whalibmob 5.1.21 → 5.5.22

package/README.md

@@ -1,22 +1,16 @@
 <div align='center'>whalibmob is a pure JavaScript Node.js library for interacting with the WhatsApp Mobile API.</div>
-<div align='center'>v5.1.16</div>
+<div align='center'>v5.1.14</div>
 
 ##
 
 > [!CAUTION]
 > Use a dedicated phone number with this library. Connecting with a number that is already active on a real device will cause WhatsApp to log that device out.
 
-This product is free for everyone but if you want to support more whalibmob or others you can support me with some USD donations through Crypto at This product is free for everyone but if you want us to support more whalibmob or others you can support me with some USD donations through Crypto at    0x8AD64F47a715eC24DeF193FBb9aC64d4E857f0f3
-
-
-
-
-
 > [!IMPORTANT]
 > This project is not affiliated, associated, authorized, endorsed by, or in any way officially connected with WhatsApp or any of its subsidiaries or affiliates. "WhatsApp" and related names are registered trademarks of their respective owners. Use at your own discretion.
 
 - whalibmob does not require a browser, Selenium, or any other external runtime — it communicates directly with WhatsApp using a **TCP socket** and the **Noise Protocol** handshake.
-- The library operates as a real **iOS mobile device** (iPhone), not as WhatsApp Web. It uses the Mobile API endpoint, which behaves differently from the Web API.
+- The library operates as a real **iOS mobile device**, not as WhatsApp Web. It uses the Mobile API endpoint, which behaves differently from the Web API.
 - Signal Protocol encryption is **fully inlined** in pure JavaScript — no native binaries, no node-gyp, runs anywhere Node.js runs.
 
 ## Install
