@hbmodsofc/baileys 2.4.0 → 3.0.0

package/lib/Store/make-ordered-dictionary.js

@@ -56,9 +56,9 @@ function makeOrderedDictionary(idGetter) {
         },
         clear: () => {
             array.splice(0, array.length);
-            Object.keys(dict).forEach(key => {
+            for (const key of Object.keys(dict)) {
                 delete dict[key];
-            });
+            }
         },
         filter: (contain) => {
             let i = 0;

package/lib/Types/Label.js

@@ -24,4 +24,4 @@ var LabelColor;
     LabelColor[LabelColor["Color18"] = 17] = "Color18";
     LabelColor[LabelColor["Color19"] = 18] = "Color19";
     LabelColor[LabelColor["Color20"] = 19] = "Color20";
-})(LabelColor = exports.LabelColor || (exports.LabelColor = {}));
+})(LabelColor || (exports.LabelColor = LabelColor = {}));

package/lib/Types/LabelAssociation.js

@@ -6,4 +6,4 @@ var LabelAssociationType;
 (function (LabelAssociationType) {
     LabelAssociationType["Chat"] = "label_jid";
     LabelAssociationType["Message"] = "label_message";
-})(LabelAssociationType = exports.LabelAssociationType || (exports.LabelAssociationType = {}));
+})(LabelAssociationType || (exports.LabelAssociationType = LabelAssociationType = {}));

package/lib/Types/Message.js

@@ -3,7 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WAMessageStatus = exports.WAMessageStubType = exports.WAProto = void 0;
 const WAProto_1 = require("../../WAProto");
 Object.defineProperty(exports, "WAProto", { enumerable: true, get: function () { return WAProto_1.proto; } });
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 exports.WAMessageStubType = WAProto_1.proto.WebMessageInfo.StubType;
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 exports.WAMessageStatus = WAProto_1.proto.WebMessageInfo.Status;

package/lib/Types/Newsletter.js

@@ -1,38 +1,18 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const MexOperations = {
-  PROMOTE: "NotificationNewsletterAdminPromote",
-  DEMOTE: "NotificationNewsletterAdminDemote",
-  UPDATE: "NotificationNewsletterUpdate"
-}
-
-const XWAPaths = {
-  PROMOTE: "xwa2_notify_newsletter_admin_promote",
-  DEMOTE: "xwa2_notify_newsletter_admin_demote",
-  ADMIN_COUNT: "xwa2_newsletter_admin",
-  CREATE: "xwa2_newsletter_create",
-  NEWSLETTER: "xwa2_newsletter",
-  SUBSCRIBED: "xwa2_newsletter_subscribed",
-  METADATA_UPDATE: "xwa2_notify_newsletter_on_metadata_update"
-}
-
-const QueryIds = {
-  JOB_MUTATION: "7150902998257522",
-  METADATA: "6620195908089573",
-  UNFOLLOW: "7238632346214362",
-  FOLLOW: "7871414976211147",
-  UNMUTE: "7337137176362961",
-  MUTE: "25151904754424642",
-  CREATE: "6996806640408138",
-  ADMIN_COUNT: "7130823597031706",
-  CHANGE_OWNER: "7341777602580933",
-  DELETE: "8316537688363079",
-  DEMOTE: "6551828931592903",
-  SUBSCRIBED: "6388546374527196"
-}
-
-exports.MexOperations = MexOperations
-exports.XWAPaths = XWAPaths
-exports.QueryIds = QueryIds
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XWAPaths = exports.MexOperations = void 0;
+var MexOperations;
+(function (MexOperations) {
+    MexOperations["PROMOTE"] = "NotificationNewsletterAdminPromote";
+    MexOperations["DEMOTE"] = "NotificationNewsletterAdminDemote";
+    MexOperations["UPDATE"] = "NotificationNewsletterUpdate";
+})(MexOperations || (exports.MexOperations = MexOperations = {}));
+var XWAPaths;
+(function (XWAPaths) {
+    XWAPaths["PROMOTE"] = "xwa2_notify_newsletter_admin_promote";
+    XWAPaths["DEMOTE"] = "xwa2_notify_newsletter_admin_demote";
+    XWAPaths["ADMIN_COUNT"] = "xwa2_newsletter_admin";
+    XWAPaths["CREATE"] = "xwa2_newsletter_create";
+    XWAPaths["NEWSLETTER"] = "xwa2_newsletter";
+    XWAPaths["METADATA_UPDATE"] = "xwa2_notify_newsletter_on_metadata_update";
+})(XWAPaths || (exports.XWAPaths = XWAPaths = {}));

