@open-wa/wa-automate 4.28.11 → 4.30.0

package/build/generate-oas-types.ts

@@ -0,0 +1,27 @@
+import * as fs from 'fs'
+import glob = require('tiny-glob');
+import * as path from 'path';
+
+import {
+    getTypeScriptReader,
+    getOpenApiWriter,
+    makeConverter,
+  } from 'typeconv'
+
+export const getTypeSchemas : any = async () => {
+    const reader = getTypeScriptReader(  );
+    const writer = getOpenApiWriter( { format: 'json', title: 'My API', version: 'v3.0.3' } );
+    const { convert } = makeConverter( reader, writer, {
+        simplify: true
+    });
+    const s = (await Promise.all([...(await glob(path.resolve(__dirname,'../**/*.d.ts'))),...(await glob(path.resolve(__dirname,'../**/message.js'))), ...(await glob(path.resolve(__dirname,'../**/chat.js')))])).filter(f=>!f.includes('node_modules'))
+    const res = {};
+    await Promise.all(s.map(async x=>{
+        const {data} =  await convert({ data: fs.readFileSync(x, 'utf8') } );
+        const schemas = JSON.parse(data)?.components?.schemas;
+        Object.keys(schemas).forEach(k => {
+            res[k] = schemas[k];
+        })
+    }))
+    return res;
+  }

package/dist/api/Client.d.ts

@@ -40,7 +40,10 @@ export declare class Client {
     private _prio;
     private _pageListeners;
     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.
@@ -111,13 +114,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

@@ -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");
@@ -90,7 +89,10 @@ class Client {
         this._prio = Number.MAX_SAFE_INTEGER;
         this._pageListeners = [];
         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.
@@ -248,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)) {
@@ -258,18 +260,21 @@ 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)) {
-                this.onLogout(() => {
-                    var _a, _b;
-                    if ((_a = this._createConfig) === null || _a === void 0 ? void 0 : _a.deleteSessionDataOnLogout)
+            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();
+                    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);
+                this._onLogoutSet = true;
             }
         });
     }
@@ -536,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.
@@ -567,27 +572,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 +627,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.
      */
@@ -1054,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
@@ -3357,7 +3386,15 @@ class Client {
                             return yield this._webhookQueue.add(() => __awaiter(this, void 0, void 0, function* () {
                                 return yield Promise.all([
                                     ...Object.keys(this._registeredWebhooks).map(webhookId => this._registeredWebhooks[webhookId]).filter(webhookEntry => webhookEntry.events.includes(event))
-                                ].map(({ id, url, requestConfig }) => (0, 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))));
+                                ].map(({ id, url, requestConfig }) => {
+                                    const whStart = performance.now();
+                                    return (0, axios_1.default)(Object.assign({ method: 'post', url, data: this.prepEventData(_data, event, { webhook_id: id }) }, requestConfig))
+                                        .then(({ status }) => {
+                                        const t = (performance.now() - whStart).toFixed(0);
+                                        logging_1.log.info("Client Webhook", event, status, t);
+                                    })
+                                        .catch(err => console.error(`WEBHOOK ERROR: `, url, err.message));
+                                }));
                             }));
                         }), 10000);
                     }

package/dist/cli/collections.d.ts

@@ -1,3 +1,2 @@
 export declare const collections: {};
 export declare const generateCollections: any;
-export declare const getTypeSchemas: any;

package/dist/cli/collections.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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) {
@@ -31,19 +12,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypeSchemas = exports.generateCollections = exports.collections = void 0;
+exports.generateCollections = exports.collections = void 0;
 const __1 = require("..");
 const postman_2_swagger_1 = __importDefault(require("postman-2-swagger"));
 const fs_extra_1 = require("fs-extra");
-const typeconv_1 = require("typeconv");
-const fs = __importStar(require("fs"));
-const glob = require("tiny-glob");
-const path = __importStar(require("path"));
 exports.collections = {};
 const generateCollections = (config, spinner) => __awaiter(void 0, void 0, void 0, function* () {
     let swCol = null;
     let pmCol = null;
-    const _types = yield (0, exports.getTypeSchemas)();
+    //TODO GENERATE TYPE SCHEMAS ON BUILD. AXIOS GET FROM GITHUB!
+    const _types = {};
     spinner.info('Generating Swagger Spec');
     pmCol = yield (0, __1.generatePostmanJson)(config);
     spinner.succeed(`Postman collection generated: open-wa-${config.sessionId}.postman_collection.json`);
@@ -114,22 +92,3 @@ const generateCollections = (config, spinner) => __awaiter(void 0, void 0, void
     return;
 });
 exports.generateCollections = generateCollections;
-const getTypeSchemas = () => __awaiter(void 0, void 0, void 0, function* () {
-    const reader = (0, typeconv_1.getTypeScriptReader)();
-    const writer = (0, typeconv_1.getOpenApiWriter)({ format: 'json', title: 'My API', version: 'v3.0.3' });
-    const { convert } = (0, typeconv_1.makeConverter)(reader, writer, {
-        simplify: true
-    });
-    const s = (yield Promise.all([...(yield glob(path.resolve(__dirname, '../**/*.d.ts'))), ...(yield glob(path.resolve(__dirname, '../**/message.js'))), ...(yield glob(path.resolve(__dirname, '../**/chat.js')))])).filter(f => !f.includes('node_modules'));
-    const res = {};
-    yield Promise.all(s.map((x) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        const { data } = yield convert({ data: fs.readFileSync(x, 'utf8') });
-        const schemas = (_b = (_a = JSON.parse(data)) === null || _a === void 0 ? void 0 : _a.components) === null || _b === void 0 ? void 0 : _b.schemas;
-        Object.keys(schemas).forEach(k => {
-            res[k] = schemas[k];
-        });
-    })));
-    return res;
-});
-exports.getTypeSchemas = getTypeSchemas;

package/dist/cli/index.js

@@ -80,6 +80,7 @@ function start() {
                     }
                     if (!cliConfig.allowSessionDataWebhook && (namespace == "sessionData" || namespace == "sessionDataBase64"))
                         return;
+                    const whStart = performance.now();
                     yield (0, axios_1.default)({
                         method: 'post',
                         url: cliConfig.ev,
@@ -89,6 +90,9 @@ function start() {
                             sessionId,
                             namespace
                         }
+                    }).then(({ status }) => {
+                        const t = (performance.now() - whStart).toFixed(0);
+                        index_1.log.info("EV Webhook", namespace, status, t);
                     }).catch(err => console.error(`WEBHOOK ERROR: ${cliConfig.ev} ${err.message}`));
                 }));
         }
@@ -109,11 +113,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/dist/controllers/auth.d.ts

@@ -13,4 +13,20 @@ export declare const isInsideChat: (waPage: Page) => Observable<boolean>;
 export declare const waitForRipeSession: (waPage: Page) => Promise<boolean>;
 export declare const sessionDataInvalid: (waPage: Page) => Promise<string>;
 export declare const phoneIsOutOfReach: (waPage: Page) => Promise<boolean>;
-export declare function smartQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<boolean | void | string>;
+export declare class QRManager {
+    qrEv: any;
+    qrNum: number;
+    hash: string;
+    config: ConfigObject;
+    firstEmitted: boolean;
+    _internalQrPngLoaded: boolean;
+    qrCheck: string;
+    constructor(config?: any);
+    setConfig(config: any): void;
+    qrEvF(config?: ConfigObject): any;
+    grabAndEmit(qrData: any, waPage: Page, config: ConfigObject, spinner: Spin): Promise<void>;
+    smartQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<boolean | void | string>;
+    emitFirst(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<void>;
+    waitFirstQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<void>;
+}
+export declare const qrManager: QRManager;

package/dist/controllers/auth.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.smartQr = exports.phoneIsOutOfReach = exports.sessionDataInvalid = exports.waitForRipeSession = exports.isInsideChat = exports.needsToScan = exports.isAuthenticated = void 0;
+exports.qrManager = exports.QRManager = exports.phoneIsOutOfReach = exports.sessionDataInvalid = exports.waitForRipeSession = exports.isInsideChat = exports.needsToScan = exports.isAuthenticated = void 0;
 const qrcode = __importStar(require("qrcode-terminal"));
 const rxjs_1 = require("rxjs");
 const events_1 = require("./events");
@@ -100,24 +100,38 @@ const phoneIsOutOfReach = (waPage) => __awaiter(void 0, void 0, void 0, function
         .catch(() => false);
 });
 exports.phoneIsOutOfReach = phoneIsOutOfReach;
