sane-wasm 0.3.1 → 0.4.0

package/build/libsane.worker.js

@@ -27,23 +27,15 @@ if (ENVIRONMENT_IS_NODE) {
 
   Object.assign(global, {
     self: global,
-    require: require,
-    Module: Module,
+    require,
+    Module,
     location: {
       href: __filename
     },
     Worker: nodeWorkerThreads.Worker,
-    importScripts: function(f) {
-      (0, eval)(fs.readFileSync(f, 'utf8') + '//# sourceURL=' + f);
-    },
-    postMessage: function(msg) {
-      parentPort.postMessage(msg);
-    },
-    performance: global.performance || {
-      now: function() {
-        return Date.now();
-      }
-    },
+    importScripts: (f) => (0, eval)(fs.readFileSync(f, 'utf8') + '//# sourceURL=' + f),
+    postMessage: (msg) => parentPort.postMessage(msg),
+    performance: global.performance || { now: Date.now },
   });
 }
 
@@ -65,7 +57,7 @@ function threadPrintErr() {
 }
 function threadAlert() {
   var text = Array.prototype.slice.call(arguments).join(' ');
-  postMessage({cmd: 'alert', text: text, threadId: Module['_pthread_self']()});
+  postMessage({cmd: 'alert', text, threadId: Module['_pthread_self']()});
 }
 // We don't need out() for now, but may need to add it if we want to use it
 // here. Or, if this code all moves into the main JS, that problem will go
