sane-wasm 0.1.0 → 0.1.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sane-wasm",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A project to bring the SANE API to the web.",
   "main": "build/libsane.js",
   "types": "libsane.d.ts",
@@ -24,5 +24,8 @@
   "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",
+  "dependencies": {
+    "usb": "^2.10.0"
+  }
 }