@open-wa/wa-automate 4.54.4 → 4.54.6

package/dist/cli/index.js

@@ -20,7 +20,6 @@ const axios_1 = __importDefault(require("axios"));
 const setup_1 = require("./setup");
 const collections_1 = require("./collections");
 const server_1 = require("./server");
-const localtunnel_1 = __importDefault(require("localtunnel"));
 const chatwoot_1 = require("./integrations/chatwoot");
 let checkUrl = (s) => (typeof s === "string") && (0, is_url_superb_1.default)(s);
 const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
@@ -105,6 +104,7 @@ function start() {
         }
         try {
             const client = yield (0, index_1.create)(Object.assign({}, createConfig));
+            (0, server_1.setupMetaProcessMiddleware)(client, cliConfig);
             yield (0, server_1.setupHttpServer)(cliConfig);
             if (cliConfig.autoReject) {
                 yield client.autoReject(cliConfig.onCall);
@@ -201,13 +201,8 @@ function start() {
                 });
                 if (cliConfig.tunnel) {
                     spinner.info(`\n• Setting up external tunnel`);
-                    const tunnel = yield (0, localtunnel_1.default)({
-                        port: PORT,
-                        host: process.env.WA_TUNNEL_SERVER || "https://public.openwa.cloud",
-                        subdomain: yield client.getTunnelCode()
-                    });
-                    cliConfig.apiHost = cliConfig.tunnel = tunnel.url;
-                    spinner.succeed(`\n\t${(0, terminal_link_1.default)('External address', tunnel.url)}`);
+                    const tunnelUrl = yield (0, server_1.setupTunnel)(cliConfig, yield client.getTunnelCode(), PORT);
+                    spinner.succeed(`\n\t${(0, terminal_link_1.default)('External address', tunnelUrl)}`);
                 }
                 const apiDocsUrl = cliConfig.apiHost ? `${cliConfig.apiHost}/api-docs/ ` : `${cliConfig.host.includes('http') ? '' : 'http://'}${cliConfig.host}:${PORT}/api-docs/ `;
                 const link = (0, terminal_link_1.default)('API Explorer', apiDocsUrl);

package/dist/cli/integrations/chatwoot.js

@@ -168,10 +168,10 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
             __1.log.info(`CHATWOOT INTEGRATION: inbox created. id: ${inboxId}`);
         }
     }
