@hbmodsofc/baileys 1.5.2 → 1.7.7

package/lib/Defaults/index.d.ts

@@ -1,17 +1,17 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { proto } from '../../WAProto';
-import type { MediaType, SocketConfig } from '../Types';
+import { proto } from '../../WAProto/index.js';
+import type { SocketConfig } from '../Types';
 export declare const UNAUTHORIZED_CODES: number[];
 export declare const DEFAULT_ORIGIN = "https://web.whatsapp.com";
+export declare const CALL_VIDEO_PREFIX = "https://call.whatsapp.com/video/";
+export declare const CALL_AUDIO_PREFIX = "https://call.whatsapp.com/voice/";
 export declare const DEF_CALLBACK_PREFIX = "CB:";
 export declare const DEF_TAG_PREFIX = "TAG:";
 export declare const PHONE_CONNECTION_CB = "CB:Pong";
 export declare const WA_DEFAULT_EPHEMERAL: number;
 export declare const NOISE_MODE = "Noise_XX_25519_AESGCM_SHA256\0\0\0\0";
-export declare const DICT_VERSION = 2;
-export declare const KEY_BUNDLE_TYPE: Buffer;
-export declare const NOISE_WA_HEADER: Buffer;
+export declare const DICT_VERSION = 3;
+export declare const KEY_BUNDLE_TYPE: Buffer<ArrayBuffer>;
+export declare const NOISE_WA_HEADER: Buffer<ArrayBuffer>;
 /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 export declare const URL_REGEX: RegExp;
 export declare const WA_CERT_DETAILS: {
@@ -41,10 +41,14 @@ export declare const MEDIA_HKDF_KEY_MAPPING: {
     'product-catalog-image': string;
     'payment-bg-image': string;
     ptv: string;
+    'biz-cover-photo': string;
 };
-export declare const MEDIA_KEYS: ("ppic" | "product" | "image" | "video" | "sticker" | "audio" | "gif" | "ptt" | "thumbnail-document" | "thumbnail-image" | "thumbnail-link" | "thumbnail-video" | "md-app-state" | "md-msg-hist" | "document" | "product-catalog-image" | "payment-bg-image" | "ptv")[];
+export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING;
+export declare const MEDIA_KEYS: MediaType[];
 export declare const MIN_PREKEY_COUNT = 5;
 export declare const INITIAL_PREKEY_COUNT = 30;
+export declare const UPLOAD_TIMEOUT = 30000;
+export declare const MIN_UPLOAD_INTERVAL = 5000;
 export declare const DEFAULT_CACHE_TTLS: {
     SIGNAL_STORE: number;
     MSG_RETRY: number;

package/lib/Defaults/index.js

@@ -1,147 +1,113 @@
-var __importDefault = this && this.__importDefault || function (a) {
-    return a && a.__esModule ? a : { "default": a }
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
-Object.defineProperty(exports, "__esModule", { value: !0 });
-
-exports.DEFAULT_CACHE_TTLS =
-    exports.INITIAL_PREKEY_COUNT =
-    exports.MIN_PREKEY_COUNT =
-    exports.MEDIA_KEYS =
-    exports.MEDIA_HKDF_KEY_MAPPING =
-    exports.MEDIA_PATH_MAP =
-    exports.DEFAULT_CONNECTION_CONFIG =
-    exports.PROCESSABLE_HISTORY_TYPES =
-    exports.WA_CERT_DETAILS =
-    exports.URL_REGEX =
-    exports.NOISE_WA_HEADER =
-    exports.KEY_BUNDLE_TYPE =
-    exports.DICT_VERSION =
-    exports.NOISE_MODE =
-    exports.WA_DEFAULT_EPHEMERAL =
-    exports.PHONE_CONNECTION_CB =
-    exports.DEF_TAG_PREFIX =
-    exports.DEF_CALLBACK_PREFIX =
-    exports.DEFAULT_ORIGIN =
-    exports.UNAUTHORIZED_CODES =
-    void 0;
-
-const crypto_1 = require("crypto");
-const WAProto_1 = require("../../WAProto"),
-    libsignal_1 = require("../Signal/libsignal"),
-    Utils_1 = require("../Utils"),
-    logger_1 = __importDefault(require("../Utils/logger")),
-    baileys_version_json_1 = require("./baileys-version.json"),
-    phonenumber_mcc_json_1 = __importDefault(require("./phonenumber-mcc.json"));
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CACHE_TTLS = exports.MIN_UPLOAD_INTERVAL = exports.UPLOAD_TIMEOUT = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.PHONE_CONNECTION_CB = exports.DEF_TAG_PREFIX = exports.DEF_CALLBACK_PREFIX = exports.CALL_AUDIO_PREFIX = exports.CALL_VIDEO_PREFIX = exports.DEFAULT_ORIGIN = exports.UNAUTHORIZED_CODES = void 0;
+const index_js_1 = require("../../WAProto/index.js");
+const libsignal_1 = require("../Signal/libsignal");
+const Utils_1 = require("../Utils");
+const logger_1 = __importDefault(require("../Utils/logger"));
+const version = [2, 3000, 1023223821];
 exports.UNAUTHORIZED_CODES = [401, 403, 419];
-exports.version = [2, 3000, 1027934701];
-exports.PHONENUMBER_MCC = phonenumber_mcc_json_1.default;
-exports.DEFAULT_ORIGIN = "https://web.whatsapp.com";
-exports.MOBILE_ENDPOINT = 'g.whatsapp.net';
-exports.MOBILE_PORT = 443;
-exports.DEF_CALLBACK_PREFIX = "CB:";
-exports.DEF_TAG_PREFIX = "TAG:";
-exports.PHONE_CONNECTION_CB = "CB:Pong";
-exports.WA_DEFAULT_EPHEMERAL = 604800;
-const WA_VERSION = '2.25.23.24';
-const WA_VERSION_HASH = (0, crypto_1.createHash)('md5').update(WA_VERSION).digest('hex');
-exports.MOBILE_TOKEN = Buffer.from('0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM' + WA_VERSION_HASH);
-exports.MOBILE_REGISTRATION_ENDPOINT = 'https://v.whatsapp.net/v2';
-exports.MOBILE_USERAGENT = `WhatsApp/${WA_VERSION} iOS/17.5.1 Device/Apple-iPhone_13`;
-exports.REGISTRATION_PUBLIC_KEY = Buffer.from([
-    5, 142, 140, 15, 116, 195, 235, 197, 215, 166, 134, 92, 108, 60, 132, 56, 86, 176, 97, 33, 204, 232, 234, 119, 77,
-    34, 251, 111, 18, 37, 18, 48, 45,
-]);
-exports.NOISE_MODE = "Noise_XX_25519_AESGCM_SHA256\x00\x00\x00\x00";
-exports.DICT_VERSION = 2;
+exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
+exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
+exports.CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
+exports.DEF_CALLBACK_PREFIX = 'CB:';
+exports.DEF_TAG_PREFIX = 'TAG:';
+exports.PHONE_CONNECTION_CB = 'CB:Pong';
+exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
+exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
+exports.DICT_VERSION = 3;
 exports.KEY_BUNDLE_TYPE = Buffer.from([5]);
-exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]);
-exports.PROTOCOL_VERSION = [5, 2];
-exports.MOBILE_NOISE_HEADER = Buffer.concat([Buffer.from('WA'), Buffer.from(exports.PROTOCOL_VERSION)]);
-
+exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]); // last is "DICT_VERSION"
+/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
-exports.WA_CERT_DETAILS = { SERIAL: 0 };
-
+exports.WA_CERT_DETAILS = {
+    SERIAL: 0
+};
 exports.PROCESSABLE_HISTORY_TYPES = [
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.INITIAL_BOOTSTRAP,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.PUSH_NAME,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.RECENT,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.FULL,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.ON_DEMAND
+    index_js_1.proto.Message.HistorySyncNotification.HistorySyncType.INITIAL_BOOTSTRAP,
+    index_js_1.proto.Message.HistorySyncNotification.HistorySyncType.PUSH_NAME,
+    index_js_1.proto.Message.HistorySyncNotification.HistorySyncType.RECENT,
+    index_js_1.proto.Message.HistorySyncNotification.HistorySyncType.FULL,
+    index_js_1.proto.Message.HistorySyncNotification.HistorySyncType.ON_DEMAND
 ];
