cuki-bailx 1.1.2 → 1.2.2

package/lib/Utils/event-buffer.js

@@ -176,9 +176,6 @@ function append(data, historyCache, event, 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':
@@ -445,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);
@@ -502,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,21 +1,24 @@
+/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
-import { ILogger } from './logger';
+import { Logger } from 'pino';
 import { proto } from '../../WAProto';
-import { BaileysEventEmitter, BaileysEventMap, BrowsersMap, WACallUpdateType, WAVersion } from '../Types';
+import { BaileysEventEmitter, BaileysEventMap, WACallUpdateType, WAVersion } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const Browsers: BrowsersMap;
-export declare const getPlatformId: (browser: string) => any;
-export declare const BufferJSON: {
-    replacer: (k: any, value: any) => any;
-    reviver: (_: any, value: any) => 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 getPlatformId: (browser: string) => any;
 export declare const getKeyAuthor: (key: proto.IMessageKey | undefined | null, meId?: string) => string;
-export declare const writeRandomPadMax16: (msg: Uint8Array) => Buffer<ArrayBuffer>;
-export declare const unpadRandomMax16: (e: Uint8Array | Buffer) => Uint8Array<ArrayBuffer>;
-export declare const encodeWAMessage: (message: proto.IMessage) => Buffer<ArrayBuffer>;
-export declare const encodeNewsletterMessage: (message: proto.IMessage) => Uint8Array<ArrayBufferLike>;
+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 generateRegistrationId: () => number;
-export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array<ArrayBuffer>;
+export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array;
 export declare const toNumber: (t: Long | number | null | undefined) => number;
 /** unix timestamp of a date in seconds */
 export declare const unixTimestampSeconds: (date?: Date) => number;
@@ -34,9 +37,9 @@ 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 generateMessageID: () => string;
-export declare function bindWaitForEvent<T extends keyof BaileysEventMap>(ev: BaileysEventEmitter, event: T): (check: (u: BaileysEventMap[T]) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
-export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
-export declare const printQRIfNecessaryListener: (ev: BaileysEventEmitter, logger: ILogger) => void;
+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<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 master branch.
  * Use to ensure your WA connection is always on the latest version
@@ -54,7 +57,7 @@ export declare const fetchLatestBaileysVersion: (options?: AxiosRequestConfig<an
  * 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;
@@ -84,6 +87,6 @@ export declare const getCodeFromWSError: (error: Error) => number;
  * Is the given platform WA business
  * @param platform AuthenticationCreds.platform
  */
-export declare const isWABusinessPlatform: (platform: string) => platform is "smba" | "smbi";
+export declare const isWABusinessPlatform: (platform: string) => boolean;
 export declare function trimUndefined(obj: any): any;
 export declare function bytesToCrockford(buffer: Buffer): string;

package/lib/Utils/generics.js

@@ -1,46 +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 () {
-    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;
-    };
-})();
+"use strict"; 
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.generateMessageID = exports.generateMessageIDV2 = 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.promiseTimeout = promiseTimeout;
-exports.bindWaitForEvent = bindWaitForEvent;
-exports.trimUndefined = trimUndefined;
-exports.bytesToCrockford = bytesToCrockford;
+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");
@@ -49,13 +12,6 @@ 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");
-const COMPANION_PLATFORM_MAP = {
-    'Chrome': '49',
-    'Edge': '50',
-    'Firefox': '51',
-    'Opera': '53',
-    'Safari': '54'
-};
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
@@ -70,12 +26,12 @@ exports.Browsers = {
     macOS: (browser) => ['Mac OS', browser, '14.4.1'],
     baileys: (browser) => ['Baileys', browser, '6.5.0'],
     windows: (browser) => ['Windows', browser, '10.0.22631'],
-    /** The appropriate browser based on your OS & release */
     appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
 };
+
 const getPlatformId = (browser) => {
     const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
-    return platformType ? platformType.toString() : '49'; //chrome
+    return platformType ? platformType.toString() : '1'; //chrome
 };
 exports.getPlatformId = getPlatformId;
 exports.BufferJSON = {
@@ -118,8 +74,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;
 };
@@ -134,7 +88,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);
@@ -200,6 +154,7 @@ async function promiseTimeout(ms, promise) {
         .finally(cancel);
     return p;
 }
