crossbind 2.0.0-beta.63 → 2.0.0-beta.65

package/src/assets/js-runtime/adapters/worker-comlink.js

@@ -24,12 +24,48 @@ let nextEmbindId = 1;
 const HANDLES = '__crossbindHandles';
 let remoteModule = null;
 
+// How many ids name each object, as a raw pointer handed out twice is one object.
+const holders = new WeakMap();
+
 function registerEmbindObject(obj) {
     const id = nextEmbindId++;
     embindRegistry.set(id, obj);
+    holders.set(obj, (holders.get(obj) ?? 0) + 1);
     return id;
 }
 
+// What JavaScript owns: an object behind a smart pointer, or a copy embind made of a returned value or an object
+// JavaScript constructed, which utils/embindObjectLifetime.js marks. A raw pointer stays its library's.
+const ownsObject = (obj) => {
+    const $$ = obj?.$$;
+    return Boolean($$ && ($$.smartPtr || $$.count?.owned));
+};
+
+// The module's own objects, its globals above all, live as long as the module, so letting go of a handle to one
+// frees nothing.
+const moduleObjects = new WeakSet();
+
+const freeIfOwned = (obj) => {
+    if (ownsObject(obj) && !moduleObjects.has(obj) && !obj.isDeleted()) obj.delete();
+};
+
+// The worker side of a handle the main thread no longer reaches: its id goes, and the object with the last id.
+const RELEASE = '__crossbindRelease';
+
+function releaseEmbindObjects(ids) {
+    for (const id of ids) {
+        const obj = embindRegistry.get(id);
+        if (!embindRegistry.delete(id)) continue;
+        const left = holders.get(obj) - 1;
+        if (left > 0) {
+            holders.set(obj, left);
+        } else {
+            holders.delete(obj);
+            freeIfOwned(obj);
+        }
+    }
+}
+
 // Comlink answers every member with a remote one: JSON.stringify and String() called toJSON and Symbol.toPrimitive
 // on the worker's object, which has neither, and a member below the module is thenable. A handle answers them as a
 // direct-mode object does.
@@ -39,11 +75,27 @@ const LOCAL_MEMBERS = {
     [Symbol.toPrimitive]: (hint) => (hint === 'number' ? NaN : '[object Object]'),
 };
 
+// The main thread side: once a handle is collected, the worker lets go of its object, the ids collected in one task
+// in one message.
+const collected = [];
+
+function releaseLater(id) {
+    collected.push(id);
+    if (collected.length > 1) return;
+    setTimeout(() => {
+        const ids = collected.splice(0);
+        Promise.resolve(remoteModule?.[RELEASE](ids)).catch(() => {});
+    }, 0);
+}
+
+const handleWatcher = typeof FinalizationRegistry === 'function' ? new FinalizationRegistry(releaseLater) : null;
+
 function handleFor(id) {
     const handle = new Proxy(remoteModule[HANDLES][id], {
         get: (target, prop) => (Object.hasOwn(LOCAL_MEMBERS, prop) ? LOCAL_MEMBERS[prop] : target[prop]),
     });
     embindProxyIds.set(handle, id);
+    handleWatcher?.register(handle, id);
     return handle;
 }
 
@@ -126,6 +178,8 @@ Comlink.transferHandlers.set('embindVector', {
                 ? { __comlinkProxy: true, __embindId: registerEmbindObject(elem) }
                 : elem;
         }
+        // The main thread gets the array alone, so nothing can reach a vector the call handed over any more.
+        freeIfOwned(unwrapCoercionProxy(obj));
         return [elements, []];
     },
     deserialize(elements) {
@@ -246,6 +300,10 @@ export function moduleRoot(m) {
         value: new Proxy({}, { get: (_, id) => embindRegistry.get(Number(id)) }),
         configurable: true,
     });
+    Object.defineProperty(m, RELEASE, { value: releaseEmbindObjects, configurable: true });
+    Object.values(m).forEach((value) => {
+        if (value !== null && typeof value === 'object') moduleObjects.add(value);
+    });
     return wrapWithVectorCoercion(m);
 }
 

