@jkt48connect-corp/baileys 7.2.7 → 7.2.9

package/lib/Utils/validate-connection.js

@@ -10,30 +10,21 @@ const crypto_2 = require("./crypto");
 const generics_1 = require("./generics");
 const signal_1 = require("./signal");
 const getUserAgent = (config) => {
-    var _a, _b;
-    const osVersion = config.mobile ? '15.3.1' : '0.1';
-    const version = config.mobile ? [2, 24, 6] : config.version;
-    const device = config.mobile ? 'iPhone_7' : 'Desktop';
-    const manufacturer = config.mobile ? 'Apple' : '';
-    const platform = config.mobile ? WAProto_1.proto.ClientPayload.UserAgent.Platform.IOS : WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB;
-    const phoneId = config.mobile ? { phoneId: config.auth.creds.phoneId } : {};
     return {
         appVersion: {
-            primary: version[0],
-            secondary: version[1],
-            tertiary: version[2],
+            primary: config.version[0],
+            secondary: config.version[1],
+            tertiary: config.version[2],
         },
-        platform,
+        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
         releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        mcc: ((_a = config.auth.creds.registration) === null || _a === void 0 ? void 0 : _a.phoneNumberMobileCountryCode) || '000',
-        mnc: ((_b = config.auth.creds.registration) === null || _b === void 0 ? void 0 : _b.phoneNumberMobileNetworkCode) || '000',
-        osVersion: osVersion,
-        manufacturer,
-        device,
-        osBuildNumber: osVersion,
+        osVersion: '0.1',
+        device: 'Desktop',
+        osBuildNumber: '0.1',
         localeLanguageIso6391: 'en',
-        localeCountryIso31661Alpha2: 'US',
-        ...phoneId
+        mnc: '000',
+        mcc: '000',
+        localeCountryIso31661Alpha2: config.countryCode,
     };
 };
 const PLATFORM_MAP = {
@@ -53,9 +44,7 @@ const getClientPayload = (config) => {
         connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
         userAgent: getUserAgent(config),
     };
-    if (!config.mobile) {
-        payload.webInfo = getWebInfo(config);
-    }
+    payload.webInfo = getWebInfo(config);
     return payload;
 };
 const generateMobileNode = (config) => {
@@ -72,7 +61,7 @@ const generateMobileNode = (config) => {
             appCached: false,
             dnsMethod: WAProto_1.proto.ClientPayload.DNSSource.DNSResolutionMethod.SYSTEM,
         },
-        passive: false,
+        passive: false, // XMPP heartbeat setting (false: server actively pings) (true: client actively pings)
         pushName: 'test',
         username: Number(`${config.auth.creds.registration.phoneNumberCountryCode}${config.auth.creds.registration.phoneNumberNationalNumber}`),
     };

package/lib/WABinary/decode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeBinaryNode = exports.decodeDecompressedBinaryNode = exports.decompressingIfRequired = void 0;
 const zlib_1 = require("zlib");

package/lib/WABinary/encode.js

@@ -15,18 +15,33 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeBinaryNode = void 0;
 const constants = __importStar(require("./constants"));
 const jid_utils_1 = require("./jid-utils");
-const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0]) => {
+const encodeBinaryNode = (node, opts = constants, buffer = [0]) => {
+    const encoded = encodeBinaryNodeInner(node, opts, buffer);
+    return Buffer.from(encoded);
+};
+exports.encodeBinaryNode = encodeBinaryNode;
+const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
     const { TAGS, TOKEN_MAP } = opts;
     const pushByte = (value) => buffer.push(value & 0xff);
     const pushInt = (value, n, littleEndian = false) => {
@@ -35,7 +50,11 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
             buffer.push((value >> (curShift * 8)) & 0xff);
         }
     };
-    const pushBytes = (bytes) => (bytes.forEach(b => buffer.push(b)));
+    const pushBytes = (bytes) => {
+        for (const b of bytes) {
+            buffer.push(b);
+        }
+    };
     const pushInt16 = (value) => {
         pushBytes([(value >> 8) & 0xff, value & 0xff]);
     };
@@ -137,8 +156,7 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
         if (str.length > TAGS.PACKED_MAX) {
             return false;
         }
