Commit b60e999838e28bdf93ac01346599a386226ddf7d | snowbound

author	clover caruso <git@paperclover.net> 2026-10-03 00:28:37-07:00
committer	clover caruso <git@paperclover.net> 2026-10-03 05:19:31-07:00
log	b60e999838e28bdf93ac01346599a386226ddf7d
tree	b2265a21488c76b86bbb298469b481e3f41233f8
parent	8587d48a5c4256dcc935abf9ad5a8a23329cea5e
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

feat: the web build deploys to snowbound.paperclover.net, each build's module and JavaScript in a folder named by their contents

release_web.py --deploy rsyncs the site to the VPS, where tools/web/serve.py (pm2's
snowbound-web) has index.html checked on every load and keeps b/HASH/ for good; the last
three builds stay for pages still running them. A page whose cached module and JavaScript
don't link reloads once afresh. The copyparty share's web/ folder is no longer published.

Assisted-by: claude-opus-5.5

4 files changed, 85 insertions(+), 36 deletions(-)

arc
- platforms.md
tools
- TESTING.md
- release_web.py
- web
  - serve.py

arc/platforms.md+1-1

...	@@ -167,7 +167,7 @@ keyboard, the toolbar and the macOS menu bar all run commands from it.	...	@@ -167,7 +167,7 @@ keyboard, the toolbar and the macOS menu bar all run commands from it.
167	module, and `web/index.html` and `web/glue.js` are the page around it. `glue.js` brings the	167	module, and `web/index.html` and `web/glue.js` are the page around it. `glue.js` brings the
168	canvas's pointer, wheel and touch, and a hidden text area's keys, composition and paste, as	168	canvas's pointer, wheel and touch, and a hidden text area's keys, composition and paste, as
169	the `ui::Event`s winit would; `web.rs` stands in for winit's window and event loop and runs	169	the `ui::Event`s winit would; `web.rs` stands in for winit's window and event loop and runs
170	`State` a turn per animation frame. `tools/release_web.py` builds and publishes it.	170	`State` a turn per animation frame. `tools/release_web.py` builds it and deploys it to https://snowbound.paperclover.net.
171	- The page has one thread. The notebook's section thread, sync worker and background run as	171	- The page has one thread. The notebook's section thread, sync worker and background run as
172	tasks on its event loop (`notebook::task`), and work the desktop gives a thread runs once	172	tasks on its event loop (`notebook::task`), and work the desktop gives a thread runs once
173	the frame is done (`spawn`).	173	the frame is done (`spawn`).

tools/TESTING.md+1-1

...	@@ -19,7 +19,7 @@ another, and the exit status is the result.	...	@@ -19,7 +19,7 @@ another, and the exit status is the result.
19	\| `windows-x86_64` \| `platform/windows/cargo.sh` build of `snowbound` (nightly's win7 target) \|	19	\| `windows-x86_64` \| `platform/windows/cargo.sh` build of `snowbound` (nightly's win7 target) \|
20	\| `windows-aarch64`, `linux-*` \| Clippy `-D warnings` on what ships (libraries and binaries but `mobile`), then the `snowbound` build; Linux through `platform/linux/cargo.sh`, which links with zig against glibc 2.17 \|	20	\| `windows-aarch64`, `linux-*` \| Clippy `-D warnings` on what ships (libraries and binaries but `mobile`), then the `snowbound` build; Linux through `platform/linux/cargo.sh`, which links with zig against glibc 2.17 \|
21	\| `ios` \| `xcodebuild` of the simulator app, unsigned \|	21	\| `ios` \| `xcodebuild` of the simulator app, unsigned \|
22	\| `web` \| Clippy `-D warnings` on `snowbound` for `wasm32-unknown-unknown`, SQLite built by nixpkgs' clang; `release_web.py` links, optimizes and publishes the static folder \|	22	\| `web` \| Clippy `-D warnings` on `snowbound` for `wasm32-unknown-unknown`, SQLite built by nixpkgs' clang; `release_web.py` links, optimizes and deploys the static folder \|
23	\| `macos-10.6` \| `platform/snow-leopard/cargo.sh` build of `snowbound`; skipped, saying why, without the SDK or nightly `rust-src` \|	23	\| `macos-10.6` \| `platform/snow-leopard/cargo.sh` build of `snowbound`; skipped, saying why, without the SDK or nightly `rust-src` \|
24		24
25	```sh	25	```sh