package/lib/Types/index.js

@@ -17,11 +17,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DisconnectReason = void 0;
 __exportStar(require("./Auth"), exports);
 __exportStar(require("./GroupMetadata"), exports);
+__exportStar(require("./Newsletter"), exports);
 __exportStar(require("./Chat"), exports);
 __exportStar(require("./Contact"), exports);
 __exportStar(require("./State"), exports);
 __exportStar(require("./Message"), exports);
-__exportStar(require("./Newsletter"), exports);
 __exportStar(require("./Socket"), exports);
 __exportStar(require("./Events"), exports);
 __exportStar(require("./Product"), exports);
@@ -39,4 +39,4 @@ var DisconnectReason;
     DisconnectReason[DisconnectReason["multideviceMismatch"] = 411] = "multideviceMismatch";
     DisconnectReason[DisconnectReason["forbidden"] = 403] = "forbidden";
     DisconnectReason[DisconnectReason["unavailableService"] = 503] = "unavailableService";
-})(DisconnectReason = exports.DisconnectReason || (exports.DisconnectReason = {}));
+})(DisconnectReason || (exports.DisconnectReason = DisconnectReason = {}));

package/lib/Utils/async-iterable.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toAsyncIterable = void 0;
+
+/**
+ * Helper by @rexxhayanasi to convert various media inputs into an Async Iterable
+ * Compatible with Baileys buffer/stream handling
+ */
+function toAsyncIterable(input) {
+    if (!input) {
+        throw new Error("Invalid media stream (undefined/null)");
+    }
+
+    if (input[Symbol.asyncIterator]) {
+        return input;
+    }
+
+
+    if (Buffer.isBuffer(input)) {
+        return (async function* () {
+            yield input;
+        })();
+    }
+
+    if (typeof input === "string") {
+        const fs = require("fs");
+        return fs.createReadStream(input);
+    }
+
+    if (typeof input.on === "function") {
+        return (async function* () {
+            for await (const chunk of input) {
+                yield chunk;
+            }
+        })();
+    }
+
+    throw new Error("Unsupported media stream type");
+}
+
+exports.toAsyncIterable = toAsyncIterable;

package/lib/Utils/audioToBuffer.js

@@ -0,0 +1,29 @@
+const { Buffer } = require("buffer")
+const fs = require("fs/promises")
+const { Readable } = require("stream")
+const streamToBuffer = require("./streamToBuffer")
+
+/**
+ * Mengonversi berbagai input audio (Buffer, URL, path file, atau Readable stream) menjadi Buffer.
+ * @param {Buffer|string|Readable} audio Input audio.
+ * @returns {Promise<Buffer>} Buffer hasil konversi.
+ */
+async function audioToBuffer(audio) {
+    if (Buffer.isBuffer(audio)) {
+        return audio
+    }
+
+    if (typeof audio === "string") {
+        if (/^https?:\/\//.test(audio)) {
+            const res = await fetch(audio) // native fetch bawaan Node 20
+            return Buffer.from(await res.arrayBuffer())
+        }
+        return fs.readFile(audio)
+    }
+
+    if (audio instanceof Readable) {
+        return streamToBuffer(audio)
+    }
+
+    throw new TypeError("Unsupported audio input type")
+}

package/lib/Utils/auth-utils.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAuthCreds = exports.addTransactionCapability = exports.makeCacheableSignalKeyStore = void 0;
+exports.initAuthCreds = exports.addTransactionCapability = void 0;
+exports.makeCacheableSignalKeyStore = makeCacheableSignalKeyStore;
 const crypto_1 = require("crypto");
