zcatalyst-cli 1.12.1 → 1.13.2

package/lib/shell/dependencies/http-functions.js

@@ -31,21 +31,22 @@ const logger_2 = require("../../util_modules/logger");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
 const logUrl = (name, pthName, httpPort, masterPort) => {
-    logger_2.labeled(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
+    (0, logger_2.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
 };
 class HttpFunctions {
-    constructor(repl) {
+    constructor({ repl, primary = true } = {}) {
         this.repl = repl;
-        this.app = express_1.default();
+        this.app = (0, express_1.default)();
+        this.app.locals.primary = primary;
         this.nodeInvoker = {
-            [constants_1.FN_TYPE.basic]: path_1.normalize(path_1.join(__dirname, './invoker', constants_1.FN_TYPE.basic, 'node.js'))
+            [constants_1.FN_TYPE.basic]: (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', constants_1.FN_TYPE.basic, 'node.js'))
         };
         this.javaInvoker = {
-            [constants_1.FN_TYPE.basic]: path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + constants_1.FN_TYPE.basic + 'Invoker')
+            [constants_1.FN_TYPE.basic]: (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + constants_1.FN_TYPE.basic + 'Invoker')
         };
-        this.requestFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_req_body');
-        this.responseFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
-        this.metaFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
+        this.requestFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_req_body');
+        this.responseFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
+        this.metaFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
         this.runningSlaves = [];
         this.targets = [];
         this.q = new better_queue_1.default((opts, cb) => {
@@ -61,25 +62,26 @@ class HttpFunctions {
                     'content-length': opts.req.headers['content-length']
                 }
             }));
-            const slave = shell_1.spawn(opts.command, opts.options, {
+            const slave = (0, shell_1.spawn)(opts.command, opts.options, {
                 cwd: opts.pth,
                 stdio: 'pipe',
                 env: {
                     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
                 }
             }).RAW();
             (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                logger_2.info(Buffer.isBuffer(data) ? data.toString() : data);
+                (0, logger_2.info)(Buffer.isBuffer(data) ? data.toString() : data);
             });
             (_b = slave.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
                 const errorStr = data.toString().trim();
-                logger_2.info(errorStr);
+                (0, logger_2.info)(errorStr);
             });
             slave.on('uncaughtException', (err, origin) => {
                 const errorString = `Caught exception: ${err}\n` + `Exception origin: ${origin}`;
-                logger_2.error(errorString);
+                (0, logger_2.error)(errorString);
                 cb(errorString, null);
             });
             slave.on('exit', (code) => {
@@ -112,20 +114,22 @@ class HttpFunctions {
             const httpPort = parseInt(runtime_store_1.default.get('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]), 10);
             if (this.repl !== undefined) {
                 this.app.use((_req, _res, next) => {
-                    shell_1.clearLine(process.stdout);
+                    (0, shell_1.clearLine)(process.stdout);
                     next();
                 });
             }
-            this.app.use(logger_1.default);
-            this.app.use(cookie_parser_1.default);
-            this.app.use(authenticator_1.default);
-            this.app.use(project_1.default({
-                id: project_2.getProjectId(),
-                domain_prefix: project_2.getDomainPrefix(),
-                domain: constants_1.ORIGIN.app.replace('https://', ''),
-                key: project_2.getDomainKey(),
-                env_name: project_2.getEnvName()
-            }));
+            if (this.app.locals.primary) {
+                this.app.use(logger_1.default);
+                this.app.use(cookie_parser_1.default);
+                this.app.use((0, project_1.default)({
+                    id: (0, project_2.getProjectId)(),
+                    domain_prefix: (0, project_2.getDomainPrefix)(),
+                    domain: constants_1.ORIGIN.app.replace('https://', ''),
+                    key: (0, project_2.getDomainKey)(),
+                    env_name: (0, project_2.getEnvName)()
+                }));
+                this.app.use(authenticator_1.default);
+            }
             const reqHandler = (fnTarget) => (request, response, next) => {
                 var _a, _b;
                 const urlParts = new url_1.URL(request.originalUrl, request.protocol + '://' + request.get('host')).searchParams;
@@ -155,9 +159,10 @@ class HttpFunctions {
                         'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
                         'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
                         'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                        'x-zc-cookie': request.headers['x-zc-cookie']
+                        'x-zc-cookie': request.headers['x-zc-cookie'],
+                        'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
-                    slaveOptions.push(JSON.stringify(path_1.join(runtime_store_1.default.get('cwd'), '.build')));
+                    slaveOptions.push(JSON.stringify((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')));
                     slave = this.q.push({
                         command: 'node',
                         options: slaveOptions,
@@ -167,18 +172,18 @@ class HttpFunctions {
                     });
                 }
                 else if ((_b = fnTarget.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
-                    const javaInvokerDir = path_1.parse(this.javaInvoker[fnTarget.type]).dir;
+                    const javaInvokerDir = (0, path_1.parse)(this.javaInvoker[fnTarget.type]).dir;
                     slaveOptions.push('-cp');
                     slaveOptions.push(javaInvokerDir +
                         fn_utils_1.fnUtils.java.classPathSep +
-                        path_1.join(javaInvokerDir, 'lib', '*'));
+                        (0, path_1.join)(javaInvokerDir, 'lib', '*'));
                     if (debugPort !== -1) {
                         slaveOptions.push('-Xdebug');
                         slaveOptions.push('-Xrunjdwp:transport=dt_socket,address=' +
                             debugPort +
                             ',server=y,suspend=y');
                     }
-                    slaveOptions.push(path_1.basename(this.javaInvoker[fnTarget.type]));
+                    slaveOptions.push((0, path_1.basename)(this.javaInvoker[fnTarget.type]));
                     slaveOptions.push(javaInvokerDir);
                     slaveOptions.push(JSON.stringify(fnTarget));
                     slaveOptions.push(query);
@@ -193,7 +198,8 @@ class HttpFunctions {
                         'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
                         'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
                         'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                        'x-zc-cookie': request.headers['x-zc-cookie']
+                        'x-zc-cookie': request.headers['x-zc-cookie'],
+                        'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
                     slave = this.q.push({
                         command: 'java',
@@ -233,7 +239,7 @@ class HttpFunctions {
                     }
                 });
             };
-            shell_1.clearLine(process.stdout);
+            (0, shell_1.clearLine)(process.stdout);
             const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
             const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
             fnTargets
@@ -245,7 +251,7 @@ class HttpFunctions {
                 .forEach((t) => {
                 var _a;
                 if ((_a = t.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-                    fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], path_1.normalize(path_1.join(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
+                    fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker[t.type], (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', t.type, 'java', 'Java' + t.type + 'Invoker.java')));
                 }
                 const pthName = new url_1.URL(t.url).pathname;
                 if (pthName !== null) {
@@ -269,7 +275,7 @@ class HttpFunctions {
                             }
                         });
                         (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.on('compiled', () => {
-                            logger_2.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
+                            (0, logger_2.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
                             logUrl(target.name, new url_1.URL(target.url).pathname, httpPort, masterPort);
                             if (this.repl && this.repl.paused) {
                                 this.repl.resume();
@@ -292,7 +298,7 @@ class HttpFunctions {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             const server = yield this._spinUpServer();
-            logger_2.info();
+            (0, logger_2.info)();
             server.on('connection', (socket) => {
                 socket.unref();
             });
@@ -310,7 +316,7 @@ class HttpFunctions {
                     yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _a; return (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close(); })));
                     if (HttpFunctions.server !== null) {
                         HttpFunctions.server.close((err) => {
-                            logger_2.debug(err);
+                            (0, logger_2.debug)(err);
                             res();
                         });
                     }

package/lib/shell/dependencies/invoker/bio/java/JavabioInvoker.java

@@ -18,6 +18,7 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -41,7 +42,7 @@ public class JavabioInvoker {
 				if (record.getThrown() != null) {
 					exceptionMessage = getStackTraceAsString(record.getThrown());
 				}
-				String message = record.getMessage() + " " + exceptionMessage;
+				String message = new SimpleFormatter().format(record) + " " + exceptionMessage;
 				if (message.length() > MESSAGE_LENGTH) {
 					message = message.substring(0, MESSAGE_LENGTH);
 				}
@@ -164,13 +165,24 @@ public class JavabioInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
 
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java

@@ -18,6 +18,7 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -42,7 +43,7 @@ public class JavacronInvoker {
 				if (record.getThrown() != null) {
 					exceptionMessage = getStackTraceAsString(record.getThrown());
 				}
-				String message = record.getMessage() + " " + exceptionMessage;
+				String message = new SimpleFormatter().format(record) + " " + exceptionMessage;
 				if (message.length() > MESSAGE_LENGTH) {
 					message = message.substring(0, MESSAGE_LENGTH);
 				}
@@ -139,13 +140,23 @@ public class JavacronInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/event/java/JavaeventInvoker.java

@@ -18,6 +18,7 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -42,7 +43,7 @@ public class JavaeventInvoker {
 				if (record.getThrown() != null) {
 					exceptionMessage = getStackTraceAsString(record.getThrown());
 				}
-				String message = record.getMessage() + " " + exceptionMessage;
+				String message = new SimpleFormatter().format(record) + " " + exceptionMessage;
 				if (message.length() > MESSAGE_LENGTH) {
 					message = message.substring(0, MESSAGE_LENGTH);
 				}
@@ -139,13 +140,23 @@ public class JavaeventInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/integ/java/JavaintegInvoker.java

@@ -18,6 +18,7 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -39,7 +40,7 @@ public class JavaintegInvoker {
 				if (record.getThrown() != null) {
 					exceptionMessage = getStackTraceAsString(record.getThrown());
 				}
-				String message = record.getMessage() + " " + exceptionMessage;
+				String message = new SimpleFormatter().format(record) + " " + exceptionMessage;
 				if (message.length() > MESSAGE_LENGTH) {
 					message = message.substring(0, MESSAGE_LENGTH);
 				}
@@ -140,13 +141,23 @@ public class JavaintegInvoker {
 
 			clientAuth.put((userAuthHeaderType.equals("token")) ? "access_token" : "ticket", userAuthToken); // No I18N
 		}
+		if(auth.containsKey("x-zc-user-type")) { // No I18N
+			String userType = auth.get("x-zc-user-type").toString(); // No I18N
+			clientAuth.put("user_type", userType); // No I18N
+		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
-
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
+
+		// For backward compatibility, to be remove in future.
 		if (auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/integ/node.js

@@ -1,7 +1,11 @@
 'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -28,9 +32,9 @@ const data = JSON.parse(args[1]);
 const projectJson = JSON.parse(args[2]);
 const authJson = JSON.parse(args[3]);
 const buildDir = JSON.parse(args[4]);
-const responseFile = path_1.join(buildDir, '.catalyst', 'user_res_body');
+const responseFile = (0, path_1.join)(buildDir, '.catalyst', 'user_res_body');
 const writeAndExit = (resp, exitCode = 0) => {
-    fs_1.writeFileSync(responseFile, JSON.stringify(resp));
+    (0, fs_1.writeFileSync)(responseFile, JSON.stringify(resp));
     process.exit(exitCode);
 };
 const integrationRequest = data || {};
@@ -71,5 +75,5 @@ try {
 }
 catch (e) {
     console.error(e);
-    writeAndExit({ error: util_1.inspect(e) }, 2);
+    writeAndExit({ error: (0, util_1.inspect)(e) }, 2);
 }

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

@@ -34,13 +34,13 @@ class LocalFunction {
         this.watcher = target.watcher;
         this.target = js_1.JS.omit(target, ['zip_stream', 'watcher']);
         this.slave = null;
-        this.nodeInvoker = path_1.normalize(path_1.join(__dirname, './invoker', target.type, 'node.js'));
-        this.javaInvoker = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + target.type + 'Invoker');
+        this.nodeInvoker = (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'node.js'));
+        this.javaInvoker = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'Java' + target.type + 'Invoker');
         if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-            fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker, path_1.normalize(path_1.join(__dirname, './invoker', target.type, 'java', 'Java' + target.type + 'Invoker.java')));
+            fn_utils_1.fnUtils.java.ensureJavaInvoker(this.javaInvoker, (0, path_1.normalize)((0, path_1.join)(__dirname, './invoker', target.type, 'java', 'Java' + target.type + 'Invoker.java')));
         }
-        this.responseFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
-        this.metaFile = path_1.join(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
+        this.responseFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_res_body');
+        this.metaFile = (0, path_1.join)(runtime_store_1.default.get('cwd'), '.build', '.catalyst', 'user_meta.json');
         this.call = this._call.bind(this);
         (_b = this.watcher) === null || _b === void 0 ? void 0 : _b.on('preparing', () => {
             if (!this.repl.paused) {
@@ -48,7 +48,7 @@ class LocalFunction {
             }
         });
         (_c = this.watcher) === null || _c === void 0 ? void 0 : _c.on('compiled', () => {
-            logger_1.labeled(`functions(${target.name})`, 'ready!').MESSAGE();
+            (0, logger_1.labeled)(`functions(${target.name})`, 'ready!').MESSAGE();
             if (this.repl.paused) {
                 repl.resume();
                 repl.showPrompt();
@@ -64,7 +64,7 @@ class LocalFunction {
         try {
             data = JSON.stringify(rawData);
             if (!data.startsWith('{') || !data.endsWith('}')) {
-                const content = fs_1.SYNC.readFile(path_1.resolve(runtime_store_1.default.get('cwd'), data.slice(1, data.length - 1)));
+                const content = fs_1.SYNC.readFile((0, path_1.resolve)(runtime_store_1.default.get('cwd'), data.slice(1, data.length - 1)));
                 if (content === undefined) {
                     return new error_1.default('content is undefined for provided file path');
                 }
@@ -72,12 +72,12 @@ class LocalFunction {
             }
         }
         catch (e) {
-            logger_1.info('the input must be in the form of json or a path to a file containing json data.');
+            (0, logger_1.info)('the input must be in the form of json or a path to a file containing json data.');
             return new error_1.default('Invalid input');
         }
         if (this.target.type === constants_1.FN_TYPE.event && !data.includes('event_bus_details')) {
-            logger_1.info('For event function kindly use event:generate command to generate the input json.');
-            logger_1.info('You can also provide event details as per documentation.');
+            (0, logger_1.info)('For event function kindly use event:generate command to generate the input json.');
+            (0, logger_1.info)('You can also provide event details as per documentation.');
             return new error_1.default('Event bus details missing');
         }
         return (() => __awaiter(this, void 0, void 0, function* () {
@@ -95,57 +95,61 @@ class LocalFunction {
                 slaveOptions.push(JSON.stringify(this.target));
                 slaveOptions.push(data);
                 slaveOptions.push(JSON.stringify({
-                    'x-zc-projectid': project_1.getProjectId(),
-                    'x-zc-project-domain': project_1.getDomainPrefix() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
-                    'x-zc-project-key': project_1.getDomainKey(),
-                    'x-zc-environment': project_1.getEnvName()
+                    '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)(),
+                    'x-zc-environment': (0, project_1.getEnvName)()
                 }));
                 slaveOptions.push(JSON.stringify({
                     'x-zc-user-cred-type': 'token',
                     'x-zc-user-cred-token': accessToken,
                     'x-zc-admin-cred-type': 'token',
-                    'x-zc-admin-cred-token': accessToken
+                    'x-zc-admin-cred-token': accessToken,
+                    'x-zc-user-type': 'admin'
                 }));
-                slaveOptions.push(JSON.stringify(path_1.join(runtime_store_1.default.get('cwd'), '.build')));
-                this.slave = shell_1.spawn('node', slaveOptions, {
+                slaveOptions.push(JSON.stringify((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')));
+                this.slave = (0, shell_1.spawn)('node', slaveOptions, {
                     cwd: this.target.source,
                     stdio: 'pipe',
                     env: {
                         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
                     }
                 }).RAW();
             }
             else if ((_b = this.target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
-                const javaInvokerDir = path_1.parse(this.javaInvoker).dir;
+                const javaInvokerDir = (0, path_1.parse)(this.javaInvoker).dir;
                 slaveOptions.push('-cp');
-                slaveOptions.push(javaInvokerDir + fn_utils_1.fnUtils.java.classPathSep + path_1.join(javaInvokerDir, 'lib', '*'));
+                slaveOptions.push(javaInvokerDir + fn_utils_1.fnUtils.java.classPathSep + (0, path_1.join)(javaInvokerDir, 'lib', '*'));
                 if (debugPort !== null) {
                     slaveOptions.push('-Xdebug');
                     slaveOptions.push('-Xrunjdwp:transport=dt_socket,address=' + debugPort + ',server=y,suspend=y');
                 }
-                slaveOptions.push(path_1.basename(this.javaInvoker));
+                slaveOptions.push((0, path_1.basename)(this.javaInvoker));
                 slaveOptions.push(javaInvokerDir);
                 slaveOptions.push(JSON.stringify(this.target));
                 slaveOptions.push(data);
                 slaveOptions.push(JSON.stringify({
-                    'x-zc-projectid': project_1.getProjectId(),
-                    'x-zc-project-domain': project_1.getDomainPrefix() + '.' + constants_1.ORIGIN.app.replace('https://', ''),
-                    'x-zc-project-key': project_1.getDomainKey(),
-                    'x-zc-environment': project_1.getEnvName()
+                    '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)(),
+                    'x-zc-environment': (0, project_1.getEnvName)()
                 }));
                 slaveOptions.push(JSON.stringify({
                     'x-zc-user-cred-type': 'token',
                     'x-zc-user-cred-token': accessToken,
                     'x-zc-admin-cred-type': 'token',
-                    'x-zc-admin-cred-token': accessToken
+                    'x-zc-admin-cred-token': accessToken,
+                    'x-zc-user-type': 'admin'
                 }));
-                this.slave = shell_1.spawn('java', slaveOptions, {
+                this.slave = (0, shell_1.spawn)('java', slaveOptions, {
                     cwd: this.target.source,
                     stdio: 'pipe',
                     env: {
                         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
                     }
@@ -157,18 +161,18 @@ class LocalFunction {
                 });
             }
             (_c = this.slave.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (message) => {
-                shell_1.clearLine(process.stdout);
-                logger_1.info(message.toString());
+                (0, shell_1.clearLine)(process.stdout);
+                (0, logger_1.info)(message.toString());
             });
             (_d = this.slave.stderr) === null || _d === void 0 ? void 0 : _d.on('data', (message) => {
                 const errorStr = js_1.JS.trim(message.toString());
-                shell_1.clearLine(process.stdout);
-                logger_1.info(errorStr);
+                (0, shell_1.clearLine)(process.stdout);
+                (0, logger_1.info)(errorStr);
             });
             this.slave.on('exit', (code) => __awaiter(this, void 0, void 0, function* () {
                 if (code !== null && code !== 130) {
-                    logger_1.info('[cli] Function execution complete');
-                    logger_1.info();
+                    (0, logger_1.info)('[cli] Function execution complete');
+                    (0, logger_1.info)();
                     const response = yield fs_1.ASYNC.readFile(this.responseFile);
                     let meta;
                     try {
@@ -179,19 +183,19 @@ class LocalFunction {
                     }
                     switch (this.target.type) {
                         case constants_1.FN_TYPE.basic:
-                            logger_1.info('[response]');
-                            logger_1.info(response);
-                            logger_1.info('[status]');
-                            logger_1.info(meta.statusCode || 200);
+                            (0, logger_1.info)('[response]');
+                            (0, logger_1.info)(response);
+                            (0, logger_1.info)('[status]');
+                            (0, logger_1.info)(meta.statusCode || 200);
                             break;
                         case constants_1.FN_TYPE.cron:
                         case constants_1.FN_TYPE.event:
-                            logger_1.info('[status]');
-                            logger_1.info(response);
+                            (0, logger_1.info)('[status]');
+                            (0, logger_1.info)(response);
                             break;
                         case constants_1.FN_TYPE.integration:
-                            logger_1.info('[response]');
-                            logger_1.info(response);
+                            (0, logger_1.info)('[response]');
+                            (0, logger_1.info)(response);
                             break;
                         default:
                             break;

package/lib/shell/index.js

@@ -38,19 +38,19 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 if (output instanceof Error) {
                     return ansi_colors_1.bold.red('Error: ') + output.message;
                 }
-                return util_1.inspect(output);
+                return (0, util_1.inspect)(output);
             }
             return '';
         }
     });
-    const httpServer = new http_functions_1.default(replServer);
+    const httpServer = new http_functions_1.default({ repl: replServer });
     try {
-        yield prepare_1.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
+        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]);
         const targets = runtime_store_1.default
             .get('context.functions.targets', [])
             .filter((target) => {
             if (!target.valid) {
-                logger_js_1.warning('target [' +
+                (0, logger_js_1.warning)('target [' +
                     target.name +
                     '] is not a valid one reason : ' +
                     target.failure_reason);
@@ -64,14 +64,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         }
         replServer.start();
-        const watchOpt = option_1.getOptionValue('watch');
+        const watchOpt = (0, option_1.getOptionValue)('watch');
         if (watchOpt === true) {
-            logger_js_1.info();
-            logger_js_1.labeled('DEPRECATED', `The ${ansi_colors_1.italic.bold('--watch')} option is deprecated. \nThe watch mode will be enabled by default. If you wish to disable it use the ${ansi_colors_1.italic.bold('--no-watch')} option. \nPlease execute ${ansi_colors_1.bold('catalyst functions:shell ' + ansi_colors_1.italic('--help'))} command for more usage details.`).WARN();
+            (0, logger_js_1.info)();
+            (0, logger_js_1.labeled)('DEPRECATED', `The ${ansi_colors_1.italic.bold('--watch')} option is deprecated. \nThe watch mode will be enabled by default. If you wish to disable it use the ${ansi_colors_1.italic.bold('--no-watch')} option. \nPlease execute ${(0, ansi_colors_1.bold)('catalyst functions:shell ' + (0, ansi_colors_1.italic)('--help'))} command for more usage details.`).WARN();
         }
         yield Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
             if (watchOpt !== false) {
-                yield fn_watcher_1.default(target);
+                yield (0, fn_watcher_1.default)(target);
             }
             const localFn = new local_function_1.default(replServer, target);
             replServer.setContext(target.name, localFn.call);
@@ -87,14 +87,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 return target.localFn.shutdown();
             }
         })));
-        yield fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch();
+        yield fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch();
         fn_utils_1.fnUtils.common.executeHook({ prefix: 'post', command: 'serve' });
-        logger_js_1.info();
-        logger_js_1.success('shell complete');
+        (0, logger_js_1.info)();
+        (0, logger_js_1.success)('shell complete');
     }
     catch (e) {
         yield Promise.all([
-            fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
             httpServer ? httpServer.stop() : undefined
         ]);
         throw e;

package/lib/shell/prepare/index.js

@@ -32,7 +32,7 @@ exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
         return target;
     });
     runtime_store_1.default.set('context.functions.targets', refinedTargets);
-    yield languages_1.prepareFunctions(refinedTargets);
-    yield common_1.resolveAllFnPorts(refinedTargets);
+    yield (0, languages_1.prepareFunctions)(refinedTargets);
+    yield (0, common_1.resolveAllFnPorts)(refinedTargets);
     return refinedTargets;
 });