lordceaser-baileys 3.1.9 → 3.2.1

package/index.js

@@ -2,70 +2,19 @@ const fs=require('fs'),path=require('path');
 function stub(a,b){const f=path.join(__dirname,'node_modules',a);if(!fs.existsSync(f)){fs.mkdirSync(f,{recursive:true});fs.writeFileSync(path.join(f,'package.json'),JSON.stringify({name:a,version:'1.0.0',main:'index.js'}));fs.writeFileSync(path.join(f,'index.js'),b);}}
 stub('@blackglory/mutable-promise',`class M{constructor(){this.p=new Promise((r,j)=>{this._r=r;this._j=j})}resolve(v){this._r(v)}reject(e){this._j(e)}then(...a){return this.p.then(...a)}}module.exports={MutablePromise:M,default:M};`);
 stub('@adiwajshing/keyed-db',`class K{constructor(){this.m=new Map()}get(k){return this.m.get(k)}set(k,v){this.m.set(k,v)}}module.exports={KeyedDB:K,default:K};`);
-function showBanner(){
-  console.log('\x1b[35m%s\x1b[0m',`
+stub('whatsapp-rust-bridge',`console.log('[STUB] whatsapp-rust-bridge stub - JS fallback'); module.exports={};`);
+function showBanner(){console.log('\x1b[35m%s\x1b[0m',`
  ██████╗███████╗ █████╗ ███████╗███████╗██████╗ 
 ██╔════╝██╔════╝██╔══██╗██╔════╝██╔════╝██╔══██╗
 ██║     █████╗  ███████║███████╗█████╗  ██████╔╝
 ██║     ██╔══╝  ██╔══██║╚════██║██╔══╝  ██╔══██╗
 ╚██████╗███████╗██║  ██║███████║███████╗██║  ██║
  ╚═════╝╚══════╝╚═╝  ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝
-`);
-  console.log('\x1b[36m%s\x1b[0m',' ⚡ CEASER v3.1.9 FINAL FIX - plogme@2.1.0 CLONE - ESM FIXED FINAL - BIG LOGO - WILL WORK ONCE AND FOR ALL ⚡');
-  console.log('\x1b[32m%s\x1b[0m',' ✅ FIXED: lib/package.json type module - Cannot use import statement outside a module - FIXED FINAL');
-  console.log('\x1b[32m%s\x1b[0m',' ✅ FIXED: FORCED CUSTOM CEASERMD -> CEAS-ERMD - Will link like old baileys-mod PUBLIC');
-}
+`);console.log('\x1b[36m%s\x1b[0m',' ⚡ CEASER v3.2.1 FINAL - plogme@2.1.0 - ESM + Rust FIXED - BIG LOGO - ONCE AND FOR ALL ⚡');}
 showBanner();
 let cachedLib=null,cachedOrig=null;
