scandoc-ai-components 0.1.19 → 0.1.20

package/dist/index.js

@@ -11178,6 +11178,7 @@ class ExtractorVideo {
     this.candidateImages = [];
     this.extractionImages = {};
     this.onExtractedResults = onExtractedResults;
+    this.onCameraSelected = null;
     this.pastBlurValues = [];
     this.isRunning = false;
     this.scanStartTime = null;
@@ -11208,6 +11209,23 @@ class ExtractorVideo {
     clearTimeout(this.turnMessageTimer);
     this.turnMessageTimer = null;
   }
+  emitCameraInfo(cameraInfo) {
+    this.lastCameraInfo = cameraInfo;
+    try {
+      if (typeof this.onCameraSelected === "function") {
+        this.onCameraSelected(cameraInfo);
+      }
+    } catch (err) {
+      console.warn("onCameraSelected callback failed:", err);
+    }
+    try {
+      window.dispatchEvent(new CustomEvent("ScanDocAICameraSelected", {
+        detail: cameraInfo
+      }));
+    } catch (err) {
+      console.warn("Could not dispatch ScanDocAICameraSelected event:", err);
+    }
+  }
   async analyzeVideoStream() {
     if (!this.isRunning) return;
     const now = Date.now();
@@ -11402,6 +11420,7 @@ class ExtractorVideo {
       });
       this.currentStream = cameraResult.stream;
       this.lastCameraInfo = cameraResult;
+      this.emitCameraInfo(cameraResult);
       try {
         const focusResult = await tryEnableDocumentFocus(this.currentStream);
         console.log("Focus result:", focusResult);
@@ -11425,7 +11444,8 @@ class ExtractorVideo {
         deviceId: cameraResult.deviceId,
         strategy: cameraResult.strategy,
         settings: cameraResult.settings,
-        score: cameraResult.score
+        score: cameraResult.score,
+        tested: cameraResult.tested
       });
       return true;
     } catch (error) {
@@ -11454,7 +11474,7 @@ class ExtractorVideo {
       try {
         this.video.pause();
       } catch (_) {}
-      if (this.video.srcObject) {
+      if (this.video.srcObject !== undefined && this.video.srcObject !== null) {
         try {
           this.video.srcObject.getTracks().forEach(t => t.stop());
         } catch (_) {}
@@ -11642,6 +11662,18 @@ class ExtractorVideo {
 					align-items: center;
 					color: ${messageColor};
 				}
+				.scandoc-camera-debug {
+					margin-top: 12px;
+					padding: 10px;
+					max-width: 95vw;
+					overflow: auto;
+					font-size: 12px;
+					background: #f3f3f3;
+					border: 1px solid #ddd;
+					border-radius: 8px;
+					white-space: pre-wrap;
+					word-break: break-word;
+				}
 			</style>
 		`;
   }
@@ -11694,6 +11726,7 @@ function getAspectRatio(settings = {}) {
   return null;
 }
 async function attachStreamToVideo(videoEl, stream) {
+  if (!videoEl) return;
   videoEl.srcObject = stream;
   try {
     await videoEl.play();
@@ -11780,60 +11813,81 @@ function isLikelyRearCamera(label = "") {
   const v = normalizeLabel(label);
   return v.includes("back") || v.includes("rear") || v.includes("environment") || v.includes("world");
 }
+function isLikelyFrontCamera(label = "") {
+  const v = normalizeLabel(label);
+  return v.includes("front") || v.includes("user") || v.includes("facetime") || v.includes("selfie");
+}
 function isLikelyUltraWideOrMacro(label = "") {
   const v = normalizeLabel(label);
   return v.includes("ultra") || v.includes("ultrawide") || v.includes("wide angle") || v.includes("0.5") || v.includes("macro") || v.includes("fisheye");
 }
+function isLikelyTelephoto(label = "") {
+  const v = normalizeLabel(label);
+  return v.includes("tele") || v.includes("zoom") || v.includes("3x") || v.includes("5x") || v.includes("10x");
+}
+function getPixelCount(settings = {}) {
+  return Number(settings.width || 0) * Number(settings.height || 0);
+}
 function scoreCameraCandidate({
   label,
-  settings
+  settings,
+  isBootstrap = false
 }) {
   const width = Number(settings?.width || 0);
   const height = Number(settings?.height || 0);
-  const pixels = width * height;
+  const pixels = getPixelCount(settings);
   const aspectRatio = getAspectRatio(settings) || 0;
   let score = 0;
   score += pixels;
+  if (isBootstrap) {
+    score += 400000;
+  }
   if (isLikelyRearCamera(label)) {
-    score += 5_000_000;
+    score += 4000000;
+  }
+  if (isLikelyFrontCamera(label)) {
+    score -= 12000000;
   }
   if (isLikelyUltraWideOrMacro(label)) {
-    score -= 8_000_000;
+    score -= 10000000;
+  }
+  if (isLikelyTelephoto(label)) {
+    score -= 2500000;
   }
-  if (aspectRatio > 1.65 && aspectRatio < 1.85) {
-    score += 750_000;
+  if (aspectRatio >= 1.6 && aspectRatio <= 1.9) {
+    score += 700000;
   }
-  if (aspectRatio > 2.1) {
-    score -= 2_000_000;
+  if (aspectRatio > 2.05) {
+    score -= 1500000;
   }
   if (width >= 1920) {
-    score += 500_000;
+    score += 500000;
   }
   if (width < 1280 || height < 720) {
-    score -= 3_000_000;
+    score -= 4000000;
   }
   return score;
 }
-async function probeCameraCandidate(device, videoElement) {
+async function probeCameraCandidate(device) {
   let stream = null;
   try {
     stream = await navigator.mediaDevices.getUserMedia(buildDeviceConstraints(device.deviceId));
-    await attachStreamToVideo(videoElement, stream);
-    await waitForVideoReady(videoElement, 800);
     const track = stream.getVideoTracks?.()[0];
     const settings = track?.getSettings?.() || {};
+    const label = track?.label || device.label || "";
+    const score = scoreCameraCandidate({
+      label,
+      settings
+    });
     return {
       ok: true,
       device,
       stream,
-      label: track?.label || device.label || "",
+      label,
       deviceId: settings.deviceId || device.deviceId,
       settings,
       aspectRatio: getAspectRatio(settings),
-      score: scoreCameraCandidate({
-        label: track?.label || device.label || "",
-        settings
-      })
+      score
     };
   } catch (error) {
     if (stream) {
@@ -11847,30 +11901,9 @@ async function probeCameraCandidate(device, videoElement) {
     };
   }
 }
-function waitForVideoReady(videoEl, timeoutMs = 800) {
-  return new Promise(resolve => {
-    if (videoEl.readyState >= 2 && videoEl.videoWidth > 0 && videoEl.videoHeight > 0) {
-      resolve();
-      return;
-    }
-    let done = false;
-    const finish = () => {
-      if (done) return;
-      done = true;
-      videoEl.removeEventListener("loadeddata", onReady);
-      videoEl.removeEventListener("canplay", onReady);
-      clearTimeout(timer);
-      resolve();
-    };
-    const onReady = () => finish();
-    const timer = setTimeout(finish, timeoutMs);
-    videoEl.addEventListener("loadeddata", onReady, {
-      once: true
-    });
-    videoEl.addEventListener("canplay", onReady, {
-      once: true
-    });
-  });
+function isIOSLike() {
+  const ua = navigator.userAgent || "";
+  return /iPhone|iPad|iPod/i.test(ua);
 }
 async function tryEnableDocumentFocus(stream) {
   const track = stream?.getVideoTracks?.()[0];
@@ -11947,27 +11980,21 @@ async function openBestDocumentCamera({
   if (!window.isSecureContext) {
     throw new Error("Camera requires HTTPS / secure context");
   }
-  let bootstrapStream = null;
+  let bootstrapStream;
   try {
     bootstrapStream = await navigator.mediaDevices.getUserMedia(buildDocumentScanConstraints(preferredFacingMode));
-    await attachStreamToVideo(videoElement, bootstrapStream);
-    await waitForVideoReady(videoElement, 800);
   } catch (preferredError) {
     console.warn("Preferred camera open failed, falling back:", preferredError);
     bootstrapStream = await navigator.mediaDevices.getUserMedia({
       video: true,
       audio: false
     });
-    await attachStreamToVideo(videoElement, bootstrapStream);
-    await waitForVideoReady(videoElement, 800);
   }
   const bootstrapTrack = bootstrapStream.getVideoTracks?.()[0];
   const bootstrapSettings = bootstrapTrack?.getSettings?.() || {};
   const bootstrapLabel = bootstrapTrack?.label || "";
   const bootstrapDeviceId = bootstrapSettings.deviceId || null;
   let best = {
-    ok: true,
-    device: null,
     stream: bootstrapStream,
     label: bootstrapLabel,
     deviceId: bootstrapDeviceId,
@@ -11975,26 +12002,34 @@ async function openBestDocumentCamera({
     aspectRatio: getAspectRatio(bootstrapSettings),
     score: scoreCameraCandidate({
       label: bootstrapLabel,
-      settings: bootstrapSettings
+      settings: bootstrapSettings,
+      isBootstrap: true
     }),
-    strategy: "bootstrap"
+    strategy: "bootstrap-environment",
+    tested: []
   };
   const devices = await enumerateVideoInputDevices();
-  if (devices.length <= 1) {
-    return best;
-  }
   const rearDevices = devices.filter(d => isLikelyRearCamera(d.label));
-  const candidates = rearDevices.length > 0 ? rearDevices : devices;
+  const candidatesBase = rearDevices.length > 0 ? rearDevices : devices;
+  const candidates = candidatesBase.filter(d => d.deviceId && d.deviceId !== bootstrapDeviceId).filter(d => !isLikelyFrontCamera(d.label)).slice(0, isIOSLike() ? 2 : 4);
   for (const device of candidates) {
-    if (!device.deviceId) continue;
-    if (device.deviceId === bootstrapDeviceId) continue;
-    const probed = await probeCameraCandidate(device, videoElement);
+    const probed = await probeCameraCandidate(device);
+    best.tested.push({
+      label: device.label || "",
+      deviceId: device.deviceId,
+      ok: probed.ok,
+      settings: probed.settings || null,
+      score: probed.score,
+      error: probed.ok ? null : String(probed.error?.message || probed.error || "")
+    });
     if (!probed.ok) continue;
-    if (probed.score > best.score) {
+    const clearlyBetter = probed.score > best.score + 1000000;
+    if (clearlyBetter) {
       await stopStream(best.stream);
       best = {
         ...probed,
-        strategy: "probed-better-camera"
+        strategy: "switched-after-ranking",
+        tested: best.tested
       };
     } else {
       await stopStream(probed.stream);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "scandoc-ai-components",
   "author": "ScanDoc-AI",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "description": "Pure JavaScript package for integrating ScanDoc-AI services.",
   "keywords": [