@open-wa/wa-automate 4.28.12 → 4.28.13

package/dist/api/Client.d.ts

@@ -40,6 +40,7 @@ export declare class Client {
     private _prio;
     private _pageListeners;
     private _registeredPageListeners;
+    private _onLogoutCallbacks;
     private _queues;
     /**
      * 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.
@@ -111,13 +112,18 @@ export declare class Client {
      *
      * @event
      * @param fn callback
+     * @param priority A priority of -1 will mean the callback will be triggered after all the non -1 callbacks
      * @fires `true`
      */
     onLogout(fn: (loggedOut?: boolean) => any, priority?: number): Promise<boolean>;
     /**
      * Wait for the webhook queue to become idle. This is useful for ensuring webhooks are cleared before ending a process.
      */
-    waitWhQIdle(): Promise<any>;
+    waitWhQIdle(): Promise<true | void>;
+    /**
+     * Wait for all queues to be empty
+     */
+    waitAllQEmpty(): Promise<true | void[]>;
     /**
      * If you have set `onAnyMessage` or `onMessage` with the second parameter (PQueue options) then you may want to inspect their respective PQueue's.
      */

package/dist/api/Client.js

@@ -90,6 +90,7 @@ class Client {
         this._prio = Number.MAX_SAFE_INTEGER;
         this._pageListeners = [];
         this._registeredPageListeners = [];
+        this._onLogoutCallbacks = [];
         this._queues = {};
         /**
          * 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.
@@ -260,16 +261,17 @@ class Client {
                 }));
             }
             if (((_h = this._createConfig) === null || _h === void 0 ? void 0 : _h.deleteSessionDataOnLogout) || ((_j = this._createConfig) === null || _j === void 0 ? void 0 : _j.killClientOnLogout)) {
-                this.onLogout(() => {
-                    var _a, _b;
-                    if ((_a = this._createConfig) === null || _a === void 0 ? void 0 : _a.deleteSessionDataOnLogout)
+                this.onLogout(() => __awaiter(this, void 0, void 0, function* () {
+                    var _k, _l;
+                    yield this.waitAllQEmpty();
+                    if ((_k = this._createConfig) === null || _k === void 0 ? void 0 : _k.deleteSessionDataOnLogout)
                         (0, browser_1.deleteSessionData)(this._createConfig);
-                    if ((_b = this._createConfig) === null || _b === void 0 ? void 0 : _b.killClientOnLogout) {
+                    if ((_l = this._createConfig) === null || _l === void 0 ? void 0 : _l.killClientOnLogout) {
                         console.log("Session logged out. Killing client");
                         logging_1.log.warn("Session logged out. Killing client");
                         this.kill("LOGGED_OUT");
                     }
-                });
+                }), -1);
             }
         });
     }
@@ -567,27 +569,47 @@ class Client {
         });
         if (this._registeredPageListeners.includes(event))
             return true;
+        this._registeredPageListeners.push(event);
+        logging_1.log.info(`setting page listener: ${event}`, this._registeredPageListeners);
         this._page.on(event, (...args) => __awaiter(this, void 0, void 0, function* () {
-            return yield Promise.all(this._pageListeners.filter(l => l.event === event).sort((a, b) => (b.priority || 0) - (a.priority || 0)).map(l => l.callback(...args)));
+            yield Promise.all(this._pageListeners.filter(l => l.event === event).filter(({ priority }) => priority !== -1).sort((a, b) => (b.priority || 0) - (a.priority || 0)).map(l => l.callback(...args)));
+            yield Promise.all(this._pageListeners.filter(l => l.event === event).filter(({ priority }) => priority == -1).sort((a, b) => (b.priority || 0) - (a.priority || 0)).map(l => l.callback(...args)));
+            return;
         }));
-        this._registeredPageListeners.push(event);
     }
     /**
      * Listens to a log out event
      *
      * @event
      * @param fn callback
+     * @param priority A priority of -1 will mean the callback will be triggered after all the non -1 callbacks
      * @fires `true`
      */
     onLogout(fn, priority) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.registerPageEventListener('framenavigated', (frame) => __awaiter(this, void 0, void 0, function* () {
+            const event = 'framenavigated';
+            this._onLogoutCallbacks.push({
+                callback: fn,
+                priority
+            });
+            if (!this._queues[event])
+                this._queues[event] = new p_queue_1.default({
+                    concurrency: 1,
+                    intervalCap: 1,
+                    carryoverConcurrencyCount: true
+                });
+            if (this._registeredPageListeners.includes(event))
+                return true;
+            this.registerPageEventListener(event, (frame) => __awaiter(this, void 0, void 0, function* () {
                 if (frame.url().includes('post_logout=1')) {
                     console.log("LOGGED OUT");
                     logging_1.log.warn("LOGGED OUT");
-                    yield fn(true);
+                    yield Promise.all(this._onLogoutCallbacks.filter(c => c.priority !== -1).map(({ callback }) => this._queues[event].add(() => callback(true))));
+                    yield this._queues[event].onEmpty();
+                    yield Promise.all(this._onLogoutCallbacks.filter(c => c.priority == -1).map(({ callback }) => this._queues[event].add(() => callback(true))));
+                    yield this._queues[event].onEmpty();
                 }
-            }), priority);
+            }), priority || 1);
             return true;
         });
     }
@@ -602,6 +624,18 @@ class Client {
             return true;
         });
     }
+    /**
+     * Wait for all queues to be empty
+     */
+    waitAllQEmpty() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield Promise.all([
+                this._webhookQueue,
+                ...Object.values(this._queues)
+            ].filter(q => q).map(q => q === null || q === void 0 ? void 0 : q.onEmpty()));
+            return true;
+        });
+    }
     /**
      * If you have set `onAnyMessage` or `onMessage` with the second parameter (PQueue options) then you may want to inspect their respective PQueue's.
      */

package/dist/cli/index.js

@@ -109,11 +109,11 @@ function start() {
             client.onLogout(() => __awaiter(this, void 0, void 0, function* () {
                 console.error('!!!! CLIENT LOGGED OUT !!!!');
                 if (cliConfig && !cliConfig.noKillOnLogout) {
-                    yield client.waitWhQIdle();
+                    yield client.waitAllQEmpty();
                     console.error("Shutting down.");
                     process.exit();
                 }
-            }));
+            }), -1);
             if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.botPressUrl) {
                 spinner.info('Setting Up Botpress handler');
                 (0, server_1.setupBotPressHandler)(cliConfig, client);

package/package.json

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