@@ -190,8 +184,9 @@ npm install -g whalibmob
 - [Media Encryption](#media-encryption)
 - [Device Emulation](#device-emulation)
   - [Quick Start](#device-quick-start)
-  - [iPhone Profiles](#iphone-profiles)
-  - [Custom iPhone Fields](#custom-iphone-fields)
+  - [iOS Profiles](#ios-profiles)
+  - [Android Profiles](#android-profiles)
+  - [Custom Device Fields](#custom-device-fields)
   - [Version & Token Overrides](#version--token-overrides)
 
 ---
@@ -2191,20 +2186,18 @@ See the [Receiving Media](#receiving-media) section for a complete working code
 
 ## Device Emulation
 
-whalibmob emulates an iPhone when communicating with WhatsApp servers.
-The device profile controls the User-Agent header, the Noise Protocol `platform` field, and the token computation.
-
-When no `WA_DEVICE` is set, the library **picks a random iPhone model** from the built-in profile list for each new session. This provides natural device diversity.
+whalibmob can emulate any iOS or Android device when communicating with WhatsApp servers.
+The device profile controls the User-Agent header, the Noise Protocol `platform` field, and the static token used in registration token computation.
 
 Configuration is done entirely through environment variables — no code changes required.
 Copy `.env.example` to `.env` in your project root and set the variables you need.
 
 ### Device Quick Start
 
-Emulate an iPhone 16 Pro:
+Emulate an Android Pixel 8 Pro:
 
 ```sh
-WA_DEVICE=iphone16pro node your-app.js
+WA_OS=android WA_DEVICE=pixel_8_pro node your-app.js
 ```
 
 Or put the variables in a `.env` file. When using the **CLI** (`wa` command) the file is loaded automatically. When using the **library directly**, load it before `require('whalibmob')`:
@@ -2215,86 +2208,86 @@ const { WhalibmobClient } = require('whalibmob')
 ```
 
 ```dotenv
-WA_DEVICE=iphone16pro
+WA_OS=android
+WA_DEVICE=pixel_8_pro
 ```
 
-### iPhone Profiles
+Emulate a custom Samsung device:
 
-Available values for `WA_DEVICE`:
+```dotenv
+WA_OS=android
+WA_DEVICE_MODEL=SM-S928B
+WA_DEVICE_MANUFACTURER=samsung
+WA_DEVICE_OS_VERSION=14
+WA_DEVICE_BUILD=UP1A.231005.007
+WA_DEVICE_MODEL_ID=samsung-sm-s928b
+```
+
+### iOS Profiles
+
+Available values for `WA_DEVICE` when `WA_OS=ios` (default):
 
 | Profile key | Device | iOS version |
 |---|---|---|
-| `iphone16promax` | iPhone 16 Pro Max | 18.3.2 |
-| `iphone16pro` | iPhone 16 Pro | 18.3.2 |
-| `iphone16plus` | iPhone 16 Plus | 18.3.2 |
-| `iphone16` | iPhone 16 | 18.3.2 |
-| `iphone15promax` | iPhone 15 Pro Max | 18.3.2 |
-| `iphone15pro` | iPhone 15 Pro | 18.3.2 |
-| `iphone15plus` | iPhone 15 Plus | 18.3.2 |
-| `iphone15` | iPhone 15 | 18.3.2 |
-| `iphone14promax` | iPhone 14 Pro Max | 18.3.2 |
-| `iphone14pro` | iPhone 14 Pro | 18.3.2 |
-| `iphone14plus` | iPhone 14 Plus | 17.7.5 |
-| `iphone14` | iPhone 14 | 17.7.5 |
-| `iphone13pro` | iPhone 13 Pro | 17.7.5 |
-| `iphone13` | iPhone 13 | 17.7.5 |
-| `iphone12pro` | iPhone 12 Pro | 17.7.5 |
-| `iphone12` | iPhone 12 | 17.7.5 |
-| `iphonese3` | iPhone SE (3rd gen) | 17.7.5 |
-| `iphone11pro` | iPhone 11 Pro | 17.7.5 |
-| `iphone11` | iPhone 11 | 17.7.5 |
-| `iphonexs` | iPhone Xs | 16.7.11 |
-
-User-Agent format: `WhatsApp/<version> iOS/<osVersion> Device/<model>`
-
-The WhatsApp version is fetched automatically from the Apple App Store (iTunes API) every time you register, always using the latest published version. The result is cached for **6 hours** so repeated calls within a session are fast. If all App Store sources fail (no internet, rate limit, etc.), the built-in `IOS_VERSION_FALLBACK` constant is used as a last resort. Three iTunes API endpoints are tried in sequence for maximum reliability.
-
-### Custom iPhone Fields
-
-These variables override individual fields to emulate a specific iPhone not in the list above.
-
-| Variable | Sent to WhatsApp as | Notes |
+| `iphone_15_pro` | iPhone 15 Pro | 17.4.1 |
+| `iphone_15` | iPhone 15 | 17.4.1 |
+| `iphone_14_pro` | iPhone 14 Pro | 16.7.5 |
+| `iphone_14` | iPhone 14 | 16.7.5 |
+| `iphone_13_pro` | iPhone 13 Pro | 16.7.5 |
+| `iphone_13` | iPhone 13 | 16.7.5 |
+| `iphone_12_pro` | iPhone 12 Pro | 15.8.2 |
+| `iphone_12` | iPhone 12 | 15.8.2 |
+| `iphone_11_pro` | iPhone 11 Pro | 15.8.2 |
+| `iphone_11` | iPhone 11 | 15.8.2 |
+| `iphone_se3` | iPhone SE (3rd gen) | 16.7.5 |
+| `iphone_xs` | iPhone Xs | 15.8.2 |
+
+iOS User-Agent format: `WhatsApp/<version> iOS/<osVersion> Device/<model>`
+
+### Android Profiles
+
+Available values for `WA_DEVICE` when `WA_OS=android`:
+
+| Profile key | Device | Android version |
 |---|---|---|
-| `WA_DEVICE_MODEL` | proto field 7 | e.g. `iPhone 16 Pro Max` |
-| `WA_DEVICE_OS_VERSION` | proto field 5 | e.g. `18.3.2` or `17.4.1` |
-| `WA_DEVICE_BUILD` | proto field 8 | iOS build number, e.g. `22D82` |
-| `WA_DEVICE_MODEL_ID` | proto field 16 | Apple model number, e.g. `iPhone17,2` |
-
-> [!NOTE]
-> These fields are sent in the **Noise Protocol handshake** (TCP connection to WhatsApp), not in the HTTP registration body. The HTTP registration body sends identity keys, token, `mcc`/`mnc`/`sim_mcc`/`sim_mnc` (derived from the country code), and locale (`lg`/`lc`) — it does **not** send the human-readable device strings.
-
-**Example — custom iPhone via Node.js API:**
+| `pixel_8_pro` | Pixel 8 Pro | 14 |
+| `pixel_8` | Pixel 8 | 14 |
+| `pixel_7` | Pixel 7 | 14 |
+| `pixel_7a` | Pixel 7a | 14 |
+| `samsung_s24_ultra` | Samsung Galaxy S24 Ultra | 14 |
+| `samsung_s24` | Samsung Galaxy S24 | 14 |
+| `samsung_s23_ultra` | Samsung Galaxy S23 Ultra | 14 |
+| `samsung_s23` | Samsung Galaxy S23 | 14 |
+| `samsung_a55` | Samsung Galaxy A55 | 14 |
+| `oneplus_12` | OnePlus 12 | 14 |
+| `oneplus_11` | OnePlus 11 | 13 |
+| `xiaomi_14` | Xiaomi 14 | 14 |
+| `xiaomi_13` | Xiaomi 13 | 13 |
+| `oppo_find_x7` | OPPO Find X7 | 14 |
+| `realme_gt5` | realme GT 5 Pro | 14 |
+
+Android User-Agent format: `WhatsApp/<version> A`
+
+The Android version is fetched automatically from the Google Play Store on first use and cached in memory. If the fetch fails, `ANDROID_VERSION_FALLBACK` is used.
+
+### Custom Device Fields
+
+These variables override individual fields on top of the selected profile:
 
-```js
-process.env.WA_DEVICE_MODEL      = 'iPhone 16 Pro Max'
-process.env.WA_DEVICE_OS_VERSION  = '18.3.2'
-process.env.WA_DEVICE_BUILD       = '22D82'
-process.env.WA_DEVICE_MODEL_ID    = 'iPhone17,2'
-
-const { createNewStore, requestSmsCode, verifyCode } = require('whalibmob')
-
-const store = createNewStore('919634847671')
-await requestSmsCode(store, 'sms')
-```
-
-**Example — custom iPhone via `.env` file:**
-
-```dotenv
-WA_DEVICE_MODEL=iPhone 16 Pro Max
-WA_DEVICE_OS_VERSION=18.3.2
-WA_DEVICE_BUILD=22D82
-WA_DEVICE_MODEL_ID=iPhone17,2
-```
+| Variable | Description |
+|---|---|
+| `WA_DEVICE_MODEL` | Device model string (e.g. `SM-S928B`) |
+| `WA_DEVICE_MANUFACTURER` | Manufacturer name (e.g. `samsung`) |
+| `WA_DEVICE_OS_VERSION` | OS version string (e.g. `14`) |
+| `WA_DEVICE_BUILD` | Build fingerprint (e.g. `UP1A.231005.007`) |
+| `WA_DEVICE_MODEL_ID` | Model ID slug (e.g. `samsung-sm-s928b`) |
 
 ### Version & Token Overrides
 
 | Variable | Description |
 |---|---|
-| `WA_VERSION` | Pin a specific WhatsApp version (e.g. `2.26.10.74`). Skips the live App Store fetch entirely. |
-| `WA_STATIC_TOKEN` | Replaces the built-in iOS static secret in the MD5 formula (`token = MD5(secret + MD5hex(version) + national)`). Only needed if WhatsApp rotates the built-in secret. |
-
-> [!NOTE]
-> **No token configuration is needed.** The built-in iOS static secret (`IOS_STATIC_TOKEN`) is valid for current WhatsApp servers. `WA_STATIC_TOKEN` is only needed if that secret is rotated in a future WhatsApp update.
+| `WA_VERSION` | Pin the WhatsApp version (e.g. `2.24.13.80`). Skips the live store fetch. |
+| `WA_STATIC_TOKEN` | Override the static token used in registration token computation. |
 
 ## License
 

package/cli.js

@@ -2,7 +2,7 @@
 'use strict';
 
 // Load .env from the current working directory (silently — no error if missing).
-// This lets users configure WA_DEVICE, WA_VERSION etc. without touching
+// This lets users configure WA_OS, WA_DEVICE, WA_VERSION etc. without touching
 // their shell environment.  Must happen before any other require() so that
 // process.env is fully populated when modules read it at load time.
 try { require('dotenv').config(); } catch (_) {}
@@ -35,7 +35,7 @@ const {
   loadStore
 } = require('./lib/Client');
 
-const VERSION = '5.1.16';
+const VERSION = '5.1.21';
 
 // ─── output helpers ───────────────────────────────────────────────────────────
 

package/index.js

@@ -2,6 +2,7 @@
 
 const { WhalibmobClient, checkNumberStatus, fetchIosVersion, fetchWaVersion, assertRegistrationKeys } = require('./lib/Client');
 const { getDeviceConfig } = require('./lib/DeviceConfig');
+const { fetchAndroidVersion } = require('./lib/Registration');
 const { createNewStore, saveStore, loadStore, toSixParts, fromSixParts, storeToJson, storeFromJson } = require('./lib/Store');
 const { checkIfRegistered, requestSmsCode, verifyCode } = require('./lib/Registration');
 const { SignalProtocol } = require('./lib/signal/SignalProtocol');
@@ -18,11 +19,12 @@ module.exports = {
   requestSmsCode,
   verifyCode,
   assertRegistrationKeys,
-  // Version fetch — fetchWaVersion fetches from the Apple App Store.
+  // Version fetch — use fetchWaVersion for device-aware (iOS or Android) fetching.
   // fetchIosVersion is kept for backward compatibility.
   fetchWaVersion,
   fetchIosVersion,
-  // Device config — reads WA_DEVICE / WA_DEVICE_* from process.env
+  fetchAndroidVersion,
+  // Device config — reads WA_OS / WA_DEVICE / WA_DEVICE_* from process.env
   getDeviceConfig,
   // Store helpers
   createNewStore,

package/lib/Client.js

@@ -175,6 +175,17 @@ class WhalibmobClient extends EventEmitter {
     this._signal = SignalProtocol.fromStore(this._store, signalFile, skFile);
     this._devMgr = new DeviceManager(this);
 
+    // Restore LID ↔ phone mappings persisted from previous sessions.
+    // This ensures we can route to LID JIDs even on fresh connections where no
+    // incoming message has yet populated _pnToLid during this session.
+    const persistedLid = this._signal.store.getLidMappings
+      ? this._signal.store.getLidMappings() : {};
+    for (const [phone, lid] of Object.entries(persistedLid)) {
+      this._pnToLid.set(phone, lid);
+      this._lidToPn.set(lid, phone);
+    }
+    process.stderr.write('[DBG] LID_RESTORED count=' + Object.keys(persistedLid).length + '\n');
+
     await this._connectSocket();
     return this;
   }
@@ -530,6 +541,10 @@ class WhalibmobClient extends EventEmitter {
       if (lidUser && pnUser && lidUser !== pnUser) {
         this._lidToPn.set(lidUser, pnUser);
         this._pnToLid.set(pnUser, lidUser);
+        // Persist so the mapping survives reconnects / process restarts
+        if (this._signal && this._signal.store && this._signal.store.setLidMapping) {
+          this._signal.store.setLidMapping(pnUser, lidUser);
+        }
       }
     }
     process.stderr.write('[DBG] _handleMessage from=' + from + ' participant=' + participant + ' senderPn=' + senderPn + ' id=' + id + '\n');
@@ -1196,6 +1211,8 @@ class WhalibmobClient extends EventEmitter {
             const pnUser = pPhone.split('@')[0].split(':')[0];
             this._lidToPn.set(lidUser, pnUser);
             this._pnToLid.set(pnUser, lidUser);
+            if (this._signal && this._signal.store && this._signal.store.setLidMapping)
+              this._signal.store.setLidMapping(pnUser, lidUser);
           }
         }
         // Case B: participant JID is a PN, lid attribute is their LID
@@ -1204,6 +1221,8 @@ class WhalibmobClient extends EventEmitter {
           const lidUser = pLid.split('@')[0].split(':')[0];
           this._lidToPn.set(lidUser, pnUser);
           this._pnToLid.set(pnUser, lidUser);
+          if (this._signal && this._signal.store && this._signal.store.setLidMapping)
+            this._signal.store.setLidMapping(pnUser, lidUser);
         }
         return { jid: pJid, role: pRole };
       });

package/lib/DeviceConfig.js

@@ -2,65 +2,80 @@
 
 const {
   IOS_DEVICE,
-  IOS_DEVICE_PROFILES
+  IOS_DEVICE_PROFILES,
+  ANDROID_DEVICE_PROFILES
 } = require('./constants');
 
-// Pre-build normalised lookup table so that user-supplied profile keys in any
+// Pre-build normalised lookup tables so that user-supplied profile keys in any
 // separator style (underscores, dashes, spaces, or none) always resolve.
 // Normalisation: lowercase, strip underscores / dashes / spaces.
 function _normalise(s) { return String(s).toLowerCase().replace(/[\s_-]/g, ''); }
 
-const _IOS_MAP = {};
-const _IOS_KEYS = [];
-for (const k of Object.keys(IOS_DEVICE_PROFILES)) {
-  _IOS_MAP[_normalise(k)] = IOS_DEVICE_PROFILES[k];
-  _IOS_KEYS.push(k);
-}
+const _IOS_MAP     = {};
+const _ANDROID_MAP = {};
+for (const k of Object.keys(IOS_DEVICE_PROFILES))     _IOS_MAP[_normalise(k)]     = IOS_DEVICE_PROFILES[k];
+for (const k of Object.keys(ANDROID_DEVICE_PROFILES)) _ANDROID_MAP[_normalise(k)] = ANDROID_DEVICE_PROFILES[k];
 
 // ─────────────────────────────────────────────────────────────────────────────
-// DeviceConfig — reads environment variables and returns the active iOS device
+// DeviceConfig — reads environment variables and returns the active device
 // profile to be used during registration and connection.
 //
 // Priority order:
-//   1. WA_DEVICE             → pick a named predefined iPhone profile
-//   2. WA_DEVICE_* variables → build a custom iOS profile
-//   3. No env vars           → random iPhone from the profile list
+//   1. WA_OS + WA_DEVICE  → pick a named predefined profile
+//   2. WA_OS + individual WA_DEVICE_* vars → build a custom profile
+//   3. No env vars → default iOS (iPhone 15 Pro)
 //
 // Env variables:
-//   WA_DEVICE              profile key (e.g. iphone16pro, iphone15, iphonese3)
-//   WA_DEVICE_MODEL        device display name   (e.g. "iPhone 16 Pro Max")
-//   WA_DEVICE_OS_VERSION   iOS version string    (e.g. "18.3.2")
-//   WA_DEVICE_BUILD        iOS build number      (e.g. "22D82")
-//   WA_DEVICE_MODEL_ID     internal model id     (e.g. "iPhone17,2")
+//   WA_OS                  ios | android                (default: ios)
+//   WA_DEVICE              profile key (e.g. samsung-s24-ultra, pixel8, iphone14)
+//   WA_DEVICE_MODEL        device display name
+//   WA_DEVICE_MANUFACTURER Apple | Samsung | Google …
+//   WA_DEVICE_OS_VERSION   OS version string (e.g. 17.4.1 or 14)
+//   WA_DEVICE_BUILD        OS build number
+//   WA_DEVICE_MODEL_ID     internal model identifier (e.g. SM-S928B, iPhone16,1)
 //   WA_VERSION             override WhatsApp version (skips live fetch if set)
-//   WA_STATIC_TOKEN        override static registration token secret
+//   WA_STATIC_TOKEN        override static registration token
 // ─────────────────────────────────────────────────────────────────────────────
 
 function getDeviceConfig() {
-  // 1. Named profile via WA_DEVICE
-  if (process.env.WA_DEVICE) {
-    const profileKey = _normalise(process.env.WA_DEVICE);
-    const found = _IOS_MAP[profileKey] || null;
-    if (found) return Object.assign({}, found);
-  }
+  const osType = (process.env.WA_OS || 'ios').toLowerCase().trim();
+
+  if (osType === 'android') {
+    const profileKey = _normalise(process.env.WA_DEVICE || 'samsungs24ultra');
+    const found = _ANDROID_MAP[profileKey] || null;
+    if (found) {
+      return Object.assign({}, found);
+    }
 
-  // 2. Custom profile via individual WA_DEVICE_* vars
-  if (process.env.WA_DEVICE_MODEL || process.env.WA_DEVICE_MODEL_ID) {
     return {
-      os:              'ios',
-      platform:        1,
-      model:           process.env.WA_DEVICE_MODEL      || IOS_DEVICE.model,
-      manufacturer:    'Apple',
-      osVersion:       process.env.WA_DEVICE_OS_VERSION  || IOS_DEVICE.osVersion,
-      osBuildNumber:   process.env.WA_DEVICE_BUILD       || IOS_DEVICE.osBuildNumber,
-      modelId:         process.env.WA_DEVICE_MODEL_ID    || IOS_DEVICE.modelId,
+      os:              'android',
+      platform:        3,
+      model:           process.env.WA_DEVICE_MODEL        || 'Samsung Galaxy S24 Ultra',
+      manufacturer:    process.env.WA_DEVICE_MANUFACTURER || 'Samsung',
+      osVersion:       process.env.WA_DEVICE_OS_VERSION   || '14',
+      osBuildNumber:   process.env.WA_DEVICE_BUILD        || 'UP1A.231005.007',
+      modelId:         process.env.WA_DEVICE_MODEL_ID     || 'SM-S928B',
       deviceModelType: 2
     };
   }
 
-  // 3. No env vars → pick a random iPhone profile for device diversity
-  const idx = Math.floor(Math.random() * _IOS_KEYS.length);
-  return Object.assign({}, IOS_DEVICE_PROFILES[_IOS_KEYS[idx]]);
+  // iOS (default)
+  const profileKey = _normalise(process.env.WA_DEVICE || 'iphone15pro');
+  const found = _IOS_MAP[profileKey] || null;
+  if (found) {
+    return Object.assign({}, found);
+  }
+
+  return {
+    os:              'ios',
+    platform:        1,
+    model:           process.env.WA_DEVICE_MODEL        || IOS_DEVICE.model,
+    manufacturer:    process.env.WA_DEVICE_MANUFACTURER || IOS_DEVICE.manufacturer,
+    osVersion:       process.env.WA_DEVICE_OS_VERSION   || IOS_DEVICE.osVersion,
+    osBuildNumber:   process.env.WA_DEVICE_BUILD        || IOS_DEVICE.osBuildNumber,
+    modelId:         process.env.WA_DEVICE_MODEL_ID     || IOS_DEVICE.modelId,
+    deviceModelType: 2
+  };
 }
 
 module.exports = { getDeviceConfig };