whalibmob 5.1.21 → 5.5.21

package/.env.example

@@ -0,0 +1,49 @@
+# ─────────────────────────────────────────────────────────────────────────────
+# whalibmob — Device Emulation Configuration
+# Copy this file to .env in your project root and set the values you need.
+# All variables are optional; defaults emulate an iPhone 15 Pro running iOS 17.
+# ─────────────────────────────────────────────────────────────────────────────
+
+# Operating system to emulate.  Accepted values: ios | android
+# Default: ios
+# WA_OS=android
+
+# Named device profile.
+#
+# iOS profiles (WA_OS=ios):
+#   iphone_15_pro, iphone_15, iphone_14_pro, iphone_14, iphone_13_pro,
+#   iphone_13, iphone_12_pro, iphone_12, iphone_11_pro, iphone_11,
+#   iphone_se3, iphone_xs
+#
+# Android profiles (WA_OS=android):
+#   pixel_8_pro, pixel_8, pixel_7, pixel_7a,
+#   samsung_s24_ultra, samsung_s24, samsung_s23_ultra, samsung_s23, samsung_a55,
+#   oneplus_12, oneplus_11, xiaomi_14, xiaomi_13, oppo_find_x7, realme_gt5
+#
+# Default: iphone_15_pro  (or pixel_8_pro when WA_OS=android)
+# WA_DEVICE=pixel_8_pro
+
+# ── Custom device overrides (applied on top of the selected profile) ─────────
+# Use these to fine-tune any field without creating a new profile.
+
+# 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
+
+# ── Version & token overrides ─────────────────────────────────────────────────
+
+# Pin the WhatsApp version string instead of fetching the latest from the store.
+# Format: 2.x.x.x  (four-part)
+# WA_VERSION=2.24.13.80
+
+# Override the static token used in registration token computation.
+# Only needed if WhatsApp rotates the bundled token.
+# WA_STATIC_TOKEN=Y29Cs6AVNR2bj5PBeKSYFd1nAKuvNQ3h
+
+# ── Proxy / Tor ───────────────────────────────────────────────────────────────
+
+# Route registration HTTP traffic through a SOCKS5 proxy or Tor.
+# TOR_PROXY=socks5://127.0.0.1:9050
+# SOCKS_PROXY=socks5://user:pass@proxy.example.com:1080

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/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 };

package/lib/MediaService.js

@@ -120,7 +120,7 @@ function _tryUpload(host, mediaPath, token, auth, encrypted, encSha256, sha256)
         'Content-Type':   'application/octet-stream',
         'Content-Length': encrypted.length,
         'Accept':         'application/json',
-        'User-Agent':     (() => { const d = getDeviceConfig(); return `WhatsApp/${d.version || '2.26.10.74'} iOS/${d.osVersion} Device/${d.model}`; })()
+        'User-Agent':     (() => { const d = getDeviceConfig(); return d.os === 'android' ? `WhatsApp/${d.version || '2.26.7.75'} A` : `WhatsApp/${d.version || '2.26.7.75'} iOS/${d.osVersion} Device/${d.model}`; })()
       }
     };
 

package/lib/Registration.js

@@ -38,7 +38,9 @@ async function httpPostViaSocks(path, body, waVersion, proxyUrl) {
   });
 
   const _dev = getDeviceConfig();
