@open-wa/wa-automate 4.44.3 → 4.44.4

package/dist/cli/cli-options.js

@@ -105,8 +105,8 @@ exports.optionList = [{
         name: 'config',
         alias: 'c',
         type: String,
-        typeLabel: '{yellowBright {underline ./config.json}}',
-        description: "The relative json file that contains the config. By default the system will look for config.json which will override any config variables set. Default: './config.json'."
+        typeLabel: '{yellowBright {underline ./cli.config.json}}',
+        description: "The relative json file that contains the config. By default the system will look for cli.config.json which will override any config variables set. Default: './cli.config.json'."
     },
     {
         name: 'session',

package/dist/cli/file-utils.d.ts

@@ -1 +1 @@
-export declare const tryOpenFileAsObject: (fileLocation: string, needArray?: boolean) => any;
+export declare const tryOpenFileAsObject: (fileLocation: string, needArray?: boolean) => Promise<any>;

package/dist/cli/file-utils.js

@@ -18,6 +18,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -27,7 +36,7 @@ const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const json5_1 = __importDefault(require("json5"));
 const logging_1 = require("../logging/logging");
-const tryOpenFileAsObject = (fileLocation, needArray = false) => {
+const tryOpenFileAsObject = (fileLocation, needArray = false) => __awaiter(void 0, void 0, void 0, function* () {
     let res = undefined;
     let fp = undefined;
     const relativePath = path.join(path.resolve(process.cwd(), fileLocation || ''));
@@ -40,6 +49,10 @@ const tryOpenFileAsObject = (fileLocation, needArray = false) => {
             const data = isJs ? (require(fp) || {}).default : json5_1.default.parse(fs.readFileSync(fp, 'utf8'));
             if (data && (Array.isArray(data) == needArray))
                 res = data;
+            if (data && typeof data === "function") {
+                logging_1.log.info("Found config as function, executing.");
+                res = yield data(process.env.CURRENT_SESSION_ID || "session");
+            }
         }
         catch (error) {
             throw `Unable to parse config file as JSON. Please make sure ${fp} is a valid JSON config file`;
@@ -49,5 +62,5 @@ const tryOpenFileAsObject = (fileLocation, needArray = false) => {
         return;
     logging_1.log.info(`${fp} is ${res ? 'valid' : 'invalid'}`);
     return res && Object.assign(Object.assign({}, (res || {})), { confPath: fp });
-};
+});
 exports.tryOpenFileAsObject = tryOpenFileAsObject;

package/dist/cli/index.js

@@ -38,7 +38,7 @@ const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
 });
 function start() {
     return __awaiter(this, void 0, void 0, function* () {
-        const { cliConfig, createConfig, PORT, spinner } = (0, setup_1.cli)();
+        const { cliConfig, createConfig, PORT, spinner } = yield (0, setup_1.cli)();
         process.env.OWA_CLI = "true";
         spinner.start("Launching EASY API");
         (0, server_1.setUpExpressApp)();

package/dist/cli/setup.d.ts

@@ -19,12 +19,12 @@ export declare const cliOptionNames: import("type-fest").Simplify<import("type-f
 export declare const meowFlags: () => AnyFlags;
 export declare const helptext: string;
 export declare const envArgs: () => JsonObject;
-export declare const configFile: (config?: string) => JsonObject;
-export declare const cli: () => {
+export declare const configFile: (config?: string) => Promise<JsonObject>;
+export declare const cli: () => Promise<{
     createConfig: ConfigObject;
     cliConfig: Merge<ConfigObject, {
         [k: string]: any;
     }>;
     PORT: number;
     spinner: Spin;
-};
+}>;

package/dist/cli/setup.js

@@ -43,6 +43,7 @@ const uuid_apikey_1 = __importDefault(require("uuid-apikey"));
 const events_1 = require("../controllers/events");
 const is_url_superb_1 = __importDefault(require("is-url-superb"));
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 const logging_1 = require("../logging/logging");
 const cli_options_1 = require("./cli-options");
 let checkUrl = url => typeof url === 'string' ? (0, is_url_superb_1.default)(url) : false;
@@ -123,44 +124,56 @@ const envArgs = () => {
     return env;
 };
 exports.envArgs = envArgs;
-const configFile = (config) => {
-    let confFile = {};
+const configFile = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    let confFile = null;
     const conf = config || process.env.WA_CLI_CONFIG;
-    const backup = () => {
+    //check if it is a directory:
+    const isDir = fs.existsSync(conf) && fs.lstatSync(conf).isDirectory();
+    logging_1.log.info(`Config ${config} is directory: ${isDir}`);
+    const backup = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!confFile)
-            confFile = (0, file_utils_1.tryOpenFileAsObject)(`cli.config.json`);
+            confFile = yield (0, file_utils_1.tryOpenFileAsObject)(`cli.config.json`);
         if (!confFile)
-            confFile = (0, file_utils_1.tryOpenFileAsObject)(`cli.config.js`);
-    };
-    const attempt = (firstAttempt) => {
+            confFile = yield (0, file_utils_1.tryOpenFileAsObject)(`cli.config.js`);
+    });
+    const attempt = (firstAttempt, skipBackup) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            confFile = (0, file_utils_1.tryOpenFileAsObject)(firstAttempt || `cli.config.json`);
-            backup();
+            if (!confFile)
+                confFile = yield (0, file_utils_1.tryOpenFileAsObject)(firstAttempt || `cli.config.json`);
+            if (!skipBackup)
+                yield backup();
         }
         catch (error) {
             logging_1.log.error(error);
             logging_1.log.error("Trying cli.config.js");
-            backup();
+            yield backup();
         }
-    };
+    });
     if (conf) {
         if ((0, tools_1.isBase64)(conf)) {
             confFile = JSON.parse(Buffer.from(conf, 'base64').toString('ascii'));
         }
         else {
-            attempt(conf);
+            if (isDir) {
+                yield attempt(`${isDir && conf}/cli.config.json`, true);
+                yield attempt(`${isDir && conf}/cli.config.js`, true);
+                yield backup();
+            }
+            else
+                attempt(conf);
             if (!confFile)
                 console.error(`Unable to read config file json: ${conf}`);
         }
     }
     else {
-        attempt();
+        yield attempt();
     }
     logging_1.log.info(`Using config file: ${(confFile || {}).confPath || "???"}`);
-    return confFile;
-};
+    return confFile || {};
+});
 exports.configFile = configFile;
