@open-wa/wa-automate 4.31.2 → 4.31.6

package/dist/api/Client.js

@@ -3395,7 +3395,7 @@ class Client {
                                         const t = ((0, tools_1.now)() - whStart).toFixed(0);
                                         logging_1.log.info("Client Webhook", event, status, t);
                                     })
-                                        .catch(err => logging_1.log.error(`WEBHOOK ERROR: `, url, err.message));
+                                        .catch(err => logging_1.log.error(`CLIENT WEBHOOK ERROR: `, url, err.message));
                                 }));
                             }));
                         }), 10000);

package/dist/cli/cli-options.js

@@ -38,6 +38,11 @@ exports.optionList = [{
         typeLabel: '{blue {underline 8080}}',
         description: "Set the port for the api. Default to 8002."
     },
+    {
+        name: 'forcePort',
+        type: Number,
+        description: "Sometimes --port is overridden by environmental variables or the config file. Use this flag to force the port to be used."
+    },
     {
         name: 'api-host',
         type: String,
@@ -59,6 +64,13 @@ exports.optionList = [{
         typeLabel: '{yellow {underline https://webhook.site/....}}',
         description: "Webhook to use for the listeners."
     },
+    {
+        name: 'verbose',
+        alias: 'v',
+        default: false,
+        type: Boolean,
+        description: "Enable console transport for internal logger."
+    },
     {
         name: 'ev',
         alias: 'e',

package/dist/cli/index.js

@@ -34,7 +34,7 @@ const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
                 sessionId: config.sessionId,
                 namespace: "READY"
             }
-        }).catch(err => index_1.log.error(`WEBHOOK ERROR: ${config.readyWebhook} ${err.message}`));
+        }).catch(err => index_1.log.error(`READY WEBHOOK ERROR: ${config.readyWebhook} ${err.message}`));
 });
 function start() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -93,7 +93,7 @@ function start() {
                     }).then(({ status }) => {
                         const t = ((0, index_1.now)() - whStart).toFixed(0);
                         index_1.log.info("EV Webhook", namespace, status, t);
-                    }).catch(err => index_1.log.error(`WEBHOOK ERROR: ${cliConfig.ev} ${err.message}`));
+                    }).catch(err => index_1.log.error(`EV WEBHOOK ERROR: ${cliConfig.ev} ${err.message}`));
                 }));
         }
         //These things can be done before the client is created

package/dist/cli/setup.js