@@ -73,6 +65,7 @@ function threadAlert() {
 var out = () => { throw 'out() is not defined in worker.js.'; }
 var err = threadPrintErr;
 self.alert = threadAlert;
+var dbg = threadPrintErr;
 
 Module['instantiateWasm'] = (info, receiveInstance) => {
   // Instantiate from the module posted from the main thread.
@@ -90,7 +83,7 @@ Module['instantiateWasm'] = (info, receiveInstance) => {
 // Turn unhandled rejected promises into errors so that the main thread will be
 // notified about them.
 self.onunhandledrejection = (e) => {
-  throw e.reason ?? e;
+  throw e.reason || e;
 };
 
 function handleMessage(e) {
@@ -120,8 +113,8 @@ function handleMessage(e) {
       // Use `const` here to ensure that the variable is scoped only to
       // that iteration, allowing safe reference from a closure.
       for (const handler of e.data.handlers) {
-        Module[handler] = function() {
-          postMessage({ cmd: 'callHandler', handler, args: [...arguments] });
+        Module[handler] = (...args) => {
+          postMessage({ cmd: 'callHandler', handler, args: args });
         }
       }
 
@@ -143,7 +136,7 @@ function handleMessage(e) {
       LibSANE(Module);
     } else if (e.data.cmd === 'run') {
       // Pass the thread address to wasm to store it for fast access.
-      Module['__emscripten_thread_init'](e.data.pthread_ptr, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0, /*canBlock=*/1);
+      Module['__emscripten_thread_init'](e.data.pthread_ptr, /*is_main=*/0, /*is_runtime=*/0, /*can_block=*/1);
 
       // Await mailbox notifications with `Atomics.waitAsync` so we can start
       // using the fast `Atomics.notify` notification path.
@@ -186,11 +179,11 @@ function handleMessage(e) {
       // The received message looks like something that should be handled by this message
       // handler, (since there is a e.data.cmd field present), but is not one of the
       // recognized commands:
-      err('worker.js received unknown command ' + e.data.cmd);
+      err(`worker.js received unknown command ${e.data.cmd}`);
       err(e.data);
     }
   } catch(ex) {
-    err('worker.js onmessage() captured an uncaught exception: ' + ex);
+    err(`worker.js onmessage() captured an uncaught exception: ${ex}`);
     if (ex && ex.stack) err(ex.stack);
     if (Module['__emscripten_thread_crashed']) {
       Module['__emscripten_thread_crashed']();
@@ -200,5 +193,3 @@ function handleMessage(e) {
 };
 
 self.onmessage = handleMessage;
-
-

package/dist/index.d.ts

@@ -371,9 +371,9 @@ export interface LibSANE {
      * Equivalent to the SANE API C function `sane_start`.
      * @see {@link https://sane-project.gitlab.io/standard/1.06/api.html#sane-start}
      */
-    sane_start: () => {
+    sane_start: () => Promise<{
         status: SANEStatus;
-    };
+    }>;
     /**
      * Equivalent to the SANE API C function `sane_read`.
      * @see {@link https://sane-project.gitlab.io/standard/1.06/api.html#sane-read}

package/dist/readers.d.ts

@@ -52,7 +52,7 @@ export declare class ScanDataReader<T extends ScanDataReaderEventMap = ScanDataR
     /**
      * Start scanning operation.
      */
-    start(): {
+    start(): Promise<{
         status: SANEStatus.UNSUPPORTED | SANEStatus.CANCELLED | SANEStatus.DEVICE_BUSY | SANEStatus.INVAL | SANEStatus.EOF | SANEStatus.JAMMED | SANEStatus.NO_DOCS | SANEStatus.COVER_OPEN | SANEStatus.IO_ERROR | SANEStatus.NO_MEM | SANEStatus.ACCESS_DENIED;
         parameters: null;
         promise: Promise<void>;
@@ -60,7 +60,7 @@ export declare class ScanDataReader<T extends ScanDataReaderEventMap = ScanDataR
         status: SANEStatus.GOOD;
         parameters: SANEParameters;
         promise: Promise<void>;
-    };
+    }>;
     /**
      * Cancel scanning operation.
      */

package/dist/readers.js

@@ -136,48 +136,46 @@ class ScanDataReader extends EventBaseClass {
      * Start scanning operation.
      */
     start() {
-        if (this._used) {
-            // readers are single use
-            return {
-                status: _1.SANEStatus.INVAL,
-                parameters: null,
-                promise: Promise.reject(new Error("Scan readers cannot be reused.")),
-            };
-        }
-        else {
-            const { status } = this._lib.sane_start();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._used) {
+                // readers are single use
+                throw new Error("Scan readers cannot be reused.");
+            }
+            else {
+                const { status } = yield this._lib.sane_start();
+                if (status !== _1.SANEStatus.GOOD) {
+                    return {
+                        status,
+                        parameters: null,
+                        promise: Promise.reject(new Error(`Status ${_1.SANEStatus[status]} during sane_start().`)),
+                    };
+                }
+                this._used = true;
+            }
+            // after successful start, sane_cancel needs to be called and we need
+            // to wait for sane_read, so subsequent fails need to use this._killed
+            // and run the read loop
+            const { status, parameters } = this._lib.sane_get_parameters();
             if (status !== _1.SANEStatus.GOOD) {
+                this._killed = new Error(`Status ${_1.SANEStatus[status]} during sane_get_parameters().`);
                 return {
-                    status,
-                    parameters: null,
-                    promise: Promise.reject(new Error(`Status ${_1.SANEStatus[status]} during sane_start().`)),
+                    status, parameters,
+                    promise: this._readPromise(parameters),
                 };
             }
-            this._used = true;
-        }
-        // after successful start, sane_cancel needs to be called and we need
-        // to wait for sane_read, so subsequent fails need to use this._killed
-        // and run the read loop
-        const { status, parameters } = this._lib.sane_get_parameters();
-        if (status !== _1.SANEStatus.GOOD) {
-            this._killed = new Error(`Status ${_1.SANEStatus[status]} during sane_get_parameters().`);
+            try {
+                this.fire('start', parameters);
+            }
+            catch (e) {
+                this._killed = e instanceof Error ? e : new Error("Unknown error while starting the scan.");
+            }
             return {
                 status, parameters,
-                promise: this._readPromise(parameters),
+                promise: this._readPromise(parameters).finally(() => {
+                    this.fire('stop', parameters, this._killed instanceof Error ? this._killed : null);
+                }),
             };
-        }
-        try {
-            this.fire('start', parameters);
-        }
-        catch (e) {
-            this._killed = e instanceof Error ? e : new Error("Unknown error while starting the scan.");
-        }
-        return {
-            status, parameters,
-            promise: this._readPromise(parameters).finally(() => {
-                this.fire('stop', parameters, this._killed instanceof Error ? this._killed : null);
-            }),
-        };
+        });
     }
     /**
      * Cancel scanning operation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sane-wasm",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "A project to bring the SANE API to the web.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",