violetics 7.0.1-alpha → 7.0.2-alpha

package/lib/Utils/use-multi-file-auth-state.js

@@ -1,27 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useMultiFileAuthState = void 0;
-const async_mutex_1 = require("async-mutex");
-const promises_1 = require("fs/promises");
-const path_1 = require("path");
-const WAProto_1 = require("../../WAProto");
-const auth_utils_1 = require("./auth-utils");
-const generics_1 = require("./generics");
+import { Mutex } from 'async-mutex';
+import { mkdir, readFile, stat, unlink, writeFile } from 'fs/promises';
+import { join } from 'path';
+import { proto } from '../../WAProto/index.js';
+import { initAuthCreds } from './auth-utils.js';
+import { BufferJSON } from './generics.js';
+// We need to lock files due to the fact that we are using async functions to read and write files
+// https://github.com/WhiskeySockets/Baileys/issues/794
+// https://github.com/nodejs/node/issues/26338
+// Use a Map to store mutexes for each file path
 const fileLocks = new Map();
-const fileLockRegistry = new FinalizationRegistry((path) => {
-    // Clean up the mutex entry when it's been garbage-collected so the
-    // Map doesn't grow unboundedly when running hundreds of bot sessions.
-    fileLocks.delete(path);
-});
+// Get or create a mutex for a specific file path
 const getFileLock = (path) => {
-    let entry = fileLocks.get(path);
-    if (entry) {
-        const mutex = entry.deref();
-        if (mutex) return mutex;
+    let mutex = fileLocks.get(path);
+    if (!mutex) {
+        mutex = new Mutex();
+        fileLocks.set(path, mutex);
     }
-    const mutex = new async_mutex_1.Mutex();
-    fileLocks.set(path, new WeakRef(mutex));
-    fileLockRegistry.register(mutex, path);
     return mutex;
 };
 /**
@@ -31,16 +25,14 @@ const getFileLock = (path) => {
  * Again, I wouldn't endorse this for any production level use other than perhaps a bot.
  * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
  * */
-const useMultiFileAuthState = async (folder) => {
+export const useMultiFileAuthState = async (folder) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const writeData = async (data, file) => {
-        const filePath = (0, path_1.join)(folder, fixFileName(file));
-        const tmpPath = filePath + '.tmp';
+        const filePath = join(folder, fixFileName(file));
         const mutex = getFileLock(filePath);
         return mutex.acquire().then(async (release) => {
             try {
-                // Atomic write: write to temp file first, then rename to avoid corruption on crash
-                await (0, promises_1.writeFile)(tmpPath, JSON.stringify(data, generics_1.BufferJSON.replacer));
-                await (0, promises_1.rename)(tmpPath, filePath);
+                await writeFile(filePath, JSON.stringify(data, BufferJSON.replacer));
             }
             finally {
                 release();
@@ -49,12 +41,12 @@ const useMultiFileAuthState = async (folder) => {
     };
     const readData = async (file) => {
         try {
-            const filePath = (0, path_1.join)(folder, fixFileName(file));
+            const filePath = join(folder, fixFileName(file));
             const mutex = getFileLock(filePath);
             return await mutex.acquire().then(async (release) => {
                 try {
-                    const data = await (0, promises_1.readFile)(filePath, { encoding: 'utf-8' });
-                    return JSON.parse(data, generics_1.BufferJSON.reviver);
+                    const data = await readFile(filePath, { encoding: 'utf-8' });
+                    return JSON.parse(data, BufferJSON.reviver);
                 }
                 finally {
                     release();
@@ -67,34 +59,32 @@ const useMultiFileAuthState = async (folder) => {
     };
     const removeData = async (file) => {
         try {
-            const filePath = (0, path_1.join)(folder, fixFileName(file));
+            const filePath = join(folder, fixFileName(file));
             const mutex = getFileLock(filePath);
             return mutex.acquire().then(async (release) => {
                 try {
-                    await (0, promises_1.unlink)(filePath);
+                    await unlink(filePath);
                 }
-                catch (_a) {
+                catch {
                 }
                 finally {
                     release();
                 }
             });
         }
-        catch (_a) {
-        }
+        catch { }
     };
-    const folderInfo = await (0, promises_1.stat)(folder).catch(() => { });
+    const folderInfo = await stat(folder).catch(() => { });
     if (folderInfo) {
         if (!folderInfo.isDirectory()) {
             throw new Error(`found something that is not a directory at ${folder}, either delete it or specify a different location`);
         }
     }
     else {
-        await (0, promises_1.mkdir)(folder, { recursive: true });
+        await mkdir(folder, { recursive: true });
     }
-    const fixFileName = (file) => { var _a; return (_a = file === null || file === void 0 ? void 0 : file.replace(/\//g, '__')) === null || _a === void 0 ? void 0 : _a.replace(/:/g, '-'); };
-    const creds = await readData('creds.json') || (0, auth_utils_1.initAuthCreds)();
-
+    const fixFileName = (file) => file?.replace(/\//g, '__')?.replace(/:/g, '-');
+    const creds = (await readData('creds.json')) || initAuthCreds();
     return {
         state: {
             creds,
@@ -104,7 +94,7 @@ const useMultiFileAuthState = async (folder) => {
                     await Promise.all(ids.map(async (id) => {
                         let value = await readData(`${type}-${id}.json`);
                         if (type === 'app-state-sync-key' && value) {
-                            value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value);
+                            value = proto.Message.AppStateSyncKeyData.fromObject(value);
                         }
                         data[id] = value;
                     }));
@@ -123,8 +113,8 @@ const useMultiFileAuthState = async (folder) => {
                 }
             }
         },
-        // Write credentials immediately (no debounce) to prevent session loss on crash
-        saveCreds: () => writeData(creds, 'creds.json')
+        saveCreds: async () => {
+            return writeData(creds, 'creds.json');
+        }
     };
-};
-exports.useMultiFileAuthState = useMultiFileAuthState;
+};

package/lib/Utils/validate-connection.js

@@ -1,94 +1,102 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeSignedDeviceIdentity = exports.configureSuccessfulPairing = exports.generateRegistrationNode = exports.generateLoginNode = void 0;
-const boom_1 = require("@hapi/boom");
-const crypto_1 = require("crypto");
-const WAProto_1 = require("../../WAProto");
-const Defaults_1 = require("../Defaults");
-const WABinary_1 = require("../WABinary");
-const crypto_2 = require("./crypto");
-const generics_1 = require("./generics");
-const signal_1 = require("./signal");
-
+import { Boom } from '@hapi/boom';
+import { createHash } from 'crypto';
+import { proto } from '../../WAProto/index.js';
+import { KEY_BUNDLE_TYPE, WA_ADV_ACCOUNT_SIG_PREFIX, WA_ADV_DEVICE_SIG_PREFIX, WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX } from '../Defaults/index.js';
+import { getBinaryNodeChild, jidDecode, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { Curve, hmacSign } from './crypto.js';
+import { encodeBigEndian } from './generics.js';
+import { createSignalIdentity } from './signal.js';
 const getUserAgent = (config) => {
     return {
         appVersion: {
             primary: config.version[0],
             secondary: config.version[1],
-            tertiary: config.version[2],
+            tertiary: config.version[2]
         },
-        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
-        releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        osVersion: '10.0.22631',
+        platform: config.browser[1].toLocaleLowerCase().includes('android')
+            ? proto.ClientPayload.UserAgent.Platform.ANDROID
+            : proto.ClientPayload.UserAgent.Platform.WEB,
+        releaseChannel: proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
+        osVersion: '0.1',
         device: 'Desktop',
-        osBuildNumber: '10.0.22631',
+        osBuildNumber: '0.1',
         localeLanguageIso6391: 'en',
-        localeCountryIso31661Alpha2: config.countryCode || 'US'
+        mnc: '000',
+        mcc: '000',
+        localeCountryIso31661Alpha2: config.countryCode
     };
 };
-
 const PLATFORM_MAP = {
-    'Mac OS': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
-    'Windows': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
+    'Mac OS': proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
+    Windows: proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
 };
-
 const getWebInfo = (config) => {
-    let webSubPlatform = WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WEB_BROWSER;
-    if (config.syncFullHistory && PLATFORM_MAP[config.browser[0]] && config.browser[1] === 'Desktop') {
+    let webSubPlatform = proto.ClientPayload.WebInfo.WebSubPlatform.WEB_BROWSER;
+    if (config.syncFullHistory &&
+        PLATFORM_MAP[config.browser[0]] &&
+        config.browser[1] === 'Desktop') {
         webSubPlatform = PLATFORM_MAP[config.browser[0]];
     }
     return { webSubPlatform };
 };
-
 const getClientPayload = (config) => {
     const payload = {
-        connectType: WAProto_1.proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
-        connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
-        userAgent: getUserAgent(config),
+        connectType: proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
+        connectReason: proto.ClientPayload.ConnectReason.USER_ACTIVATED,
+        userAgent: getUserAgent(config)
     };
-    payload.webInfo = getWebInfo(config);
+    if (!config.browser[1].toLocaleLowerCase().includes('android')) {
+        payload.webInfo = getWebInfo(config);
+    }
     return payload;
 };
-
-const generateLoginNode = (userJid, config) => {
-    const { user, device } = (0, WABinary_1.jidDecode)(userJid);
+export const generateLoginNode = (userJid, config) => {
+    const { user, device } = jidDecode(userJid);
     const payload = {
         ...getClientPayload(config),
         passive: true,
         pull: true,
         username: +user,
         device: device,
+        // TODO: investigate (hard set as false atm)
         lidDbMigrated: false
     };
-    return WAProto_1.proto.ClientPayload.fromObject(payload);
+    return proto.ClientPayload.fromObject(payload);
 };
-exports.generateLoginNode = generateLoginNode;
-
 const getPlatformType = (platform) => {
     const platformType = platform.toUpperCase();
-    return WAProto_1.proto.DeviceProps.PlatformType[platformType] || WAProto_1.proto.DeviceProps.PlatformType.CHROME;
+    if (platformType === 'ANDROID') {
+        return proto.DeviceProps.PlatformType.ANDROID_PHONE;
+    }
+    return (proto.DeviceProps.PlatformType[platformType] ||
+        proto.DeviceProps.PlatformType.CHROME);
 };
-
-const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
-    const appVersionBuf = (0, crypto_1.createHash)('md5')
-        .update(config.version.join('.'))
+export const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
+    // the app version needs to be md5 hashed
+    // and passed in
+    const appVersionBuf = createHash('md5')
+        .update(config.version.join('.')) // join as string
         .digest();
-
     const companion = {
         os: config.browser[0],
         platformType: getPlatformType(config.browser[1]),
         requireFullSync: config.syncFullHistory,
         historySyncConfig: {
             storageQuotaMb: 10240,
-            inlineInitialPayloadInE2EeMsg: false,
-            supportBotUserAgentChatHistory: false,
+            inlineInitialPayloadInE2EeMsg: true,
+            recentSyncDaysLimit: undefined,
+            supportCallLogHistory: false,
+            supportBotUserAgentChatHistory: true,
             supportCagReactionsAndPolls: true,
             supportBizHostedMsg: true,
             supportRecentSyncChunkMessageCountTuning: true,
             supportHostedGroupMsg: true,
-            supportFbidBotChatHistory: false,
+            supportFbidBotChatHistory: true,
+            supportAddOnHistorySyncMigration: undefined,
             supportMessageAssociation: true,
-            supportGroupHistory: true,
+            supportGroupHistory: false,
+            onDemandReady: undefined,
+            supportGuestChat: undefined
         },
         version: {
             primary: 10,
@@ -96,9 +104,7 @@ const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentity
             tertiary: 7
         }
     };
-
-    const companionProto = WAProto_1.proto.DeviceProps.encode(companion).finish();
-
+    const companionProto = proto.DeviceProps.encode(companion).finish();
     const registerPayload = {
         ...getClientPayload(config),
         passive: false,
@@ -106,77 +112,63 @@ const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentity
         devicePairingData: {
             buildHash: appVersionBuf,
             deviceProps: companionProto,
-            eRegid: (0, generics_1.encodeBigEndian)(registrationId),
-            eKeytype: Defaults_1.KEY_BUNDLE_TYPE,
+            eRegid: encodeBigEndian(registrationId),
+            eKeytype: KEY_BUNDLE_TYPE,
             eIdent: signedIdentityKey.public,
-            eSkeyId: (0, generics_1.encodeBigEndian)(signedPreKey.keyId, 3),
+            eSkeyId: encodeBigEndian(signedPreKey.keyId, 3),
             eSkeyVal: signedPreKey.keyPair.public,
-            eSkeySig: signedPreKey.signature,
-        },
+            eSkeySig: signedPreKey.signature
+        }
     };
-    return WAProto_1.proto.ClientPayload.fromObject(registerPayload);
+    return proto.ClientPayload.fromObject(registerPayload);
 };
-exports.generateRegistrationNode = generateRegistrationNode;
-
-const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, signalIdentities }) => {
+export const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, signalIdentities }) => {
     const msgId = stanza.attrs.id;
-    const pairSuccessNode = (0, WABinary_1.getBinaryNodeChild)(stanza, 'pair-success');
-    const deviceIdentityNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'device-identity');
-    const platformNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'platform');
-    const deviceNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'device');
-    const businessNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'biz');
-
+    const pairSuccessNode = getBinaryNodeChild(stanza, 'pair-success');
+    const deviceIdentityNode = getBinaryNodeChild(pairSuccessNode, 'device-identity');
+    const platformNode = getBinaryNodeChild(pairSuccessNode, 'platform');
+    const deviceNode = getBinaryNodeChild(pairSuccessNode, 'device');
+    const businessNode = getBinaryNodeChild(pairSuccessNode, 'biz');
     if (!deviceIdentityNode || !deviceNode) {
-        throw new boom_1.Boom('Missing device-identity or device in pair success node', { data: stanza });
+        throw new Boom('Missing device-identity or device in pair success node', { data: stanza });
     }
-
     const bizName = businessNode?.attrs.name;
     const jid = deviceNode.attrs.jid;
     const lid = deviceNode.attrs.lid;
-
-    const { details, hmac, accountType } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
-
+    const { details, hmac, accountType } = proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
     let hmacPrefix = Buffer.from([]);
-    if (accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED) {
-        hmacPrefix = Buffer.from([0x06, 0x05]);
+    if (accountType !== undefined && accountType === proto.ADVEncryptionType.HOSTED) {
+        hmacPrefix = WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX;
     }
-
-    const advSign = (0, crypto_2.hmacSign)(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
+    const advSign = hmacSign(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
     if (Buffer.compare(hmac, advSign) !== 0) {
-        throw new boom_1.Boom('Invalid account signature');
+        throw new Boom('Invalid account signature');
     }
-
-    const account = WAProto_1.proto.ADVSignedDeviceIdentity.decode(details);
+    const account = proto.ADVSignedDeviceIdentity.decode(details);
     const { accountSignatureKey, accountSignature, details: deviceDetails } = account;
-
-    const deviceIdentity = WAProto_1.proto.ADVDeviceIdentity.decode(deviceDetails);
-
-    const accountSignaturePrefix = deviceIdentity.deviceType === WAProto_1.proto.ADVEncryptionType.HOSTED 
-        ? Buffer.from([0x06, 0x05])
-        : Buffer.from([0x06, 0x00]);
+    const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails);
+    const accountSignaturePrefix = deviceIdentity.deviceType === proto.ADVEncryptionType.HOSTED
+        ? WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
+        : WA_ADV_ACCOUNT_SIG_PREFIX;
     const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public]);
-    
-    if (!crypto_2.Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
-        throw new boom_1.Boom('Failed to verify account signature');
+    if (!Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
+        throw new Boom('Failed to verify account signature');
     }
-
     const deviceMsg = Buffer.concat([
-        Buffer.from([0x06, 0x01]),
+        WA_ADV_DEVICE_SIG_PREFIX,
         deviceDetails,
         signedIdentityKey.public,
         accountSignatureKey
     ]);
-    account.deviceSignature = crypto_2.Curve.sign(signedIdentityKey.private, deviceMsg);
-
-    const identity = (0, signal_1.createSignalIdentity)(jid, accountSignatureKey);
-    const accountEnc = (0, exports.encodeSignedDeviceIdentity)(account, false);
-
+    account.deviceSignature = Curve.sign(signedIdentityKey.private, deviceMsg);
+    const identity = createSignalIdentity(lid, accountSignatureKey);
+    const accountEnc = encodeSignedDeviceIdentity(account, false);
     const reply = {
         tag: 'iq',
         attrs: {
-            to: WABinary_1.S_WHATSAPP_NET,
+            to: S_WHATSAPP_NET,
             type: 'result',
-            id: msgId,
+            id: msgId
         },
         content: [
             {
@@ -192,31 +184,23 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
             }
         ]
     };
-
     const authUpdate = {
         account,
         me: { id: jid, name: bizName, lid },
-        signalIdentities: [
-            ...(signalIdentities || []),
-            identity
-        ],
+        signalIdentities: [...(signalIdentities || []), identity],
         platform: platformNode?.attrs.name
     };
-
     return {
         creds: authUpdate,
         reply
     };
 };
-exports.configureSuccessfulPairing = configureSuccessfulPairing;
-
-const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
+export const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
     account = { ...account };
+    // set to null if we are not to include the signature key
+    // or if we are including the signature key but it is empty
     if (!includeSignatureKey || !account.accountSignatureKey?.length) {
         account.accountSignatureKey = null;
     }
-    return WAProto_1.proto.ADVSignedDeviceIdentity
-        .encode(account)
-        .finish();
-};
-exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;
+    return proto.ADVSignedDeviceIdentity.encode(account).finish();
+};