@open-wa/wa-automate 4.27.0 → 4.27.4

package/dist/cli/index.js

@@ -113,12 +113,6 @@ function start() {
                     process.exit();
                 }
             }));
-            if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.chatwootUrl) {
-                spinner.info('Setting Up Chatwoot handler');
-                spinner.info('Make sure to set up the Chatwoot inbox webhook to the following path on this process: /chatwoot');
-                yield server_1.setupChatwoot(cliConfig, client);
-                spinner.succeed('Chatwoot handler set up successfully');
-            }
             if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.botPressUrl) {
                 spinner.info('Setting Up Botpress handler');
                 server_1.setupBotPressHandler(cliConfig, client);
@@ -150,6 +144,12 @@ function start() {
                     console.log(`Please use the following api key for requests as a header:\napi_key: ${cliConfig.key}`);
                     server_1.setupAuthenticationLayer(cliConfig);
                 }
+                if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.chatwootUrl) {
+                    spinner.info('Setting Up Chatwoot handler');
+                    spinner.info(`Make sure to set up the Chatwoot inbox webhook to the following path on this process: /chatwoot${cliConfig.key ? `?api_key=YOUR-API-KEY` : ''}`);
+                    yield server_1.setupChatwoot(cliConfig, client);
+                    spinner.succeed('Chatwoot handler set up successfully');
+                }
                 server_1.setupRefocusDisengageMiddleware(cliConfig);
                 if (cliConfig && cliConfig.generateApiDocs && collections_1.collections["swagger"]) {
                     spinner.info('Setting Up API Explorer');

package/dist/cli/integrations/chatwoot.js

@@ -140,7 +140,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
                 contact_id,
                 "inbox_id": resolvedInbox
             });
