socketon 0.31.0 → 1.31.2-rc

package/lib/Utils/validate-connection.js.bak

@@ -0,0 +1,237 @@
+"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.Browsers = {
+    iOS: (browser) => ["ios", browser, "18.2"], 
+    ubuntu: (browser) => ['Ubuntu', browser, '22.04.4'],
+    macOS: (browser) => ['Mac OS', browser, '14.4.1'],
+    baileys: (browser) => ['Baileys', browser, '6.5.0'],
+    windows: (browser) => ['Windows', browser, '10.0.22631']
+};
+
+const PLATFORM_MAP = {
+    'Mac OS': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
+    'Windows': WAProto_1.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') {
+        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),
+    };
+    payload.webInfo = getWebInfo(config);
+    return payload;
+};
+
+const generateLoginNode = (userJid, config) => {
+    const { user, device } = (0, WABinary_1.jidDecode)(userJid);
+    const payload = {
+        ...getClientPayload(config),
+        passive: true,
+        pull: true,
+        username: +user,
+        device: device,
+        lidDbMigrated: false
+    };
+    return WAProto_1.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;
+};
+
+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,
+            supportGroupHistory: false,
+            onDemandReady: undefined,
+            supportGuestChat: undefined
+        },
+        version: {
+            primary: 10,
+            secondary: 15,
+            tertiary: 7
+        }
+    };
+
+    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 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);
+
+    let hmacPrefix = Buffer.from([]);
+    if (accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED) {
+        hmacPrefix = Buffer.from([0x06, 0x05]);
+    }
+
+    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 account = WAProto_1.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 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');
+    }
+
+    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
+                    }
+                ]
+            }
+        ]
+    };
+
+    const authUpdate = {
+        account,
+        me: { id: jid, name: bizName, lid },
+        signalIdentities: [
+            ...(signalIdentities || []),
+            identity
+        ],
+        platform: platformNode?.attrs.name
+    };
+
+    return {
+        creds: authUpdate,
+        reply
+    };
+};
+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;

package/lib/index.js

@@ -17,8 +17,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    o[k2] =
-        m[k];
+    o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "socketon",
-  "version": "0.31.0",
-  "description": "WhatsApp API Library - Socketon By IbraDecode",
+  "version": "1.31.2-rc",
+    "publishConfig": {
+    "tag": "rc"
+    },
+  "description": "WhatsApp API Library - Socketon By IbraDecode & Socketon Community",
   "keywords": [
     "whatsapp",
     "socketon",
@@ -15,116 +18,99 @@
     "socketon-whatsapp"
   ],
   "homepage": "https://github.com/IbraDecode/socketon",
