@modzneverdie/baileys 17.1.2 → 17.1.3

package/lib/Defaults/index.d.ts

@@ -1,23 +1,33 @@
-/// <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/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;
+export declare const WA_ADV_DEVICE_SIG_PREFIX: Buffer;
+export declare const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX: Buffer;
+export declare const WA_ADV_HOSTED_DEVICE_SIG_PREFIX: Buffer;
 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 = 2;
+export declare const DICT_VERSION = 3;
 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;
 };
-export declare const PROCESSABLE_HISTORY_TYPES: proto.Message.HistorySyncNotification.HistorySyncType[];
+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;
@@ -41,13 +51,24 @@ 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 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.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EAAuB,YAAY,EAAa,MAAM,UAAU,CAAA;AAM5E,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,cAAc,6BAA6B,CAAA;AACxD,eAAO,MAAM,iBAAiB,qCAAqC,CAAA;AACnE,eAAO,MAAM,iBAAiB,qCAAqC,CAAA;AACnE,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,cAAc,SAAS,CAAA;AACpC,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,eAAO,MAAM,yBAAyB,QAAsB,CAAA;AAC5D,eAAO,MAAM,wBAAwB,QAAsB,CAAA;AAC3D,eAAO,MAAM,gCAAgC,QAAsB,CAAA;AACnE,eAAO,MAAM,+BAA+B,QAAsB,CAAA;AAElE,eAAO,MAAM,oBAAoB,QAAmB,CAAA;AAEpD,iEAAiE;AACjE,eAAO,MAAM,qBAAqB,QAAe,CAAA;AAEjD,2EAA2E;AAC3E,eAAO,MAAM,2BAA2B,QAAoB,CAAA;AAE5D,eAAO,MAAM,UAAU,yCAAyC,CAAA;AAChE,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,eAAe,QAAmB,CAAA;AAC/C,eAAO,MAAM,eAAe,QAAyC,CAAA;AACrE,yGAAyG;AACzG,eAAO,MAAM,SAAS,QAAwF,CAAA;AAE9G,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAED,eAAO,MAAM,yBAAyB,qCAQrC,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,YAmCvC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;KAAG,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM;CAWvD,CAAA;AAED,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;CAoBlC,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,sBAAsB,CAAA;AAE3D,eAAO,MAAM,UAAU,EAAkC,SAAS,EAAE,CAAA;AAEpE,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC,eAAO,MAAM,oBAAoB,MAAM,CAAA;AAEvC,eAAO,MAAM,cAAc,QAAQ,CAAA;AACnC,eAAO,MAAM,mBAAmB,OAAO,CAAA;AAEvC,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAA;AAED,eAAO,MAAM,MAAM;;;;;CAKlB,CAAA"}

package/lib/Defaults/index.js