+exports.promiseTimeout = promiseTimeout;
 const generateMessageIDV2 = (userId) => {
     const data = Buffer.alloc(8 + 20 + 16);
     data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
@@ -217,7 +172,7 @@ const generateMessageIDV2 = (userId) => {
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => '3EB0' + (0, crypto_1.randomBytes)(18).toString('hex').toUpperCase();
+const generateMessageID = () => 'SH3NN-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -231,8 +186,8 @@ function bindWaitForEvent(ev, event) {
                 }
             };
             ev.on('connection.update', closeListener);
-            listener = async (update) => {
-                if (await check(update)) {
+            listener = (update) => {
+                if (check(update)) {
                     resolve();
                 }
             };
@@ -244,12 +199,14 @@ function bindWaitForEvent(ev, event) {
         }));
     };
 }
+exports.bindWaitForEvent = bindWaitForEvent;
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 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');
             });
@@ -258,8 +215,12 @@ const printQRIfNecessaryListener = (ev, logger) => {
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
+/**
+ * utility that fetches latest baileys version from the master branch.
+ * Use to ensure your WA connection is always on the latest version
+ */
 const fetchLatestBaileysVersion = async (options = {}) => {
-    const URL = 'https://unpkg.com/@yupra/baileys@1.0.5/lib/Defaults/baileys-version.json';
+    const URL = 'https://raw.githubusercontent.com/kiuur/bails/master/src/Defaults/baileys-version.json';
     try {
         const result = await axios_1.default.get(URL, {
             ...options,
@@ -285,24 +246,13 @@ exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
  */
 const fetchLatestWaWebVersion = async (options) => {
     try {
-        const { data } = await axios_1.default.get('https://web.whatsapp.com/sw.js', {
+        const result = await axios_1.default.get('https://web.whatsapp.com/check-update?version=1&platform=web', {
             ...options,
             responseType: 'json'
         });
-        const regex = /\\?"client_revision\\?":\s*(\d+)/;
-        const match = data.match(regex);
-        if (!(match === null || match === void 0 ? void 0 : match[1])) {
-            return {
-                version: baileys_version_json_1.version,
-                isLatest: false,
-                error: {
-                    message: 'Could not find client revision in the fetched content'
-                }
-            };
-        }
-        const clientRevision = match[1];
+        const version = result.data.currentVersion.split('.');
         return {
-            version: [2, 3000, +clientRevision],
+            version: [+version[0], +version[1], +version[2]],
             isLatest: true
         };
     }
@@ -322,7 +272,6 @@ const generateMdTagPrefix = () => {
 };
 exports.generateMdTagPrefix = generateMdTagPrefix;
 const STATUS_MAP = {
-    'sender': WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
     'played': WAProto_1.proto.WebMessageInfo.Status.PLAYED,
     'read': WAProto_1.proto.WebMessageInfo.Status.READ,
     'read-self': WAProto_1.proto.WebMessageInfo.Status.READ
@@ -371,8 +320,7 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
                 status = 'timeout';
             }
             else {
-                // fired when accepted/rejected/timeout/caller hangs up
-                status = 'terminate';
+                status = 'reject';
             }
             break;
         case 'reject':
@@ -421,6 +369,7 @@ function trimUndefined(obj) {
     }
     return obj;
 }
+exports.trimUndefined = trimUndefined;
 const CROCKFORD_CHARACTERS = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
 function bytesToCrockford(buffer) {
     let value = 0;
@@ -439,3 +388,4 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
+exports.bytesToCrockford = bytesToCrockford;

package/lib/Utils/history.d.ts

@@ -6,14 +6,10 @@ 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<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,9 +32,13 @@ 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, lid: chat.lidJid || undefined, jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : chat.pnJid });
+                contacts.push({ 
+                    id: chat.id,
+                    name: chat.name || undefined,
+                    lid: chat.lidJid || undefined,
+                    jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : undefined
+                });
                 const msgs = chat.messages || [];
                 delete chat.messages;
                 delete chat.archived;
@@ -75,8 +79,6 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
-        syncType: item.syncType,
-        progress: item.progress
     };
 };
 exports.processHistoryMessage = processHistoryMessage;

package/lib/Utils/link-preview.d.ts

@@ -1,5 +1,5 @@
 import { AxiosRequestConfig } from 'axios';
-import { ILogger } from './logger';
+import { Logger } from 'pino';
 import { WAMediaUploadFunction, WAUrlInfo } from '../Types';
 export type URLGenerationOptions = {
     thumbnailWidth: number;
@@ -10,7 +10,7 @@ export type URLGenerationOptions = {
         headers?: AxiosRequestConfig<{}>['headers'];
     };
     uploadImage?: WAMediaUploadFunction;
-    logger?: ILogger;
+    logger?: Logger;
 };
 /**
  * Given a piece of text, checks for any URL present, generates link preview for the same and returns it

package/lib/Utils/link-preview.js

@@ -1,37 +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 () {
-    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.getUrlInfo = void 0;
 const messages_1 = require("./messages");
@@ -58,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,11 +1,4 @@
-export interface ILogger {
-    level: string;
-    child(obj: Record<string, unknown>): ILogger;
-    trace(obj: unknown, msg?: string): any;
-    debug(obj: unknown, msg?: string): any;
-    info(obj: unknown, msg?: string): any;
-    warn(obj: unknown, msg?: string): any;
-    error(obj: unknown, msg?: string): any;
-}
-declare const _default: import("pino").Logger<never, boolean>;
+declare const _default: import("pino").Logger<{
+    timestamp: () => string;
+}>;
 export default _default;

package/lib/Utils/lt-hash.d.ts

@@ -4,8 +4,8 @@ declare class d {
     add(e: any, t: any): any;
     subtract(e: any, t: any): any;
     subtractThenAdd(e: any, t: any, r: any): any;
-    _addSingle(e: any, t: any): Promise<ArrayBuffer>;
-    _subtractSingle(e: any, t: any): Promise<ArrayBuffer>;
+    _addSingle(e: any, t: any): ArrayBuffer;
+    _subtractSingle(e: any, t: any): ArrayBuffer;
     performPointwiseWithOverflow(e: any, t: any, r: any): ArrayBuffer;
 }
 export declare const LT_HASH_ANTI_TAMPERING: d;

package/lib/Utils/lt-hash.js

@@ -30,15 +30,15 @@ class d {
         var n = this;
         return n.add(n.subtract(e, r), t);
     }
-    async _addSingle(e, t) {
+    _addSingle(e, t) {
         var r = this;
-        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e + t));
+        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+        return r.performPointwiseWithOverflow(e, n, ((e, t) => e + t));
     }
-    async _subtractSingle(e, t) {
+    _subtractSingle(e, t) {
         var r = this;
-        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e - t));
+        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+        return r.performPointwiseWithOverflow(e, n, ((e, t) => e - t));
     }
     performPointwiseWithOverflow(e, t, r) {
         const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);

package/lib/Utils/make-mutex.d.ts

@@ -1,7 +1,7 @@
 export declare const makeMutex: () => {
-    mutex<T>(code: () => Promise<T> | T): Promise<T>;
+    mutex<T>(code: () => T | Promise<T>): Promise<T>;
 };
 export type Mutex = ReturnType<typeof makeMutex>;
 export declare const makeKeyedMutex: () => {
-    mutex<T>(key: string, task: () => Promise<T> | T): Promise<T>;
+    mutex<T>(key: string, task: () => T | Promise<T>): Promise<T>;
 };

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

@@ -1,31 +1,27 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { AxiosRequestConfig } from 'axios';
+import type { Logger } from 'pino';
 import { Readable, Transform } from 'stream';
 import { URL } from 'url';
 import { proto } from '../../WAProto';
 import { DownloadableMessage, MediaConnInfo, MediaDecryptionKeyInfo, MediaType, SocketConfig, WAMediaUpload, WAMediaUploadFunction, WAMessageContent } from '../Types';
 import { BinaryNode } from '../WABinary';
-import { ILogger } from './logger';
 export declare const hkdfInfoKey: (type: MediaType) => string;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
-export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): Promise<MediaDecryptionKeyInfo>;
-export declare function uploadFile(buffer: Buffer, logger?: ILogger): Promise<string>;
-export declare function vid2jpg(videoUrl: string): Promise<string>;
-/**
- * Originally written by Techwiz (https://github.com/techwiz37)
- * Modified for customization and improvements
- */
-export declare const extractVideoThumb: (videoPath: string) => Promise<Buffer<ArrayBufferLike>>;
+export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): MediaDecryptionKeyInfo;
 export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | string, width?: number) => Promise<{
-    buffer: Buffer<ArrayBufferLike>;
+    buffer: Buffer;
     original: {
-        width: number;
-        height: number;
+        width: number | undefined;
+        height: number | undefined;
     };
 }>;
 export declare const encodeBase64EncodedStringForUpload: (b64: string) => string;
 export declare const generateProfilePicture: (mediaUpload: WAMediaUpload) => Promise<{
-    img: Buffer<ArrayBufferLike>;
+    img: Buffer;
 }>;
 /** gets the SHA256 of the given media message */
 export declare const mediaMessageSHA256B64: (message: WAMessageContent) => string | null | undefined;
@@ -33,9 +29,9 @@ export declare function getAudioDuration(buffer: Buffer | string | Readable): Pr
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
-export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: ILogger): Promise<Uint8Array<ArrayBuffer> | undefined>;
+export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: Logger): Promise<Uint8Array | undefined>;
 export declare const toReadable: (buffer: Buffer) => Readable;
