@open-wa/wa-automate 4.28.13 → 4.29.0

package/dist/api/Client.d.ts

@@ -42,6 +42,8 @@ export declare class Client {
     private _registeredPageListeners;
     private _onLogoutCallbacks;
     private _queues;
+    private _autoEmojiSet;
+    private _onLogoutSet;
     /**
      * This is used to track if a listener is already used via webhook. Before, webhooks used to be set once per listener. Now a listener can be set via multiple webhooks, or revoked from a specific webhook.
      * For this reason, listeners assigned to a webhook are only set once and map through all possible webhooks to and fire only if the specific listener is assigned.

package/dist/api/Client.js

@@ -56,7 +56,6 @@ const fs = __importStar(require("fs"));
 const datauri_1 = __importDefault(require("datauri"));
 const is_url_superb_1 = __importDefault(require("is-url-superb"));
 const fs_extra_1 = require("fs-extra");
-const tree_kill_1 = __importDefault(require("tree-kill"));
 const browser_1 = require("../controllers/browser");
 const auth_1 = require("../controllers/auth");
 const wa_decrypt_1 = require("@open-wa/wa-decrypt");
@@ -92,6 +91,8 @@ class Client {
         this._registeredPageListeners = [];
         this._onLogoutCallbacks = [];
         this._queues = {};
+        this._autoEmojiSet = false;
+        this._onLogoutSet = false;
         /**
          * This is used to track if a listener is already used via webhook. Before, webhooks used to be set once per listener. Now a listener can be set via multiple webhooks, or revoked from a specific webhook.
          * For this reason, listeners assigned to a webhook are only set once and map through all possible webhooks to and fire only if the specific listener is assigned.
@@ -249,7 +250,7 @@ class Client {
             logging_1.log.info('LOADED', {
                 PHONE_VERSION: this._sessionInfo.PHONE_VERSION
             });
-            if (((_d = this._createConfig) === null || _d === void 0 ? void 0 : _d.autoEmoji) === undefined || ((_e = this._createConfig) === null || _e === void 0 ? void 0 : _e.autoEmoji)) {
+            if ((((_d = this._createConfig) === null || _d === void 0 ? void 0 : _d.autoEmoji) === undefined || ((_e = this._createConfig) === null || _e === void 0 ? void 0 : _e.autoEmoji)) && !this._autoEmojiSet) {
                 const ident = typeof ((_f = this._createConfig) === null || _f === void 0 ? void 0 : _f.autoEmoji) === "string" ? (_g = this._createConfig) === null || _g === void 0 ? void 0 : _g.autoEmoji : ":";
                 this.onMessage((message) => __awaiter(this, void 0, void 0, function* () {
                     if (message.body && message.body.startsWith(ident) && message.body.endsWith(ident)) {
@@ -259,8 +260,9 @@ class Client {
                         return yield this.sendEmoji(message.from, emojiId, message.id);
                     }
                 }));
+                this._autoEmojiSet = true;
             }
-            if (((_h = this._createConfig) === null || _h === void 0 ? void 0 : _h.deleteSessionDataOnLogout) || ((_j = this._createConfig) === null || _j === void 0 ? void 0 : _j.killClientOnLogout)) {
+            if ((((_h = this._createConfig) === null || _h === void 0 ? void 0 : _h.deleteSessionDataOnLogout) || ((_j = this._createConfig) === null || _j === void 0 ? void 0 : _j.killClientOnLogout)) && !this._onLogoutSet) {
                 this.onLogout(() => __awaiter(this, void 0, void 0, function* () {
                     var _k, _l;
                     yield this.waitAllQEmpty();
@@ -272,6 +274,7 @@ class Client {
                         this.kill("LOGGED_OUT");
                     }
                 }), -1);
+                this._onLogoutSet = true;
             }
         });
     }
@@ -538,7 +541,7 @@ class Client {
                 fn = _fn;
             }
             if (this._registeredEvListeners && this._registeredEvListeners[funcName]) {
-                return events_1.ev.on(this.getEventSignature(funcName), ({ data }) => fn(data));
+                return events_1.ev.on(this.getEventSignature(funcName), ({ data }) => fn(data), { objectify: true });
             }
             /**
              * If evMode is on then make the callback come from ev.
@@ -1088,25 +1091,17 @@ class Client {
      * @returns true
      */
     kill(reason = "MANUALLY_KILLED") {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._currentlyBeingKilled)
                 return;
             this._currentlyBeingKilled = true;
             console.log('Killing client. Shutting Down');
             logging_1.log.info('Killing client. Shutting Down');
-            (0, tools_1.processSendData)({
-                reason
-            });
             const browser = yield ((_a = this === null || this === void 0 ? void 0 : this._page) === null || _a === void 0 ? void 0 : _a.browser());
             const pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? (_b = browser === null || browser === void 0 ? void 0 : browser.process()) === null || _b === void 0 ? void 0 : _b.pid : null;
             try {
-                if (this._page && !((_c = this._page) === null || _c === void 0 ? void 0 : _c.isClosed()))
-                    yield ((_d = this._page) === null || _d === void 0 ? void 0 : _d.close());
-                if (this._page && ((_e = this._page) === null || _e === void 0 ? void 0 : _e.browser))
-                    yield ((_g = (_f = this._page) === null || _f === void 0 ? void 0 : _f.browser()) === null || _g === void 0 ? void 0 : _g.close());
-                if (pid)
-                    (0, tree_kill_1.default)(pid, 'SIGKILL');
+                yield (0, browser_1.kill)(this._page, browser, false, pid, reason);
             }
             catch (error) {
                 //ignore error

package/dist/controllers/browser.js

@@ -41,7 +41,7 @@ const events_1 = require("./events");
 const pico_s3_1 = require("pico-s3");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const puppeteer = require('puppeteer-extra');
-const tree_kill_1 = __importDefault(require("tree-kill"));
+const promise_1 = __importDefault(require("terminate/promise"));
 const logging_1 = require("../logging/logging");
 const tools_1 = require("../utils/tools");
 let browser;
@@ -406,7 +406,7 @@ const kill = (p, b, exit, pid, reason = "LAUNCH_KILL") => __awaiter(void 0, void
         yield killBrowser(b);
     }
     if (pid)
-        (0, tree_kill_1.default)(pid, 'SIGKILL');
+        yield (0, promise_1.default)(pid, 'SIGKILL').catch(e => console.error('Error while terminating browser PID. You can just ignore this, as the process has most likely been terminated successfully already:', e.message));
     if (exit)
         process.exit();
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.28.13",
+  "version": "4.29.0",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -159,9 +159,9 @@
     "swagger-ui-express": "^4.1.4",
     "tcp-port-used": "^1.0.1",
     "terminal-link": "^2.1.1",
+    "terminate": "^2.5.0",
     "tiny-glob": "^0.2.9",
     "traverse": "^0.6.6",
-    "tree-kill": "^1.2.2",
     "ts-json-schema-generator": "^0.95.0",
     "ts-morph": "^12.0.0",
     "type-fest": "^1.1.1",