hh-shipments 0.3.15 → 0.3.17

package/package.json

@@ -18,7 +18,7 @@
     "test": "node test/run-tests.js && node test/run-carriers-tests.js"
   },
   "type": "commonjs",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "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, label_text: preset && preset.labelText }),
+      api.post('/api/intake/quick', { text, seller_name: preset && preset.seller, device: preset && preset.device, label_text: preset && preset.labelText, typed: preset && preset.typed }),
       new Promise((_, rej) => setTimeout(() => rej(new Error('extract timed out — check your connection and try again')), 45000)),
     ]);
     let html = '';
@@ -175,6 +175,7 @@ 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>`;
@@ -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'); });
-      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;
@@ -275,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))]);
@@ -355,6 +360,7 @@ 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>`;
@@ -365,13 +371,13 @@ 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…';
@@ -567,7 +573,7 @@ $('search-arch').addEventListener('input', () => { clearTimeout(searchAT); searc
 $('btn-quick').onclick = () => {
   const t = $('paste-text').value.trim();
   if (!t) { $('quick-result').innerHTML = '<p class="muted">Paste the seller\'s text above first — or tap <b>📋 Paste screenshot</b>, screenshots extract on their own.</p>'; return; }
-  runQuick(t, $('quick-result'));
+  runQuick(t, $('quick-result'), { typed: true });
 };
 $('btn-manual').onclick = async () => {
   $('manual-err').textContent = '';

package/server.js

@@ -218,11 +218,12 @@ 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', label_text } = opts;
+  const { seller_name, device, notes, source = 'paste', label_text, typed } = opts;
   const candidates = extract.extractTrackingNumbers(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);
+  // Typed text (paste box) gets the lenient name rule; OCR never does.
+  const autoCtx = extract.extractContext(label_text || text, { lenient: !!typed && !label_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) {
@@ -240,9 +241,9 @@ function quickAddText(text, opts = {}) {
 }
 
 app.post('/api/intake/quick', requireAuth, (req, res) => {
-  const { text, seller_name, device, notes, label_text } = req.body || {};
+  const { text, seller_name, device, notes, label_text, typed } = req.body || {};
   if (!text || !text.trim()) return res.status(400).json({ error: 'empty text' });
-  res.json(quickAddText(text, { seller_name, device, notes, source: 'paste', label_text }));
+  res.json(quickAddText(text, { seller_name, device, notes, source: 'paste', label_text, typed: !!typed }));
 });
 
 /* ---------------- intake: images (in-app upload + iOS Shortcut) ---------------- */

package/src/extract.js

@@ -38,8 +38,11 @@
   }
 
   // Light heuristics for seller name + device details from message text.
-  function extractContext(text) {
+  // opts.lenient: the text was typed by Hunter himself (paste-text box) —
+  // trust a name-looking line far more than OCR output.
+  function extractContext(text, opts) {
     var out = { seller_name: null, device: null };
+    opts = opts || {};
     if (!text) return out;
     // A plausible person name: no digits (addresses have them), not ALL CAPS
     // (shipping-label blocks are), proper name shape. Shipping labels like
@@ -86,6 +89,25 @@
         if (looksLikeLabelName(cleaned)) { out.seller_name = cleaned; break; }
       }
     }
+    // Hunter's typed format: tracking number on one line, seller name on
+    // another ("1Z...\nAbdullah S"). Typed text is trusted — take the first
+    // plausible name line that isn't the number itself.
+    if (!out.seller_name && opts.lenient) {
+      var lblock = /\b(UPS|FEDEX|USPS|DHL|GROUND|EXPRESS|PRIORITY|BILLING|TRACKING|POSTAGE|LABEL|SHIPMENT|SHIP\b|SCREENSHOT|READING|FINDING|UPLOADING|EXTRACT|PASTE|DETAILS|SAVE|TAP|CLIPBOARD|NUMBER|BACK|HOME|ARCHIVE|SETTINGS)\b/i;
+      var lns = String(text).split(/\r?\n/);
+      for (var k = 0; k < lns.length; k++) {
+        var ln = lns[k].trim();
+        if (!ln || ln.length > 40) continue;
+        if (/\d{6,}/.test(ln)) continue;   // tracking-number line
+        if (/\d/.test(ln)) continue;       // addresses/order lines have digits
+        var w = ln.split(/\s+/);
+        if (w.length > 4) continue;
+        if (lblock.test(ln)) continue;
+        if (!/^[A-Za-z][A-Za-z .,'-]*$/.test(ln)) continue;
+        out.seller_name = ln;
+        break;
+      }
+    }
     // Device: iPhone 15 Pro Max 256GB, iPad Pro 11, etc.
     var dm = text.match(/\b(iPhone\s+\d{1,2}\s*(?:Pro\s*Max|Pro|Plus|Mini|e)?|iPad\s*(?:Pro|Air|Mini)?\s*\d*(?:\.\d)?)\b/i);
     var sm = text.match(/\b(64|128|256|512)\s?GB\b/i) || text.match(/\b1\s?TB\b/i);