lordceaser-baileys 2.0.1 → 2.0.2

package/WASignalGroup/sender_key_state.js

@@ -0,0 +1,129 @@
+const SenderChainKey = require('./sender_chain_key');
+const SenderMessageKey = require('./sender_message_key');
+
+const protobufs = require('./protobufs');
+
+class SenderKeyState {
+    MAX_MESSAGE_KEYS = 2000;
+
+    constructor(
+        id = null,
+        iteration = null,
+        chainKey = null,
+        signatureKeyPair = null,
+        signatureKeyPublic = null,
+        signatureKeyPrivate = null,
+        senderKeyStateStructure = null
+    ) {
+        if (senderKeyStateStructure) {
+            this.senderKeyStateStructure = senderKeyStateStructure;
+        } else {
+            if (signatureKeyPair) {
+                signatureKeyPublic = signatureKeyPair.public;
+                signatureKeyPrivate = signatureKeyPair.private;
+            }
+
+            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
+            this.senderKeyStateStructure = protobufs.SenderKeyStateStructure.create();
+            const senderChainKeyStructure = protobufs.SenderChainKey.create();
+            senderChainKeyStructure.iteration = iteration;
+            senderChainKeyStructure.seed = chainKey;
+            this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
+
+            const signingKeyStructure = protobufs.SenderSigningKey.create();
+            signingKeyStructure.public =
+                typeof signatureKeyPublic === 'string' ?
+                Buffer.from(signatureKeyPublic, 'base64') :
+                signatureKeyPublic;
+            if (signatureKeyPrivate) {
+                signingKeyStructure.private =
+                    typeof signatureKeyPrivate === 'string' ?
+                    Buffer.from(signatureKeyPrivate, 'base64') :
+                    signatureKeyPrivate;
+            }
+            this.senderKeyStateStructure.senderKeyId = id;
+            this.senderChainKey = senderChainKeyStructure;
+            this.senderKeyStateStructure.senderSigningKey = signingKeyStructure;
+        }
+        this.senderKeyStateStructure.senderMessageKeys =
+            this.senderKeyStateStructure.senderMessageKeys || [];
+    }
+
+    SenderKeyState(senderKeyStateStructure) {
+        this.senderKeyStateStructure = senderKeyStateStructure;
+    }
+
+    getKeyId() {
+        return this.senderKeyStateStructure.senderKeyId;
+    }
+
+    getSenderChainKey() {
+        return new SenderChainKey(
+            this.senderKeyStateStructure.senderChainKey.iteration,
+            this.senderKeyStateStructure.senderChainKey.seed
+        );
+    }
+
+    setSenderChainKey(chainKey) {
+        const senderChainKeyStructure = protobufs.SenderChainKey.create({
+            iteration: chainKey.getIteration(),
+            seed: chainKey.getSeed(),
+        });
+        this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
+    }
+
+    getSigningKeyPublic() {
+        return typeof this.senderKeyStateStructure.senderSigningKey.public === 'string' ?
+            Buffer.from(this.senderKeyStateStructure.senderSigningKey.public, 'base64') :
+            this.senderKeyStateStructure.senderSigningKey.public;
+    }
+
+    getSigningKeyPrivate() {
+        return typeof this.senderKeyStateStructure.senderSigningKey.private === 'string' ?
+            Buffer.from(this.senderKeyStateStructure.senderSigningKey.private, 'base64') :
+            this.senderKeyStateStructure.senderSigningKey.private;
+    }
+
+    hasSenderMessageKey(iteration) {
+        const list = this.senderKeyStateStructure.senderMessageKeys;
+        for (let o = 0; o < list.length; o++) {
+            const senderMessageKey = list[o];
+            if (senderMessageKey.iteration === iteration) return true;
+        }
+        return false;
+    }
+
+    addSenderMessageKey(senderMessageKey) {
+        const senderMessageKeyStructure = protobufs.SenderKeyStateStructure.create({
+            iteration: senderMessageKey.getIteration(),
+            seed: senderMessageKey.getSeed(),
+        });
+        this.senderKeyStateStructure.senderMessageKeys.push(senderMessageKeyStructure);
+
+        if (this.senderKeyStateStructure.senderMessageKeys.length > this.MAX_MESSAGE_KEYS) {
+            this.senderKeyStateStructure.senderMessageKeys.shift();
+        }
+    }
+
+    removeSenderMessageKey(iteration) {
+        let result = null;
+
+        this.senderKeyStateStructure.senderMessageKeys = this.senderKeyStateStructure.senderMessageKeys.filter(
+            senderMessageKey => {
+                if (senderMessageKey.iteration === iteration) result = senderMessageKey;
+                return senderMessageKey.iteration !== iteration;
+            }
+        );
+
+        if (result != null) {
+            return new SenderMessageKey(result.iteration, result.seed);
+        }
+        return null;
+    }
+
+    getStructure() {
+        return this.senderKeyStateStructure;
+    }
+}
+
+module.exports = SenderKeyState;