-
 exports.DEFAULT_CONNECTION_CONFIG = {
-    version: baileys_version_json_1.version,
-    browser: Utils_1.Browsers("Chrome"),
-    waWebSocketUrl: "wss://web.whatsapp.com/ws/chat",
-    connectTimeoutMs: 2E4,
-    keepAliveIntervalMs: 3E4,
-    logger: logger_1.default.child({ class: "baileys" }),
-    printQRInTerminal: !1,
-    emitOwnEvents: !0,
-    defaultQueryTimeoutMs: 6E4,
+    version: version,
+    browser: Utils_1.Browsers.ubuntu('Chrome'),
+    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
+    connectTimeoutMs: 20000,
+    keepAliveIntervalMs: 30000,
+    logger: logger_1.default.child({ class: 'baileys' }),
+    emitOwnEvents: true,
+    defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
-    fireInitQueries: !0,
-    auth: void 0,
-    markOnlineOnConnect: !0,
-    syncFullHistory: !1,
-    patchMessageBeforeSending: a => a,
-    shouldSyncHistoryMessage: () => !0,
-    shouldIgnoreJid: () => !1,
+    fireInitQueries: true,
+    auth: undefined,
+    markOnlineOnConnect: true,
+    syncFullHistory: false,
+    patchMessageBeforeSending: msg => msg,
+    shouldSyncHistoryMessage: () => true,
+    shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3E3 },
-    generateHighQualityLinkPreview: !1,
+    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
+    generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true,
+    enableRecentMessageCache: true,
     options: {},