-const node_cache_1 = __importDefault(require("node-cache"));
-const uuid_1 = require("uuid");
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const Defaults_1 = require("../Defaults");
 const crypto_2 = require("./crypto");
 const generics_1 = require("./generics");
@@ -18,7 +18,7 @@ const generics_1 = require("./generics");
  */
 function makeCacheableSignalKeyStore(store, logger, _cache) {
     const cache = _cache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.SIGNAL_STORE,
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.SIGNAL_STORE, // 5 minutes
         useClones: false,
         deleteOnExpire: true,
     });
@@ -39,7 +39,7 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
                 }
             }
             if (idsToFetch.length) {
-                logger.trace({ items: idsToFetch.length }, 'loading from store');
+                logger === null || logger === void 0 ? void 0 : logger.trace({ items: idsToFetch.length }, 'loading from store');
                 const fetched = await store.get(type, idsToFetch);
                 for (const id of idsToFetch) {
                     const item = fetched[id];
@@ -59,7 +59,7 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
                     keys += 1;
                 }
             }
-            logger.trace({ keys }, 'updated cache');
+            logger === null || logger === void 0 ? void 0 : logger.trace({ keys }, 'updated cache');
             await store.set(data);
         },
         async clear() {
@@ -69,7 +69,6 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
         }
     };
 }
-exports.makeCacheableSignalKeyStore = makeCacheableSignalKeyStore;
 /**
  * Adds DB like transaction capability (https://en.wikipedia.org/wiki/Database_transaction) to the SignalKeyStore,
  * this allows batch read & write operations & improves the performance of the lib
@@ -191,13 +190,7 @@ const initAuthCreds = () => {
         accountSettings: {
             unarchiveChats: false
         },
-        // mobile creds
-        deviceId: Buffer.from((0, uuid_1.v4)().replace(/-/g, ''), 'hex').toString('base64url'),
-        phoneId: (0, uuid_1.v4)(),
-        identityId: (0, crypto_1.randomBytes)(20),
         registered: false,
-        backupToken: (0, crypto_1.randomBytes)(20),
-        registration: {},
         pairingCode: undefined,
         lastPropHash: undefined,
         routingInfo: undefined,

package/lib/Utils/baileys-event-stream.js

@@ -11,7 +11,7 @@ const readline_1 = require("readline");
 const generics_1 = require("./generics");
 const make_mutex_1 = require("./make-mutex");
 /**
- * Captures events from a baileys event emitter & stores them in a file
+ * Captures events from a RexxHayanasi event emitter & stores them in a file
  * @param ev The event emitter to read events from
  * @param filename File to save to
  */

package/lib/Utils/browser-utils.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPlatformId = exports.Browsers = void 0;
+
+const os = require("os");
+const { proto } = require("../../WAProto/index.js"); 
+
+const PLATFORM_MAP = {
+    'aix': 'AIX',
+    'darwin': 'Mac OS',
+    'win32': 'Windows',
+    'android': 'Android',
+    'freebsd': 'FreeBSD',
+    'openbsd': 'OpenBSD',
+    'sunos': 'Solaris',
+    'linux': undefined,  // Default ke Ubuntu untuk Linux
+    'haiku': undefined,
+    'cygwin': undefined,
+    'netbsd': undefined
+};
+
+// Fixed: Browsers sekarang fungsi yang return array [platform, browser, version]
+// Ini kompatibel dengan pemanggilan Browsers('Chrome') di Defaults/index.js
+exports.Browsers = (browser) => {
+    const osName = PLATFORM_MAP[os.platform()] || 'Ubuntu';  // Default Ubuntu kalau undefined
+    const osRelease = os.release();  // Ambil versi OS real-time
+    return [osName, browser, osRelease];
+};
+
+const getPlatformId = (browser) => {
+    const platformType = proto.DeviceProps.PlatformType[browser.toUpperCase()];
+    return platformType ? platformType.toString() : '1'; // Default Chrome
+};
+
+exports.getPlatformId = getPlatformId;

