@areb0s/ocr-common 1.0.3 → 1.0.4

package/build/Ocr.d.ts

@@ -7,6 +7,10 @@ export declare class Ocr {
         detection: Detection;
         recognition: Recognition;
     });
+    /**
+     * Detect text from image
+     * Note: Calls are automatically serialized to prevent "Session already started" error
+     */
     detect(image: string | ImageRawData | BrowserImageInput, options?: {}): Promise<{
         texts: import("./types/index.js").Line[];
         resizedImageWidth: any;

package/build/Ocr.js

@@ -7,11 +7,34 @@ export class Ocr {
     }
     #detection;
     #recognition;
+    #mutex = Promise.resolve();
     constructor({ detection, recognition, }) {
         this.#detection = detection;
         this.#recognition = recognition;
     }
+    /**
+     * Detect text from image
+     * Note: Calls are automatically serialized to prevent "Session already started" error
+     */
     async detect(image, options = {}) {
+        // Queue this call behind any pending operations
+        const currentMutex = this.#mutex;
+        let releaseMutex;
+        this.#mutex = new Promise((resolve) => {
+            releaseMutex = resolve;
+        });
+        try {
+            // Wait for previous operation to complete
+            await currentMutex;
+            // Execute detection
+            return await this.#detectInternal(image, options);
+        }
+        finally {
+            // Release mutex for next operation
+            releaseMutex();
+        }
+    }
+    async #detectInternal(image, options = {}) {
         const { lineImages, resizedImageWidth, resizedImageHeight } = await this.#detection.run(image, options);
         const texts = await this.#recognition.run(lineImages, options);
         return {

package/build/Ocr.js.map

@@ -1 +1 @@
-{"version":3,"file":"Ocr.js","sourceRoot":"","sources":["../src/Ocr.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,OAAO,GAAG;IACd,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAA8B,EAAE;QAClD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACrD,OAAO,IAAI,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,UAAU,CAAW;IACrB,YAAY,CAAa;IAEzB,YAAY,EACV,SAAS,EACT,WAAW,GAIZ;QACC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAgD,EAAE,OAAO,GAAG,EAAE;QACzE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACvG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAC9D,OAAO;YACL,KAAK;YACL,iBAAiB;YACjB,kBAAkB;SACnB,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"Ocr.js","sourceRoot":"","sources":["../src/Ocr.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,OAAO,GAAG;IACd,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAA8B,EAAE;QAClD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACrD,OAAO,IAAI,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,UAAU,CAAW;IACrB,YAAY,CAAa;IACzB,MAAM,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;IAEzC,YAAY,EACV,SAAS,EACT,WAAW,GAIZ;QACC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,KAAgD,EAAE,OAAO,GAAG,EAAE;QACzE,gDAAgD;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAA;QAChC,IAAI,YAAwB,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,YAAY,GAAG,OAAO,CAAA;QACxB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC;YACH,0CAA0C;YAC1C,MAAM,YAAY,CAAA;YAClB,oBAAoB;YACpB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACnD,CAAC;gBAAS,CAAC;YACT,mCAAmC;YACnC,YAAa,EAAE,CAAA;QACjB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAgD,EAAE,OAAO,GAAG,EAAE;QAClF,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACvG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAC9D,OAAO;YACL,KAAK;YACL,iBAAiB;YACjB,kBAAkB;SACnB,CAAA;IACH,CAAC;CACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@areb0s/ocr-common",
   "description": "Fork of @gutenye/ocr-common with ImageBitmap support. Shared OCR library for Browser/Node based on PaddleOCR and ONNX runtime.",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "license": "MIT",
   "repository": {

package/src/Ocr.ts

@@ -1,34 +1,58 @@
-import type { ImageRawData, BrowserImageInput, ModelCreateOptions } from '#common/types'
-import { Detection, Recognition } from './models'
-
-export class Ocr {
-  static async create(options: ModelCreateOptions = {}) {
-    const detection = await Detection.create(options)
-    const recognition = await Recognition.create(options)
-    return new Ocr({ detection, recognition })
-  }
-
-  #detection: Detection
-  #recognition: Recognition
-
-  constructor({
-    detection,
-    recognition,
-  }: {
-    detection: Detection
-    recognition: Recognition
-  }) {
-    this.#detection = detection
-    this.#recognition = recognition
-  }
-
-  async detect(image: string | ImageRawData | BrowserImageInput, options = {}) {
-    const { lineImages, resizedImageWidth, resizedImageHeight } = await this.#detection.run(image, options)
-    const texts = await this.#recognition.run(lineImages, options)
-    return {
-      texts,
-      resizedImageWidth,
-      resizedImageHeight,
-    }
-  }
-}
+import type { ImageRawData, BrowserImageInput, ModelCreateOptions } from '#common/types'
+import { Detection, Recognition } from './models'
+
+export class Ocr {
+  static async create(options: ModelCreateOptions = {}) {
+    const detection = await Detection.create(options)
+    const recognition = await Recognition.create(options)
+    return new Ocr({ detection, recognition })
+  }
+
+  #detection: Detection
+  #recognition: Recognition
+  #mutex: Promise<void> = Promise.resolve()
+
+  constructor({
+    detection,
+    recognition,
+  }: {
+    detection: Detection
+    recognition: Recognition
+  }) {
+    this.#detection = detection
+    this.#recognition = recognition
+  }
+
+  /**
+   * Detect text from image
+   * Note: Calls are automatically serialized to prevent "Session already started" error
+   */
+  async detect(image: string | ImageRawData | BrowserImageInput, options = {}) {
+    // Queue this call behind any pending operations
+    const currentMutex = this.#mutex
+    let releaseMutex: () => void
+    this.#mutex = new Promise((resolve) => {
+      releaseMutex = resolve
+    })
+
+    try {
+      // Wait for previous operation to complete
+      await currentMutex
+      // Execute detection
+      return await this.#detectInternal(image, options)
+    } finally {
+      // Release mutex for next operation
+      releaseMutex!()
+    }
+  }
+
+  async #detectInternal(image: string | ImageRawData | BrowserImageInput, options = {}) {
+    const { lineImages, resizedImageWidth, resizedImageHeight } = await this.#detection.run(image, options)
+    const texts = await this.#recognition.run(lineImages, options)
+    return {
+      texts,
+      resizedImageWidth,
+      resizedImageHeight,
+    }
+  }
+}