package/src/assets/js-runtime/core.js

@@ -74,12 +74,13 @@ function buildLocateFile(config, adapter) {
 }
 
 // WASMFS's FS.writeFile writes at the end of a file that exists (emsdk 6.0.9 js_api.cpp), where the classic FS
-// replaces it; opening the file for writing empties it first.
+// replaces it; opening the file for writing empties it first, unless the flags ask to append.
 function replaceOnWriteFile(FS) {
     const { writeFile } = FS;
-    FS.writeFile = (path, data) => {
-        FS.close(FS.open(path, 'w'));
-        return writeFile(path, data);
+    FS.writeFile = (path, data, opts) => {
+        const appends = typeof opts?.flags === 'string' && opts.flags.startsWith('a');
+        if (!appends) FS.close(FS.open(path, 'w', opts?.mode));
+        return writeFile(path, data, opts);
     };
 }
 

package/src/assets/toolchain-digests.json

@@ -1,49 +1,55 @@
 {
-    "version": "1.0.12",
+    "version": "1.0.15",
     "registry": "ghcr.io/crossbind",
     "toolchains": {
-        "rust": "1.99.0"
+        "rust": "1.99.1"
     },
     "images": {
         "rust-sysroot": {
-            "index": "sha256:fcaddb9514956c80c28152679d11817599b3c544e2bb56568d79dbd7699af805",
+            "index": "sha256:720469aca3cff3f1abe69374882d2c48399864be3778225e7754e94036e3be7a",
             "platforms": {
-                "linux/arm64": "sha256:70dca2248666ee712ad5cb11fd013274ca4bb1efdafee732a0ec15492889f622",
-                "linux/amd64": "sha256:a3377c70598ef4e1918a73feeebb0ec1b80b3cde956daac9b2b62f9d742b88dc"
+                "linux/arm64": "sha256:3aa68ad3736491de26c6ca9b52a49c80e6291228cc17a05caba4c060ea68913c",
+                "linux/amd64": "sha256:e77357a8c763244a5a5b4086fb771e81bec385526432ec6e77fb316f39158c53"
             }
         },
         "base": {
-            "index": "sha256:86c6559bd51c10f8fc1ff6cbc0cf5386115fd7f0491a59f30f0d26a0203c200d",
+            "index": "sha256:a7c9342c50a493c990f8c26f1bec7e3919ad6010ce8a6cdfaa772487a1040989",
             "platforms": {
-                "linux/amd64": "sha256:16056b4bd85ba1792791401003db0325c31d4aa4821ff40f6f2eb1e0fff1d3ce",
-                "linux/arm64": "sha256:8d213f83ddd1ad9101b74b2b071f304ac8924ffbe68d79ece50668076e0172c0"
+                "linux/arm64": "sha256:c9152c3ff4854ba898df1b9fe89e8a94fd29aa5832e8cc5a4bd5fa2e06cee10f",
+                "linux/amd64": "sha256:817fc177f488b975bbbd196d9ec9d1d3effbf2c59d1ed82e979fcf5124c4c1aa"
             }
         },
         "web": {
-            "index": "sha256:ffa089b83160e380e0b4447f483bf66cb87324f89b8e80b5776ed9346275a5ca",
+            "index": "sha256:143c2e79a950f732913726f32559f7c70323accf2727b34a12f332df91b765ef",
             "platforms": {
-                "linux/arm64": "sha256:1baf14ee0f1a821c1562d12902fe362d3639f57acb31f969402f2a2d8486647f",
-                "linux/amd64": "sha256:d3bd3aa785447f1679fdcb898921f614579d9eaad2aa9e828675ba7f82dc11ec"
+                "linux/arm64": "sha256:ebd0dbeee77a5fde4659b5f129713e5006cc205c629f837b56478e3691e85b9c",
+                "linux/amd64": "sha256:14429be7ee52afa0bd9c94248db3a84f90e74c29700a3f5f34da2989d7161431"
             }
         },
         "android": {
-            "index": "sha256:830286886d8bb259e94e112e4f1bab5f153106365b17859d20c9ef714349e520",
+            "index": "sha256:249bdfda25dcd394c1e4955f3cd3e63140264697e9a543fbae1dce2ec3d80c38",
             "platforms": {
-                "linux/amd64": "sha256:1004144243fea89a8915417954073e8ffabb20d8a9aed31045ce2a95c1abe1da"
+                "linux/amd64": "sha256:725375a79e64c93a7cc7e35f4708e36511f6a36212e0a3aaf44f6b5ec1057724"
+            }
+        },
+        "android-app": {
+            "index": "sha256:d739c6b72e1545b086f38fe5613b58f52877a36e14c2ffd763acdd0296802802",
+            "platforms": {
+                "linux/amd64": "sha256:a7124034f1ba3d888b3cd32c18051f87498c47ec515eac809b7440394c54ecb7"
             }
         },
         "linux": {
-            "index": "sha256:8d4cc55d2ef8ea40845fd13708575e06f6aecdc035e7200deddf8c662d5c910f",
+            "index": "sha256:433af720cf95a99c4e007c0cfc98ab358c6ddc61fecca75a0b844f598d750b1b",
             "platforms": {
-                "linux/arm64": "sha256:0de59cc6ce7b381f213af0d26ccc83e0c41545a91eb0b36c51832c7fb660566c",
-                "linux/amd64": "sha256:3b3bc24d8f5dffe3a2408193265a807764fcf2744243c0a5e07f312f608fc6c0"
+                "linux/arm64": "sha256:0cf32948302c1a23294d28d20dd3b784790c7789b9e99bc8be56888bddb6aeb7",
+                "linux/amd64": "sha256:6da084ff433e792381aadd280b769aa1b09ba593e3e21ea4580f4736776e3cb9"
             }
         },
         "windows": {
-            "index": "sha256:a31110874a9b6b9e3fec177edc8a8093905902bcc6abc6a85e45eb0927d4f070",
+            "index": "sha256:c1fb594cb245f6b0414f04cb7413881532438b204c7ce06f78f6deaea2d3cb24",
             "platforms": {
-                "linux/arm64": "sha256:bd9ec6ba60952f929e09777374a3bb05512bbe796325c0e8a0b84e1a12d1b86c",
-                "linux/amd64": "sha256:01f4bd8c4d1044bde68fe758d2632c510f8efb76aa4bad28696f9e9b199c8f4e"
+                "linux/amd64": "sha256:3ee3a4f9c565b0d2adedc3c699871bf8de4c2d7034b2b7a24309f4a6c4d0e64c",
+                "linux/arm64": "sha256:44702d741848f96d71dfb0a5322c37c9c248f7a38fe9e7c09b7d307ce000cc3f"
             }
         }
     }

package/src/assets/wasi-runtime/http/README.md

@@ -0,0 +1,17 @@
+# HTTP component runtime
+
+What an http build (`crossbind build -p wasi -e http`) links besides the app: `handler.cpp`, the
+`wasi:http/handler` export that calls the app's `crossbind::http::handle` (`include/crossbind/http.h`),
+and `bindings/`, which `wit-bindgen c` generated from `wit/`.
+
+`wit/deps/` holds the `http` package of the WASI 0.3.0 release, unchanged: `wasi-wit-0.3.0.tar.gz` from
+https://github.com/WebAssembly/WASI/releases/tag/v0.3.0 (sha256
+`596182ecd79311c8d010389b78b0253d54bee596254002df504ea5cf0124b894`), licensed as `wit/deps/LICENSE.md` says.
+
+After changing `wit/`, regenerate the bindings with wit-bindgen 0.62.0; with `--check` it confirms instead
+that the committed ones, the `.o` included, are what it generates:
+
+```bash
+wit-bindgen c wit --world crossbind-http --out-dir bindings
+wit-bindgen c wit --world crossbind-http --out-dir bindings --check
+```