@neelegirl/wa-api 1.6.9 → 1.7.0

package/dist/Socket/index.js

@@ -1,426 +1,440 @@
-"use strict";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onPairingCode = exports.onMessageUpdate = exports.onConnecting = exports.onDisconnected = exports.onConnected = exports.onQRUpdated = exports.onMessageReceived = exports.sock = exports.loadSessionsFromStorage = exports.getAllSessionData = exports.getSession = exports.getAllSession = exports.deleteSession = exports.startWhatsapp = exports.startSessionWithPairingCode = exports.onimaii = exports.startSession = void 0;
-
-const baileys_1 = require("@neelegirl/baileys");
-const pino_1 = require("pino");
-const path_1 = require("path");
-const fs_1 = require("fs");
-const https_1 = require("https");
+exports.onPairingCode = exports.onMessageUpdate = exports.onConnecting = exports.onDisconnected = exports.onConnected = exports.onQRUpdated = exports.onMessageReceived = exports.loadSessionsFromStorage = exports.getSession = exports.getAllSession = exports.deleteSession = exports.startWhatsapp = exports.startSession = void 0;
+const baileys_1 = __importStar(require("@neelegirl/baileys"));
+const pino_1 = __importDefault(require("pino"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const https_1 = __importDefault(require("https"));
 const Defaults_1 = require("../Defaults");
 const save_media_1 = require("../Utils/save-media");
 const Error_1 = require("../Error");
 const message_status_1 = require("../Utils/message-status");
-
 const sessions = new Map();
 const callback = new Map();
 const retryCount = new Map();
-const TERMINAL_QR_FORCE_ENV = String(process.env.ONIMAI_FORCE_TERMINAL_QR || "").trim();
-
-let CURRENT_WA_API_VERSION = "1.6.5";
+let stock;
+const CURRENT_WA_API_VERSION = "1.3.3";
 let waApiUpdateCheckDone = false;
 
-try {
-    const pkg = require("../../package.json");
-    if (pkg && typeof pkg.version === "string") {
-        CURRENT_WA_API_VERSION = pkg.version;
-    }
-}
-catch (_) {
-}
-
-const isNewerVersion = (latest, current) => {
-    if (!latest || !current) {
-        return false;
-    }
-    const a = current.split(".").map((n) => parseInt(n, 10) || 0);
-    const b = latest.split(".").map((n) => parseInt(n, 10) || 0);
-    for (let i = 0; i < Math.max(a.length, b.length); i += 1) {
-        const x = a[i] || 0;
-        const y = b[i] || 0;
-        if (y > x) {
-            return true;
-        }
-        if (y < x) {
-            return false;
-        }
+function isNewerVersion(latest, current) {
+    if (!latest || !current) return false;
+    const a = current.split('.').map((n) => parseInt(n, 10) || 0);
+    const b = latest.split('.').map((n) => parseInt(n, 10) || 0);
+    for (let i = 0; i < Math.max(a.length, b.length); i++) {
+        const x = a[i] || 0, y = b[i] || 0;
+        if (y > x) return true;
+        if (y < x) return false;
     }
     return false;
-};
+}
 
+// Liest von der offiziellen npm-Registry (registry.npmjs.org), ob ein Update existiert – nur 1x pro Prozess
 const checkWaApiUpdate = () => {
     if (waApiUpdateCheckDone) {
         return Promise.resolve(null);
     }
     waApiUpdateCheckDone = true;
     return new Promise((resolve) => {
-        const url = "https://registry.npmjs.org/@neelegirl/wa-api/latest";
-        https_1.get(url, { timeout: 5000 }, (res) => {
-            let data = "";
-            res.on("data", (chunk) => {
+        const url = `https://registry.npmjs.org/@neelegirl/wa-api/latest`;
+        https_1.default.get(url, { timeout: 5000 }, (res) => {
+            let data = '';
+            res.on('data', (chunk) => {
                 data += chunk;
             });
-            res.on("end", () => {
+            res.on('end', () => {
                 try {
-                    const latestVersion = JSON.parse(data)?.version;
+                    const packageInfo = JSON.parse(data);
+                    const latestVersion = packageInfo.version;
                     if (latestVersion && isNewerVersion(latestVersion, CURRENT_WA_API_VERSION)) {
-                        console.log(
-                            [
-                                "",
-                                "[wa-api] Update available",
-                                `Current: ${CURRENT_WA_API_VERSION}`,
-                                `Latest:  ${latestVersion}`,
-                                "Run: npm install @neelegirl/wa-api@latest",
-                                ""
-                            ].join("\n")
-                        );
+                        const updateMessage = `\n╔════════════════════════════════════════╗\n║  🔔 NEUES UPDATE VERFÜGBAR! 🔔        ║\n╠════════════════════════════════════════╣\n║  @neelegirl/wa-api                    ║\n║  Aktuelle Version: ${(CURRENT_WA_API_VERSION || '').padEnd(20)} ║\n║  Neue Version:     ${(latestVersion || '').padEnd(20)} ║\n║                                        ║\n║  Bitte aktualisiere:                  ║\n║  npm install @neelegirl/wa-api@latest ║\n╚════════════════════════════════════════╝\n`;
+                        console.log(updateMessage);
                         resolve({
                             current: CURRENT_WA_API_VERSION,
                             latest: latestVersion,
                             hasUpdate: true
                         });
-                        return;
                     }
-                    resolve({
-                        current: CURRENT_WA_API_VERSION,
-                        latest: latestVersion || CURRENT_WA_API_VERSION,
-                        hasUpdate: false
-                    });
+                    else {
+                        const currentVersionMessage = `\n╔════════════════════════════════════════╗\n║  ✅ Du nutzt die aktuelle Version      ║\n║     von @neelegirl/wa-api              ║\n╚════════════════════════════════════════╝\n`;
+                        console.log(currentVersionMessage);
+                        resolve({
+                            current: CURRENT_WA_API_VERSION,
+                            latest: latestVersion || CURRENT_WA_API_VERSION,
+                            hasUpdate: false
+                        });
+                    }
                 }
-                catch (_) {
+                catch (error) {
                     resolve(null);
                 }
             });
-        }).on("error", () => resolve(null))
-            .on("timeout", () => resolve(null));
+        }).on('error', () => {
+            resolve(null);
+        }).on('timeout', () => {
+            resolve(null);
+        });
     });
 };
-
-const getSessionCredsDir = (sessionId) =>
-    path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX);
-
-const readStoredSessionCreds = (sessionId) => {
-    try {
-        const credsPath = path_1.join(getSessionCredsDir(sessionId), "creds.json");
-        if (!fs_1.existsSync(credsPath)) {
-            return null;
-        }
-        const raw = fs_1.readFileSync(credsPath, "utf8");
-        return JSON.parse(raw || "{}");
-    }
-    catch (_) {
-        return null;
-    }
-};
-
-const hasStoredLinkedSessionCreds = (sessionId) => {
-    try {
-        const dir = getSessionCredsDir(sessionId);
-        if (!fs_1.existsSync(dir) || !fs_1.lstatSync(dir).isDirectory()) {
-            return false;
-        }
-        const creds = readStoredSessionCreds(sessionId);
-        const me = creds?.me || {};
-        if (creds?.registered === true || me?.id || me?.lid) {
-            return true;
-        }
-        const files = fs_1.readdirSync(dir);
-        return files.some((file) => /^(session-|sender-key-|app-state-sync-key-|pre-key-)/i.test(String(file || "").trim()));
-    }
-    catch (_) {
-        return false;
-    }
-};
-
-const shouldPrintQrInTerminal = (sessionId, options = {}) => {
-    if (TERMINAL_QR_FORCE_ENV === "1") {
-        return true;
-    }
-    if (TERMINAL_QR_FORCE_ENV === "0") {
-        return false;
-    }
-    return true;
-};
-
-const emitMessageUpsert = (sessionId, msg) => {
-    msg.sessionId = sessionId;
-    msg.saveImage = (path) => (0, save_media_1.saveImageHandler)(msg, path);
-    msg.saveVideo = (path) => (0, save_media_1.saveVideoHandler)(msg, path);
-    msg.saveDocument = (path) => (0, save_media_1.saveDocumentHandler)(msg, path);
-    callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_RECEIVED)?.({ ...msg });
-};
-
-const attachSocketEvents = (sessionId, sock, saveCreds, restartSocket) => {
-    sock.ev.process(async (events) => {
-        if (events["connection.update"]) {
-            const update = events["connection.update"];
-            const { connection, lastDisconnect } = update;
-            if (update.qr) {
-                callback.get(Defaults_1.CALLBACK_KEY.ON_QR)?.({
-                    sessionId,
-                    qr: update.qr
-                });
-            }
-            if (connection === "connecting") {
-                callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTING)?.(sessionId);
-            }
-            if (connection === "close") {
-                const code = lastDisconnect?.error?.output?.statusCode;
-                let retryAttempt = retryCount.get(sessionId) ?? 0;
-                const shouldRetry = code !== baileys_1.DisconnectReason.loggedOut && retryAttempt < 10;
-                if (shouldRetry) {
-                    retryAttempt += 1;
-                    retryCount.set(sessionId, retryAttempt);
-                    restartSocket();
+const startSession = (sessionId = "mysession", options = { printQR: true }) => __awaiter(void 0, void 0, void 0, function* () {
+    // Prüfe auf Updates beim Start
+    checkWaApiUpdate().catch(() => {
+        // Silently fail if update check fails
+    });
+    if (isSessionExistAndRunning(sessionId))
+        throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
+    const logger = (0, pino_1.default)({ level: "silent" });
+    const { version } = yield (0, baileys_1.fetchLatestBaileysVersion)();
+    const startSocket = () => __awaiter(void 0, void 0, void 0, function* () {
+        const { state, saveCreds } = yield (0, baileys_1.useMultiFileAuthState)(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX));
+        const sock = (0, baileys_1.default)({
+            version,
+            printQRInTerminal: options.printQR,
+            auth: state,
+            logger,
+            markOnlineOnConnect: false,
+            browser: baileys_1.Browsers.ubuntu("Chrome"),
+        });
+        sessions.set(sessionId, sock);
+        try {
+                
+            sock.ev.process((events) => __awaiter(void 0, void 0, void 0, function* () {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                if (events["connection.update"]) {
+                    const update = events["connection.update"];
+                    const { connection, lastDisconnect } = update;
+                    if (update.qr) {
+                        (_a = callback.get(Defaults_1.CALLBACK_KEY.ON_QR)) === null || _a === void 0 ? void 0 : _a({
+                            sessionId,
+                            qr: update.qr,
+                        });
+                    }
+                    if (connection == "connecting") {
+                        (_b = callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTING)) === null || _b === void 0 ? void 0 : _b(sessionId);
+                    }
+                    if (connection === "close") {
+                        const code = (_d = (_c = lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error) === null || _c === void 0 ? void 0 : _c.output) === null || _d === void 0 ? void 0 : _d.statusCode;
+                        let retryAttempt = (_e = retryCount.get(sessionId)) !== null && _e !== void 0 ? _e : 0;
+                        let shouldRetry;
+                        if (code != baileys_1.DisconnectReason.loggedOut && retryAttempt < 10) {
+                            shouldRetry = true;
+                        }
+                        if (shouldRetry) {
+                            retryAttempt++;
+                        }
+                        if (shouldRetry) {
+                            retryCount.set(sessionId, retryAttempt);
+                            startSocket();
+                        }
+                        else {
+                            //retryCount.delete(sessionId);
+                            (0, exports.deleteSession)(sessionId);
+                            (_f = callback.get(Defaults_1.CALLBACK_KEY.ON_DISCONNECTED)) === null || _f === void 0 ? void 0 : _f(sessionId);
+                        }
+                    }
+                    if (connection == "open") {
+                        retryCount.delete(sessionId);
+                        (_g = callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTED)) === null || _g === void 0 ? void 0 : _g(sessionId);
+                    }
                 }
-                else {
-                    retryCount.delete(sessionId);
-                    await (0, exports.deleteSession)(sessionId);
-                    callback.get(Defaults_1.CALLBACK_KEY.ON_DISCONNECTED)?.(sessionId);
+                if (events["creds.update"]) {
+                    yield saveCreds();
                 }
-            }
-            if (connection === "open") {
-                retryCount.delete(sessionId);
-                callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTED)?.(sessionId);
-            }
-        }
-        if (events["creds.update"]) {
-            await saveCreds();
-        }
-        if (events["messages.update"]) {
-            const msg = events["messages.update"][0];
-            if (msg) {
-                const data = {
-                    ...msg,
-                    sessionId,
-                    messageStatus: (0, message_status_1.parseMessageStatusCodeToReadable)(msg.update?.status)
-                };
-                callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_UPDATED)?.(sessionId, data);
-            }
+                if (events["messages.update"]) {
+                    const msg = events["messages.update"][0];
+                    const data = Object.assign({ sessionId: sessionId, messageStatus: (0, message_status_1.parseMessageStatusCodeToReadable)(msg.update.status) }, msg);
+                    (_h = callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_UPDATED)) === null || _h === void 0 ? void 0 : _h(sessionId, data);
+                }
+                if (events["messages.upsert"]) {
+                    const msg = (_j = events["messages.upsert"]
+                        .messages) === null || _j === void 0 ? void 0 : _j[0];
+                    msg.sessionId = sessionId;
+                    msg.saveImage = (path) => (0, save_media_1.saveImageHandler)(msg, path);
+                    msg.saveVideo = (path) => (0, save_media_1.saveVideoHandler)(msg, path);
+                    msg.saveDocument = (path) => (0, save_media_1.saveDocumentHandler)(msg, path);
+                    (_k = callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_RECEIVED)) === null || _k === void 0 ? void 0 : _k(Object.assign({}, msg));
+                }
+            }));
+            return sock;
         }
-        if (events["messages.upsert"]) {
-            const msg = events["messages.upsert"]?.messages?.[0];
-            if (msg) {
-                emitMessageUpsert(sessionId, msg);
-            }
+        catch (error) {
+            // console.log("SOCKET ERROR", error);
+            return sock;
         }
     });
-};
-
-const createSessionSocket = async (sessionId, options = {}, retryStarter) => {
-    const logger = (0, pino_1)({ level: "silent" });
-    const { version } = await (0, baileys_1.fetchLatestBaileysVersion)();
-    const { state, saveCreds } = await (0, baileys_1.useMultiFileAuthState)(
-        getSessionCredsDir(sessionId)
-    );
-    const sock = (0, baileys_1.default)({
-        version,
-        printQRInTerminal: shouldPrintQrInTerminal(sessionId, options),
-        auth: state,
-        logger,
-        markOnlineOnConnect: false,
-        browser: baileys_1.Browsers.ubuntu("Chrome")
-    });
-    sessions.set(sessionId, { ...sock });
-    attachSocketEvents(sessionId, sock, saveCreds, retryStarter);
-    if (options.phoneNumber && !sock.authState?.creds?.registered) {
-        setTimeout(async () => {
-            try {
-                const code = await sock.requestPairingCode(options.phoneNumber, options.pairingCode);
-                callback.get(Defaults_1.CALLBACK_KEY.ON_PAIRING_CODE)?.(sessionId, code);
-            }
-            catch (_) {
-            }
-        }, 5000);
-    }
-    return sock;
-};
-
-const isSessionExistAndRunning = (sessionId) => {
-    const credsPath = path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX);
-    return (
-        fs_1.existsSync(path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME)) &&
-        fs_1.existsSync(credsPath) &&
-        fs_1.readdirSync(credsPath).length > 0 &&
-        (0, exports.getSession)(sessionId)
-    );
-};
-
-const shouldLoadSession = (sessionId) => {
-    const credsPath = path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX);
-    return (
-        fs_1.existsSync(path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME)) &&
-        fs_1.existsSync(credsPath) &&
-        fs_1.readdirSync(credsPath).length > 0 &&
-        !(0, exports.getSession)(sessionId)
-    );
-};
-
-const startSession = async (sessionId = "mysession", options = { printQR: true }) => {
-    checkWaApiUpdate().catch(() => { });
-    if (isSessionExistAndRunning(sessionId)) {
-        throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
-    }
-    const starter = () => createSessionSocket(sessionId, { ...options, printQR: options?.printQR !== false }, starter);
-    return starter();
-};
+    return startSocket();
+});
+const onimaii = (sessionId = "mysession", connect) => __awaiter(void 0, void 0, void 0, function* () {
+            if (isSessionExistAndRunning(sessionId))
+                throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
+            const logger = (0, pino_1.default)({ level: "silent" });
+            const { version } = yield (0, baileys_1.fetchLatestBaileysVersion)();
+                const { state, saveCreds } = yield (0, baileys_1.useMultiFileAuthState)(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX));
+                const sock = (0, connect)({
+                    version,
+                    printQRInTerminal: true,
+                    auth: state,
+                    logger,
+                    markOnlineOnConnect: false,
+                    browser: baileys_1.Browsers.ubuntu("Chrome"),
+                });
+            })
+            exports.onimaii = onimaii;
 exports.startSession = startSession;
