@rexxhayanasi/elaina-baileys 1.0.9 → 1.1.0-rc.2

package/lib/Auth/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSQLiteAuth = void 0;
+const sqlite_1 = __importDefault(require("./sqlite"));
+exports.useSQLiteAuth = sqlite_1.default;

package/lib/Auth/sqlite.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSQLiteAuth = void 0;
+
+const better_sqlite3_1 = require("better-sqlite3");
+const baileys_1 = require("../index"); 
+
+const BetterSqlite = better_sqlite3_1.default || better_sqlite3_1;
+const db = new BetterSqlite("./session.db");
+
+db.exec(`
+  CREATE TABLE IF NOT EXISTS auth (
+    id TEXT PRIMARY KEY,
+    data TEXT
+  )
+`);
+
+const useSQLiteAuth = () => {
+    const readData = (id) => {
+        const row = db.prepare("SELECT data FROM auth WHERE id=?").get(id);
+        return row ? JSON.parse(row.data, baileys_1.BufferJSON.reviver) : null;
+    };
+
+    const writeData = (id, data) => {
+        db.prepare("INSERT OR REPLACE INTO auth VALUES (?, ?)")
+            .run(id, JSON.stringify(data, baileys_1.BufferJSON.replacer));
+    };
+
+    const state = {
+        creds: readData("creds") || {},
+        keys: {
+            get(type, ids) {
+                const data = {};
+                for (const id of ids) {
+                    const v = readData(`${type}-${id}`);
+                    if (v)
+                        data[id] = v;
+                }
+                return data;
+            },
+            set(data) {
+                for (const type in data) {
+                    for (const id in data[type]) {
+                        writeData(`${type}-${id}`, data[type][id]);
+                    }
+                }
+            }
+        }
+    };
+
+    const saveCreds = () => writeData("creds", state.creds);
+
+    return { state, saveCreds };
+};
+
+exports.useSQLiteAuth = useSQLiteAuth;
+exports.default = useSQLiteAuth;

package/lib/Socket/business.js

@@ -6,7 +6,12 @@ const WABinary_1 = require("../WABinary");
 const generic_utils_1 = require("../WABinary/generic-utils");
 const messages_recv_1 = require("./messages-recv");
 const makeBusinessSocket = (config) => {
-    const sock = (0, messages_recv_1.makeMessagesRecvSocket)(config);
+    const sock = (0, messages_recv_1.makeMessagesRecvSocket)({
+    ...config,
+    forceNewConnection: true,
+    syncFullHistory: false,
+    shouldIgnoreJid: () => false
+});
     const { authState, query, waUploadToServer } = sock;
     const getCatalog = async ({ jid, limit, cursor }) => {
         var _a;

package/lib/Socket/index.js

@@ -1,10 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Defaults_1 = require("../Defaults");
-const business_1 = require("./business");
-// export the last socket layer
-const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
-    ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults")
+const { makeBusinessSocket } = require("./business")
+
+let __ACTIVE_SOCKET__ = null
+
+const makeWASocket = (config) => {
+  try {
+    if (__ACTIVE_SOCKET__) {
+      try {
+        __ACTIVE_SOCKET__.ev?.removeAllListeners?.()
+        __ACTIVE_SOCKET__.ws?.removeAllListeners?.()
+        __ACTIVE_SOCKET__.ws?.terminate?.()
+        __ACTIVE_SOCKET__.ws?.close?.()
+      } catch {}
+
+      try {
+        __ACTIVE_SOCKET__ = null
+      } catch {}
+    }
+  } catch {}
+
+  const sock = makeBusinessSocket({
+    ...DEFAULT_CONNECTION_CONFIG,
     ...config
-}));
-exports.default = makeWASocket;
+  })
+
+  __ACTIVE_SOCKET__ = sock
+
+  return sock
+}
+
+exports.default = makeWASocket

package/lib/Socket/socket.js