package/lib/Utils/business.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadingNecessaryImages = exports.uploadingNecessaryImagesOfProduct = exports.parseProductNode = exports.toProductNode = exports.parseOrderDetailsNode = exports.parseCollectionsNode = exports.parseCatalogNode = void 0;
+exports.uploadingNecessaryImages = exports.parseProductNode = exports.toProductNode = exports.parseOrderDetailsNode = exports.parseCollectionsNode = exports.parseCatalogNode = void 0;
+exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const WABinary_1 = require("../WABinary");
@@ -188,7 +189,6 @@ async function uploadingNecessaryImagesOfProduct(product, waUploadToServer, time
     };
     return product;
 }
-exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
 /**
  * Uploads images not already uploaded to WA's servers
  */

package/lib/Utils/chat-utils.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSyncAction = exports.chatModificationToAppPatch = exports.decodePatches = exports.decodeSyncdSnapshot = exports.downloadExternalPatch = exports.downloadExternalBlob = exports.extractSyncdPatches = exports.decodeSyncdPatch = exports.decodeSyncdMutations = exports.encodeSyncdPatch = exports.newLTHashState = void 0;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
-const LabelAssociation_1 = require("../Types/LabelAssociation");
 const WABinary_1 = require("../WABinary");
+const LabelAssociation_1 = require("../Types/LabelAssociation");
 const crypto_1 = require("./crypto");
 const generics_1 = require("./generics");
 const lt_hash_1 = require("./lt-hash");
 const messages_media_1 = require("./messages-media");
