hh-shipments 0.3.12 → 0.3.14

package/package.json

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

package/public/app.js

@@ -113,7 +113,7 @@ async function runQuick(text, targetEl, preset) {
   targetEl.innerHTML = '<p class="muted">Extracting…</p>';
   try {
     const r = await Promise.race([
-      api.post('/api/intake/quick', { text, seller_name: preset && preset.seller, device: preset && preset.device }),
+      api.post('/api/intake/quick', { text, seller_name: preset && preset.seller, device: preset && preset.device, label_text: preset && preset.labelText }),
       new Promise((_, rej) => setTimeout(() => rej(new Error('extract timed out — check your connection and try again')), 45000)),
     ]);
     let html = '';
@@ -180,22 +180,31 @@ async function handlePhotoFile(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;
+    let text, preset;
     if (barcode) {
       text = barcode;
-      if (live) live.textContent = '📷 Barcode read — verifying…';
+      if (live) live.textContent = '📷 Barcode read — reading sender…';
+      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'));
+      const up = await upPromise;
+      if (!up.ok) throw new Error('upload failed');
+      preset = topText ? { labelText: topText } : undefined;
     } else {
       if (live) live.textContent = '📖 Reading screenshot…';
       text = await ocrFile(f, $('ocr-status'));
+      // Upload original for reference, then run the quick flow on OCR text
+      const fd = new FormData();
+      fd.append('image', f);
+      let up;
+      try { up = await fetchTimeout('/api/intake/image', { method: 'POST', body: fd }, 60000); }
+      catch (e) { throw new Error('upload timed out — check your connection and try again'); }
+      if (!up.ok) throw new Error('upload failed');
     }
-    // Upload original for reference, then run the quick flow on OCR text
-    const fd = new FormData();
-    fd.append('image', f);
-    let up;
-    try { up = await fetchTimeout('/api/intake/image', { method: 'POST', body: fd }, 60000); }
-    catch (e) { throw new Error('upload timed out — check your connection and try again'); }
-    if (!up.ok) throw new Error('upload failed');
-    const r = await runQuick(text, $('photo-result'));
+    const r = await runQuick(text, $('photo-result'), preset);
+    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();
   } catch (err) { $('ocr-status').textContent = ''; $('photo-result').innerHTML = `<p class="error">${esc(err.message)}</p>`; }
@@ -264,6 +273,23 @@ function loadZxing() {
   return zxingPromise;
 }
 
+// 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) {
+  try {
+    const bmp = await createImageBitmap(file);
+    const sh = Math.max(60, Math.round(bmp.height * 0.30));
+    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);
+    bmp.close();
+    const blob = await new Promise((res) => canvas.toBlob(res, 'image/jpeg', 0.9));
+    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))]);
+  } catch (e) { return null; }
+}
 // Strict client-side check: only barcode reads that look exactly like a
 // tracking number are trusted (the server re-validates anyway).
 function strictTracking(s) {
@@ -329,12 +355,25 @@ async function handlePastedImageFile(f) {
     let text;
     if (barcode) {
       text = barcode;
-      if (live) live.textContent = '📷 Barcode read — verifying…';
-    } else {
-      // 2) Fallback: OCR the printed text
-      if (live) live.textContent = '📖 Reading screenshot…';
-      text = await ocrFile(f, $('ocr-status-paste'));
+      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.
+      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 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 (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;
     }
+    // 2) Fallback: OCR the printed text
+    if (live) live.textContent = '📖 Reading screenshot…';
+    text = await ocrFile(f, $('ocr-status-paste'));
     if (live) live.textContent = '⬆️ Uploading…';
     const fd = new FormData();
     fd.append('image', f);
@@ -344,7 +383,6 @@ 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 (barcode && 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);
   } catch (err) { $('ocr-status-paste').textContent = ''; target.innerHTML = `<p class="error">${esc(err.message)}</p>`; }
 }

package/server.js

@@ -218,9 +218,11 @@ app.post('/api/intake/text', requireAuth, (req, res) => {
 // high-confidence ones, return the rest for review. Used by paste intake
 // and the WhatsApp webhook.
 function quickAddText(text, opts = {}) {
-  const { seller_name, device, notes, source = 'paste' } = opts;
+  const { seller_name, device, notes, source = 'paste', label_text } = opts;
   const candidates = extract.extractTrackingNumbers(text);
-  const autoCtx = extract.extractContext(text);
+  // When the number came from a barcode scan, text is just the number —
+  // use the label's top-strip OCR text (if provided) for seller context.
+  const autoCtx = extract.extractContext(label_text || text);
   const existing = new Set(db.prepare('SELECT tracking_number FROM shipments').all().map((r) => r.tracking_number));
   const added = [], needs_review = [], duplicates = [];
   for (const c of candidates) {
@@ -238,9 +240,9 @@ function quickAddText(text, opts = {}) {
 }
 
 app.post('/api/intake/quick', requireAuth, (req, res) => {
-  const { text, seller_name, device, notes } = req.body || {};
+  const { text, seller_name, device, notes, label_text } = req.body || {};
   if (!text || !text.trim()) return res.status(400).json({ error: 'empty text' });
-  res.json(quickAddText(text, { seller_name, device, notes, source: 'paste' }));
+  res.json(quickAddText(text, { seller_name, device, notes, source: 'paste', label_text }));
 });
 
 /* ---------------- intake: images (in-app upload + iOS Shortcut) ---------------- */

package/src/extract.js

@@ -64,16 +64,20 @@
     }
     // Shipping labels: the sender name is the first or second line
     // ("MOHAMMED SALEM"). Only take it when it's clearly a name — never
-    // digits, never address fragments, never OCR garbage like "EE SS".
+    // digits, never address fragments, never OCR garbage like "EE SS",
+    // and never the app's own UI words when a screenshot of the app itself
+    // gets pasted ("Back Shipment").
     if (!out.seller_name) {
       var labelWords = function (s) { return String(s).trim().split(/\s+/); };
       var looksLikeLabelName = function (s) {
         var words = labelWords(s);
         if (words.length < 2 || words.length > 3) return false;
-        // every word 4+ letters: OCR garbage ("Eg NTT", "EE SS") never
-        // qualifies; real label names ("MOHAMMED SALEM") do.
-        for (var i = 0; i < words.length; i++) if (!/^[A-Za-z]{4,}$/.test(words[i])) return false;
-        if (/\b(UPS|FEDEX|USPS|DHL|GROUND|EXPRESS|PRIORITY|BILLING|SHIP\b|FROM|TRACKING|POSTAGE|LABEL)\b/i.test(s)) return false;
+        // Real shipping labels print names in ALL CAPS; app UI chrome
+        // ("Back Shipment") and OCR fragments ("Eg NTT") don't.
+        if (s !== s.toUpperCase()) return false;
+        // every word 4+ letters: OCR garbage ("EE SS") never qualifies.
+        for (var i = 0; i < words.length; i++) if (!/^[A-Z]{4,}$/.test(words[i])) return false;
+        if (/\b(UPS|FEDEX|USPS|DHL|GROUND|EXPRESS|PRIORITY|BILLING|SHIP\b|FROM|TRACKING|POSTAGE|LABEL|BACK|SHIPMENT|HOME|ARCHIVE|SETTINGS|SCREENSHOT|READING|FINDING|UPLOADING|EXTRACT|PASTE|DETAILS|SAVE|TAP|CLIPBOARD|NUMBER)\b/.test(s)) return false;
         return true;
       };
       var lines = String(text).split(/\r?\n/);