-export declare const toBuffer: (stream: Readable) => Promise<Buffer<ArrayBuffer>>;
+export declare const toBuffer: (stream: Readable) => Promise<Buffer>;
 export declare const getStream: (item: WAMediaUpload, opts?: AxiosRequestConfig) => Promise<{
     readonly stream: Readable;
     readonly type: "buffer";
@@ -51,7 +47,7 @@ export declare const getStream: (item: WAMediaUpload, opts?: AxiosRequestConfig)
 }>;
 /** generates a thumbnail for a given media, if required */
 export declare function generateThumbnail(file: string, mediaType: 'video' | 'image', options: {
-    logger?: ILogger;
+    logger?: Logger;
 }): Promise<{
     thumbnail: string | undefined;
     originalImageDimensions: {
@@ -64,25 +60,25 @@ export declare const getHttpStream: (url: string | URL, options?: AxiosRequestCo
 }) => Promise<Readable>;
 type EncryptedStreamOptions = {
     saveOriginalFileIfRequired?: boolean;
-    logger?: ILogger;
+    logger?: Logger;
     opts?: AxiosRequestConfig;
 };
 export declare const prepareStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
     mediaKey: undefined;
-    encWriteStream: Buffer<ArrayBuffer>;
+    encWriteStream: Buffer;
     fileLength: number;
-    fileSha256: Buffer<ArrayBufferLike>;
+    fileSha256: Buffer;
     fileEncSha256: undefined;
     bodyPath: string | undefined;
     didSaveToTmpPath: boolean;
 }>;
 export declare const encryptedStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
