idmission-web-sdk 2.2.30 → 2.2.32

package/dist/sdk2.umd.development.js

@@ -211,7 +211,7 @@
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
 
-  var webSdkVersion = '2.2.30';
+  var webSdkVersion = '2.2.32';
 
   function getPlatform() {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -8858,30 +8858,29 @@
       mobile: 0.3
     }
   };
-  var models = {};
+  var classifier = null;
+  var classifierSettings = null;
   function loadFocusModel() {
     return __awaiter(this, arguments, void 0, function (modelAssetPath) {
-      var id, _a, _b, _c, _d;
+      var _a, _b;
       if (modelAssetPath === void 0) {
         modelAssetPath = defaultFocusModelPath;
       }
-      return __generator(this, function (_e) {
-        switch (_e.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
-            id = "".concat(modelAssetPath);
-            if (models[id]) return [2 /*return*/, models[id]];
+            if (classifier && (classifierSettings === null || classifierSettings === void 0 ? void 0 : classifierSettings.modelAssetPath) === modelAssetPath) return [2 /*return*/, classifier];
+            closeFocusModel();
             return [4 /*yield*/, preloadFocusModelDependencies()];
           case 1:
-            _e.sent();
+            _c.sent();
             if (modelCapabilities.delegate === 'NONE') {
               throw new Error('No available delegate for focus detector.');
             }
-            _a = models;
-            _b = id;
-            _d = (_c = Ua).createFromOptions;
+            _b = (_a = Ua).createFromOptions;
             return [4 /*yield*/, ao.forVisionTasks(visionTasksBasePath)];
           case 2:
-            return [4 /*yield*/, _d.apply(_c, [_e.sent(), {
+            return [4 /*yield*/, _b.apply(_a, [_c.sent(), {
               baseOptions: {
                 modelAssetPath: modelAssetPath,
                 delegate: modelCapabilities.delegate
@@ -8890,20 +8889,19 @@
               runningMode: 'VIDEO'
             }])];
           case 3:
-            _a[_b] = _e.sent();
-            return [2 /*return*/, models[id]];
+            classifier = _c.sent();
+            classifierSettings = {
+              modelAssetPath: modelAssetPath
+            };
+            return [2 /*return*/, classifier];
         }
       });
     });
   }
-  function closeFocusModel(modelAssetPath) {
-    if (modelAssetPath === void 0) {
-      modelAssetPath = defaultFocusModelPath;
-    }
-    var id = "".concat(modelAssetPath);
-    if (!models[id]) return;
-    models[id].close();
-    delete models[id];
+  function closeFocusModel() {
+    classifier === null || classifier === void 0 ? void 0 : classifier.close();
+    classifier = null;
+    classifierSettings = null;
   }
   function useLoadFocusModel(_a) {
     var _b = _a.modelPath,
@@ -8911,7 +8909,6 @@
       _c = _a.modelLoadTimeoutMs,
       modelLoadTimeoutMs = _c === void 0 ? defaultFocusModelLoadTimeoutMs : _c,
       onModelError = _a.onModelError;
-    var model = React.useRef(null);
     var _d = React.useState(false),
       ready = _d[0],
       setReady = _d[1];
@@ -8937,7 +8934,6 @@
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                model.current = loadedModel;
                 setModelDownloadProgress(100);
                 clearTimeout(modelLoadTimeout);
                 return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -8957,9 +8953,8 @@
         clearTimeout(modelLoadTimeout);
       });
       return function () {
-        log('unloading focus model', model.current);
-        model.current = null;
-        closeFocusModel(modelPath);
+        log('unloading focus model');
+        closeFocusModel();
         clearTimeout(modelLoadTimeout);
         document.removeEventListener('idmission.preloadProgress.focus', handleDownloadProgress);
       };
@@ -8968,7 +8963,6 @@
       modelError && (onModelError === null || onModelError === void 0 ? void 0 : onModelError(modelError));
     }, [modelError, onModelError]);
     return {
-      model: model,
       ready: ready,
       modelDownloadProgress: modelDownloadProgress,
       modelError: modelError
@@ -8980,11 +8974,12 @@
     lastFocusPredictionTime = time - lastFocusPredictionAt;
     lastFocusPredictionAt = time;
   }
-  function makeFocusModelPrediction(model, imageData, cropCanvas, rotateCanvas, box) {
+  function makeFocusModelPrediction(imageData, cropCanvas, rotateCanvas, box) {
     var _a, _b, _c, _d, _e;
+    if (!classifier) return null;
     var startedAt = new Date();
     var image = cropIfNecessary(imageData, cropCanvas, rotateCanvas, box);
-    var result = model.classifyForVideo(image, performance.now());
+    var result = classifier.classifyForVideo(image, performance.now());
     var score = (_e = (_d = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.classifications) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.categories) === null || _c === void 0 ? void 0 : _c.find(function (c) {
       return c.categoryName === 'focused';
     })) === null || _d === void 0 ? void 0 : _d.score) !== null && _e !== void 0 ? _e : 0;
@@ -9013,30 +9008,29 @@
   }
 
   var defaultSelfieCaptureModelLoadTimeoutMs = 45000;
-  var detectors$1 = {};
+  var detector$1 = null;
+  var detectorSettings$1 = null;
   function loadFaceDetector() {
     return __awaiter(this, arguments, void 0, function (modelAssetPath) {
-      var id, _a, _b, _c, _d;
+      var _a, _b;
       if (modelAssetPath === void 0) {
         modelAssetPath = defaultFaceDetectorModelPath;
       }
-      return __generator(this, function (_e) {
-        switch (_e.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
-            id = "".concat(modelAssetPath);
-            if (detectors$1[id]) return [2 /*return*/, detectors$1[id]];
+            if (detector$1 && (detectorSettings$1 === null || detectorSettings$1 === void 0 ? void 0 : detectorSettings$1.modelAssetPath) === modelAssetPath) return [2 /*return*/, detector$1];
+            closeFaceDetector();
             return [4 /*yield*/, preloadFaceDetectorDependencies()];
           case 1:
-            _e.sent();
+            _c.sent();
             if (modelCapabilities.delegate === 'NONE') {
               throw new Error('No available delegate for face detector.');
             }
-            _a = detectors$1;
-            _b = id;
-            _d = (_c = ya).createFromOptions;
+            _b = (_a = ya).createFromOptions;
             return [4 /*yield*/, ao.forVisionTasks(visionTasksBasePath)];
           case 2:
-            return [4 /*yield*/, _d.apply(_c, [_e.sent(), {
+            return [4 /*yield*/, _b.apply(_a, [_c.sent(), {
               // canvas: document.createElement('canvas'),
               baseOptions: {
                 modelAssetPath: modelAssetPath,
@@ -9045,26 +9039,24 @@
               runningMode: 'VIDEO'
             }])];
           case 3:
-            _a[_b] = _e.sent();
-            return [2 /*return*/, detectors$1[id]];
+            detector$1 = _c.sent();
+            detectorSettings$1 = {
+              modelAssetPath: modelAssetPath
+            };
+            return [2 /*return*/, detector$1];
         }
       });
     });
   }
-  function closeFaceDetector(modelAssetPath) {
-    if (modelAssetPath === void 0) {
-      modelAssetPath = defaultFaceDetectorModelPath;
-    }
-    var id = "".concat(modelAssetPath);
-    if (!detectors$1[id]) return;
-    detectors$1[id].close();
-    delete detectors$1[id];
+  function closeFaceDetector() {
+    detector$1 === null || detector$1 === void 0 ? void 0 : detector$1.close();
+    detector$1 = null;
+    detectorSettings$1 = null;
   }
   function useLoadFaceDetector(_a) {
     var onModelError = _a.onModelError,
       _b = _a.modelLoadTimeoutMs,
       modelLoadTimeoutMs = _b === void 0 ? defaultSelfieCaptureModelLoadTimeoutMs : _b;
-    var detector = React.useRef(null);
     var _c = React.useState(false),
       ready = _c[0],
       setReady = _c[1];
@@ -9090,7 +9082,6 @@
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                detector.current = model;
                 setModelDownloadProgress(100);
                 clearTimeout(modelLoadTimeout);
                 return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -9108,8 +9099,7 @@
         clearTimeout(modelLoadTimeout);
       });
       return function () {
-        log('unloading face detection model', detector.current);
-        detector.current = null;
+        log('unloading face detection model');
         closeFaceDetector();
         clearTimeout(modelLoadTimeout);
         document.removeEventListener('idmission.preloadProgress.faceDetection', handleDownloadProgress);
@@ -9119,7 +9109,6 @@
       modelError && (onModelError === null || onModelError === void 0 ? void 0 : onModelError(modelError));
     }, [modelError, onModelError]);
     return {
-      detector: detector,
       ready: ready,
       modelDownloadProgress: modelDownloadProgress,
       modelError: modelError
@@ -9158,8 +9147,9 @@
       if (lastNPairs$1.length > framesNeeded - 1) lastNPairs$1.length = framesNeeded - 1;
     }
   }
-  function makeFaceDetectorPrediction(model, imageData) {
-    var prediction = model.detectForVideo(imageData, performance.now());
+  function makeFaceDetectorPrediction(imageData) {
+    if (!detector$1) return null;
+    var prediction = detector$1.detectForVideo(imageData, performance.now());
     var faces = prediction.detections.map(function (d) {
       return {
         box: convertBoundingBox(d.boundingBox),
@@ -9295,11 +9285,10 @@
   };
   function preloadDependency(url) {
     return __awaiter(this, void 0, void 0, function () {
-      var xhr;
       return __generator(this, function (_a) {
-        xhr = new XMLHttpRequest();
-        return [2 /*return*/, new Promise(function (resolve) {
-          xhr.addEventListener('progress', function (event) {
+        return [2 /*return*/, new Promise(function (resolve, reject) {
+          var req = new XMLHttpRequest();
+          req.addEventListener('progress', function (event) {
             if (!event.lengthComputable) return;
             progressByUrl[url] = event;
             document.dispatchEvent(new CustomEvent('idmission.preloadProgress', {
@@ -9310,11 +9299,12 @@
               }
             }));
           });
-          xhr.addEventListener('loadend', function () {
-            resolve(xhr.readyState === 4 && xhr.status === 200);
+          req.addEventListener('loadend', function () {
+            resolve(req.readyState === 4 && req.status === 200);
           });
-          xhr.open('GET', url, true);
-          xhr.send();
+          req.addEventListener('error', reject);
+          req.open('GET', url, true);
+          req.send();
         })];
       });
     });
@@ -9337,8 +9327,11 @@
         switch (_a.label) {
           case 0:
             if (documentDetectorPreloading) return [2 /*return*/, new Promise(function (resolve) {
-              setInterval(function () {
-                if (!documentDetectorPreloading) resolve();
+              var i = setInterval(function () {
+                if (!documentDetectorPreloading) {
+                  clearInterval(i);
+                  resolve();
+                }
               }, 100);
             })];
             documentDetectorPreloading = true;
@@ -9382,8 +9375,11 @@
         switch (_a.label) {
           case 0:
             if (focusModelPreloading) return [2 /*return*/, new Promise(function (resolve) {
-              setInterval(function () {
-                if (!focusModelPreloading) resolve();
+              var i = setInterval(function () {
+                if (!focusModelPreloading) {
+                  clearInterval(i);
+                  resolve();
+                }
               }, 100);
             })];
             focusModelPreloading = true;
@@ -9427,8 +9423,11 @@
         switch (_a.label) {
           case 0:
             if (faceDetectorPreloading) return [2 /*return*/, new Promise(function (resolve) {
-              setInterval(function () {
-                if (!faceDetectorPreloading) resolve();
+              var i = setInterval(function () {
+                if (!faceDetectorPreloading) {
+                  clearInterval(i);
+                  resolve();
+                }
               }, 100);
             })];
             faceDetectorPreloading = true;
@@ -9491,33 +9490,32 @@
     passport: 'Passport',
     none: 'None'
   };
-  var detectors = {};
+  var detector = null;
+  var detectorSettings = null;
   function loadDocumentDetector() {
     return __awaiter(this, arguments, void 0, function (modelAssetPath, scoreThreshold) {
-      var id, _a, _b, _c, _d;
+      var _a, _b;
       if (modelAssetPath === void 0) {
         modelAssetPath = defaultDocumentDetectorModelPath;
       }
       if (scoreThreshold === void 0) {
         scoreThreshold = defaultDocumentDetectionScoreThreshold;
       }
-      return __generator(this, function (_e) {
-        switch (_e.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
-            id = "".concat(modelAssetPath, ":").concat(scoreThreshold);
-            if (detectors[id]) return [2 /*return*/, detectors[id]];
+            if (detector && (detectorSettings === null || detectorSettings === void 0 ? void 0 : detectorSettings.modelAssetPath) === modelAssetPath && (detectorSettings === null || detectorSettings === void 0 ? void 0 : detectorSettings.scoreThreshold) === scoreThreshold) return [2 /*return*/, detector];
+            closeDocumentDetector();
             return [4 /*yield*/, preloadDocumentDetectorDependencies()];
           case 1:
-            _e.sent();
+            _c.sent();
             if (modelCapabilities.delegate === 'NONE') {
               throw new Error('No available delegate for document detector.');
             }
-            _a = detectors;
-            _b = id;
-            _d = (_c = lh).createFromOptions;
+            _b = (_a = lh).createFromOptions;
             return [4 /*yield*/, ao.forVisionTasks(visionTasksBasePath)];
           case 2:
-            return [4 /*yield*/, _d.apply(_c, [_e.sent(), {
+            return [4 /*yield*/, _b.apply(_a, [_c.sent(), {
               baseOptions: {
                 modelAssetPath: modelAssetPath,
                 delegate: modelCapabilities.delegate
@@ -9527,23 +9525,20 @@
               runningMode: 'VIDEO'
             }])];
           case 3:
-            _a[_b] = _e.sent();
-            return [2 /*return*/, detectors[id]];
+            detector = _c.sent();
+            detectorSettings = {
+              modelAssetPath: modelAssetPath,
+              scoreThreshold: scoreThreshold
+            };
+            return [2 /*return*/, detector];
         }
       });
     });
   }
-  function closeDocumentDetector(modelAssetPath, scoreThreshold) {
-    if (modelAssetPath === void 0) {
-      modelAssetPath = defaultDocumentDetectorModelPath;
-    }
-    if (scoreThreshold === void 0) {
-      scoreThreshold = defaultDocumentDetectionScoreThreshold;
-    }
-    var id = "".concat(modelAssetPath, ":").concat(scoreThreshold);
-    if (!detectors[id]) return;
-    detectors[id].close();
-    delete detectors[id];
+  function closeDocumentDetector() {
+    detector === null || detector === void 0 ? void 0 : detector.close();
+    detector = null;
+    detectorSettings = null;
   }
   function useLoadDocumentDetector(_a) {
     var _b = _a.modelPath,
@@ -9553,7 +9548,6 @@
       _d = _a.scoreThreshold,
       scoreThreshold = _d === void 0 ? defaultDocumentDetectionScoreThreshold : _d,
       onModelError = _a.onModelError;
-    var detector = React.useRef(null);
     var _e = React.useState(false),
       ready = _e[0],
       setReady = _e[1];
@@ -9579,7 +9573,6 @@
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                detector.current = model;
                 setModelDownloadProgress(100);
                 clearTimeout(modelLoadTimeout);
                 return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -9600,8 +9593,7 @@
       });
       return function () {
         log('unloading document detection model');
-        detector.current = null;
-        closeDocumentDetector(modelPath, scoreThreshold);
+        closeDocumentDetector();
         clearTimeout(modelLoadTimeout);
         document.removeEventListener('idmission.preloadProgress.documentDetection', handleDownloadProgress);
       };
@@ -9610,17 +9602,17 @@
       modelError && (onModelError === null || onModelError === void 0 ? void 0 : onModelError(modelError));
     }, [modelError, onModelError]);
     return {
-      detector: detector,
       ready: ready,
       modelDownloadProgress: modelDownloadProgress,
       modelError: modelError,
       setModelError: setModelError
     };
   }
-  function makeDocumentDetectorPrediction(detector, frame) {
+  function makeDocumentDetectorPrediction(frame) {
     return __awaiter(this, void 0, void 0, function () {
       var startedAt, prediction, time, frameWidth, frameHeight;
       return __generator(this, function (_a) {
+        if (!detector) return [2 /*return*/, null];
         startedAt = new Date();
         // Detectors can throw errors, for example when using custom URLs that
         // contain a model that doesn't provide the expected output.
@@ -9944,7 +9936,6 @@
         scoreThreshold: documentDetectionModelScoreThreshold,
         onModelError: onDocumentDetectionModelError
       }),
-      detector = _o.detector,
       ready = _o.ready,
       modelDownloadProgress = _o.modelDownloadProgress,
       modelError = _o.modelError,
@@ -9956,7 +9947,7 @@
           return __generator(this, function (_b) {
             switch (_b.label) {
               case 0:
-                if (!videoLoaded || !cameraReady || !ready || !videoRef.current || !detector.current || !lastPredictionCanvas.current) return [2 /*return*/];
+                if (!videoLoaded || !cameraReady || !ready || !videoRef.current || !lastPredictionCanvas.current) return [2 /*return*/];
                 stopDetectionAtStart = stopDetection.current;
                 vw = videoRef.current.videoWidth;
                 vh = videoRef.current.videoHeight;
@@ -9966,7 +9957,7 @@
                 if (!(ctx && videoRef.current.readyState === 4)) return [3 /*break*/, 3];
                 if (stopDetectionAtStart !== stopDetection.current) return [2 /*return*/];
                 ctx.drawImage(videoRef.current, 0, 0, vw, vh);
-                return [4 /*yield*/, makeDocumentDetectorPrediction(detector.current, lastPredictionCanvas.current)];
+                return [4 /*yield*/, makeDocumentDetectorPrediction(lastPredictionCanvas.current)];
               case 1:
                 prediction = _b.sent();
                 if (!prediction) return [3 /*break*/, 3];
@@ -9988,7 +9979,7 @@
             }
           });
         });
-      }, [cameraReady, delayAfterStartMs, detector, documentDetectionBoundaries, documentDetectionThresholds, ready, videoLoaded, videoRef]), {
+      }, [cameraReady, delayAfterStartMs, documentDetectionBoundaries, documentDetectionThresholds, ready, videoLoaded, videoRef]), {
         throttleMs: throttleMs,
         autoStart: autoStart
       }),
@@ -10065,16 +10056,16 @@
         modelLoadTimeoutMs: focusModelLoadTimeoutMs,
         onModelError: onFocusModelError
       }),
-      model = _f.model,
       ready = _f.ready,
       modelDownloadProgress = _f.modelDownloadProgress,
       modelError = _f.modelError;
     var makeFocusPrediction = React.useCallback(function (imageData, box) {
-      if (!model.current) return null;
-      var prediction = makeFocusModelPrediction(model.current, imageData, cropCanvas.current, rotateCanvas.current, box);
+      if (!ready) return null;
+      var prediction = makeFocusModelPrediction(imageData, cropCanvas.current, rotateCanvas.current, box);
+      if (!prediction) return null;
       setLastFocusPredictionAt(prediction.predictionTime);
       return prediction;
-    }, [model]);
+    }, [ready]);
     var value = React.useMemo(function () {
       return {
         focusModelReady: ready,
@@ -18170,18 +18161,17 @@
         onModelError: onModelError,
         modelLoadTimeoutMs: modelLoadTimeoutMs
       }),
-      detector = _f.detector,
       ready = _f.ready,
       modelDownloadProgress = _f.modelDownloadProgress,
       modelError = _f.modelError;
     var _g = useFrameLoop(React.useCallback(function () {
         return __awaiter(_this, void 0, void 0, function () {
-          var vw, vh, ctx, faces, processed, e_1;
-          var _a;
-          return __generator(this, function (_b) {
-            switch (_b.label) {
+          var vw, vh, ctx, prediction, processed, e_1;
+          var _a, _b;
+          return __generator(this, function (_c) {
+            switch (_c.label) {
               case 0:
-                if (!videoLoaded || !cameraReady || !ready || modelError || !videoRef.current || !detector.current || !canvasRef.current) return [2 /*return*/];
+                if (!videoLoaded || !cameraReady || !ready || modelError || !videoRef.current || !canvasRef.current) return [2 /*return*/];
                 vw = videoRef.current.videoWidth;
                 vh = videoRef.current.videoHeight;
                 ctx = canvasRef.current.getContext('2d');
@@ -18191,23 +18181,23 @@
                 ctx.translate(vw, 0);
                 ctx.scale(-1, 1);
                 ctx.drawImage(videoRef.current, 0, 0, vw, vh);
-                _b.label = 1;
+                _c.label = 1;
               case 1:
-                _b.trys.push([1, 3,, 4]);
-                faces = makeFaceDetectorPrediction(detector.current, canvasRef.current).faces;
+                _c.trys.push([1, 3,, 4]);
+                prediction = makeFaceDetectorPrediction(canvasRef.current);
                 processed = processFaceDetectorPrediction({
-                  faces: faces,
+                  faces: (_a = prediction === null || prediction === void 0 ? void 0 : prediction.faces) !== null && _a !== void 0 ? _a : [],
                   videoWidth: vw,
                   videoHeight: vh,
                   requireVerticalFaceCentering: requireVerticalFaceCentering
                 });
                 setLastFaceDetectionAt(new Date().getTime());
-                return [4 /*yield*/, (_a = onPredictionHandler.current) === null || _a === void 0 ? void 0 : _a.call(onPredictionHandler, processed)];
+                return [4 /*yield*/, (_b = onPredictionHandler.current) === null || _b === void 0 ? void 0 : _b.call(onPredictionHandler, processed)];
               case 2:
-                _b.sent();
+                _c.sent();
                 return [3 /*break*/, 4];
               case 3:
-                e_1 = _b.sent();
+                e_1 = _c.sent();
                 error('caught face detection error', e_1);
                 return [3 /*break*/, 4];
               case 4:
@@ -18215,7 +18205,7 @@
             }
           });
         });
-      }, [cameraReady, detector, modelError, ready, requireVerticalFaceCentering, videoLoaded, videoRef]), {
+      }, [cameraReady, modelError, ready, requireVerticalFaceCentering, videoLoaded, videoRef]), {
         throttleMs: throttleMs,
         autoStart: autoStart
       }),