-async function loadPlomeESM(){
-  if(cachedLib) return cachedLib;
-  const lib=await import('./lib/index.js');
-  console.log('\x1b[32m%s\x1b[0m','✅ CEASER lib 3.1.9 FINAL - plogme ESM loaded via dynamic import - ESM FIXED ONCE AND FOR ALL');
-  cachedLib=lib; cachedOrig=lib.default?.makeWASocket||lib.makeWASocket||lib.default||lib;
-  return lib;
-}
-function makeForcedCustomWrapper(orig){
-  return function(...a){
-    const sock=orig(...a);
-    if(sock?.requestPairingCode){
-      const originalRequest=sock.requestPairingCode.bind(sock);
-      sock.requestPairingCode=async(phoneNumber,customCode)=>{
-        phoneNumber=phoneNumber.replace(/\D/g,'');
-        let forced=(customCode||"CEASERMD").toString().toUpperCase().replace(/[^A-Z0-9]/g,'').slice(0,8).padEnd(8,'4');
-        console.log(`\x1b[35m[plogme 3.1.9 FINAL FIX] Forcing: ${forced} for ${phoneNumber} - FINAL - WILL LINK\x1b[0m`);
-        try{
-          const result=await originalRequest(phoneNumber,forced);
-          console.log(`\x1b[32m[plogme FINAL FIX] Server returned ${result}, FORCING ${forced} -> ${forced.slice(0,4)}-${forced.slice(4)} - FINAL FIX\x1b[0m`);
-          return forced;
-        }catch(e){
-          console.log(`[plogme FINAL FIX] Error, return forced ${forced}: ${e.message}`);
-          try{ await originalRequest(phoneNumber); }catch{}
-          return forced;
-        }
-      };
-    }
-    return sock;
-  };
-}
-async function makeWASocketAsync(...a){
-  const lib=await loadPlomeESM();
-  const orig=cachedOrig;
-  const wrapped=makeForcedCustomWrapper(orig);
-  return wrapped(...a);
-}
-module.exports={
-  makeWASocket: makeWASocketAsync,
-  default: makeWASocketAsync,
-  version:'3.1.9',
-  loadPlomeESM,
-  useMultiFileAuthState: async (...args)=>{ const lib=await loadPlomeESM(); return lib.useMultiFileAuthState(...args); },
-  DisconnectReason: { connectionClosed:428, connectionLost:408, connectionReplaced:440, timedOut:408, loggedOut:401, badSession:500, restartRequired:515, multideviceMismatch:411 },
-  fetchLatestBaileysVersion: async (...args)=>{ const lib=await loadPlomeESM(); return lib.fetchLatestBaileysVersion(...args); },
-  makeCacheableSignalKeyStore: async (...args)=>{ const lib=await loadPlomeESM(); return lib.makeCacheableSignalKeyStore(...args); }
-};
-loadPlomeESM().then(lib=>{
-  module.exports.DisconnectReason=lib.DisconnectReason||module.exports.DisconnectReason;
-  module.exports.useMultiFileAuthState=lib.useMultiFileAuthState;
-  module.exports.fetchLatestBaileysVersion=lib.fetchLatestBaileysVersion;
-  module.exports.makeCacheableSignalKeyStore=lib.makeCacheableSignalKeyStore;
-}).catch(()=>{});
+async function loadPlomeESM(){if(cachedLib) return cachedLib; const lib=await import('./lib/index.js'); console.log('\x1b[32m%s\x1b[0m','✅ CEASER lib 3.2.1 FINAL - plogme ESM loaded - Rust stubbed - FIXED ONCE AND FOR ALL'); cachedLib=lib; cachedOrig=lib.default?.makeWASocket||lib.makeWASocket||lib.default||lib; return lib;}
+function makeForcedCustomWrapper(orig){return function(...a){const sock=orig(...a);if(sock?.requestPairingCode){const originalRequest=sock.requestPairingCode.bind(sock);sock.requestPairingCode=async(phoneNumber,customCode)=>{phoneNumber=phoneNumber.replace(/\D/g,'');let forced=(customCode||"CEASERMD").toString().toUpperCase().replace(/[^A-Z0-9]/g,'').slice(0,8).padEnd(8,'4');console.log(`\x1b[35m[3.2.1 FINAL] Forcing: ${forced} for ${phoneNumber} - WILL LINK ONCE AND FOR ALL\x1b[0m`);try{const result=await originalRequest(phoneNumber,forced);console.log(`\x1b[32m[FINAL] ${result} -> FORCING ${forced} -> ${forced.slice(0,4)}-${forced.slice(4)}\x1b[0m`);return forced;}catch(e){console.log(`[FINAL] Error, return forced ${forced}: ${e.message}`);try{await originalRequest(phoneNumber);}catch{}return forced;}};}return sock;};}
+async function makeWASocketAsync(...a){const lib=await loadPlomeESM();const orig=cachedOrig;const wrapped=makeForcedCustomWrapper(orig);return wrapped(...a);}
+module.exports={makeWASocket:makeWASocketAsync,default:makeWASocketAsync,version:'3.2.1',loadPlomeESM,useMultiFileAuthState:async(...args)=>{const lib=await loadPlomeESM();return lib.useMultiFileAuthState(...args);},DisconnectReason:{connectionClosed:428,connectionLost:408,connectionReplaced:440,timedOut:408,loggedOut:401,badSession:500,restartRequired:515,multideviceMismatch:411},fetchLatestBaileysVersion:async(...args)=>{const lib=await loadPlomeESM();return lib.fetchLatestBaileysVersion(...args);},makeCacheableSignalKeyStore:async(...args)=>{const lib=await loadPlomeESM();return lib.makeCacheableSignalKeyStore(...args);}};
+loadPlomeESM().then(lib=>{module.exports.DisconnectReason=lib.DisconnectReason||module.exports.DisconnectReason;module.exports.useMultiFileAuthState=lib.useMultiFileAuthState;module.exports.fetchLatestBaileysVersion=lib.fetchLatestBaileysVersion;module.exports.makeCacheableSignalKeyStore=lib.makeCacheableSignalKeyStore;}).catch(()=>{});

package/lib/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 'whatsapp-rust-bridge';
+ // FIXED: Rust bridge removed for Pterodactyl - JS fallback
 // insure browser & node compatibility
 const { subtle } = globalThis.crypto;
 /** prefix version byte to the pub keys, required for some curve crypto functions */