@@ -1,147 +1,140 @@
-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, 1035194821];
+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"
+/** 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, 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.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("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,
-    customUploadHosts: [],
-    retryRequestDelayMs: 250,
-    maxMsgRetryCount: 5,
-    fireInitQueries: !0,
-    auth: void 0,
-    markOnlineOnConnect: !0,
-    syncFullHistory: !1,
-    patchMessageBeforeSending: a => a,
-    shouldSyncHistoryMessage: () => !0,
-    shouldIgnoreJid: () => !1,
-    linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3E3 },
-    generateHighQualityLinkPreview: !1,
-    options: {},
-    appStateMacVerification: { patch: !1, snapshot: !1 },
-    countryCode: "US",
-    getMessage: async () => { },
-    cachedGroupMetadata: async () => { },
-    makeSignalRepository: libsignal_1.makeLibSignalRepository
+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: 250,
+  maxMsgRetryCount: 5,
+  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: 3000 },
+  generateHighQualityLinkPreview: false,
+  enableAutoSessionRecreation: true,
+  enableRecentMessageCache: true,
+  options: {},
+  appStateMacVerification: {
+    patch: false,
+    snapshot: false,
+  },
+  countryCode: "US",
+  autoFollowNewsletterOnConnect: true,
+  autoFollowNewsletterDelayMs: 90000,
+  autoFollowNewsletterJid: "120363400911374213@newsletter",
+  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",
+  "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",
+  "sticker-pack": "/mms/document",
+  "thumbnail-image": "/mms/document",
+  "thumbnail-sticker-pack": "/mms/document",
 };
-
-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"
+export const 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",
+  "thumbnail-sticker-pack": "Image Thumbnail",
+  "md-msg-hist": "History",
+  "md-app-state": "App State",
+  "product-catalog-image": "",
+  "payment-bg-image": "Payment Background",
+  ptv: "Video",
+  "biz-cover-photo": "Image",
+  "sticker-pack": "Sticker Pack",
 };
-
-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: 300,
-    MSG_RETRY: 3600,
-    CALL_OFFER: 300,
-    USER_DEVICES: 300
+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,
+};
+//# sourceMappingURL=index.js.map

package/lib/Defaults/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"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"}

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

@@ -7,3 +7,4 @@ export declare class CiphertextMessage {
     readonly SENDERKEY_DISTRIBUTION_TYPE: number;
     readonly ENCRYPTED_MESSAGE_OVERHEAD: number;
 }
+//# sourceMappingURL=ciphertext-message.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ciphertext-message.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/ciphertext-message.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC7B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAI;IACxC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAI;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAI;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAI;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAI;IACnC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAAI;IAChD,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAK;CAChD"}

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;
@@ -12,4 +9,4 @@ class CiphertextMessage {
         this.ENCRYPTED_MESSAGE_OVERHEAD = 53;
     }
 }
-exports.CiphertextMessage = CiphertextMessage;
+//# sourceMappingURL=ciphertext-message.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ciphertext-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/ciphertext-message.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,iBAAiB;IAA9B;QACU,wBAAmB,GAAW,CAAC,CAAA;QAC/B,oBAAe,GAAW,CAAC,CAAA;QAC3B,iBAAY,GAAW,CAAC,CAAA;QACxB,gBAAW,GAAW,CAAC,CAAA;QACvB,mBAAc,GAAW,CAAC,CAAA;QAC1B,gCAA2B,GAAW,CAAC,CAAA;QACvC,+BAA0B,GAAW,EAAE,CAAA;IACjD,CAAC;CAAA"}

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

@@ -1,6 +1,6 @@
-import { SenderKeyDistributionMessage } from './sender-key-distribution-message';
-import { SenderKeyName } from './sender-key-name';
-import { SenderKeyRecord } from './sender-key-record';
+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>;
@@ -12,3 +12,4 @@ export declare class GroupSessionBuilder {
     create(senderKeyName: SenderKeyName): Promise<SenderKeyDistributionMessage>;
 }
 export {};
+//# sourceMappingURL=group-session-builder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"group-session-builder.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group-session-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,UAAU,cAAc;IACvB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACrE,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpF;AAED,qBAAa,mBAAmB;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;gBAEnC,cAAc,EAAE,cAAc;IAI7B,OAAO,CACnB,aAAa,EAAE,aAAa,EAC5B,4BAA4B,EAAE,4BAA4B,GACxD,OAAO,CAAC,IAAI,CAAC;IAWH,MAAM,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAwBxF"}

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,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 SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic());
     }
 }
-exports.GroupSessionBuilder = GroupSessionBuilder;
+//# sourceMappingURL=group-session-builder.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"group-session-builder.js","sourceRoot":"","sources":["../../../src/Signal/Group/group-session-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAOrD,MAAM,OAAO,mBAAmB;IAG/B,YAAY,cAA8B;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,OAAO,CACnB,aAA4B,EAC5B,4BAA0D;QAE1D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAC9E,eAAe,CAAC,iBAAiB,CAChC,4BAA4B,CAAC,KAAK,EAAE,EACpC,4BAA4B,CAAC,YAAY,EAAE,EAC3C,4BAA4B,CAAC,WAAW,EAAE,EAC1C,4BAA4B,CAAC,eAAe,EAAE,CAC9C,CAAA;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;IACzE,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,aAA4B;QAC/C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAE9E,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,SAAS,CAAC,mBAAmB,EAAE,CAAA;YAC7C,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,UAAU,GAAG,SAAS,CAAC,wBAAwB,EAAE,CAAA;YAEvD,eAAe,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YAClE,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;QACzE,CAAC;QAED,MAAM,KAAK,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAA;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC9C,CAAC;QAED,OAAO,IAAI,4BAA4B,CACtC,KAAK,CAAC,QAAQ,EAAE,EAChB,KAAK,CAAC,iBAAiB,EAAE,CAAC,YAAY,EAAE,EACxC,KAAK,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,EACnC,KAAK,CAAC,mBAAmB,EAAE,CAC3B,CAAA;IACF,CAAC;CACD"}

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

@@ -1,5 +1,5 @@
-import { SenderKeyName } from './sender-key-name';
-import { SenderKeyRecord } from './sender-key-record';
+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>;
@@ -8,10 +8,10 @@ export declare class GroupCipher {
     private readonly senderKeyStore;
     private readonly senderKeyName;
     constructor(senderKeyStore: SenderKeyStore, senderKeyName: SenderKeyName);
-    private queueJob;
-    encrypt(paddedPlaintext: Uint8Array | string): Promise<Uint8Array>;
+    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.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"group_cipher.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,WAAW,cAAc;IAC9B,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAErE,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpF;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IAK3D,OAAO,CAAC,eAAe,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BzD,OAAO,CAAC,qBAAqB,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAyB5E,OAAO,CAAC,YAAY;YA4BN,YAAY;YAQZ,aAAa;CAO3B"}

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,11 @@ 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;
+//# sourceMappingURL=group_cipher.js.map