-const mutationKeys = (keydata) => {
-    const expanded = (0, crypto_1.hkdf)(keydata, 160, { info: 'WhatsApp Mutation Keys' });
+const mutationKeys = async (keydata) => {
+    const expanded = await (0, crypto_1.hkdf)(keydata, 160, { info: 'WhatsApp Mutation Keys' });
     return {
         indexKey: expanded.slice(0, 32),
         valueEncryptionKey: expanded.slice(32, 64),
@@ -69,9 +69,9 @@ const makeLtHashGenerator = ({ indexValueMap, hash }) => {
                 subBuffs.push(new Uint8Array(prevOp.valueMac).buffer);
             }
         },
-        finish: () => {
+        finish: async () => {
             const hashArrayBuffer = new Uint8Array(hash).buffer;
-            const result = lt_hash_1.LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
+            const result = await lt_hash_1.LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
             const buffer = Buffer.from(result);
             return {
                 hash: buffer,
@@ -114,14 +114,14 @@ const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, operation
         version: apiVersion
     });
     const encoded = WAProto_1.proto.SyncActionData.encode(dataProto).finish();
-    const keyValue = mutationKeys(key.keyData);
+    const keyValue = await mutationKeys(key.keyData);
     const encValue = (0, crypto_1.aesEncrypt)(encoded, keyValue.valueEncryptionKey);
     const valueMac = generateMac(operation, encValue, encKeyId, keyValue.valueMacKey);
     const indexMac = (0, crypto_1.hmacSign)(indexBuffer, keyValue.indexKey);
     // update LT hash
     const generator = makeLtHashGenerator(state);
     generator.mix({ indexMac, valueMac, operation });
-    Object.assign(state, generator.finish());
+    Object.assign(state, await generator.finish());
     state.version += 1;
     const snapshotMac = generateSnapshotMac(state.hash, state.version, type, keyValue.snapshotMacKey);
     const patch = {
@@ -184,7 +184,7 @@ const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncK
             operation: operation
         });
     }
-    return ltGenerator.finish();
+    return await ltGenerator.finish();
     async function getKey(keyId) {
         const base64Key = Buffer.from(keyId).toString('base64');
         const keyEnc = await getAppStateSyncKey(base64Key);
@@ -202,7 +202,7 @@ const decodeSyncdPatch = async (msg, name, initialState, getAppStateSyncKey, onM
         if (!mainKeyObj) {
             throw new boom_1.Boom(`failed to find key "${base64Key}" to decode patch`, { statusCode: 404, data: { msg } });
         }
-        const mainKey = mutationKeys(mainKeyObj.keyData);
+        const mainKey = await mutationKeys(mainKeyObj.keyData);
         const mutationmacs = msg.mutations.map(mutation => mutation.record.value.blob.slice(-32));
         const patchMac = generatePatchMac(msg.snapshotMac, mutationmacs, (0, generics_1.toNumber)(msg.version.version), name, mainKey.patchMacKey);
         if (Buffer.compare(patchMac, msg.patchMac) !== 0) {
@@ -286,7 +286,7 @@ const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVe
         if (!keyEnc) {
             throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
         }
-        const result = mutationKeys(keyEnc.keyData);
+        const result = await mutationKeys(keyEnc.keyData);
         const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
         if (Buffer.compare(snapshot.mac, computedSnapshotMac) !== 0) {
             throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name} from snapshot`);
@@ -332,7 +332,7 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
             if (!keyEnc) {
                 throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
             }
-            const result = mutationKeys(keyEnc.keyData);
+            const result = await mutationKeys(keyEnc.keyData);
             const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
             if (Buffer.compare(snapshotMac, computedSnapshotMac) !== 0) {
                 throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name}`);
@@ -418,25 +418,31 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
+    else if ('deleteForMe' in mod) {
+        const { timestamp, key, deleteMedia } = mod.deleteForMe;
+        patch = {
+            syncAction: {
+                deleteMessageForMeAction: {
+                    deleteMedia,
+                    messageTimestamp: timestamp
+                }
+            },
+            index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
+            type: 'regular_high',
+            apiVersion: 3,
+            operation: OP.SET
+        };
+    }
     else if ('clear' in mod) {
-        if (mod.clear === 'all') {
-            throw new boom_1.Boom('not supported');
-        }
-        else {
-            const key = mod.clear.messages[0];
-            patch = {
-                syncAction: {
-                    deleteMessageForMeAction: {
-                        deleteMedia: false,
-                        messageTimestamp: key.timestamp
-                    }
-                },
-                index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
-                type: 'regular_high',
-                apiVersion: 3,
-                operation: OP.SET
-            };
-        }
+        patch = {
+            syncAction: {
+                clearChatAction: {} // add message range later
+            },
+            index: ['clearChat', jid, '1' /*the option here is 0 when keep starred messages is enabled*/, '0'],
+            type: 'regular_high',
+            apiVersion: 6,
+            operation: OP.SET
+        };
     }
     else if ('pin' in mod) {
         patch = {
@@ -633,12 +639,7 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
         });
     }
     else if (action === null || action === void 0 ? void 0 : action.contactAction) {
-        ev.emit('contacts.upsert', [{ 
-            id: id,
-            name: action.contactAction.fullName,
-            lid: action.contactAction.lidJid || undefined,
-            jid: (0, WABinary_1.isJidUser)(id) ? id : undefined
-        }]);
+        ev.emit('contacts.upsert', [{ id, name: action.contactAction.fullName, lid: action.contactAction.lidJid || undefined, jid: (0, WABinary_1.isJidUser)(id) ? id : action.contactAction.pnJid }]);
     }
     else if (action === null || action === void 0 ? void 0 : action.pushNameSetting) {
         const name = (_b = action === null || action === void 0 ? void 0 : action.pushNameSetting) === null || _b === void 0 ? void 0 : _b.name;

package/lib/Utils/crypto.js

@@ -15,22 +15,43 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 };
-};
+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.derivePairingCodeKey = exports.hkdf = exports.md5 = exports.sha256 = exports.hmacSign = exports.aesEncrypWithIV = exports.aesEncrypt = exports.aesDecryptWithIV = exports.aesDecrypt = exports.aesDecryptCTR = exports.aesEncryptCTR = exports.aesDecryptGCM = exports.aesEncryptGCM = exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+exports.aesEncryptGCM = aesEncryptGCM;
+exports.aesDecryptGCM = aesDecryptGCM;
+exports.aesEncryptCTR = aesEncryptCTR;
+exports.aesDecryptCTR = aesDecryptCTR;
+exports.aesDecrypt = aesDecrypt;
+exports.aesDecryptWithIV = aesDecryptWithIV;
+exports.aesEncrypt = aesEncrypt;
+exports.aesEncrypWithIV = aesEncrypWithIV;
+exports.hmacSign = hmacSign;
+exports.sha256 = sha256;
+exports.md5 = md5;
+exports.hkdf = hkdf;
+exports.derivePairingCodeKey = derivePairingCodeKey;
 const crypto_1 = require("crypto");
-const futoin_hkdf_1 = __importDefault(require("futoin-hkdf"));
 const libsignal = __importStar(require("libsignal"));
 const Defaults_1 = require("../Defaults");
+// insure browser & node compatibility
+const { subtle } = globalThis.crypto;
 /** prefix version byte to the pub keys, required for some curve crypto functions */
 const generateSignalPubKey = (pubKey) => (pubKey.length === 33
     ? pubKey
@@ -77,7 +98,6 @@ function aesEncryptGCM(plaintext, key, iv, additionalData) {
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
-exports.aesEncryptGCM = aesEncryptGCM;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
@@ -92,60 +112,82 @@ function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-exports.aesDecryptGCM = aesDecryptGCM;
 function aesEncryptCTR(plaintext, key, iv) {
     const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-exports.aesEncryptCTR = aesEncryptCTR;
 function aesDecryptCTR(ciphertext, key, iv) {
     const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
-exports.aesDecryptCTR = aesDecryptCTR;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
 function aesDecrypt(buffer, key) {
     return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
-exports.aesDecrypt = aesDecrypt;
 /** decrypt AES 256 CBC */
 function aesDecryptWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
-exports.aesDecryptWithIV = aesDecryptWithIV;
 // encrypt AES 256 CBC; where a random IV is prefixed to the buffer
 function aesEncrypt(buffer, key) {
     const IV = (0, crypto_1.randomBytes)(16);
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-exports.aesEncrypt = aesEncrypt;
 // encrypt AES 256 CBC with a given IV
 function aesEncrypWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-exports.aesEncrypWithIV = aesEncrypWithIV;
 // sign HMAC using SHA 256
 function hmacSign(buffer, key, variant = 'sha256') {
     return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
 }
-exports.hmacSign = hmacSign;
 function sha256(buffer) {
     return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
-exports.sha256 = sha256;
 function md5(buffer) {
     return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
-exports.md5 = md5;
 // HKDF key expansion
-function hkdf(buffer, expandedLength, info) {
-    return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
+async function hkdf(buffer, expandedLength, info) {
+    // Ensure we have a Uint8Array for the key material
+    const inputKeyMaterial = buffer instanceof Uint8Array
+        ? buffer
+        : new Uint8Array(buffer);
+    // Set default values if not provided
+    const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0);
+    const infoBytes = info.info
+        ? new TextEncoder().encode(info.info)
+        : new Uint8Array(0);
+    // Import the input key material
+    const importedKey = await subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, ['deriveBits']);
+    // Derive bits using HKDF
+    const derivedBits = await subtle.deriveBits({
+        name: 'HKDF',
+        hash: 'SHA-256',
+        salt: salt,
+        info: infoBytes
+    }, importedKey, expandedLength * 8 // Convert bytes to bits
+    );
+    return Buffer.from(derivedBits);
 }
-exports.hkdf = hkdf;
-function derivePairingCodeKey(pairingCode, salt) {
-    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
+async function derivePairingCodeKey(pairingCode, salt) {
+    // Convert inputs to formats Web Crypto API can work with
+    const encoder = new TextEncoder();
+    const pairingCodeBuffer = encoder.encode(pairingCode);
+    const saltBuffer = salt instanceof Uint8Array ? salt : new Uint8Array(salt);
+    // Import the pairing code as key material
+    const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits']);
+    // Derive bits using PBKDF2 with the same parameters
+    // 2 << 16 = 131,072 iterations
+    const derivedBits = await subtle.deriveBits({
+        name: 'PBKDF2',
+        salt: saltBuffer,
+        iterations: 2 << 16,
+        hash: 'SHA-256'
+    }, keyMaterial, 32 * 8 // 32 bytes * 8 = 256 bits
+    );
+    return Buffer.from(derivedBits);
 }
-exports.derivePairingCodeKey = derivePairingCodeKey;