whalibmob 5.12.13 → 5.12.14

package/lib/Registration.js

@@ -137,7 +137,7 @@ function socksProxyUrl() {
   return process.env.TOR_PROXY || process.env.SOCKS_PROXY || '';
 }
 
-async function httpPostViaSocks(path, body, waVersion, proxyUrl, authHeader) {
+async function httpPostViaSocks(path, body, waVersion, proxyUrl, authHeader, device) {
   const proxy = parseSocksProxy(proxyUrl);
   const dHost = 'v.whatsapp.net';
   const dPort = 443;
@@ -164,7 +164,7 @@ async function httpPostViaSocks(path, body, waVersion, proxyUrl, authHeader) {
     tlsSocket.once('error', rej);
   });
 
-  const headers  = registrationHeaders(getDeviceConfig(), waVersion);
+  const headers  = registrationHeaders(device || getDeviceConfig(), waVersion);
   const reqLines = [
     `POST /v2${path} HTTP/1.1`,
     `Host: ${dHost}`,
@@ -590,9 +590,9 @@ function tryLoadAndroidMaterial() {
  * A no-op on iOS, and WA_NO_APK_DOWNLOAD=1 turns it off for anyone who would
  * rather a hundred megabytes were never fetched without being asked for.
  */
-async function ensureAndroidMaterial(opts) {
+async function ensureAndroidMaterial(opts, device) {
   opts = opts || {};
-  const device = getDeviceConfig();
+  device = device || getDeviceConfig();
   if (device.os !== 'android') return null;
 
   try {
@@ -676,8 +676,8 @@ function loadAndroidMaterial() {
   return _androidMaterial;
 }
 
-function computeToken(waVersion, national) {
-  const device = getDeviceConfig();
+function computeToken(waVersion, national, device) {
+  device = device || getDeviceConfig();
   if (device.os === 'android') {
     return AndroidApk.computeToken(loadAndroidMaterial(), national);
   }
@@ -817,8 +817,8 @@ function toBase64Url(buf) {
 async function buildPayload(store, waVersion, useToken, extraPairs) {
   const { cc, national } = parsePhone(store.phoneNumber);
   const meta   = getCountryMeta(cc);
-  const token  = useToken ? computeToken(waVersion, national) : null;
   const device = store.device || getDeviceConfig();
+  const token  = useToken ? computeToken(waVersion, national, device) : null;
   // Android formats fdid lowercase, iOS uppercase (matches the native clients).
   const fdid   = device.os === 'android'
     ? store.fdid.toLowerCase()
@@ -874,14 +874,14 @@ function encryptPayload(plaintext) {
 
 // ---------- HTTP ----------
 
-function httpPost(path, body, waVersion, authHeader) {
+function httpPost(path, body, waVersion, authHeader, device) {
   const proxy = socksProxyUrl();
-  if (proxy) return httpPostViaSocks(path, body, waVersion, proxy, authHeader);
+  if (proxy) return httpPostViaSocks(path, body, waVersion, proxy, authHeader, device);
 
   return new Promise((resolve, reject) => {
     const bodyBuf = Buffer.from(body, 'utf8');
     const headers = Object.assign(
-      registrationHeaders(getDeviceConfig(), waVersion),
+      registrationHeaders(device || getDeviceConfig(), waVersion),
       { 'Content-Length': bodyBuf.length }
     );
     // Attestation cert-chain / App Attest header (Android cert chain, iOS
@@ -943,7 +943,7 @@ async function sendEncrypted(path, plaintext, store, waVersion) {
 
   _whaDbg('[DBG] REG → ' + path + ' (' + body.length + ' bytes' +
     (bodyAtt.bodyAttestation ? ', attested' : '') + ')');
-  const result = await httpPost(path, body, waVersion, bodyAtt.authorizationHeader);
+  const result = await httpPost(path, body, waVersion, bodyAtt.authorizationHeader, device);
   _whaDbg('[DBG] REG ← ' + path + ' ' +
     (result && result.status ? result.status : JSON.stringify(result).slice(0, 120)) +
     (result && result.reason ? ' reason=' + result.reason : ''));
@@ -1193,7 +1193,7 @@ async function handle2FA(store, waVersion, opts) {
 // ---------- Public API ----------
 
 async function checkIfRegistered(store) {
-  const waVersion = await fetchWaVersion(getDeviceConfig());
+  const waVersion = await fetchWaVersion(store.device || getDeviceConfig());
   return sendRequest('/exist', store, waVersion, false, null);
 }
 
@@ -1333,8 +1333,12 @@ async function requestSmsCode(store, method, opts) {
   opts   = opts   || {};
   // Before the version is read, since on Android the version comes out of the
   // APK this fetches.
-  await ensureAndroidMaterial(opts);
-  const _device   = getDeviceConfig();
+  // What a session registered as is settled when it is created, so it is the
+  // store that decides — not whatever WA_OS the shell happens to carry now. A
+  // confirmation run from a shell without the variables would otherwise sign an
+  // Android registration with an iOS token.
+  const _device   = store.device || getDeviceConfig();
+  await ensureAndroidMaterial(opts, _device);
   const waVersion = await fetchWaVersion(_device);
   store.version = waVersion;
   store.device  = _device;
@@ -1455,8 +1459,12 @@ async function verifyCode(store, code, opts) {
   opts = opts || {};
   // Normally already there from the code request, but a confirmation can be run
   // from a fresh shell that never made one.
-  await ensureAndroidMaterial(opts);
-  const _device   = getDeviceConfig();
+  // What a session registered as is settled when it is created, so it is the
+  // store that decides — not whatever WA_OS the shell happens to carry now. A
+  // confirmation run from a shell without the variables would otherwise sign an
+  // Android registration with an iOS token.
+  const _device   = store.device || getDeviceConfig();
+  await ensureAndroidMaterial(opts, _device);
   const waVersion = await fetchWaVersion(_device);
   store.version = waVersion;
   store.device  = _device;

package/package.json

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