hh-shipments 0.3.25 → 0.3.27

package/package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@zxing/library": "^0.23.0",
     "bcryptjs": "^2.4.3",
     "cookie-parser": "^1.4.6",
     "express": "^4.21.2",
@@ -15,10 +16,10 @@
   "name": "hh-shipments",
   "scripts": {
     "start": "node server.js",
-    "test": "node test/run-tests.js && node test/run-carriers-tests.js"
+    "test": "node test/run-extract-tests.js && node test/run-tests.js && node test/run-carriers-tests.js"
   },
   "type": "commonjs",
-  "version": "0.3.25",
+  "version": "0.3.27",
   "bin": {
     "hh-shipments": "server.js"
   },

package/public/app.js

@@ -381,15 +381,17 @@ async function fetchTimeout(url, opts = {}, ms = 60000) {
 }
 
 // ---- Barcode-first decoding (ZXing) ----
-// A decoded barcode is checksum-verified (Code128 mod-103), so it is
-// essentially never wrong — far more reliable than OCR text for labels.
+// Bundled locally at /vendor/zxing.min.js so a CDN outage can never
+// silently kill it. A decoded barcode is checksum-verified (Code128
+// mod-103), so it is essentially never wrong — far more reliable than
+// OCR text for labels.
 let zxingPromise = null;
 function loadZxing() {
   if (window.ZXing) return Promise.resolve();
   if (!zxingPromise) {
     zxingPromise = new Promise((res, rej) => {
       const s = document.createElement('script');
-      s.src = 'https://cdn.jsdelivr.net/npm/@zxing/library@0.21.3/umd/index.min.js';
+      s.src = '/vendor/zxing.min.js';
       s.onload = res;
       s.onerror = () => rej(new Error('barcode reader failed to load'));
       document.head.appendChild(s);
@@ -398,13 +400,15 @@ function loadZxing() {
   return zxingPromise;
 }
 
-// OCR just the top strip of a label (sender block) for the seller name.
+// OCR the top strip of a label (sender block) for the seller name.
 // Works from the ORIGINAL full-resolution image, upscaled — small text
-// reads far better than on the shrunk copy. Returns text or null.
+// reads far better than on the shrunk copy. Top 45%: covers the sender
+// block on USPS labels (~35-40%) as well as UPS/FedEx (top). Returns text
+// or null.
 async function ocrTopStrip(origFile, statusEl) {
   try {
     const bmp = await createImageBitmap(origFile);
-    const sw = bmp.width, sh = Math.max(60, Math.round(bmp.height * 0.35));
+    const sw = bmp.width, sh = Math.max(60, Math.round(bmp.height * 0.45));
     const targetW = 1400, scale = targetW / sw;
     const canvas = document.createElement('canvas');
     canvas.width = targetW;
@@ -424,8 +428,13 @@ async function ocrTopStrip(origFile, statusEl) {
 function strictTracking(s) {
   s = String(s || '').toUpperCase().replace(/[\s-]/g, '');
   if (/^1Z[0-9A-Z]{16}$/.test(s)) return s;          // UPS
-  if (/^9\d{19,21}$/.test(s)) return s;               // USPS
-  if (/^(\d{12}|\d{15}|\d{20})$/.test(s)) return s;    // FedEx
+  // IMpb barcode: strip the routing prefix, return the tracking number.
+  // The routing portion alone is never a shipment.
+  var impb = (window.HHExtract && HHExtract.parseImpb) ? HHExtract.parseImpb(s) : null;
+  if (impb) return impb;
+  if (/^9[1-5]\d{18,20}$/.test(s)) return s;         // USPS
+  if (/^420\d{9}$/.test(s)) return null;             // IMpb routing — never a shipment
+  if (/^(\d{12}|\d{15}|\d{20})$/.test(s)) return s;   // FedEx
   if (/^\d{10,11}$/.test(s)) return s;                // DHL
   return null;
 }
@@ -530,9 +539,14 @@ async function handlePastedImageFile(f) {
       if (r && !r.added.length && !r.duplicates.length && !r.needs_review.some((c) => c.carrier && c.carrier !== 'unknown')) showOcrRead(target, text);
       return;
     }
-    // 2) Fallback: OCR the printed text
+    // 2) Fallback: OCR the printed text (+ the sender strip for the name,
+    // in parallel — the number crop usually excludes the sender block)
     if (live) live.textContent = '📖 Reading screenshot…';
-    text = await ocrFile(f, $('ocr-status-paste'));
+    const [ocrText, topTextFb] = await Promise.all([
+      ocrFile(f, $('ocr-status-paste')),
+      ocrTopStrip(orig, $('ocr-status-paste')),
+    ]);
+    text = ocrText;
     if (live) live.textContent = '⬆️ Uploading…';
     const fd = new FormData();
     fd.append('image', f);
@@ -542,7 +556,7 @@ async function handlePastedImageFile(f) {
     if (!up.ok) throw new Error('upload failed');
     const upId2 = await up.json().then((j) => j.id).catch(() => null);
     if (live) live.textContent = '🔍 Finding tracking number…';
-    const r = await runQuick(text, target);
+    const r = await runQuick(text, target, topTextFb ? { labelText: topTextFb } : undefined);
     // Paste flow already handled this image — don't leave it nagging in the review queue.
     if (upId2) api.patch('/api/intake/' + upId2, { state: 'reviewed' }).catch(() => {});
     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>');

package/public/extract.js

@@ -9,8 +9,8 @@
   var PATTERNS = [
     // UPS: 1Z + 16 alphanumerics
     { carrier: 'ups', confidence: 'high', re: /\b(1Z[0-9A-Z]{16})\b/gi },
-    // USPS: 20-22 digits starting 92-95 (9400..., 9205..., etc.)
-    { carrier: 'usps', confidence: 'high', re: /\b(9[2-5]\d{18,20})\b/g },
+    // USPS: 20-22 digits starting 91-95 (9400..., 9305..., 9205..., 9101..., etc.)
+    { carrier: 'usps', confidence: 'high', re: /\b(9[1-5]\d{18,20})\b/g },
     // USPS S10 international: 2 letters + 9 digits + 2 letters (ends US = USPS)
     { carrier: 'usps', confidence: 'medium', re: /\b([A-Z]{2}\d{9}US)\b/g },
     // FedEx SmartPost / Ground 22-digit starting 96
@@ -95,9 +95,14 @@
     anchorZones(text).forEach(function (z) {
       runPatterns(z.text, found, seen, z.carrier);
       spacedUpsIn(z.text, found, seen, 'high');
+      spacedDigitGroupsIn(z.text, found, seen, 'high');
     });
     // 1) Whole-text strict patterns
     runPatterns(text, found, seen, false);
+    // 1b) Spaced digit groups: labels print "9305 5110 4390 0011 2062 42"
+    // with spaces, which strict PATTERNS cannot match. Without this pass a
+    // perfectly-read number is silently dropped.
+    spacedDigitGroupsIn(text, found, seen, 'medium');
     // 2) OCR-tolerant recovery pass
     extractOcrTolerant(text, found, seen);
     var rank = { high: 0, medium: 1, low: 2 };
@@ -142,6 +147,9 @@
         var num = normalize(m[1]);
         if (seen[num]) continue;
         seen[num] = true;
+        // Never accept an IMpb routing prefix (420 + 9 digits) as a FedEx
+        // number — it is postal routing, not a shipment.
+        if (p.carrier === 'fedex' && /^420\d{9}$/.test(num)) continue;
         // Context boost: carrier word near the number, or a hot-zone anchor
         // naming this carrier (a label's "UPS GROUND" line means the number
         // under it really is UPS).
@@ -162,12 +170,61 @@
   function isValidFormat(number, carrier) {
     var n = normalize(number);
     if (carrier === 'ups') return /^1Z[0-9A-Z]{16}$/.test(n);
-    if (carrier === 'usps') return /^9[2-5]\d{18,20}$/.test(n) || /^[A-Z]{2}\d{9}US$/.test(n);
-    if (carrier === 'fedex') return /^(96\d{20}|\d{12}|\d{15}|\d{20})$/.test(n);
+    if (carrier === 'usps') return /^9[1-5]\d{18,20}$/.test(n) || /^[A-Z]{2}\d{9}US$/.test(n);
+    // FedEx: never accept an IMpb routing prefix (420 + 9 digits) — it is
+    // postal routing, not a shipment number.
+    if (carrier === 'fedex') return /^(96\d{20}|\d{12}|\d{15}|\d{20})$/.test(n) && !/^420\d{9}$/.test(n);
     if (carrier === 'dhl') return /^\d{10,11}$/.test(n) || /^[A-Z]{2,4}\d{10,20}$/.test(n);
     return false;
   }
 
+  // Intelligent Mail package barcode: 420 + routing digits + USPS tracking,
+  // e.g. 420078742956 + 9305511043900011206242 (34 digits). The full barcode
+  // is NOT the tracking number — return the trailing tracking number. The
+  // routing portion must never pass as a shipment number.
+  function parseImpb(s) {
+    var num = normalize(s);
+    if (!/^420\d{23,31}$/.test(num)) return null; // 26–34 digits total
+    var m = /(9[1-5]\d{18,20})$/.exec(num);
+    return m ? m[1] : null;
+  }
+
+  // A spaced/dashed digit run is only plausible as a tracking number when
+  // every group has 2+ digits — this rejects ZIP+4 glued to a nearby lone
+  // digit ("07874-2956 1 lb"), phone fragments ("1-800-555-1234"), etc.
+  function validSpacedGroups(raw) {
+    var groups = String(raw).split(/[\s-]+/);
+    if (groups.length < 2) return true; // contiguous — decided elsewhere
+    for (var i = 0; i < groups.length; i++) if (groups[i].length < 2) return false;
+    return true;
+  }
+
+  // Digit groups split by spaces/dashes: "9305 5110 4390 0011 2062 42".
+  // Strict PATTERNS only match contiguous runs, so this pass exists for the
+  // standard label printing format. Only fires when the raw match actually
+  // contains a separator (contiguous runs are already covered by PATTERNS).
+  // Joined candidates must validate against a carrier format; IMpb barcodes
+  // yield their tracking number, never the routing.
+  function spacedDigitGroupsIn(text, found, seen, conf) {
+    var re = /\b\d(?:[\s-]?\d){9,33}\b/g, m;
+    while ((m = re.exec(text)) !== null) {
+      if (!/[\s-]/.test(m[0])) continue;
+      if (!validSpacedGroups(m[0])) continue;
+      var num = normalize(m[0]);
+      if (!num || seen[num]) continue;
+      var impb = parseImpb(num);
+      if (impb) {
+        seen[num] = true;
+        if (!seen[impb]) { seen[impb] = true; found.push({ number: impb, carrier: 'usps', confidence: conf }); }
+        continue;
+      }
+      var carrier = guessCarrier(num);
+      if (carrier === 'unknown') { seen[num] = true; continue; }
+      seen[num] = true;
+      found.push({ number: num, carrier: carrier, confidence: conf });
+    }
+  }
+
   function guessCarrier(num) {
     var carriers = ['ups', 'usps', 'fedex', 'dhl'];
     for (var i = 0; i < carriers.length; i++) if (isValidFormat(num, carriers[i])) return carriers[i];
@@ -194,13 +251,20 @@
     // a) UPS number split by spaces/dashes (whole-text fallback; the anchor
     // pass already tried the hot zones at high confidence)
     spacedUpsIn(text, found, seen, 'medium');
-    // b) long digit-like runs with OCR confusions -> fix -> re-match digit formats
-    var runRe = /[0-9OILSBoilszb]{10,24}/g, run;
+    // b) long digit-like runs with OCR confusions -> fix -> re-match digit formats.
+    // Space-aware: OCR often reads "9305 51O0 ..." with both mangled chars
+    // AND spaces, so runs may contain separators. Runs up to 34 chars so a
+    // full 34-digit IMpb barcode is tested whole (parseImpb) instead of
+    // being split into chunks that false-positive as DHL/FedEx.
+    var runRe = /[0-9OILSBoilszb](?:[\s-]?[0-9OILSBoilszb]){9,33}/g, run;
     while ((run = runRe.exec(text)) !== null) {
+      if (/[\s-]/.test(run[0]) && !validSpacedGroups(run[0])) continue;
       var fixed = normalize(ocrDigitFix(run[0]));
-      if (/^9[2-5]\d{18,20}$/.test(fixed)) push(fixed, 'usps', 'medium');
+      var impbFixed = parseImpb(fixed);
+      if (impbFixed) { push(impbFixed, 'usps', 'medium'); continue; }
+      if (/^9[1-5]\d{18,20}$/.test(fixed)) push(fixed, 'usps', 'medium');
       else if (/^96\d{20}$/.test(fixed)) push(fixed, 'fedex', 'medium');
-      else if (/^(\d{12}|\d{15}|\d{20})$/.test(fixed)) push(fixed, 'fedex', 'medium');
+      else if (/^(\d{12}|\d{15}|\d{20})$/.test(fixed) && !/^420\d{9}$/.test(fixed)) push(fixed, 'fedex', 'medium');
       else if (/^\d{11}$/.test(fixed)) push(fixed, 'dhl', 'medium');
       else if (/^\d{10}$/.test(fixed)) push(fixed, 'dhl', 'low');
     }
@@ -214,6 +278,7 @@
     });
     tokens.sort(function (a, b) { return b.length - a.length; });
     tokens.slice(0, 3).forEach(function (t) {
+      if (/^420\d{9}$/.test(t)) return; // IMpb routing — never a shipment
       // UPS "1Z" misread as "12"/"IZ" in a joined (space-free) token
       var fixed = repairUpsZ(t);
       if (fixed) { push(fixed, 'ups', 'medium'); return; }
@@ -225,7 +290,7 @@
     });
   }
 
-  var api = { extractTrackingNumbers: extractTrackingNumbers, extractContext: extractContext, normalize: normalize, isValidFormat: isValidFormat };
+  var api = { extractTrackingNumbers: extractTrackingNumbers, extractContext: extractContext, normalize: normalize, isValidFormat: isValidFormat, parseImpb: parseImpb };
   if (typeof module !== 'undefined' && module.exports) module.exports = api;
   globalThis.HHExtract = api;
 })();

package/public/sw.js

@@ -2,7 +2,7 @@
    CACHE name includes the app version (injected by the server), so every
    deploy installs a fresh shell and deletes the old one. */
 const CACHE = 'hh-ship-__APP_VERSION__';
-const SHELL = ['/', '/index.html', '/styles.css', '/app.js', '/extract.js', '/manifest.webmanifest'];
+const SHELL = ['/', '/index.html', '/styles.css', '/app.js', '/extract.js', '/vendor/zxing.min.js', '/manifest.webmanifest'];
 
 self.addEventListener('install', (e) => {
   e.waitUntil(caches.open(CACHE).then((c) => c.addAll(SHELL)).then(() => self.skipWaiting()));