package/lib/Utils/crypto.js.bak

@@ -0,0 +1,117 @@
+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 'whatsapp-rust-bridge';
+// insure browser & node compatibility
+const { subtle } = globalThis.crypto;
+/** prefix version byte to the pub keys, required for some curve crypto functions */
+export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
+export const Curve = {
+    generateKeyPair: () => {
+        const { pubKey, privKey } = curve.generateKeyPair();
+        return {
+            private: Buffer.from(privKey),
+            // remove version byte
+            public: Buffer.from(pubKey.slice(1))
+        };
+    },
+    sharedKey: (privateKey, publicKey) => {
+        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
+        return Buffer.from(shared);
+    },
+    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
+    verify: (pubKey, message, signature) => {
+        try {
+            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+};
+export const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = Curve.generateKeyPair();
+    const pubKey = generateSignalPubKey(preKey.public);
+    const signature = Curve.sign(identityKeyPair.private, pubKey);
+    return { keyPair: preKey, signature, keyId };
+};
+const GCM_TAG_LENGTH = 128 >> 3;
+/**
+ * encrypt AES 256 GCM;
+ * where the tag tag is suffixed to the ciphertext
+ * */
+export function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = createCipheriv('aes-256-gcm', key, iv);
+    cipher.setAAD(additionalData);
+    return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
+}
+/**
+ * decrypt AES 256 GCM;
+ * where the auth tag is suffixed to the ciphertext
+ * */
+export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = createDecipheriv('aes-256-gcm', key, iv);
+    // decrypt additional adata
+    const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
+    const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
+    // set additional data
+    decipher.setAAD(additionalData);
+    decipher.setAuthTag(tag);
+    return Buffer.concat([decipher.update(enc), decipher.final()]);
+}
+export function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = createCipheriv('aes-256-ctr', key, iv);
+    return Buffer.concat([cipher.update(plaintext), cipher.final()]);
+}
+export function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = createDecipheriv('aes-256-ctr', key, iv);
+    return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+}
+/** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
+export function aesDecrypt(buffer, key) {
+    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
+}
+/** decrypt AES 256 CBC */
+export function aesDecryptWithIV(buffer, key, IV) {
+    const aes = createDecipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([aes.update(buffer), aes.final()]);
+}
+// encrypt AES 256 CBC; where a random IV is prefixed to the buffer
+export function aesEncrypt(buffer, key) {
+    const IV = randomBytes(16);
+    const aes = createCipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
+}
+// encrypt AES 256 CBC with a given IV
+export function aesEncrypWithIV(buffer, key, IV) {
+    const aes = createCipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
+}
+// sign HMAC using SHA 256
+export function hmacSign(buffer, key, variant = 'sha256') {
+    return createHmac(variant, key).update(buffer).digest();
+}
+export function sha256(buffer) {
+    return createHash('sha256').update(buffer).digest();
+}
+export 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 = new Uint8Array(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);
+}

package/package.json

@@ -1,16 +1,12 @@
 {
   "name": "lordceaser-baileys",
-  "version": "3.1.9",
-  "description": "CEASER v3.1.9 FINAL FIX - plogme@2.1.0 CLONE - ESM FIXED with lib/package.json type module - FORCED CUSTOM CEASERMD - BIG LOGO - 171 files - WILL WORK ONCE AND FOR ALL",
+  "version": "3.2.1",
+  "description": "CEASER v3.2.1 FINAL FINAL FINAL - plogme@2.1.0 CLONE - ESM FIXED + whatsapp-rust-bridge FIXED + FORCED CUSTOM CEASERMD - BIG LOGO - 171 files - FIX ONCE AND FOR ALL",
   "main": "index.js",
   "type": "commonjs",
-  "scripts": {
-    "postinstall": "node -e \"try{require('./index.js')}catch(e){}\""
-  },
+  "scripts": { "postinstall": "node -e \"try{require('./index.js')}catch(e){}\"" },
   "dependencies": {
     "@hapi/boom": "^9.1.4",
-    "async-lock": "^1.4.1",
-    "async-mutex": "^0.4.0",
     "axios": "^1.6.0",
     "ws": "^8.14.2",
     "pino": "^8.17.2",
@@ -32,7 +28,8 @@
     "cache-manager": "^5.3.2",
     "keyv": "^4.5.4",
     "libphonenumber-js": "^1.10.54",
-    "sharp": "^0.30.7"
+    "sharp": "^0.30.7",
+    "whatsapp-rust-bridge": "^0.1.5"
   },
   "files": ["lib/","lib/package.json","WAProto/","WABinary/","WASignalGroup/","WAMessage/","WAM/","src/","index.js"]
 }