@n4tzz/n4lyx 2.7.3 → 2.7.5

package/lib/Defaults/index.js

@@ -8,7 +8,7 @@ const WAProto_1 = require("../../WAProto");
 const libsignal_1 = require("../Signal/libsignal");
 const browser_utils_1 = require("../Utils/browser-utils");
 const logger_1 = __importDefault(require("../Utils/logger"));
-exports.version = [2, 3000, 1033105955];
+exports.version = [2, 2413, 51];
 exports.UNAUTHORIZED_CODES = [401, 403, 419];
 exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
 exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';

package/lib/Utils/validate-connection.js

@@ -1,219 +1,149 @@
 "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");
-
-const getUserAgent = (config) => {
-    return {
-        appVersion: {
-            primary: config.version[0],
-            secondary: config.version[1],
-            tertiary: config.version[2],
-        },
-        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
-        releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        osVersion: '0.1',
-        device: 'Desktop',
-        osBuildNumber: '0.1',
-        localeLanguageIso6391: 'en',
-        mnc: '000',
-        mcc: '000',
-        localeCountryIso31661Alpha2: config.countryCode || 'US'
-    };
-};
+exports.useMultiFileAuthState = void 0;
 
-const PLATFORM_MAP = {
-    'Mac OS': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
-    'Windows': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
-};
+const { Mutex } = require("async-mutex");
+const { writeFile, readFile, unlink, stat, mkdir } = require("fs/promises");
+const { join } = require("path");
+const { proto } = require("../../WAProto");
+const { initAuthCreds } = require("./auth-utils");
+const { BufferJSON } = require("./generics");
+
+const fileLocks = new Map();
 
-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') {
-        webSubPlatform = PLATFORM_MAP[config.browser[0]];
+const getFileLock = (path) => {
+    if (!fileLocks.has(path)) {
+        fileLocks.set(path, new Mutex());
     }
-    return { webSubPlatform };
+    return fileLocks.get(path);
 };
 
