zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

package/lib/util_modules/config/lib/{appSail.js → appsail.js}

@@ -13,12 +13,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllTargetDetails = exports.getTargetDetails = exports.raw = void 0;
+const path_1 = require("path");
 const error_1 = __importDefault(require("../../../error"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../constants");
 const fs_1 = require("../../fs");
-const logger_1 = require("../../logger");
 const project_1 = require("../../project");
+function validateConfig(source, configJson) {
+    if (!configJson) {
+        return {
+            valid: false,
+            reason: 'Config file is empty'
+        };
+    }
+    const sourcePath = (0, path_1.join)((0, project_1.getProjectRoot)(), source);
+    configJson.raw.source_path = sourcePath;
+    if (configJson.buildPath || configJson.build_path) {
+        const buildPath = configJson.build_path || configJson.buildPath;
+        if (!buildPath) {
+            return {
+                valid: false,
+                reason: 'Build Path not present'
+            };
+        }
+        const absolutePath = (0, path_1.isAbsolute)(buildPath) ? buildPath : (0, path_1.resolve)(sourcePath, buildPath);
+        configJson.build_path = absolutePath;
+        configJson.raw.build_path = buildPath;
+    }
+    if (configJson.catalyst_auth === true) {
+        if (configJson.login_redirect === undefined) {
+            return {
+                valid: false,
+                reason: 'Login Redirect value incorrect! Please check the entered value.'
+            };
+        }
+        else if (configJson.login_redirect.length === 0) {
+            return {
+                valid: false,
+                reason: 'Login Redirect value empty! Please provide a login redirect URL.'
+            };
+        }
+        else if (configJson.login_redirect.toLowerCase().startsWith('http') ||
+            configJson.login_redirect.includes('://') ||
+            !configJson.login_redirect.startsWith('/') ||
+            configJson.login_redirect.includes('//')) {
+            return {
+                valid: false,
+                reason: 'Login Redirect value not a relative URL! Please provide a relative URL.'
+            };
+        }
+    }
+    return {
+        valid: true
+    };
+}
 function raw(throwError = false) {
     const config = runtime_store_1.default.get('config', null);
     if (config === null) {
@@ -27,7 +75,11 @@ function raw(throwError = false) {
         }
         return;
     }
-    return config.get('appsail');
+    const appsailConfig = config.get('appsail');
+    return appsailConfig === null || appsailConfig === void 0 ? void 0 : appsailConfig.map((_conf) => {
+        _conf.source = (0, path_1.isAbsolute)(_conf.source) ? _conf.source : (0, path_1.normalize)(_conf.source);
+        return _conf;
+    });
 }
 exports.raw = raw;
 function getTargetDetails(name) {
@@ -70,17 +122,19 @@ function getAllTargetDetails(throwErr = true) {
                 return resArr;
             }
             resArr.push(new Promise((res) => __awaiter(this, void 0, void 0, function* () {
-                const configJson = yield fs_1.ASYNC.readJSONFile(catalystConfigPth).catch((err) => (0, logger_1.debug)('Unable to read config file: ', err));
-                if (!configJson) {
-                    return res(Object.assign({ validity: {
+                try {
+                    const configJson = yield fs_1.ASYNC.readJSONFile(catalystConfigPth);
+                    configJson && (configJson.raw = {});
+                    const validity = validateConfig(target.source, configJson);
+                    return res(Object.assign({ config: configJson, validity }, target));
+                }
+                catch (er) {
+                    const configErr = error_1.default.getErrorInstance(er, { skipHelp: true });
+                    res(Object.assign({ validity: {
                             valid: false,
-                            reason: 'Config file is empty'
+                            reason: configErr.message
                         } }, target));
                 }
-                return res({
-                    appSail: Object.assign(Object.assign({}, target), configJson),
-                    validity: { valid: true }
-                });
             })));
             return resArr;
         }, []));

package/lib/util_modules/config/lib/client.js

@@ -55,16 +55,14 @@ function ignore(sourcePath) {
         if (js_js_1.JS.indexOf(value, path_1.sep) === js_js_1.JS.size(value) - 1) {
             return '**' + path_1.sep + js_js_1.JS.initial(value).join('');
         }
-        else {
-            if (js_js_1.JS.startsWith(value, path_1.sep)) {
-                return js_js_1.JS.endsWith(value, path_1.sep)
-                    ? sourcePath + js_js_1.JS.initial(value).join('')
-                    : sourcePath + value;
-            }
+        if (js_js_1.JS.startsWith(value, path_1.sep)) {
             return js_js_1.JS.endsWith(value, path_1.sep)
-                ? sourcePath + path_1.sep + js_js_1.JS.initial(value).join('')
-                : sourcePath + path_1.sep + value;
+                ? sourcePath + js_js_1.JS.initial(value).join('')
+                : sourcePath + value;
         }
+        return js_js_1.JS.endsWith(value, path_1.sep)
+            ? sourcePath + path_1.sep + js_js_1.JS.initial(value).join('')
+            : sourcePath + path_1.sep + value;
     });
 }
 exports.ignore = ignore;

package/lib/util_modules/config/lib/functions.js

@@ -68,16 +68,14 @@ function ignore(sourcePath) {
         if (js_1.JS.indexOf(value, path_1.sep) === js_1.JS.size(value) - 1) {
             return '**' + path_1.sep + js_1.JS.initial(value).join('');
         }
-        else {
-            if (js_1.JS.startsWith(value, path_1.sep)) {
-                return js_1.JS.endsWith(value, path_1.sep)
-                    ? sourcePath + js_1.JS.initial(value).join('')
-                    : sourcePath + value;
-            }
+        if (js_1.JS.startsWith(value, path_1.sep)) {
             return js_1.JS.endsWith(value, path_1.sep)
-                ? sourcePath + path_1.sep + js_1.JS.initial(value).join('')
-                : sourcePath + path_1.sep + value;
+                ? sourcePath + js_1.JS.initial(value).join('')
+                : sourcePath + value;
         }
+        return js_1.JS.endsWith(value, path_1.sep)
+            ? sourcePath + path_1.sep + js_1.JS.initial(value).join('')
+            : sourcePath + path_1.sep + value;
     });
 }
 exports.ignore = ignore;

package/lib/util_modules/constants/lib/dc-type.js

@@ -40,5 +40,13 @@ exports.default = Object.freeze({
         w_auth: 'us',
         m_auth: 'us',
         ext: '.ca'
+    },
+    sa: {
+        loc: 'SaudiArabia',
+        ref: 'sa',
+        value: 'sa',
+        w_auth: 'us',
+        m_auth: 'us',
+        ext: '.sa'
     }
 });

package/lib/util_modules/constants/lib/default.js

@@ -12,22 +12,22 @@ exports.default = Object.freeze({
     serve_port: {
         http: {
             master: 3000,
+            advancedio: 4000,
+            basicio: 4200,
+            browser_logic: 4400,
             appsail: {
                 master: 3000,
-                service: 3060
+                service: 4600
             },
-            advancedio: 3010,
-            basicio: 3040,
-            client: 3050,
-            browser_logic: 3100
+            client: 5000
         },
         debug: {
             master: -1,
             advancedio: 8000,
-            basicio: 8010,
-            client: -1,
-            appsail: 8020,
-            browser_logic: 8040
+            basicio: 8200,
+            browser_logic: 8400,
+            appsail: -1,
+            client: -1
         }
     },
     event_bus: {

package/lib/util_modules/constants/lib/event-action.js

@@ -9,6 +9,7 @@ exports.default = Object.freeze({
     [event_source_1.default.cache]: ['Put'],
     [event_source_1.default.user]: ['SignUp', 'Delete'],
     [event_source_1.default.filestore]: ['Upload', 'Download'],
+    [event_source_1.default.stratus]: ['Object Upload', 'Object Download', 'Object Update', 'Object Delete'],
     [event_source_1.default.webapp]: ['Success'],
     [event_source_1.default.github]: ['Success', 'Failure'],
     [event_source_1.default.custom]: ['Produce']

package/lib/util_modules/constants/lib/event-source.js

@@ -6,6 +6,7 @@ exports.default = Object.freeze({
     user: 'UserManagement',
     custom: 'Custom',
     filestore: 'Filestore',
+    stratus: 'Stratus',
     webapp: 'Webapp',
     github: 'Github'
 });

package/lib/util_modules/constants/lib/fn-type.js

@@ -7,5 +7,6 @@ exports.default = Object.freeze({
     applogic: 'applogic',
     advanced: 'aio',
     integration: 'integ',
-    browserLogic: 'browserlogic'
+    browserLogic: 'browserlogic',
+    job: 'job'
 });

package/lib/util_modules/constants/lib/needed-scopes.js

@@ -2,51 +2,60 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("..");
+const login_1 = require("../../../authentication/login");
+const dc_1 = require("../../../dc");
 const scopes_1 = __importDefault(require("./scopes"));
+const serveScopes = [
+    scopes_1.default.api_read,
+    scopes_1.default.apig_read,
+    scopes_1.default.segment,
+    scopes_1.default.cache_read,
+    scopes_1.default.cache_create,
+    scopes_1.default.cache_delete,
+    scopes_1.default.projects,
+    scopes_1.default.cron,
+    scopes_1.default.zcql,
+    scopes_1.default.project_user_read,
+    scopes_1.default.project_user_create,
+    scopes_1.default.project_user_delete,
+    scopes_1.default.project_user_update,
+    scopes_1.default.custom_token_generation,
+    scopes_1.default.email_send,
+    scopes_1.default.datastore,
+    scopes_1.default.row,
+    scopes_1.default.column,
+    scopes_1.default.bulk_create,
+    scopes_1.default.bulk_read,
+    scopes_1.default.folders,
+    scopes_1.default.file_create,
+    scopes_1.default.file_read,
+    scopes_1.default.file_delete,
+    scopes_1.default.functions,
+    scopes_1.default.functions_execution,
+    scopes_1.default.event_listeners,
+    scopes_1.default.event_produce,
+    scopes_1.default.security_read,
+    scopes_1.default.security_update,
+    scopes_1.default.notification_mobile,
+    scopes_1.default.notification_web,
+    scopes_1.default.search_read,
+    scopes_1.default.zia,
+    scopes_1.default.quick_ml,
+    scopes_1.default.pdf_shot,
+    scopes_1.default.dataverse,
+    scopes_1.default.circuits_exe_delete,
+    scopes_1.default.circuits_exe_read,
+    scopes_1.default.circuits_execute,
+    scopes_1.default.appsail_read,
+    scopes_1.default.jobpool_read,
+    scopes_1.default.job,
+    scopes_1.default.nosql_table,
+    scopes_1.default.nosql_rows
+];
+const _missingScope = ((_a = login_1.missingScopes[(0, dc_1.getActiveDC)()]) === null || _a === void 0 ? void 0 : _a.map((dvScope) => __1.SCOPE[dvScope])) || [];
 exports.default = Object.freeze({
-    SERVE: [
-        scopes_1.default.api_read,
-        scopes_1.default.apig_read,
-        scopes_1.default.segment,
-        scopes_1.default.cache_read,
-        scopes_1.default.cache_create,
-        scopes_1.default.cache_delete,
-        scopes_1.default.projects,
-        scopes_1.default.cron,
-        scopes_1.default.zcql,
-        scopes_1.default.project_user_read,
-        scopes_1.default.project_user_create,
-        scopes_1.default.project_user_delete,
-        scopes_1.default.project_user_update,
-        scopes_1.default.email_send,
-        scopes_1.default.datastore,
-        scopes_1.default.row,
-        scopes_1.default.column,
-        scopes_1.default.bulk_create,
-        scopes_1.default.bulk_read,
-        scopes_1.default.folders,
-        scopes_1.default.file_create,
-        scopes_1.default.file_read,
-        scopes_1.default.file_delete,
-        scopes_1.default.functions,
-        scopes_1.default.functions_execution,
-        scopes_1.default.event_listeners,
-        scopes_1.default.event_produce,
-        scopes_1.default.security_read,
-        scopes_1.default.security_update,
-        scopes_1.default.notification_mobile,
-        scopes_1.default.notification_web,
-        scopes_1.default.search_read,
-        scopes_1.default.zia,
-        scopes_1.default.quick_ml,
-        scopes_1.default.pdf_shot,
-        scopes_1.default.dataverse,
-        scopes_1.default.circuits_exe_delete,
-        scopes_1.default.circuits_exe_read,
-        scopes_1.default.circuits_execute,
-        scopes_1.default.appsail_read,
-        scopes_1.default.nosql_table,
-        scopes_1.default.nosql_rows
-    ]
+    SERVE: serveScopes.filter((scope) => !_missingScope.includes(scope))
 });

package/lib/util_modules/constants/lib/placeholders.js

@@ -38,5 +38,12 @@ exports.default = Object.freeze({
         event_time: '{{__EVENT_TIME__}}',
         data: '{{__DATA__}}',
         rule_id: '{{__RULE_ID__}}'
+    },
+    init_js: {
+        project_id: '{{__PROJECT_ID__}}',
+        zaid: '{{__ZAID__}}',
+        auth_domain: '{{__AUTH_DOMAIN__}}',
+        org_id: '{{__ORG_ID__}}',
+        stratus_domain: '{{_STRATUS_DOMAIN__}}'
     }
 });

package/lib/util_modules/constants/lib/ref-mapping.js

@@ -13,7 +13,8 @@ exports.default = Object.freeze({
             applogic: fn_type_1.default.applogic,
             advancedio: fn_type_1.default.advanced,
             integration: fn_type_1.default.integration,
-            browser_logic: fn_type_1.default.browserLogic
+            browser_logic: fn_type_1.default.browserLogic,
+            job: fn_type_1.default.job
         }
     }
 });

package/lib/util_modules/constants/lib/remote-mapping.js

@@ -13,7 +13,8 @@ exports.default = Object.freeze({
             [fn_type_1.default.applogic]: 'applogic',
             [fn_type_1.default.advanced]: 'advancedio',
             [fn_type_1.default.integration]: 'integration',
-            [fn_type_1.default.browserLogic]: 'browser_logic'
+            [fn_type_1.default.browserLogic]: 'browser_logic',
+            [fn_type_1.default.job]: 'job'
         }
     }
 });

package/lib/util_modules/constants/lib/scopes.js

@@ -61,9 +61,24 @@ exports.default = Object.freeze({
     appsail_create: 'ZohoCatalyst.appsail.Create',
     appsail_update: 'ZohoCatalyst.appsail.Update',
     appsail_delete: 'ZohoCatalyst.appsail.Delete',
+    jobpool_read: 'ZohoCatalyst.jobpool.READ',
+    job: 'ZohoCatalyst.job.ALL',
     tunneling_read: 'ZohoCatalyst.tunneling.READ',
     tunneling_update: 'ZohoCatalyst.tunneling.UPDATE',
     iam_profile: 'AaaServer.profile.READ',
-    stratus_create: 'Stratus.sdkop.CREATE',
-    stratus_read: 'Stratus.sdkop.READ'
+    object_creation: 'Stratus.fileop.CREATE',
+    object_operation: 'Stratus.fileop.ALL',
+    stratus_bucket_operation: 'Stratus.bucketop.ALL',
+    object_update: 'ZohoCatalyst.buckets.objects.UPDATE',
+    object_read: 'ZohoCatalyst.buckets.objects.READ',
+    object_delete: 'ZohoCatalyst.buckets.objects.DELETE',
+    bucket_read: 'ZohoCatalyst.buckets.READ',
+    object_create: 'ZohoCatalyst.buckets.objects.CREATE',
+    pipline_read: 'ZohoCatalyst.pipeline.READ',
+    pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE',
+    zest_file_read: 'ZohoZEST.files.READ',
+    zest_spec_read: 'ZohoZEST.specifications.READ',
+    zest_spec_all: 'ZohoZEST.specifications.ALL',
+    zest_spec_src_action: 'ZohoZEST.specifications.sources.CREATE',
+    zest_schedule_job_read: 'ZohoZEST.scheduled_jobs.READ'
 });

package/lib/util_modules/constants/lib/template.js

@@ -38,7 +38,8 @@ exports.default = Object.freeze({
                 Playwright: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'playwright'),
                 Puppeteer: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'puppeteer'),
                 Selenium: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'browserlogic', 'selenium')
-            }
+            },
+            [constants_1.FN_TYPE.job]: (0, path_1.join)(FUNCTIONS_NODE_ROOT, 'job')
         },
         java: {
             [constants_1.FN_TYPE.basic]: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'bio'),
