@open-wa/wa-automate 4.34.3 → 4.35.1

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/cli/index.js

@@ -183,7 +183,7 @@ function start() {
                 spinner.succeed(`Port ${PORT} is now free.`);
                 server_1.server.listen(PORT, () => __awaiter(this, void 0, void 0, function* () {
                     spinner.succeed(`\n• Listening on port ${PORT}!`);
-                    yield (0, index_1.processSendData)({ port: PORT });
+                    (0, index_1.processSendData)({ port: PORT });
                     yield ready(Object.assign(Object.assign(Object.assign(Object.assign({}, cliConfig), createConfig), client.getSessionInfo()), { hostAccountNumber: yield client.getHostNumber() }));
                 }));
                 process.on('message', function (data) {
@@ -191,7 +191,7 @@ function start() {
                     return __awaiter(this, void 0, void 0, function* () {
                         if (((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.command) === "port_report") {
                             const response = { port: PORT };
-                            yield (0, index_1.processSendData)(response);
+                            (0, index_1.processSendData)(response);
                             return response;
                         }
                     });

package/dist/controllers/browser.js

@@ -490,7 +490,7 @@ function getWAPage(browser) {
  * @internal
  */
 const kill = (p, b, exit, pid, reason = "LAUNCH_KILL") => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, tools_1.processSendData)({
+    (0, tools_1.processSendData)({
         reason
     });
     (0, tools_1.timeout)(3000);

package/dist/controllers/initializer.js

@@ -314,7 +314,12 @@ 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);
+                const storeKeys = yield waPage.evaluate(`Object.keys(window.Store || {})`);
+                logging_1.log.info("Store keys", storeKeys);
+                return false;
+            }));
             if (VALID_SESSION) {
                 /**
                  * Session is valid, attempt to preload patches

package/dist/controllers/popup/index.js

@@ -111,7 +111,7 @@ function popup(config) {
             });
         });
         server.listen(PORT);
-        yield (0, tools_1.processSendData)({ port: PORT });
+        (0, tools_1.processSendData)({ port: PORT });
         const os = (0, os_name_1.default)();
         const appName = os.includes('macOS') ? 'google chrome' : os.includes('Windows') ? 'chrome' : 'google-chrome';
         const hasChrome = yield (0, command_exists_1.default)(appName).then(() => true).catch(() => false);

package/dist/utils/tools.d.ts

@@ -67,7 +67,7 @@ export declare function timePromise(fn: () => Promise<any>): Promise<string>;
  * @param {any} data - The data to be sent to the parent process.
  * @returns Nothing.
  */
-export declare const processSendData: (data?: any) => Promise<unknown>;
+export declare const processSendData: (data?: any) => boolean;
 /**
  * It generates a link to the GitHub issue template for the current session
  * @param {ConfigObject} config - the config object

package/dist/utils/tools.js

@@ -211,21 +211,20 @@ exports.timePromise = timePromise;
  * @param {any} data - The data to be sent to the parent process.
  * @returns Nothing.
  */
-const processSendData = (data = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const sd = (resolve, reject) => process.send({
+const processSendData = (data = {}) => {
+    const sd = () => process.send({
         type: 'process:msg',
         data
     }, (error) => {
         if (error) {
             console.error(error);
-            reject(error);
         }
-        resolve(true);
     });
-    return yield new Promise((resolve, reject) => {
-        sd(resolve, reject);
-    });
-});
+    return sd();
+    //  return await new Promise((resolve, reject)=>{
+    //   sd(resolve,reject)
+    //  })
+};
 exports.processSendData = processSendData;
 /**
  * It generates a link to the GitHub issue template for the current session

package/package.json

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