@remix_labs/machine-starter 2.3134.0-dev → 2.3138.0-dev

package/common.js

@@ -5,18 +5,31 @@ import { MixcoreTauri, filterFFINames } from "./mixcore.lib.mjs";
 let workers = {};
 let children = {};
 let ffiLoops = {};
+let blobs = {};
+let blobsLoops = {};
 
 function terminateAll() {
     console.log("[groovebox-starter] terminate all VMs");
     for (let [vmID, worker] of Object.entries(workers)) {
         worker.terminate();
     };
+    for (let [vmID, blobs] of Object.entries(blobs)) {
+        for (let blob_url of blobs) {
+            console.log("[groovebox-starter] revoke ", blob_url);
+            URL.revokeObjectURL(blob_url);
+        }
+    };
     for (let ffiLoop of Object.values(ffiLoops)) {
         ffiLoop.terminate();
     }
+    for (let blobsLoop of Object.values(blobsLoops)) {
+        blobsLoop.terminate();
+    }
     workers = {};
     children = {};
     ffiLoops = {};
+    blobs = {};
+    blobsLoops = {};
 }
 
 function terminateVM(vmID) {
@@ -24,12 +37,22 @@ function terminateVM(vmID) {
     let worker = workers[vmID];
     if (worker) {
         let vmChildren = children[vmID];
+        let blobList = blobs[vmID] || [];
         let ffiLoop = ffiLoops[vmID];
+        let blobsLoop = blobsLoops[vmID];
         delete workers[vmID];
         delete children[vmID];
         delete ffiLoops[vmID];
+        delete blobsLoops[vmID];
         worker.terminate();
         ffiLoop.terminate();
+        if (blobsLoop) {
+            blobsLoop.terminate();
+        }
+        for (let blob_url of blobList) {
+            console.log("[groovebox-starter] revoke ", blob_url);
+            URL.revokeObjectURL(blob_url);
+        };
         if (vmChildren) {
             for (let subID of vmChildren) {
                 terminateVM(subID)
@@ -116,6 +139,7 @@ async function StartWASM2(hub, config) {
         }
     };
     ffiLoops[config.vmID] = setupLocalFFIs(hub, config, localFFIfuns);
+    blobsLoops[config.vmID] = setupBlobs(hub, config);
     let config_msg =
         { "_rmx_type": "msg_vm_configure",
           "baseURL": config.baseURL,
@@ -337,6 +361,35 @@ async function localFFIsMessageLoop(hub, config, localFFIs, terminate) {
     }
 }
 
+function setupBlobs(hub, config) {
+    let vmID = config.vmID;
+    let terminate = Promise.withResolvers();
+    blobsMessageLoop(hub, config, terminate.promise); // don't wait
+    return {terminate: terminate.resolve};
+}
+async function blobsMessageLoop(hub, config, terminate) {
+    let vmID = config.vmID;
+    let channel = await hub.newChannel();
+    let comm = new FFIComm(vmID, hub, channel);
+    let sub = await channel.subscribe("/local/" + vmID + "/blobs");
+    while (true) {
+        let {msg, terminated} = await Promise.race([
+            sub.next().then((msg) => ({msg})),
+            terminate.then(() => ({terminated: true})),
+        ]);
+        if (terminated) {
+            console.log("[groovebox-starter] terminate blobs loop", vmID);
+            return;
+        }
+        let name = msg.payload.name;
+        let url = msg.payload.url;
+        let blobList = blobs[vmID];
+        if (!blobList) blobList = [];
+        blobList.push(url);
+        blobs[vmID] = blobList;
+    }
+}
+
 class FFIComm {
     constructor(vmID, hub, channel) {
         this.vmID = vmID;

package/groovebox_build.js

@@ -1,2 +1,2 @@
-var GROOVEBOX_BUILD = "3488";
+var GROOVEBOX_BUILD = "3492";
 export { GROOVEBOX_BUILD }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "2.3134.0-dev",
+  "version": "2.3138.0-dev",
   "description": "start the groove",
   "main": "node.js",
   "browser": "index.js",
@@ -11,7 +11,7 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/hub-client": "2.3134.0-dev",
+    "@remix_labs/hub-client": "2.3138.0-dev",
     "nanoid": "^5.0.2",
     "web-worker": "^1.2.0"
   },