@open-wa/wa-automate 4.39.0 → 4.40.0

package/dist/api/model/config.d.ts

@@ -98,7 +98,8 @@ export declare enum LicenseType {
     TEXT_STORY = "Text Story License Key",
     IMAGE_STORY = "Image Story License Key",
     VIDEO_STORY = "Video Story License Key",
-    PREMIUM = "Premium License Key"
+    PREMIUM = "Premium License Key",
+    NONE = "NONE"
 }
 export interface SessionData {
     WABrowserId?: string;

package/dist/api/model/config.js

@@ -104,4 +104,5 @@ var LicenseType;
     LicenseType["IMAGE_STORY"] = "Image Story License Key";
     LicenseType["VIDEO_STORY"] = "Video Story License Key";
     LicenseType["PREMIUM"] = "Premium License Key";
+    LicenseType["NONE"] = "NONE";
 })(LicenseType = exports.LicenseType || (exports.LicenseType = {}));

package/dist/cli/file-utils.js

@@ -26,13 +26,18 @@ exports.tryOpenFileAsObject = void 0;
 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) => {
     let res = undefined;
+    let fp = undefined;
     const relativePath = path.join(path.resolve(process.cwd(), fileLocation || ''));
+    const isJs = fileLocation.endsWith(".js");
+    logging_1.log.info(`Checking exists: ${fileLocation || relativePath}`);
     if (fs.existsSync(fileLocation) || fs.existsSync(relativePath)) {
-        const fp = fs.existsSync(fileLocation) ? fileLocation : relativePath;
+        fp = isJs ? fs.existsSync(relativePath) && relativePath : fs.existsSync(fileLocation) ? fileLocation : relativePath;
+        logging_1.log.info("Attempting to open: " + fp);
         try {
-            const data = json5_1.default.parse(fs.readFileSync(fp, 'utf8'));
+            const data = isJs ? (require(fp) || {}).default : json5_1.default.parse(fs.readFileSync(fp, 'utf8'));
             if (data && (Array.isArray(data) == needArray))
                 res = data;
         }
@@ -40,6 +45,9 @@ const tryOpenFileAsObject = (fileLocation, needArray = false) => {
             throw `Unable to parse config file as JSON. Please make sure ${fp} is a valid JSON config file`;
         }
     }
-    return res;
+    else
+        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/setup.d.ts

@@ -19,7 +19,7 @@ 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 configFile: (config?: string) => JsonObject;
 export declare const cli: () => {
     createConfig: ConfigObject;
     cliConfig: Merge<ConfigObject, {

package/dist/cli/setup.js

@@ -126,23 +126,42 @@ exports.envArgs = envArgs;
 const configFile = (config) => {
     let confFile = {};
     const conf = config || process.env.WA_CLI_CONFIG;
+    const backup = () => {
+        if (!confFile)
+            confFile = (0, file_utils_1.tryOpenFileAsObject)(`cli.config.json`);
+        if (!confFile)
+            confFile = (0, file_utils_1.tryOpenFileAsObject)(`cli.config.js`);
+    };
+    const attempt = (firstAttempt) => {
+        try {
+            confFile = (0, file_utils_1.tryOpenFileAsObject)(firstAttempt || `cli.config.json`);
+            backup();
+        }
+        catch (error) {
+            logging_1.log.error(error);
+            logging_1.log.error("Trying cli.config.js");
+            backup();
+        }
+    };
     if (conf) {
         if ((0, tools_1.isBase64)(conf)) {
             confFile = JSON.parse(Buffer.from(conf, 'base64').toString('ascii'));
         }
         else {
-            confFile = (0, file_utils_1.tryOpenFileAsObject)(conf || `cli.config.json`);
+            attempt(conf);
             if (!confFile)
                 console.error(`Unable to read config file json: ${conf}`);
         }
     }
     else {
-        confFile = (0, file_utils_1.tryOpenFileAsObject)(`cli.config.json`);
+        attempt();
     }
+    logging_1.log.info(`Using config file: ${confFile.confPath || "???"}`);
     return confFile;
 };
 exports.configFile = configFile;
 const cli = () => {
+    let loggingSetup = false;
     const _cli = (0, meow_1.default)(exports.helptext, {
         flags: Object.assign(Object.assign({}, (0, exports.meowFlags)()), { popup: {
                 type: 'boolean',
@@ -150,6 +169,21 @@ const cli = () => {
             } }),
         booleanDefault: undefined
     });
+    const _setupLogging = (_config) => {
+        if (loggingSetup)
+            return;
+        //firstly set up logger
+        if ((_config === null || _config === void 0 ? void 0 : _config.logging) || (_config === null || _config === void 0 ? void 0 : _config.verbose)) {
+            if (!(_config === null || _config === void 0 ? void 0 : _config.logging) && (_config === null || _config === void 0 ? void 0 : _config.verbose))
+                _config.logging = [];
+            if ((_config === null || _config === void 0 ? void 0 : _config.logging) && !((_config === null || _config === void 0 ? void 0 : _config.logging) || []).find(transport => transport.type === "console"))
+                _config.logging.push({ type: 'console' });
+            if (Array.isArray(_config === null || _config === void 0 ? void 0 : _config.logging))
+                _config.logging = (0, logging_1.setupLogging)(_config === null || _config === void 0 ? void 0 : _config.logging, `easy-api-${(_config === null || _config === void 0 ? void 0 : _config.sessionId) || 'session'}`);
+            loggingSetup = true;
+        }
+    };
+    _setupLogging(_cli.flags);
     /**
      * Config order should follow airmanship rules. Least maneuverable to most maneuverable.
      *
@@ -161,14 +195,7 @@ const cli = () => {
     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
-    if ((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) || (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.verbose)) {
-        if (!(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) && (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.verbose))
-            cliConfig.logging = [];
-        if ((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) && !((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) || []).find(transport => transport.type === "console"))
-            cliConfig.logging.push({ type: 'console' });
-        if (Array.isArray(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging))
-            cliConfig.logging = (0, logging_1.setupLogging)(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging, `easy-api-${(cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.sessionId) || 'session'}`);
-    }
+    _setupLogging(cliConfig);
     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);

package/dist/controllers/patch_manager.js

@@ -149,6 +149,15 @@ function getLicense(config, me, debugInfo, spinner) {
         const hasSpin = !!spinner;
         if (!spinner)
             spinner = new events_1.Spin(config.sessionId || "session", "FETCH_LICENSE", config.disableSpins, true);
+        if (typeof config.licenseKey === "function") {
+            //run the funciton to get the key
+            config.licenseKey = yield config.licenseKey(config.sessionId, me._serialized);
+        }
+        if (typeof config.licenseKey === "object") {
+            //attempt to get the key from the object
+            config.licenseKey = config.licenseKey[me._serialized] || config.licenseKey[config.sessionId];
+        }
+        //asume by now the key is a string
         spinner === null || spinner === void 0 ? void 0 : spinner.start(`Fetching License: ${Array.isArray(config.licenseKey) ? config.licenseKey : typeof config.licenseKey === "string" ? config.licenseKey.indexOf("-") == -1 ? config.licenseKey.slice(-4) : config.licenseKey.split("-").slice(-1)[0] : config.licenseKey}`, hasSpin ? undefined : 2);
         try {
             const START = Date.now();

package/package.json

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