@lynovratech/baileys 1.0.8 → 1.0.10

package/lib/cjs/Utils/chat-utils.js

@@ -2,7 +2,7 @@
 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 whatsapp_rust_bridge_1 = require("../vendor/whatsapp-rust-bridge.js");
+const whatsapp_rust_bridge_1 = require("../../vendor/whatsapp-rust-bridge-cjs.cjs");
 const index_js_1 = require("../../WAProto/index.js");
 const LabelAssociation_1 = require("../Types/LabelAssociation");
 const WABinary_1 = require("../WABinary");

package/lib/cjs/Utils/crypto.js

@@ -48,7 +48,7 @@ exports.derivePairingCodeKey = derivePairingCodeKey;
 const crypto_1 = require("crypto");
 const curve = __importStar(require("libsignal/src/curve"));
 const Defaults_1 = require("../Defaults");
-var whatsapp_rust_bridge_1 = require("../vendor/whatsapp-rust-bridge.js");
+var whatsapp_rust_bridge_1 = require("../../vendor/whatsapp-rust-bridge-cjs.cjs");
 Object.defineProperty(exports, "md5", { enumerable: true, get: function () { return whatsapp_rust_bridge_1.md5; } });
 Object.defineProperty(exports, "hkdf", { enumerable: true, get: function () { return whatsapp_rust_bridge_1.hkdf; } });
 // insure browser & node compatibility

package/lib/cjs/Utils/lt-hash.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LT_HASH_ANTI_TAMPERING = void 0;
-const whatsapp_rust_bridge_1 = require("../vendor/whatsapp-rust-bridge.js");
+const whatsapp_rust_bridge_1 = require("../../vendor/whatsapp-rust-bridge-cjs.cjs");
 /**
  * LT Hash is a summation based hash algorithm that maintains the integrity of a piece of data
  * over a series of mutations. You can add/remove mutations and it'll return a hash equal to

package/lib/esm/Utils/chat-utils.js

@@ -1,5 +1,5 @@
 import { Boom } from '@hapi/boom';
-import { expandAppStateKeys } from "../vendor/whatsapp-rust-bridge.js";
+import { expandAppStateKeys } from "../../vendor/whatsapp-rust-bridge.js";
 import { proto } from '../../WAProto/index.js';
 import { LabelAssociationType } from '../Types/LabelAssociation.js';
 import { getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, jidNormalizedUser } from '../WABinary/index.js';

package/lib/esm/Utils/crypto.js

@@ -1,7 +1,7 @@
 import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes } from 'crypto';
 import * as curve from 'libsignal/src/curve.js';
 import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
-export { md5, hkdf } from "../vendor/whatsapp-rust-bridge.js";
+export { md5, hkdf } from "../../vendor/whatsapp-rust-bridge.js";
 // insure browser & node compatibility
 const { subtle } = globalThis.crypto;
 /** prefix version byte to the pub keys, required for some curve crypto functions */

package/lib/esm/Utils/lt-hash.js

@@ -1,4 +1,4 @@
-import { LTHashAntiTampering } from "../vendor/whatsapp-rust-bridge.js";
+import { LTHashAntiTampering } from "../../vendor/whatsapp-rust-bridge.js";
 /**
  * LT Hash is a summation based hash algorithm that maintains the integrity of a piece of data
  * over a series of mutations. You can add/remove mutations and it'll return a hash equal to

package/lib/vendor/whatsapp-rust-bridge-cjs.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+let _mod = null;
+
+async function _load() {
+  if (!_mod) {
+    _mod = await import('./whatsapp-rust-bridge.js');
+  }
+  return _mod;
+}
+
+module.exports = {
+  async expandAppStateKeys(...args) {
+    const m = await _load();
+    return m.expandAppStateKeys(...args);
+  },
+  async md5(...args) {
+    const m = await _load();
+    return m.md5(...args);
+  },
+  async hkdf(...args) {
+    const m = await _load();
+    return m.hkdf(...args);
+  },
+  async LTHashAntiTampering(...args) {
+    const m = await _load();
+    return m.LTHashAntiTampering(...args);
+  }
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lynovratech/baileys",
   "type": "module",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "A WebSockets library for interacting with WhatsApp Web - lynovra fork with JID-first and dual ESM/CJS support",
   "keywords": [
     "whatsapp",

package/scripts/fix-rust-bridge-import.cjs

@@ -1,11 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 
-function getDepth(filePath, baseDir) {
-  const rel = path.relative(baseDir, path.dirname(filePath));
-  return rel === '' ? 0 : rel.split(path.sep).length;
-}
-
 function fixDir(dir, baseDir) {
   const files = fs.readdirSync(dir);
   for(const file of files) {
@@ -15,21 +10,48 @@ function fixDir(dir, baseDir) {
       fixDir(full, baseDir);
     } else if(file.endsWith('.js')) {
       let c = fs.readFileSync(full, 'utf8');
-      if(c.includes("'whatsapp-rust-bridge'") || c.includes('"whatsapp-rust-bridge"')) {
-        const depth = getDepth(full, baseDir);
-        const rel = '../'.repeat(depth) + 'vendor/whatsapp-rust-bridge.js';
-        c = c.replace(/require\(["']whatsapp-rust-bridge["']\)/g, `require("${rel}")`);
-        c = c.replace(/from ["']whatsapp-rust-bridge["']/g, `from "${rel}"`);
+      if(c.includes('whatsapp-rust-bridge')) {
+        const relToVendor = path.relative(
+          path.dirname(full),
+          path.join(baseDir, '..', 'vendor', 'whatsapp-rust-bridge-cjs.cjs')
+        ).replace(/\\/g, '/');
+        c = c.replace(/require\(["'].*?whatsapp-rust-bridge.*?["']\)/g, `require("${relToVendor}")`);
+        c = c.replace(/from ["'].*?whatsapp-rust-bridge.*?["']/g, `from "${relToVendor}"`);
         fs.writeFileSync(full, c);
-        console.log('Fixed:', full);
+        console.log('Fixed:', full, '->', relToVendor);
       }
     }
   }
 }
 
+// CJS pakai wrapper .cjs
 const cjsDir = path.resolve(__dirname, '../lib/cjs');
+fixDir(cjsDir, cjsDir);
+
+// ESM pakai file asli .js
 const esmDir = path.resolve(__dirname, '../lib/esm');
+const esmFiles = [];
+function findEsmFiles(dir) {
+  const files = fs.readdirSync(dir);
+  for(const file of files) {
+    const full = path.join(dir, file);
+    const stat = fs.statSync(full);
+    if(stat.isDirectory()) findEsmFiles(full);
+    else if(file.endsWith('.js')) esmFiles.push(full);
+  }
+}
+findEsmFiles(esmDir);
+for(const full of esmFiles) {
+  let c = fs.readFileSync(full, 'utf8');
+  if(c.includes('whatsapp-rust-bridge')) {
+    const relToVendor = path.relative(
+      path.dirname(full),
+      path.join(esmDir, '..', 'vendor', 'whatsapp-rust-bridge.js')
+    ).replace(/\\/g, '/');
+    c = c.replace(/from ["'].*?whatsapp-rust-bridge.*?["']/g, `from "${relToVendor}"`);
+    fs.writeFileSync(full, c);
+    console.log('Fixed ESM:', full, '->', relToVendor);
+  }
+}
 
-fixDir(cjsDir, cjsDir);
-fixDir(esmDir, esmDir);
 console.log('All done!');