-function smartQr(waPage, config, spinner) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let qrNum = 0;
-        const evalResult = yield waPage.evaluate("window.Store && window.Store.State");
-        if (evalResult === false) {
-            console.log('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
-            logging_1.log.warn('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
-            if (config.throwErrorOnTosBlock)
-                throw new Error('TOSBLOCK');
-        }
-        const isAuthed = yield (0, exports.isAuthenticated)(waPage);
-        if (isAuthed)
-            return true;
-        let hash = 'START';
-        const grabAndEmit = (qrData) => __awaiter(this, void 0, void 0, function* () {
-            if (!qrNum && browser_1.BROWSER_START_TS)
+class QRManager {
+    constructor(config = null) {
+        this.qrEv = null;
+        this.qrNum = 0;
+        this.hash = 'START';
+        this.config = null;
+        this.firstEmitted = false;
+        this._internalQrPngLoaded = false;
+        this.qrCheck = `document.querySelector("canvas[aria-label='Scan me!']")?document.querySelector("canvas[aria-label='Scan me!']").parentElement.getAttribute("data-ref"):false`;
+        this.config = config;
+    }
+    setConfig(config) {
+        this.config = config;
+        this.qrEvF(this.config);
+    }
+    qrEvF(config = this.config) {
+        if (!this.qrEv)
+            this.qrEv = new events_1.EvEmitter(config.sessionId || 'session', 'qr');
+        return this.qrEv;
+    }
+    grabAndEmit(qrData, waPage, config, spinner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.qrNum++;
+            if (config.qrMax && this.qrNum > config.qrMax) {
+                spinner.info('QR Code limit reached, exiting...');
+                yield (0, browser_1.kill)(waPage, null, true, null, "QR_LIMIT_REACHED");
+            }
+            const qrEv = this.qrEvF(config);
+            if (!this.qrNum && browser_1.BROWSER_START_TS)
                 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 });
                 else {
@@ -125,31 +139,32 @@ function smartQr(waPage, config, spinner) {
                     logging_1.log.info(`New QR Code generated. Not printing in console because qrLogSkip is set to true`);
                 }
             }
+            if (!this._internalQrPngLoaded) {
+                logging_1.log.info("Waiting for internal QR renderer to load");
+                const t = yield (0, tools_1.timePromise)(() => waPage.waitForFunction(`window.getQrPng || false`, { timeout: 0, polling: 'mutation' }));
+                logging_1.log.info(`Internal QR renderer loaded in ${t} ms`);
+                this._internalQrPngLoaded = true;
+            }
             try {
                 const qrPng = yield waPage.evaluate(`window.getQrPng()`);
                 if (qrPng) {
                     qrEv.emit(qrPng);
-                    qrNum++;
                     (0, tools_1.processSend)('ready');
-                    if (config.qrMax && qrNum >= config.qrMax) {
-                        spinner.info('QR Code limit reached, exiting...');
-                        yield (0, browser_1.kill)(waPage, null, true, null, "QR_LIMIT_REACHED");
-                    }
-                    if (config.ezqr || config.inDocker) {
+                    if (config.ezqr) {
                         const host = 'https://qr.openwa.cloud/';
                         yield axios_1.default.post(host, {
                             value: qrPng,
-                            hash
+                            hash: this.hash
                         }).then(({ data }) => {
-                            if (hash === 'START') {
+                            if (this.hash === 'START') {
                                 const qrUrl = `${host}${data}`;
                                 qrEv.emit(qrUrl, `qrUrl`);
                                 console.log(`Scan the qr code at ${qrUrl}`);
                                 logging_1.log.info(`Scan the qr code at ${qrUrl}`);
                             }
-                            hash = data;
+                            this.hash = data;
                         }).catch(e => {
-                            hash = 'START';
+                            this.hash = 'START';
                         });
                     }
                 }
@@ -165,42 +180,76 @@ function smartQr(waPage, config, spinner) {
                 spinner.info(`Something went wrong while retreiving new the QR code but it should not affect the session launch procedure: ${error.message}`);
             }
         });
-        const qrEv = new events_1.EvEmitter(config.sessionId || 'session', 'qr');
-        const _hasDefaultStateYet = yield waPage.evaluate("!!(window.Store &&  window.Store.State && window.Store.State.Socket)");
-        if (!_hasDefaultStateYet) {
-            //expecting issue, take a screenshot then wait a few seconds before continuing
-            yield (0, tools_1.timeout)(2000);
-        }
-        return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-            const funcName = '_smartQr';
-            const md = "MULTI_DEVICE_DETECTED";
-            let gotResult = false;
-            const fn = (qrData) => __awaiter(this, void 0, void 0, function* () {
-                if (qrData.length > 200 && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {
-                    spinner.fail(`Multi-Device detected, please set multiDevice to true in your config or add the --multi-device flag`);
-                    return resolve(md);
-                }
-                if (!gotResult && (qrData === 'QR_CODE_SUCCESS' || qrData === md)) {
-                    gotResult = true;
-                    spinner === null || spinner === void 0 ? void 0 : spinner.succeed(qrData === md ? "Multi device support for this project is EXPERIMENTAL. Some things may not work...." : "QR code scanned. Loading session...");
-                    return resolve(yield (0, exports.isInsideChat)(waPage).toPromise());
-                }
-                if (!gotResult)
-                    grabAndEmit(qrData);
-            });
-            const set = () => waPage.evaluate(({ funcName }) => {
-                //@ts-ignore
-                return window['smartQr'] ? window[`smartQr`](obj => window[funcName](obj)) : false;
-            }, { funcName });
-            yield waPage.exposeFunction(funcName, (obj) => fn(obj)).then(set).catch((e) => __awaiter(this, void 0, void 0, function* () {
-                //if an error occurs during the qr launcher then take a screenshot.
-                yield (0, initializer_1.screenshot)(waPage);
-                console.log("qr -> e", e);
-                logging_1.log.error("qr -> e", e);
+    }
+    smartQr(waPage, config, spinner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const evalResult = yield waPage.evaluate("window.Store && window.Store.State");
+            if (evalResult === false) {
+                console.log('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
+                logging_1.log.warn('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
+                if (config.throwErrorOnTosBlock)
+                    throw new Error('TOSBLOCK');
+            }
+            const isAuthed = yield (0, exports.isAuthenticated)(waPage);
+            if (isAuthed)
+                return true;
+            const _hasDefaultStateYet = yield waPage.evaluate("!!(window.Store &&  window.Store.State && window.Store.State.Socket)");
+            if (!_hasDefaultStateYet) {
+                //expecting issue, take a screenshot then wait a few seconds before continuing
+                yield (0, tools_1.timeout)(2000);
+            }
+            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                const funcName = '_smartQr';
+                const md = "MULTI_DEVICE_DETECTED";
+                let gotResult = false;
+                const fn = (qrData) => __awaiter(this, void 0, void 0, function* () {
+                    if (qrData.length > 200 && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {
+                        spinner.fail(`Multi-Device detected, please set multiDevice to true in your config or add the --multi-device flag`);
+                        return resolve(md);
+                    }
+                    if (!gotResult && (qrData === 'QR_CODE_SUCCESS' || qrData === md)) {
+                        gotResult = true;
+                        spinner === null || spinner === void 0 ? void 0 : spinner.succeed(qrData === md ? "Multi device support for this project is EXPERIMENTAL. Some things may not work...." : "QR code scanned. Loading session...");
+                        return resolve(yield (0, exports.isInsideChat)(waPage).toPromise());
+                    }
+                    if (!gotResult)
+                        this.grabAndEmit(qrData, waPage, config, spinner);
+                });
+                const set = () => waPage.evaluate(({ funcName }) => {
+                    //@ts-ignore
+                    return window['smartQr'] ? window[`smartQr`](obj => window[funcName](obj)) : false;
+                }, { funcName });
+                yield waPage.exposeFunction(funcName, (obj) => fn(obj)).then(set).catch((e) => __awaiter(this, void 0, void 0, function* () {
+                    //if an error occurs during the qr launcher then take a screenshot.
+                    yield (0, initializer_1.screenshot)(waPage);
+                    console.log("qr -> e", e);
+                    logging_1.log.error("qr -> e", e);
+                }));
+                yield this.emitFirst(waPage, config, spinner);
             }));
-            const firstQr = yield waPage.evaluate(`document.querySelector("canvas[aria-label='Scan me!']")?document.querySelector("canvas[aria-label='Scan me!']").parentElement.getAttribute("data-ref"):false`);
-            yield grabAndEmit(firstQr);
-        }));
-    });
+        });
+    }
+    emitFirst(waPage, config, spinner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.firstEmitted)
+                return;
+            this.firstEmitted = true;
+            const firstQr = yield waPage.evaluate(this.qrCheck);
+            yield this.grabAndEmit(firstQr, waPage, config, spinner);
+        });
+    }
+    waitFirstQr(waPage, config, spinner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fqr = yield waPage.waitForFunction(`!!(${this.qrCheck})`, {
+                polling: 500,
+                timeout: 10000
+            })
+                .catch(e => false);
+            if (fqr)
+                yield this.emitFirst(waPage, config, spinner);
+            return;
+        });
+    }
 }
-exports.smartQr = smartQr;
+exports.QRManager = QRManager;
+exports.qrManager = new QRManager();

package/dist/controllers/browser.d.ts