tools/release_web.py+52-34

 @@ -1,9 +1,14 @@
 #!/usr/bin/env python3
 """Builds Snowbound for the web (crates/snowbound for wasm32, with crates/snowbound/web) as a
-static folder and publishes it to the share's web/ folder.
+static folder and deploys it to the VPS, which serves it at https://snowbound.paperclover.net.
     python3 tools/release_web.py --out /tmp/snowbound-web/dist   # build only
-    python3 tools/release_web.py --publish                       # build, then replace web/
+    python3 tools/release_web.py --deploy                        # build, then replace the site
+The module and its JavaScript go in a folder named by their contents, b/HASH/, which
+index.html names, so a page never pairs one build's module with another's JavaScript; the
+server (tools/web/serve.py, which pm2's `snowbound-web` runs as `serve.py 23593 site` in the
+VPS's snowbound-web/) has index.html checked on every load and keeps a build's folder for good.
 """
 import argparse
 import gzip
 @@ -26,9 +31,13 @@ WEB = ROOT / 'crates/snowbound/web'
 FONTS = ROOT / 'crates/canvas/assets/fonts'
 # Where the loading shell's icons are looked up by name, in order.
 ICONS = [ROOT / 'crates/snowbound/assets/icons', ROOT / 'crates/canvas/assets/tags', ROOT / 'crates/ui/assets']
-PUBLISHED = Path('/Volumes/clover/Documents/Public/Snowbound/web')
+# The VPS's folder: serve.py, and the site it serves on 127.0.0.1:23593 as pm2's
-# copyparty lists the folder itself, so the app is at its index.html.
+# `snowbound-web`, behind https://snowbound.paperclover.net.
-URL = 'https://file.paperclover.net/shr/snowbound/web/index.html'
+HOST = 'clo@paperclover.net'
+DEPLOYED = 'snowbound-web'
+URL = 'https://snowbound.paperclover.net'
+# Builds the server keeps beside the newest, for pages still running one.
+KEPT = 3
 EMOJI_URL = 'https://github.com/googlefonts/noto-emoji/raw/v2.051/fonts/Noto-COLRv1.ttf'
 EMOJI_SHA256 = '0ae57fe58645638523ba35f388d93739d292539a9acb84df5700c81b1e1a28d2'
 # As `EMOJI` in src/web.rs names it.
 @@ -91,25 +100,32 @@ def build(out):
         shutil.rmtree(out)
     out.mkdir(parents=True)
     module = TARGET / 'wasm32-unknown-unknown/release/snowbound.wasm'
+    code = out / 'b/next'
     run([tool('wasm-bindgen'), '--target', 'web', '--no-typescript', '--out-name', 'snowbound_web',
-         '--out-dir', out, module])
+         '--out-dir', code, module])
-    bound = out / 'snowbound_web_bg.wasm'
+    bound = code / 'snowbound_web_bg.wasm'
     run([tool('wasm-opt', 'binaryen'), '-Oz', '--strip-debug', '--strip-producers', bound, '-o', bound])
+    digest = hashlib.sha256()
+    for path in sorted(code.rglob('*')):
+        if path.is_file():
+            digest.update(str(path.relative_to(code)).encode() + b'\0' + path.read_bytes())
+    code = code.rename(out / 'b' / digest.hexdigest()[:16])
     dictionaries(out / 'dictionaries')
     (out / 'fonts').mkdir()
     for font in sorted(FONTS.glob('*')):
         if font.suffix in ('.ttf', '.txt'):
             shutil.copy(font, out / 'fonts')
     fallbacks(out / 'fonts')
-    page(out)
+    page(out, code.relative_to(out).as_posix())
     for path in sorted(out.rglob('*')):
         if path.is_file():
             print(f'{path.stat().st_size:>12,}  {path.relative_to(out)}')
-def page(out):
+def page(out, code):
-    """Writes index.html with its loading shell's icons inlined, and the sizes of the files
+    """Writes index.html with its loading shell's icons inlined, the folder `code` it takes
-    it fetches before the app starts, for its progress bar."""
+    the module and its JavaScript from, and the sizes of the files it fetches before the app
+    starts, for its progress bar."""
     count = itertools.count()
     def inline(match):
 @@ -121,12 +137,15 @@ def page(out):
         svg = re.sub(r'url\(#([^)]+)\)', rf'url(#{prefix}\1)', svg)
         return f'<i{match[1]}>{svg.strip()}</i>'
     html = re.sub(r'<i([^>]*) icon="([^"]+)"></i>', inline, (WEB / 'index.html').read_text())
