jagproject 26.3.23 → 26.3.26

package/engine-requirements.js

@@ -1,10 +1,7 @@
 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.d.ts

@@ -0,0 +1,74 @@
+import { proto } from '../../WAProto/index.js';
+import type { SocketConfig } from '../Types/index.js';
+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>;
+/** 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_CONNECTION_CONFIG: SocketConfig;
+export declare const MEDIA_PATH_MAP: {
+    [T in MediaType]?: string;
+};
+export declare const MEDIA_HKDF_KEY_MAPPING: {
+    audio: string;
+    document: string;
+    gif: string;
+    image: string;
+    ppic: string;
+    product: string;
+    ptt: string;
+    sticker: string;
+    video: string;
+    'thumbnail-document': string;
+    'thumbnail-image': string;
+    'thumbnail-video': string;
+    'thumbnail-link': string;
+    'md-msg-hist': string;
+    'md-app-state': string;
+    '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[];
+export declare const MIN_PREKEY_COUNT = 5;
+export declare const INITIAL_PREKEY_COUNT = 812;
+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;
+    CALL_OFFER: number;
+    USER_DEVICES: number;
+};
+export declare const TimeMs: {
+    Minute: number;
+    Hour: number;
+    Day: number;
+    Week: number;
+};
+//# sourceMappingURL=index.d.ts.map

package/lib/Defaults/index.js

@@ -3,13 +3,15 @@ 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.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.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = exports.WA_ADV_DEVICE_SIG_PREFIX = exports.WA_ADV_ACCOUNT_SIG_PREFIX = exports.UNAUTHORIZED_CODES = exports.version = void 0;
-const WAProto_1 = require("../../WAProto");
-const libsignal_1 = require("../Signal/libsignal");
-const browser_utils_1 = require("../Utils/browser-utils");
-const logger_1 = __importDefault(require("../Utils/logger"));
-const waVer = require("./wileys-version.json");
-exports.version = waVer?.version || [2, 3000, 1036687490];
+exports.PHONENUMBER_MCC = exports.TimeMs = 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.PLACEHOLDER_MAX_AGE_SECONDS = exports.STATUS_EXPIRY_SECONDS = exports.WA_DEFAULT_EPHEMERAL = exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = exports.WA_ADV_DEVICE_SIG_PREFIX = exports.WA_ADV_ACCOUNT_SIG_PREFIX = 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 = exports.version = void 0;
+const index_js_1 = require("../../WAProto/index.js");
+const node_fs_1 = require("node:fs");
+const phoneNumberMcc = JSON.parse((0, node_fs_1.readFileSync)(require('path').join(__dirname, 'phonenumber-mcc.json')));
+const libsignal_js_1 = require("../Signal/libsignal.js");
+const browser_utils_js_1 = require("../Utils/browser-utils.js");
+const logger_js_1 = __importDefault(require("../Utils/logger.js"));
+const waVer = require('./wileys-version.json');
+exports.version = waVer?.version || [2, 3000, 1036804474];
 exports.UNAUTHORIZED_CODES = [401, 403, 419];
 exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
 exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
@@ -22,32 +24,39 @@ exports.WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
 exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
 exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
 exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
+/** Status messages older than 24 hours are considered expired */
+exports.STATUS_EXPIRY_SECONDS = 24 * 60 * 60;
+/** WA Web enforces a 14-day maximum age for placeholder resend requests */
+exports.PLACEHOLDER_MAX_AGE_SECONDS = 14 * 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.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
+    SERIAL: 0,
+    ISSUER: 'WhatsAppLongTerm1',
+    PUBLIC_KEY: Buffer.from('142375574d0a587166aae71ebe516437c4a28b73e3695c6ce1f7f9545da8ee6b', 'hex')
 };
 exports.PROCESSABLE_HISTORY_TYPES = [
-    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
-    WAProto_1.proto.HistorySync.HistorySyncType.PUSH_NAME,
-    WAProto_1.proto.HistorySync.HistorySyncType.RECENT,
-    WAProto_1.proto.HistorySync.HistorySyncType.FULL,
-    WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND,
-    WAProto_1.proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
-    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3,
+    index_js_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
+    index_js_1.proto.HistorySync.HistorySyncType.PUSH_NAME,
+    index_js_1.proto.HistorySync.HistorySyncType.RECENT,
+    index_js_1.proto.HistorySync.HistorySyncType.FULL,
+    index_js_1.proto.HistorySync.HistorySyncType.ON_DEMAND,
+    index_js_1.proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
+    index_js_1.proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
 ];
 exports.DEFAULT_CONNECTION_CONFIG = {
     version: exports.version,
-    browser: (0, browser_utils_1.Browsers)('Chrome'),
+    browser: browser_utils_js_1.Browsers.macOS('Chrome'),
     waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
-    connectTimeoutMs: 20_000,
-    keepAliveIntervalMs: 30_000,
-    logger: logger_1.default.child({ class: 'baileys' }),
+    connectTimeoutMs: 20000,
+    keepAliveIntervalMs: 30000,
+    logger: logger_js_1.default.child({ class: 'wileys' }),
     emitOwnEvents: true,
-    defaultQueryTimeoutMs: 60_000,
+    defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
@@ -56,11 +65,11 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     markOnlineOnConnect: true,
     syncFullHistory: true,
     patchMessageBeforeSending: msg => msg,
-    shouldSyncHistoryMessage: () => true,
+    shouldSyncHistoryMessage: ({ syncType }) => {
+        return syncType !== index_js_1.proto.HistorySync.HistorySyncType.FULL;
+    },
     shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
-    // no forced delay between album items by default, to avoid slow perceived delivery
-    albumMessageItemDelayMs: 0,
     transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
     generateHighQualityLinkPreview: false,
     enableAutoSessionRecreation: true,
@@ -73,7 +82,7 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     countryCode: 'US',
     getMessage: async () => undefined,
     cachedGroupMetadata: async () => undefined,
-    makeSignalRepository: libsignal_1.makeLibSignalRepository
+    makeSignalRepository: libsignal_js_1.makeLibSignalRepository
 };
 exports.MEDIA_PATH_MAP = {
     image: '/mms/image',
@@ -86,8 +95,7 @@ exports.MEDIA_PATH_MAP = {
     'md-app-state': '',
     'md-msg-hist': '/mms/md-app-state',
     'biz-cover-photo': '/pps/biz-cover-photo',
-    'sticker-pack': '/mms/sticker',
-    'thumbnail-sticker-pack': '/mms/image'
+    'sticker-pack': '/mms/sticker'
 };
 exports.MEDIA_HKDF_KEY_MAPPING = {
     audio: 'Audio',
@@ -109,17 +117,23 @@ exports.MEDIA_HKDF_KEY_MAPPING = {
     'payment-bg-image': 'Payment Background',
     ptv: 'Video',
     'biz-cover-photo': 'Image',
-    'sticker-pack': 'Sticker Pack',
-    'thumbnail-sticker-pack': 'Image Thumbnail'
+    'sticker-pack': 'Sticker Pack'
 };
 exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
 exports.MIN_PREKEY_COUNT = 5;
 exports.INITIAL_PREKEY_COUNT = 812;
-exports.UPLOAD_TIMEOUT = 30000;
-exports.MIN_UPLOAD_INTERVAL = 5000;
+exports.UPLOAD_TIMEOUT = 30000; // 30 seconds
+exports.MIN_UPLOAD_INTERVAL = 5000; // 5 seconds minimum between uploads
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 5 * 60,
-    MSG_RETRY: 60 * 60,
-    CALL_OFFER: 5 * 60,
-    USER_DEVICES: 5 * 60
+    SIGNAL_STORE: 5 * 60, // 5 minutes
+    MSG_RETRY: 60 * 60, // 1 hour
+    CALL_OFFER: 5 * 60, // 5 minutes
+    USER_DEVICES: 5 * 60 // 5 minutes
+};
+exports.TimeMs = {
+    Minute: 60 * 1000,
+    Hour: 60 * 60 * 1000,
+    Day: 24 * 60 * 60 * 1000,
+    Week: 7 * 24 * 60 * 60 * 1000
 };
+exports.PHONENUMBER_MCC = phoneNumberMcc;

package/lib/Defaults/phonenumber-mcc.json

@@ -0,0 +1,223 @@
+{
+	"93": 412,
+	"355": 276,
+	"213": 603,
+	"1-684": 544,
+	"376": 213,
+	"244": 631,
+	"1-264": 365,
+	"1-268": 344,
+	"54": 722,
+	"374": 283,
+	"297": 363,
+	"61": 505,
+	"43": 232,
+	"994": 400,
+	"1-242": 364,
+	"973": 426,
+	"880": 470,
+	"1-246": 342,
+	"375": 257,
+	"32": 206,
+	"501": 702,
+	"229": 616,
+	"1-441": 350,
+	"975": 402,
+	"591": 736,
+	"387": 218,
+	"267": 652,
+	"55": 724,
+	"1-284": 348,
+	"673": 528,
+	"359": 284,
+	"226": 613,
+	"257": 642,
+	"855": 456,
+	"237": 624,
+	"238": 625,
+	"1-345": 346,
+	"236": 623,
+	"235": 622,
+	"56": 730,
+	"86": 454,
+	"57": 732,
+	"269": 654,
+	"682": 548,
+	"506": 712,
+	"385": 219,
+	"53": 368,
+	"357": 280,
+	"420": 230,
+	"243": 630,
+	"45": 238,
+	"253": 638,
+	"1-767": 366,
+	"1-809": 370,
+	"1-849": 370,
+	"1-829": 370,
+	"593": 740,
+	"20": 602,
+	"503": 706,
+	"240": 627,
+	"291": 657,
+	"372": 248,
+	"251": 636,
+	"500": 750,
+	"298": 288,
+	"679": 542,
+	"358": 244,
+	"33": 208,
+	"689": 547,
+	"241": 628,
+	"220": 607,
+	"995": 282,
+	"49": 262,
+	"233": 620,
+	"350": 266,
+	"30": 202,
+	"299": 290,
+	"1-473": 352,
+	"1-671": 535,
+	"502": 704,
+	"224": 537,
+	"592": 738,
+	"509": 372,
+	"504": 708,
+	"852": 454,
+	"36": 216,
+	"354": 274,
+	"91": 404,
+	"62": 510,
+	"98": 432,
+	"964": 418,
+	"353": 234,
+	"972": 425,
+	"39": 222,
+	"225": 612,
+	"1-876": 338,
+	"81": 440,
+	"962": 416,
+	"254": 639,
+	"686": 545,
+	"383": 221,
+	"965": 419,
+	"371": 247,
+	"961": 415,
+	"266": 651,
+	"231": 618,
+	"218": 606,
+	"423": 295,
+	"370": 246,
+	"352": 270,
+	"389": 294,
+	"261": 646,
+	"265": 650,
+	"60": 502,
+	"960": 472,
+	"223": 610,
+	"356": 278,
+	"692": 551,
+	"222": 609,
+	"230": 617,
+	"52": 334,
+	"691": 550,
+	"373": 259,
+	"377": 212,
+	"976": 428,
+	"382": 297,
+	"1-664": 354,
+	"212": 604,
+	"258": 643,
+	"95": 414,
+	"264": 649,
+	"674": 536,
+	"977": 429,
+	"31": 204,
+	"687": 546,
+	"64": 530,
+	"505": 710,
+	"227": 614,
+	"234": 621,
+	"683": 555,
+	"1-670": 534,
+	"47": 242,
+	"968": 226,
+	"92": 410,
+	"680": 552,
+	"970": 423,
+	"507": 714,
+	"675": 537,
+	"595": 744,
+	"51": 716,
+	"63": 515,
+	"48": 260,
+	"351": 268,
+	"1-787, 1-939": 330,
+	"974": 427,
+	"242": 630,
+	"40": 226,
+	"7": 250,
+	"250": 635,
+	"290": 658,
+	"1-869": 356,
+	"1-758": 358,
+	"508": 308,
+	"1-784": 360,
+	"685": 544,
+	"378": 292,
+	"239": 626,
+	"966": 420,
+	"221": 608,
+	"381": 220,
+	"248": 633,
+	"232": 619,
+	"65": 525,
+	"386": 293,
+	"677": 540,
+	"27": 655,
+	"211": 659,
+	"34": 214,
+	"94": 413,
+	"249": 634,
+	"597": 746,
+	"268": 653,
+	"46": 240,
+	"41": 228,
+	"963": 417,
+	"886": 466,
+	"992": 436,
+	"255": 640,
+	"66": 520,
+	"228": 615,
+	"690": 554,
+	"676": 539,
+	"1-868": 374,
+	"216": 605,
+	"90": 286,
+	"993": 438,
+	"1-649": 376,
+	"688": 553,
+	"1-340": 332,
+	"256": 641,
+	"380": 255,
+	"971": 424,
+	"44": 234,
+	"1": 310,
+	"598": 748,
+	"998": 434,
+	"678": 541,
+	"379": 225,
+	"58": 734,
+	"681": 543,
+	"967": 421,
+	"260": 645,
+	"263": 648,
+	"670": 514,
+	"245": 632,
+	"856": 457,
+	"599": 362,
+	"850": 467,
+	"262": 647,
+	"82": 450,
+	"84": 452
+}

package/lib/Defaults/wileys-version.json

@@ -2,7 +2,7 @@
   "version": [
     2,
     3000,
-    1036687490
+    1036804474
   ],
-  "raw": "2.3000.1036687490"
+  "raw": "2.3000.1036804474"
 }

