hh-shipments 0.3.17 → 0.3.19

package/package.json

@@ -18,7 +18,7 @@
     "test": "node test/run-tests.js && node test/run-carriers-tests.js"
   },
   "type": "commonjs",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "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 ---------- */
@@ -119,6 +122,7 @@ async function runQuick(text, targetEl, preset) {
     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 () => {

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.19">
 <title>HH Shipments</title>
 <link rel="manifest" href="/manifest.webmanifest">
 <link rel="apple-touch-icon" href="/icon-192.png">

package/server.js

@@ -225,9 +225,25 @@ function quickAddText(text, opts = {}) {
   // 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 });
@@ -237,7 +253,7 @@ 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) => {

package/src/extract.js

@@ -89,6 +89,29 @@
         if (looksLikeLabelName(cleaned)) { out.seller_name = cleaned; break; }
       }
     }
+    // Chat screenshots (Messenger): the other person's name is the header at
+    // the very top ("Abdullah Sohail"), above the message bubbles. Take the
+    // first title-case name in the top lines — never Hunter's own name /
+    // address bubble, never app or chat UI words.
+    if (!out.seller_name) {
+      var cheadBlock = /\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|HUNTER|HILLS|THANK|THANKS|YOU|DELIVERED|SEEN|TYPING|AFTERMARKET|DISPLAY)\b/i;
+      var clines = String(text).split(/\r?\n/);
+      var checked = 0;
+      for (var ci = 0; ci < clines.length && checked < 6; ci++) {
+        var ch = clines[ci].trim();
+        if (!ch || ch.length > 40) continue;
+        checked++;
+        if (/\d/.test(ch)) continue;
+        var cw = ch.split(/\s+/);
+        if (cw.length < 2 || cw.length > 3) continue;
+        var cok = true;
+        for (var cj = 0; cj < cw.length; cj++) if (!/^[A-Z][a-z]{2,}$/.test(cw[cj])) { cok = false; break; }
+        if (!cok) continue;
+        if (cheadBlock.test(ch)) continue;
+        out.seller_name = ch;
+        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.