@open-wa/wa-automate 4.25.0 → 4.25.1

package/dist/api/Client.d.ts

@@ -39,6 +39,8 @@ export declare class Client {
     private _refreshing;
     private _l;
     private _prio;
+    private _pageListeners;
+    private _registeredPageListeners;
     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.
@@ -104,6 +106,7 @@ export declare class Client {
      *
      */
     private registerListener;
+    private registerPageEventListener;
     /**
      * Listens to a log out event
      *
@@ -111,7 +114,11 @@ export declare class Client {
      * @param fn callback
      * @fires `true`
      */
-    onLogout(fn: (loggedOut?: boolean) => any): Promise<boolean>;
+    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>;
     /**
      * 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

@@ -104,6 +104,8 @@ class Client {
         this._currentlyBeingKilled = false;
         this._refreshing = false;
         this._prio = Number.MAX_SAFE_INTEGER;
+        this._pageListeners = [];
+        this._registeredPageListeners = [];
         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.
@@ -552,7 +554,21 @@ class Client {
             return res;
         });
     }
-    // NON-STAMDARD LISTENERS
+    // NON-STANDARD LISTENERS
+    registerPageEventListener(_event, callback, priority) {
+        const event = _event;
+        this._pageListeners.push({
+            event,
+            callback,
+            priority
+        });
+        if (this._registeredPageListeners.includes(event))
+            return true;
+        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)));
+        }));
+        this._registeredPageListeners.push(event);
+    }
     /**
      * Listens to a log out event
      *
@@ -560,17 +576,25 @@ class Client {
      * @param fn callback
      * @fires `true`
      */
-    onLogout(fn) {
+    onLogout(fn, priority) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._page.on('request', request => {
-                if (request.url() === "https://web.whatsapp.com/" && !this._refreshing)
-                    fn();
-            });
-            this.onStateChanged(state => {
-                if (state === model_1.STATE.UNPAIRED) {
-                    fn();
+            this.registerPageEventListener('framenavigated', (frame) => __awaiter(this, void 0, void 0, function* () {
+                if (frame.url().includes('post_logout=1')) {
+                    console.log("LOGGED OUT");
+                    yield fn(true);
                 }
-            });
+            }), priority);
+            return true;
+        });
+    }
+    /**
+     * Wait for the webhook queue to become idle. This is useful for ensuring webhooks are cleared before ending a process.
+     */
+    waitWhQIdle() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._webhookQueue) {
+                return yield this._webhookQueue.onIdle();
+            }
             return true;
         });
     }
@@ -3309,7 +3333,7 @@ class Client {
                                     ...Object.keys(this._registeredWebhooks).map(webhookId => this._registeredWebhooks[webhookId]).filter(webhookEntry => webhookEntry.events.includes(event))
                                 ].map(({ id, url, requestConfig }) => axios_1.default(Object.assign({ method: 'post', url, data: this.prepEventData(_data, event, { webhook_id: id }) }, requestConfig)).catch(err => console.error(`WEBHOOK ERROR: `, url, err.message))));
                             }));
-                        }));
+                        }), 10000);
                     }
                 }
             });

package/dist/cli/index.js

@@ -108,6 +108,7 @@ function start() {
             client.onLogout(() => __awaiter(this, void 0, void 0, function* () {
                 console.error('!!!! CLIENT LOGGED OUT !!!!');
                 if (cliConfig && !cliConfig.noKillOnLogout) {
+                    yield client.waitWhQIdle();
                     console.error("Shutting down.");
                     process.exit();
                 }

package/package.json

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