Spaces:

cardef
/

grid-lab

Running

cardef commited on 4 days ago

Commit

dbdc890

verified ·

1 Parent(s): 326114e

Work in a private Space inside the Hub page: pass the page's ?__sign= to the app module, the fonts, the worker and its libraries

Files changed (4) hide show

engine_api.js CHANGED Viewed

@@ -38,6 +38,9 @@
 export const WORKER_URL = "engine_worker.js";
 export const WORKER_TYPE = "module";               // the worker is an ES module (import onnxruntime-web / pyodide.mjs)
 export function normalizeKnobs(k) {
   const n = (x, d) => (Number.isFinite(+x) ? +x : d);
@@ -98,7 +101,7 @@ export function validateExact(r, dims) {
 export class Engine {
   constructor(url = WORKER_URL, type = WORKER_TYPE) {
-    this.worker = new Worker(url, { type });
     this.n = 0;
     this.pending = new Map();
     this.statusListeners = [];

 export const WORKER_URL = "engine_worker.js";
 export const WORKER_TYPE = "module";               // the worker is an ES module (import onnxruntime-web / pyodide.mjs)
+// a private Space signs the page (?__sign=): the worker's requests pass only if the worker's own URL carries the signature
+const SIGN = typeof location === "undefined" ? null : new URLSearchParams(location.search).get("__sign");
+const signed = (u) => (SIGN ? `${u}${String(u).includes("?") ? "&" : "?"}__sign=${encodeURIComponent(SIGN)}` : u);
 export function normalizeKnobs(k) {
   const n = (x, d) => (Number.isFinite(+x) ? +x : d);
 export class Engine {
   constructor(url = WORKER_URL, type = WORKER_TYPE) {
+    this.worker = new Worker(signed(url), { type });
     this.n = 0;
     this.pending = new Map();
     this.statusListeners = [];

engine_worker.js CHANGED Viewed

@@ -9,6 +9,10 @@
 import { createEngine, transferables } from "./assets/engine/engine_core.js";
 const BASE = new URL("./assets/engine/", import.meta.url).href;
 const STAGES = { start: [0.02, "starting Python (Pyodide)"], pyodide: [0.25, "loading numpy, scipy, pandas"],
   packages: [0.6, "fetching the grid and GENCO"], fetch_rest: [0.65, "loading the engine"],
   engine: [0.8, "loading GENCO (onnxruntime-web)"], model: [0.9, "warming up"], warmup: [1.0, "ready"] };
@@ -21,7 +25,7 @@ const status = (stage, detail, progress) => self.postMessage({ type: "status", s
 async function start(opts = {}) {
   status("loading", "loading the engine", 0.01);
-  const [{ loadPyodide }, ortModule] = await Promise.all([import(BASE + "pyodide/pyodide.mjs"), import(BASE + "ort/ort.wasm.min.mjs")]);
   const ort = ortModule.default ?? ortModule;
   ort.env.wasm.wasmPaths = BASE + "ort/";
   // GENCO's WASM threads: the visitor's cores, up to 8, when the page is cross-origin isolated (else 1). Measured on a

 import { createEngine, transferables } from "./assets/engine/engine_core.js";
 const BASE = new URL("./assets/engine/", import.meta.url).href;
+// a private Space: this worker's URL carries the page's signature (engine_api.js); Pyodide and onnxruntime-web import
+// their own files with their URL as the Referer, so they are imported signed too
+const SIGN = new URLSearchParams(self.location.search).get("__sign");
+const signed = (u) => (SIGN ? `${u}?__sign=${encodeURIComponent(SIGN)}` : u);
 const STAGES = { start: [0.02, "starting Python (Pyodide)"], pyodide: [0.25, "loading numpy, scipy, pandas"],
   packages: [0.6, "fetching the grid and GENCO"], fetch_rest: [0.65, "loading the engine"],
   engine: [0.8, "loading GENCO (onnxruntime-web)"], model: [0.9, "warming up"], warmup: [1.0, "ready"] };
 async function start(opts = {}) {
   status("loading", "loading the engine", 0.01);
+  const [{ loadPyodide }, ortModule] = await Promise.all([import(signed(BASE + "pyodide/pyodide.mjs")), import(signed(BASE + "ort/ort.wasm.min.mjs"))]);
   const ort = ortModule.default ?? ortModule;
   ort.env.wasm.wasmPaths = BASE + "ort/";
   // GENCO's WASM threads: the visitor's cores, up to 8, when the page is cross-origin isolated (else 1). Measured on a

index.html CHANGED Viewed

@@ -9,8 +9,19 @@
 <link rel="icon" href="assets/favicon.svg" type="image/svg+xml">
 <link rel="stylesheet" href="assets/vendor/maplibre-gl-5.24.0.css">
 <link rel="stylesheet" href="styles_v2.css">
 <script src="assets/vendor/maplibre-gl-5.24.0.js"></script>
-<script type="module" src="app_v2.js"></script>
 </head>
 <body>
 <header class="hdr">

 <link rel="icon" href="assets/favicon.svg" type="image/svg+xml">
 <link rel="stylesheet" href="assets/vendor/maplibre-gl-5.24.0.css">
 <link rel="stylesheet" href="styles_v2.css">
+<!-- A private Space signs this page (?__sign=): a file another file asks for passes only if the asking file's URL is
+     signed. So the fonts are declared here, not in the stylesheet, and the app is imported with the signature. -->
+<style>
+@font-face { font-family: "Mulish"; font-weight: 400; font-display: swap; src: url("assets/fonts/Mulish-Regular.ttf") format("truetype"); }
+@font-face { font-family: "Mulish"; font-weight: 600; font-display: swap; src: url("assets/fonts/Mulish-SemiBold.ttf") format("truetype"); }
+@font-face { font-family: "Mulish"; font-weight: 700; font-display: swap; src: url("assets/fonts/Mulish-Bold.ttf") format("truetype"); }
+@font-face { font-family: "Mulish"; font-weight: 800; font-display: swap; src: url("assets/fonts/Mulish-ExtraBold.ttf") format("truetype"); }
+</style>
 <script src="assets/vendor/maplibre-gl-5.24.0.js"></script>
+<script type="module">
+const sign = new URLSearchParams(location.search).get("__sign");
+import(sign ? `./app_v2.js?__sign=${encodeURIComponent(sign)}` : "./app_v2.js");
+</script>
 </head>
 <body>
 <header class="hdr">

styles_v2.css CHANGED Viewed

@@ -1,10 +1,7 @@
 /* Weather what-ifs v2: light, minimal, Vicomtech tokens. 8-pt grid; cards with soft layered shadows instead of borders;
    a frosted sticky header; segmented controls; thin sliders; 250 ms ease-out motion (none with reduced motion). */
-@font-face { font-family: "Mulish"; font-weight: 400; font-display: swap; src: url("assets/fonts/Mulish-Regular.ttf") format("truetype"); }
-@font-face { font-family: "Mulish"; font-weight: 600; font-display: swap; src: url("assets/fonts/Mulish-SemiBold.ttf") format("truetype"); }
-@font-face { font-family: "Mulish"; font-weight: 700; font-display: swap; src: url("assets/fonts/Mulish-Bold.ttf") format("truetype"); }
-@font-face { font-family: "Mulish"; font-weight: 800; font-display: swap; src: url("assets/fonts/Mulish-ExtraBold.ttf") format("truetype"); }
 :root {
   --cyan: #00A7C4; --cyan-d: #018299; --cyan-h: #076C7F;

 /* Weather what-ifs v2: light, minimal, Vicomtech tokens. 8-pt grid; cards with soft layered shadows instead of borders;
    a frosted sticky header; segmented controls; thin sliders; 250 ms ease-out motion (none with reduced motion). */
+/* Mulish's @font-face rules are in index.html: in a private Space the fonts must be asked for by the signed page */
 :root {
   --cyan: #00A7C4; --cyan-d: #018299; --cyan-h: #076C7F;