@@ -52,7 +53,8 @@ exports.default = Object.freeze({
             [constants_1.FN_TYPE.browserLogic]: {
                 Selenium: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'browserlogic', 'selenium'),
                 Playwright: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'browserlogic', 'playwright')
-            }
+            },
+            [constants_1.FN_TYPE.job]: (0, path_1.join)(FUNCTIONS_JAVA_ROOT, 'job')
         },
         python: {
             [constants_1.FN_TYPE.basic]: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'bio'),
@@ -62,8 +64,11 @@ exports.default = Object.freeze({
             [constants_1.FN_TYPE.integration]: {
                 [constants_1.INTEG.services.cliq]: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'integ', 'cliq'),
                 [constants_1.INTEG.services.convokraft]: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'integ', 'convokraft')
-            }
+            },
+            [constants_1.FN_TYPE.job]: (0, path_1.join)(FUNCTIONS_PYTHON_ROOT, 'job')
         }
     },
-    event_data: (0, path_1.join)(TEMPLATE_ROOT, 'event', 'data.json')
+    event_data: (0, path_1.join)(TEMPLATE_ROOT, 'event', 'data.json'),
+    job_data: (0, path_1.join)(TEMPLATE_ROOT, 'event', 'job.json'),
+    init_js: (0, path_1.join)(TEMPLATE_ROOT, 'init.txt')
 });

