hh-shipments 0.3.11 → 0.3.13

package/package.json

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

package/public/app.js

@@ -56,6 +56,7 @@ 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(() => {});
 }
 
 /* ---------- auth ---------- */

package/public/index.html

@@ -152,6 +152,7 @@
     <div class="card">
       <button id="btn-logout" class="danger">Sign out</button>
     </div>
+    <p class="muted" style="text-align:center">HH Shipments v<span id="app-version">…</span></p>
   </section>
 
   <nav id="tabbar" hidden>

package/server.js

@@ -60,6 +60,8 @@ function checkIntakeToken(req, res, next) {
   next();
 }
 
+app.get('/api/version', (req, res) => res.json({ version: require('./package.json').version }));
+
 app.get('/api/setup-needed', (req, res) => {
   const n = db.prepare('SELECT COUNT(*) c FROM users').get().c;
   res.json({ needed: n === 0 });

package/src/extract.js

@@ -54,7 +54,9 @@
     }
     // WhatsApp export style: "[10/12/26, 9:41 AM] John Smith: message"
     var m = text.match(/^\[?[^\]\n]*\]?\s*([^:\[\]\n]{2,40}):\s/m);
-    if (m && !/^(you|me|http)/i.test(m[1].trim()) && looksLikeName(m[1])) out.seller_name = m[1].trim();
+    // ...plus a run of 3+ lowercase letters: real names have them ("Marcus
+    // Webb"), OCR fragments like "Eg NTT" don't.
+    if (m && !/^(you|me|http)/i.test(m[1].trim()) && looksLikeName(m[1]) && /[a-z]{3,}/.test(m[1])) out.seller_name = m[1].trim();
     // "from John", "seller: John"
     if (!out.seller_name) {
       var m2 = text.match(/(?:from|seller)\s*:\s*([A-Z][a-z]+(?:\s+[A-Z][a-z]+)?)/);
@@ -62,14 +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 > 4) return false;
-        for (var i = 0; i < words.length; i++) if (!/^[A-Za-z]{3,}$/.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;
+        if (words.length < 2 || words.length > 3) 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/);