@@ -161,11 +161,15 @@ const cli = () => {
     cli_options_1.optionList.filter(option => option.default);
     const cliConfig = Object.assign(Object.assign(Object.assign({ sessionId: "session" }, nonCliConfigs), _cli.flags), exports.optionKeysWithDefalts.reduce((p, c) => nonCliConfigs.hasOwnProperty(c) ? Object.assign(Object.assign({}, p), { [c]: nonCliConfigs[c] }) : p, {}));
     //firstly set up logger
-    if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) {
+    if ((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) || (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.verbose)) {
+        if (!(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) && (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.verbose))
+            cliConfig.logging = [];
+        if ((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) && !((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) || []).find(transport => transport.type === "console"))
+            cliConfig.logging.push({ type: 'console' });
         if (Array.isArray(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging))
             cliConfig.logging = (0, logging_1.setupLogging)(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging, `easy-api-${(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.sessionId) || 'session'}`);
     }
-    const PORT = Number(cliConfig.port || process.env.PORT || 8080);
+    const PORT = Number((typeof cliConfig.forcePort === "boolean" && cliConfig.forcePort ? process.env.PORT : cliConfig.forcePort) || cliConfig.port || process.env.PORT || 8080);
     const spinner = new events_1.Spin(cliConfig.sessionId, 'STARTUP', cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.disableSpins);
     const createConfig = Object.assign({}, cliConfig);
     if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.session) {
@@ -234,7 +238,12 @@ const cli = () => {
     if (cliConfig.apiHost) {
         cliConfig.apiHost = cliConfig.apiHost.replace(/\/$/, '');
     }
+    /**
+     * Check the port in the config
+     */
+    cliConfig.port = PORT;
     if (cliConfig.debug) {
+        spinner.succeed(`DEBUG - PORT: ${PORT}`);
         spinner.succeed(`DEBUG - flags: ${JSON.stringify(cliConfig)}`);
         const WA_ENV = {};
         Object.keys(process.env).map(k => {

package/dist/controllers/browser.js

@@ -132,14 +132,19 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
         if (interceptAuthentication || proxyAddr || blockCrashLogs || true) {
             yield waPage.setRequestInterception(true);
             waPage.on('response', (response) => __awaiter(this, void 0, void 0, function* () {
-                if (response.request().url() == "https://web.whatsapp.com/") {
-                    const t = yield response.text();
-                    if (t.includes(`class="no-js"`) && t.includes(`self.`) && !dumbCache) {
-                        //this is a valid response, save it for later
-                        dumbCache = t;
-                        logging_1.log.info("saving valid page to dumb cache");
+                try {
+                    if (response.request().url() == "https://web.whatsapp.com/") {
+                        const t = yield response.text();
+                        if (t.includes(`class="no-js"`) && t.includes(`self.`) && !dumbCache) {
+                            //this is a valid response, save it for later
+                            dumbCache = t;
+                            logging_1.log.info("saving valid page to dumb cache");
+                        }
                     }
                 }
+                catch (error) {
+                    logging_1.log.error("dumb cache error", error);
+                }
             }));
             const authCompleteEv = new events_1.EvEmitter(sessionId, 'AUTH');
             waPage.on('request', (request) => __awaiter(this, void 0, void 0, function* () {
@@ -304,7 +309,7 @@ const getSessionDataFilePath = (sessionId, config) => {
     return false;
 };
 exports.getSessionDataFilePath = getSessionDataFilePath;
-const addScript = (page, js) => __awaiter(void 0, void 0, void 0, function* () { return page.evaluate(yield script_preloader_1.scriptLoader.getScript(js)); });
+const addScript = (page, js) => __awaiter(void 0, void 0, void 0, function* () { return page.evaluate(yield script_preloader_1.scriptLoader.getScript(js)).catch(e => logging_1.log.error(`Injection error: ${js}`, e)); });
 exports.addScript = addScript;
 // (page: Page, js : string) : Promise<unknown> => page.addScriptTag({
 //   path: require.resolve(path.join(__dirname, '../lib', js))

package/dist/controllers/patch_manager.js

@@ -147,7 +147,7 @@ function getLicense(config, me, debugInfo, spinner) {
         const hasSpin = !!spinner;
         if (!spinner)
             spinner = new events_1.Spin(config.sessionId || "session", "FETCH_LICENSE", config.disableSpins, true);
-        spinner === null || spinner === void 0 ? void 0 : spinner.start(`Fetching License: ${Array.isArray(config.licenseKey) ? config.licenseKey : config.licenseKey.indexOf("-") == -1 ? config.licenseKey.slice(-4) : config.licenseKey.split("-").slice(-1)[0]}`, hasSpin ? undefined : 2);
+        spinner === null || spinner === void 0 ? void 0 : spinner.start(`Fetching License: ${Array.isArray(config.licenseKey) ? config.licenseKey : typeof config.licenseKey === "string" ? config.licenseKey.indexOf("-") == -1 ? config.licenseKey.slice(-4) : config.licenseKey.split("-").slice(-1)[0] : config.licenseKey}`, hasSpin ? undefined : 2);
         try {
             const START = Date.now();
             const { data } = yield axios_1.default.post(initializer_1.pkg.licenseCheckUrl, Object.assign({ key: config.licenseKey, number: me._serialized }, debugInfo));

package/package.json

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