@rexxhayanasi/elaina-baileys 1.0.8 → 1.1.0-rc.1

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/Defaults/index.js

@@ -3,6 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+
+const PHONENUMBER_MCC = require("./phonenumber_mcc.json");
+exports.PHONENUMBER_MCC = PHONENUMBER_MCC;
+
 exports.DEFAULT_CACHE_TTLS = exports.MIN_UPLOAD_INTERVAL = exports.UPLOAD_TIMEOUT = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = exports.WA_ADV_DEVICE_SIG_PREFIX = exports.WA_ADV_ACCOUNT_SIG_PREFIX = exports.UNAUTHORIZED_CODES = exports.version = void 0;
 const WAProto_1 = require("../../WAProto");
 const libsignal_1 = require("../Signal/libsignal");
@@ -115,4 +119,4 @@ exports.DEFAULT_CACHE_TTLS = {
     MSG_RETRY: 60 * 60,
     CALL_OFFER: 5 * 60,
     USER_DEVICES: 5 * 60
-};
+};

package/lib/Defaults/phonenumber_mcc.json

@@ -0,0 +1,223 @@
+{
+	"93": 412,
+	"355": 276,
+	"213": 603,
+	"1-684": 544,
+	"376": 213,
+	"244": 631,
+	"1-264": 365,
+	"1-268": 344,
+	"54": 722,
+	"374": 283,
+	"297": 363,
+	"61": 505,
+	"43": 232,
+	"994": 400,
+	"1-242": 364,
+	"973": 426,
+	"880": 470,
+	"1-246": 342,
+	"375": 257,
+	"32": 206,
+	"501": 702,
+	"229": 616,
+	"1-441": 350,
+	"975": 402,
+	"591": 736,
+	"387": 218,
+	"267": 652,
+	"55": 724,
+	"1-284": 348,
+	"673": 528,
+	"359": 284,
+	"226": 613,
+	"257": 642,
+	"855": 456,
+	"237": 624,
+	"238": 625,
+	"1-345": 346,
+	"236": 623,
+	"235": 622,
+	"56": 730,
+	"86": 454,
+	"57": 732,
+	"269": 654,
+	"682": 548,
+	"506": 712,
+	"385": 219,
+	"53": 368,
+	"357": 280,
+	"420": 230,
+	"243": 630,
+	"45": 238,
+	"253": 638,
+	"1-767": 366,
+	"1-809": 370,
+	"1-849": 370,
+	"1-829": 370,
+	"593": 740,
+	"20": 602,
+	"503": 706,
+	"240": 627,
+	"291": 657,
+	"372": 248,
+	"251": 636,
+	"500": 750,
+	"298": 288,
+	"679": 542,
+	"358": 244,
+	"33": 208,
+	"689": 547,
+	"241": 628,
+	"220": 607,
+	"995": 282,
+	"49": 262,
+	"233": 620,
+	"350": 266,
+	"30": 202,
+	"299": 290,
+	"1-473": 352,
+	"1-671": 535,
+	"502": 704,
+	"224": 537,
+	"592": 738,
+	"509": 372,
+	"504": 708,
+	"852": 454,
+	"36": 216,
+	"354": 274,
+	"91": 404,
+	"62": 510,
+	"98": 432,
+	"964": 418,
+	"353": 234,
+	"972": 425,
+	"39": 222,
+	"225": 612,
+	"1-876": 338,
+	"81": 440,
+	"962": 416,
+	"254": 639,
+	"686": 545,
+	"383": 221,
+	"965": 419,
+	"371": 247,
+	"961": 415,
+	"266": 651,
+	"231": 618,
+	"218": 606,
+	"423": 295,
+	"370": 246,
+	"352": 270,
+	"389": 294,
+	"261": 646,
+	"265": 650,
+	"60": 502,
+	"960": 472,
+	"223": 610,
+	"356": 278,
+	"692": 551,
+	"222": 609,
+	"230": 617,
+	"52": 334,
+	"691": 550,
+	"373": 259,
+	"377": 212,
+	"976": 428,
+	"382": 297,
+	"1-664": 354,
+	"212": 604,
+	"258": 643,
+	"95": 414,
+	"264": 649,
+	"674": 536,
+	"977": 429,
+	"31": 204,
+	"687": 546,
+	"64": 530,
+	"505": 710,
+	"227": 614,
+	"234": 621,
+	"683": 555,
+	"1-670": 534,
+	"47": 242,
+	"968": 226,
+	"92": 410,
+	"680": 552,
+	"970": 423,
+	"507": 714,
+	"675": 537,
+	"595": 744,
+	"51": 716,
+	"63": 515,
+	"48": 260,
+	"351": 268,
+	"1-787, 1-939": 330,
+	"974": 427,
+	"242": 630,
+	"40": 226,
+	"7": 250,
+	"250": 635,
+	"290": 658,
+	"1-869": 356,
+	"1-758": 358,
+	"508": 308,
+	"1-784": 360,
+	"685": 544,
+	"378": 292,
+	"239": 626,
+	"966": 420,
+	"221": 608,
+	"381": 220,
+	"248": 633,
+	"232": 619,
+	"65": 525,
+	"386": 293,
+	"677": 540,
+	"27": 655,
+	"211": 659,
+	"34": 214,
+	"94": 413,
+	"249": 634,
+	"597": 746,
+	"268": 653,
+	"46": 240,
+	"41": 228,
+	"963": 417,
+	"886": 466,
+	"992": 436,
+	"255": 640,
+	"66": 520,
+	"228": 615,
+	"690": 554,
+	"676": 539,
+	"1-868": 374,
+	"216": 605,
+	"90": 286,
+	"993": 438,
+	"1-649": 376,
+	"688": 553,
+	"1-340": 332,
+	"256": 641,
+	"380": 255,
+	"971": 424,
+	"44": 234,
+	"1": 310,
+	"598": 748,
+	"998": 434,
+	"678": 541,
+	"379": 225,
+	"58": 734,
+	"681": 543,
+	"967": 421,
+	"260": 645,
+	"263": 648,
+	"670": 514,
+	"245": 632,
+	"856": 457,
+	"599": 362,
+	"850": 467,
+	"262": 647,
+	"82": 450,
+	"84": 452
+}

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;

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.8",
+  "version": "1.1.0-rc.1",
   "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"