whalibmob 5.5.28 → 5.5.30

package/lib/Client.js

@@ -790,7 +790,7 @@ class WhalibmobClient extends EventEmitter {
     }
 
     const fromStr       = attrs.from ? String(attrs.from) : '';
-    // Extract bare phone number: "407xxx@s.whatsapp.net" → "407xxxx"
+    // Extract bare phone number: "40756469325@s.whatsapp.net" → "40756469325"
     const recipientPhone = fromStr.split('@')[0].split('.')[0];
 
     process.stderr.write('[DBG] RETRY_RECV msgId=' + msgId + ' from=' + fromStr + ' — clearing session + resending\n');
@@ -1589,7 +1589,7 @@ class WhalibmobClient extends EventEmitter {
    */
   _reissueTcTokenAfterIdentityChange(from) {
     if (!this._tcTokenStore || !from) return;
-    const { normalizeJidForTcToken, isTcTokenExpired } = require('./messages/TcTokenStore');
+    const { normalizeJidForTcToken, tcTokenExpired } = require('./messages/TcTokenStore');
 
     void (async () => {
       try {
@@ -1601,7 +1601,7 @@ class WhalibmobClient extends EventEmitter {
 
         const entry    = this._tcTokenStore.get(tcJid);
         const senderTs = entry && entry.senderTimestamp;
-        if (!senderTs || isTcTokenExpired(senderTs)) {
+        if (!senderTs || tcTokenExpired(senderTs)) {
           // No previous issuance — nothing to re-issue
           return;
         }

package/lib/messages/MessageSender.js

@@ -889,6 +889,23 @@ class MessageSender {
             client._issuePrivacyTokens(ackFrom || tcJid, issueTs)
               .then(result => client._storeTcTokenFromIqResult(result, tcJid, issueTs))
               .then(() => {
+                // Verify that real token bytes were received from the server.
+                // If the IQ timed out (result=NULL) or the server refused to
+                // issue (restricted account), tokenBytes=0 — re-sending would
+                // just get another 463 immediately.  Reject with a clear message.
+                const tcStore = client._tcTokenStore;
+                const entry   = tcStore && tcStore.get(tcJid);
+                const hasToken = entry && entry.token && entry.token.length > 0;
+                if (!hasToken) {
+                  process.stderr.write(
+                    '[DBG] ACK_463 IQ timeout or server refused — no token bytes stored for ' +
+                    tcJid + ', giving up (account may be restricted)\n'
+                  );
+                  throw new Error(
+                    'Send error 463: server did not issue a tctoken for ' + tcJid +
+                    ' (IQ timeout or account restricted)'
+                  );
+                }
                 process.stderr.write('[DBG] ACK_463 token stored for ' + tcJid + ' — retrying send\n');
                 const retryId   = crypto.randomBytes(8).toString('hex').toUpperCase();
                 const retryNode = new BinaryNode(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whalibmob",
-  "version": "5.5.28",
+  "version": "5.5.30",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto20",
   "main": "index.js",