whalibmob 5.33.7 → 5.33.8

package/cli.js

@@ -496,10 +496,13 @@ function normalizePhone(s) {
 // describe a call that is never coming.
 function printCodeNextSteps(store, phone, confirmCmd) {
   if (store && store.codeMethod === 'flash') {
+    const cc      = store.flashCliCc ? ' (from +' + store.flashCliCc + ')' : '';
+    const timeout = Number(store.flashTimeout) > 0 ? Number(store.flashTimeout) : null;
     out('  a call will ring +' + phone + ' and hang up by itself — do not answer it');
-    out('  the code is the LAST 6 DIGITS of the number that called');
-    out('  pasting the whole number works too — only its last 6 digits are sent');
-    out('  run: ' + confirmCmd + ' <last-6-digits>');
+    out('  it comes from a foreign number' + cc + ' — paste that WHOLE number here');
+    out('  whalibmob reads the code out of it for you (no need to pick out digits)');
+    if (timeout) out('  ⚠ be quick — the flash code expires about ' + timeout + 's after the call');
+    out('  run: ' + confirmCmd + ' <number-that-called>');
     return;
   }
   out('  important: enter the code within 10 minutes');
@@ -2742,7 +2745,7 @@ options:
   --pair            connect by linking to an existing account (8-digit code)
   --method          sms | voice | wa_old | flash | email  (default: sms)
                     flash: WhatsApp rings the number and hangs up; the code is
-                    the last 6 digits of the calling number (Android only)
+                    read from the calling number automatically (Android only)
   --email <address> email address (required when --method email)
   --business        register/connect as WhatsApp Business (same as WA_BUSINESS=1)
   --all             refresh-version: every session in the session directory

package/lib/Registration.js

@@ -1838,13 +1838,50 @@ function flashCodeLength() {
   return raw > 0 ? raw : FLASH_CODE_LENGTH;
 }
 
-function flashCodeFromCallerId(input, len) {
+// The server's own rule for pulling the code out of the number that rang.
+//
+// The /code reply for a flash call carries cli_filter — a regex such as
+// "(.*)373(.*)" — alongside cli_prefix and the code length. The code is the
+// part the filter isolates after the prefix: for a caller id "393739799312"
+// the filter's trailing group is "9799312", and the code is its last `length`
+// digits. Applying this is the whole fix for a flash "mismatch" on a correctly
+// read number — the national part of an Italian +39 373 XXXXXXX caller id has
+// more digits after the prefix than the six-digit code, so the old assumption
+// that the code was simply the last six digits took the wrong slice.
+//
+// Returns null when there is no filter, it does not compile, or it does not
+// match, so the caller can fall back to the plain last-`length` behaviour.
+function applyFlashFilter(digits, filter) {
+  if (!filter) return null;
+  let re;
+  try { re = new RegExp(String(filter)); } catch (_) { return null; }
+  const m = re.exec(digits);
+  if (!m) return null;
+  // The code follows the prefix, so it is the last capture group that has any
+  // digits in it; earlier groups hold the country code and prefix.
+  for (let i = m.length - 1; i >= 1; i--) {
+    const g = m[i] && m[i].replace(/\D/g, '');
+    if (g) return g;
+  }
+  return null;
+}
+
+// `opts` may be a bare length (the historical signature) or
+// { length, filter }. The filter, when it matches, decides which digits are the
+// code; the length then trims them. Without a filter this is the old behaviour:
+// the last `length` digits of whatever was typed.
+function flashCodeFromCallerId(input, opts) {
   const digits = normalizeCodeResult(input);
-  const want   = len > 0 ? len : flashCodeLength();
+  const o      = (opts && typeof opts === 'object') ? opts : { length: opts };
+  const want   = Number(o.length) > 0 ? Number(o.length) : flashCodeLength();
+
+  const filtered = applyFlashFilter(digits, o.filter);
+  const base     = (filtered && filtered.length) ? filtered : digits;
+
   // Shorter than the code means the caller already typed just the tail (or the
   // handset showed a short number); there is nothing to trim and guessing would
   // only corrupt it.
-  return digits.length > want ? digits.slice(-want) : digits;
+  return base.length > want ? base.slice(-want) : base;
 }
 
 // The digits /register is given, for whichever method the pending code came by.
@@ -1859,9 +1896,20 @@ function codeForSubmission(store, code, opts) {
   const pending = String(
     (opts && opts.method) || (store && store.codeMethod) || ''
   ).toLowerCase();
-  return pending === 'flash'
-    ? flashCodeFromCallerId(code)
-    : normalizeCodeResult(code);
+  if (pending !== 'flash') return normalizeCodeResult(code);
+
+  // Length: an explicit WA_FLASH_CODE_LEN / opts.flashCodeLen wins, else the
+  // length the server named in its /code reply (captured as store.flashCodeLength),
+  // else the six-digit default inside flashCodeFromCallerId.
+  const envLen = parseInt(process.env.WA_FLASH_CODE_LEN, 10);
+  const length = envLen > 0 ? envLen
+               : (opts && Number(opts.flashCodeLen) > 0 ? Number(opts.flashCodeLen)
+               : (store && Number(store.flashCodeLength) > 0 ? Number(store.flashCodeLength) : 0));
+  // Filter: the server's cli_filter from the /code reply, isolating the code
+  // after the prefix. opts.flashFilter lets a caller state it outright.
+  const filter = (opts && opts.flashFilter) || (store && store.flashCliFilter) || null;
+
+  return flashCodeFromCallerId(code, { length, filter });
 }
 
 // Take the digits the server filed the account under. Brazilian mobiles are the
@@ -2214,6 +2262,27 @@ async function requestSmsCode(store, method, opts) {
         // The confirmation step is usually a separate command, so this is
         // written to the session rather than kept in memory.
         store.codeMethod = m;
+
+        // A flash /code reply states exactly how to read the code out of the
+        // number that will ring: cli_filter is a regex isolating the code after
+        // cli_prefix, and `length` is how many digits it is. Confirmation is
+        // usually a separate command, so these are written to the session for
+        // codeForSubmission to use rather than kept in memory. flash_timeout is
+        // the window the call is valid for, carried so the CLI can warn.
+        if (m === 'flash') {
+          const srvLen = Number(result.length);
+          store.flashCliFilter  = result.cli_filter || null;
+          store.flashCliPrefix  = result.cli_prefix || null;
+          store.flashCliCc      = result.cli_cc     || null;
+          store.flashCodeLength = srvLen > 0 ? srvLen : null;
+          store.flashTimeout    = Number(result.flash_timeout) > 0 ? Number(result.flash_timeout) : null;
+          _whaDbg('[DBG] REG ← /code flash cli: cc=' + (result.cli_cc || '?')
+            + ' prefix=' + (result.cli_prefix || '?')
+            + ' filter=' + (result.cli_filter || '?')
+            + ' length=' + (srvLen > 0 ? srvLen : '?')
+            + ' timeout=' + (result.flash_timeout || '?') + 's');
+        }
+
         await sendFunnelLog(store, waVersion, verifyScreen, 'request_code', 'request_code_success');
         return result;
       }
@@ -2426,7 +2495,7 @@ module.exports._token = { computeToken, androidMaterialPath, registrationHeaders
 module.exports._verify = {
   hasChallenge, is2FARequired, decodeOrNull, isSuccessful,
   normalizeCodeResult, currentVerifyScreen, adoptCanonicalNumber, funnelEnabled, waitHint,
-  flashCodeFromCallerId, flashCodeLength, codeForSubmission,
+  flashCodeFromCallerId, flashCodeLength, applyFlashFilter, codeForSubmission,
   getRequestVerificationCodeParameters
 };
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "whalibmob",
-  "version": "5.33.7",
+  "version": "5.33.8",
   "description": "Node.js library for WhatsApp — register a number over SMS, or link as a companion by QR. Signal E2E encryption, media, groups, channels.",
   "author": "Kunboruto20",
   "main": "index.js",
   "types": "index.d.ts",
   "bin": {
-    "wa": "cli.js"
+    "wa": "./cli.js"
   },
   "files": [
     "index.js",