-  const userAgent = `WhatsApp/${waVersion} iOS/${_dev.osVersion} Device/${_dev.model}`;
+  const userAgent = _dev.os === 'android'
+    ? `WhatsApp/${waVersion} A`
+    : `WhatsApp/${waVersion} iOS/${_dev.osVersion} Device/${_dev.model}`;
   const req = [
     `POST /v2${path} HTTP/1.1`,
     `Host: ${dHost}`,
@@ -88,7 +90,9 @@ const {
   REGISTRATION_ENDPOINT,
   REGISTRATION_PUBLIC_KEY,
   IOS_STATIC_TOKEN,
+  ANDROID_STATIC_TOKEN,
   IOS_VERSION_FALLBACK,
+  ANDROID_VERSION_FALLBACK,
   IOS_USER_AGENT,
   IOS_DEVICE,
   SIGNAL_KEY_TYPE,
@@ -227,93 +231,93 @@ function parsePhone(phoneNumber) {
   return { cc: cc1, national: String(BigInt(str.slice(1))) };
 }
 
-// ---------- WhatsApp version fetch (from Apple App Store / iTunes) ----------
+// ---------- WhatsApp version fetch (iOS from iTunes, Android from Play Store) ----------
 
-// Version cache with TTL — re-fetches every 6 hours so long-running processes
-// always use the current App Store version, not a stale one from startup.
-const VERSION_CACHE_TTL_MS = 6 * 60 * 60 * 1000; // 6 hours
-let _versionCache = { version: null, fetchedAt: 0 };
+let _cachedIosVersion     = null;
+let _cachedAndroidVersion = null;
 
-// Fetch JSON from a single iTunes API URL.  Resolves to a version string or null.
-function _fetchFromUrl(url) {
+async function fetchIosVersion() {
+  if (_cachedIosVersion) return _cachedIosVersion;
   return new Promise((resolve) => {
-    const req = https.get(url, { headers: { 'User-Agent': IOS_USER_AGENT } }, (res) => {
-      // Follow one redirect (iTunes sometimes 301 → 200)
-      if ((res.statusCode === 301 || res.statusCode === 302) && res.headers.location) {
-        resolve(_fetchFromUrl(res.headers.location));
-        return;
+    const req = https.get(
+      'https://itunes.apple.com/lookup?bundleId=net.whatsapp.WhatsApp',
+      { headers: { 'User-Agent': IOS_USER_AGENT } },
+      (res) => {
+        const chunks = [];
+        res.on('data', d => chunks.push(d));
+        res.on('end', () => {
+          try {
+            const json = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+            let ver = (json.results && json.results[0] && json.results[0].version) || IOS_VERSION_FALLBACK;
+            if (!ver.startsWith('2.')) ver = '2.' + ver;
+            _cachedIosVersion = ver;
+            resolve(ver);
+          } catch (_) {
+            resolve(IOS_VERSION_FALLBACK);
+          }
+        });
       }
-      const chunks = [];
-      res.on('data', d => chunks.push(d));
-      res.on('end', () => {
-        try {
-          const json = JSON.parse(Buffer.concat(chunks).toString('utf8'));
-          const raw = json.results && json.results[0] && json.results[0].version;
-          if (!raw) return resolve(null);
-          let ver = String(raw).trim();
-          if (!ver.startsWith('2.')) ver = '2.' + ver;
-          resolve(ver);
-        } catch (_) {
-          resolve(null);
-        }
-      });
-    });
-    req.on('error', () => resolve(null));
-    req.setTimeout(8000, () => { req.destroy(); resolve(null); });
+    );
+    req.on('error', () => resolve(IOS_VERSION_FALLBACK));
+    req.setTimeout(8000, () => { req.destroy(); resolve(IOS_VERSION_FALLBACK); });
   });
 }
 
-// Live App Store sources, tried in order until one succeeds.
-// Multiple endpoints provide resilience against CDN hiccups and region blocks.
-const IOS_VERSION_SOURCES = [
-  'https://itunes.apple.com/lookup?bundleId=net.whatsapp.WhatsApp&country=us',
-  'https://itunes.apple.com/lookup?bundleId=net.whatsapp.WhatsApp',
-  'https://itunes.apple.com/lookup?bundleId=net.whatsapp.WhatsApp&country=gb',
-];
-
-// Fetch and return the latest WhatsApp iOS version from the Apple App Store.
-// Results are cached for VERSION_CACHE_TTL_MS (6 hours) so long-running
-// servers automatically pick up new releases without a restart.
-// Set WA_VERSION env var to pin a specific version and skip the live fetch.
-async function fetchIosVersion() {
-  const now = Date.now();
-  if (_versionCache.version && (now - _versionCache.fetchedAt) < VERSION_CACHE_TTL_MS) {
-    return _versionCache.version;
-  }
-
-  // Try each source in order — return the first successful result
-  for (const url of IOS_VERSION_SOURCES) {
-    const ver = await _fetchFromUrl(url);
-    if (ver) {
-      _versionCache = { version: ver, fetchedAt: now };
-      console.error(`[DBG] fetchIosVersion: ${ver} (source: ${url})`);
-      return ver;
+// Fetch latest WhatsApp Android version from Google Play Store.
+// Parses the 4-part "2.x.x.x" version string embedded in the page JSON data.
+// Falls back to ANDROID_VERSION_FALLBACK on any error.
+async function fetchAndroidVersion() {
+  if (_cachedAndroidVersion) return _cachedAndroidVersion;
+  try {
+    const axios = require('axios');
+    const resp = await axios.get(
+      'https://play.google.com/store/apps/details?id=com.whatsapp&hl=en&gl=us',
+      {
+        headers: {
+          'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+          'Accept-Language': 'en-US,en;q=0.9'
+        },
+        timeout: 12000
+      }
+    );
+    const html = String(resp.data);
+
+    // Primary: first quoted 4-part version string matching WhatsApp's "2.x.x.x" scheme.
+    // In Play Store JSON the current stable version appears first, before beta/history entries.
+    const primary = html.match(/"(2\.\d+\.\d+\.\d+)"/);
+    if (primary) {
+      _cachedAndroidVersion = primary[1];
+      return primary[1];
     }
-  }
 
-  // All sources failed — use fallback constant (and don't cache it so next call retries)
-  console.error(`[DBG] fetchIosVersion: all sources failed, using fallback ${IOS_VERSION_FALLBACK}`);
-  return IOS_VERSION_FALLBACK;
+    // Secondary: unquoted version adjacent to "WhatsApp" text (catches alternate HTML structures).
+    const secondary = html.match(/WhatsApp[^<"]{0,200}?(2\.\d+\.\d+\.\d+)/);
+    if (secondary) {
+      _cachedAndroidVersion = secondary[1];
+      return secondary[1];
+    }
+  } catch (_) {}
+  return ANDROID_VERSION_FALLBACK;
 }
 
-// Return the latest WhatsApp iOS version.
-// If WA_VERSION is set in the environment, that value is always used (no fetch).
-async function fetchWaVersion() {
+// Return the appropriate WhatsApp version for the active device.
+// If WA_VERSION is set in the environment, that value is always used.
+async function fetchWaVersion(device) {
   if (process.env.WA_VERSION) return process.env.WA_VERSION;
-  return fetchIosVersion();
+  return (device && device.os === 'android') ? fetchAndroidVersion() : fetchIosVersion();
 }
 
 // ---------- Token computation ----------
-//
-// iOS token formula:
-//   token = MD5( staticSecret + MD5hex(waVersion) + nationalNumber )
-//   The staticSecret is IOS_STATIC_TOKEN unless WA_STATIC_TOKEN is set.
-//   This algorithm is accepted by WhatsApp servers as of 2.26.x.
+// token = MD5( staticToken + MD5hex(waVersion) + nationalNumber )
+// The static token depends on the platform (iOS vs Android).
+// Override with WA_STATIC_TOKEN in .env if the bundled token becomes stale.
 
 function computeToken(waVersion, national) {
-  const secret = process.env.WA_STATIC_TOKEN || IOS_STATIC_TOKEN;
+  const device      = getDeviceConfig();
+  const staticToken = process.env.WA_STATIC_TOKEN
+    || (device.os === 'android' ? ANDROID_STATIC_TOKEN : IOS_STATIC_TOKEN);
   const versionHashHex = md5Bytes(waVersion).toString('hex');
-  return md5Hex(secret + versionHashHex + national);
+  return md5Hex(staticToken + versionHashHex + national);
 }
 
 // ---------- Byte helpers ----------
@@ -368,31 +372,24 @@ function buildPayload(store, waVersion, useToken, extraPairs) {
   const { cc, national } = parsePhone(store.phoneNumber);
   const token = useToken ? computeToken(waVersion, national) : null;
   const fdid  = store.fdid.toUpperCase();
-  const meta  = getCountryMeta(cc);
 
   return buildForm([
-    'cc',       cc,
-    'in',       national,
-    'rc',       String(RELEASE_CHANNEL),
-    'lg',       meta.lg || 'en',
-    'lc',       meta.lc || 'US',
-    'mcc',      meta.mcc,
-    'mnc',      meta.mnc,
-    'sim_mcc',  meta.mcc,
-    'sim_mnc',  meta.mnc,
-    'platform', '1',
-    'hasinrc',  '0',
-    'authkey',  toBase64Url(stripKeyPrefix(store.noiseKeyPair.public)),
-    'e_regid',  toBase64Url(intToBytes(store.registrationId, 4)),
-    'e_keytype', toBase64Url(Buffer.from([SIGNAL_KEY_TYPE])),
-    'e_ident',  toBase64Url(stripKeyPrefix(store.identityKeyPair.public)),
-    'e_skey_id', toBase64Url(intToBytes(store.signedPreKey.id, 3)),
+    'cc',         cc,
+    'in',         national,
+    'rc',         String(RELEASE_CHANNEL),
+    'lg',         'en',
+    'lc',         'US',
+    'authkey',    toBase64Url(stripKeyPrefix(store.noiseKeyPair.public)),
+    'e_regid',    toBase64Url(intToBytes(store.registrationId, 4)),
+    'e_keytype',  toBase64Url(Buffer.from([SIGNAL_KEY_TYPE])),
+    'e_ident',    toBase64Url(stripKeyPrefix(store.identityKeyPair.public)),
+    'e_skey_id',  toBase64Url(intToBytes(store.signedPreKey.id, 3)),
     'e_skey_val', toBase64Url(stripKeyPrefix(store.signedPreKey.public)),
     'e_skey_sig', toBase64Url(store.signedPreKey.signature),
-    'fdid',     fdid,
-    'expid',    toBase64Url(store.deviceId),
-    'id',       toUrlHex(store.identityId),
-    'token',    token
+    'fdid',       fdid,
+    'expid',      toBase64Url(store.deviceId),
+    'id',         toUrlHex(store.identityId),
+    'token',      token
   ], extraPairs);
 }
 
@@ -419,7 +416,9 @@ function httpPost(path, body, waVersion) {
 
   return new Promise((resolve, reject) => {
     const _httpDev  = getDeviceConfig();
-    const userAgent = `WhatsApp/${waVersion} iOS/${_httpDev.osVersion} Device/${_httpDev.model}`;
+    const userAgent = _httpDev.os === 'android'
+      ? `WhatsApp/${waVersion} A`
+      : `WhatsApp/${waVersion} iOS/${_httpDev.osVersion} Device/${_httpDev.model}`;
     const bodyBuf = Buffer.from(body, 'utf8');
     const opts = {
       hostname: 'v.whatsapp.net',
@@ -462,7 +461,7 @@ async function sendRequest(path, store, waVersion, useToken, extraPairs) {
 // ---------- Public API ----------
 
 async function checkIfRegistered(store) {
-  const waVersion = await fetchWaVersion();
+  const waVersion = await fetchWaVersion(getDeviceConfig());
   return sendRequest('/exist', store, waVersion, false, null);
 }
 
@@ -491,9 +490,13 @@ async function checkNumberStatus(phoneNumber) {
 
   phoneNumber = String(phoneNumber).replace(/\D/g, '');
   const store     = createNewStore(phoneNumber);
-  const waVersion = await fetchWaVersion();
+  const waVersion = await fetchWaVersion(getDeviceConfig());
+  const { cc }    = parsePhone(phoneNumber);
+  const meta      = getCountryMeta(cc);
 
   const baseExtra = [
+    'sim_mcc',           meta.mcc,
+    'sim_mnc',           meta.mnc,
     'reason',            '',
     'cellular_strength', '1'
   ];
@@ -589,7 +592,7 @@ async function assertRegistrationKeys(store, waVersion) {
 async function requestSmsCode(store, method) {
   method = method || 'sms';
   const _device   = getDeviceConfig();
-  const waVersion = await fetchWaVersion();
+  const waVersion = await fetchWaVersion(_device);
   store.version = waVersion;
   store.device  = _device;
 
@@ -601,6 +604,8 @@ async function requestSmsCode(store, method) {
   async function _tryMethod(m) {
     const extra = [
       'method',            m,
+      'sim_mcc',           '000',
+      'sim_mnc',           '000',
       'reason',            '',
       'cellular_strength', '1'
     ];
@@ -676,7 +681,7 @@ async function requestSmsCode(store, method) {
 
 async function verifyCode(store, code) {
   const _device   = getDeviceConfig();
-  const waVersion = await fetchWaVersion();
+  const waVersion = await fetchWaVersion(_device);
   store.version = waVersion;
   store.device  = _device;
   const normalized = code.replace(/[\s\-]/g, '').replace(/\D/g, '');
@@ -701,4 +706,4 @@ async function verifyCode(store, code) {
   throw new Error(`Verification failed: ${reason || JSON.stringify(result)}`);
 }
 
-module.exports = { checkIfRegistered, checkNumberStatus, requestSmsCode, verifyCode, fetchIosVersion, fetchWaVersion, parsePhone, getCountryMeta, assertRegistrationKeys };
+module.exports = { checkIfRegistered, checkNumberStatus, requestSmsCode, verifyCode, fetchIosVersion, fetchAndroidVersion, fetchWaVersion, parsePhone, assertRegistrationKeys };

package/lib/Store.js

@@ -5,7 +5,7 @@ const path = require('path');
 const crypto = require('crypto');
 const curveJs = require('curve25519-js');
 const { v4: uuidv4 } = require('uuid');
-const { IOS_DEVICE, IOS_VERSION_FALLBACK } = require('./constants');
+const { IOS_DEVICE, IOS_VERSION_FALLBACK, ANDROID_VERSION_FALLBACK } = require('./constants');
 const { getDeviceConfig } = require('./DeviceConfig');
 
 // ─────────────────────────────────────────────────────────
@@ -60,7 +60,7 @@ function createNewStore(phoneNumber) {
   const identityId     = crypto.randomBytes(16);
 
   const device  = getDeviceConfig();
-  const version = IOS_VERSION_FALLBACK;
+  const version = device.os === 'android' ? ANDROID_VERSION_FALLBACK : IOS_VERSION_FALLBACK;
 
   return {
     phoneNumber: String(phoneNumber).replace(/^\+/, ''),

package/lib/constants.js

@@ -7,16 +7,18 @@ const REGISTRATION_PUBLIC_KEY = Buffer.from('8e8c0f74c3ebc5d7a6865c6c3c843856b06
 
 const MOBILE_PROLOGUE = Buffer.from([0x57, 0x41, 0x05, 0x03]);
 
-// iOS static tokens (MD5 approach):  token = MD5( staticToken + MD5hex(waVersion) + nationalNumber )
+// Static tokens used in WhatsApp registration token computation.
+// token = MD5( staticToken + MD5hex(waVersion) + nationalNumber )
 const IOS_STATIC_TOKEN          = '0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM';
 const IOS_BUSINESS_STATIC_TOKEN = 'USUDuDYDeQhY4RF2fCSp5m3F6kJ1M2J8wS7bbNA2';
+const ANDROID_STATIC_TOKEN      = 'Y29Cs6AVNR2bj5PBeKSYFd1nAKuvNQ3h';
 
-// WhatsApp version fallback — used when ALL live iTunes sources fail.
-// Updated: 2025-03. The library always tries the App Store first.
-const IOS_VERSION_FALLBACK = '2.26.10.74';
+// WhatsApp version fallbacks — used when live fetch fails.
+const IOS_VERSION_FALLBACK     = '2.26.9.75';
+const ANDROID_VERSION_FALLBACK = '2.24.13.80';
 
 // Safari UA for the iTunes lookup only.
-const IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3 Mobile/15E148 Safari/604.1';
+const IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Mobile/15E148 Safari/604.1';
 
 // Default iOS device (iPhone 15 Pro, iOS 17.4.1).
 // platform 1 = iOS in WhatsApp's ClientPayload.UserAgent proto enum.
@@ -32,129 +34,139 @@ const IOS_DEVICE = {
 };
 
 // ─── iOS device profiles ───────────────────────────────────────────────────
-// Set WA_DEVICE=<key> in .env to select one.
-// When no profile is set, the library picks one at random for each new session.
-// platform 1 = IOS in WhatsApp's ClientPayload.UserAgent proto enum.
+// Set WA_OS=ios  WA_DEVICE=<key>  in .env to select one.
 const IOS_DEVICE_PROFILES = {
-  'iphone16promax': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 16 Pro Max', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone17,2', deviceModelType: 2
-  },
-  'iphone16pro': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 16 Pro', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone17,1', deviceModelType: 2
-  },
-  'iphone16plus': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 16 Plus', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone17,4', deviceModelType: 2
-  },
-  'iphone16': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 16', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone17,3', deviceModelType: 2
-  },
-  'iphone15promax': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 15 Pro Max', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone16,2', deviceModelType: 2
-  },
   'iphone15pro': {
     os: 'ios', platform: 1,
     model: 'iPhone 15 Pro', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
+    osVersion: '17.4.1', osBuildNumber: '21E236',
     modelId: 'iPhone16,1', deviceModelType: 2
   },
-  'iphone15plus': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 15 Plus', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone15,5', deviceModelType: 2
-  },
   'iphone15': {
     os: 'ios', platform: 1,
     model: 'iPhone 15', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
+    osVersion: '17.4.1', osBuildNumber: '21E236',
     modelId: 'iPhone15,4', deviceModelType: 2
   },
-  'iphone14promax': {
+  'iphone14': {
     os: 'ios', platform: 1,
-    model: 'iPhone 14 Pro Max', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
-    modelId: 'iPhone15,3', deviceModelType: 2
+    model: 'iPhone 14', manufacturer: 'Apple',
+    osVersion: '17.4.1', osBuildNumber: '21E236',
+    modelId: 'iPhone14,2', deviceModelType: 2
   },
   'iphone14pro': {
     os: 'ios', platform: 1,
     model: 'iPhone 14 Pro', manufacturer: 'Apple',
-    osVersion: '18.3.2', osBuildNumber: '22D82',
+    osVersion: '17.4.1', osBuildNumber: '21E236',
     modelId: 'iPhone15,2', deviceModelType: 2
   },
-  'iphone14plus': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 14 Plus', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone14,8', deviceModelType: 2
-  },
-  'iphone14': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 14', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone14,7', deviceModelType: 2
-  },
-  'iphone13pro': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 13 Pro', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone14,2', deviceModelType: 2
-  },
   'iphone13': {
     os: 'ios', platform: 1,
     model: 'iPhone 13', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
+    osVersion: '16.7.8', osBuildNumber: '20H343',
     modelId: 'iPhone14,5', deviceModelType: 2
   },
-  'iphone12pro': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 12 Pro', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone13,3', deviceModelType: 1
-  },
   'iphone12': {
     os: 'ios', platform: 1,
     model: 'iPhone 12', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
+    osVersion: '15.8.3', osBuildNumber: '19H384',
     modelId: 'iPhone13,2', deviceModelType: 1
-  },
-  'iphonese3': {
-    os: 'ios', platform: 1,
-    model: 'iPhone SE (3rd generation)', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone14,6', deviceModelType: 1
-  },
-  'iphone11pro': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 11 Pro', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone12,3', deviceModelType: 1
-  },
-  'iphone11': {
-    os: 'ios', platform: 1,
-    model: 'iPhone 11', manufacturer: 'Apple',
-    osVersion: '17.7.5', osBuildNumber: '21H516',
-    modelId: 'iPhone12,1', deviceModelType: 1
-  },
-  'iphonexs': {
-    os: 'ios', platform: 1,
-    model: 'iPhone Xs', manufacturer: 'Apple',
-    osVersion: '16.7.11', osBuildNumber: '20H330',
-    modelId: 'iPhone11,2', deviceModelType: 1
+  }
+};
+
+// ─── Android device profiles ───────────────────────────────────────────────
+// Set WA_OS=android  WA_DEVICE=<key>  in .env to select one.
+// platform 3 = ANDROID in WhatsApp's ClientPayload.UserAgent proto enum.
+const ANDROID_DEVICE_PROFILES = {
+  'samsung-s24-ultra': {
+    os: 'android', platform: 3,
+    model: 'Samsung Galaxy S24 Ultra', manufacturer: 'Samsung',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'SM-S928B', deviceModelType: 2
+  },
+  'samsung-s24': {
+    os: 'android', platform: 3,
+    model: 'Samsung Galaxy S24', manufacturer: 'Samsung',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'SM-S921B', deviceModelType: 2
+  },
+  'samsung-s23': {
+    os: 'android', platform: 3,
+    model: 'Samsung Galaxy S23', manufacturer: 'Samsung',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'SM-S911B', deviceModelType: 2
+  },
+  'samsung-s23-ultra': {
+    os: 'android', platform: 3,
+    model: 'Samsung Galaxy S23 Ultra', manufacturer: 'Samsung',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'SM-S918B', deviceModelType: 2
+  },
+  'samsung-a55': {
+    os: 'android', platform: 3,
+    model: 'Samsung Galaxy A55', manufacturer: 'Samsung',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'SM-A556B', deviceModelType: 1
+  },
+  'pixel8pro': {
+    os: 'android', platform: 3,
+    model: 'Pixel 8 Pro', manufacturer: 'Google',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'Pixel 8 Pro', deviceModelType: 2
+  },
+  'pixel8': {
+    os: 'android', platform: 3,
+    model: 'Pixel 8', manufacturer: 'Google',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'Pixel 8', deviceModelType: 2
+  },
+  'pixel7': {
+    os: 'android', platform: 3,
+    model: 'Pixel 7', manufacturer: 'Google',
+    osVersion: '14', osBuildNumber: 'TP1A.221005.002',
+    modelId: 'Pixel 7', deviceModelType: 2
+  },
+  'pixel7a': {
+    os: 'android', platform: 3,
+    model: 'Pixel 7a', manufacturer: 'Google',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'Pixel 7a', deviceModelType: 1
+  },
+  'xiaomi14': {
+    os: 'android', platform: 3,
+    model: 'Xiaomi 14', manufacturer: 'Xiaomi',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: '23127PN0CG', deviceModelType: 2
+  },
+  'xiaomi13': {
+    os: 'android', platform: 3,
+    model: 'Xiaomi 13', manufacturer: 'Xiaomi',
+    osVersion: '13', osBuildNumber: 'TQ3A.230901.001',
+    modelId: '2211133G', deviceModelType: 2
+  },
+  'oneplus12': {
+    os: 'android', platform: 3,
+    model: 'OnePlus 12', manufacturer: 'OnePlus',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'CPH2573', deviceModelType: 2
+  },
+  'oneplus11': {
+    os: 'android', platform: 3,
+    model: 'OnePlus 11', manufacturer: 'OnePlus',
+    osVersion: '13', osBuildNumber: 'TQ3A.230901.001',
+    modelId: 'CPH2449', deviceModelType: 2
+  },
+  'oppo-find-x7': {
+    os: 'android', platform: 3,
+    model: 'OPPO Find X7', manufacturer: 'OPPO',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'CPH2599', deviceModelType: 2
+  },
+  'realme-gt5': {
+    os: 'android', platform: 3,
+    model: 'realme GT 5 Pro', manufacturer: 'realme',
+    osVersion: '14', osBuildNumber: 'UP1A.231005.007',
+    modelId: 'RMX3888', deviceModelType: 2
   }
 };
 
@@ -187,10 +199,13 @@ module.exports = {
   MOBILE_PROLOGUE,
   IOS_STATIC_TOKEN,
   IOS_BUSINESS_STATIC_TOKEN,
+  ANDROID_STATIC_TOKEN,
   IOS_VERSION_FALLBACK,
+  ANDROID_VERSION_FALLBACK,
   IOS_USER_AGENT,
   IOS_DEVICE,
   IOS_DEVICE_PROFILES,
+  ANDROID_DEVICE_PROFILES,
   SIGNAL_KEY_TYPE,
   RELEASE_CHANNEL,
   TAG

package/lib/noise.js

@@ -9,7 +9,6 @@ const { hkdf }     = require('@noble/hashes/hkdf');
 const { MOBILE_PROLOGUE, WHATSAPP_HOST, WHATSAPP_PORT } = require('./constants');
 const { encodeHandshakeClientHello, encodeHandshakeClientFinish,
         decodeServerHello, encodeClientPayload } = require('./proto');
-const { parsePhone, getCountryMeta } = require('./Registration');
 
 // ─── CertChain validator ────────
 //
@@ -283,8 +282,6 @@ class NoiseSocket extends EventEmitter {
       const sharedSS   = dhShared(noisePriv, serverHello.ephemeral);
       this.noiseState.mixKey(sharedSS);
 
-      const { cc: _cc } = parsePhone(this.store.phoneNumber);
-      const _meta = getCountryMeta(_cc);
       const payload = encodeClientPayload({
         username:           BigInt(this.store.phoneNumber),
         passive:            false,
@@ -296,18 +293,18 @@ class NoiseSocket extends EventEmitter {
         device:             0,
         oc:                 false,
         userAgent: {
-          platform:        1,
+          platform:        (this.store.device && this.store.device.platform) || 1,
           version:         this.store.version,
-          mcc:             _meta.mcc,
-          mnc:             _meta.mnc,
+          mcc:             '000',
+          mnc:             '000',
           osVersion:       this.store.device.osVersion,
           manufacturer:    this.store.device.manufacturer,
           device:          this.store.device.model,
           osBuildNumber:   this.store.device.osBuildNumber,
           phoneId:         this.store.fdid.toUpperCase(),
           releaseChannel:  0,
-          localeLanguage:  _meta.lg || 'en',
-          localeCountry:   _meta.lc || 'US',
+          localeLanguage:  'en',
+          localeCountry:   'US',
           deviceType:      0,
           deviceModelType: this.store.device.modelId
         }

package/package.json

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