package/lib/Signal/Group/ciphertext-message.d.ts

@@ -0,0 +1,10 @@
+export declare class CiphertextMessage {
+    readonly UNSUPPORTED_VERSION: number;
+    readonly CURRENT_VERSION: number;
+    readonly WHISPER_TYPE: number;
+    readonly PREKEY_TYPE: number;
+    readonly SENDERKEY_TYPE: number;
+    readonly SENDERKEY_DISTRIBUTION_TYPE: number;
+    readonly ENCRYPTED_MESSAGE_OVERHEAD: number;
+}
+//# sourceMappingURL=ciphertext-message.d.ts.map

package/lib/Signal/Group/group-session-builder.d.ts

@@ -0,0 +1,15 @@
+import { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
+import { SenderKeyName } from './sender-key-name.js';
+import { SenderKeyRecord } from './sender-key-record.js';
+interface SenderKeyStore {
+    loadSenderKey(senderKeyName: SenderKeyName): Promise<SenderKeyRecord>;
+    storeSenderKey(senderKeyName: SenderKeyName, record: SenderKeyRecord): Promise<void>;
+}
+export declare class GroupSessionBuilder {
+    private readonly senderKeyStore;
+    constructor(senderKeyStore: SenderKeyStore);
+    process(senderKeyName: SenderKeyName, senderKeyDistributionMessage: SenderKeyDistributionMessage): Promise<void>;
+    create(senderKeyName: SenderKeyName): Promise<SenderKeyDistributionMessage>;
+}
+export {};
+//# sourceMappingURL=group-session-builder.d.ts.map

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

@@ -34,8 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 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");
+const keyhelper = __importStar(require("./keyhelper.js"));
+const sender_key_distribution_message_js_1 = require("./sender-key-distribution-message.js");
+const sender_key_name_js_1 = require("./sender-key-name.js");
+const sender_key_record_js_1 = require("./sender-key-record.js");
 class GroupSessionBuilder {
     constructor(senderKeyStore) {
         this.senderKeyStore = senderKeyStore;
@@ -58,7 +60,7 @@ 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 sender_key_distribution_message_js_1.SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic());
     }
 }
 exports.GroupSessionBuilder = GroupSessionBuilder;

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