-
-const onimaii = async (sessionId = "mysession", connect) => {
-    if (typeof connect !== "function") {
-        throw new Error_1.WhatsappError("connect must be a function");
+const startSessionWithPairingCode = (sessionId = "mysession", options = { phoneNumber: "" }, key) => __awaiter(void 0, void 0, void 0, function* () {
+   if (isSessionExistAndRunning(sessionId)) throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
+    if (!(options === null || options === void 0 ? void 0 : options.phoneNumber)) {
+        throw new Error_1.WhatsappError(Defaults_1.Messages.paremetersRequired("phoneNumber"));
     }
-    if (isSessionExistAndRunning(sessionId)) {
-        throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
-    }
-    const logger = (0, pino_1)({ level: "silent" });
-    const { version } = await (0, baileys_1.fetchLatestBaileysVersion)();
-    const { state, saveCreds } = await (0, baileys_1.useMultiFileAuthState)(
-        getSessionCredsDir(sessionId)
-    );
-    const sock = connect({
-        version,
-        printQRInTerminal: shouldPrintQrInTerminal(sessionId, { printQR: true }),
-        auth: state,
-        logger,
-        markOnlineOnConnect: false,
-        browser: baileys_1.Browsers.ubuntu("Chrome")
-    });
-    sessions.set(sessionId, { ...sock });
-    if (sock?.ev?.on) {
-        sock.ev.on("creds.update", saveCreds);
-    }
-    return sock;
-};
-exports.onimaii = onimaii;
-
-const startSessionWithPairingCode = async (
-    sessionId = "mysession",
-    options = { phoneNumber: "" },
-    pairingCode
-) => {
-    if (isSessionExistAndRunning(sessionId)) {
-        throw new Error_1.WhatsappError(Defaults_1.Messages.sessionAlreadyExist(sessionId));
+    const logger = (0, pino_1.default)({ level: "silent" });
+            const { version } = yield (0, baileys_1.fetchLatestBaileysVersion)();
+              const startSocket = () => __awaiter(void 0, void 0, void 0, function* () {
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+   const { state, saveCreds } = yield (0, baileys_1.useMultiFileAuthState)(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX));
+   
+          const sock = (0, baileys_1.default)({
+              version,
+              printQRInTerminal: false,
+              auth: state,
+              logger,
+              markOnlineOnConnect: false,
+              browser: baileys_1.Browsers.ubuntu("Chrome"),
+          });
+     sessions.set(sessionId, sock);
+    try {
+       if (!sock.authState.creds.registered) {
+         console.log("first time pairing");
+         setTimeout(async () => {
+           const code = await sock.requestPairingCode(options.phoneNumber,key);
+           console.log(code);
+                 
+           callback.get(Defaults_1.CALLBACK_KEY.ON_PAIRING_CODE)?.(sessionId, code);
+        }, 5000);
+       }
+       sock.ev.process(async (events) => {
+        if (events["connection.update"]) {
+           const update = events["connection.update"];
+          const { connection, lastDisconnect } = update;
+          
+                              if (connection == "connecting") {
+                        (_b = callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTING)) === null || _b === void 0 ? void 0 : _b(sessionId);
+                    }
+           if (connection === "close") {
+              const code = (_d = (_c = lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error) === null || _c === void 0 ? void 0 : _c.output) === null || _d === void 0 ? void 0 : _d.statusCode;
+                        let retryAttempt = (_e = retryCount.get(sessionId)) !== null && _e !== void 0 ? _e : 0;
+                        let shouldRetry;
+                        if (code != baileys_1.DisconnectReason.loggedOut && retryAttempt < 10) {
+                            shouldRetry = true;
+                        }
+                        if (shouldRetry) {
+                            retryAttempt++;
+                        }
+                        if (shouldRetry) {
+                            retryCount.set(sessionId, retryAttempt);
+                            startSocket();
+                        }
+                        else {
+                            retryCount.delete(sessionId);
+                            (0, exports.deleteSession)(sessionId);
+                            (_f = callback.get(Defaults_1.CALLBACK_KEY.ON_DISCONNECTED)) === null || _f === void 0 ? void 0 : _f(sessionId);
+                        }
+      }
+      if (connection == "open") {
+        retryCount.delete(sessionId);
+        callback.get(Defaults_1.CALLBACK_KEY.ON_CONNECTED)?.(sessionId);
+      }
     }
-    if (!options?.phoneNumber) {
-        throw new Error_1.WhatsappError("phoneNumber is required for pairing mode");
+    if (events["creds.update"]) {
+      await saveCreds();
     }
-    const starter = () => createSessionSocket(
-        sessionId,
-        { printQR: false, phoneNumber: options.phoneNumber, pairingCode },
-        starter
-    );
-    return starter();
-};
-exports.startSessionWithPairingCode = startSessionWithPairingCode;
-
+     if (events["messages.update"]) {
+                    const msg = events["messages.update"][0];
+                    const data = Object.assign({ sessionId: sessionId, messageStatus: (0, message_status_1.parseMessageStatusCodeToReadable)(msg.update.status) }, msg);
+                    (_h = callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_UPDATED)) === null || _h === void 0 ? void 0 : _h(sessionId, data);
+                }
+                if (events["messages.upsert"]) {
+                    const msg = (_j = events["messages.upsert"]
+                        .messages) === null || _j === void 0 ? void 0 : _j[0];
+                    msg.sessionId = sessionId;
+                    msg.saveImage = (path) => (0, save_media_1.saveImageHandler)(msg, path);
+                    msg.saveVideo = (path) => (0, save_media_1.saveVideoHandler)(msg, path);
+                    msg.saveDocument = (path) => (0, save_media_1.saveDocumentHandler)(msg, path);
+                    (_k = callback.get(Defaults_1.CALLBACK_KEY.ON_MESSAGE_RECEIVED)) === null || _k === void 0 ? void 0 : _k(Object.assign({}, msg));
+                }
+      });
+            return sock;
+       }
+        catch (error) {
+            // console.log("SOCKET ERROR", error);
+            return sock;
+        }
+    });
+    return startSocket();
+});
+/**
+ * @deprecated Use startSession method instead
+ */
+exports.startSessionWithPairingCode = startSessionWithPairingCode
 exports.startWhatsapp = exports.startSession;
