violetics 7.0.1-alpha → 7.0.3-alpha

package/engine-requirements.js

@@ -1,10 +1,13 @@
-const major = parseInt(process.versions.node.split('.')[0], 10);
+const major = parseInt(
+    process.versions.node.split('.')[0],
+    10
+);
 
 if (major < 20) {
-  console.error(
-    `\n❌ This package requires Node.js 20+ to run reliably.\n` +
-    `   You are using Node.js ${process.versions.node}.\n` +
-    `   Please upgrade to Node.js 20+ to proceed.\n`
-  );
-  process.exit(1);
-}
+    console.error(
+        `\n❌ This package requires Node.js 20+ to run reliably.\n` +
+        `   You are using Node.js ${process.versions.node}.\n` +
+        `   Please upgrade to Node.js 20+ to proceed.\n`
+    );
+    process.exit(1);
+}

package/lib/Defaults/index.js

@@ -1,158 +1,144 @@
-var __importDefault = this && this.__importDefault || function (a) {
-    return a && a.__esModule ? a : { "default": a }
+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, 1033846690];
+export const UNAUTHORIZED_CODES = [401, 403, 419];
+export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_show_system_message":false,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
+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 DONATE_URL = 'https://saweria.co/itsliaaa'; // Lia@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
+export const LIBRARY_NAME = 'itsliaaa/baileys';
+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"
+export const OLD_GROUP_ID_REGEX = /^(\d{1,15})-(\d+)@g\.us$/;
+/** 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 = {
+    SERIAL: 0,
+    ISSUER: 'WhatsAppLongTerm1',
+    PUBLIC_KEY: Buffer.from('142375574d0a587166aae71ebe516437c4a28b73e3695c6ce1f7f9545da8ee6b', 'hex')
 };
-
-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"));
-
-exports.UNAUTHORIZED_CODES = [401, 403, 419];
-exports.version = [2, 3000, 1033846690];
-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.28.80';
-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/18.3.1 Device/Apple-iPhone_16`;
-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 = 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.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
-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
+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.DEFAULT_CONNECTION_CONFIG = {
-    version: baileys_version_json_1.version,
-    browser: Utils_1.Browsers.macOS("Chrome"),
-    waWebSocketUrl: "wss://web.whatsapp.com/ws/chat",
-    connectTimeoutMs: 6E4,
-    keepAliveIntervalMs: 15E3,
-    logger: logger_1.default.child({ class: "baileys" }),
-    printQRInTerminal: !1,
-    emitOwnEvents: !0,
-    defaultQueryTimeoutMs: 6E4,
+export const DEFAULT_CONNECTION_CONFIG = {
+    version: version,
+    browser: Browsers.macOS('Chrome'),
+    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
+    connectTimeoutMs: 20000,
+    keepAliveIntervalMs: 30000,
+    logger: logger.child({ class: 'baileys' }),
+    emitOwnEvents: true,
+    defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
-    retryRequestDelayMs: 500,    // was 0 - add minimum backoff between decrypt-fail retries to reduce burst
-    maxMsgRetryCount: 5,         // was 15 - fewer retries = less traffic when running many bots
-    fireInitQueries: !0,
-    auth: void 0,
-    markOnlineOnConnect: !1,     // was true - prevents all bots spamming presence on simultaneous restart
-    syncFullHistory: !1,
-    connectJitterMs: 0,          // set e.g. 10000 to spread multi-bot connects over a random 0-10s window
-    patchMessageBeforeSending: a => a,
-    shouldSyncHistoryMessage: () => !0,
-    shouldIgnoreJid: () => !1,
+    retryRequestDelayMs: 250,
+    maxMsgRetryCount: 3,
+    fireInitQueries: true,
+    auth: undefined,
+    markOnlineOnConnect: true,
+    syncFullHistory: true,
+    patchMessageBeforeSending: msg => msg,
+    shouldSyncHistoryMessage: ({ syncType }) => {
+        return syncType !== proto.HistorySync.HistorySyncType.FULL;
+    },
+    shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3E3 },
-    generateHighQualityLinkPreview: !1,
+    transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 3000 },
+    generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true,
+    enableRecentMessageCache: true,
     options: {},
-    appStateMacVerification: { patch: !1, snapshot: !1 },
-    countryCode: "US",
-    getMessage: async () => { },
-    cachedGroupMetadata: async () => { },
-    makeSignalRepository: libsignal_1.makeLibSignalRepository
+    appStateMacVerification: {
+        patch: false,
+        snapshot: false
+    },
+    countryCode: 'US',
+    getMessage: async () => undefined,
+    cachedGroupMetadata: async () => undefined,
+    makeSignalRepository: 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"
+export const MEDIA_PATH_MAP = {
+    image: '/mms/image',
+    video: '/mms/video',
+    document: '/mms/document',
+    audio: '/mms/audio',
+    sticker: '/mms/image',
+    'sticker-pack': '/mms/sticker-pack',
+    'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
+    'thumbnail-link': '/mms/thumbnail-link',
+    '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"
+// vltcs@changes 06-02-26 --- Add newsletter media path for "/m1/" instead of "/o1/" (⁠≧⁠▽⁠≦⁠)
+export const NEWSLETTER_MEDIA_PATH_MAP = {
+    image: '/newsletter/newsletter-image',
+    video: '/newsletter/newsletter-video',
+    document: '/newsletter/newsletter-document',
+    audio: '/newsletter/newsletter-audio',
+    sticker: '/newsletter/newsletter-image',
+    'thumbnail-link': '/newsletter/newsletter-thumbnail-link'
 };
-
-exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
-exports.MIN_PREKEY_COUNT = 5;
-exports.INITIAL_PREKEY_COUNT = 30;
-exports.UPLOAD_TIMEOUT = 30000;
-exports.MIN_UPLOAD_INTERVAL = 30000; // was 5000 - prevent prekey upload storms when many bots connect at once
-exports.PREKEY_UPLOAD_JITTER_MS = 5000; // random jitter added to prekey upload timing
-
-exports.TimeMs = {
+export const MEDIA_HKDF_KEY_MAPPING = {
+    audio: 'Audio',
+    document: 'Document',
+    gif: 'Video',
+    image: 'Image',
+    ppic: '',
+    product: 'Image',
+    ptt: 'Audio',
+    'sticker-pack': 'Sticker Pack',
+    'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
+    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'
+};
+export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP);
+export const MIN_PREKEY_COUNT = 5;
+export const INITIAL_PREKEY_COUNT = 812;
+export const UPLOAD_TIMEOUT = 30000; // 30 seconds
+export const MIN_UPLOAD_INTERVAL = 5000; // 5 seconds minimum between uploads
+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 TimeMs = {
     Minute: 60 * 1000,
     Hour: 60 * 60 * 1000,
     Day: 24 * 60 * 60 * 1000,
     Week: 7 * 24 * 60 * 60 * 1000
-};
-
-exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 300,
-    MSG_RETRY: 3600,
-    CALL_OFFER: 300,
-    USER_DEVICES: 300
-};
+};

package/lib/Signal/Group/ciphertext-message.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CiphertextMessage = void 0;
-class CiphertextMessage {
+export class CiphertextMessage {
     constructor() {
         this.UNSUPPORTED_VERSION = 1;
         this.CURRENT_VERSION = 3;
@@ -11,5 +8,4 @@ class CiphertextMessage {
         this.SENDERKEY_DISTRIBUTION_TYPE = 5;
         this.ENCRYPTED_MESSAGE_OVERHEAD = 53;
     }
-}
-exports.CiphertextMessage = CiphertextMessage;
+}

package/lib/Signal/Group/group-session-builder.js

@@ -1,42 +1,8 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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.GroupSessionBuilder = void 0;
-const keyhelper = __importStar(require("./keyhelper"));
-const sender_key_distribution_message_1 = require("./sender-key-distribution-message");
-class GroupSessionBuilder {
+import * as keyhelper from './keyhelper.js';
+import { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
+import { SenderKeyName } from './sender-key-name.js';
+import { SenderKeyRecord } from './sender-key-record.js';
+export class GroupSessionBuilder {
     constructor(senderKeyStore) {
         this.senderKeyStore = senderKeyStore;
     }
@@ -58,7 +24,6 @@ class GroupSessionBuilder {
         if (!state) {
             throw new Error('No session state available');
         }
-        return new sender_key_distribution_message_1.SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic());
+        return new SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic());
     }
-}
-exports.GroupSessionBuilder = GroupSessionBuilder;
+}

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 {
+import { decrypt, encrypt } from 'libsignal/src/crypto.js';
+import { SenderKeyMessage } from './sender-key-message.js';
+import { SenderKeyName } from './sender-key-name.js';
+import { SenderKeyRecord } from './sender-key-record.js';
+import { SenderKeyState } from './sender-key-state.js';
+export 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 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 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();
@@ -75,7 +64,7 @@ class GroupCipher {
     }
     async getPlainText(iv, key, ciphertext) {
         try {
-            return (0, crypto_1.decrypt)(key, ciphertext, iv);
+            return decrypt(key, ciphertext, iv);
         }
         catch (e) {
             throw new Error('InvalidMessageException');
@@ -83,14 +72,10 @@ class GroupCipher {
     }
     async getCipherText(iv, key, plaintext) {
         try {
-            const ivBuffer = typeof iv === 'string' ? Buffer.from(iv, 'base64') : iv;
-            const keyBuffer = typeof key === 'string' ? Buffer.from(key, 'base64') : key;
-            const plaintextBuffer = typeof plaintext === 'string' ? Buffer.from(plaintext) : plaintext;
-            return (0, crypto_1.encrypt)(keyBuffer, plaintextBuffer, ivBuffer);
+            return encrypt(key, plaintext, iv);
         }
         catch (e) {
             throw new Error('InvalidMessageException');
         }
     }
-}
-exports.GroupCipher = GroupCipher;
+}

package/lib/Signal/Group/index.js

@@ -1,57 +1,11 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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.keyhelper = exports.CiphertextMessage = exports.SenderChainKey = exports.SenderMessageKey = exports.SenderKeyMessage = exports.SenderKeyState = exports.GroupCipher = exports.SenderKeyName = exports.SenderKeyRecord = exports.SenderKeyDistributionMessage = exports.GroupSessionBuilder = void 0;
-var group_session_builder_1 = require("./group-session-builder");
-Object.defineProperty(exports, "GroupSessionBuilder", { enumerable: true, get: function () { return group_session_builder_1.GroupSessionBuilder; } });
-var sender_key_distribution_message_1 = require("./sender-key-distribution-message");
-Object.defineProperty(exports, "SenderKeyDistributionMessage", { enumerable: true, get: function () { return sender_key_distribution_message_1.SenderKeyDistributionMessage; } });
-var sender_key_record_1 = require("./sender-key-record");
-Object.defineProperty(exports, "SenderKeyRecord", { enumerable: true, get: function () { return sender_key_record_1.SenderKeyRecord; } });
-var sender_key_name_1 = require("./sender-key-name");
-Object.defineProperty(exports, "SenderKeyName", { enumerable: true, get: function () { return sender_key_name_1.SenderKeyName; } });
-var group_cipher_1 = require("./group_cipher");
-Object.defineProperty(exports, "GroupCipher", { enumerable: true, get: function () { return group_cipher_1.GroupCipher; } });
-var sender_key_state_1 = require("./sender-key-state");
-Object.defineProperty(exports, "SenderKeyState", { enumerable: true, get: function () { return sender_key_state_1.SenderKeyState; } });
-var sender_key_message_1 = require("./sender-key-message");
-Object.defineProperty(exports, "SenderKeyMessage", { enumerable: true, get: function () { return sender_key_message_1.SenderKeyMessage; } });
-var sender_message_key_1 = require("./sender-message-key");
-Object.defineProperty(exports, "SenderMessageKey", { enumerable: true, get: function () { return sender_message_key_1.SenderMessageKey; } });
-var sender_chain_key_1 = require("./sender-chain-key");
-Object.defineProperty(exports, "SenderChainKey", { enumerable: true, get: function () { return sender_chain_key_1.SenderChainKey; } });
-var ciphertext_message_1 = require("./ciphertext-message");
-Object.defineProperty(exports, "CiphertextMessage", { enumerable: true, get: function () { return ciphertext_message_1.CiphertextMessage; } });
-exports.keyhelper = __importStar(require("./keyhelper"));
+export { GroupSessionBuilder } from './group-session-builder.js';
+export { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
+export { SenderKeyRecord } from './sender-key-record.js';
+export { SenderKeyName } from './sender-key-name.js';
+export { GroupCipher } from './group_cipher.js';
+export { SenderKeyState } from './sender-key-state.js';
+export { SenderKeyMessage } from './sender-key-message.js';
+export { SenderMessageKey } from './sender-message-key.js';
+export { SenderChainKey } from './sender-chain-key.js';
+export { CiphertextMessage } from './ciphertext-message.js';
+export * as keyhelper from './keyhelper.js';

package/lib/Signal/Group/keyhelper.js

@@ -1,55 +1,17 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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.generateSenderKey = generateSenderKey;
-exports.generateSenderKeyId = generateSenderKeyId;
-exports.generateSenderSigningKey = generateSenderSigningKey;
-const nodeCrypto = __importStar(require("crypto"));
-const curve_1 = require("libsignal/src/curve");
-function generateSenderKey() {
+import * as nodeCrypto from 'crypto';
+import { generateKeyPair } from 'libsignal/src/curve.js';
+export function generateSenderKey() {
     return nodeCrypto.randomBytes(32);
 }
-function generateSenderKeyId() {
+export function generateSenderKeyId() {
     return nodeCrypto.randomInt(2147483647);
 }
-function generateSenderSigningKey(key) {
+export function generateSenderSigningKey(key) {
     if (!key) {
-        key = (0, curve_1.generateKeyPair)();
+        key = generateKeyPair();
     }
     return {
         public: Buffer.from(key.pubKey),
         private: Buffer.from(key.privKey)
     };
-}
+}