@proto-labs-inc/rig-core 0.2.2 → 0.2.4

package/dist/frame-tools-loader.js

@@ -3,12 +3,13 @@ export function loadFrameTools(frameOrigin) {
     if (window.parent === window)
         return () => { };
     let disposed = false;
+    let closeRequest;
     let unmount;
     const report = (status, origin = "*") => {
         if (!disposed)
             window.parent.postMessage({ type: "frame-tools-status", status }, origin);
     };
-    const dispose = () => { disposed = true; unmount?.(); };
+    const dispose = () => { disposed = true; closeRequest?.(); unmount?.(); };
     if (!frameOrigin) {
         report("unavailable");
         return dispose;
@@ -31,12 +32,47 @@ export function loadFrameTools(frameOrigin) {
         return dispose;
     }
     report("loading", origin);
-    const url = new URL("/frame-tools/v1.js", origin).href;
-    void import(/* @vite-ignore */ url).then((runtime) => {
+    // The Frame fetches its own public module. A published HTTPS prototype
+    // never needs to reach into a localhost or private-network Frame.
+    const channel = new MessageChannel();
+    const source = new Promise((resolve, reject) => {
+        const finish = () => {
+            clearTimeout(timer);
+            channel.port1.close();
+            closeRequest = undefined;
+        };
+        const timer = setTimeout(() => {
+            finish();
+            reject(new Error("Selection runtime request timed out"));
+        }, 15_000);
+        closeRequest = () => {
+            finish();
+            reject(new Error("Selection runtime request disposed"));
+        };
+        channel.port1.onmessage = (event) => {
+            finish();
+            const reply = event.data;
+            if (reply?.status === "ready" && typeof reply.source === "string")
+                resolve(reply.source);
+            else
+                reject(new Error("Selection runtime unavailable"));
+        };
+        window.parent.postMessage({ type: "request-frame-tools" }, origin, [channel.port2]);
+    });
+    void source.then(async (text) => {
         if (disposed)
             return;
-        unmount = runtime.mountFrameTools({ frameOrigin: origin });
-        report("ready", origin);
+        const url = URL.createObjectURL(new Blob([text], { type: "text/javascript" }));
+        try {
+            const runtime = await import(/* webpackIgnore: true */ /* @vite-ignore */ url);
+            if (disposed)
+                return;
+            unmount = runtime.mountFrameTools({ frameOrigin: origin });
+            report("ready", origin);
+        }
+        finally {
+            URL.revokeObjectURL(url);
+        }
     }).catch((error) => {
         if (disposed)
             return;

package/dist/index.js

@@ -8,7 +8,7 @@ import { PROTOCOL_VERSION, STATE_PARAM, variantParam, applyVariantSelection, isF
 import { loadFrameTools } from "./frame-tools-loader.js";
 import { observePageHistory } from "./page-history.js";
 export { STATE_PARAM, variantParam } from "@proto-labs-inc/wire";
-const RIG_VERSION = "0.2.2";
+const RIG_VERSION = "0.2.4";
 export const INTERNAL_PREVIEW_THEME_PARAM = "__protoTheme";
 /** Mark the page light or dark (data-proto-theme and the "dark" class) for
  *  a prototype that styles both. The page's own CSS decides color-scheme:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proto-labs-inc/rig-core",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Proto's rig, framework-free: URL-state sync, the postMessage bridge to the Frame, and comment mode.",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "@proto-labs-inc/wire": "^0.2.1"
+    "@proto-labs-inc/wire": "^0.2.3"
   },
   "devDependencies": {
     "typescript": "~6.0.2",