-
-const deleteSession = async (sessionId) => {
+const deleteSession = (sessionId) => __awaiter(void 0, void 0, void 0, function* () {
     const session = (0, exports.getSession)(sessionId);
     try {
-        await session?.logout?.();
+        yield (session === null || session === void 0 ? void 0 : session.logout());
     }
-    catch (_) {
-    }
-    session?.end?.(undefined);
+    catch (error) { }
+    session === null || session === void 0 ? void 0 : session.end(undefined);
     sessions.delete(sessionId);
-    const dir = path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX);
-    if (fs_1.existsSync(dir)) {
-        fs_1.rmSync(dir, { force: true, recursive: true });
+    const dir = path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX);
+    if (fs_1.default.existsSync(dir)) {
+        fs_1.default.rmSync(dir, { force: true, recursive: true });
     }
-};
+});
 exports.deleteSession = deleteSession;
-
 const getAllSession = () => Array.from(sessions.keys());
 exports.getAllSession = getAllSession;
-
 const getSession = (key) => sessions.get(key);
 exports.getSession = getSession;
-
+const isSessionExistAndRunning = (sessionId) => {
+    if (fs_1.default.existsSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME)) &&
+        fs_1.default.existsSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX)) &&
+        fs_1.default.readdirSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX)).length &&
+        (0, exports.getSession)(sessionId)) {
+        return true;
+    }
+    return false;
+};
+const shouldLoadSession = (sessionId) => {
+    if (fs_1.default.existsSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME)) &&
+        fs_1.default.existsSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX)) &&
+        fs_1.default.readdirSync(path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME, sessionId + Defaults_1.CREDENTIALS.SUFFIX)).length &&
+        !(0, exports.getSession)(sessionId)) {
+        return true;
+    }
+    return false;
+};
 const getAllSessionData = () => {
-    const allSessionData = {};
-    for (const sessionName of (0, exports.getAllSession)()) {
-        allSessionData[sessionName] = (0, exports.getSession)(sessionName);
+    // Angenommen, getAllSession gibt eine Liste aller aktiven Sessions zurück
+    let allSessions = getAllSession();
+    let allSessionData = {};
+
+    for(let i = 0; i < allSessions.length; i++) {
+        let sessionName = allSessions[i];
+        allSessionData[sessionName] = getSession(sessionName);
     }
+
     return allSessionData;
-};
+}
 exports.getAllSessionData = getAllSessionData;
 