@@ -0,0 +1,17 @@
+import { SenderKeyName } from './sender-key-name.js';
+import { SenderKeyRecord } from './sender-key-record.js';
+export interface SenderKeyStore {
+    loadSenderKey(senderKeyName: SenderKeyName): Promise<SenderKeyRecord>;
+    storeSenderKey(senderKeyName: SenderKeyName, record: SenderKeyRecord): Promise<void>;
+}
+export declare class GroupCipher {
+    private readonly senderKeyStore;
+    private readonly senderKeyName;
+    constructor(senderKeyStore: SenderKeyStore, senderKeyName: SenderKeyName);
+    encrypt(paddedPlaintext: Uint8Array): Promise<Uint8Array>;
+    decrypt(senderKeyMessageBytes: Uint8Array): Promise<Uint8Array>;
+    private getSenderKey;
+    private getPlainText;
+    private getCipherText;
+}
+//# sourceMappingURL=group_cipher.d.ts.map

package/lib/Signal/Group/group_cipher.js

@@ -1,55 +1,47 @@
 "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");
+const crypto_js_1 = require("libsignal/src/crypto.js");
+const sender_key_message_js_1 = require("./sender-key-message.js");
+const sender_key_name_js_1 = require("./sender-key-name.js");
+const sender_key_record_js_1 = require("./sender-key-record.js");
+const sender_key_state_js_1 = require("./sender-key-state.js");
 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_js_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_js_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();
@@ -75,7 +67,7 @@ class GroupCipher {
     }
     async getPlainText(iv, key, ciphertext) {
         try {
-            return (0, crypto_1.decrypt)(key, ciphertext, iv);
+            return (0, crypto_js_1.decrypt)(key, ciphertext, iv);
         }
         catch (e) {
             throw new Error('InvalidMessageException');
@@ -83,10 +75,7 @@ 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 (0, crypto_js_1.encrypt)(key, plaintext, iv);
         }
         catch (e) {
             throw new Error('InvalidMessageException');

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

@@ -0,0 +1,12 @@
+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';
+//# sourceMappingURL=index.d.ts.map