-const cli = () => {
+const cli = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     let loggingSetup = false;
     const _cli = (0, meow_1.default)(exports.helptext, {
         flags: Object.assign(Object.assign({}, (0, exports.meowFlags)()), { popup: {
@@ -169,6 +182,7 @@ const cli = () => {
             } }),
         booleanDefault: undefined
     });
+    process.env.CURRENT_SESSION_ID = ((_a = _cli.flags) === null || _a === void 0 ? void 0 : _a.sessionId) || process.env.WA_SESSION_ID || 'session';
     const _setupLogging = (_config) => {
         if (loggingSetup)
             return;
@@ -191,11 +205,13 @@ const cli = () => {
      * 2. Config file
      * 3. CLI flags
      */
-    const nonCliConfigs = Object.assign(Object.assign({}, (0, exports.envArgs)()), ((0, exports.configFile)(_cli.flags.config) || {}));
+    const resolvedConfigFromFile = ((yield (0, exports.configFile)(_cli.flags.config)) || {});
+    const nonCliConfigs = Object.assign(Object.assign({}, (0, exports.envArgs)()), resolvedConfigFromFile);
     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
     _setupLogging(cliConfig);
+    process.env.CURRENT_SESSION_ID = cliConfig.sessionId;
     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);
@@ -282,5 +298,5 @@ const cli = () => {
     return {
         createConfig, cliConfig, PORT, spinner
     };
-};
+});
 exports.cli = cli;

package/dist/controllers/browser.js

@@ -191,7 +191,7 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
                     spinner === null || spinner === void 0 ? void 0 : spinner.fail(`${error instanceof pico_s3_1.FileNotFoundError ? 'The session data file was not found in the cloud storage bucket' : 'Something went wrong while fetching session data from cloud storage bucket'}. Continuing...`);
                 }
             }
-            if (sessionjson) {
+            if (sessionjson && Object.keys(sessionjson).length) {
                 spinner === null || spinner === void 0 ? void 0 : spinner.info(config.multiDevice ? "multi-device enabled. Session data skipped..." : 'Existing session data detected. Injecting...');
                 if (!(config === null || config === void 0 ? void 0 : config.multiDevice))
                     yield waPage.evaluateOnNewDocument(session => {
@@ -204,14 +204,15 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
                 if (config === null || config === void 0 ? void 0 : config.multiDevice) {
                     spinner === null || spinner === void 0 ? void 0 : spinner.info("No session data detected. Opting in for MD.");
                     spinner === null || spinner === void 0 ? void 0 : spinner.info("Make sure to keep the session alive for at least 5 minutes after scanning the QR code before trying to restart a session!!");
-                    yield waPage.evaluateOnNewDocument(session => {
-                        localStorage.clear();
-                        Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
-                    }, {
-                        "md-opted-in": "true",
-                        "MdUpgradeWamFlag": "true",
-                        "remember-me": "true"
-                    });
+                    if (config === null || config === void 0 ? void 0 : config.legacy)
+                        yield waPage.evaluateOnNewDocument(session => {
+                            localStorage.clear();
+                            Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
+                        }, {
+                            "md-opted-in": "true",
+                            "MdUpgradeWamFlag": "true",
+                            "remember-me": "true"
+                        });
                 }
             }
             /**

package/package.json

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