@queenanya/baileys 7.4.10 → 7.4.13

package/lib/Utils/event-buffer.js

@@ -138,9 +138,7 @@ const makeBufferData = () => {
         groupUpdates: {}
     };
 };
-function append(data, historyCache, event, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-eventData, logger) {
+function append(data, historyCache, event, eventData, logger) {
     var _a, _b, _c;
     switch (event) {
         case 'messaging-history.set':
@@ -178,9 +176,6 @@ eventData, logger) {
                 }
             }
             data.historySets.empty = false;
-            data.historySets.syncType = eventData.syncType;
-            data.historySets.progress = eventData.progress;
-            data.historySets.peerDataRequestSessionId = eventData.peerDataRequestSessionId;
             data.historySets.isLatest = eventData.isLatest || data.historySets.isLatest;
             break;
         case 'chats.upsert':
@@ -447,10 +442,7 @@ function consolidateEvents(data) {
             chats: Object.values(data.historySets.chats),
             messages: Object.values(data.historySets.messages),
             contacts: Object.values(data.historySets.contacts),
-            syncType: data.historySets.syncType,
-            progress: data.historySets.progress,
-            isLatest: data.historySets.isLatest,
-            peerDataRequestSessionId: data.historySets.peerDataRequestSessionId
+            isLatest: data.historySets.isLatest
         };
     }
     const chatUpsertList = Object.values(data.chatUpserts);