package/{lib/Signal/Group/sender-message-key.js → WASignalGroup/sender_message_key.js}

@@ -1,5 +1,13 @@
-import { deriveSecrets } from 'libsignal/src/crypto.js';
-export class SenderMessageKey {
+const { deriveSecrets } = require('libsignal/src/crypto');
+class SenderMessageKey {
+    iteration = 0;
+
+    iv = Buffer.alloc(0);
+
+    cipherKey = Buffer.alloc(0);
+
+    seed = Buffer.alloc(0);
+
     constructor(iteration, seed) {
         const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
         const keys = new Uint8Array(32);
@@ -7,20 +15,25 @@ export class SenderMessageKey {
         keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
         this.iv = Buffer.from(derivative[0].slice(0, 16));
         this.cipherKey = Buffer.from(keys.buffer);
+
         this.iteration = iteration;
         this.seed = seed;
     }
+
     getIteration() {
         return this.iteration;
     }
+
     getIv() {
         return this.iv;
     }
+
     getCipherKey() {
         return this.cipherKey;
     }
+
     getSeed() {
         return this.seed;
     }
 }
-//# sourceMappingURL=sender-message-key.js.map
+module.exports = SenderMessageKey;

package/index.js

@@ -1 +1,17 @@
-module.exports = require('./lib/index.js');
+const baileys = require('./lib/index.js');
+const { c4ParseContent } = require('./lib/Utils/c4-compat');
+const origMake = baileys.default || baileys.makeWASocket;
+if (origMake) {
+  const makeWASocket = (...args) => {
+    const sock = (baileys.default || origMake)(...args);
+    const origSend = sock.sendMessage.bind(sock);
+    sock.sendMessage = async (jid, content, opts) => {
+      if (content) content = c4ParseContent(content);
+      return origSend(jid, content, opts);
+    };
+    return sock;
+  };
+  baileys.default = makeWASocket;
+  baileys.makeWASocket = makeWASocket;
+}
+module.exports = baileys;

package/lib/Defaults/baileys-version.json

@@ -0,0 +1,3 @@
+{
+    "version": [2, 3000, 1020608496]
+}

package/lib/Defaults/index.d.ts

@@ -1,39 +1,23 @@
-import { proto } from '../../WAProto/index.js';
-import type { SocketConfig } from '../Types/index.js';
+/// <reference types="node" />
+/// <reference types="node" />
+import { proto } from '../../WAProto';
+import type { MediaType, 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_ADV_ACCOUNT_SIG_PREFIX: Buffer<ArrayBuffer>;
-export declare const WA_ADV_DEVICE_SIG_PREFIX: Buffer<ArrayBuffer>;
-export declare const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX: Buffer<ArrayBuffer>;
-export declare const WA_ADV_HOSTED_DEVICE_SIG_PREFIX: Buffer<ArrayBuffer>;
 export declare const WA_DEFAULT_EPHEMERAL: number;
-/** Status messages older than 24 hours are considered expired */
-export declare const STATUS_EXPIRY_SECONDS: number;
-/** WA Web enforces a 14-day maximum age for placeholder resend requests */
-export declare const PLACEHOLDER_MAX_AGE_SECONDS: number;
 export declare const NOISE_MODE = "Noise_XX_25519_AESGCM_SHA256\0\0\0\0";
-export declare const DICT_VERSION = 3;
-export declare const KEY_BUNDLE_TYPE: Buffer<ArrayBuffer>;
-export declare const NOISE_WA_HEADER: Buffer<ArrayBuffer>;
+export declare const DICT_VERSION = 2;
+export declare const KEY_BUNDLE_TYPE: Buffer;
+export declare const NOISE_WA_HEADER: Buffer;
 /** 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: {
     SERIAL: number;
-    ISSUER: string;
-    PUBLIC_KEY: Buffer<ArrayBuffer>;
-};
-export declare const PROCESSABLE_HISTORY_TYPES: proto.HistorySync.HistorySyncType[];
-export declare const DEFAULT_CACHE_TTLS: {
-    SIGNAL_STORE: number;
-    MSG_RETRY: number;
-    CALL_OFFER: number;
-    USER_DEVICES: number;
 };
+export declare const PROCESSABLE_HISTORY_TYPES: proto.Message.HistorySyncNotification.HistorySyncType[];
 export declare const DEFAULT_CONNECTION_CONFIG: SocketConfig;
 export declare const MEDIA_PATH_MAP: {
     [T in MediaType]?: string;
@@ -57,19 +41,13 @@ export declare const MEDIA_HKDF_KEY_MAPPING: {
     'product-catalog-image': string;
     'payment-bg-image': string;
     ptv: string;
-    'biz-cover-photo': string;
 };
-export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING;
-export declare const MEDIA_KEYS: MediaType[];
-/** 120s timeout for history sync stall detection, same as WA Web's handleChunkProgress / restartPausedTimer (g = 120) */
-export declare const HISTORY_SYNC_PAUSED_TIMEOUT_MS = 120000;
+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 declare const MIN_PREKEY_COUNT = 5;
-export declare const INITIAL_PREKEY_COUNT = 812;
-export declare const UPLOAD_TIMEOUT = 30000;
-export declare const TimeMs: {
-    Minute: number;
-    Hour: number;
-    Day: number;
-    Week: number;
+export declare const INITIAL_PREKEY_COUNT = 30;
+export declare const DEFAULT_CACHE_TTLS: {
+    SIGNAL_STORE: number;
+    MSG_RETRY: number;
+    CALL_OFFER: number;
+    USER_DEVICES: number;
 };
-//# sourceMappingURL=index.d.ts.map

package/lib/Defaults/index.js

@@ -1,57 +1,44 @@
-import { proto } from '../../WAProto/index.js';
-import { makeLibSignalRepository } from '../Signal/libsignal.js';
-import { Browsers } from '../Utils/browser-utils.js';
-import logger from '../Utils/logger.js';
-const version = [2, 3000, 1043857760];
-export const UNAUTHORIZED_CODES = [401, 403, 419];
-export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
-export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
-export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
-export const DEF_CALLBACK_PREFIX = 'CB:';
-export const DEF_TAG_PREFIX = 'TAG:';
-export const PHONE_CONNECTION_CB = 'CB:Pong';
-export const WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0]);
-export const WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
-export const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
-export const WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
-export const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
-/** Status messages older than 24 hours are considered expired */
-export const STATUS_EXPIRY_SECONDS = 24 * 60 * 60;
-/** WA Web enforces a 14-day maximum age for placeholder resend requests */
-export const PLACEHOLDER_MAX_AGE_SECONDS = 14 * 24 * 60 * 60;
-export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
-export const DICT_VERSION = 3;
-export const KEY_BUNDLE_TYPE = Buffer.from([5]);
-export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]); // last is "DICT_VERSION"
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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 WAProto_1 = require("../../WAProto");
+const libsignal_1 = require("../Signal/libsignal");
+const Utils_1 = require("../Utils");
+const logger_1 = __importDefault(require("../Utils/logger"));
+const baileys_version_json_1 = require("./baileys-version.json");
+exports.UNAUTHORIZED_CODES = [401, 403, 419];
+exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
+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 = 2;
+exports.KEY_BUNDLE_TYPE = Buffer.from([5]);
+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 */
-export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
-export const WA_CERT_DETAILS = {
+exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
+exports.WA_CERT_DETAILS = {
     SERIAL: 0,
-    ISSUER: 'WhatsAppLongTerm1',
-    PUBLIC_KEY: Buffer.from('142375574d0a587166aae71ebe516437c4a28b73e3695c6ce1f7f9545da8ee6b', 'hex')
 };
-export const PROCESSABLE_HISTORY_TYPES = [
-    proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
-    proto.HistorySync.HistorySyncType.PUSH_NAME,
-    proto.HistorySync.HistorySyncType.RECENT,
-    proto.HistorySync.HistorySyncType.FULL,
-    proto.HistorySync.HistorySyncType.ON_DEMAND,
-    proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
-    proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
+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,
 ];
-export const DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 5 * 60, // 5 minutes
-    MSG_RETRY: 60 * 60, // 1 hour
-    CALL_OFFER: 5 * 60, // 5 minutes
-    USER_DEVICES: 5 * 60 // 5 minutes
-};
-export const DEFAULT_CONNECTION_CONFIG = {
-    version: version,
-    browser: Browsers.macOS('Chrome'),
+exports.DEFAULT_CONNECTION_CONFIG = {
+    version: baileys_version_json_1.version,
+    browser: Utils_1.Browsers.ubuntu('Chrome'),
     waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
     connectTimeoutMs: 20000,
     keepAliveIntervalMs: 30000,
-    logger: logger.child({ class: 'baileys' }),
+    logger: logger_1.default.child({ class: 'baileys' }),
+    printQRInTerminal: false,
     emitOwnEvents: true,
     defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
@@ -60,28 +47,26 @@ export const DEFAULT_CONNECTION_CONFIG = {
     fireInitQueries: true,
     auth: undefined,
     markOnlineOnConnect: true,
-    syncFullHistory: true,
+    syncFullHistory: false,
     patchMessageBeforeSending: msg => msg,
-    shouldSyncHistoryMessage: ({ syncType }) => {
-        return syncType !== proto.HistorySync.HistorySyncType.FULL;
-    },
+    shouldSyncHistoryMessage: () => true,
     shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
     transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
     generateHighQualityLinkPreview: false,
-    enableAutoSessionRecreation: true,
-    enableRecentMessageCache: true,
     options: {},
     appStateMacVerification: {
         patch: false,
-        snapshot: false
+        snapshot: false,
     },
     countryCode: 'US',
     getMessage: async () => undefined,
     cachedGroupMetadata: async () => undefined,
-    makeSignalRepository: makeLibSignalRepository
+    generateMessageID: () => undefined,
+    generateMessageIDV2: () => undefined,
+    makeSignalRepository: libsignal_1.makeLibSignalRepository
 };
-export const MEDIA_PATH_MAP = {
+exports.MEDIA_PATH_MAP = {
     image: '/mms/image',
     video: '/mms/video',
     document: '/mms/document',
@@ -91,18 +76,17 @@ export const MEDIA_PATH_MAP = {
     'product-catalog-image': '/product/image',
     'md-app-state': '',
     'md-msg-hist': '/mms/md-app-state',
-    'biz-cover-photo': '/pps/biz-cover-photo'
 };
-export const MEDIA_HKDF_KEY_MAPPING = {
-    audio: 'Audio',
-    document: 'Document',
-    gif: 'Video',
-    image: 'Image',
-    ppic: '',
-    product: 'Image',
-    ptt: 'Audio',
-    sticker: 'Image',
-    video: 'Video',
+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',
@@ -111,19 +95,14 @@ export const MEDIA_HKDF_KEY_MAPPING = {
     'md-app-state': 'App State',
     'product-catalog-image': '',
     'payment-bg-image': 'Payment Background',
-    ptv: 'Video',
-    'biz-cover-photo': 'Image'
+    'ptv': 'Video'
 };
-export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP);
-/** 120s timeout for history sync stall detection, same as WA Web's handleChunkProgress / restartPausedTimer (g = 120) */
-export const HISTORY_SYNC_PAUSED_TIMEOUT_MS = 120000;
-export const MIN_PREKEY_COUNT = 5;
-export const INITIAL_PREKEY_COUNT = 812;
-export const UPLOAD_TIMEOUT = 30000; // 30 seconds
-export const TimeMs = {
-    Minute: 60 * 1000,
-    Hour: 60 * 60 * 1000,
-    Day: 24 * 60 * 60 * 1000,
-    Week: 7 * 24 * 60 * 60 * 1000
+exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
+exports.MIN_PREKEY_COUNT = 5;
+exports.INITIAL_PREKEY_COUNT = 30;
+exports.DEFAULT_CACHE_TTLS = {
+    SIGNAL_STORE: 10 * 60,
+    MSG_RETRY: 60 * 60,
+    CALL_OFFER: 5 * 60,
+    USER_DEVICES: 5 * 60, // 5 minutes
 };
-//# sourceMappingURL=index.js.map

package/lib/Signal/libsignal.d.ts

@@ -1,5 +1,3 @@
-import type { LIDMapping, SignalAuthState } from '../Types/index.js';
-import type { SignalRepositoryWithLIDStore } from '../Types/Signal.js';
-import type { ILogger } from '../Utils/logger.js';
-export declare function makeLibSignalRepository(auth: SignalAuthState, logger: ILogger, pnToLIDFunc?: (jids: string[]) => Promise<LIDMapping[] | undefined>): SignalRepositoryWithLIDStore;
-//# sourceMappingURL=libsignal.d.ts.map
+import { SignalAuthState } from '../Types';
+import { SignalRepository } from '../Types/Signal';
+export declare function makeLibSignalRepository(auth: SignalAuthState): SignalRepository;