-const getClientPayload = (config) => {
-    const payload = {
-        connectType: WAProto_1.proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
-        connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
-        userAgent: getUserAgent(config),
-    };
-    payload.webInfo = getWebInfo(config);
-    return payload;
+const fixFileName = (file) => {
+    return file?.replace(/\//g, '__')?.replace(/:/g, '-');
 };
 
-// FIX: Hapus lidDbMigrated yang bikin WA reject
-const generateLoginNode = (userJid, config) => {
-    const { user, device } = (0, WABinary_1.jidDecode)(userJid);
-    const payload = {
-        ...getClientPayload(config),
-        passive: true,
-        pull: true,
-        username: +user,
-        device: device,
-    };
-    return WAProto_1.proto.ClientPayload.fromObject(payload);
-};
-exports.generateLoginNode = generateLoginNode;
+const delay = (ms) => new Promise(res => setTimeout(res, ms));
 
-const getPlatformType = (platform) => {
-    const platformType = platform.toUpperCase();
-    return WAProto_1.proto.DeviceProps.PlatformType[platformType] || WAProto_1.proto.DeviceProps.PlatformType.CHROME;
+const safeWrite = async (filePath, data) => {
+    const tmp = filePath + ".tmp";
+    await writeFile(tmp, JSON.stringify(data, BufferJSON.replacer));
+    await writeFile(filePath, await readFile(tmp));
+    await unlink(tmp).catch(() => { });
 };
 
-const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
-    const appVersionBuf = (0, crypto_1.createHash)('md5')
-        .update(config.version.join('.'))
-        .digest();
-
-    const companion = {
-        os: config.browser[0],
-        platformType: getPlatformType(config.browser[1]),
-        requireFullSync: config.syncFullHistory,
-        historySyncConfig: {
-            storageQuotaMb: 10240,
-            inlineInitialPayloadInE2EeMsg: true,
-            recentSyncDaysLimit: undefined,
-            supportCallLogHistory: false,
-            supportBotUserAgentChatHistory: true,
-            supportCagReactionsAndPolls: true,
-            supportBizHostedMsg: true,
-            supportRecentSyncChunkMessageCountTuning: true,
-            supportHostedGroupMsg: true,
-            supportFbidBotChatHistory: true,
-            supportAddOnHistorySyncMigration: undefined,
-            supportMessageAssociation: true,
-        },
-    };
+const useMultiFileAuthState = async (folder) => {
 
-    const companionProto = WAProto_1.proto.DeviceProps.encode(companion).finish();
-
-    const registerPayload = {
-        ...getClientPayload(config),
-        passive: false,
-        pull: false,
-        devicePairingData: {
-            buildHash: appVersionBuf,
-            deviceProps: companionProto,
-            eRegid: (0, generics_1.encodeBigEndian)(registrationId),
-            eKeytype: Defaults_1.KEY_BUNDLE_TYPE,
-            eIdent: signedIdentityKey.public,
-            eSkeyId: (0, generics_1.encodeBigEndian)(signedPreKey.keyId, 3),
-            eSkeyVal: signedPreKey.keyPair.public,
-            eSkeySig: signedPreKey.signature,
-        },
-    };
-    return WAProto_1.proto.ClientPayload.fromObject(registerPayload);
-};
-exports.generateRegistrationNode = generateRegistrationNode;
-
-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');
-
-    if (!deviceIdentityNode || !deviceNode) {
-        throw new boom_1.Boom('Missing device-identity or device in pair success node', { data: stanza });
-    }
+    const folderInfo = await stat(folder).catch(() => null);
 
-    const bizName = businessNode?.attrs.name;
-    const jid = deviceNode.attrs.jid;
-    const lid = deviceNode.attrs.lid;
+    if (folderInfo && !folderInfo.isDirectory()) {
+        throw new Error(`Path ${folder} is not a directory`);
+    }
 
-    const { details, hmac, accountType } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
+    if (!folderInfo) {
+        await mkdir(folder, { recursive: true });
+    }
 
-    const isHostedAccount = accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED;
-    const hmacPrefix = isHostedAccount ? Buffer.from([0x06, 0x05]) : Buffer.alloc(0);
+    const writeData = async (data, file) => {
+        const filePath = join(folder, fixFileName(file));
+        const mutex = getFileLock(filePath);
+
+        return mutex.acquire().then(async (release) => {
+            try {
+                await safeWrite(filePath, data);
+            } catch (e) {
+                await delay(100);
+                try {
+                    await safeWrite(filePath, data);
+                } catch (_) { }
+            } finally {
+                release();
+            }
+        });
+    };
 
-    const advSign = (0, crypto_2.hmacSign)(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
-    if (Buffer.compare(hmac, advSign) !== 0) {
-        throw new boom_1.Boom('Invalid account signature');
-    }
+    const readData = async (file) => {
+        const filePath = join(folder, fixFileName(file));
+        const mutex = getFileLock(filePath);
+
+        return mutex.acquire().then(async (release) => {
+            try {
+                const data = await readFile(filePath, { encoding: 'utf-8' });
+                return JSON.parse(data, BufferJSON.reviver);
+            } catch (_) {
+                return null;
+            } finally {
+                release();
+            }
+        });
+    };
 
-    const account = WAProto_1.proto.ADVSignedDeviceIdentity.decode(details);
-    const { accountSignatureKey, accountSignature, details: deviceDetails } = account;
+    const removeData = async (file) => {
+        const filePath = join(folder, fixFileName(file));
+        const mutex = getFileLock(filePath);
 
-    const deviceIdentity = WAProto_1.proto.ADVDeviceIdentity.decode(deviceDetails);
+        return mutex.acquire().then(async (release) => {
+            try {
+                await unlink(filePath);
+            } catch (_) { }
+            finally {
+                release();
+            }
+        });
+    };
 
-    const accountSignaturePrefix = deviceIdentity.deviceType === WAProto_1.proto.ADVEncryptionType.HOSTED
-        ? Buffer.from([0x06, 0x05])
-        : Buffer.from([0x06, 0x00]);
-    const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public]);
+    let creds = await readData('creds.json');
 
-    if (!crypto_2.Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
-        throw new boom_1.Boom('Failed to verify account signature');
+    if (!creds) {
+        creds = initAuthCreds();
+        await writeData(creds, 'creds.json');
     }
 
-    const deviceMsg = Buffer.concat([
-        Buffer.from([0x06, 0x01]),
-        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);
-
-    const reply = {
-        tag: 'iq',
-        attrs: {
-            to: WABinary_1.S_WHATSAPP_NET,
-            type: 'result',
-            id: msgId,
-        },
-        content: [
-            {
-                tag: 'pair-device-sign',
-                attrs: {},
-                content: [
-                    {
-                        tag: 'device-identity',
-                        attrs: { 'key-index': deviceIdentity.keyIndex.toString() },
-                        content: accountEnc
+    return {
+        state: {
+            creds,
+            keys: {
+                get: async (type, ids) => {
+                    const data = {};
+
+                    await Promise.all(ids.map(async (id) => {
+                        let value = await readData(`${type}-${id}.json`);
+
+                        if (type === 'app-state-sync-key' && value) {
+                            value = proto.Message.AppStateSyncKeyData.fromObject(value);
+                        }
+
+                        data[id] = value;
+                    }));
+
+                    return data;
+                },
+
+                set: async (data) => {
+                    const tasks = [];
+
+                    for (const category in data) {
+                        for (const id in data[category]) {
+                            const value = data[category][id];
+                            const file = `${category}-${id}.json`;
+
+                            if (value) {
+                                tasks.push(writeData(value, file));
+                            } else {
+                                tasks.push(removeData(file));
+                            }
+                        }
                     }
-                ]
-            }
-        ]
-    };
 
-    const authUpdate = {
-        account,
-        me: { id: jid, name: bizName, lid },
-        signalIdentities: [
-            ...(signalIdentities || []),
-            identity
-        ],
-        platform: platformNode?.attrs.name
-    };
+                    await Promise.all(tasks);
+                }
+            }
+        },
 
-    return {
-        creds: authUpdate,
-        reply
+        saveCreds: async () => {
+            await writeData(creds, 'creds.json');
+        }
     };
 };
-exports.configureSuccessfulPairing = configureSuccessfulPairing;
 
-const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
-    account = { ...account };
-    if (!includeSignatureKey || !account.accountSignatureKey?.length) {
-        account.accountSignatureKey = null;
-    }
-    return WAProto_1.proto.ADVSignedDeviceIdentity
-        .encode(account)
-        .finish();
-};
-exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;
+exports.useMultiFileAuthState = useMultiFileAuthState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n4tzz/n4lyx",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "description": "N4lyx - WhatsApp Web API Library powered by N4tzzOfficial",
   "keywords": [
     "n4lyx",