@@ -6,7 +6,9 @@ export declare function initPage(sessionId?: string, config?: ConfigObject, cust
 export declare const deleteSessionData: (config: ConfigObject) => boolean;
 export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | boolean;
 export declare const addScript: (page: Page, js: string) => Promise<unknown>;
-export declare function injectApi(page: Page): Promise<Page>;
+export declare function injectPreApiScripts(page: Page, spinner?: Spin): Promise<Page>;
+export declare function injectWapi(page: Page, spinner?: Spin): Promise<Page>;
+export declare function injectApi(page: Page, spinner?: Spin): Promise<Page>;
 /**
  * @internal
  */

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.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.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"));
@@ -41,9 +41,10 @@ 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");
+const auth_1 = require("./auth");
 let browser;
 exports.BROWSER_START_TS = 0;
 function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth) {
@@ -59,9 +60,12 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
         let waPage = _page;
         if (!waPage) {
             spinner === null || spinner === void 0 ? void 0 : spinner.info('Launching Browser');
+            const startBrowser = performance.now();
             browser = yield initBrowser(sessionId, config, spinner);
+            spinner === null || spinner === void 0 ? void 0 : spinner.info(`Browser launched: ${(performance.now() - startBrowser).toFixed(0)}ms`);
             waPage = yield getWAPage(browser);
         }
+        const postBrowserLaunchTs = performance.now();
         spinner === null || spinner === void 0 ? void 0 : spinner.info('Setting Up Page');
         if (config === null || config === void 0 ? void 0 : config.proxyServerCredentials) {
             yield waPage.authenticate(config.proxyServerCredentials);
@@ -174,11 +178,13 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
         if ((_e = config === null || config === void 0 ? void 0 : config.proxyServerCredentials) === null || _e === void 0 ? void 0 : _e.address)
             spinner.succeed(`Active proxy: ${config.proxyServerCredentials.address}`);
         yield Promise.all(setupPromises);
+        spinner === null || spinner === void 0 ? void 0 : spinner.info(`Pre page launch setup complete: ${(performance.now() - postBrowserLaunchTs).toFixed(0)}ms`);
         spinner === null || spinner === void 0 ? void 0 : spinner.info('Navigating to WA');
         try {
             //try twice 
             const WEB_START_TS = new Date().getTime();
             const webRes = yield waPage.goto(puppeteer_config_1.puppeteerConfig.WAUrl);
+            Promise.all([injectApi(waPage, spinner), auth_1.qrManager.waitFirstQr(waPage, config, spinner)]);
             const WEB_END_TS = new Date().getTime();
             if (webRes == null) {
                 spinner === null || spinner === void 0 ? void 0 : spinner.info(`Page loaded but something may have gone wrong: ${WEB_END_TS - WEB_START_TS}ms`);
@@ -260,24 +266,46 @@ const addScript = (page, js) => page.addScriptTag({
     path: require.resolve(path.join(__dirname, '../lib', js))
 });
 exports.addScript = addScript;
-function injectApi(page) {
+function injectPreApiScripts(page, spinner) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield Promise.all([
+        const t1 = yield (0, tools_1.timePromise)(() => Promise.all([
             'axios.min.js',
             'jsSha.min.js',
             'qr.min.js',
             'base64.js',
             'hash.js'
-        ].map(js => (0, exports.addScript)(page, js)));
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'wapi.js');
-        yield (0, exports.addScript)(page, 'launch.js');
+        ].map(js => (0, exports.addScript)(page, js))));
+        spinner === null || spinner === void 0 ? void 0 : spinner.info(`Base inject: ${t1}ms`);
+        return page;
+    });
+}
+exports.injectPreApiScripts = injectPreApiScripts;
+function injectWapi(page, spinner) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const wapi = yield (0, tools_1.timePromise)(() => (0, exports.addScript)(page, 'wapi.js'));
+        spinner === null || spinner === void 0 ? void 0 : spinner.info(`WAPI inject: ${wapi}ms`);
+        spinner === null || spinner === void 0 ? void 0 : spinner.info("Checking WAPI Injection");
+        const check = (c) => `window.${c} ? true : false`;
+        yield page.waitForFunction(check('WAPI'), { timeout: 0, polling: 500 });
+        return;
+    });
+}
+exports.injectWapi = injectWapi;
+function injectApi(page, spinner) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield injectPreApiScripts(page, spinner);
+        yield injectWapi(page, spinner);
+        // const wapi = await timePromise(()=>addScript(page,'wapi.js'))
+        // spinner?.info(`WAPI inject: ${wapi}ms`)
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        // await addScript(page,'wapi.js')
+        const launch = yield (0, tools_1.timePromise)(() => (0, exports.addScript)(page, 'launch.js'));
+        spinner === null || spinner === void 0 ? void 0 : spinner.info(`Launch inject: ${launch}ms`);
         return page;
     });
 }
@@ -406,7 +434,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/dist/controllers/events.d.ts

@@ -54,8 +54,10 @@ export declare const ev: EventEmitter2;
 export declare class EvEmitter {
     sessionId: string;
     eventNamespace: string;
+    bannedTransports: string[];
     constructor(sessionId: string, eventNamespace: string);
     emit(data: unknown, eventNamespaceOverride?: string): void;
+    emitAsync(data: unknown, eventNamespaceOverride?: string): Promise<any>;
 }
 /**
  * @internal

package/dist/controllers/events.js

@@ -82,6 +82,12 @@ const getGlobalSpinner = (disableSpins = false) => {
  */
 class EvEmitter {
     constructor(sessionId, eventNamespace) {
+        this.bannedTransports = [
+            //DO NOT ALLOW THESE NAMESPACES ON TRANSPORTS!!
+            "sessionData",
+            "sessionDataBase64",
+            "qr",
+        ];
         this.sessionId = sessionId;
         this.eventNamespace = eventNamespace;
     }
@@ -90,18 +96,27 @@ class EvEmitter {
         const sessionId = this.sessionId;
         const eventNamespace = eventNamespaceOverride || this.eventNamespace;
         exports.ev.emit(eventName, data, sessionId, eventNamespace);
-        if (![
-            //DO NOT ALLOW THESE NAMESPACES ON TRANSPORTS!!
-            "sessionData",
-            "sessionDataBase64",
-            "qr",
-        ].find(x => eventNamespace == x))
+        if (!this.bannedTransports.find(x => eventNamespace == x))
+            logging_1.log.info(typeof data === 'string' ? data : eventName, {
+                eventName,
+                data,
+                sessionId,
+                eventNamespace
+            });
+        // ev.emit(`${this.sessionId}.${this.eventNamespace}`,data,this.sessionId,this.eventNamespace);
+    }
+    emitAsync(data, eventNamespaceOverride) {
+        const eventName = `${eventNamespaceOverride || this.eventNamespace}.${this.sessionId}`;
+        const sessionId = this.sessionId;
+        const eventNamespace = eventNamespaceOverride || this.eventNamespace;
+        if (!this.bannedTransports.find(x => eventNamespace == x))
             logging_1.log.info(typeof data === 'string' ? data : eventName, {
                 eventName,
                 data,
                 sessionId,
                 eventNamespace
             });
+        return exports.ev.emitAsync(eventName, data, sessionId, eventNamespace);
         // ev.emit(`${this.sessionId}.${this.eventNamespace}`,data,this.sessionId,this.eventNamespace);
     }
 }

package/dist/controllers/initializer.js

