sane-wasm 0.3.2 → 0.5.0

package/build/libsane.js

@@ -137,8 +137,8 @@ Module["ready"] = new Promise((resolve, reject) => {
   sane_control_option_get_value: true,
   sane_control_option_set_value: true,
   sane_control_option_set_auto: true,
-  sane_get_parameters: false,
-  sane_start: false,
+  sane_get_parameters: true,
+  sane_start: true,
   sane_read: true,
   sane_cancel: true,
   sane_strstatus: false

package/dist/index.d.ts

@@ -360,20 +360,20 @@ export interface LibSANE {
      * Equivalent to the SANE API C function `sane_get_parameters`.
      * @see {@link https://sane-project.gitlab.io/standard/1.06/api.html#sane-get-parameters}
      */
-    sane_get_parameters: () => {
+    sane_get_parameters: () => Promise<{
         status: SANEStatus.GOOD;
         parameters: SANEParameters;
     } | {
         status: Exclude<SANEStatus, SANEStatus.GOOD>;
         parameters: null;
-    };
+    }>;
     /**
      * 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 } = yield 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.2",
+  "version": "0.5.0",
   "description": "A project to bring the SANE API to the web.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",