sane-wasm 0.1.0 → 0.1.2

package/build/libsane.js

@@ -978,7 +978,7 @@ function dbg(text) {
 }
 
 var ASM_CONSTS = {
- 1061203: ($0, $1, $2) => {
+ 1061804: ($0, $1, $2) => {
   return stringToUTF16(Emval.toValue($0), $1, $2);
  }
 };
@@ -987,8 +987,18 @@ function module_set(k, v) {
  Module[UTF8ToString(k)] = Emval.toValue(v);
 }
 
+function em_libusb_event_target() {
+ if (ENVIRONMENT_IS_NODE) {
+  if (!Module.libusbEventTarget) {
+   Module.libusbEventTarget = new EventTarget();
+  }
+  return Module.libusbEventTarget;
+ }
+ return globalThis;
+}
+
 function em_libusb_notify() {
- dispatchEvent(new Event("em-libusb"));
+ em_libusb_event_target().dispatchEvent(new Event("em-libusb"));
  Object.values(PThread.pthreads).forEach(w => {
   w.postMessage({
    target: "setimmediate",
@@ -1000,24 +1010,40 @@ function em_libusb_notify() {
 function __asyncjs__em_libusb_wait(timeout) {
  return Asyncify.handleAsync(async () => {
   let onEvent, onEventWorker, timeoutId, intervalId;
+  let parentPort = ENVIRONMENT_IS_WORKER && ENVIRONMENT_IS_NODE && require("node:worker_threads").parentPort;
   try {
    intervalId = setInterval(_em_force_yield_main_thread, 50);
    return await new Promise(resolve => {
     onEvent = () => resolve(0);
-    addEventListener("em-libusb", onEvent);
-    if (typeof WorkerGlobalScope !== "undefined") {
-     onEventWorker = e => {
-      if (e.data.cmd == "em-libusb") {
-       resolve(0);
-      }
-     };
-     addEventListener("message", onEventWorker);
+    em_libusb_event_target().addEventListener("em-libusb", onEvent);
+    if (ENVIRONMENT_IS_WORKER) {
+     if (ENVIRONMENT_IS_NODE) {
+      onEventWorker = data => {
+       if (data.cmd == "em-libusb") {
+        resolve(0);
+       }
+      };
+      parentPort.on("message", onEventWorker);
+     } else {
+      onEventWorker = e => {
+       if (e.data.cmd == "em-libusb") {
+        resolve(0);
+       }
+      };
+      addEventListener("message", onEventWorker);
+     }
     }
     timeoutId = setTimeout(resolve, timeout, -1);
    });
   } finally {
-   removeEventListener("em-libusb", onEvent);
-   removeEventListener("message", onEventWorker);
+   em_libusb_event_target().removeEventListener("em-libusb", onEvent);
+   if (ENVIRONMENT_IS_WORKER) {
+    if (ENVIRONMENT_IS_NODE) {
+     parentPort.off("message", onEventWorker);
+    } else {
+     addEventListener("message", onEventWorker);
+    }
+   }
    clearInterval(intervalId);
    clearTimeout(timeoutId);
   }
@@ -8422,7 +8448,7 @@ var ___emscripten_embedded_file_data = Module["___emscripten_embedded_file_data"
 
 var ___start_em_js = Module["___start_em_js"] = 1058876;
 
-var ___stop_em_js = Module["___stop_em_js"] = 1061203;
+var ___stop_em_js = Module["___stop_em_js"] = 1061804;
 
 Module["addRunDependency"] = addRunDependency;
 
@@ -8567,6 +8593,17 @@ if (Module["noInitialRun"]) shouldRunNow = false;
 
 run();
 
+{
+ if (ENVIRONMENT_IS_NODE) {
+  if (!globalThis.navigator) {
+   globalThis.navigator = {};
+  }
+  if (!globalThis.navigator.usb) {
+   globalThis.navigator.usb = require("usb").webusb;
+  }
+ }
+}
+
 
   return LibSANE.ready
 }

package/lib/index.js

@@ -0,0 +1,7 @@
+if (globalThis.window && globalThis.window.document) {
+    // browser environment (e.g. webpack)
+    module.exports = require('./loader.js');
+} else {
+    // local environment (e.g. node)
+    module.exports = eval('require')('../build/libsane.js');
+}

package/lib/loader.js

@@ -0,0 +1,80 @@
+const { version } = require('../package.json');
+
+// we cannot use unpkg as a CDN because they don't set CORP
+// Cross-Origin-Resource-Policy: cross-origin
+// const cdnURL = `https://unpkg.com/sane-wasm@${version}/build`;
+
+// use good old jsdelivr
+const cdnURL = `https://cdn.jsdelivr.net/npm/sane-wasm@${version}/build`;
+
+let libPromise = null;
+
+function loadScript(src) {
+    return new Promise((resolve, reject) => {
+        document.head.append(Object.assign(
+            document.createElement('script'),
+            { src, onload: resolve, onerror: reject }
+        ));
+    });
+}
+
+function fetchFileToBlobURL(src) {
+    return fetch(src).then(res => res.ok ? res.blob() : new Blob()).then(blob => URL.createObjectURL(blob));
+}
+
+async function prepareLib(options) {
+    const jsURL = `${options.sane.loaderURL}/libsane.js`;
+    const jsWorkerURL = `${options.sane.loaderURL}/libsane.worker.js`;
+    const jsWasmURL = `${options.sane.loaderURL}/libsane.wasm`;
+
+    const filesToPrefetch = options.sane.loaderPrefetchToBlob ? [
+        // because of security restrictions around the Worker constructor
+        // we need to prefetch the worker js and serve it from a blob
+        // see: https://github.com/emscripten-core/emscripten/issues/8338
+        jsWorkerURL,
+        // since we are already doing all this work to fetch the files in
+        // parallel, might as well prefetch the wasm file
+        jsWasmURL,
+    ] : [];
+
+    const [lib, prefetchResult] = await Promise.all([
+        loadScript(jsURL).then(() => {
+            const lib = window.LibSANE;
+            if (options.sane.loaderRemoveGlobal) {
+                window.LibSANE = undefined; // nuke global variable
+            }
+            return lib;
+        }),
+        Promise.all(filesToPrefetch.map(url => fetchFileToBlobURL(url).then(urlBlob => ({ url, urlBlob })))),
+    ]);
+
+    const preFetchedFiles = prefetchResult.reduce((obj, { url, urlBlob }) => {
+        obj[url] = urlBlob;
+        return obj;
+    }, {});
+
+    return { lib, preFetchedFiles };
+}
+
+module.exports = async (options) => {
+    options = options || {};
+    options.sane = {
+        loaderURL: cdnURL,
+        loaderPrefetchToBlob: true,
+        loaderRemoveGlobal: true,
+        ...(options.sane || {}),
+    };
+
+    if (!libPromise) {
+        libPromise = prepareLib(options);
+    }
+
+    const { lib, preFetchedFiles } = await libPromise;
+    return lib({
+        ...(options || {}),
+        locateFile: (path, prefix) => {
+            const fullUrl = `${prefix}${path}`;
+            return preFetchedFiles[fullUrl] ? preFetchedFiles[fullUrl] : (options.locateFile ? options.locateFile(path, prefix) : fullUrl);
+        },
+    });
+};

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "sane-wasm",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A project to bring the SANE API to the web.",
-  "main": "build/libsane.js",
+  "main": "lib/index.js",
   "types": "libsane.d.ts",
   "scripts": {
+    "test": "jest",
     "clean": "./build.sh --with-docker --no-build --clean",
     "build": "./build.sh --with-docker --clean",
     "build-debug": "./build.sh --with-docker --debug --emrun"
   },
   "files": [
+    "lib/",
     "build/",
     "libsane.d.ts",
     "LICENSE-LGPL.txt",
@@ -24,5 +26,17 @@
   "bugs": {
     "url": "https://github.com/goncalomb/sane-wasm/issues"
   },
-  "homepage": "https://github.com/goncalomb/sane-wasm#readme"
+  "homepage": "https://github.com/goncalomb/sane-wasm#readme",
+  "jest": {
+    "setupFilesAfterEnv": [
+      "jest-extended/all"
+    ]
+  },
+  "dependencies": {
+    "usb": "^2.10.0"
+  },
+  "devDependencies": {
+    "jest": "^29.6.4",
+    "jest-extended": "^4.0.1"
+  }
 }