sane-wasm 0.5.0 → 0.6.1

package/dist/readers.js

@@ -1,36 +1,20 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScanImageReader = exports.ScanDataReader = void 0;
-const _1 = require(".");
+import { SANEFrame, SANEStatus } from "./index.js";
 class EventBaseClass {
-    constructor() {
-        this._firing = false;
-        this._listeners = {};
-    }
+    _firing = false;
+    _listeners = {};
     /**
      * Add event listener.
      */
     on(type, listener) {
-        var _a;
         if (!this._listeners[type]) {
             this._listeners[type] = [];
         }
-        (_a = this._listeners[type]) === null || _a === void 0 ? void 0 : _a.push(listener);
+        this._listeners[type]?.push(listener);
     }
     /**
      * Fire event.
      */
     fire(type, ...args) {
-        var _a;
         // if already firing an event, queue for later
         if (this._firing) {
             return Promise.resolve().then(() => this.fire(type, ...args));
@@ -38,7 +22,7 @@ class EventBaseClass {
         // fire now
         this._firing = true;
         try {
-            (_a = this._listeners[type]) === null || _a === void 0 ? void 0 : _a.forEach(fn => fn.apply(this, args));
+            this._listeners[type]?.forEach(fn => fn.apply(this, args));
         }
         finally {
             this._firing = false;
@@ -61,121 +45,102 @@ class EventBaseClass {
  *
  * {@link https://sane-project.gitlab.io/standard/1.06/api.html#code-flow}
  */
-class ScanDataReader extends EventBaseClass {
+export class ScanDataReader extends EventBaseClass {
+    _lib;
+    _used = false;
+    _killed = false;
     constructor(lib) {
         super();
-        this._used = false;
-        this._killed = false;
         this._lib = lib;
     }
-    _readPromise(parameters) {
-        return new Promise((resolve, reject) => {
-            const read = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (this._killed) {
-                        yield this._lib.sane_cancel(); // ignore status
-                    }
-                    // reads are non-blocking because of how emscripten works
-                    // this causes sane_read() to immediately return with
-                    // 0 bytes of data, this goes against the SANE spec,
-                    // blocking I/O by default
-                    // the only option right now is to poll the read using
-                    // setTimeout(), this is not ideal
-                    // currently even emscripten's asyncify does not help here,
-                    // but in the future it might help support blocking I/O
-                    // XXX: are we in the future now? can we improve this
-                    // https://github.com/emscripten-core/emscripten/issues/13214
-                    const { status, data } = yield this._lib.sane_read(); // non-blocking
-                    if (status === _1.SANEStatus.GOOD) {
-                        if (parameters && data.length) {
-                            this.fire('data', parameters, data);
-                        }
-                    }
-                    else if (status === _1.SANEStatus.CANCELLED ||
-                        // special case for EOF after sane_cancel, after a successful
-                        // page read (EOF) and subsequent call to sane_cancel we expected a
-                        // CANCELLED status but the test backend never changes from EOF,
-                        // this is different on the pixma backend (it changes to CANCELLED),
-                        // it's unknown what is the correct option, or what happens on other
-                        // backends, handle special case as cancelled for now
-                        // XXX: more research
-                        // https://sane-project.gitlab.io/standard/1.06/api.html#code-flow
-                        (status === _1.SANEStatus.EOF && this._killed)) {
-                        if (this._killed instanceof Error) {
-                            reject(this._killed);
-                            return;
-                        }
-                        resolve();
-                        return;
-                    }
-                    else if (status === _1.SANEStatus.EOF) {
-                        // image finished
-                        this._killed = true;
-                    }
-                    else {
-                        // TODO: handle document feeder / multi-page scans
-                        this._killed = new Error(`Status ${_1.SANEStatus[status]} during sane_read().`);
+    async _readPromise(parameters) {
+        while (true) {
+            try {
+                if (this._killed) {
+                    await this._lib.sane_cancel(); // ignore status
+                }
+                const { status, data } = await this._lib.sane_read();
+                if (status === SANEStatus.GOOD) {
+                    if (parameters && data.length) {
+                        this.fire('data', parameters, data);
                     }
-                    setTimeout(read, data && data.length > 0 ? 10 : 200);
                 }
-                catch (e) {
-                    const ee = e instanceof Error ? e : new Error("Unknown error while scanning.");
-                    if (this._killed) {
-                        // already killed, but sane_read is still going? die
-                        reject(ee);
-                        return;
+                else if (status === SANEStatus.CANCELLED ||
+                    // special case for EOF after sane_cancel, after a successful
+                    // page read (EOF) and subsequent call to sane_cancel we expected a
+                    // CANCELLED status but the test backend never changes from EOF,
+                    // this is different on the pixma backend (it changes to CANCELLED),
+                    // it's unknown what is the correct option, or what happens on other
+                    // backends, handle special case as cancelled for now
+                    // XXX: more research
+                    // https://sane-project.gitlab.io/standard/1.06/api.html#code-flow
+                    (status === SANEStatus.EOF && this._killed)) {
+                    if (this._killed instanceof Error) {
+                        throw this._killed;
                     }
-                    this._killed = ee;
-                    setTimeout(read, 200);
+                    return;
+                }
+                else if (status === SANEStatus.EOF) {
+                    // image finished
+                    this._killed = true;
                 }
-            });
-            setTimeout(read, 200);
-        });
+                else {
+                    // TODO: handle document feeder / multi-page scans
+                    this._killed = new Error(`Status ${SANEStatus[status]} during sane_read().`);
+                }
+            }
+            catch (e) {
+                const ee = e instanceof Error ? e : new Error("Unknown error while scanning.");
+                if (this._killed) {
+                    // already killed, but sane_read is still going? die
+                    throw ee;
+                }
+                this._killed = ee;
+            }
+        }
     }
     /**
      * Start scanning operation.
      */
-    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 } = yield this._lib.sane_get_parameters();
-            if (status !== _1.SANEStatus.GOOD) {
-                this._killed = new Error(`Status ${_1.SANEStatus[status]} during sane_get_parameters().`);
+    async start() {
+        if (this._used) {
+            // readers are single use
+            throw new Error("Scan readers cannot be reused.");
+        }
+        else {
+            const { status } = await this._lib.sane_start();
+            if (status !== SANEStatus.GOOD) {
                 return {
-                    status, parameters,
-                    promise: this._readPromise(parameters),
+                    status,
+                    parameters: null,
+                    promise: Promise.reject(new Error(`Status ${SANEStatus[status]} during sane_start().`)),
                 };
             }
-            try {
-                this.fire('start', parameters);
-            }
-            catch (e) {
-                this._killed = e instanceof Error ? e : new Error("Unknown error while starting the scan.");
-            }
+            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 } = await this._lib.sane_get_parameters();
+        if (status !== SANEStatus.GOOD) {
+            this._killed = new Error(`Status ${SANEStatus[status]} during sane_get_parameters().`);
             return {
                 status, parameters,
-                promise: this._readPromise(parameters).finally(() => {
-                    this.fire('stop', parameters, this._killed instanceof Error ? this._killed : null);
-                }),
+                promise: this._readPromise(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).finally(() => {
+                this.fire('stop', parameters, this._killed instanceof Error ? this._killed : null);
+            }),
+        };
     }
     /**
      * Cancel scanning operation.
@@ -186,7 +151,6 @@ class ScanDataReader extends EventBaseClass {
         }
     }
 }
-exports.ScanDataReader = ScanDataReader;
 /**
  * Image reader that automatically generates RGBA data while reading from
  * SANE's API using {@link ScanDataReader}. It supports the most common scan
@@ -204,18 +168,18 @@ exports.ScanDataReader = ScanDataReader;
  *
  * {@link https://sane-project.gitlab.io/standard/1.06/api.html#code-flow}
  */
-class ScanImageReader extends ScanDataReader {
+export class ScanImageReader extends ScanDataReader {
+    _line = 0;
+    _allData = new Uint8ClampedArray();
+    _remainder = new Uint8ClampedArray();
     constructor(lib) {
         super(lib);
-        this._line = 0;
-        this._allData = new Uint8ClampedArray();
-        this._remainder = new Uint8ClampedArray();
         this.on('start', this._onStart);
         this.on('data', this._onData);
         this.on('stop', this._onStop);
     }
     _onStart(parameters) {
-        if (parameters.format !== _1.SANEFrame.GRAY && parameters.format !== _1.SANEFrame.RGB) {
+        if (parameters.format !== SANEFrame.GRAY && parameters.format !== SANEFrame.RGB) {
             throw new Error(`Invalid format (${JSON.stringify(parameters)}).`);
         }
         if (parameters.depth !== 1 && parameters.depth !== 8) {
@@ -230,7 +194,7 @@ class ScanImageReader extends ScanDataReader {
         if (parameters.bytes_per_line <= 0 || parameters.pixels_per_line <= 0 || parameters.lines <= 0) {
             throw new Error(`Unexpected image size (${JSON.stringify(parameters)}).`);
         }
-        const channels = parameters.format === _1.SANEFrame.GRAY ? 1 : 3;
+        const channels = parameters.format === SANEFrame.GRAY ? 1 : 3;
         const bits = parameters.pixels_per_line * parameters.depth * channels;
         if (parameters.bytes_per_line * 8 < bits) {
             throw new Error(`Unexpected byte count (${JSON.stringify(parameters)}).`);
@@ -254,7 +218,7 @@ class ScanImageReader extends ScanDataReader {
         const dataOut = new Uint8ClampedArray(lc * parameters.pixels_per_line * 4); // RGBA (8-bit)
         let ik = 0; // consumed data on dataIn
         if (parameters.depth === 8) {
-            if (parameters.format === _1.SANEFrame.GRAY) {
+            if (parameters.format === SANEFrame.GRAY) {
                 // 8-bit / 1 channel
                 for (let l = 0, o = 0; l < lc; l++, ik += parameters.bytes_per_line) { // for lines
                     for (let p = 0, i = ik; p < parameters.pixels_per_line; p++, i++, o += 4) { // for pixels
@@ -274,7 +238,7 @@ class ScanImageReader extends ScanDataReader {
             }
         }
         else { // parameters.depth == 1
-            if (parameters.format === _1.SANEFrame.GRAY) {
+            if (parameters.format === SANEFrame.GRAY) {
                 // 1-bit / 1 channel
                 for (let l = 0, o = 0; l < lc; l++, ik += parameters.bytes_per_line) { // for lines
                     for (let p = 0, i = ik; p < parameters.pixels_per_line; i++) { // for in bytes
@@ -315,4 +279,4 @@ class ScanImageReader extends ScanDataReader {
         }
     }
 }
-exports.ScanImageReader = ScanImageReader;
+//# sourceMappingURL=readers.js.map

package/dist/readers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readers.js","sourceRoot":"","sources":["../src/readers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,26 +1,27 @@
 {
   "name": "sane-wasm",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "A project to bring the SANE API to the web.",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "jest",
-    "clean": "npm run clean:ts && npm run clean:sane",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "clean": "npm run clean:sane && npm run clean:ts",
     "clean:ts": "rm -rf dist/ docs/",
     "clean:sane": "./build.sh --no-build --clean",
     "prebuild": "rm -rf dist/ docs/ build/",
-    "build": "npm run build:ts && npm run build:sane",
+    "build": "npm run build:sane && npm run build:ts",
     "build:ts": "tsc && typedoc",
     "postbuild:ts": "rm -rf dist/docs-plugin.*",
     "build:sane": "./build.sh --with-docker --clean",
-    "debug:sane": "./build.sh --with-docker --debug --emrun"
+    "debug": "./build.sh --with-docker --debug --emrun",
+    "emrun": "./build.sh --with-docker --no-build --emrun"
   },
   "files": [
     "dist/",
-    "lib/",
     "build/",
-    "libsane.d.ts",
     "LICENSE-LGPL.txt",
     "LICENSE.txt"
   ],
@@ -34,11 +35,6 @@
     "url": "https://github.com/goncalomb/sane-wasm/issues"
   },
   "homepage": "https://github.com/goncalomb/sane-wasm#readme",
-  "jest": {
-    "setupFilesAfterEnv": [
-      "jest-extended/all"
-    ]
-  },
   "peerDependencies": {
     "usb": "^2.10.0"
   },
@@ -48,9 +44,12 @@
     }
   },
   "devDependencies": {
-    "jest": "^29.6.4",
-    "jest-extended": "^4.0.1",
-    "typedoc": "^0.25.0",
-    "typescript": "^5.2.2"
+    "@types/emscripten": "^1.41.6",
+    "@types/node": "^26.6.4",
+    "jest-extended": "^7.0.0",
+    "typedoc": "^0.28.20",
+    "typescript": "^6.0.3",
+    "usb": "^2.10.0",
+    "vitest": "^5.0.3"
   }
 }

package/build/libsane.worker.js

@@ -1,195 +0,0 @@
-/**
- * @license
- * Copyright 2015 The Emscripten Authors
- * SPDX-License-Identifier: MIT
- */
-
-// Pthread Web Worker startup routine:
-// This is the entry point file that is loaded first by each Web Worker
-// that executes pthreads on the Emscripten application.
-
-'use strict';
-
-var Module = {};
-
-// Node.js support
-var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string';
-if (ENVIRONMENT_IS_NODE) {
-  // Create as web-worker-like an environment as we can.
-
-  var nodeWorkerThreads = require('worker_threads');
-
-  var parentPort = nodeWorkerThreads.parentPort;
-
-  parentPort.on('message', (data) => onmessage({ data: data }));
-
-  var fs = require('fs');
-
-  Object.assign(global, {
-    self: global,
-    require,
-    Module,
-    location: {
-      href: __filename
-    },
-    Worker: nodeWorkerThreads.Worker,
-    importScripts: (f) => (0, eval)(fs.readFileSync(f, 'utf8') + '//# sourceURL=' + f),
-    postMessage: (msg) => parentPort.postMessage(msg),
-    performance: global.performance || { now: Date.now },
-  });
-}
-
-// Thread-local guard variable for one-time init of the JS state
-var initializedJS = false;
-
-function assert(condition, text) {
-  if (!condition) abort('Assertion failed: ' + text);
-}
-
-function threadPrintErr() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  // See https://github.com/emscripten-core/emscripten/issues/14804
-  if (ENVIRONMENT_IS_NODE) {
-    fs.writeSync(2, text + '\n');
-    return;
-  }
-  console.error(text);
-}
-function threadAlert() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  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
-// away. (For now, adding it here increases code size for no benefit.)
-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.
-  // We can just use sync instantiation in the worker.
-  var module = Module['wasmModule'];
-  // We don't need the module anymore; new threads will be spawned from the main thread.
-  Module['wasmModule'] = null;
-  var instance = new WebAssembly.Instance(module, info);
-  // TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193,
-  // the above line no longer optimizes out down to the following line.
-  // When the regression is fixed, we can remove this if/else.
-  return receiveInstance(instance);
-}
-
-// Turn unhandled rejected promises into errors so that the main thread will be
-// notified about them.
-self.onunhandledrejection = (e) => {
-  throw e.reason || e;
-};
-
-function handleMessage(e) {
-  try {
-    if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
-
-    // Until we initialize the runtime, queue up any further incoming messages.
-    let messageQueue = [];
-    self.onmessage = (e) => messageQueue.push(e);
-
-    // And add a callback for when the runtime is initialized.
-    self.startWorker = (instance) => {
-      Module = instance;
-      // Notify the main thread that this thread has loaded.
-      postMessage({ 'cmd': 'loaded' });
-      // Process any messages that were queued before the thread was ready.
-      for (let msg of messageQueue) {
-        handleMessage(msg);
-      }
-      // Restore the real message handler.
-      self.onmessage = handleMessage;
-    };
-
-      // Module and memory were sent from main thread
-      Module['wasmModule'] = e.data.wasmModule;
-
-      // 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] = (...args) => {
-          postMessage({ cmd: 'callHandler', handler, args: args });
-        }
-      }
-
-      Module['wasmMemory'] = e.data.wasmMemory;
-
-      Module['buffer'] = Module['wasmMemory'].buffer;
-
-      Module['workerID'] = e.data.workerID;
-
-      Module['ENVIRONMENT_IS_PTHREAD'] = true;
-
-      if (typeof e.data.urlOrBlob == 'string') {
-        importScripts(e.data.urlOrBlob);
-      } else {
-        var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
-        importScripts(objectUrl);
-        URL.revokeObjectURL(objectUrl);
-      }
-      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, /*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.
-      Module['__emscripten_thread_mailbox_await'](e.data.pthread_ptr);
-
-      assert(e.data.pthread_ptr);
-      // Also call inside JS module to set up the stack frame for this pthread in JS module scope
-      Module['establishStackSpace']();
-      Module['PThread'].receiveObjectTransfer(e.data);
-      Module['PThread'].threadInitTLS();
-
-      if (!initializedJS) {
-        // Embind must initialize itself on all threads, as it generates support JS.
-        // We only do this once per worker since they get reused
-        Module['__embind_initialize_bindings']();
-        initializedJS = true;
-      }
-
-      try {
-        Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
-      } catch(ex) {
-        if (ex != 'unwind') {
-          // The pthread "crashed".  Do not call `_emscripten_thread_exit` (which
-          // would make this thread joinable).  Instead, re-throw the exception
-          // and let the top level handler propagate it back to the main thread.
-          throw ex;
-        }
-      }
-    } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
-      if (Module['_pthread_self']()) {
-        Module['__emscripten_thread_exit'](-1);
-      }
-    } else if (e.data.target === 'setimmediate') {
-      // no-op
-    } else if (e.data.cmd === 'checkMailbox') {
-      if (initializedJS) {
-        Module['checkMailbox']();
-      }
-    } else if (e.data.cmd) {
-      // 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(e.data);
-    }
-  } catch(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']();
-    }
-    throw ex;
-  }
-};
-
-self.onmessage = handleMessage;

package/lib/index.js

@@ -1,7 +0,0 @@
-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');
-}