-    appStateMacVerification: { patch: !1, snapshot: !1 },
-    countryCode: "US",
-    getMessage: async () => { },
-    cachedGroupMetadata: async () => { },
+    appStateMacVerification: {
+        patch: false,
+        snapshot: false
+    },
+    countryCode: 'US',
+    getMessage: async () => undefined,
+    cachedGroupMetadata: async () => undefined,
     makeSignalRepository: libsignal_1.makeLibSignalRepository
 };
-
 exports.MEDIA_PATH_MAP = {
-    image: "/mms/image",
-    video: "/mms/video",
-    document: "/mms/document",
-    audio: "/mms/audio",
-    sticker: "/mms/image",
-    "thumbnail-link": "/mms/image",
-    "product-catalog-image": "/product/image",
-    "md-app-state": "",
-    "md-msg-hist": "/mms/md-app-state"
+    image: '/mms/image',
+    video: '/mms/video',
+    document: '/mms/document',
+    audio: '/mms/audio',
+    sticker: '/mms/image',
+    'thumbnail-link': '/mms/image',
+    'product-catalog-image': '/product/image',
+    'md-app-state': '',
+    'md-msg-hist': '/mms/md-app-state',
+    'biz-cover-photo': '/pps/biz-cover-photo'
 };
-
 exports.MEDIA_HKDF_KEY_MAPPING = {
-    audio: "Audio",
-    document: "Document",
-    gif: "Video",
-    image: "Image",
-    ppic: "",
-    product: "Image",
-    ptt: "Audio",
-    sticker: "Image",
-    video: "Video",
-    "thumbnail-document": "Document Thumbnail",
-    "thumbnail-image": "Image Thumbnail",
-    "thumbnail-video": "Video Thumbnail",
-    "thumbnail-link": "Link Thumbnail",
-    "md-msg-hist": "History",
-    "md-app-state": "App State",
-    "product-catalog-image": "",
-    "payment-bg-image": "Payment Background",
-    ptv: "Video"
+    audio: 'Audio',
+    document: 'Document',
+    gif: 'Video',
+    image: 'Image',
+    ppic: '',
+    product: 'Image',
+    ptt: 'Audio',
+    sticker: 'Image',
+    video: 'Video',
+    'thumbnail-document': 'Document Thumbnail',
+    'thumbnail-image': 'Image Thumbnail',
+    'thumbnail-video': 'Video Thumbnail',
+    'thumbnail-link': 'Link Thumbnail',
+    'md-msg-hist': 'History',
+    'md-app-state': 'App State',
+    'product-catalog-image': '',
+    'payment-bg-image': 'Payment Background',
+    ptv: 'Video',
+    'biz-cover-photo': 'Image'
 };