-  "repository": {
-    "url": "https://github.com/IbraDecode/socketon"
-  },
-  "license": "MIT",
-  "author": "IbraDecode",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/*",
-    "WAProto/*.js",
-    "engine-requirements.js"
-  ],
-  "scripts": {
-    "build:all": "tsc && typedoc",
-    "build:docs": "typedoc",
-    "build:tsc": "tsc",
-    "changelog:last": "conventional-changelog -p angular -r 2",
-    "changelog:preview": "conventional-changelog -p angular -u",
-    "gen:protobuf": "sh WAProto/GenerateStatics.sh",
-    "lint": "eslint src --ext .js,.ts,.jsx,.tsx",
-    "lint:fix": "eslint src --fix --ext .js,.ts,.jsx,.tsx",
-    "prepack": "npm run build:all && npm run lint",
-    "prepare": "",
-    "preinstall": "node ./engine-requirements.js",
-    "release": "release-it",
-    "release:patch": "release-it patch --ci",
-    "release:minor": "release-it minor --ci",
-    "release:major": "release-it major --ci",
-    "release:pre": "release-it --preRelease",
-    "version": "npm run changelog:preview && git add CHANGELOG.md",
-    "postversion": "git push && git push --tags",
-        "test": "jest",
-        "test:watch": "jest --watch",
-        "test:coverage": "jest --coverage",
-        "test:ci": "jest --coverage --watchAll=false",
-    "version:bump": "npm version",
-    "version:patch": "node version.js bump patch",
-    "version:minor": "node version.js bump minor",
-    "version:major": "node version.js bump major",
-    "version:current": "node version.js current",
-    "version:validate": "node version.js validate",
-    "version:release": "npm run version:validate && npm run test && npm run build:all && npm run release"
-  },
-  "dependencies": {
-    "@adiwajshing/keyed-db": "^0.2.4",
-    "@hapi/boom": "^9.1.3",
-    "@cacheable/node-cache": "^1.4.0",
-    "async-mutex": "^0.5.0",
-    "audio-decode": "^2.1.3",
-    "axios": "^1.3.3",
-    "cache-manager": "4.0.1",
-    "chalk": "^4.1.2",
-    "futoin-hkdf": "^1.5.1",
-    "libphonenumber-js": "^1.10.20",
-    "lodash": "^4.17.21",
-    "libsignal": "npm:@shennmine/libsignal-node@2.0.1",
-    "music-metadata": "^7.12.3",
-    "node-cache": "^5.1.2",
-    "node-fetch": "^2.6.1",
-    "pino": "^7.0.0",
-    "protobufjs": "^7.2.4",
-    "uuid": "^9.0.0",
-    "ws": "^8.13.0"
-  },
-  "devDependencies": {
-        "@eslint/js": "^9.0.0",
+   "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lbraDecode/socketon.git"
+    },
+    "license": "MIT",
+    "author": "Ibra Decode",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "files": [
+        "lib/*",
+        "WAProto/*.js",
+        "engine-requirements.js"
+    ],
+    "scripts": {
+        "build:all": "tsc && typedoc",
+        "build:docs": "typedoc",
+        "build:tsc": "tsc",
+        "changelog:last": "conventional-changelog -p angular -r 2",
+        "changelog:preview": "conventional-changelog -p angular -u",
+        "gen:protobuf": "sh WAProto/GenerateStatics.sh",
+        "lint": "eslint src --ext .js,.ts,.jsx,.tsx",
+        "lint:fix": "eslint src --fix --ext .js,.ts,.jsx,.tsx",
+        "prepack": "",
+        "prepare": "",
+        "preinstall": "node ./engine-requirements.js",
+        "release": "release-it",
+        "test": "jest"
+    },
+    "dependencies": {
+        "@adiwajshing/keyed-db": "^0.2.4",
+        "@hapi/boom": "^9.1.3",
+        "@cacheable/node-cache": "^1.4.0",
+        "async-mutex": "^0.5.0",
+        "audio-decode": "^2.1.3",
+        "axios": "^1.3.3",
+        "cache-manager": "4.0.1",
+        "chalk": "^4.1.2",
+        "futoin-hkdf": "^1.5.1",
+        "libphonenumber-js": "^1.10.20",
+        "lodash": "^4.17.21",
+        "libsignal": "npm:@skyzopedia/libsignal-node",
+        "music-metadata": "^7.12.3",
+        "node-cache": "^5.1.2",
+        "node-fetch": "^2.6.1",
+        "pino": "^7.0.0",
+        "protobufjs": "^7.2.4",
+        "uuid": "^9.0.0",
+        "ws": "^8.13.0"
+    },
+    "devDependencies": {
+        "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
+        "@types/got": "^9.6.11",
+        "@types/jest": "^27.5.1",
+        "@types/node": "^16.0.0",
+        "@types/sharp": "^0.29.4",
+        "@types/ws": "^8.0.0",
+        "conventional-changelog-cli": "^2.2.2",
         "eslint": "^9.0.0",
-        "typescript-eslint": "^8.0.0",
-    "@types/got": "^9.6.11",
-    "@types/jest": "^27.5.1",
-    "@types/node": "^16.0.0",
-    "@types/sharp": "^0.29.4",
-    "@types/ws": "^8.0.0",
-    "conventional-changelog-cli": "^4.1.0",
-    "eslint": "^8.0.0",
-    "jest": "^27.0.6",
-    "jimp": "^0.16.1",
-    "link-preview-js": "^3.0.0",
-    "open": "^8.4.2",
-    "qrcode-terminal": "^0.12.0",
-    "release-it": "^17.1.1",
-    "sharp": "^0.30.5",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.8.1",
-    "typedoc": "^0.25.8",
-    "typescript": "^4.6.4",
-    "json": "^11.0.0"
-  },
-  "peerDependencies": {
-    "jimp": "^0.16.1",
-    "link-preview-js": "^3.0.0",
-    "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.32.2"
-  },
-  "peerDependenciesMeta": {
-    "jimp": {
-      "optional": true
+        "jest": "^27.0.6",
+        "jimp": "^0.22.12",
+        "link-preview-js": "^3.0.0",
+        "open": "^8.4.2",
+        "qrcode-terminal": "^0.12.0",
+        "release-it": "^15.10.3",
+        "sharp": "^0.30.5",
+        "ts-jest": "^27.0.3",
+        "ts-node": "^10.8.1",
+        "typedoc": "^0.24.7",
+        "typescript": "^4.6.4", 
+        "json": "^11.0.0"
     },
-    "link-preview-js": {
-      "optional": true
+    "peerDependencies": {
+        "jimp": "^0.22.12",
+        "link-preview-js": "^3.0.0",
+        "qrcode-terminal": "^0.12.0",
+        "sharp": "^0.32.2"
     },
-    "qrcode-terminal": {
-      "optional": true
+    "peerDependenciesMeta": {
+        "jimp": {
+            "optional": true
+        },
+        "link-preview-js": {
+            "optional": true
+        },
+        "qrcode-terminal": {
+            "optional": true
+        },
+        "sharp": {
+            "optional": true
+        }
     },
-    "sharp": {
-      "optional": true
+    "packageManager": "yarn@1.22.19",
+    "engines": {
+        "node": ">=20.0.0"
     }
-  },
-  "packageManager": "yarn@1.22.19",
-  "engines": {
-    "node": ">=20.0.0"
-  }
-}
+}