package/lib/util_modules/constants/lib/urls.js

@@ -17,6 +17,13 @@ class URL {
         }
         return URL._auth.replace('.com', dc.ext);
     }
+    static get iamPortal() {
+        const dc = (0, dc_js_1.getActiveDCType)();
+        if (dc === undefined) {
+            return URL._portal;
+        }
+        return URL._portal.replace('.com', dc.ext);
+    }
     static get admin() {
         const dc = (0, dc_js_1.getActiveDCType)();
         if (dc === undefined) {
@@ -61,14 +68,23 @@ class URL {
         }
         return URL._console.replace('.com', dc.ext);
     }
+    static get stratusSuffix() {
+        const dc = (0, dc_js_1.getActiveDCType)();
+        if (dc === undefined) {
+            return URL._stratusSuffix;
+        }
+        return URL._stratusSuffix.replace('.com', dc.ext);
+    }
 }
 exports.default = URL;
 URL._auth = (0, env_js_1.envOverride)('CATALYST_AUTH_URL', 'https://accounts.zoho.com');
+URL._portal = (0, env_js_1.envOverride)('CATALYST_PORTAL_DOMAIN', 'https://accounts.zohoportal.com');
 URL._admin = (0, env_js_1.envOverride)('CATALYST_ADMIN_URL', 'https://api.catalyst.zoho.com');
 URL._app = (0, env_js_1.envOverride)('CATALYST_APP_URL', 'https://catalystserverless.com');
 URL._appSailDomain = (0, env_js_1.envOverride)('CATALYST_APPSAIL_URL', 'https://catalystappsail.com');
 URL._zohoStatic = (0, env_js_1.envOverride)('ZOHO_STATIC', 'https://www.zoho.com/catalyst');
 URL._console = (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');
+URL._stratusSuffix = (0, env_js_1.envOverride)('CATALYST_STRATUS_RESOURCE_SUFFIX', '.zohostratus.com');
 URL.zohoCDN = (0, env_js_1.envOverride)('ZOHO_CDN', 'https://static.zohocdn.com');
 URL.external = Object.freeze({
     gitHubAPI: 'https://api.github.com',

package/lib/util_modules/fs/lib/async.js

@@ -99,8 +99,13 @@ function walk(dir, { filter = {
             const isEntryPthDir = entryPathStats.isDirectory() && !entryPathStats.isSymbolicLink();
             let excludeMatch = false;
             if (!(isEntryPthDir && !filter.excludeDir)) {
-                for (const glob of filter.exclude || []) {
-                    excludeMatch = excludeMatch || (0, minimatch_1.default)(entryPath, glob);
+                if (typeof filter.exclude === 'function') {
+                    excludeMatch = excludeMatch || (yield filter.exclude(entryPath));
+                }
+                else if (Array.isArray(filter.exclude)) {
+                    for (const glob of filter.exclude || []) {
+                        excludeMatch = excludeMatch || (0, minimatch_1.default)(entryPath, glob);
+                    }
                 }
             }
             if (excludeMatch) {
@@ -146,10 +151,15 @@ function deleteDir(dir) {
     });
 }
 exports.deleteDir = deleteDir;
-function copyFile(src, dest, flag) {
+function copyFile(src, dest, overwrite = true) {
     return __awaiter(this, void 0, void 0, function* () {
         yield ensureDir(path_1.default.dirname(dest));
-        return fs_extra_1.default.copyFile(src, dest, flag);
+        return fs_extra_1.default.copy(src, dest, {
+            dereference: true,
+            recursive: false,
+            overwrite,
+            errorOnExist: true
+        });
     });
 }
 exports.copyFile = copyFile;

package/lib/util_modules/fs/lib/sync.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.fileExists = exports.readSymLink = exports.getReadStream = exports.getWriteStream = void 0;
+exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.pathExists = exports.fileExists = exports.readSymLink = exports.getReadStream = exports.getWriteStream = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("../utils");
 function getWriteStream(pth, mode) {
     return fs_extra_1.default.createWriteStream(pth, { mode });
 }
@@ -29,6 +30,16 @@ function fileExists(pth) {
     }
 }
 exports.fileExists = fileExists;
+function pathExists(pth) {
+    try {
+        const stats = fs_extra_1.default.statSync((0, utils_1.untildify)(pth));
+        return stats && true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+exports.pathExists = pathExists;
 function dirExists(pth) {
     try {
         const stats = fs_extra_1.default.statSync(pth);

package/lib/util_modules/server.js

@@ -41,10 +41,8 @@ class ConnectionDestroyer {
                     if (this.server instanceof http_proxy_1.default) {
                         return this.server.close(() => resolve());
                     }
-                    else {
-                        return (this.server.listening &&
-                            this.server.close((err) => (err instanceof Error ? reject(err) : resolve())));
-                    }
+                    return (this.server.listening &&
+                        this.server.close((err) => (err instanceof Error ? reject(err) : resolve())));
                 }
                 resolve();
             });

package/lib/winston.js

@@ -17,9 +17,11 @@ exports.transport = {
     console: new winston_1.transports.Console({
         level: 'info',
         handleExceptions: false,
-        format: winston_1.format.printf((info) => {
-            return info.message;
-        })
+        format: winston_1.format.printf(env_1.isCI
+            ? (info) => (0, strip_ansi_1.default)(info.message)
+            : (info) => {
+                return info.message;
+            })
     }),
     log_file: new winston_1.transports.File({
         filename: constants_1.FILENAME.log,
@@ -47,14 +49,18 @@ exports.transport = {
 };
 if (process.env.DEBUG || process.argv.slice(2).includes('--verbose')) {
     exports.transport.console.level = 'debug';
-    exports.transport.console.format = winston_1.format.combine(winston_1.format.cli({
-        colors: { info: 'green', error: 'red', debug: 'blue', warn: 'yellow' }
-    }), winston_1.format.timestamp({ format: 'YYYY-MM-DD hh:mm:ss.SSS A' }), winston_1.format.printf((info) => {
-        if (exports.transport.console.level === 'info') {
-            return info.message;
-        }
-        return `[${info.timestamp}] ${info.level}: ${info.message}`;
-    }));
+    const formats = [
+        winston_1.format.timestamp({ format: 'YYYY-MM-DD hh:mm:ss.SSS A' }),
+        winston_1.format.printf(env_1.isCI
+            ? (info) => `[${info.timestamp}] ${info.level}: ${(0, strip_ansi_1.default)(info.message)}`
+            : (info) => `[${info.timestamp}] ${info.level}: ${info.message}`)
+    ];
+    if (!env_1.isCI) {
+        formats.unshift(winston_1.format.cli({
+            colors: { info: 'green', error: 'red', debug: 'blue', warn: 'yellow' }
+        }));
+    }
+    exports.transport.console.format = winston_1.format.combine(...formats);
 }
 exports.logger = (0, winston_1.createLogger)({
     transports: [exports.transport.console],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.0",
+	"version": "1.18.0-beta.10",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -25,7 +25,7 @@
 	"homepage": "https://catalyst.zoho.com",
 	"license": "MIT",
 	"dependencies": {
-		"ansi-colors": "^4.1.1",
+		"ansi-colors": "^4.1.3",
 		"app-module-path": "^2.2.0",
 		"better-queue": "^3.8.10",
 		"chokidar": "^3.5.3",
@@ -70,6 +70,7 @@
 		"@types/inquirer-autocomplete-prompt": "^1.3.4",
 		"@types/jest": "^27.4.1",
 		"@types/lodash": "^4.14.182",
+		"@types/mime-types": "^2.1.4",
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "^20.12.7",
 		"@types/request": "^2.48.8",
@@ -94,6 +95,7 @@
 		"build:watch": "gulp watch",
 		"clean": "gulp cleanup",
 		"test:unit": "jest --config jest.config.js",
+		"lint:nofix": "eslint --ext .ts src/ --color",
 		"lint:src": "eslint --ext .ts src/ --fix --color",
 		"lint:unit": "eslint --ext .js,.ts test/ --fix --color",
 		"lint": "run-p lint:src lint:unit",

package/templates/event/job.json

@@ -0,0 +1,30 @@
+{
+    "job_details": {
+        "job_id": "",
+        "created_time": "",
+        "response_code": 200,
+        "start_time": {},
+        "end_time": {},
+        "submitted_on": {},
+        "job_status": "RUNNING",
+        "capacity": { "memory": 256 },
+        "job_meta_details": {
+            "id": "",
+            "url": "",
+            "job_name": "",
+            "job_config": { "number_of_retries": 0 },
+            "target_type": "Function",
+            "target_details": { "id": "", "target_name": "" },
+            "source_type": "API",
+            "source_details": { "source_name": "API" },
+            "jobpool_id": "",
+            "jobpool_details": {},
+            "headers": {},
+            "params": {},
+            "request_method": ""
+        },
+        "retried_count": null,
+        "parent_job_id": "",
+        "execution_time": ""
+    }
+}