-    mediaKey: Buffer<ArrayBufferLike>;
+    mediaKey: Buffer;
     encWriteStream: Readable;
     bodyPath: string | undefined;
-    mac: Buffer<ArrayBuffer>;
-    fileEncSha256: Buffer<ArrayBufferLike>;
-    fileSha256: Buffer<ArrayBufferLike>;
+    mac: Buffer;
+    fileEncSha256: Buffer;
+    fileSha256: Buffer;
     fileLength: number;
     didSaveToTmpPath: boolean;
 }>;
@@ -103,18 +99,18 @@ export declare const getWAUploadToServer: ({ customUploadHosts, fetchAgent, logg
 /**
  * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
  */
-export declare const encryptMediaRetryRequest: (key: proto.IMessageKey, mediaKey: Buffer | Uint8Array, meId: string) => Promise<BinaryNode>;
+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;
-    };
-    error?: Boom;
+    } | undefined;
+    error?: Boom<any> | undefined;
 };
 export declare const decryptMediaRetryData: ({ ciphertext, iv }: {
     ciphertext: Uint8Array;
     iv: Uint8Array;
-}, mediaKey: Uint8Array, msgId: string) => Promise<proto.MediaRetryNotification>;
+}, mediaKey: Uint8Array, msgId: string) => proto.MediaRetryNotification;
 export declare const getStatusCodeForMediaRetry: (code: number) => any;
 export {};