-
 exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
 exports.MIN_PREKEY_COUNT = 5;
 exports.INITIAL_PREKEY_COUNT = 30;
-
+exports.UPLOAD_TIMEOUT = 30000; // 30 seconds
+exports.MIN_UPLOAD_INTERVAL = 5000; // 5 seconds minimum between uploads
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 300,
-    MSG_RETRY: 3600,
-    CALL_OFFER: 300,
-    USER_DEVICES: 300
+    SIGNAL_STORE: 5 * 60, // 5 minutes
+    MSG_RETRY: 60 * 60, // 1 hour
+    CALL_OFFER: 5 * 60, // 5 minutes
+    USER_DEVICES: 5 * 60 // 5 minutes
 };

package/lib/Signal/Group/group_cipher.d.ts

@@ -8,7 +8,6 @@ export declare class GroupCipher {
     private readonly senderKeyStore;
     private readonly senderKeyName;
     constructor(senderKeyStore: SenderKeyStore, senderKeyName: SenderKeyName);
-    private queueJob;
     encrypt(paddedPlaintext: Uint8Array | string): Promise<Uint8Array>;
     decrypt(senderKeyMessageBytes: Uint8Array): Promise<Uint8Array>;
     private getSenderKey;

package/lib/Signal/Group/group_cipher.js

@@ -1,55 +1,44 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupCipher = void 0;
 const crypto_1 = require("libsignal/src/crypto");
-const queue_job_1 = __importDefault(require("./queue-job"));
 const sender_key_message_1 = require("./sender-key-message");
 class GroupCipher {
     constructor(senderKeyStore, senderKeyName) {
         this.senderKeyStore = senderKeyStore;
         this.senderKeyName = senderKeyName;
     }
-    queueJob(awaitable) {
-        return (0, queue_job_1.default)(this.senderKeyName.toString(), awaitable);
-    }
     async encrypt(paddedPlaintext) {
-        return await this.queueJob(async () => {
-            const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
-            if (!record) {
-                throw new Error('No SenderKeyRecord found for encryption');
-            }
-            const senderKeyState = record.getSenderKeyState();
-            if (!senderKeyState) {
-                throw new Error('No session to encrypt message');
-            }
-            const iteration = senderKeyState.getSenderChainKey().getIteration();
-            const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
-            const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
-            const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
-            await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
-            return senderKeyMessage.serialize();
-        });
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+        if (!record) {
+            throw new Error('No SenderKeyRecord found for encryption');
+        }
+        const senderKeyState = record.getSenderKeyState();
+        if (!senderKeyState) {
+            throw new Error('No session to encrypt message');
+        }
+        const iteration = senderKeyState.getSenderChainKey().getIteration();
+        const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
+        const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
+        const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
+        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+        return senderKeyMessage.serialize();
     }
     async decrypt(senderKeyMessageBytes) {
-        return await this.queueJob(async () => {
-            const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
-            if (!record) {
-                throw new Error('No SenderKeyRecord found for decryption');
-            }
-            const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
-            const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
-            if (!senderKeyState) {
-                throw new Error('No session found to decrypt message');
-            }
-            senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
-            const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
-            const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
-            await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
-            return plaintext;
-        });
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+        if (!record) {
+            throw new Error('No SenderKeyRecord found for decryption');
+        }
+        const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
+        const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
+        if (!senderKeyState) {
+            throw new Error('No session found to decrypt message');
+        }
+        senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
+        const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
+        const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
+        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+        return plaintext;
     }
     getSenderKey(senderKeyState, iteration) {
         let senderChainKey = senderKeyState.getSenderChainKey();

package/lib/Signal/Group/sender-chain-key.d.ts

@@ -4,7 +4,7 @@ export declare class SenderChainKey {
     private readonly CHAIN_KEY_SEED;
     private readonly iteration;
     private readonly chainKey;
-    constructor(iteration: number, chainKey: any);
+    constructor(iteration: number, chainKey: Uint8Array | Buffer);
     getIteration(): number;
     getSenderMessageKey(): SenderMessageKey;
     getNext(): SenderChainKey;

package/lib/Signal/Group/sender-chain-key.js

@@ -8,11 +8,18 @@ class SenderChainKey {
         this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
         this.CHAIN_KEY_SEED = Buffer.from([0x02]);
         this.iteration = iteration;
-        if (chainKey instanceof Buffer) {
+        if (Buffer.isBuffer(chainKey)) {
             this.chainKey = chainKey;
         }
+        else if (chainKey instanceof Uint8Array) {
+            this.chainKey = Buffer.from(chainKey);
+        }
+        else if (chainKey && typeof chainKey === 'object') {
+            // backported from @MartinSchere (#1741)
+            this.chainKey = Buffer.from(Object.values(chainKey)); // temp fix // backported from @MartinSchere (#1741)
+        }
         else {
-            this.chainKey = Buffer.from(chainKey || []);
+            this.chainKey = Buffer.alloc(0);
         }
     }
     getIteration() {

package/lib/Signal/Group/sender-key-distribution-message.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SenderKeyDistributionMessage = void 0;
-const WAProto_1 = require("../../../WAProto");
+const index_js_1 = require("../../../WAProto/index.js");
 const ciphertext_message_1 = require("./ciphertext-message");
 class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
     constructor(id, iteration, chainKey, signatureKey, serialized) {
@@ -9,7 +9,7 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
         if (serialized) {
             try {
                 const message = serialized.slice(1);
-                const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON();
+                const distributionMessage = index_js_1.proto.SenderKeyDistributionMessage.decode(message);
                 this.serialized = serialized;
                 this.id = distributionMessage.id;
                 this.iteration = distributionMessage.iteration;
@@ -32,7 +32,7 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
             this.iteration = iteration;
             this.chainKey = chainKey;
             this.signatureKey = signatureKey;
-            const message = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
+            const message = index_js_1.proto.SenderKeyDistributionMessage.encode(index_js_1.proto.SenderKeyDistributionMessage.create({
                 id,
                 iteration,
                 chainKey,

package/lib/Signal/Group/sender-key-message.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SenderKeyMessage = void 0;
 const curve_1 = require("libsignal/src/curve");
-const WAProto_1 = require("../../../WAProto");
+const index_js_1 = require("../../../WAProto/index.js");
 const ciphertext_message_1 = require("./ciphertext-message");
 class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
     constructor(keyId, iteration, ciphertext, signatureKey, serialized) {
@@ -12,7 +12,7 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
             const version = serialized[0];
             const message = serialized.slice(1, serialized.length - this.SIGNATURE_LENGTH);
             const signature = serialized.slice(-1 * this.SIGNATURE_LENGTH);
-            const senderKeyMessage = WAProto_1.proto.SenderKeyMessage.decode(message).toJSON();
+            const senderKeyMessage = index_js_1.proto.SenderKeyMessage.decode(message);
             this.serialized = serialized;
             this.messageVersion = (version & 0xff) >> 4;
             this.keyId = senderKeyMessage.id;
@@ -26,7 +26,7 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
         else {
             const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256;
             const ciphertextBuffer = Buffer.from(ciphertext);
-            const message = WAProto_1.proto.SenderKeyMessage.encode(WAProto_1.proto.SenderKeyMessage.create({
+            const message = index_js_1.proto.SenderKeyMessage.encode(index_js_1.proto.SenderKeyMessage.create({
                 id: keyId,
                 iteration: iteration,
                 ciphertext: ciphertextBuffer

package/lib/Signal/Group/sender-key-state.d.ts

@@ -21,10 +21,10 @@ interface SenderKeyStateStructure {
 export declare class SenderKeyState {
     private readonly MAX_MESSAGE_KEYS;
     private readonly senderKeyStateStructure;
-    constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null, signatureKeyPair?: {
-        public: Uint8Array;
-        private: Uint8Array;
-    } | null, signatureKeyPublic?: Uint8Array | null, signatureKeyPrivate?: Uint8Array | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
+    constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null | string, signatureKeyPair?: {
+        public: Uint8Array | string;
+        private: Uint8Array | string;
+    } | null, signatureKeyPublic?: Uint8Array | string | null, signatureKeyPrivate?: Uint8Array | string | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
     getKeyId(): number;
     getSenderChainKey(): SenderChainKey;
     setSenderChainKey(chainKey: SenderChainKey): void;

package/lib/Signal/Group/sender-key-state.js

@@ -6,8 +6,22 @@ const sender_message_key_1 = require("./sender-message-key");
 class SenderKeyState {
     constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
         this.MAX_MESSAGE_KEYS = 2000;
+        const toBuffer = (val) => {
+            if (!val)
+                return Buffer.alloc(0);
+            if (typeof val === 'string')
+                return Buffer.from(val, 'base64');
+            if (val instanceof Uint8Array || Array.isArray(val))
+                return Buffer.from(val);
+            return Buffer.alloc(0);
+        };
         if (senderKeyStateStructure) {
-            this.senderKeyStateStructure = senderKeyStateStructure;
+            this.senderKeyStateStructure = {
+                ...senderKeyStateStructure,
+                senderMessageKeys: Array.isArray(senderKeyStateStructure.senderMessageKeys)
+                    ? senderKeyStateStructure.senderMessageKeys
+                    : []
+            };
         }
         else {
             if (signatureKeyPair) {
@@ -17,17 +31,12 @@ class SenderKeyState {
             chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
             const senderChainKeyStructure = {
                 iteration: iteration || 0,
-                seed: chainKey || Buffer.alloc(0)
+                seed: chainKey ? toBuffer(chainKey) : Buffer.alloc(0)
             };
             const signingKeyStructure = {
-                public: typeof signatureKeyPublic === 'string'
-                    ? Buffer.from(signatureKeyPublic, 'base64')
-                    : signatureKeyPublic || Buffer.alloc(0)
+                public: toBuffer(signatureKeyPublic),
+                private: signatureKeyPrivate ? toBuffer(signatureKeyPrivate) : undefined
             };
-            if (signatureKeyPrivate) {
-                signingKeyStructure.private =
-                    typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
-            }
             this.senderKeyStateStructure = {
                 senderKeyId: id || 0,
                 senderChainKey: senderChainKeyStructure,
@@ -49,23 +58,45 @@ class SenderKeyState {
         };
     }
     getSigningKeyPublic() {
-        const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
-        if (publicKey instanceof Buffer) {
-            return publicKey;
+        let key = this.senderKeyStateStructure.senderSigningKey.public;
+        // normalize into Buffer
+        if (!Buffer.isBuffer(key)) {
+            if (key instanceof Uint8Array) {
+                key = Buffer.from(key);
+            }
+            else if (typeof key === 'string') {
+                key = Buffer.from(key, 'base64');
+            }
+            else if (key && typeof key === 'object') {
+                return Buffer.from(Object.values(key)); // temp fix // inspired by @MartinSchere 's #1741
+            }
+            else {
+                key = Buffer.from(key || []);
+            }
         }
-        else if (typeof publicKey === 'string') {
-            return Buffer.from(publicKey, 'base64');
+        const publicKey = key;
+        if (publicKey.length === 32) {
+            const fixed = Buffer.alloc(33);
+            fixed[0] = 0x05;
+            publicKey.copy(fixed, 1);
+            return fixed;
         }
-        return Buffer.from(publicKey || []);
+        return publicKey;
     }
     getSigningKeyPrivate() {
         const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
         if (!privateKey) {
             return undefined;
         }
-        if (privateKey instanceof Buffer) {
+        if (Buffer.isBuffer(privateKey)) {
             return privateKey;
         }
+        else if (privateKey instanceof Uint8Array) {
+            return Buffer.from(privateKey);
+        }
+        else if (privateKey && typeof privateKey === 'object') {
+            return Buffer.from(Object.values(privateKey)); // temp fix // inspired by @MartinSchere 's #1741
+        }
         else if (typeof privateKey === 'string') {
             return Buffer.from(privateKey, 'base64');
         }

package/lib/Signal/libsignal.d.ts

@@ -1,3 +1,7 @@
-import { SignalAuthState } from '../Types';
-import { SignalRepository } from '../Types/Signal';
-export declare function makeLibSignalRepository(auth: SignalAuthState): SignalRepository;
+import type { SignalAuthState } from '../Types';
+import type { SignalRepositoryWithLIDStore } from '../Types/Signal';
+export declare function makeLibSignalRepository(auth: SignalAuthState, onWhatsAppFunc?: (...jids: string[]) => Promise<{
+    jid: string;
+    exists: boolean;
+    lid: string;
+}[] | undefined>): SignalRepositoryWithLIDStore;