-const loadSessionsFromStorage = async () => {
-    const dirPath = path_1.resolve(Defaults_1.CREDENTIALS.DIR_NAME);
+async function loadSessionsFromStorage() {
+    const dirPath = path_1.default.resolve(Defaults_1.CREDENTIALS.DIR_NAME);
     const loadedSessions = [];
-    if (!fs_1.existsSync(dirPath)) {
-        fs_1.mkdirSync(dirPath, { recursive: true });
+  
+    // Ordner anlegen, falls nicht existiert
+    if (!fs_1.default.existsSync(dirPath)) {
+      fs_1.default.mkdirSync(dirPath, { recursive: true });
     }
-    const entries = await fs_1.promises.readdir(dirPath);
-    for (const entry of entries) {
-        const fullPath = path_1.join(dirPath, entry);
+  
+    try {
+      const entries = await fs_1.default.promises.readdir(dirPath);
+  
+      for (const entry of entries) {
+        const fullPath = path_1.default.join(dirPath, entry);
         let stat;
         try {
-            stat = await fs_1.promises.stat(fullPath);
-        }
-        catch (_) {
-            continue;
-        }
-        if (!stat.isDirectory()) {
-            continue;
-        }
-        const sessionId = entry.endsWith(Defaults_1.CREDENTIALS.SUFFIX)
-            ? entry.slice(0, -Defaults_1.CREDENTIALS.SUFFIX.length)
-            : entry;
-        if (!shouldLoadSession(sessionId)) {
-            continue;
+          stat = await fs_1.default.promises.stat(fullPath);
+        } catch {
+          // Wenn sich die Datei zwischenzeitlich entfernt hat o.Ä., überspringen
+          continue;
         }
+        if (!stat.isDirectory()) continue;
+  
+        // sessionId bis zum ersten Unterstrich extrahieren
+        const underscoreIndex = entry.indexOf('_');
+        const sessionId = underscoreIndex > 0
+          ? entry.slice(0, underscoreIndex)
+          : entry; // oder continue, wenn du ohne _ nicht laden willst
+  
         try {
-            await (0, exports.startSession)(sessionId, { printQR: false });
-            loadedSessions.push(sessionId);
-        }
-        catch (_) {
+          await startSession(sessionId);
+          loadedSessions.push(sessionId);
+        } catch (err) {
+          console.error(`Fehler beim Starten der Session "${sessionId}":`, err);
+          // weitere Sessions trotzdem laden
         }
+      }
+  
+      return loadedSessions;
+    } catch (err) {
+      console.error('Fehler beim Lesen des Session-Verzeichnisses:', err);
+      throw err; // oder wirf einen eigenen WhatsappError o.Ä.
     }
-    return loadedSessions;
-};
+  }
 exports.loadSessionsFromStorage = loadSessionsFromStorage;
-
-const sock = (conn) => {
-    (0, exports.onMessageReceived)((msg) => {
-        conn = (0, exports.getSession)(msg.sessionId);
-    });
-    return conn;
-};
-exports.sock = sock;
-
 const onMessageReceived = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_MESSAGE_RECEIVED, listener);
 };
-exports.onMessageReceived = onMessageReceived;
 
+const sock = (sessionId) => {
+    return (0, exports.getSession)(sessionId);
+  };
+exports.sock = sock;
+exports.onMessageReceived = onMessageReceived;
 const onQRUpdated = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_QR, listener);
 };
 exports.onQRUpdated = onQRUpdated;
-
 const onConnected = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_CONNECTED, listener);
 };
 exports.onConnected = onConnected;
-
 const onDisconnected = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_DISCONNECTED, listener);
 };
 exports.onDisconnected = onDisconnected;
-
 const onConnecting = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_CONNECTING, listener);
 };
 exports.onConnecting = onConnecting;
-
 const onMessageUpdate = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_MESSAGE_UPDATED, listener);
 };
 exports.onMessageUpdate = onMessageUpdate;
-
 const onPairingCode = (listener) => {
     callback.set(Defaults_1.CALLBACK_KEY.ON_PAIRING_CODE, listener);
 };