@@ -145,6 +145,7 @@ function create(config = {}) {
         if (!sessionId)
             sessionId = 'session';
         const spinner = new events_1.Spin(sessionId, 'STARTUP', config === null || config === void 0 ? void 0 : config.disableSpins);
+        auth_1.qrManager.setConfig(config);
         try {
             if (typeof config === 'string')
                 console.error("AS OF VERSION 3+ YOU CAN NO LONGER SET THE SESSION ID AS THE FIRST PARAMETER OF CREATE. CREATE CAN ONLY TAKE A CONFIG OBJECT. IF YOU STILL HAVE CONFIGS AS A SECOND PARAMETER, THEY WILL HAVE NO EFFECT! PLEASE SEE DOCS.");
@@ -164,7 +165,8 @@ function create(config = {}) {
             if ((config === null || config === void 0 ? void 0 : config.multiDevice) && !(config === null || config === void 0 ? void 0 : config.useChrome))
                 spinner.info(`It is recommended to set useChrome: true or use the --use-chrome flag if you are experiencing issues with Multi device support`);
             waPage = yield (0, browser_1.initPage)(sessionId, config, customUserAgent, spinner);
-            spinner.succeed('Browser Launched');
+            spinner.succeed('Page loaded');
+            const browserLaunchedTs = performance.now();
             const throwOnError = config && config.throwErrorOnTosBlock == true;
             const PAGE_UA = yield waPage.evaluate('navigator.userAgent');
             const BROWSER_VERSION = yield waPage.browser().version();
@@ -211,11 +213,12 @@ function create(config = {}) {
             debugInfo.CLI = process.env.OWA_CLI && true || false;
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             spinner.succeed('Use this easy pre-filled link to report an issue: ' + (0, tools_1.generateGHIssueLink)(config, debugInfo));
+            spinner.info(`Time to injection: ${(performance.now() - browserLaunchedTs).toFixed(0)}ms`);
             if (canInjectEarly) {
                 if (attemptingReauth)
                     yield waPage.evaluate(`window.Store = {"Msg": true}`);
                 spinner.start('Injecting api');
-                waPage = yield (0, browser_1.injectApi)(waPage);
+                waPage = yield (0, browser_1.injectApi)(waPage, spinner);
                 spinner.start('WAPI injected');
             }
             else {
@@ -265,7 +268,7 @@ function create(config = {}) {
             else {
                 spinner.info('Authenticate to continue');
                 const race = [];
-                race.push((0, auth_1.smartQr)(waPage, config, spinner));
+                race.push(auth_1.qrManager.smartQr(waPage, config, spinner));
                 if ((config === null || config === void 0 ? void 0 : config.qrTimeout) !== 0) {
                     let to = ((config === null || config === void 0 ? void 0 : config.qrTimeout) || 60) * 1000;
                     if (config === null || config === void 0 ? void 0 : config.multiDevice)
@@ -300,7 +303,7 @@ function create(config = {}) {
             }
             const pre = canInjectEarly ? 'Rei' : 'I';
             spinner.start(`${pre}njecting api`);
-            waPage = yield (0, browser_1.injectApi)(waPage);
+            waPage = yield (0, browser_1.injectApi)(waPage, spinner);
             spinner.succeed(`WAPI ${pre}njected`);
             if (canInjectEarly) {
                 //check if page is valid after 5 seconds

package/dist/lib/axios.min.js

@@ -1,3 +1,3 @@
-/* axios v0.19.2 | (c) 2020 by Matt Zabriskie */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return e[r].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function r(e){var t=new s(e),n=i(s.prototype.request,t);return o.extend(n,s.prototype,t),o.extend(n,t),n}var o=n(2),i=n(3),s=n(4),a=n(22),u=n(10),c=r(u);c.Axios=s,c.create=function(e){return r(a(c.defaults,e))},c.Cancel=n(23),c.CancelToken=n(24),c.isCancel=n(9),c.all=function(e){return Promise.all(e)},c.spread=n(25),e.exports=c,e.exports.default=c},function(e,t,n){"use strict";function r(e){return"[object Array]"===j.call(e)}function o(e){return"undefined"==typeof e}function i(e){return null!==e&&!o(e)&&null!==e.constructor&&!o(e.constructor)&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)}function s(e){return"[object ArrayBuffer]"===j.call(e)}function a(e){return"undefined"!=typeof FormData&&e instanceof FormData}function u(e){var t;return t="undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer}function c(e){return"string"==typeof e}function f(e){return"number"==typeof e}function p(e){return null!==e&&"object"==typeof e}function d(e){return"[object Date]"===j.call(e)}function l(e){return"[object File]"===j.call(e)}function h(e){return"[object Blob]"===j.call(e)}function m(e){return"[object Function]"===j.call(e)}function y(e){return p(e)&&m(e.pipe)}function g(e){return"undefined"!=typeof URLSearchParams&&e instanceof URLSearchParams}function v(e){return e.replace(/^\s*/,"").replace(/\s*$/,"")}function x(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product&&"NativeScript"!==navigator.product&&"NS"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)}function w(e,t){if(null!==e&&"undefined"!=typeof e)if("object"!=typeof e&&(e=[e]),r(e))for(var n=0,o=e.length;n<o;n++)t.call(null,e[n],n,e);else for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&t.call(null,e[i],i,e)}function b(){function e(e,n){"object"==typeof t[n]&&"object"==typeof e?t[n]=b(t[n],e):t[n]=e}for(var t={},n=0,r=arguments.length;n<r;n++)w(arguments[n],e);return t}function E(){function e(e,n){"object"==typeof t[n]&&"object"==typeof e?t[n]=E(t[n],e):"object"==typeof e?t[n]=E({},e):t[n]=e}for(var t={},n=0,r=arguments.length;n<r;n++)w(arguments[n],e);return t}function S(e,t,n){return w(t,function(t,r){n&&"function"==typeof t?e[r]=C(t,n):e[r]=t}),e}var C=n(3),j=Object.prototype.toString;e.exports={isArray:r,isArrayBuffer:s,isBuffer:i,isFormData:a,isArrayBufferView:u,isString:c,isNumber:f,isObject:p,isUndefined:o,isDate:d,isFile:l,isBlob:h,isFunction:m,isStream:y,isURLSearchParams:g,isStandardBrowserEnv:x,forEach:w,merge:b,deepMerge:E,extend:S,trim:v}},function(e,t){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return e.apply(t,n)}}},function(e,t,n){"use strict";function r(e){this.defaults=e,this.interceptors={request:new s,response:new s}}var o=n(2),i=n(5),s=n(6),a=n(7),u=n(22);r.prototype.request=function(e){"string"==typeof e?(e=arguments[1]||{},e.url=arguments[0]):e=e||{},e=u(this.defaults,e),e.method?e.method=e.method.toLowerCase():this.defaults.method?e.method=this.defaults.method.toLowerCase():e.method="get";var t=[a,void 0],n=Promise.resolve(e);for(this.interceptors.request.forEach(function(e){t.unshift(e.fulfilled,e.rejected)}),this.interceptors.response.forEach(function(e){t.push(e.fulfilled,e.rejected)});t.length;)n=n.then(t.shift(),t.shift());return n},r.prototype.getUri=function(e){return e=u(this.defaults,e),i(e.url,e.params,e.paramsSerializer).replace(/^\?/,"")},o.forEach(["delete","get","head","options"],function(e){r.prototype[e]=function(t,n){return this.request(o.merge(n||{},{method:e,url:t}))}}),o.forEach(["post","put","patch"],function(e){r.prototype[e]=function(t,n,r){return this.request(o.merge(r||{},{method:e,url:t,data:n}))}}),e.exports=r},function(e,t,n){"use strict";function r(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}var o=n(2);e.exports=function(e,t,n){if(!t)return e;var i;if(n)i=n(t);else if(o.isURLSearchParams(t))i=t.toString();else{var s=[];o.forEach(t,function(e,t){null!==e&&"undefined"!=typeof e&&(o.isArray(e)?t+="[]":e=[e],o.forEach(e,function(e){o.isDate(e)?e=e.toISOString():o.isObject(e)&&(e=JSON.stringify(e)),s.push(r(t)+"="+r(e))}))}),i=s.join("&")}if(i){var a=e.indexOf("#");a!==-1&&(e=e.slice(0,a)),e+=(e.indexOf("?")===-1?"?":"&")+i}return e}},function(e,t,n){"use strict";function r(){this.handlers=[]}var o=n(2);r.prototype.use=function(e,t){return this.handlers.push({fulfilled:e,rejected:t}),this.handlers.length-1},r.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},r.prototype.forEach=function(e){o.forEach(this.handlers,function(t){null!==t&&e(t)})},e.exports=r},function(e,t,n){"use strict";function r(e){e.cancelToken&&e.cancelToken.throwIfRequested()}var o=n(2),i=n(8),s=n(9),a=n(10);e.exports=function(e){r(e),e.headers=e.headers||{},e.data=i(e.data,e.headers,e.transformRequest),e.headers=o.merge(e.headers.common||{},e.headers[e.method]||{},e.headers),o.forEach(["delete","get","head","post","put","patch","common"],function(t){delete e.headers[t]});var t=e.adapter||a.adapter;return t(e).then(function(t){return r(e),t.data=i(t.data,t.headers,e.transformResponse),t},function(t){return s(t)||(r(e),t&&t.response&&(t.response.data=i(t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)})}},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t,n){return r.forEach(n,function(n){e=n(e,t)}),e}},function(e,t){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},function(e,t,n){"use strict";function r(e,t){!i.isUndefined(e)&&i.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}function o(){var e;return"undefined"!=typeof XMLHttpRequest?e=n(12):"undefined"!=typeof process&&"[object process]"===Object.prototype.toString.call(process)&&(e=n(12)),e}var i=n(2),s=n(11),a={"Content-Type":"application/x-www-form-urlencoded"},u={adapter:o(),transformRequest:[function(e,t){return s(t,"Accept"),s(t,"Content-Type"),i.isFormData(e)||i.isArrayBuffer(e)||i.isBuffer(e)||i.isStream(e)||i.isFile(e)||i.isBlob(e)?e:i.isArrayBufferView(e)?e.buffer:i.isURLSearchParams(e)?(r(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):i.isObject(e)?(r(t,"application/json;charset=utf-8"),JSON.stringify(e)):e}],transformResponse:[function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(e){}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(e){return e>=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},i.forEach(["delete","get","head"],function(e){u.headers[e]={}}),i.forEach(["post","put","patch"],function(e){u.headers[e]=i.merge(a)}),e.exports=u},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t){r.forEach(e,function(n,r){r!==t&&r.toUpperCase()===t.toUpperCase()&&(e[t]=n,delete e[r])})}},function(e,t,n){"use strict";var r=n(2),o=n(13),i=n(5),s=n(16),a=n(19),u=n(20),c=n(14);e.exports=function(e){return new Promise(function(t,f){var p=e.data,d=e.headers;r.isFormData(p)&&delete d["Content-Type"];var l=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password||"";d.Authorization="Basic "+btoa(h+":"+m)}var y=s(e.baseURL,e.url);if(l.open(e.method.toUpperCase(),i(y,e.params,e.paramsSerializer),!0),l.timeout=e.timeout,l.onreadystatechange=function(){if(l&&4===l.readyState&&(0!==l.status||l.responseURL&&0===l.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in l?a(l.getAllResponseHeaders()):null,r=e.responseType&&"text"!==e.responseType?l.response:l.responseText,i={data:r,status:l.status,statusText:l.statusText,headers:n,config:e,request:l};o(t,f,i),l=null}},l.onabort=function(){l&&(f(c("Request aborted",e,"ECONNABORTED",l)),l=null)},l.onerror=function(){f(c("Network Error",e,null,l)),l=null},l.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),f(c(t,e,"ECONNABORTED",l)),l=null},r.isStandardBrowserEnv()){var g=n(21),v=(e.withCredentials||u(y))&&e.xsrfCookieName?g.read(e.xsrfCookieName):void 0;v&&(d[e.xsrfHeaderName]=v)}if("setRequestHeader"in l&&r.forEach(d,function(e,t){"undefined"==typeof p&&"content-type"===t.toLowerCase()?delete d[t]:l.setRequestHeader(t,e)}),r.isUndefined(e.withCredentials)||(l.withCredentials=!!e.withCredentials),e.responseType)try{l.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&l.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&l.upload&&l.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){l&&(l.abort(),f(e),l=null)}),void 0===p&&(p=null),l.send(p)})}},function(e,t,n){"use strict";var r=n(14);e.exports=function(e,t,n){var o=n.config.validateStatus;!o||o(n.status)?e(n):t(r("Request failed with status code "+n.status,n.config,null,n.request,n))}},function(e,t,n){"use strict";var r=n(15);e.exports=function(e,t,n,o,i){var s=new Error(e);return r(s,t,n,o,i)}},function(e,t){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e.isAxiosError=!0,e.toJSON=function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code}},e}},function(e,t,n){"use strict";var r=n(17),o=n(18);e.exports=function(e,t){return e&&!r(t)?o(e,t):t}},function(e,t){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},function(e,t,n){"use strict";var r=n(2),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,i,s={};return e?(r.forEach(e.split("\n"),function(e){if(i=e.indexOf(":"),t=r.trim(e.substr(0,i)).toLowerCase(),n=r.trim(e.substr(i+1)),t){if(s[t]&&o.indexOf(t)>=0)return;"set-cookie"===t?s[t]=(s[t]?s[t]:[]).concat([n]):s[t]=s[t]?s[t]+", "+n:n}}),s):s}},function(e,t,n){"use strict";var r=n(2);e.exports=r.isStandardBrowserEnv()?function(){function e(e){var t=e;return n&&(o.setAttribute("href",t),t=o.href),o.setAttribute("href",t),{href:o.href,protocol:o.protocol?o.protocol.replace(/:$/,""):"",host:o.host,search:o.search?o.search.replace(/^\?/,""):"",hash:o.hash?o.hash.replace(/^#/,""):"",hostname:o.hostname,port:o.port,pathname:"/"===o.pathname.charAt(0)?o.pathname:"/"+o.pathname}}var t,n=/(msie|trident)/i.test(navigator.userAgent),o=document.createElement("a");return t=e(window.location.href),function(n){var o=r.isString(n)?e(n):n;return o.protocol===t.protocol&&o.host===t.host}}():function(){return function(){return!0}}()},function(e,t,n){"use strict";var r=n(2);e.exports=r.isStandardBrowserEnv()?function(){return{write:function(e,t,n,o,i,s){var a=[];a.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&a.push("expires="+new Date(n).toGMTString()),r.isString(o)&&a.push("path="+o),r.isString(i)&&a.push("domain="+i),s===!0&&a.push("secure"),document.cookie=a.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t){t=t||{};var n={},o=["url","method","params","data"],i=["headers","auth","proxy"],s=["baseURL","url","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"];r.forEach(o,function(e){"undefined"!=typeof t[e]&&(n[e]=t[e])}),r.forEach(i,function(o){r.isObject(t[o])?n[o]=r.deepMerge(e[o],t[o]):"undefined"!=typeof t[o]?n[o]=t[o]:r.isObject(e[o])?n[o]=r.deepMerge(e[o]):"undefined"!=typeof e[o]&&(n[o]=e[o])}),r.forEach(s,function(r){"undefined"!=typeof t[r]?n[r]=t[r]:"undefined"!=typeof e[r]&&(n[r]=e[r])});var a=o.concat(i).concat(s),u=Object.keys(t).filter(function(e){return a.indexOf(e)===-1});return r.forEach(u,function(r){"undefined"!=typeof t[r]?n[r]=t[r]:"undefined"!=typeof e[r]&&(n[r]=e[r])}),n}},function(e,t){"use strict";function n(e){this.message=e}n.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},n.prototype.__CANCEL__=!0,e.exports=n},function(e,t,n){"use strict";function r(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise(function(e){t=e});var n=this;e(function(e){n.reason||(n.reason=new o(e),t(n.reason))})}var o=n(23);r.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},r.source=function(){var e,t=new r(function(t){e=t});return{token:t,cancel:e}},e.exports=r},function(e,t){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}}])});
+/* axios v0.25.0 | (c) 2022 by Matt Zabriskie */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=11)}([function(e,t,n){"use strict";var r=n(3),o=Object.prototype.toString;function i(e){return"[object Array]"===o.call(e)}function s(e){return void 0===e}function a(e){return null!==e&&"object"==typeof e}function u(e){if("[object Object]"!==o.call(e))return!1;var t=Object.getPrototypeOf(e);return null===t||t===Object.prototype}function c(e){return"[object Function]"===o.call(e)}function f(e,t){if(null!=e)if("object"!=typeof e&&(e=[e]),i(e))for(var n=0,r=e.length;n<r;n++)t.call(null,e[n],n,e);else for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(null,e[o],o,e)}e.exports={isArray:i,isArrayBuffer:function(e){return"[object ArrayBuffer]"===o.call(e)},isBuffer:function(e){return null!==e&&!s(e)&&null!==e.constructor&&!s(e.constructor)&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)},isFormData:function(e){return"undefined"!=typeof FormData&&e instanceof FormData},isArrayBufferView:function(e){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer},isString:function(e){return"string"==typeof e},isNumber:function(e){return"number"==typeof e},isObject:a,isPlainObject:u,isUndefined:s,isDate:function(e){return"[object Date]"===o.call(e)},isFile:function(e){return"[object File]"===o.call(e)},isBlob:function(e){return"[object Blob]"===o.call(e)},isFunction:c,isStream:function(e){return a(e)&&c(e.pipe)},isURLSearchParams:function(e){return"undefined"!=typeof URLSearchParams&&e instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product&&"NativeScript"!==navigator.product&&"NS"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)},forEach:f,merge:function e(){var t={};function n(n,r){u(t[r])&&u(n)?t[r]=e(t[r],n):u(n)?t[r]=e({},n):i(n)?t[r]=n.slice():t[r]=n}for(var r=0,o=arguments.length;r<o;r++)f(arguments[r],n);return t},extend:function(e,t,n){return f(t,(function(t,o){e[o]=n&&"function"==typeof t?r(t,n):t})),e},trim:function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")},stripBOM:function(e){return 65279===e.charCodeAt(0)&&(e=e.slice(1)),e}}},function(e,t,n){"use strict";var r=n(0),o=n(17),i=n(5),s={"Content-Type":"application/x-www-form-urlencoded"};function a(e,t){!r.isUndefined(e)&&r.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}var u,c={transitional:{silentJSONParsing:!0,forcedJSONParsing:!0,clarifyTimeoutError:!1},adapter:(("undefined"!=typeof XMLHttpRequest||"undefined"!=typeof process&&"[object process]"===Object.prototype.toString.call(process))&&(u=n(6)),u),transformRequest:[function(e,t){return o(t,"Accept"),o(t,"Content-Type"),r.isFormData(e)||r.isArrayBuffer(e)||r.isBuffer(e)||r.isStream(e)||r.isFile(e)||r.isBlob(e)?e:r.isArrayBufferView(e)?e.buffer:r.isURLSearchParams(e)?(a(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):r.isObject(e)||t&&"application/json"===t["Content-Type"]?(a(t,"application/json"),function(e,t,n){if(r.isString(e))try{return(t||JSON.parse)(e),r.trim(e)}catch(e){if("SyntaxError"!==e.name)throw e}return(n||JSON.stringify)(e)}(e)):e}],transformResponse:[function(e){var t=this.transitional||c.transitional,n=t&&t.silentJSONParsing,o=t&&t.forcedJSONParsing,s=!n&&"json"===this.responseType;if(s||o&&r.isString(e)&&e.length)try{return JSON.parse(e)}catch(e){if(s){if("SyntaxError"===e.name)throw i(e,this,"E_JSON_PARSE");throw e}}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,validateStatus:function(e){return e>=200&&e<300},headers:{common:{Accept:"application/json, text/plain, */*"}}};r.forEach(["delete","get","head"],(function(e){c.headers[e]={}})),r.forEach(["post","put","patch"],(function(e){c.headers[e]=r.merge(s)})),e.exports=c},function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},function(e,t,n){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return e.apply(t,n)}}},function(e,t,n){"use strict";var r=n(0);function o(e){return encodeURIComponent(e).replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}e.exports=function(e,t,n){if(!t)return e;var i;if(n)i=n(t);else if(r.isURLSearchParams(t))i=t.toString();else{var s=[];r.forEach(t,(function(e,t){null!=e&&(r.isArray(e)?t+="[]":e=[e],r.forEach(e,(function(e){r.isDate(e)?e=e.toISOString():r.isObject(e)&&(e=JSON.stringify(e)),s.push(o(t)+"="+o(e))})))})),i=s.join("&")}if(i){var a=e.indexOf("#");-1!==a&&(e=e.slice(0,a)),e+=(-1===e.indexOf("?")?"?":"&")+i}return e}},function(e,t,n){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e.isAxiosError=!0,e.toJSON=function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code,status:this.response&&this.response.status?this.response.status:null}},e}},function(e,t,n){"use strict";var r=n(0),o=n(18),i=n(19),s=n(4),a=n(20),u=n(23),c=n(24),f=n(7),l=n(1),p=n(2);e.exports=function(e){return new Promise((function(t,n){var d,h=e.data,m=e.headers,v=e.responseType;function y(){e.cancelToken&&e.cancelToken.unsubscribe(d),e.signal&&e.signal.removeEventListener("abort",d)}r.isFormData(h)&&delete m["Content-Type"];var g=new XMLHttpRequest;if(e.auth){var b=e.auth.username||"",x=e.auth.password?unescape(encodeURIComponent(e.auth.password)):"";m.Authorization="Basic "+btoa(b+":"+x)}var w=a(e.baseURL,e.url);function E(){if(g){var r="getAllResponseHeaders"in g?u(g.getAllResponseHeaders()):null,i={data:v&&"text"!==v&&"json"!==v?g.response:g.responseText,status:g.status,statusText:g.statusText,headers:r,config:e,request:g};o((function(e){t(e),y()}),(function(e){n(e),y()}),i),g=null}}if(g.open(e.method.toUpperCase(),s(w,e.params,e.paramsSerializer),!0),g.timeout=e.timeout,"onloadend"in g?g.onloadend=E:g.onreadystatechange=function(){g&&4===g.readyState&&(0!==g.status||g.responseURL&&0===g.responseURL.indexOf("file:"))&&setTimeout(E)},g.onabort=function(){g&&(n(f("Request aborted",e,"ECONNABORTED",g)),g=null)},g.onerror=function(){n(f("Network Error",e,null,g)),g=null},g.ontimeout=function(){var t=e.timeout?"timeout of "+e.timeout+"ms exceeded":"timeout exceeded",r=e.transitional||l.transitional;e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),n(f(t,e,r.clarifyTimeoutError?"ETIMEDOUT":"ECONNABORTED",g)),g=null},r.isStandardBrowserEnv()){var S=(e.withCredentials||c(w))&&e.xsrfCookieName?i.read(e.xsrfCookieName):void 0;S&&(m[e.xsrfHeaderName]=S)}"setRequestHeader"in g&&r.forEach(m,(function(e,t){void 0===h&&"content-type"===t.toLowerCase()?delete m[t]:g.setRequestHeader(t,e)})),r.isUndefined(e.withCredentials)||(g.withCredentials=!!e.withCredentials),v&&"json"!==v&&(g.responseType=e.responseType),"function"==typeof e.onDownloadProgress&&g.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&g.upload&&g.upload.addEventListener("progress",e.onUploadProgress),(e.cancelToken||e.signal)&&(d=function(e){g&&(n(!e||e&&e.type?new p("canceled"):e),g.abort(),g=null)},e.cancelToken&&e.cancelToken.subscribe(d),e.signal&&(e.signal.aborted?d():e.signal.addEventListener("abort",d))),h||(h=null),g.send(h)}))}},function(e,t,n){"use strict";var r=n(5);e.exports=function(e,t,n,o,i){var s=new Error(e);return r(s,t,n,o,i)}},function(e,t,n){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},function(e,t,n){"use strict";var r=n(0);e.exports=function(e,t){t=t||{};var n={};function o(e,t){return r.isPlainObject(e)&&r.isPlainObject(t)?r.merge(e,t):r.isPlainObject(t)?r.merge({},t):r.isArray(t)?t.slice():t}function i(n){return r.isUndefined(t[n])?r.isUndefined(e[n])?void 0:o(void 0,e[n]):o(e[n],t[n])}function s(e){if(!r.isUndefined(t[e]))return o(void 0,t[e])}function a(n){return r.isUndefined(t[n])?r.isUndefined(e[n])?void 0:o(void 0,e[n]):o(void 0,t[n])}function u(n){return n in t?o(e[n],t[n]):n in e?o(void 0,e[n]):void 0}var c={url:s,method:s,data:s,baseURL:a,transformRequest:a,transformResponse:a,paramsSerializer:a,timeout:a,timeoutMessage:a,withCredentials:a,adapter:a,responseType:a,xsrfCookieName:a,xsrfHeaderName:a,onUploadProgress:a,onDownloadProgress:a,decompress:a,maxContentLength:a,maxBodyLength:a,transport:a,httpAgent:a,httpsAgent:a,cancelToken:a,socketPath:a,responseEncoding:a,validateStatus:u};return r.forEach(Object.keys(e).concat(Object.keys(t)),(function(e){var t=c[e]||i,o=t(e);r.isUndefined(o)&&t!==u||(n[e]=o)})),n}},function(e,t){e.exports={version:"0.24.0"}},function(e,t,n){e.exports=n(12)},function(e,t,n){"use strict";var r=n(0),o=n(3),i=n(13),s=n(9);var a=function e(t){var n=new i(t),a=o(i.prototype.request,n);return r.extend(a,i.prototype,n),r.extend(a,n),a.create=function(n){return e(s(t,n))},a}(n(1));a.Axios=i,a.Cancel=n(2),a.CancelToken=n(26),a.isCancel=n(8),a.VERSION=n(10).version,a.all=function(e){return Promise.all(e)},a.spread=n(27),a.isAxiosError=n(28),e.exports=a,e.exports.default=a},function(e,t,n){"use strict";var r=n(0),o=n(4),i=n(14),s=n(15),a=n(9),u=n(25),c=u.validators;function f(e){this.defaults=e,this.interceptors={request:new i,response:new i}}f.prototype.request=function(e){"string"==typeof e?(e=arguments[1]||{}).url=arguments[0]:e=e||{},(e=a(this.defaults,e)).method?e.method=e.method.toLowerCase():this.defaults.method?e.method=this.defaults.method.toLowerCase():e.method="get";var t=e.transitional;void 0!==t&&u.assertOptions(t,{silentJSONParsing:c.transitional(c.boolean),forcedJSONParsing:c.transitional(c.boolean),clarifyTimeoutError:c.transitional(c.boolean)},!1);var n=[],r=!0;this.interceptors.request.forEach((function(t){"function"==typeof t.runWhen&&!1===t.runWhen(e)||(r=r&&t.synchronous,n.unshift(t.fulfilled,t.rejected))}));var o,i=[];if(this.interceptors.response.forEach((function(e){i.push(e.fulfilled,e.rejected)})),!r){var f=[s,void 0];for(Array.prototype.unshift.apply(f,n),f=f.concat(i),o=Promise.resolve(e);f.length;)o=o.then(f.shift(),f.shift());return o}for(var l=e;n.length;){var p=n.shift(),d=n.shift();try{l=p(l)}catch(e){d(e);break}}try{o=s(l)}catch(e){return Promise.reject(e)}for(;i.length;)o=o.then(i.shift(),i.shift());return o},f.prototype.getUri=function(e){return e=a(this.defaults,e),o(e.url,e.params,e.paramsSerializer).replace(/^\?/,"")},r.forEach(["delete","get","head","options"],(function(e){f.prototype[e]=function(t,n){return this.request(a(n||{},{method:e,url:t,data:(n||{}).data}))}})),r.forEach(["post","put","patch"],(function(e){f.prototype[e]=function(t,n,r){return this.request(a(r||{},{method:e,url:t,data:n}))}})),e.exports=f},function(e,t,n){"use strict";var r=n(0);function o(){this.handlers=[]}o.prototype.use=function(e,t,n){return this.handlers.push({fulfilled:e,rejected:t,synchronous:!!n&&n.synchronous,runWhen:n?n.runWhen:null}),this.handlers.length-1},o.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},o.prototype.forEach=function(e){r.forEach(this.handlers,(function(t){null!==t&&e(t)}))},e.exports=o},function(e,t,n){"use strict";var r=n(0),o=n(16),i=n(8),s=n(1),a=n(2);function u(e){if(e.cancelToken&&e.cancelToken.throwIfRequested(),e.signal&&e.signal.aborted)throw new a("canceled")}e.exports=function(e){return u(e),e.headers=e.headers||{},e.data=o.call(e,e.data,e.headers,e.transformRequest),e.headers=r.merge(e.headers.common||{},e.headers[e.method]||{},e.headers),r.forEach(["delete","get","head","post","put","patch","common"],(function(t){delete e.headers[t]})),(e.adapter||s.adapter)(e).then((function(t){return u(e),t.data=o.call(e,t.data,t.headers,e.transformResponse),t}),(function(t){return i(t)||(u(e),t&&t.response&&(t.response.data=o.call(e,t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)}))}},function(e,t,n){"use strict";var r=n(0),o=n(1);e.exports=function(e,t,n){var i=this||o;return r.forEach(n,(function(n){e=n.call(i,e,t)})),e}},function(e,t,n){"use strict";var r=n(0);e.exports=function(e,t){r.forEach(e,(function(n,r){r!==t&&r.toUpperCase()===t.toUpperCase()&&(e[t]=n,delete e[r])}))}},function(e,t,n){"use strict";var r=n(7);e.exports=function(e,t,n){var o=n.config.validateStatus;n.status&&o&&!o(n.status)?t(r("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},function(e,t,n){"use strict";var r=n(0);e.exports=r.isStandardBrowserEnv()?{write:function(e,t,n,o,i,s){var a=[];a.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&a.push("expires="+new Date(n).toGMTString()),r.isString(o)&&a.push("path="+o),r.isString(i)&&a.push("domain="+i),!0===s&&a.push("secure"),document.cookie=a.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},function(e,t,n){"use strict";var r=n(21),o=n(22);e.exports=function(e,t){return e&&!r(t)?o(e,t):t}},function(e,t,n){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t,n){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},function(e,t,n){"use strict";var r=n(0),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,i,s={};return e?(r.forEach(e.split("\n"),(function(e){if(i=e.indexOf(":"),t=r.trim(e.substr(0,i)).toLowerCase(),n=r.trim(e.substr(i+1)),t){if(s[t]&&o.indexOf(t)>=0)return;s[t]="set-cookie"===t?(s[t]?s[t]:[]).concat([n]):s[t]?s[t]+", "+n:n}})),s):s}},function(e,t,n){"use strict";var r=n(0);e.exports=r.isStandardBrowserEnv()?function(){var e,t=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function o(e){var r=e;return t&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return e=o(window.location.href),function(t){var n=r.isString(t)?o(t):t;return n.protocol===e.protocol&&n.host===e.host}}():function(){return!0}},function(e,t,n){"use strict";var r=n(10).version,o={};["object","boolean","number","function","string","symbol"].forEach((function(e,t){o[e]=function(n){return typeof n===e||"a"+(t<1?"n ":" ")+e}}));var i={};o.transitional=function(e,t,n){function o(e,t){return"[Axios v"+r+"] Transitional option '"+e+"'"+t+(n?". "+n:"")}return function(n,r,s){if(!1===e)throw new Error(o(r," has been removed"+(t?" in "+t:"")));return t&&!i[r]&&(i[r]=!0,console.warn(o(r," has been deprecated since v"+t+" and will be removed in the near future"))),!e||e(n,r,s)}},e.exports={assertOptions:function(e,t,n){if("object"!=typeof e)throw new TypeError("options must be an object");for(var r=Object.keys(e),o=r.length;o-- >0;){var i=r[o],s=t[i];if(s){var a=e[i],u=void 0===a||s(a,i,e);if(!0!==u)throw new TypeError("option "+i+" must be "+u)}else if(!0!==n)throw Error("Unknown option "+i)}},validators:o}},function(e,t,n){"use strict";var r=n(2);function o(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise((function(e){t=e}));var n=this;this.promise.then((function(e){if(n._listeners){var t,r=n._listeners.length;for(t=0;t<r;t++)n._listeners[t](e);n._listeners=null}})),this.promise.then=function(e){var t,r=new Promise((function(e){n.subscribe(e),t=e})).then(e);return r.cancel=function(){n.unsubscribe(t)},r},e((function(e){n.reason||(n.reason=new r(e),t(n.reason))}))}o.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},o.prototype.subscribe=function(e){this.reason?e(this.reason):this._listeners?this._listeners.push(e):this._listeners=[e]},o.prototype.unsubscribe=function(e){if(this._listeners){var t=this._listeners.indexOf(e);-1!==t&&this._listeners.splice(t,1)}},o.source=function(){var e;return{token:new o((function(t){e=t})),cancel:e}},e.exports=o},function(e,t,n){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}},function(e,t,n){"use strict";e.exports=function(e){return"object"==typeof e&&!0===e.isAxiosError}}])}));
 //# sourceMappingURL=axios.min.map

package/dist/lib/base64.js

@@ -1,224 +1 @@
-/*
- *  base64.js
- *
- *  Licensed under the BSD 3-Clause License.
- *    http://opensource.org/licenses/BSD-3-Clause
- *
- *  References:
- *    http://en.wikipedia.org/wiki/Base64
- */
-;(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined'
-        ? module.exports = factory(global)
-        : typeof define === 'function' && define.amd
-        ? define(factory) : factory(global)
-}((
-    typeof self !== 'undefined' ? self
-        : typeof window !== 'undefined' ? window
-        : typeof global !== 'undefined' ? global
-: this
-), function(global) {
-    'use strict';
-    // existing version for noConflict()
-    global = global || {};
-    var _Base64 = global.Base64;
-    var version = "2.5.2";
-    // if node.js and NOT React Native, we use Buffer
-    var buffer;
-    if (typeof module !== 'undefined' && module.exports) {
-        try {
-            buffer = eval("require('buffer').Buffer");
-        } catch (err) {
-            buffer = undefined;
-        }
-    }
-    // constants
-    var b64chars
-        = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-    var b64tab = function(bin) {
-        var t = {};
-        for (var i = 0, l = bin.length; i < l; i++) t[bin.charAt(i)] = i;
-        return t;
-    }(b64chars);
-    var fromCharCode = String.fromCharCode;
-    // encoder stuff
-    var cb_utob = function(c) {
-        if (c.length < 2) {
-            var cc = c.charCodeAt(0);
-            return cc < 0x80 ? c
-                : cc < 0x800 ? (fromCharCode(0xc0 | (cc >>> 6))
-                                + fromCharCode(0x80 | (cc & 0x3f)))
-                : (fromCharCode(0xe0 | ((cc >>> 12) & 0x0f))
-                    + fromCharCode(0x80 | ((cc >>>  6) & 0x3f))
-                    + fromCharCode(0x80 | ( cc         & 0x3f)));
-        } else {
-            var cc = 0x10000
-                + (c.charCodeAt(0) - 0xD800) * 0x400
-                + (c.charCodeAt(1) - 0xDC00);
-            return (fromCharCode(0xf0 | ((cc >>> 18) & 0x07))
-                    + fromCharCode(0x80 | ((cc >>> 12) & 0x3f))
-                    + fromCharCode(0x80 | ((cc >>>  6) & 0x3f))
-                    + fromCharCode(0x80 | ( cc         & 0x3f)));
-        }
-    };
-    var re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
-    var utob = function(u) {
-        return u.replace(re_utob, cb_utob);
-    };
-    var cb_encode = function(ccc) {
-        var padlen = [0, 2, 1][ccc.length % 3],
-        ord = ccc.charCodeAt(0) << 16
-            | ((ccc.length > 1 ? ccc.charCodeAt(1) : 0) << 8)
-            | ((ccc.length > 2 ? ccc.charCodeAt(2) : 0)),
-        chars = [
-            b64chars.charAt( ord >>> 18),
-            b64chars.charAt((ord >>> 12) & 63),
-            padlen >= 2 ? '=' : b64chars.charAt((ord >>> 6) & 63),
-            padlen >= 1 ? '=' : b64chars.charAt(ord & 63)
-        ];
-        return chars.join('');
-    };
-    var btoa = global.btoa ? function(b) {
-        return global.btoa(b);
-    } : function(b) {
-        return b.replace(/[\s\S]{1,3}/g, cb_encode);
-    };
-    var _encode = function(u) {
-        var isUint8Array = Object.prototype.toString.call(u) === '[object Uint8Array]';
-        return isUint8Array ? u.toString('base64')
-            : btoa(utob(String(u)));
-    }
-    var encode = function(u, urisafe) {
-        return !urisafe
-            ? _encode(u)
-            : _encode(String(u)).replace(/[+\/]/g, function(m0) {
-                return m0 == '+' ? '-' : '_';
-            }).replace(/=/g, '');
-    };
-    var encodeURI = function(u) { return encode(u, true) };
-    // decoder stuff
-    var re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
-    var cb_btou = function(cccc) {
-        switch(cccc.length) {
-        case 4:
-            var cp = ((0x07 & cccc.charCodeAt(0)) << 18)
-                |    ((0x3f & cccc.charCodeAt(1)) << 12)
-                |    ((0x3f & cccc.charCodeAt(2)) <<  6)
-                |     (0x3f & cccc.charCodeAt(3)),
-            offset = cp - 0x10000;
-            return (fromCharCode((offset  >>> 10) + 0xD800)
-                    + fromCharCode((offset & 0x3FF) + 0xDC00));
-        case 3:
-            return fromCharCode(
-                ((0x0f & cccc.charCodeAt(0)) << 12)
-                    | ((0x3f & cccc.charCodeAt(1)) << 6)
-                    |  (0x3f & cccc.charCodeAt(2))
-            );
-        default:
-            return  fromCharCode(
-                ((0x1f & cccc.charCodeAt(0)) << 6)
-                    |  (0x3f & cccc.charCodeAt(1))
-            );
-        }
-    };
-    var btou = function(b) {
-        return b.replace(re_btou, cb_btou);
-    };
-    var cb_decode = function(cccc) {
-        var len = cccc.length,
-        padlen = len % 4,
-        n = (len > 0 ? b64tab[cccc.charAt(0)] << 18 : 0)
-            | (len > 1 ? b64tab[cccc.charAt(1)] << 12 : 0)
-            | (len > 2 ? b64tab[cccc.charAt(2)] <<  6 : 0)
-            | (len > 3 ? b64tab[cccc.charAt(3)]       : 0),
-        chars = [
-            fromCharCode( n >>> 16),
-            fromCharCode((n >>>  8) & 0xff),
-            fromCharCode( n         & 0xff)
-        ];
-        chars.length -= [0, 0, 2, 1][padlen];
-        return chars.join('');
-    };
-    var _atob = global.atob ? function(a) {
-        return global.atob(a);
-    } : function(a){
-        return a.replace(/\S{1,4}/g, cb_decode);
-    };
-    var atob = function(a) {
-        return _atob(String(a).replace(/[^A-Za-z0-9\+\/]/g, ''));
-    };
-    var _decode = buffer ?
-        buffer.from && Uint8Array && buffer.from !== Uint8Array.from
-        ? function(a) {
-            return (a.constructor === buffer.constructor
-                    ? a : buffer.from(a, 'base64')).toString();
-        }
-        : function(a) {
-            return (a.constructor === buffer.constructor
-                    ? a : new buffer(a, 'base64')).toString();
-        }
-        : function(a) { return btou(_atob(a)) };
-    var decode = function(a){
-        return _decode(
-            String(a).replace(/[-_]/g, function(m0) { return m0 == '-' ? '+' : '/' })
-                .replace(/[^A-Za-z0-9\+\/]/g, '')
-        );
-    };
-    var noConflict = function() {
-        var Base64 = global.Base64;
-        global.Base64 = _Base64;
-        return Base64;
-    };
-    // export Base64
-    global.Base64 = {
-        VERSION: version,
-        atob: atob,
-        btoa: btoa,
-        fromBase64: decode,
-        toBase64: encode,
-        utob: utob,
-        encode: encode,
-        encodeURI: encodeURI,
-        btou: btou,
-        decode: decode,
-        noConflict: noConflict,
-        __buffer__: buffer
-    };
-    // if ES5 is available, make Base64.extendString() available
-    if (typeof Object.defineProperty === 'function') {
-        var noEnum = function(v){
-            return {value:v,enumerable:false,writable:true,configurable:true};
-        };
-        global.Base64.extendString = function () {
-            Object.defineProperty(
-                String.prototype, 'fromBase64', noEnum(function () {
-                    return decode(this)
-                }));
-            Object.defineProperty(
-                String.prototype, 'toBase64', noEnum(function (urisafe) {
-                    return encode(this, urisafe)
-                }));
-            Object.defineProperty(
-                String.prototype, 'toBase64URI', noEnum(function () {
-                    return encode(this, true)
-                }));
-        };
-    }
-    //
-    // export Base64 to the namespace
-    //
-    if (global['Meteor']) { // Meteor.js
-        Base64 = global.Base64;
-    }
-    // module.exports and AMD are mutually exclusive.
-    // module.exports has precedence.
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports.Base64 = global.Base64;
-    }
-    else if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define([], function(){ return global.Base64 });
-    }
-    // that's it!
-    return {Base64: global.Base64}
-}));
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(e):"function"==typeof define&&define.amd?define(o):o(e)}("undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:this,function(global){"use strict";global=global||{};var _Base64=global.Base64,version="2.5.2",buffer;if("undefined"!=typeof module&&module.exports)try{buffer=eval("require('buffer').Buffer")}catch(e){buffer=void 0}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",b64tab=function(e){for(var o={},r=0,t=e.length;r<t;r++)o[e.charAt(r)]=r;return o}(b64chars),fromCharCode=String.fromCharCode,cb_utob=function(e){if(e.length<2)return(o=e.charCodeAt(0))<128?e:o<2048?fromCharCode(192|o>>>6)+fromCharCode(128|63&o):fromCharCode(224|o>>>12&15)+fromCharCode(128|o>>>6&63)+fromCharCode(128|63&o);var o=65536+1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320);return fromCharCode(240|o>>>18&7)+fromCharCode(128|o>>>12&63)+fromCharCode(128|o>>>6&63)+fromCharCode(128|63&o)},re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g,utob=function(e){return e.replace(re_utob,cb_utob)},cb_encode=function(e){var o=[0,2,1][e.length%3],r=e.charCodeAt(0)<<16|(e.length>1?e.charCodeAt(1):0)<<8|(e.length>2?e.charCodeAt(2):0);return[b64chars.charAt(r>>>18),b64chars.charAt(r>>>12&63),o>=2?"=":b64chars.charAt(r>>>6&63),o>=1?"=":b64chars.charAt(63&r)].join("")},btoa=global.btoa?function(e){return global.btoa(e)}:function(e){return e.replace(/[\s\S]{1,3}/g,cb_encode)},_encode=function(e){return"[object Uint8Array]"===Object.prototype.toString.call(e)?e.toString("base64"):btoa(utob(String(e)))},encode=function(e,o){return o?_encode(String(e)).replace(/[+\/]/g,function(e){return"+"==e?"-":"_"}).replace(/=/g,""):_encode(e)},encodeURI=function(e){return encode(e,!0)},re_btou=/[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g,cb_btou=function(e){switch(e.length){case 4:var o=((7&e.charCodeAt(0))<<18|(63&e.charCodeAt(1))<<12|(63&e.charCodeAt(2))<<6|63&e.charCodeAt(3))-65536;return fromCharCode(55296+(o>>>10))+fromCharCode(56320+(1023&o));case 3:return fromCharCode((15&e.charCodeAt(0))<<12|(63&e.charCodeAt(1))<<6|63&e.charCodeAt(2));default:return fromCharCode((31&e.charCodeAt(0))<<6|63&e.charCodeAt(1))}},btou=function(e){return e.replace(re_btou,cb_btou)},cb_decode=function(e){var o=e.length,r=o%4,t=(o>0?b64tab[e.charAt(0)]<<18:0)|(o>1?b64tab[e.charAt(1)]<<12:0)|(o>2?b64tab[e.charAt(2)]<<6:0)|(o>3?b64tab[e.charAt(3)]:0),n=[fromCharCode(t>>>16),fromCharCode(t>>>8&255),fromCharCode(255&t)];return n.length-=[0,0,2,1][r],n.join("")},_atob=global.atob?function(e){return global.atob(e)}:function(e){return e.replace(/\S{1,4}/g,cb_decode)},atob=function(e){return _atob(String(e).replace(/[^A-Za-z0-9\+\/]/g,""))},_decode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(e){return(e.constructor===buffer.constructor?e:buffer.from(e,"base64")).toString()}:function(e){return(e.constructor===buffer.constructor?e:new buffer(e,"base64")).toString()}:function(e){return btou(_atob(e))},decode=function(e){return _decode(String(e).replace(/[-_]/g,function(e){return"-"==e?"+":"/"}).replace(/[^A-Za-z0-9\+\/]/g,""))},noConflict=function(){var e=global.Base64;return global.Base64=_Base64,e};if(global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict,__buffer__:buffer},"function"==typeof Object.defineProperty){var noEnum=function(e){return{value:e,enumerable:!1,writable:!0,configurable:!0}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)})),Object.defineProperty(String.prototype,"toBase64",noEnum(function(e){return encode(this,e)})),Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,!0)}))}}return global.Meteor&&(Base64=global.Base64),"undefined"!=typeof module&&module.exports?module.exports.Base64=global.Base64:"function"==typeof define&&define.amd&&define([],function(){return global.Base64}),{Base64:global.Base64}});

