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

package/lib/shell/dependencies/local-function.js

@@ -97,7 +97,7 @@ class LocalFunction {
                 return new error_1.default('Invalid input');
             }
             return (() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                 const projectRoot = runtime_store_1.default.get('project.root');
                 const accessToken = yield credential_1.default.getAccessToken();
                 const slaveOptions = [];
@@ -105,9 +105,9 @@ class LocalFunction {
                 yield fs_1.ASYNC.ensureFile(this.responseFile, true);
                 yield fs_1.ASYNC.ensureFile(this.metaFile, true);
                 if (this.target.type === constants_1.FN_TYPE.job) {
-                    const jobDetails = data;
+                    const jobData = data;
                     const jobMetaDetails = {
-                        headers: Object.assign(Object.assign({}, (_a = jobDetails.job_meta_details) === null || _a === void 0 ? void 0 : _a.headers), {
+                        headers: Object.assign(Object.assign({}, (_b = (_a = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _a === void 0 ? void 0 : _a.job_meta_details) === null || _b === void 0 ? void 0 : _b.headers), {
                             'x-zc-projectid': (0, project_1.getProjectId)(),
                             'x-zc-project-domain': (0, project_1.getDomainPrefix)() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
                             'x-zc-project-key': (0, project_1.getDomainKey)(),
@@ -118,8 +118,8 @@ class LocalFunction {
                             'x-zc-admin-cred-token': accessToken,
                             'x-zc-user-type': 'admin'
                         }),
-                        params: ((_b = jobDetails.job_meta_details) === null || _b === void 0 ? void 0 : _b.params) || {},
-                        jobpool_details: ((_c = jobDetails.job_meta_details) === null || _c === void 0 ? void 0 : _c.jobpool_details) || {
+                        params: ((_d = (_c = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _c === void 0 ? void 0 : _c.job_meta_details) === null || _d === void 0 ? void 0 : _d.params) || {},
+                        jobpool_details: ((_f = (_e = jobData === null || jobData === void 0 ? void 0 : jobData.job_details) === null || _e === void 0 ? void 0 : _e.job_meta_details) === null || _f === void 0 ? void 0 : _f.jobpool_details) || {
                             type: 'Function',
                             project_details: {
                                 project_name: (0, project_1.getProjectName)(),
@@ -127,14 +127,14 @@ class LocalFunction {
                             }
                         }
                     };
-                    jobDetails.job_meta_details = jobMetaDetails;
-                    jobDetails.capacity = jobDetails.capacity || {
+                    jobData.job_details = Object.assign(Object.assign({}, jobData.job_details), { job_meta_details: jobMetaDetails });
+                    jobData.capacity = jobData.capacity || {
                         memory: '256'
                     };
-                    data = jobDetails;
+                    data = jobData;
                 }
                 const slaveFnTarget = { index: this.target.index, name: this.target.name };
-                if ((_d = this.target.stack) === null || _d === void 0 ? void 0 : _d.startsWith(runtime_1.default.language.node.value)) {
+                if ((_g = this.target.stack) === null || _g === void 0 ? void 0 : _g.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== null) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
@@ -158,10 +158,10 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)('node', slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_e = this.target) === null || _e === void 0 ? void 0 : _e.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_h = this.target) === null || _h === void 0 ? void 0 : _h.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_f = this.target.stack) === null || _f === void 0 ? void 0 : _f.startsWith(runtime_1.default.language.java.value)) {
+                else if ((_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.startsWith(runtime_1.default.language.java.value)) {
                     const javaInvokerDir = (0, path_1.parse)(this.javaInvoker).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
@@ -196,11 +196,11 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(spawnCommand, slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_g = this.target) === null || _g === void 0 ? void 0 : _g.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
-                else if ((_h = this.target.stack) === null || _h === void 0 ? void 0 : _h.startsWith(runtime_1.default.language.python.value)) {
-                    const stackVersion = (_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.replace('python_', '');
+                else if ((_l = this.target.stack) === null || _l === void 0 ? void 0 : _l.startsWith(runtime_1.default.language.python.value)) {
+                    const stackVersion = (_m = this.target.stack) === null || _m === void 0 ? void 0 : _m.replace('python_', '');
                     const runtimesDir = constants_1.ENVPATH.runtimes.data;
                     const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
                     const runTimePort = yield port_resolver_1.default.getFreePort(httpPort, 20, false);
@@ -211,10 +211,10 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_o = this.target) === null || _o === void 0 ? void 0 : _o.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
                     }).RAW();
                     this.slave.once('spawn', () => __awaiter(this, void 0, void 0, function* () {
-                        var _o;
+                        var _r;
                         const jsonData = data;
                         jsonData.timestamp = Date.now();
                         const writeResponse = (response, status) => {
@@ -223,15 +223,15 @@ class LocalFunction {
                         };
                         if (this.target.type === constants_1.FN_TYPE.job) {
                             const jobDetailsServer = new http_1.Server((serverReq, serverRes) => __awaiter(this, void 0, void 0, function* () {
-                                var _p, _q, _r;
-                                if ((_p = serverReq.url) === null || _p === void 0 ? void 0 : _p.includes('data')) {
+                                var _s, _t, _u;
+                                if ((_s = serverReq.url) === null || _s === void 0 ? void 0 : _s.includes('data')) {
                                     serverRes.writeHead(200);
                                     serverRes.write(JSON.stringify({
                                         data: jsonData
                                     }));
                                     serverRes.end();
                                 }
-                                else if ((_q = serverReq.url) === null || _q === void 0 ? void 0 : _q.includes('callback')) {
+                                else if ((_t = serverReq.url) === null || _t === void 0 ? void 0 : _t.includes('callback')) {
                                     const reqData = yield new Promise((resolve) => {
                                         const data = [];
                                         serverReq.on('data', (chunk) => data.push(chunk));
@@ -262,7 +262,7 @@ class LocalFunction {
                                 else {
                                     (0, logger_1.debug)(`Invalid request: (${serverReq.method}) ${serverReq.url}`);
                                     writeResponse('INTERNAL_SERVER_ERROR', 500);
-                                    (_r = this.slave) === null || _r === void 0 ? void 0 : _r.kill('SIGINT');
+                                    (_u = this.slave) === null || _u === void 0 ? void 0 : _u.kill('SIGINT');
                                     return;
                                 }
                             }));
@@ -270,7 +270,7 @@ class LocalFunction {
                             jobDetailsServer.listen(runTimePort, () => {
                                 (0, logger_1.debug)('server listening on port :' + runTimePort);
                             });
-                            (_o = this.slave) === null || _o === void 0 ? void 0 : _o.once('exit', () => {
+                            (_r = this.slave) === null || _r === void 0 ? void 0 : _r.once('exit', () => {
                                 jobConnDestroyer.destroy();
                             });
                             return;
@@ -347,11 +347,11 @@ class LocalFunction {
                         exit: 2
                     });
                 }
-                (_l = this.slave.stdout) === null || _l === void 0 ? void 0 : _l.on('data', (message) => {
+                (_p = this.slave.stdout) === null || _p === void 0 ? void 0 : _p.on('data', (message) => {
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(message.toString());
                 });
-                (_m = this.slave.stderr) === null || _m === void 0 ? void 0 : _m.on('data', (message) => {
+                (_q = this.slave.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (message) => {
                     const errorStr = js_1.JS.trim(message.toString());
                     (0, shell_1.clearLine)(process.stdout);
                     (0, logger_1.info)(errorStr);
@@ -379,6 +379,7 @@ class LocalFunction {
                                 });
                                 break;
                             case constants_1.FN_TYPE.cron:
+                            case constants_1.FN_TYPE.job:
                             case constants_1.FN_TYPE.event:
                                 (0, logger_1.info)(`[status - ${this.target.name}] ${response || 'Unknown'}`);
                                 if (!response) {

package/lib/shell/dependencies/tunnel-server.js

@@ -33,6 +33,7 @@ const server_1 = require("../../util_modules/server");
 const ansi_colors_1 = require("ansi-colors");
 const util_1 = require("util");
 const project_1 = require("../../util_modules/project");
+const endpoints_1 = require("../../endpoints");
 class TunnelServer {
     constructor(repel) {
         _TunnelServer_contextMap.set(this, {});
@@ -42,6 +43,29 @@ class TunnelServer {
         _TunnelServer_projectId.set(this, (0, project_1.getProjectId)());
         __classPrivateFieldSet(this, _TunnelServer_repel, repel, "f");
     }
+    isAsyncFn(fnType) {
+        switch (fnType) {
+            case 'cron':
+            case 'event':
+            case 'job': {
+                return true;
+            }
+        }
+        return false;
+    }
+    send(req, res, status = 200, data, contentType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const body = req.body;
+            if (this.isAsyncFn(body.function_details.function_type)) {
+                const tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+                yield tunnelAPI.tunnelCallback(status, body.default, data);
+                return;
+            }
+            contentType && res.contentType(contentType);
+            res.status(status);
+            res.send(data);
+        });
+    }
     startServer() {
         return __awaiter(this, void 0, void 0, function* () {
             const tunnelPortOpt = Number.parseInt(runtime_store_1.default.get('context.port.tunnel'));
@@ -59,23 +83,33 @@ class TunnelServer {
             const app = (0, express_1.default)();
             app.use(express_1.default.json());
             app.all('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+                if (req.method !== 'POST') {
+                    res.status(200);
+                    res.send();
+                    return;
+                }
+                const body = req.body;
+                if (!body.function_details ||
+                    !body.function_data ||
+                    (body.function_details.function_type !== 'integration' && !body.default)) {
+                    res.status(400);
+                    res.send();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
+                    return;
+                }
+                if (this.isAsyncFn(body.function_details.function_type)) {
+                    res.status(200);
+                    res.send();
+                }
                 try {
-                    const body = req.body;
-                    if (!body.function_details || !body.function_data) {
-                        res.status(400);
-                        res.send();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
-                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
-                        return;
-                    }
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                     __classPrivateFieldGet(this, _TunnelServer_repel, "f").write((0, ansi_colors_1.bold)(`Received tunnel request from ${body.function_details.function_name}(${body.function_details.function_id})`));
                     const target = body.function_details.function_id in __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")
                         ? __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[body.function_details.function_id]
-                        : (() => {
+                        : yield (() => __awaiter(this, void 0, void 0, function* () {
                             if (__classPrivateFieldGet(this, _TunnelServer_projectId, "f") !== body.function_details.project_id) {
-                                res.status(403);
-                                res.send();
+                                yield this.send(req, res, 403);
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid access: the tunnel is trying to access the functions from a different project');
                                 __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
@@ -87,15 +121,14 @@ class TunnelServer {
                             if (namedFn) {
                                 return namedFn;
                             }
-                            res.status(404);
-                            res.send();
+                            yield this.send(req, res, 404);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write(`The tunneled function ${(0, ansi_colors_1.bold)(body.function_details.function_name)} is not present in local project directory`);
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('[STATUS]');
                             __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('NOT_FOUND');
                             return;
-                        }).bind(this)();
+                        })).bind(this)();
                     if (!target) {
                         return;
                     }
@@ -103,11 +136,10 @@ class TunnelServer {
                         ? JSON.parse(body.function_data)
                         : body.function_data;
                     target.call(false)(fnData);
-                    const errorHandler = (e) => {
-                        res.status(500);
-                        res.send();
+                    const errorHandler = (e) => __awaiter(this, void 0, void 0, function* () {
+                        yield this.send(req, res, 500);
                         (0, logger_1.debug)('Target error: ' + e);
-                    };
+                    });
                     target.once('error', errorHandler);
                     const response = yield new Promise((resolve, reject) => {
                         target.once('response', (response) => {
@@ -118,13 +150,10 @@ class TunnelServer {
                             resolve(response);
                         });
                     });
-                    response.ContentType && res.setHeader('Content-Type', response.ContentType);
-                    res.status(response.status || 200);
-                    res.send(response.responseBody);
+                    yield this.send(req, res, response.status, response.responseBody, response.ContentType);
                 }
                 catch (e) {
-                    res.status(500);
-                    res.send();
+                    yield this.send(req, res, 500);
                     (0, logger_1.debug)(e);
                 }
             }));

package/lib/shell/index.js

@@ -49,35 +49,29 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default({ repl: replServer });
     const tunnelServer = new tunnel_server_1.default(replServer);
     const projectRoot = runtime_store_1.default.get('project.root');
-    try {
-        yield (0, prepare_1.default)([
-            constants_1.FN_TYPE.basic,
-            constants_1.FN_TYPE.cron,
-            constants_1.FN_TYPE.event,
-            constants_1.FN_TYPE.integration,
-            constants_1.FN_TYPE.job
-        ]);
-        const targets = runtime_store_1.default
-            .get('context.functions.targets', [])
-            .filter((target) => {
-            if (!target.valid) {
-                (0, logger_js_1.warning)('target [' +
-                    target.name +
-                    '] is not a valid one reason : ' +
-                    target.failure_reason);
-                Array.isArray(target.compilationError) &&
-                    target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
-                Array.isArray(target.compilationWarning) &&
-                    target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
-            }
-            return target.valid;
-        });
-        if (targets.length === 0) {
-            throw new error_1.default('No functions are ready for serving', {
-                exit: 0,
-                errorId: 'SHELL-IDX-1'
-            });
+    yield (0, prepare_1.default)([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration, constants_1.FN_TYPE.job]);
+    const targets = runtime_store_1.default
+        .get('context.functions.targets', [])
+        .filter((target) => {
+        if (!target.valid) {
+            (0, logger_js_1.warning)('target [' +
+                target.name +
+                '] is not a valid one reason : ' +
+                target.failure_reason);
+            Array.isArray(target.compilationError) &&
+                target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
+            Array.isArray(target.compilationWarning) &&
+                target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
         }
+        return target.valid;
+    });
+    if (targets.length === 0) {
+        throw new error_1.default('No functions are ready for serving', {
+            exit: 0,
+            errorId: 'SHELL-IDX-1'
+        });
+    }
+    try {
         replServer.start();
         yield tunnelServer.startServer();
         const tunnelUrl = runtime_store_1.default.get('context.fn_shell.enable_tunnel', undefined);

package/lib/util_modules/config/lib/appsail.js

@@ -26,6 +26,8 @@ function validateConfig(source, configJson) {
             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) {
@@ -34,14 +36,9 @@ function validateConfig(source, configJson) {
                 reason: 'Build Path not present'
             };
         }
-        const absolutePath = (0, path_1.isAbsolute)(buildPath) ? buildPath : (0, path_1.resolve)(source, buildPath);
-        if (!fs_1.SYNC.pathExists(absolutePath)) {
-            return {
-                valid: false,
-                reason: 'Build Path does not exists'
-            };
-        }
+        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) {
@@ -78,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) {
@@ -123,6 +124,7 @@ function getAllTargetDetails(throwErr = true) {
             resArr.push(new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                 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));
                 }

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/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/placeholders.js

@@ -43,6 +43,7 @@ exports.default = Object.freeze({
         project_id: '{{__PROJECT_ID__}}',
         zaid: '{{__ZAID__}}',
         auth_domain: '{{__AUTH_DOMAIN__}}',
-        org_id: '{{__ORG_ID__}}'
+        org_id: '{{__ORG_ID__}}',
+        stratus_domain: '{{_STRATUS_DOMAIN__}}'
     }
 });

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

@@ -66,8 +66,19 @@ exports.default = Object.freeze({
     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'
+    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/urls.js

@@ -68,6 +68,13 @@ 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');
@@ -77,6 +84,7 @@ URL._app = (0, env_js_1.envOverride)('CATALYST_APP_URL', 'https://catalystserver
 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.1",
+	"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/init/client/react/react_js/template/src/index.js

@@ -1,14 +1,14 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 
-ReactDOM.render(
+const root = ReactDOM.createRoot(document.getElementById('root'));
+root.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,
-  document.getElementById('root')
 );
 
 // If you want to start measuring performance in your app, pass a function

package/templates/init/client/react/react_ts/template/src/index.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM, { Container } from 'react-dom/client';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 
-ReactDOM.render(
+const root = ReactDOM.createRoot(document.getElementById('root') as Container);
+root.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,
-  document.getElementById('root')
 );
 
 // If you want to start measuring performance in your app, pass a function

package/templates/init/client/react/react_ts/template.json

@@ -4,9 +4,9 @@
       "@testing-library/jest-dom": "^5.11.4",
       "@testing-library/react": "^11.1.0",
       "@testing-library/user-event": "^12.1.10",
-      "@types/node": "^12.0.0",
-      "@types/react": "^17.0.0",
-      "@types/react-dom": "^17.0.0",
+      "@types/node": "latest",
+      "@types/react": "latest",
+      "@types/react-dom": "latest",
       "@types/jest": "^26.0.15",
       "typescript": "^4.1.2",
       "web-vitals": "^1.0.1"

package/templates/init/functions/java/job/sample.java

@@ -23,7 +23,7 @@ public class {{_CLASS_}} implements CatalystJobHandler {
 			}
 			LOGGER.log(Level.SEVERE, "Project Details " + request.getProjectDetails().toString());
 			ZCCache.getInstance().putCacheValue("JobSample", "Working", 1l);
-			LOGGER.log(Level.SEVERE, "Inserted SucessFully:)");
+			LOGGER.log(Level.SEVERE, "Inserted SuccessFully:)");
 		} catch (Exception e) {
 			LOGGER.log(Level.SEVERE, "Exception in Job Function", e);
 			return JOB_STATUS.FAILURE;

package/templates/init/functions/node/aio/sample.js

@@ -1,5 +1,12 @@
 'use strict';
 
+const { IncomingMessage, ServerResponse } = require("http");
+
+/**
+ * 
+ * @param {IncomingMessage} req 
+ * @param {ServerResponse} res 
+ */
 module.exports = (req, res) => {
 	var url = req.url;
 

package/templates/init/functions/node/bio/sample.js

@@ -1,3 +1,8 @@
+/**
+ * 
+ * @param {import('./types/basicio').Context} context 
+ * @param {import('./types/basicio').BasicIO} basicIO 
+ */
 module.exports = (context, basicIO) => {
 	/* 
         BASICIO FUNCTIONALITIES