-        for (let i = 0; i < str.length; i++) {
-            const char = str[i];
+        for (const char of str) {
             const isInNibbleRange = char >= '0' && char <= '9';
             if (!isInNibbleRange && char !== '-' && char !== '.') {
                 return false;
@@ -150,10 +168,9 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
         if (str.length > TAGS.PACKED_MAX) {
             return false;
         }
-        for (let i = 0; i < str.length; i++) {
-            const char = str[i];
+        for (const char of str) {
             const isInNibbleRange = char >= '0' && char <= '9';
-            if (!isInNibbleRange && !(char >= 'A' && char <= 'F') && !(char >= 'a' && char <= 'f')) {
+            if (!isInNibbleRange && !(char >= 'A' && char <= 'F')) {
                 return false;
             }
         }
@@ -214,7 +231,7 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
     else if (Array.isArray(content)) {
         writeListStart(content.length);
         for (const item of content) {
-            (0, exports.encodeBinaryNode)(item, opts, buffer);
+            encodeBinaryNodeInner(item, opts, buffer);
         }
     }
     else if (typeof content === 'undefined') {
@@ -223,6 +240,5 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
     else {
         throw new Error(`invalid children for header "${tag}": ${content} (${typeof content})`);
     }
-    return Buffer.from(buffer);
+    return buffer;
 };
-exports.encodeBinaryNode = encodeBinaryNode;

package/lib/WABinary/generic-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.binaryNodeToString = exports.getBinaryNodeMessages = exports.reduceBinaryNodeToDictionary = exports.assertNodeErrorFree = exports.getBinaryNodeChildUInt = exports.getBinaryNodeChildString = exports.getBinaryNodeChildBuffer = exports.getBinaryNodeChild = exports.getAllBinaryNodeChildren = exports.getBinaryNodeChildren = void 0;
+exports.getBinaryNodeMessages = exports.reduceBinaryNodeToDictionary = exports.assertNodeErrorFree = exports.getBinaryNodeChildUInt = exports.getBinaryNodeChildString = exports.getBinaryNodeChildBuffer = exports.getBinaryNodeChild = exports.getAllBinaryNodeChildren = exports.getBinaryNodeChildren = void 0;
+exports.binaryNodeToString = binaryNodeToString;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 // some extra useful utilities
@@ -107,4 +108,3 @@ function binaryNodeToString(node, i = 0) {
     const content = children ? `>\n${children}\n${tabs(i)}</${node.tag}>` : '/>';
     return tag + content;
 }
-exports.binaryNodeToString = binaryNodeToString;

package/lib/WAUSync/Protocols/USyncContactProtocol.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncContactProtocol = void 0;
+const WABinary_1 = require("../../WABinary");
+class USyncContactProtocol {
+    constructor() {
+        this.name = 'contact';
+    }
+    getQueryElement() {
+        return {
+            tag: 'contact',
+            attrs: {},
+        };
+    }
+    getUserElement(user) {
+        //TODO: Implement type / username fields (not yet supported)
+        return {
+            tag: 'contact',
+            attrs: {},
+            content: user.phone,
+        };
+    }
+    parser(node) {
+        var _a;
+        if (node.tag === 'contact') {
+            (0, WABinary_1.assertNodeErrorFree)(node);
+            return ((_a = node === null || node === void 0 ? void 0 : node.attrs) === null || _a === void 0 ? void 0 : _a.type) === 'in';
+        }
+        return false;
+    }
+}
+exports.USyncContactProtocol = USyncContactProtocol;

package/lib/WAUSync/Protocols/USyncDeviceProtocol.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncDeviceProtocol = void 0;
+const WABinary_1 = require("../../WABinary");
+class USyncDeviceProtocol {
+    constructor() {
+        this.name = 'devices';
+    }
+    getQueryElement() {
+        return {
+            tag: 'devices',
+            attrs: {
+                version: '2',
+            },
+        };
+    }
+    getUserElement( /* user: USyncUser */) {
+        //TODO: Implement device phashing, ts and expectedTs
+        //TODO: if all are not present, return null <- current behavior
+        //TODO: otherwise return a node w tag 'devices' w those as attrs
+        return null;
+    }
+    parser(node) {
+        const deviceList = [];
+        let keyIndex = undefined;
+        if (node.tag === 'devices') {
+            (0, WABinary_1.assertNodeErrorFree)(node);
+            const deviceListNode = (0, WABinary_1.getBinaryNodeChild)(node, 'device-list');
+            const keyIndexNode = (0, WABinary_1.getBinaryNodeChild)(node, 'key-index-list');
+            if (Array.isArray(deviceListNode === null || deviceListNode === void 0 ? void 0 : deviceListNode.content)) {
+                for (const { tag, attrs } of deviceListNode.content) {
+                    const id = +attrs.id;
+                    const keyIndex = +attrs['key-index'];
+                    if (tag === 'device') {
+                        deviceList.push({
+                            id,
+                            keyIndex,
+                            isHosted: !!(attrs['is_hosted'] && attrs['is_hosted'] === 'true')
+                        });
+                    }
+                }
+            }
+            if ((keyIndexNode === null || keyIndexNode === void 0 ? void 0 : keyIndexNode.tag) === 'key-index-list') {
+                keyIndex = {
+                    timestamp: +keyIndexNode.attrs['ts'],
+                    signedKeyIndex: keyIndexNode === null || keyIndexNode === void 0 ? void 0 : keyIndexNode.content,
+                    expectedTimestamp: keyIndexNode.attrs['expected_ts'] ? +keyIndexNode.attrs['expected_ts'] : undefined
+                };
+            }
+        }
+        return {
+            deviceList,
+            keyIndex
+        };
+    }
+}
+exports.USyncDeviceProtocol = USyncDeviceProtocol;

package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncDisappearingModeProtocol = void 0;
+const WABinary_1 = require("../../WABinary");
+class USyncDisappearingModeProtocol {
+    constructor() {
+        this.name = 'disappearing_mode';
+    }
+    getQueryElement() {
+        return {
+            tag: 'disappearing_mode',
+            attrs: {},
+        };
+    }
+    getUserElement() {
+        return null;
+    }
+    parser(node) {
+        if (node.tag === 'status') {
+            (0, WABinary_1.assertNodeErrorFree)(node);
+            const duration = +(node === null || node === void 0 ? void 0 : node.attrs.duration);
+            const setAt = new Date(+((node === null || node === void 0 ? void 0 : node.attrs.t) || 0) * 1000);
+            return {
+                duration,
+                setAt,
+            };
+        }
+    }
+}
+exports.USyncDisappearingModeProtocol = USyncDisappearingModeProtocol;

package/lib/WAUSync/Protocols/USyncStatusProtocol.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncStatusProtocol = void 0;
+const WABinary_1 = require("../../WABinary");
+class USyncStatusProtocol {
+    constructor() {
+        this.name = 'status';
+    }
+    getQueryElement() {
+        return {
+            tag: 'status',
+            attrs: {},
+        };
+    }
+    getUserElement() {
+        return null;
+    }
+    parser(node) {
+        var _a;
+        if (node.tag === 'status') {
+            (0, WABinary_1.assertNodeErrorFree)(node);
+            let status = node === null || node === void 0 ? void 0 : node.content.toString();
+            const setAt = new Date(+((node === null || node === void 0 ? void 0 : node.attrs.t) || 0) * 1000);
+            if (!status) {
+                if (+((_a = node.attrs) === null || _a === void 0 ? void 0 : _a.code) === 401) {
+                    status = '';
+                }
+                else {
+                    status = null;
+                }
+            }
+            else if (typeof status === 'string' && status.length === 0) {
+                status = null;
+            }
+            return {
+                status,
+                setAt,
+            };
+        }
+    }
+}
+exports.USyncStatusProtocol = USyncStatusProtocol;

package/lib/WAUSync/Protocols/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./USyncDeviceProtocol"), exports);
+__exportStar(require("./USyncContactProtocol"), exports);
+__exportStar(require("./USyncStatusProtocol"), exports);
+__exportStar(require("./USyncDisappearingModeProtocol"), exports);

package/lib/WAUSync/USyncQuery.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncQuery = void 0;
+const WABinary_1 = require("../WABinary");
+const Protocols_1 = require("./Protocols");
+class USyncQuery {
+    constructor() {
+        this.protocols = [];
+        this.users = [];
+        this.context = 'interactive';
+        this.mode = 'query';
+    }
+    withMode(mode) {
+        this.mode = mode;
+        return this;
+    }
+    withContext(context) {
+        this.context = context;
+        return this;
+    }
+    withUser(user) {
+        this.users.push(user);
+        return this;
+    }
+    parseUSyncQueryResult(result) {
+        if (result.attrs.type !== 'result') {
+            return;
+        }
+        const protocolMap = Object.fromEntries(this.protocols.map((protocol) => {
+            return [protocol.name, protocol.parser];
+        }));
+        const queryResult = {
+            // TODO: implement errors etc.
+            list: [],
+            sideList: [],
+        };
+        const usyncNode = (0, WABinary_1.getBinaryNodeChild)(result, 'usync');
+        //TODO: implement error backoff, refresh etc.
+        //TODO: see if there are any errors in the result node
+        //const resultNode = getBinaryNodeChild(usyncNode, 'result')
+        const listNode = (0, WABinary_1.getBinaryNodeChild)(usyncNode, 'list');
+        if (Array.isArray(listNode === null || listNode === void 0 ? void 0 : listNode.content) && typeof listNode !== 'undefined') {
+            queryResult.list = listNode.content.map((node) => {
+                const id = node === null || node === void 0 ? void 0 : node.attrs.jid;
+                const data = Array.isArray(node === null || node === void 0 ? void 0 : node.content) ? Object.fromEntries(node.content.map((content) => {
+                    const protocol = content.tag;
+                    const parser = protocolMap[protocol];
+                    if (parser) {
+                        return [protocol, parser(content)];
+                    }
+                    else {
+                        return [protocol, null];
+                    }
+                }).filter(([, b]) => b !== null)) : {};
+                return { ...data, id };
+            });
+        }
+        //TODO: implement side list
+        //const sideListNode = getBinaryNodeChild(usyncNode, 'side_list')
+        return queryResult;
+    }
+    withDeviceProtocol() {
+        this.protocols.push(new Protocols_1.USyncDeviceProtocol());
+        return this;
+    }
+    withContactProtocol() {
+        this.protocols.push(new Protocols_1.USyncContactProtocol());
+        return this;
+    }
+    withStatusProtocol() {
+        this.protocols.push(new Protocols_1.USyncStatusProtocol());
+        return this;
+    }
+    withDisappearingModeProtocol() {
+        this.protocols.push(new Protocols_1.USyncDisappearingModeProtocol());
+        return this;
+    }
+}
+exports.USyncQuery = USyncQuery;

package/lib/WAUSync/USyncUser.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USyncUser = void 0;
+class USyncUser {
+    withId(id) {
+        this.id = id;
+        return this;
+    }
+    withLid(lid) {
+        this.lid = lid;
+        return this;
+    }
+    withPhone(phone) {
+        this.phone = phone;
+        return this;
+    }
+    withType(type) {
+        this.type = type;
+        return this;
+    }
+}
+exports.USyncUser = USyncUser;

package/lib/WAUSync/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Protocols"), exports);
+__exportStar(require("./USyncQuery"), exports);
+__exportStar(require("./USyncUser"), exports);

package/lib/index.js

@@ -17,7 +17,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeWASocket = void 0;
+exports.proto = exports.makeWASocket = void 0;
+const WAProto_1 = require("../WAProto");
+Object.defineProperty(exports, "proto", { enumerable: true, get: function () { return WAProto_1.proto; } });
 const Socket_1 = __importDefault(require("./Socket"));
 exports.makeWASocket = Socket_1.default;
 __exportStar(require("../WAProto"), exports);
@@ -27,4 +29,5 @@ __exportStar(require("./Store"), exports);
 __exportStar(require("./Defaults"), exports);
 __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
+__exportStar(require("./WAUSync"), exports);
 exports.default = Socket_1.default;

package/package.json

@@ -1,22 +1,29 @@
 {
   "name": "@jkt48connect-corp/baileys",
-  "version": "7.2.7",
-  "description": "WhatsApp baileys",
+  "version": "7.2.9",
+  "description": "WhatsApp API",
   "keywords": [
+    "Baileys",
+    "whiskeysockets/baileys",
+    "whatsapp",
+    "meta",
+    "valzyy",
+    "jkt48connect",
     "whatsapp",
     "js-whatsapp",
     "whatsapp-api",
     "whatsapp-web",
+    "whatsapp-chat",
+    "whatsapp-group",
+    "automation",
     "multi-device",
-    "md",
-    "indraa"
+    "modder"
   ],
-  "homepage": "https://github.com/WhiskeySockets/Baileys",
   "repository": {
-    "url": "git@github.com:WhiskeySockets/Baileys.git"
+    "url": ""
   },
   "license": "MIT",
-  "author": "Rlzyy",
+  "author": "jkt48connect-corp",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -36,14 +43,13 @@
     "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": "tsc",
-    "prepare": "tsc",
     "release": "release-it",
     "test": "jest"
   },
   "dependencies": {
     "@adiwajshing/keyed-db": "^0.2.4",
     "@hapi/boom": "^9.1.3",
+    "async-lock": "^1.4.1",
     "audio-decode": "^2.1.3",
     "axios": "^1.3.3",
     "cache-manager": "4.0.1",
@@ -59,7 +65,6 @@
   },
   "devDependencies": {
     "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
-    "@jkt48connect/cli": "^3.0.12",
     "@types/got": "^9.6.11",
     "@types/jest": "^27.5.1",
     "@types/node": "^16.0.0",