@open-wa/wa-automate 4.31.10 → 4.31.13

package/dist/api/Client.d.ts

@@ -824,10 +824,10 @@ export declare class Client {
     isConnected(): Promise<boolean>;
     /**
      * Logs out from the session.
-     *
+     * @param preserveSessionData skip session.data.json file invalidation
      * Please be careful when using this as it can exit the whole process depending on your config
      */
-    logout(): Promise<boolean>;
+    logout(preserveSessionData?: boolean): Promise<boolean>;
     /**
      * Retrieves Battery Level
      * @returns Number

package/dist/api/Client.js

@@ -266,6 +266,7 @@ class Client {
                 this.onLogout(() => __awaiter(this, void 0, void 0, function* () {
                     var _k, _l;
                     yield this.waitAllQEmpty();
+                    yield (0, browser_1.invalidateSesssionData)(this._createConfig);
                     if ((_k = this._createConfig) === null || _k === void 0 ? void 0 : _k.deleteSessionDataOnLogout)
                         (0, browser_1.deleteSessionData)(this._createConfig);
                     if ((_l = this._createConfig) === null || _l === void 0 ? void 0 : _l.killClientOnLogout) {
@@ -1882,11 +1883,15 @@ class Client {
     }
     /**
      * Logs out from the session.
-     *
+     * @param preserveSessionData skip session.data.json file invalidation
      * Please be careful when using this as it can exit the whole process depending on your config
      */
-    logout() {
+    logout(preserveSessionData = false) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!preserveSessionData) {
+                logging_1.log.info(`LOGOUT CALLED. INVALIDATING SESSION DATA`);
+                yield (0, browser_1.invalidateSesssionData)(this._createConfig);
+            }
             return yield this.pup(() => WAPI.logout());
         });
     }

package/dist/controllers/auth.js

@@ -40,6 +40,7 @@ const tools_1 = require("../utils/tools");
 const browser_1 = require("./browser");
 const axios_1 = __importDefault(require("axios"));
 const logging_1 = require("../logging/logging");
+const boxen_1 = __importDefault(require("boxen"));
 /**
  * isAuthenticated
  * Validates if client is authenticated
@@ -145,8 +146,11 @@ class QRManager {
                 spinner.info(`First QR: ${Date.now() - browser_1.BROWSER_START_TS} ms`);
             if (qrData) {
                 qrEv.emit(qrData, `qrData`);
-                if (!config.qrLogSkip)
-                    qrcode.generate(qrData, { small: true });
+                if (!config.qrLogSkip) {
+                    qrcode.generate(qrData, { small: true }, terminalQrCode => {
+                        console.log((0, boxen_1.default)(terminalQrCode, { title: config.sessionId, padding: 1, titleAlignment: 'center' }));
+                    });
+                }
                 else {
                     console.log(`New QR Code generated. Not printing in console because qrLogSkip is set to true`);
                     logging_1.log.info(`New QR Code generated. Not printing in console because qrLogSkip is set to true`);

package/dist/controllers/browser.d.ts

@@ -5,7 +5,8 @@ import { QRManager } from './auth';
 export declare let BROWSER_START_TS: number;
 export declare function initPage(sessionId?: string, config?: ConfigObject, qrManager?: QRManager, customUserAgent?: string, spinner?: Spin, _page?: Page, skipAuth?: boolean): Promise<Page>;
 export declare const deleteSessionData: (config: ConfigObject) => boolean;
-export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | boolean;
+export declare const invalidateSesssionData: (config: ConfigObject) => boolean;
+export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | false;
 export declare const addScript: (page: Page, js: string) => Promise<unknown>;
 export declare function injectPreApiScripts(page: Page, spinner?: Spin): Promise<Page>;
 export declare function injectWapi(page: Page, spinner?: Spin, force?: boolean): Promise<Page>;

package/dist/controllers/browser.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kill = exports.injectApi = exports.injectWapi = exports.injectPreApiScripts = exports.addScript = exports.getSessionDataFilePath = exports.deleteSessionData = exports.initPage = exports.BROWSER_START_TS = void 0;
+exports.kill = exports.injectApi = exports.injectWapi = exports.injectPreApiScripts = exports.addScript = exports.getSessionDataFilePath = exports.invalidateSesssionData = exports.deleteSessionData = exports.initPage = exports.BROWSER_START_TS = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const death_1 = __importDefault(require("death"));
@@ -52,7 +52,7 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         const setupPromises = [];
-        script_preloader_1.scriptLoader.loadScripts();
+        yield script_preloader_1.scriptLoader.loadScripts();
         if ((config === null || config === void 0 ? void 0 : config.resizable) === undefined || !(config === null || config === void 0 ? void 0 : config.resizable) == false)
             config.defaultViewport = null;
         if (config === null || config === void 0 ? void 0 : config.useStealth) {
@@ -268,7 +268,7 @@ const getSessionDataFromFile = (sessionId, config, spinner) => {
                 sessionjson = JSON.parse(Buffer.from(s, 'base64').toString('ascii'));
             }
             catch (error) {
-                const msg = "Session data json file is corrupted. Please reauthenticate.";
+                const msg = `${s == "LOGGED OUT" ? "The session was logged out" : "Session data json file is corrupted"}. Please re-scan the QR code.`;
                 if (spinner) {
                     spinner.fail(msg);
                 }
@@ -294,6 +294,22 @@ const deleteSessionData = (config) => {
     return true;
 };
 exports.deleteSessionData = deleteSessionData;
+const invalidateSesssionData = (config) => {
+    const sessionjsonpath = (0, exports.getSessionDataFilePath)((config === null || config === void 0 ? void 0 : config.sessionId) || 'session', config);
+    if (typeof sessionjsonpath == 'string' && fs.existsSync(sessionjsonpath)) {
+        const l = `logout detected, invalidating session data file: ${sessionjsonpath}`;
+        console.log(l);
+        logging_1.log.info(l);
+        fs.writeFile(sessionjsonpath, "LOGGED OUT", (err) => {
+            if (err) {
+                console.error(err);
+                return;
+            }
+        });
+    }
+    return true;
+};
+exports.invalidateSesssionData = invalidateSesssionData;
 const getSessionDataFilePath = (sessionId, config) => {
     var _a, _b;
     const p = ((_a = require === null || require === void 0 ? void 0 : require.main) === null || _a === void 0 ? void 0 : _a.path) || ((_b = process === null || process === void 0 ? void 0 : process.mainModule) === null || _b === void 0 ? void 0 : _b.path);
@@ -338,7 +354,7 @@ function injectWapi(page, spinner, force = false) {
         if (initCheck)
             return;
         logging_1.log.info(`WAPI CHECK: ${initCheck}`);
-        if (!check)
+        if (!initCheck)
             force = true;
         if (wapiInjected && !force)
             return page;

package/dist/controllers/script_preloader.js

@@ -66,8 +66,10 @@ class ScriptLoader {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.contentRegistry[scriptName]) {
                 this.contentRegistry[scriptName] = yield read(scriptName);
-                logging_1.log.info("SCRIPT READY: " + scriptName);
+                logging_1.log.info(`SCRIPT READY: ${scriptName} ${this.contentRegistry[scriptName].length}`);
             }
+            else
+                logging_1.log.info(`GET SCRIPT: ${scriptName} ${this.contentRegistry[scriptName].length}`);
             return this.contentRegistry[scriptName];
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.31.10",
+  "version": "4.31.13",
   "licenseCheckUrl": "https://funcs.openwa.dev/license-check",
   "brokenMethodReportUrl": "https://funcs.openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",