-    const cwReq = (method, path, data, _headers) => {
+    const cwReq = (method, path, data, _headers) => __awaiter(void 0, void 0, void 0, function* () {
         const url = `${origin}/api/v1/accounts/${accountId}/${path}`.replace('app.bentonow.com', 'chat.bentonow.com');
         // console.log(url,method,data)
-        return (0, axios_1.default)({
+        const response = yield (0, axios_1.default)({
             method,
             data,
             url,
@@ -181,7 +181,9 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
             __1.log.error(`CW REQ ERROR: ${(_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status} ${(_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.message}`, error === null || error === void 0 ? void 0 : error.toJSON());
             throw error;
         });
-    };
+        __1.log.info(`CW REQUEST: ${response.status} ${method} ${url} ${JSON.stringify(data)}`);
+        return response;
+    });
     let { data: get_inbox } = yield cwReq('get', `inboxes/${inboxId}`);
     /**
      * Update the webhook

package/dist/cli/server.d.ts

@@ -13,9 +13,11 @@ export declare const setupAuthenticationLayer: (cliConfig: cliFlags) => void;
 export declare const setupApiDocs: (cliConfig: cliFlags) => void;
 export declare const setupSwaggerStatsMiddleware: (cliConfig: cliFlags) => Promise<void>;
 export declare const setupRefocusDisengageMiddleware: (cliConfig: cliFlags) => void;
+export declare const setupMetaProcessMiddleware: (client: Client, cliConfig: any) => void;
 export declare const getCommands: () => any;
 export declare const listListeners: () => string[];
 export declare const setupMediaMiddleware: () => void;
+export declare const setupTunnel: (cliConfig: any, tunnelCode: string, PORT: number) => Promise<string>;
 export declare const setupTwilioCompatibleWebhook: (cliConfig: cliFlags, client: Client) => void;
 export declare const setupChatwoot: (cliConfig: cliFlags, client: Client) => void;
 export declare const setupBotPressHandler: (cliConfig: cliFlags, client: Client) => void;

package/dist/cli/server.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupSocketServer = exports.setupBotPressHandler = exports.setupChatwoot = exports.setupTwilioCompatibleWebhook = exports.setupMediaMiddleware = exports.listListeners = exports.getCommands = exports.setupRefocusDisengageMiddleware = exports.setupSwaggerStatsMiddleware = exports.setupApiDocs = exports.setupAuthenticationLayer = exports.enableCORSRequests = exports.setUpExpressApp = exports.setupHttpServer = exports.server = exports.app = void 0;
+exports.setupSocketServer = exports.setupBotPressHandler = exports.setupChatwoot = exports.setupTwilioCompatibleWebhook = exports.setupTunnel = exports.setupMediaMiddleware = exports.listListeners = exports.getCommands = exports.setupMetaProcessMiddleware = exports.setupRefocusDisengageMiddleware = exports.setupSwaggerStatsMiddleware = exports.setupApiDocs = exports.setupAuthenticationLayer = exports.enableCORSRequests = exports.setUpExpressApp = exports.setupHttpServer = exports.server = exports.app = void 0;
 //@ts-ignore
 const express_1 = __importDefault(require("express"));
 const https_1 = __importDefault(require("https"));
@@ -52,8 +52,11 @@ const xmlbuilder2_1 = require("xmlbuilder2");
 const chatwoot_1 = require("./integrations/chatwoot");
 const express_ipfilter_1 = require("express-ipfilter");
 const helmet_1 = __importDefault(require("helmet"));
+const localtunnel_1 = __importDefault(require("localtunnel"));
+const child_process_1 = require("child_process");
 exports.app = (0, express_1.default)();
 exports.server = http_1.default.createServer(exports.app);
+let tunnel;
 const trimChatId = (chatId) => chatId.replace("@c.us", "").replace("@g.us", "");
 const socketListenerCallbacks = {};
 // const existingListeners = () => Object.keys(Object.keys(socketListenerCallbacks).flatMap(id=>Object.keys(socketListenerCallbacks[id])).reduce((acc,curr)=>{acc[curr]=true;return acc},{}))
@@ -243,6 +246,69 @@ const setupMetaMiddleware = () => {
         }
     }));
 };
+const setupMetaProcessMiddleware = (client, cliConfig) => {
+    /**
+     * Kill the client. End the process.
+     */
+    let closing = false;
+    const nuke = (req, res, restart) => __awaiter(void 0, void 0, void 0, function* () {
+        res.set("Connection", "close");
+        res.send(closing ? `Already closing! Stop asking!!` : 'Closing after connections closed. Waiting max 5 seconds');
+        res.end();
+        res.connection.end();
+        res.connection.destroy();
+        if (closing)
+            return;
+        closing = true;
+        yield client.kill("API_KILL");
+        __1.log.info("Waiting for maximum ");
+        if (tunnel && tunnel.close && typeof tunnel.close === 'function')
+            tunnel.close();
+        yield Promise.race([
+            new Promise((resolve) => exports.server.close(() => {
+                console.log('Server closed');
+                resolve(true);
+            })),
+            new Promise(resolve => setTimeout(resolve, 5000, 'timeout'))
+        ]);
+        if (process.env.pm_id && process.env.PM2_USAGE) {
+            const cmd = `pm2 ${restart ? 'restart' : 'stop'} ${process.env.pm_id}`;
+            __1.log.info(`PM2 DETECTED, RUNNING COMMAND: ${cmd}`);
+            const cmda = cmd.split(' ');
+            (0, child_process_1.spawn)(cmda[0], cmda.splice(1), { stdio: 'inherit' });
+        }
+        else {
+            if (restart)
+                setTimeout(function () {
+                    process.on("exit", function () {
+                        (0, child_process_1.spawn)(process.argv.shift(), process.argv, {
+                            cwd: process.cwd(),
+                            detached: true,
+                            stdio: "inherit"
+                        });
+                    });
+                    process.exit();
+                }, 5000);
+            else
+                process.exit(restart ? 0 : 10);
+        }
+    });
+    /**
+     * Exit code 10 will prevent pm2 process from auto-restarting
+     */
+    exports.app.post('/meta/process/exit', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        return yield nuke(req, res, false);
+    }));
+    /**
+     * Will only restart if the process is managed by pm2
+     *
+     * Note: Only works when `--pm2` flag is enabled.
+     */
+    exports.app.post('/meta/process/restart', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        return yield nuke(req, res, true);
+    }));
+};
+exports.setupMetaProcessMiddleware = setupMetaProcessMiddleware;
 const getCommands = () => Object.entries(collections_1.collections['swagger'].paths).reduce((acc, [key, value]) => { var _a, _b, _c, _d; acc[key.replace("/", "")] = ((_d = (_c = (_b = (_a = value === null || value === void 0 ? void 0 : value.post) === null || _a === void 0 ? void 0 : _a.requestBody) === null || _b === void 0 ? void 0 : _b.content["application/json"]) === null || _c === void 0 ? void 0 : _c.example) === null || _d === void 0 ? void 0 : _d.args) || {}; return acc; }, {});
 exports.getCommands = getCommands;
 const listListeners = () => {
@@ -253,6 +319,16 @@ const setupMediaMiddleware = () => {
     exports.app.use("/media", express_1.default.static('media'));
 };
 exports.setupMediaMiddleware = setupMediaMiddleware;
+const setupTunnel = (cliConfig, tunnelCode, PORT) => __awaiter(void 0, void 0, void 0, function* () {
+    tunnel = yield (0, localtunnel_1.default)({
+        port: PORT,
+        host: process.env.WA_TUNNEL_SERVER || "https://public.openwa.cloud",
+        subdomain: tunnelCode
+    });
+    cliConfig.apiHost = cliConfig.tunnel = tunnel.url;
+    return tunnel.url;
+});
+exports.setupTunnel = setupTunnel;
 const setupTwilioCompatibleWebhook = (cliConfig, client) => {
     const url = cliConfig.twilioWebhook;
     client.onMessage((message) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

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