@open-wa/wa-automate 4.34.4 → 4.35.2

package/bin/server.js

@@ -1,3 +1,40 @@
 #! /usr/bin/env node
-// require('./index.js');
-require('../dist/cli');
+const pm2Index = process.argv.findIndex(arg => arg === "--pm2");
+const sIdIndex = process.argv.findIndex(arg => arg === "--session-id");
+const nameIndex = process.argv.findIndex(arg => arg === "--name");
+const getVal = (index) => index !== -1 && process.argv[index + 1]
+const getBool = (index) => !((index !== -1 && process.argv[index + 1]) === false)
+const procName = getVal(sIdIndex || nameIndex) || "@OPEN-WA EASY API";
+const CLI = '../dist/cli'
+async function start() {
+    if (getBool(pm2Index)) {
+        const { spawn } = require("child_process");
+        try {
+            const pm2 = spawn('pm2');
+            await new Promise((resolve, reject) => {
+                pm2.on('error', reject);
+                pm2.stdout.on('data', () => resolve(true));
+            })
+            const pm2Flags = (getVal(pm2Index) || "").split(" ");
+            const cliFlags = (process.argv.slice(2) || []);
+            spawn("pm2", [
+                "start",
+                require.resolve(CLI),
+                '--name',
+                procName,
+                ...pm2Flags,
+                '--',
+                ...cliFlags.filter(x=>!pm2Flags.includes(x))
+            ], {
+                stdio: "inherit",
+                detached: true
+            })
+        } catch (error) {
+            if (error.errorno === -2) console.error("pm2 not found. Please install with the following command: npm install -g pm2");
+        }
+    } else {
+        require(CLI);
+    }
+}
+
+start()

package/dist/cli/cli-options.js

@@ -234,6 +234,12 @@ exports.optionList = [{
         type: Boolean,
         description: "Expose a tunnel to your EASY API session - this is for testing and it is unsecured."
     },
+    {
+        name: 'pm2',
+        type: Boolean,
+        typeLabel: '{yellow {underline "--max-memory-restart 300M"}}',
+        description: "Offload the EASY API to local instance of pm2. You can add pm2 specific arguments also if you want."
+    },
     {
         name: 'help',
         description: 'Print this usage guide.'

package/dist/controllers/initializer.js

@@ -314,7 +314,10 @@ function create(config = {}) {
                     yield (0, exports.timeout)(5000);
             }
             //@ts-ignore
-            const VALID_SESSION = yield waPage.waitForFunction(`window.Store && window.Store.Msg ? true : false`, { timeout: 9000, polling: 200 }).catch(e => false);
+            const VALID_SESSION = yield waPage.waitForFunction(`window.Store && window.Store.Msg ? true : false`, { timeout: 9000, polling: 200 }).catch((e) => __awaiter(this, void 0, void 0, function* () {
+                logging_1.log.error("Valid session check failed", e);
+                return false;
+            }));
             if (VALID_SESSION) {
                 /**
                  * Session is valid, attempt to preload patches
@@ -428,6 +431,8 @@ function create(config = {}) {
                 return client;
             }
             else {
+                const storeKeys = yield waPage.evaluate(`Object.keys(window.Store || {})`);
+                logging_1.log.info("Store keys", storeKeys);
                 spinner.fail('The session is invalid. Retrying');
                 yield (0, browser_1.kill)(waPage);
                 return yield create(config);

package/package.json

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