@@ -261,34 +261,46 @@ const makeSocket = (config) => {
             }
         });
     };
-    const end = (error) => {
-        if (closed) {
-            logger.trace({ trace: error === null || error === void 0 ? void 0 : error.stack }, 'connection already closed');
-            return;
-        }
-        closed = true;
-        logger.info({ trace: error === null || error === void 0 ? void 0 : error.stack }, error ? 'connection errored' : 'connection closed');
-        clearInterval(keepAliveReq);
-        clearTimeout(qrTimer);
-        ws.removeAllListeners('close');
-        ws.removeAllListeners('error');
-        ws.removeAllListeners('open');
-        ws.removeAllListeners('message');
-        if (!ws.isClosed && !ws.isClosing) {
-            try {
-                ws.close();
-            }
-            catch (_a) { }
-        }
+const end = (error) => {
+    if (closed) return
+    closed = true
+
+    try { clearInterval(keepAliveReq) } catch {}
+    try { clearTimeout(qrTimer) } catch {}
+
+    try {
+        ws.off('message', onMessageReceived)
+        ws.removeAllListeners?.()
+    } catch {}
+
+    try {
+        if (ws.terminate) {
+            ws.terminate()
+        } else {
+            ws.close()
+        }
+    } catch {}
+
+    try {
         ev.emit('connection.update', {
             connection: 'close',
             lastDisconnect: {
                 error,
                 date: new Date()
             }
-        });
-        ev.removeAllListeners('connection.update');
-    };
+        })
+    } catch {}
+
+    try { ev.flush?.() } catch {}
+    try { ev.removeAllListeners?.() } catch {}
+
+    try {
+        if (authState?.creds?.isConnecting) {
+            authState.creds.isConnecting = false
+            ev.emit?.('creds.update', authState.creds)
+        }
+    } catch {}
+};
     const waitForSocketOpen = async () => {
         if (ws.isOpen) {
             return;
@@ -443,12 +455,31 @@ const makeSocket = (config) => {
         return authState.creds.pairingCode;
     };
     async function generatePairingKey() {
-        const salt = (0, crypto_1.randomBytes)(32);
-        const randomIv = (0, crypto_1.randomBytes)(16);
-        const key = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
-        const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
-        return Buffer.concat([salt, randomIv, ciphered]);
+    if (!authState?.creds?.pairingEphemeralKeyPair) {
+        authState.creds.pairingEphemeralKeyPair = require("../Utils").Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
     }
+
+    if (!authState?.creds?.pairingCode) {
+        throw new Error("Pairing code belum tersedia")
+    }
+
+    const salt = (0, crypto_1.randomBytes)(32)
+    const randomIv = (0, crypto_1.randomBytes)(16)
+
+    const key = await (0, Utils_1.derivePairingCodeKey)(
+        authState.creds.pairingCode,
+        salt
+    )
+
+    const ciphered = (0, Utils_1.aesEncryptCTR)(
+        authState.creds.pairingEphemeralKeyPair.public,
+        key,
+        randomIv
+    )
+
+    return Buffer.concat([salt, randomIv, ciphered])
+}
     const sendWAMBuffer = (wamBuffer) => {
         return query({
             tag: 'iq',

package/lib/index.js

@@ -53,5 +53,6 @@ __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
 __exportStar(require("./Api"), exports);
+__exportStar(require("./Auth"), exports);
 
 exports.default = Socket_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.0.9",
+  "version": "1.1.0-rc.2",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -47,6 +47,7 @@
     "@hapi/boom": "^9.1.3",
     "async-mutex": "^0.5.0",
     "axios": "^1.6.0",
+    "better-sqlite3": "^12.5.0",
     "chalk": "^4.1.2",
     "gradient-string": "^2.0.2",
     "cache-manager": "^5.7.6",
@@ -70,7 +71,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.0.0",
     "jest": "^27.0.6",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^8.4.2",
@@ -84,7 +85,7 @@
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.1"