Upgrade tesseract.js-utils

package-lock.json

@@ -6505,22 +6505,24 @@
       "integrity": "sha512-lTkQYGwENaNLvLODYyfcKgRUrIARWs4aH9Tkrf5kGybw7Lzn+AvieEqD1t90CT2CtAOXmFynxt/0NSwOhZNpRw=="
     },
     "tesseract.js-utils": {
-      "version": "1.0.0-beta.2",
+      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/tesseract.js-utils/-/tesseract.js-utils-1.0.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/tesseract.js-utils/-/tesseract.js-utils-1.0.0-beta.3.tgz",
-      "integrity": "sha512-FdmHJ8A2zOreqdixhg15aqv/pS6h9s7Xo1YAIydsC7mngBGc+Aw+NFnlqmFlNmrZbLmEAy0ZZR1/RlvRltwdMw==",
+      "integrity": "sha512-Ka8pyGU7HvzRYlalhGJDxBmpRHUMvXyNvbmwjEKUjrhOKwxOqX83TDgwKZyQBWUDw2+4DrVd5wNH/FM1ufBXOg==",
       "requires": {
         "bmp-js": "^0.1.0",
         "file-type": "^10.5.0",
         "idb-keyval": "^3.1.0",
+        "is-url": "^1.2.4",
         "node-fetch": "^2.3.0",
+        "resolve-url": "^0.2.1",
         "whatwg-fetch": "^3.0.0",
         "zlibjs": "^0.3.1"
       },
       "dependencies": {
-        "node-fetch": {
+        "is-url": {
-          "version": "2.3.0",
+          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-          "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
+          "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
         }
       }
     },

package.json

@@ -38,7 +38,7 @@
     "node-fetch": "^2.3.0",
     "resolve-url": "^0.2.1",
     "tesseract.js-core": "^2.0.0-beta.5",
-    "tesseract.js-utils": "^1.0.0-beta.2"
+    "tesseract.js-utils": "^1.0.0-beta.3"
   },
   "repository": {
     "type": "git",

src/common/worker.js

@@ -41,21 +41,9 @@ const handleInit = ({ corePath }, res) => {
   return Promise.resolve();
 };
 
-const loadLanguage = ({
+const loadLanguage = ({ lang, options }, res) => {
-  lang,
-  options: {
-    langPath, cachePath, cacheMethod, dataPath,
-  },
-}, res) => {
   res.progress({ status: 'loading language traineddata', progress: 0 });
-  return loadLang({
+  return loadLang({ lang, TessModule, ...options }).then((...args) => {
-    langs: lang,
-    tessModule: TessModule,
-    langURI: langPath,
-    cachePath,
-    cacheMethod,
-    dataPath,
-  }).then((...args) => {
     res.progress({ status: 'loaded language traineddata', progress: 1 });
     return args;
   });

tests/recognize.test.js

@@ -23,9 +23,8 @@ before(function cb(done) {
   this.timeout(30000);
   const load = () => (
     loadLang({
-      langs: 'eng+chi_tra',
+      lang: 'eng+chi_tra',
       cacheMethod: 'write',
-      langURI: loadLangOptions.langPath,
       ...loadLangOptions,
     }).then(() => {
       done();
@@ -92,7 +91,7 @@ describe('recognize()', () => {
           worker.terminate();
           done();
         });
-      }).timeout(30000)
+      }).timeout(60000)
     ));
   });
 
@@ -136,7 +135,7 @@ describe('recognize()', () => {
             worker.terminate();
             done();
           });
-      }).timeout(20000)
+      }).timeout(60000)
     ));
   });
 });