idmission-web-sdk 2.2.30 → 2.2.32

package/dist/sdk2.esm.js

@@ -201,7 +201,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   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
@@ -2783,30 +2783,29 @@ var defaultFocusThresholds = {
     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 = ImageClassifier).createFromOptions;
+          _b = (_a = ImageClassifier).createFromOptions;
           return [4 /*yield*/, FilesetResolver.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
@@ -2815,20 +2814,19 @@ function loadFocusModel() {
             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,
@@ -2836,7 +2834,6 @@ function useLoadFocusModel(_a) {
     _c = _a.modelLoadTimeoutMs,
     modelLoadTimeoutMs = _c === void 0 ? defaultFocusModelLoadTimeoutMs : _c,
     onModelError = _a.onModelError;
-  var model = useRef(null);
   var _d = useState(false),
     ready = _d[0],
     setReady = _d[1];
@@ -2862,7 +2859,6 @@ function useLoadFocusModel(_a) {
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              model.current = loadedModel;
               setModelDownloadProgress(100);
               clearTimeout(modelLoadTimeout);
               return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -2882,9 +2878,8 @@ function useLoadFocusModel(_a) {
       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);
     };
@@ -2893,7 +2888,6 @@ function useLoadFocusModel(_a) {
     modelError && (onModelError === null || onModelError === void 0 ? void 0 : onModelError(modelError));
   }, [modelError, onModelError]);
   return {
-    model: model,
     ready: ready,
     modelDownloadProgress: modelDownloadProgress,
     modelError: modelError
@@ -2905,11 +2899,12 @@ function setLastFocusPredictionAt(time) {
   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;
@@ -2938,30 +2933,29 @@ function cropIfNecessary(imageData, cropCanvas, rotateCanvas, box) {
 }
 
 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 = FaceDetector).createFromOptions;
+          _b = (_a = FaceDetector).createFromOptions;
           return [4 /*yield*/, FilesetResolver.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,
@@ -2970,26 +2964,24 @@ function loadFaceDetector() {
             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 = useRef(null);
   var _c = useState(false),
     ready = _c[0],
     setReady = _c[1];
@@ -3015,7 +3007,6 @@ function useLoadFaceDetector(_a) {
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              detector.current = model;
               setModelDownloadProgress(100);
               clearTimeout(modelLoadTimeout);
               return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -3033,8 +3024,7 @@ function useLoadFaceDetector(_a) {
       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);
@@ -3044,7 +3034,6 @@ function useLoadFaceDetector(_a) {
     modelError && (onModelError === null || onModelError === void 0 ? void 0 : onModelError(modelError));
   }, [modelError, onModelError]);
   return {
-    detector: detector,
     ready: ready,
     modelDownloadProgress: modelDownloadProgress,
     modelError: modelError
@@ -3083,8 +3072,9 @@ function trackFace(face, framesNeeded) {
     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),
@@ -3220,11 +3210,10 @@ var progressByUseCase = {
 };
 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', {
@@ -3235,11 +3224,12 @@ function preloadDependency(url) {
             }
           }));
         });
-        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();
       })];
     });
   });
@@ -3262,8 +3252,11 @@ function preloadDocumentDetectorDependencies() {
       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;
@@ -3307,8 +3300,11 @@ function preloadFocusModelDependencies() {
       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;
@@ -3352,8 +3348,11 @@ function preloadFaceDetectorDependencies() {
       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;
@@ -3416,33 +3415,32 @@ var documentTypeDisplayNames = {
   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 = ObjectDetector).createFromOptions;
+          _b = (_a = ObjectDetector).createFromOptions;
           return [4 /*yield*/, FilesetResolver.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
@@ -3452,23 +3450,20 @@ function loadDocumentDetector() {
             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,
@@ -3478,7 +3473,6 @@ function useLoadDocumentDetector(_a) {
     _d = _a.scoreThreshold,
     scoreThreshold = _d === void 0 ? defaultDocumentDetectionScoreThreshold : _d,
     onModelError = _a.onModelError;
-  var detector = useRef(null);
   var _e = useState(false),
     ready = _e[0],
     setReady = _e[1];
@@ -3504,7 +3498,6 @@ function useLoadDocumentDetector(_a) {
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              detector.current = model;
               setModelDownloadProgress(100);
               clearTimeout(modelLoadTimeout);
               return [4 /*yield*/, waitForVideoReady(videoRef)];
@@ -3525,8 +3518,7 @@ function useLoadDocumentDetector(_a) {
     });
     return function () {
       log('unloading document detection model');
-      detector.current = null;
-      closeDocumentDetector(modelPath, scoreThreshold);
+      closeDocumentDetector();
       clearTimeout(modelLoadTimeout);
       document.removeEventListener('idmission.preloadProgress.documentDetection', handleDownloadProgress);
     };
@@ -3535,17 +3527,17 @@ function useLoadDocumentDetector(_a) {
     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.
@@ -3869,7 +3861,6 @@ function DocumentDetectionModelProvider(_a) {
       scoreThreshold: documentDetectionModelScoreThreshold,
       onModelError: onDocumentDetectionModelError
     }),
-    detector = _o.detector,
     ready = _o.ready,
     modelDownloadProgress = _o.modelDownloadProgress,
     modelError = _o.modelError,
@@ -3881,7 +3872,7 @@ function DocumentDetectionModelProvider(_a) {
         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;
@@ -3891,7 +3882,7 @@ function DocumentDetectionModelProvider(_a) {
               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];
@@ -3913,7 +3904,7 @@ function DocumentDetectionModelProvider(_a) {
           }
         });
       });
-    }, [cameraReady, delayAfterStartMs, detector, documentDetectionBoundaries, documentDetectionThresholds, ready, videoLoaded, videoRef]), {
+    }, [cameraReady, delayAfterStartMs, documentDetectionBoundaries, documentDetectionThresholds, ready, videoLoaded, videoRef]), {
       throttleMs: throttleMs,
       autoStart: autoStart
     }),
@@ -3990,16 +3981,16 @@ function FocusModelProvider(_a) {
       modelLoadTimeoutMs: focusModelLoadTimeoutMs,
       onModelError: onFocusModelError
     }),
-    model = _f.model,
     ready = _f.ready,
     modelDownloadProgress = _f.modelDownloadProgress,
     modelError = _f.modelError;
   var makeFocusPrediction = 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 = useMemo(function () {
     return {
       focusModelReady: ready,
@@ -9222,18 +9213,17 @@ function SelfieGuidanceModelsProvider(_a) {
       onModelError: onModelError,
       modelLoadTimeoutMs: modelLoadTimeoutMs
     }),
-    detector = _f.detector,
     ready = _f.ready,
     modelDownloadProgress = _f.modelDownloadProgress,
     modelError = _f.modelError;
   var _g = useFrameLoop(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');
@@ -9243,23 +9233,23 @@ function SelfieGuidanceModelsProvider(_a) {
               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:
@@ -9267,7 +9257,7 @@ function SelfieGuidanceModelsProvider(_a) {
           }
         });
       });
-    }, [cameraReady, detector, modelError, ready, requireVerticalFaceCentering, videoLoaded, videoRef]), {
+    }, [cameraReady, modelError, ready, requireVerticalFaceCentering, videoLoaded, videoRef]), {
       throttleMs: throttleMs,
       autoStart: autoStart
     }),