hh-shipments 0.3.16 → 0.3.18

package/package.json

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

package/public/app.js

@@ -56,7 +56,10 @@ function showApp() {
   $('tabbar').hidden = false;
   showView('view-dash');
   loadDash();
-  api.get('/api/version').then((v) => { if (v && v.version) $('app-version').textContent = v.version; }).catch(() => {});
+  api.get('/api/version').then((v) => {
+    const cv = (document.querySelector('meta[name="app-version"]') || {}).content || '?';
+    if (v && v.version) $('app-version').textContent = 'app v' + cv + ' · server v' + v.version;
+  }).catch(() => {});
 }
 
 /* ---------- auth ---------- */
@@ -113,12 +116,13 @@ 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 = '';
     r.added.forEach((a) => { html += `<div class="review">✅ Added <b>${esc(a.number)}</b> (${esc(a.carrier.toUpperCase())})${r.simulated ? ' <span class="sim-badge">SIMULATED</span>' : ''}</div>`; });
     r.duplicates.forEach((n) => { html += `<div class="review">⛔ <b>${esc(n)}</b> is already tracked — skipped.</div>`; });
+    (r.updated || []).forEach((u) => { html += `<div class="review">🔄 Updated <b>${esc(u.number)}</b> — seller: <b>${esc(u.seller_name || '—')}</b>${u.device ? ` · ${esc(u.device)}` : ''}</div>`; });
     r.needs_review.forEach((c, i) => {
       html += `<div class="review" id="rev-${i}"><span class="warn">Needs review</span> — <b>${esc(c.number)}</b> (${esc(c.carrier.toUpperCase())}, ${esc(c.confidence)} confidence)${c.error ? ' — ' + esc(c.error) : ''}
         <div class="row"><button class="secondary" data-add="${i}">Add anyway</button></div></div>`;
@@ -126,7 +130,7 @@ async function runQuick(text, targetEl, preset) {
     if (r.context && (r.context.seller_name || r.context.device)) {
       html = `<div class="review">📝 Detected: ${esc(r.context.seller_name || '—')} · ${esc(r.context.device || '—')}</div>` + html;
     }
-    if (!r.added.length && !r.needs_review.length && !r.duplicates.length) html = '<div class="review">No tracking numbers found in that text.</div>';
+    if (!r.added.length && !r.needs_review.length && !r.duplicates.length && !(r.updated || []).length) html = '<div class="review">No tracking numbers found in that text.</div>';
     targetEl.innerHTML = html;
     targetEl.querySelectorAll('[data-add]').forEach((btn) => {
       btn.onclick = async () => {
@@ -573,7 +577,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/public/index.html

@@ -4,6 +4,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
 <meta name="theme-color" content="#0a84ff">
+<meta name="app-version" content="0.3.18">
 <title>HH Shipments</title>
 <link rel="manifest" href="/manifest.webmanifest">
 <link rel="apple-touch-icon" href="/icon-192.png">

package/server.js

@@ -218,15 +218,32 @@ 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 = [];
+  const added = [], needs_review = [], duplicates = [], updated = [];
   for (const c of candidates) {
-    if (existing.has(c.number)) { duplicates.push(c.number); continue; }
+    if (existing.has(c.number)) {
+      // Already tracked — but a re-paste carrying a name (Hunter's
+      // "number + name" workflow) fills a blank seller/device on it.
+      const newSeller = seller_name || autoCtx.seller_name;
+      const newDevice = device || autoCtx.device;
+      if (newSeller || newDevice) {
+        const cur = db.prepare('SELECT id, seller_name, device FROM shipments WHERE tracking_number = ?').get(c.number);
+        if (cur && ((!cur.seller_name && newSeller) || (!cur.device && newDevice))) {
+          db.prepare('UPDATE shipments SET seller_name = COALESCE(seller_name, ?), device = COALESCE(device, ?) WHERE id = ?')
+            .run(newSeller || null, newDevice || null, cur.id);
+          updated.push({ id: cur.id, number: c.number, seller_name: newSeller || cur.seller_name, device: newDevice || cur.device });
+          continue;
+        }
+      }
+      duplicates.push(c.number);
+      continue;
+    }
     if (c.confidence === 'high') {
       const r = addShipment({ number: c.number, carrier: c.carrier, seller_name: seller_name || autoCtx.seller_name, device: device || autoCtx.device, notes, source });
       if (r.error) needs_review.push({ ...c, error: r.error });
@@ -236,13 +253,13 @@ function quickAddText(text, opts = {}) {
       needs_review.push(c);
     }
   }
-  return { added, needs_review, duplicates, context: autoCtx, simulated: provider.simulated };
+  return { added, needs_review, duplicates, updated, context: autoCtx, simulated: provider.simulated };
 }
 
 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);