-    sizes = {str(path.relative_to(out)): path.stat().st_size
+    sizes = {path.relative_to(out).as_posix(): path.stat().st_size
-             for path in [out / 'snowbound_web_bg.wasm', *sorted((out / 'fonts').glob('*.ttf'))]}
+             for path in [out / code / 'snowbound_web_bg.wasm', *sorted((out / 'fonts').glob('*.ttf'))]}
-    marker = 'const SIZES = {};'
+    for marker, written in [('const SIZES = {};', f'const SIZES = {json.dumps(sizes)};'),
-    if marker not in html:
+                            ('"./snowbound_web.js"', f'"./{code}/snowbound_web.js"'),
-        sys.exit(f'index.html lacks `{marker}`')
+                            ('const MODULE = "snowbound_web_bg.wasm";', f'const MODULE = "{code}/snowbound_web_bg.wasm";')]:
-    (out / 'index.html').write_text(html.replace(marker, f'const SIZES = {json.dumps(sizes)};'))
+        if marker not in html:
+            sys.exit(f'index.html lacks `{marker}`')
+        html = html.replace(marker, written)
+    (out / 'index.html').write_text(html)
 def dictionaries(folder):
 @@ -187,32 +206,31 @@ def fallbacks(fonts):
     (fonts / 'Noto-OFL.txt').write_text('Noto fonts: SIL Open Font License 1.1, https://openfontlicense.org\n')
-def publish(built):
+def deploy(built):
-    """Replaces the share's web/ folder with `built`, leaving every other folder alone."""
+    """Makes the VPS's site `built`, each file taking its place once all have arrived, and
-    if not PUBLISHED.parent.is_dir():
+    leaves the last builds' folders for pages still running them."""
-        sys.exit(f'{PUBLISHED.parent} is not mounted')
+    sync = ['rsync', '--recursive', '--links', '--times', '--compress', '--itemize-changes']
-    staging = PUBLISHED.with_name('.web-staging')
+    server = subprocess.run([*sync, ROOT / 'tools/web/serve.py', f'{HOST}:{DEPLOYED}/'],
-    if staging.exists():
+                            check=True, capture_output=True, text=True).stdout
-        shutil.rmtree(staging)
+    run([*sync, '--delete', '--delay-updates', '--filter=P b/*', f'{built}/', f'{HOST}:{DEPLOYED}/site/'])
-    shutil.copytree(built, staging)
+    run(['ssh', HOST, f'cd {DEPLOYED}/site/b && ls -t | tail -n +{KEPT + 2} | xargs -r rm -rf --'])
-    if PUBLISHED.exists():
+    if server.strip():
-        shutil.rmtree(PUBLISHED)
+        run(['ssh', HOST, 'pm2 restart snowbound-web'])
-    staging.rename(PUBLISHED)
+    print(f'Deployed {URL}')
-    print(f'Published {URL}')
 def main():
     parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('--out', type=Path, help='Build into this folder (default: a temporary one)')
-    parser.add_argument('--publish', action='store_true', help=f'Copy the build to {PUBLISHED}')
+    parser.add_argument('--deploy', action='store_true', help=f'Copy the build to {DEPLOYED}')
     args = parser.parse_args()
-    if not args.out and not args.publish:
+    if not args.out and not args.deploy:
-        parser.error('give --out, --publish or both')
+        parser.error('give --out, --deploy or both')
     with tempfile.TemporaryDirectory() as scratch:
         out = args.out or Path(scratch) / 'web'
         build(out)
-        if args.publish:
+        if args.deploy:
-            publish(out)
+            deploy(out)
 if __name__ == '__main__':

tools/web/serve.py created+31

...	@@ -0,0 +1,31 @@
1	#!/usr/bin/env python3
2	"""Serves the web build on 127.0.0.1, behind the VPS's Caddy and Cloudflare: index.html is
3	checked every load, a build's folder (b/HASH/) is kept for good, and the fonts and
4	dictionaries for a day.
5
6	python3 serve.py PORT FOLDER
7	"""
8	import functools
9	import http.server
10	import sys
11
12
13	class Handler(http.server.SimpleHTTPRequestHandler):
14	extensions_map = {**http.server.SimpleHTTPRequestHandler.extensions_map, '.wasm': 'application/wasm'}
15
16	def end_headers(self):
17	path = self.path.split('?')[0]
18	if path.startswith('/b/'):
19	cache = 'public, max-age=31536000, immutable'
20	elif path in ('/', '/index.html'):
21	cache = 'no-cache'
22	else:
23	cache = 'public, max-age=86400'
24	self.send_header('Cache-Control', cache)
25	super().end_headers()
26
27
28	if __name__ == '__main__':
29	port, folder = int(sys.argv[1]), sys.argv[2]
30	handler = functools.partial(Handler, directory=folder)
31	http.server.ThreadingHTTPServer(('127.0.0.1', port), handler).serve_forever()