-            return data.payload;
+            return data;
         }
         catch (error) {
             return;

package/dist/cli/server.js

@@ -71,7 +71,10 @@ const setupAuthenticationLayer = (cliConfig) => {
             return next();
         }
         const apiKey = req.get('key') || req.get('api_key');
-        if (!apiKey || apiKey !== cliConfig.key) {
+        if (req.path.includes('chatwoot') && req.query['api_key'] && req.query['api_key'] == cliConfig.key) {
+            next();
+        }
+        else if (!apiKey || apiKey !== cliConfig.key) {
             res.status(401).json({ error: 'unauthorised' });
         }
         else {

package/dist/cli/setup.d.ts

@@ -3,6 +3,7 @@ import { Merge, JsonObject } from 'type-fest';
 import { ConfigObject } from '../api/model/config';
 import { Spin } from '../controllers/events';
 export declare const optionKeys: string[];
+export declare const optionKeysWithDefalts: string[];
 export declare const PrimitiveConverter: {
     Number: number;
     Boolean: boolean;

package/dist/cli/setup.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.cli = exports.configFile = exports.envArgs = exports.helptext = exports.meowFlags = exports.cliOptionNames = exports.PrimitiveConverter = exports.optionKeys = void 0;
+exports.cli = exports.configFile = exports.envArgs = exports.helptext = exports.meowFlags = exports.cliOptionNames = exports.PrimitiveConverter = exports.optionKeysWithDefalts = exports.optionKeys = void 0;
 const tools_1 = require("./../utils/tools");
 const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const meow_1 = __importDefault(require("meow"));
@@ -272,6 +272,7 @@ const optionList = [{
     }
 ];
 exports.optionKeys = optionList.map(({ name }) => tools_1.camelize(name));
+exports.optionKeysWithDefalts = optionList.filter(o => o.hasOwnProperty('default')).map(({ name }) => tools_1.camelize(name));
 exports.PrimitiveConverter = {
     Number: 1,
     Boolean: true,
@@ -380,7 +381,9 @@ const cli = () => {
      * 2. Config file
      * 3. CLI flags
      */
-    const cliConfig = Object.assign(Object.assign(Object.assign({ sessionId: "session" }, exports.envArgs()), (exports.configFile(_cli.flags.config) || {})), _cli.flags);
+    const nonCliConfigs = Object.assign(Object.assign({}, exports.envArgs()), (exports.configFile(_cli.flags.config) || {}));
+    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, {}));
     const PORT = Number(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);

package/dist/controllers/browser.d.ts

@@ -9,4 +9,4 @@ export declare function injectApi(page: Page): Promise<Page>;
 /**
  * @internal
  */
-export declare const kill: (p: Page, b?: Browser, exit?: boolean) => Promise<void>;
+export declare const kill: (p: Page, b?: Browser, exit?: boolean, pid?: number) => Promise<void>;

package/dist/controllers/browser.js

@@ -290,6 +290,8 @@ function initBrowser(sessionId, config = {}) {
             if (!_savedPath) {
                 const chromeLauncher = yield Promise.resolve().then(() => __importStar(require('chrome-launcher')));
                 config.executablePath = chromeLauncher.Launcher.getInstallations()[0];
+                if (!config.executablePath)
+                    delete config.executablePath;
                 yield storage.setItem('executablePath', config.executablePath);
             }
             else
@@ -324,6 +326,9 @@ function initBrowser(sessionId, config = {}) {
         }
         if (config === null || config === void 0 ? void 0 : config.corsFix)
             args.push('--disable-web-security');
+        if (config["userDataDir"] && !fs.existsSync(config["userDataDir"])) {
+            fs.mkdirSync(config["userDataDir"], { recursive: true });
+        }
         const browser = (config === null || config === void 0 ? void 0 : config.browserWSEndpoint) ? yield puppeteer.connect(Object.assign({}, config)) : yield puppeteer.launch(Object.assign(Object.assign({ headless: true, args }, config), { devtools: false }));
         //devtools
         if (config === null || config === void 0 ? void 0 : config.devtools) {
@@ -366,27 +371,27 @@ death_1.default(() => __awaiter(void 0, void 0, void 0, function* () {
 /**
  * @internal
  */
-const kill = (p, b, exit) => __awaiter(void 0, void 0, void 0, function* () {
+const kill = (p, b, exit, pid) => __awaiter(void 0, void 0, void 0, function* () {
     const killBrowser = (browser) => __awaiter(void 0, void 0, void 0, function* () {
         if (!browser)
             return;
-        const pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? browser === null || browser === void 0 ? void 0 : browser.process().pid : null;
+        pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? browser === null || browser === void 0 ? void 0 : browser.process().pid : null;
         if (!pid)
             return;
         if (!(p === null || p === void 0 ? void 0 : p.isClosed()))
             yield (p === null || p === void 0 ? void 0 : p.close());
         if (browser)
             yield (browser === null || browser === void 0 ? void 0 : browser.close().catch(() => { }));
-        if (pid)
-            tree_kill_1.default(pid, 'SIGKILL');
     });
     if (p) {
-        const browser = p === null || p === void 0 ? void 0 : p.browser();
+        const browser = (p === null || p === void 0 ? void 0 : p.browser) && typeof (p === null || p === void 0 ? void 0 : p.browser) === 'function' && (p === null || p === void 0 ? void 0 : p.browser());
         yield killBrowser(browser);
     }
     else if (b) {
         yield killBrowser(b);
     }
+    if (pid)
+        tree_kill_1.default(pid, 'SIGKILL');
     if (exit)
         process.exit();
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.27.0",
+  "version": "4.27.4",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -28,7 +28,7 @@
     "docwatch": "onchange 'src/**/*.ts'  'docs-source/**/*.md' -- typedoc",
     "build:config-for-bin": "cd build && ts-node build-config-json-for-bin.ts && cd ..",
     "postinstall": "patch-package",
-    "install": "cross-env npm_config_yes=true npx ignore-check@latest -p '**.data.json' -p '**.node-persist**' --comment 'managed by open-wa'"
+    "install": "cross-env npm_config_yes=true npx ignore-check@latest -p '**.data.json' -p '**.node-persist**' -p '**_IGNORE_**' --comment 'managed by open-wa'"
   },
   "husky": {
     "hooks": {
@@ -138,11 +138,11 @@
     "pico-s3": "^1.0.1",
     "pino": "^6.11.1",
     "postman-2-swagger": "^0.5.0",
-    "puppeteer": "10.4.0",
-    "puppeteer-extra": "^3.1.9",
-    "puppeteer-extra-plugin-block-resources": "^2.2.7",
+    "puppeteer": "^13.0.0",
+    "puppeteer-extra": "^3.2.3",
+    "puppeteer-extra-plugin-block-resources": "^2.3.0",
     "puppeteer-extra-plugin-devtools": "^2.3.3",
-    "puppeteer-extra-plugin-stealth": "^2.4.9",
+    "puppeteer-extra-plugin-stealth": "^2.9.0",
     "puppeteer-page-proxy": "^1.2.8",
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.10.1",