package/dist/utils/tools.d.ts

@@ -27,5 +27,6 @@ export declare const getDUrl: (url: string, optionsOverride?: AxiosRequestConfig
  */
 export declare const base64MimeType: (dUrl: DataURL) => string;
 export declare const processSend: (message: string) => void;
+export declare function timePromise(fn: () => Promise<any>): Promise<string>;
 export declare const processSendData: (data?: any) => void;
 export declare const generateGHIssueLink: (config: ConfigObject, sessionInfo: SessionInfo, extras?: any) => string;

package/dist/utils/tools.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGHIssueLink = exports.processSendData = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = exports.timeout = void 0;
+exports.generateGHIssueLink = exports.processSendData = exports.timePromise = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = exports.timeout = void 0;
 const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
 //@ts-ignore
@@ -138,6 +138,14 @@ const processSend = (message) => {
     return;
 };
 exports.processSend = processSend;
+function timePromise(fn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const start = performance.now();
+        yield fn();
+        return (performance.now() - start).toFixed(0);
+    });
+}
+exports.timePromise = timePromise;
 const processSendData = (data = {}) => {
     process.send({
         type: 'process:msg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.28.11",
+  "version": "4.30.0",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -60,6 +60,9 @@
     "node": ">=12.18.3",
     "npm": ">=7.9.0"
   },
+  "resolutions": {
+    "colors": "1.4.0"
+  },
   "devDependencies": {
     "@types/changelog-parser": "^2.7.1",
     "@types/command-line-args": "^5.0.0",
@@ -81,6 +84,7 @@
     "auto-changelog": "^2.0.0",
     "ava": "^3.13.0",
     "changelog-parser": "^2.8.0",
+    "typeconv": "^1.7.0",
     "command-line-args": "^5.1.1",
     "eslint": "^8.1.0",
     "husky": "^7.0.0",
@@ -94,6 +98,7 @@
     "shelljs": "^0.8.3",
     "ts-node": "^10.0.0",
     "tsc-watch": "^4.0.0",
+    "tiny-glob": "^0.2.9",
     "typedoc": "^0.21.6",
     "typedoc-plugin-pages": "^1.0.1",
     "typescript": "^4.2.4"
@@ -156,13 +161,11 @@
     "swagger-ui-express": "^4.1.4",
     "tcp-port-used": "^1.0.1",
     "terminal-link": "^2.1.1",
-    "tiny-glob": "^0.2.9",
+    "terminate": "^2.5.0",
     "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",
-    "typeconv": "^1.7.0",
     "update-notifier": "^5.0.0",
     "uuid": "^8.3.2",
     "uuid-apikey": "^1.5.3",