hh-shipments 0.3.14 → 0.3.16

package/package.json

@@ -18,7 +18,7 @@
     "test": "node test/run-tests.js && node test/run-carriers-tests.js"
   },
   "type": "commonjs",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "bin": {
     "hh-shipments": "server.js"
   },

package/public/app.js

@@ -175,12 +175,13 @@ async function ocrFile(file, statusEl) {
 async function handlePhotoFile(f) {
   const target = $('photo-result');
   try {
+    const orig = f;
     f = await shrinkImage(f);
     const url = URL.createObjectURL(f);
     target.innerHTML = `<div class="review"><img src="${url}" style="max-width:100%;border-radius:10px"><p class="muted" id="ocr-live-photo">📷 Scanning barcode…</p></div>`;
     const live = $('ocr-live-photo');
     const barcode = await decodeBarcode(f);
-    let text, preset;
+    let text, preset, topText = null;
     if (barcode) {
       text = barcode;
       if (live) live.textContent = '📷 Barcode read — reading sender…';
@@ -188,7 +189,7 @@ async function handlePhotoFile(f) {
       fd.append('image', f);
       const upPromise = fetchTimeout('/api/intake/image', { method: 'POST', body: fd }, 60000)
         .catch(() => { throw new Error('upload timed out — check your connection and try again'); });
-      const topText = await ocrTopStrip(f, $('ocr-status'));
+      topText = await ocrTopStrip(orig, $('ocr-status'));
       const up = await upPromise;
       if (!up.ok) throw new Error('upload failed');
       preset = topText ? { labelText: topText } : undefined;
@@ -204,6 +205,7 @@ async function handlePhotoFile(f) {
       if (!up.ok) throw new Error('upload failed');
     }
     const r = await runQuick(text, $('photo-result'), preset);
+    if (looksLikeAppScreenshot(topText || text)) $('photo-result').insertAdjacentHTML('afterbegin', '<p class="warn">⚠️ This looks like a screenshot of the app itself — choose the label photo directly for best results.</p>');
     if (barcode && r && r.added.length) $('photo-result').insertAdjacentHTML('afterbegin', '<p class="muted">📷 Read from the barcode — checksum verified.</p>');
     if (r && !r.added.length && !r.needs_review.length && !r.duplicates.length) showOcrRead($('photo-result'), text);
     loadPending();
@@ -274,17 +276,21 @@ function loadZxing() {
 }
 
 // OCR just the top strip of a label (sender block) for the seller name.
-// Small crop = fast. Returns text or null.
-async function ocrTopStrip(file, statusEl) {
+// Works from the ORIGINAL full-resolution image, upscaled — small text
+// reads far better than on the shrunk copy. Returns text or null.
+async function ocrTopStrip(origFile, statusEl) {
   try {
-    const bmp = await createImageBitmap(file);
-    const sh = Math.max(60, Math.round(bmp.height * 0.30));
+    const bmp = await createImageBitmap(origFile);
+    const sw = bmp.width, sh = Math.max(60, Math.round(bmp.height * 0.35));
+    const targetW = 1400, scale = targetW / sw;
     const canvas = document.createElement('canvas');
-    canvas.width = bmp.width;
-    canvas.height = sh;
-    canvas.getContext('2d').drawImage(bmp, 0, 0, bmp.width, sh, 0, 0, bmp.width, sh);
+    canvas.width = targetW;
+    canvas.height = Math.max(60, Math.round(sh * scale));
+    const ctx = canvas.getContext('2d');
+    ctx.imageSmoothingEnabled = true;
+    ctx.drawImage(bmp, 0, 0, sw, sh, 0, 0, targetW, canvas.height);
     bmp.close();
-    const blob = await new Promise((res) => canvas.toBlob(res, 'image/jpeg', 0.9));
+    const blob = await new Promise((res) => canvas.toBlob(res, 'image/jpeg', 0.92));
     if (!blob) return null;
     const p = ocrFile(new File([blob], 'top.jpg', { type: 'image/jpeg' }), statusEl);
     return await Promise.race([p, new Promise((_, rej) => setTimeout(() => rej(new Error('top-strip timeout')), 25000))]);
@@ -342,10 +348,19 @@ async function decodeBarcode(file) {
   } finally { bmp.close(); }
   return null;
 }
+// Detect when the pasted image is a screenshot OF THE APP itself (its own
+// header/buttons/tab bar get OCR'd) — the label inside is too small to read
+// well, and UI words pollute the results.
+function looksLikeAppScreenshot(text) {
+  const t = String(text || '').toLowerCase();
+  return /paste a screenshot|extract from text|finding tracking number|reading screenshot|mark received|open carrier tracking|hh shipments/.test(t);
+}
+
 async function handlePastedImageFile(f) {
   const target = $('quick-result');
   try {
     // Instant feedback: show a thumbnail + progress the moment the image lands
+    const orig = f;
     f = await shrinkImage(f);
     const url = URL.createObjectURL(f);
     target.innerHTML = `<div class="review"><img src="${url}" style="max-width:100%;border-radius:10px"><p class="muted" id="ocr-live">📷 Scanning barcode…</p></div>`;
@@ -356,17 +371,18 @@ async function handlePastedImageFile(f) {
     if (barcode) {
       text = barcode;
       if (live) live.textContent = '📷 Barcode read — reading sender…';
-      // Number is verified; OCR just the top strip (sender block) for the
-      // name, in parallel with the upload.
+      // Number is verified; OCR the top strip of the ORIGINAL full-res
+      // image (sender block) for the name, in parallel with the upload.
       const fd = new FormData();
       fd.append('image', f);
       const upPromise = fetchTimeout('/api/intake/image', { method: 'POST', body: fd }, 60000)
         .catch(() => { throw new Error('upload timed out — check your connection and try again'); });
-      const topText = await ocrTopStrip(f, $('ocr-status-paste'));
+      const topText = await ocrTopStrip(orig, $('ocr-status-paste'));
       const up = await upPromise;
       if (!up.ok) throw new Error('upload failed');
       if (live) live.textContent = '🔍 Finding tracking number…';
       const r = await runQuick(text, target, topText ? { labelText: topText } : undefined);
+      if (looksLikeAppScreenshot(topText)) target.insertAdjacentHTML('afterbegin', '<p class="warn">⚠️ This looks like a screenshot of the app itself — paste the label photo directly for best results.</p>');
       if (r && r.added.length) target.insertAdjacentHTML('afterbegin', '<p class="muted">📷 Read from the barcode — checksum verified.</p>');
       if (r && !r.added.length && !r.needs_review.length && !r.duplicates.length) showOcrRead(target, text);
       return;
@@ -383,6 +399,7 @@ async function handlePastedImageFile(f) {
     if (!up.ok) throw new Error('upload failed');
     if (live) live.textContent = '🔍 Finding tracking number…';
     const r = await runQuick(text, target);
+    if (looksLikeAppScreenshot(text)) target.insertAdjacentHTML('afterbegin', '<p class="warn">⚠️ This looks like a screenshot of the app itself — paste the label photo directly for best results.</p>');
     if (r && !r.added.length && !r.needs_review.length && !r.duplicates.length) showOcrRead(target, text);
   } catch (err) { $('ocr-status-paste').textContent = ''; target.innerHTML = `<p class="error">${esc(err.message)}</p>`; }
 }