@@ -504,10 +496,12 @@ function consolidateEvents(data) {
     return map;
 }
 function concatChats(a, b) {
-    if (b.unreadCount === null && // neutralize unread counter
-        a.unreadCount < 0) {
-        a.unreadCount = undefined;
-        b.unreadCount = undefined;
+    if (b.unreadCount === null) {
+        // neutralize unread counter
+        if (a.unreadCount < 0) {
+            a.unreadCount = undefined;
+            b.unreadCount = undefined;
+        }
     }
     if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number') {
         b = { ...b };

package/lib/Utils/generics.d.ts

@@ -1,22 +1,17 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import { Logger } from 'pino';
 import { proto } from '../../WAProto';
-import { BaileysEventEmitter, BaileysEventMap, BrowsersMap, ConnectionState, WACallUpdateType, WAVersion } from '../Types';
+import { BaileysEventEmitter, BaileysEventMap, WACallUpdateType, WAVersion } from '../Types';
 import { BinaryNode } from '../WABinary';
-/**
-const COMPANION_PLATFORM_MAP = {
-    'Chrome': '49',
-    'Edge': '50',
-    'Firefox': '51',
-    'Opera': '53',
-    'Safari': '54'
-}
-*/
-export declare const Browsers: BrowsersMap;
-/** Other Browser Support for Paircode */
-export declare const getPlatformId: (browser: string) => any;
+export declare const Browsers: {
+    ubuntu: (browser: any) => [string, string, string];
+    macOS: (browser: any) => [string, string, string];
+    baileys: (browser: any) => [string, string, string];
+    windows: (browser: any) => [string, string, string];
+    /** The appropriate browser based on your OS & release */
+    appropriate: (browser: any) => [string, string, string];
+};
 export declare const BufferJSON: {
     replacer: (k: any, value: any) => any;
     reviver: (_: any, value: any) => any;
@@ -25,7 +20,6 @@ export declare const getKeyAuthor: (key: proto.IMessageKey | undefined | null, m
 export declare const writeRandomPadMax16: (msg: Uint8Array) => Buffer;
 export declare const unpadRandomMax16: (e: Uint8Array | Buffer) => Uint8Array;
 export declare const encodeWAMessage: (message: proto.IMessage) => Buffer;
-export declare const encodeNewsletterMessage: (message: proto.IMessage) => Uint8Array;
 export declare const generateRegistrationId: () => number;
 export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array;
 export declare const toNumber: (t: Long | number | null | undefined) => number;
@@ -45,29 +39,15 @@ export declare const delayCancellable: (ms: number) => {
 };
 export declare function promiseTimeout<T>(ms: number | undefined, promise: (resolve: (v: T) => void, reject: (error: any) => void) => void): Promise<T>;
 export declare const generateMessageIDV2: (userId?: string) => string;
-export declare const generateMessageIDV3: (userId?: string) => string;
 export declare const generateMessageID: () => string;
 export declare function bindWaitForEvent<T extends keyof BaileysEventMap>(ev: BaileysEventEmitter, event: T): (check: (u: BaileysEventMap[T]) => boolean | undefined, timeoutMs?: number) => Promise<void>;
-export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
+export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
 export declare const printQRIfNecessaryListener: (ev: BaileysEventEmitter, logger: Logger) => void;
-/**
- * utility that fetches latest baileys version from the main branch.
- * Use to ensure your WA connection is always on the latest version
- */
-export declare const fetchLatestBaileysVersion: (options?: AxiosRequestConfig<any>) => Promise<{
-    version: number[];
-    isLatest: boolean;
-    error?: undefined;
-} | {
-    version: WAVersion;
-    isLatest: boolean;
-    error: any;
-}>;
 /**
  * utility that fetches latest baileys version from the master branch.
  * Use to ensure your WA connection is always on the latest version
  */
-export declare const fetchLatestBaileysVersion2: (options?: AxiosRequestConfig<any>) => Promise<{
+export declare const fetchLatestBaileysVersion: (options?: AxiosRequestConfig<any>) => Promise<{
     version: WAVersion;
     isLatest: boolean;
     error?: undefined;
@@ -80,7 +60,7 @@ export declare const fetchLatestBaileysVersion2: (options?: AxiosRequestConfig<a
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
  */
-export declare const fetchLatestWaWebVersion: (options: AxiosRequestConfig<{}>) => Promise<{
+export declare const fetchLatestWaWebVersion: (options: AxiosRequestConfig<any>) => Promise<{
     version: WAVersion;
     isLatest: boolean;
     error?: undefined;
@@ -111,9 +91,5 @@ export declare const getCodeFromWSError: (error: Error) => number;
  * @param platform AuthenticationCreds.platform
  */
 export declare const isWABusinessPlatform: (platform: string) => boolean;
-export declare function trimUndefined(obj: {
-    [_: string]: any;
-}): {
-    [_: string]: any;
-};
+export declare function trimUndefined(obj: any): any;
 export declare function bytesToCrockford(buffer: Buffer): string;

package/lib/Utils/generics.js

@@ -1,32 +1,9 @@
 "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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytesToCrockford = exports.trimUndefined = exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion2 = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.bindWaitForEvent = exports.generateMessageID = exports.generateMessageIDV3 = exports.generateMessageIDV2 = exports.promiseTimeout = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeNewsletterMessage = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.getPlatformId = exports.Browsers = void 0;
+exports.bytesToCrockford = exports.trimUndefined = exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.bindWaitForEvent = exports.generateMessageID = exports.generateMessageIDV2 = exports.promiseTimeout = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.Browsers = void 0;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -35,49 +12,27 @@ const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
-/** Added Extra Browsers or Platforms*/
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
     'win32': 'Windows',
-    'android': 'Android',
-    'freebsd': 'FreeBSD',
-    'openbsd': 'OpenBSD',
-    'sunos': 'Solaris'
+    'android': 'Android'
 };
-/**
-const COMPANION_PLATFORM_MAP = {
-    'Chrome': '49',
-    'Edge': '50',
-    'Firefox': '51',
-    'Opera': '53',
-    'Safari': '54'
-}
-*/
 exports.Browsers = {
-    ubuntu: (browser) => ['Ubuntu', browser, '24.04.1'],
-    macOS: (browser) => ['Mac OS', browser, '14.4.1'],
-    baileys: (browser) => ['Baileys', browser, '6.7.9'],
-    windows: (browser) => ['Windows', browser, '10.0.22631'],
-    // iOS: (browser) => ['iOS', browser, '18.1'],
+    ubuntu: browser => ['Ubuntu', browser, '20.0.04'],
+    macOS: browser => ['Mac OS', browser, '10.15.7'],
+    baileys: browser => ['Baileys', browser, '4.0.0'],
+    windows: browser => ['Windows', browser, '10.0.22621'],
     /** The appropriate browser based on your OS & release */
-    appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
+    appropriate: browser => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
 };
-/** Other Browser Support for Paircode */
-const getPlatformId = (browser) => {
-    const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
-    return platformType ? platformType.toString().charCodeAt(0).toString() : '51'; // Firefox
-};
-exports.getPlatformId = getPlatformId;
 exports.BufferJSON = {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     replacer: (k, value) => {
         if (Buffer.isBuffer(value) || value instanceof Uint8Array || (value === null || value === void 0 ? void 0 : value.type) === 'Buffer') {
             return { type: 'Buffer', data: Buffer.from((value === null || value === void 0 ? void 0 : value.data) || value).toString('base64') };
         }
         return value;
     },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     reviver: (_, value) => {
         if (typeof value === 'object' && !!value && (value.buffer === true || value.type === 'Buffer')) {
             const val = value.data || value.value;
@@ -111,8 +66,6 @@ const unpadRandomMax16 = (e) => {
 exports.unpadRandomMax16 = unpadRandomMax16;
 const encodeWAMessage = (message) => ((0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish()));
 exports.encodeWAMessage = encodeWAMessage;
-const encodeNewsletterMessage = (message) => (WAProto_1.proto.Message.encode(message).finish());
-exports.encodeNewsletterMessage = encodeNewsletterMessage;
 const generateRegistrationId = () => {
     return Uint16Array.from((0, crypto_1.randomBytes)(2))[0] & 16383;
 };
@@ -127,7 +80,7 @@ const encodeBigEndian = (e, t = 4) => {
     return a;
 };
 exports.encodeBigEndian = encodeBigEndian;
-const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0);
+const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t);
 exports.toNumber = toNumber;
 /** unix timestamp of a date in seconds */
 const unixTimestampSeconds = (date = new Date()) => Math.floor(date.getTime() / 1000);
@@ -194,7 +147,6 @@ async function promiseTimeout(ms, promise) {
     return p;
 }
 exports.promiseTimeout = promiseTimeout;
-//Useless but still keep this to avoid unexpected errors and bugs 
 const generateMessageIDV2 = (userId) => {
     const data = Buffer.alloc(8 + 20 + 16);
     data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
@@ -208,19 +160,11 @@ const generateMessageIDV2 = (userId) => {
     const random = (0, crypto_1.randomBytes)(16);
     random.copy(data, 28);
     const hash = (0, crypto_1.createHash)('sha256').update(data).digest();
-    return 'ANYAWEB' + hash.toString('hex').toUpperCase().substring(0, 18);
+    return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18);
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
-//Message ID function for Anya_Baileyz
-//This V3 is RollBack Update Of Old Message ID
-const generateMessageIDV3 = (userId) => {
-    let swebfix = 'ANYAWEB';
-    let swebRandom = (0, crypto_1.randomBytes)(5).toString('hex').toUpperCase().substring(0, 10);
-    return swebfix + swebRandom;
-};
-exports.generateMessageIDV3 = generateMessageIDV3;
 // generate a random ID to attach to a message
-const generateMessageID = () => 'ANYAWEB' + (0, crypto_1.randomBytes)(10).toString('hex').toUpperCase();
+const generateMessageID = () => 'FELZ' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -253,7 +197,8 @@ exports.bindWaitForConnectionUpdate = bindWaitForConnectionUpdate;
 const printQRIfNecessaryListener = (ev, logger) => {
     ev.on('connection.update', async ({ qr }) => {
         if (qr) {
-            const QR = await Promise.resolve().then(() => __importStar(require('qrcode-terminal'))).then(m => m.default || m)
+            const QR = await import('qrcode-terminal')
+                .then(m => m.default || m)
                 .catch(() => {
                 logger.error('QR code terminal not added as dependency');
             });
@@ -262,37 +207,11 @@ const printQRIfNecessaryListener = (ev, logger) => {
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
-/**
- * utility that fetches latest baileys version from the main branch.
- * Use to ensure your WA connection is always on the latest version
- */
-const fetchLatestBaileysVersion = async (options = {}) => {
-    try {
-        const result = await axios_1.default.get('https://raw.githubusercontent.com/wppconnect-team/wa-version/main/versions.json', {
-            ...options,
-            responseType: 'json'
-        });
-        const version = result.data.currentVersion.split('.');
-        const version2 = version[2].replace('-alpha', '');
-        return {
-            version: [+version[0], +version[1], +version2],
-            isLatest: true
-        };
-    }
-    catch (error) {
-        return {
-            version: baileys_version_json_1.version,
-            isLatest: false,
-            error
-        };
-    }
-};
-exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
 /**
  * utility that fetches latest baileys version from the master branch.
  * Use to ensure your WA connection is always on the latest version
  */
-const fetchLatestBaileysVersion2 = async (options = {}) => {
+const fetchLatestBaileysVersion = async (options = {}) => {
     const URL = 'https://raw.githubusercontent.com/WhiskeySockets/Baileys/master/src/Defaults/baileys-version.json';
     try {
         const result = await axios_1.default.get(URL, {
@@ -312,7 +231,7 @@ const fetchLatestBaileysVersion2 = async (options = {}) => {
         };
     }
 };
-exports.fetchLatestBaileysVersion2 = fetchLatestBaileysVersion2;
+exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
 /**
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
@@ -393,8 +312,7 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
                 status = 'timeout';
             }
             else {
-                //fired when accepted/rejected/timeout/caller hangs up
-                status = 'terminate';
+                status = 'reject';
             }
             break;
         case 'reject':
@@ -420,9 +338,7 @@ const getCodeFromWSError = (error) => {
             statusCode = code;
         }
     }
-    else if (
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ((_b = error === null || error === void 0 ? void 0 : error.code) === null || _b === void 0 ? void 0 : _b.startsWith('E'))
+    else if (((_b = error === null || error === void 0 ? void 0 : error.code) === null || _b === void 0 ? void 0 : _b.startsWith('E'))
         || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('timed out'))) { // handle ETIMEOUT, ENOTFOUND etc
         statusCode = 408;
     }
@@ -437,7 +353,6 @@ const isWABusinessPlatform = (platform) => {
     return platform === 'smbi' || platform === 'smba';
 };
 exports.isWABusinessPlatform = isWABusinessPlatform;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function trimUndefined(obj) {
     for (const key in obj) {
         if (typeof obj[key] === 'undefined') {
@@ -452,8 +367,8 @@ function bytesToCrockford(buffer) {
     let value = 0;
     let bitCount = 0;
     const crockford = [];
-    for (const element of buffer) {
-        value = (value << 8) | (element & 0xff);
+    for (let i = 0; i < buffer.length; i++) {
+        value = (value << 8) | (buffer[i] & 0xff);
         bitCount += 8;
         while (bitCount >= 5) {
             crockford.push(CROCKFORD_CHARACTERS.charAt((value >>> (bitCount - 5)) & 31));

package/lib/Utils/history.d.ts

@@ -1,19 +1,15 @@
 import { AxiosRequestConfig } from 'axios';
 import { proto } from '../../WAProto';
 import { Chat, Contact } from '../Types';
-export declare const downloadHistory: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<{}>) => Promise<proto.HistorySync>;
+export declare const downloadHistory: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<any>) => Promise<proto.HistorySync>;
 export declare const processHistoryMessage: (item: proto.IHistorySync) => {
     chats: Chat[];
     contacts: Contact[];
     messages: proto.IWebMessageInfo[];
-    syncType: proto.HistorySync.HistorySyncType;
-    progress: number | null | undefined;
 };
-export declare const downloadAndProcessHistorySyncNotification: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<{}>) => Promise<{
+export declare const downloadAndProcessHistorySyncNotification: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<any>) => Promise<{
     chats: Chat[];
     contacts: Contact[];
     messages: proto.IWebMessageInfo[];
-    syncType: proto.HistorySync.HistorySyncType;
-    progress: number | null | undefined;
 }>;
 export declare const getHistoryMsg: (message: proto.IMessage) => proto.Message.IHistorySyncNotification | null | undefined;

package/lib/Utils/history.js

@@ -32,7 +32,6 @@ const processHistoryMessage = (item) => {
         case WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
         case WAProto_1.proto.HistorySync.HistorySyncType.RECENT:
         case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
-        case WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND:
             for (const chat of item.conversations) {
                 contacts.push({ id: chat.id, name: chat.name || undefined });
                 const msgs = chat.messages || [];
@@ -75,8 +74,6 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
-        syncType: item.syncType,
-        progress: item.progress
     };
 };
 exports.processHistoryMessage = processHistoryMessage;

package/lib/Utils/index.d.ts

@@ -11,7 +11,6 @@ export * from './chat-utils';
 export * from './lt-hash';
 export * from './auth-utils';
 export * from './baileys-event-stream';
-export * from './use-single-file-auth-state';
 export * from './use-multi-file-auth-state';
 export * from './link-preview';
 export * from './event-buffer';

package/lib/Utils/index.js

@@ -27,7 +27,6 @@ __exportStar(require("./chat-utils"), exports);
 __exportStar(require("./lt-hash"), exports);
 __exportStar(require("./auth-utils"), exports);
 __exportStar(require("./baileys-event-stream"), exports);
-__exportStar(require("./use-single-file-auth-state"), exports);
 __exportStar(require("./use-multi-file-auth-state"), exports);
 __exportStar(require("./link-preview"), exports);
 __exportStar(require("./event-buffer"), exports);

package/lib/Utils/link-preview.js

@@ -1,27 +1,4 @@
 "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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUrlInfo = void 0;
 const messages_1 = require("./messages");
@@ -48,7 +25,7 @@ const getUrlInfo = async (text, opts = {
         // retries
         const retries = 0;
         const maxRetry = 5;
-        const { getLinkPreview } = await Promise.resolve().then(() => __importStar(require('link-preview-js')));
+        const { getLinkPreview } = await import('link-preview-js');
         let previewLink = text;
         if (!text.startsWith('https://') && !text.startsWith('http://')) {
             previewLink = 'https://' + previewLink;

package/lib/Utils/logger.d.ts

@@ -1,2 +1,4 @@
-declare const _default: import("pino").Logger<never, boolean>;
+declare const _default: import("pino").Logger<{
+    timestamp: () => string;
+}>;
 export default _default;

package/lib/Utils/make-mutex.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeKeyedMutex = exports.makeMutex = void 0;
 const makeMutex = () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let task = Promise.resolve();
     let taskTimeout;
     return {

package/lib/Utils/messages-media.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
@@ -100,7 +99,7 @@ export declare const encryptedStream: (media: WAMediaUpload, mediaType: MediaTyp
 export type MediaDownloadOptions = {
     startByte?: number;
     endByte?: number;
-    options?: AxiosRequestConfig<{}>;
+    options?: AxiosRequestConfig<any>;
 };
 export declare const getUrlFromDirectPath: (directPath: string) => string;
 export declare const downloadContentFromMessage: ({ mediaKey, directPath, url }: DownloadableMessage, type: MediaType, opts?: MediaDownloadOptions) => Promise<Transform>;
@@ -116,7 +115,7 @@ export declare const getWAUploadToServer: ({ customUploadHosts, fetchAgent, logg
  */
 export declare const encryptMediaRetryRequest: (key: proto.IMessageKey, mediaKey: Buffer | Uint8Array, meId: string) => BinaryNode;
 export declare const decodeMediaRetryNode: (node: BinaryNode) => {
-    key: import("../Types").WAMessageKey;
+    key: proto.IMessageKey;
     media?: {
         ciphertext: Uint8Array;
         iv: Uint8Array;

package/lib/Utils/messages-media.js

@@ -22,13 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.extensionForMediaMessage = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.generateThumbnail = exports.getStream = exports.toBuffer = exports.toReadable = exports.getAudioWaveform = exports.getAudioDuration = exports.mediaMessageSHA256B64 = exports.changeprofileFull = exports.generatePP = exports.generateProfilePictureFP = exports.generateProfilePictureFull = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.getMediaKeys = exports.hkdfInfoKey = void 0;
 const boom_1 = require("@hapi/boom");
-const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
 const Crypto = __importStar(require("crypto"));
 const events_1 = require("events");
@@ -45,11 +41,13 @@ const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
     const [_jimp, sharp] = await Promise.all([
         (async () => {
-            const jimp = await (Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }));
+            const jimp = await (import('jimp')
+                .catch(() => { }));
             return jimp;
         })(),
         (async () => {
-            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
+            const sharp = await (import('sharp')
+                .catch(() => { }));
             return sharp;
         })()
     ]);
@@ -260,7 +258,7 @@ const mediaMessageSHA256B64 = (message) => {
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
-    const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
+    const musicMetadata = await import('music-metadata');
     let metadata;
     if (Buffer.isBuffer(buffer)) {
         metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
@@ -285,7 +283,7 @@ exports.getAudioDuration = getAudioDuration;
  */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const audioDecode = (buffer) => Promise.resolve().then(() => __importStar(require('audio-decode'))).then(({ default: audioDecode }) => audioDecode(buffer));
+        const audioDecode = (buffer) => import('audio-decode').then(({ default: audioDecode }) => audioDecode(buffer));
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;
@@ -385,7 +383,8 @@ async function generateThumbnail(file, mediaType, options) {
 }
 exports.generateThumbnail = generateThumbnail;
 const getHttpStream = async (url, options = {}) => {
-    const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' });
+    const { default: axios } = await import('axios');
+    const fetched = await axios.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
 };
 exports.getHttpStream = getHttpStream;
@@ -443,7 +442,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     let writeStream;
     let didSaveToTmpPath = false;
     if (type === 'file') {
-        bodyPath = media.url.toString();
+        bodyPath = media.url;
     }
     else if (saveOriginalFileIfRequired) {
         bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
@@ -466,8 +465,10 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                 });
             }
             sha256Plain = sha256Plain.update(data);
-            if (writeStream && !writeStream.write(data)) {
-                await (0, events_1.once)(writeStream, 'drain');
+            if (writeStream) {
+                if (!writeStream.write(data)) {
+                    await (0, events_1.once)(writeStream, 'drain');
+                }
             }
             onChunk(aes.update(data));
         }
@@ -638,23 +639,33 @@ exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
+        const { default: axios } = await import('axios');
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
+        const chunks = [];
+        if (!Buffer.isBuffer(stream)) {
+            for await (const chunk of stream) {
+                chunks.push(chunk);
+            }
+        }
+        const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
         let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
         if (newsletter) {
             media = media === null || media === void 0 ? void 0 : media.replace('/mms/', '/newsletter/newsletter-');
         }
-        for (const { hostname } of hosts) {
+        for (const { hostname, maxContentLengthBytes } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth); // the auth token
-            const url = `https://${hostname}${Defaults_1.MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
-                const body = await axios_1.default.post(url, stream, {
+                if (maxContentLengthBytes && reqBody.length > maxContentLengthBytes) {
+                    throw new boom_1.Boom(`Body too large for "${hostname}"`, { statusCode: 413 });
+                }
+                const body = await axios.post(url, reqBody, {
                     ...options,
                     headers: {
                         ...options.headers || {},
@@ -682,7 +693,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 }
             }
             catch (error) {
-                if (axios_1.default.isAxiosError(error)) {
+                if (axios.isAxiosError(error)) {
                     result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
                 }
                 const isLast = hostname === ((_b = hosts[uploadInfo.hosts.length - 1]) === null || _b === void 0 ? void 0 : _b.hostname);
@@ -784,3 +795,7 @@ const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
     [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
 };
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function __importStar(arg0) {
+    throw new Error('Function not implemented.');
+}

package/lib/Utils/messages.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { Logger } from 'pino';
 import { type Transform } from 'stream';
 import { proto } from '../../WAProto';