zcatalyst-cli 1.22.0 → 1.22.2

package/lib/commands/signals/generate/index.js

@@ -1,27 +1,4 @@
 'use strict';
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,180 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ansi_colors_1 = require("ansi-colors");
-const error_1 = __importDefault(require("../../../error"));
 const command_1 = __importDefault(require("../../../internal/command"));
-const constants_1 = require("../../../util_modules/constants");
-const fs_1 = require("../../../util_modules/fs");
-const logger_1 = require("../../../util_modules/logger");
-const project_1 = require("../../../util_modules/project");
-const js_1 = require("../../../util_modules/js");
-const option_1 = require("../../../util_modules/option");
+const signals_1 = require("../../../signals");
 exports.default = new command_1.default('signals:generate <publisher_service> <event_name>')
     .description('Generate sample payloads from different components or custom event publishers to test Event functions')
     .allowUnknownOpts()
     .needs('rc')
     .needs('auth')
-    .action(function generate(publisher, event) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const unknownArgs = (0, option_1.getUnknownOpts)([]);
-        if (unknownArgs.length % 2 !== 0) {
-            throw new error_1.default('Unknown options are not provided as key value pairs', {
-                exit: 1,
-                errorId: 'IDX-1',
-                arg: [(0, ansi_colors_1.bold)(publisher), (0, ansi_colors_1.bold)(event), (0, ansi_colors_1.bold)('--key value')]
-            });
-        }
-        const remotePublisherName = constants_1.SIGNALS_PUBLISHERS[publisher];
-        if (remotePublisherName === undefined) {
-            throw new error_1.default('Invalid publisher service', {
-                exit: 1,
-                errorId: 'IDX-2',
-                arg: [
-                    (0, ansi_colors_1.bold)(Object.keys(constants_1.SIGNALS_PUBLISHERS)
-                        .map((src) => '* ' + src)
-                        .join('\n'))
-                ]
-            });
-        }
-        if (constants_1.SIGNALS_API_NAMES[remotePublisherName] === undefined) {
-            throw new error_1.default('Signal reference is not found for the publisher service provided', {
-                exit: 2
-            });
-        }
-        let eventJsonContent = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.signal_event_data);
-        if (eventJsonContent === undefined) {
-            throw new error_1.default('Signal template json is undefined', { exit: 2 });
-        }
-        const eventDataPlaceHolder = constants_1.PLACEHOLDER.signal_event_data;
-        const optionMap = unknownArgs.reduce((previousValue, currentValue, currentIndex, optionArr) => {
-            if (currentIndex % 2 === 0) {
-                if (!currentValue.startsWith('--') &&
-                    currentValue !== '-e' &&
-                    currentValue !== '-rid' &&
-                    currentValue !== '--verbose') {
-                    const fault = unknownArgs === null || unknownArgs === void 0 ? void 0 : unknownArgs.map((arg) => {
-                        if (arg === currentValue) {
-                            return (0, ansi_colors_1.red)(arg);
-                        }
-                        return arg;
-                    }).join(' ');
-                    throw new error_1.default('Invalid option format detected', {
-                        exit: 1,
-                        errorId: 'IDX-3',
-                        arg: [(0, ansi_colors_1.italic)(fault), (0, ansi_colors_1.bold)('--<option> <value>')]
-                    });
-                }
-                previousValue[currentValue.slice(2)] = optionArr[currentIndex + 1];
-            }
-            return previousValue;
-        }, {});
-        let data = {};
-        if (publisher !== 'custom') {
-            const publisherModule = yield (_a = '../../../event_generate/' + (publisher === 'authentication' ? 'user' : publisher), Promise.resolve().then(() => __importStar(require(_a))));
-            data = yield publisherModule.getData(optionMap);
-            if (publisher === 'datastore') {
-                data = Object.assign(Object.assign({}, data), { table_details: {
-                        table_id: publisherModule.sourceId,
-                        table_name: 'Default'
-                    } });
-            }
-            if (publisher === 'authentication' && event !== 'user_signedup') {
-                data = data.user_details;
-            }
-        }
-        Object.keys(eventDataPlaceHolder).forEach((placeholderKey) => {
-            switch (placeholderKey) {
-                case 'version':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), 1 + '');
-                    break;
-                case 'org_id':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getEnvId)() + '');
-                    break;
-                case 'project_id':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getProjectId)() + '');
-                    break;
-                case 'project_name':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getProjectName)() + '');
-                    break;
-                case 'environment':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getEnvName)() + '');
-                    break;
-                case 'rule_id':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(18) + '');
-                    break;
-                case 'uuid':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomString(8) +
-                        '-' +
-                        js_1.JS.randomString(4) +
-                        '-' +
-                        js_1.JS.randomString(4) +
-                        '-' +
-                        js_1.JS.randomString(4) +
-                        '-' +
-                        js_1.JS.randomString(11));
-                    break;
-                case 'target_id':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(8) + '');
-                    break;
-                case 'signal_id':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(17) + '');
-                    break;
-                case 'signal_api_name':
-                    if (publisher !== 'custom') {
-                        const eventRefArr = constants_1.SIGNALS_API_NAMES[remotePublisherName];
-                        const remoteRefevent = event;
-                        (0, logger_1.debug)(`event name provided is : ${remoteRefevent}`);
-                        const indexOfevent = eventRefArr.indexOf(remoteRefevent);
-                        if (indexOfevent < 0) {
-                            const availableEvents = eventRefArr
-                                .map((act) => {
-                                return '* ' + act;
-                            })
-                                .join('\n');
-                            throw new error_1.default('Event name incompatible with the publisher service' + eventRefArr, {
-                                exit: 1,
-                                errorId: 'IDX-4',
-                                arg: [
-                                    (0, ansi_colors_1.bold)(event),
-                                    ansi_colors_1.bold.red('X'),
-                                    (0, ansi_colors_1.bold)(publisher),
-                                    (0, ansi_colors_1.bold)(availableEvents)
-                                ]
-                            });
-                        }
-                        event = constants_1.SIGNALS_API_NAMES[remotePublisherName][indexOfevent];
-                    }
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), event);
-                    break;
-                case 'attempt':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), 1 + '');
-                    break;
-                case 'source':
-                    const publisherDetails = `publisher_id:${js_1.JS.randomNumber(17)}` +
-                        `/service:${getPublisherType(publisher)}${publisher === 'custom'
-                            ? ''
-                            : publisher + '/account:' + js_1.JS.randomNumber(8)}`;
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), publisherDetails);
-                    break;
-                case 'time_in_ms':
-                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), Date.now().toString());
-                    break;
-                default:
-                    break;
-            }
-        });
-        eventJsonContent = eventJsonContent.replace(new RegExp(constants_1.PLACEHOLDER.signal_event_data.data, 'g'), JSON.stringify(data));
-        const jsonContent = JSON.parse(eventJsonContent);
-        process.stdout.write(JSON.stringify(jsonContent) + '\n');
-    });
-});
-function getPublisherType(publisher) {
-    for (const [category, services] of Object.entries(constants_1.SIGNALS_PUBLISHERS_TYPE)) {
-        if (services.includes(publisher)) {
-            return category;
-        }
-    }
-    return null;
-}
+    .action((publisher, event) => __awaiter(void 0, void 0, void 0, function* () {
+    const jsonContent = yield (0, signals_1.generate)(publisher, event);
+    process.stdout.write(JSON.stringify(jsonContent) + '\n');
+}));

package/lib/deploy/features/appsail/utils.js

@@ -196,18 +196,21 @@ function getStandAloneTarget() {
             return tag;
         }))();
         const nameOpt = yield validateOptions(((name) => __awaiter(this, void 0, void 0, function* () {
-            (0, index_1.info)();
-            (0, index_1.warning)(`Skipping ${(0, ansi_colors_1.yellow)('--name')} option. Since AppSail name value supplied with the option is invalid`);
-            (0, index_1.warning)('Name must contain only alphanumeric and hyphen');
-            (0, index_1.info)();
-            return name.match(constants_1.REGEX.appsail.name) ? name : false;
+            if (!name.match(constants_1.REGEX.appsail.name)) {
+                (0, index_1.info)();
+                (0, index_1.warning)(`Skipping ${(0, ansi_colors_1.yellow)('--name')} option. Since AppSail name value supplied with the option is invalid`);
+                (0, index_1.warning)('Name must contain only alphanumeric and hyphen');
+                (0, index_1.info)();
+                return false;
+            }
+            return name;
         })), 'name');
-        const appSailName = yield (0, utils_1.getAppSailName)();
+        const appSailName = nameOpt ? nameOpt : yield (0, utils_1.getAppSailName)();
         if (typeof imgSource === 'string') {
             return {
                 source: imgSource,
                 runtime: 'custom',
-                name: typeof nameOpt === 'boolean' ? appSailName : nameOpt,
+                name: appSailName,
                 validity: {
                     valid: true
                 },
@@ -225,7 +228,7 @@ function getStandAloneTarget() {
             configJson.stack = configJson.stack.runtime;
         }
         return {
-            name: typeof nameOpt === 'boolean' ? appSailName : nameOpt,
+            name: appSailName,
             runtime: 'catalyst',
             source: cwd,
             config: configJson,

package/lib/deploy/features/slate.js

@@ -122,7 +122,7 @@ function slateLogger() {
     deployTargets.forEach((slate) => {
         var _a, _b;
         (0, logger_1.labeled)(`Slate(${slate.name})`, 'Deploy is live!').SUCCESS();
-        (0, logger_1.labeled)((0, ansi_colors_1.cyan)(`Build Url(${slate.name})`), `${urls_1.default.admin}/baas/${(0, project_1.getEnvId)()}/project/${(0, project_1.getProjectId)()}/${getEnvironmentType()}#/slate/app/${(_a = slate.details) === null || _a === void 0 ? void 0 : _a.id}/deployment/${(_b = slate.details) === null || _b === void 0 ? void 0 : _b.deployment_type_config.upcoming_build.deployment_id}/overview`).MESSAGE();
+        (0, logger_1.labeled)((0, ansi_colors_1.cyan)(`Build Url(${slate.name})`), `${urls_1.default.console}/baas/${(0, project_1.getEnvId)()}/project/${(0, project_1.getProjectId)()}/${getEnvironmentType()}#/slate/app/${(_a = slate.details) === null || _a === void 0 ? void 0 : _a.id}/deployment/${(_b = slate.details) === null || _b === void 0 ? void 0 : _b.deployment_type_config.upcoming_build.deployment_id}/overview`).MESSAGE();
         (0, logger_1.info)();
     });
     return deployTargets;

package/lib/endpoints/lib/appsail.js

@@ -110,7 +110,7 @@ class AppSail {
     downloadJetty() {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield new api_1.default({
-                origin: constants_1.ORIGIN.zohoCDN,
+                origin: constants_1.ORIGIN.zohoCDNUS,
                 authNeeded: false,
                 json: false,
                 isExternal: true

package/lib/endpoints/lib/code-deck.js

@@ -35,7 +35,7 @@ class CodeDeck {
             }
             const res = yield new api_1.default(this.opts).get(`/catalyst-library/codelib/${manifestData['data.json']}`, {
                 json: true,
-                origin: constants_1.ORIGIN.zohoCDN,
+                origin: constants_1.ORIGIN.zohoCDNUS,
                 headers: {
                     'Cache-Control': 'no-cache'
                 }
@@ -55,7 +55,7 @@ _CodeDeck_instances = new WeakSet(), _CodeDeck_manifest = function _CodeDeck_man
     return __awaiter(this, void 0, void 0, function* () {
         const res = yield new api_1.default(this.opts).get('/catalyst-library/codelib/config.json', {
             json: true,
-            origin: constants_1.ORIGIN.zohoCDN,
+            origin: constants_1.ORIGIN.zohoCDNUS,
             headers: {
                 'Cache-Control': 'no-cache'
             }

package/lib/execute/caller.js

@@ -46,10 +46,15 @@ class Caller extends fn_execution_handler_1.FnExecutionHandler {
                 throw new error_1.default('Data is not a valid JSON object', { exit: 1 });
             }
             if (this.fn.target.type === constants_1.FN_TYPE.event) {
-                if (!('event_bus_details' in data) && !('events' in data)) {
-                    (0, index_1.info)('For event function kindly use event:generate command to generate the input json.');
-                    (0, index_1.info)('You can also provide event details as per documentation.');
-                    throw new error_1.default('Event bus details missing', { exit: 1, skipHelp: true });
+                if (!('event_bus_details' in data)) {
+                    if (!('events' in data)) {
+                        (0, index_1.info)('For event function kindly use signals:generate command to generate the input json.');
+                        (0, index_1.info)('You can also provide event details as per documentation.');
+                        throw new error_1.default('Event details missing', {
+                            exit: 1,
+                            skipHelp: true
+                        });
+                    }
                 }
                 else {
                     (0, index_1.warning)('Since the event:generate command is being deprecated and being sunsetted in future releases. Please use signals:generate command here after to get the event details.');

package/lib/express_middlewares/auth-checker.js

@@ -34,7 +34,8 @@ exports.default = (req, res, next) => {
                 break;
             case 'OAuth':
                 const oauthHeader = req.get('authorization');
-                if (oauthHeader !== undefined) {
+                const userType = req.headers['x-zc-user-type'];
+                if (oauthHeader !== undefined && userType === 'admin') {
                     accumulator[0] = type;
                     accumulator[1] = oauthHeader;
                 }
@@ -45,6 +46,13 @@ exports.default = (req, res, next) => {
                     accumulator[0] = type;
                     accumulator[1] = csrfToken;
                 }
+                else {
+                    const authHeader = req.get('authorization');
+                    if (authHeader !== undefined) {
+                        accumulator[0] = type;
+                        accumulator[1] = authHeader;
+                    }
+                }
                 break;
         }
         return accumulator;

package/lib/init/features/functions/index.js

@@ -24,7 +24,7 @@ const common_1 = require("../../util/common");
 const languages_1 = __importDefault(require("./languages"));
 const catalyst_details_1 = __importDefault(require("../../../endpoints/lib/catalyst-details"));
 const path_1 = require("path");
-const event_generate_1 = require("../../../event_generate");
+const signals_1 = require("../../../signals");
 const config_1 = require("../../../util_modules/config");
 const cliq_1 = __importDefault(require("../../../event_generate/integration/cliq"));
 const error_1 = __importDefault(require("../../../error"));
@@ -112,7 +112,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             break;
         }
         case constants_1.FN_TYPE.event: {
-            const jsonContent = yield (0, event_generate_1.generate)('cache', 'put');
+            const jsonContent = yield (0, signals_1.generate)('cache', 'cache_item_created');
             inputsJson.test_event_cache_put = jsonContent;
             break;
         }

package/lib/init/features/project.js

@@ -105,7 +105,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         let projectId = null;
         const userActionError = yield new Promise((res, rej) => __awaiter(void 0, void 0, void 0, function* () {
             const callbackPort = yield port_resolver_1.default.getFreePort(3000, 10, false);
-            const accessUrl = new URL(`/baas/${(0, project_1.getEnvId)()}/index#/?port=${callbackPort}&type=cli`, `${constants_1.ORIGIN.admin}`);
+            const accessUrl = new URL(`${constants_1.ORIGIN.console}/baas/${(0, project_1.getEnvId)()}/index#/?port=${callbackPort}&type=cli`);
             const server = (0, http_1.createServer)((req, resp) => __awaiter(void 0, void 0, void 0, function* () {
                 var _c, _d;
                 try {

package/lib/internal/command.js

@@ -169,7 +169,7 @@ class Command {
                     arg: [(0, ansi_colors_1.bold)(cmd.name()), (0, ansi_colors_1.bold)('CI=true catalyst help')]
                 }));
             }
-            if (programArgs.slice(-1)[0].args.length > argCount &&
+            if (programArgs.slice(-1)[0].args.filter((_arg) => _arg.trim() !== '').length > argCount &&
                 !this.allowUnknownOptions) {
                 return (0, errorOut_1.default)(new index_js_1.default('Too many arguments', {
                     exit: 1,

package/lib/serve/features/index.d.ts

@@ -1,7 +1,8 @@
 import { IFnTarget } from '../../fn-utils/lib/common.js';
 import { TAppSailServerDetails } from './appsail.js';
+import { TSlateServerDetails } from './slate.js';
 export declare function client(): Promise<void>;
 export declare function functions(): Promise<Array<IFnTarget>>;
 export declare function apig(): Promise<void>;
 export declare function appsail(): Promise<Array<TAppSailServerDetails>>;
-export declare function slate(): Promise<void>;
+export declare function slate(): Promise<Array<TSlateServerDetails>>;

package/lib/serve/features/index.js

@@ -86,8 +86,8 @@ function appsail() {
 exports.appsail = appsail;
 function slate() {
     return __awaiter(this, void 0, void 0, function* () {
-        const appSailModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
-        yield appSailModule.default();
+        const slateModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
+        return slateModule.default();
     });
 }
 exports.slate = slate;

package/lib/serve/features/slate.d.ts

@@ -8,5 +8,5 @@ export type TSlateServerDetails = ISlateConfig & {
         kill: boolean;
     };
 };
-declare const _default: () => Promise<void>;
+declare const _default: () => Promise<Array<TSlateServerDetails>>;
 export default _default;

package/lib/serve/features/slate.js

@@ -24,7 +24,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const optionTargets = slate_utils_1.slateUtils.filterTargets(allTargets || []);
     if (optionTargets.length === 0) {
         (0, logger_1.debug)('Slate targets are empty');
-        return;
+        return [];
     }
     const validated = (0, slate_utils_1.validateServeCommand)(optionTargets);
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
@@ -46,4 +46,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         return Object.assign(Object.assign({}, targ), { port: { slate: slatePort, proxy: proxyPort }, trigger: { kill: false } });
     })));
     runtime_store_1.default.set('context.slate.targets', filledTargets);
+    return filledTargets;
 });

package/lib/serve/index.js

@@ -136,7 +136,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
         if (serveTargets.includes('slate')) {
-            const slates = runtime_store_1.default.get('context.slate.targets', []);
+            const slates = yield features.slate();
             const validSlates = slates.filter((slate) => {
                 if (!slate.validity.valid) {
                     (0, index_1.warning)('skipping serve of Slate service [' +

package/lib/serve/server/lib/master/index.js

@@ -23,7 +23,6 @@ const logger_1 = __importDefault(require("../../../../express_middlewares/logger
 const project_1 = __importDefault(require("../../../../express_middlewares/project"));
 const unknown_req_proxy_1 = __importDefault(require("./unknown-req-proxy"));
 const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/url-rewriter"));
-const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
 const js_1 = require("../../../../util_modules/js");
 const index_1 = require("../../../../util_modules/logger/index");
@@ -35,6 +34,7 @@ const appsail_1 = require("./appsail");
 const web_client_1 = require("./web-client");
 const functions_1 = require("./functions");
 const slate_1 = require("./slate");
+const apig_1 = __importDefault(require("../../../features/apig"));
 function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDetails }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -49,7 +49,7 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
             key: (0, project_2.getDomainKey)(),
             env_name: (0, project_2.getEnvName)()
         };
-        const rules = runtime_store_1.default.get('context.apig.local.config', -1);
+        const rules = (yield (0, apig_1.default)()) || -1;
         const customProxyUrl = (0, option_1.getOptionValue)('proxy');
         const app = (0, express_1.default)();
         let systemRoutes;

package/lib/shell/dependencies/non-http-function/slave-manager.js

@@ -54,16 +54,22 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
                             data = { data };
                             break;
                         }
-                        case constants_1.FN_TYPE.event:
+                        case constants_1.FN_TYPE.event: {
                             if (!('event_bus_details' in data)) {
-                                (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', {
-                                    exit: 1,
-                                    skipHelp: true
-                                });
+                                if (!('events' in data)) {
+                                    (0, logger_1.info)('For event function kindly use signals:generate command to generate the input json.');
+                                    (0, logger_1.info)('You can also provide event details as per documentation.');
+                                    throw new error_1.default('Event details missing', {
+                                        exit: 1,
+                                        skipHelp: true
+                                    });
+                                }
+                            }
+                            else {
+                                (0, logger_1.warning)('Since the event:generate command is being deprecated and being sunsetted in future releases. Please use signals:generate command here after to get the event details.');
                             }
                             break;
+                        }
                     }
                 }
                 else {
@@ -77,7 +83,7 @@ class SlaveManager extends fn_execution_handler_1.FnExecutionHandler {
             }
             catch (e) {
                 (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');
+                return new error_1.default('Invalid input: ' + e);
             }
             return (() => __awaiter(this, void 0, void 0, function* () {
                 var _b, _c, _d, _e, _f, _g, _h, _j, _k;

package/lib/signals/index.d.ts

@@ -0,0 +1,2 @@
+import { SIGNALS_API_NAMES } from '../util_modules/constants';
+export declare function generate(publisher: keyof typeof SIGNALS_API_NAMES, event: string): Promise<Record<string, unknown>>;

package/lib/signals/index.js

@@ -0,0 +1,208 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generate = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("../error"));
+const constants_1 = require("../util_modules/constants");
+const fs_1 = require("../util_modules/fs");
+const logger_1 = require("../util_modules/logger");
+const project_1 = require("../util_modules/project");
+const js_1 = require("../util_modules/js");
+const option_1 = require("../util_modules/option");
+function generate(publisher, event) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const unknownArgs = (0, option_1.getUnknownOpts)([]);
+        if (unknownArgs.length % 2 !== 0) {
+            throw new error_1.default('Unknown options are not provided as key value pairs', {
+                exit: 1,
+                errorId: 'IDX-1',
+                arg: [(0, ansi_colors_1.bold)(publisher), (0, ansi_colors_1.bold)(event), (0, ansi_colors_1.bold)('--key value')]
+            });
+        }
+        const remotePublisherName = constants_1.SIGNALS_PUBLISHERS[publisher];
+        if (remotePublisherName === undefined) {
+            throw new error_1.default('Invalid publisher service', {
+                exit: 1,
+                errorId: 'IDX-2',
+                arg: [
+                    (0, ansi_colors_1.bold)(Object.keys(constants_1.SIGNALS_PUBLISHERS)
+                        .map((src) => '* ' + src)
+                        .join('\n'))
+                ]
+            });
+        }
+        if (constants_1.SIGNALS_API_NAMES[remotePublisherName] === undefined) {
+            throw new error_1.default('Signal reference is not found for the publisher service provided', {
+                exit: 2
+            });
+        }
+        let eventJsonContent = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.signal_event_data);
+        if (eventJsonContent === undefined) {
+            throw new error_1.default('Signal template json is undefined', { exit: 2 });
+        }
+        const eventDataPlaceHolder = constants_1.PLACEHOLDER.signal_event_data;
+        const optionMap = unknownArgs.reduce((previousValue, currentValue, currentIndex, optionArr) => {
+            if (currentIndex % 2 === 0) {
+                if (!currentValue.startsWith('--') &&
+                    currentValue !== '-e' &&
+                    currentValue !== '-rid' &&
+                    currentValue !== '--verbose') {
+                    const fault = unknownArgs === null || unknownArgs === void 0 ? void 0 : unknownArgs.map((arg) => {
+                        if (arg === currentValue) {
+                            return (0, ansi_colors_1.red)(arg);
+                        }
+                        return arg;
+                    }).join(' ');
+                    throw new error_1.default('Invalid option format detected', {
+                        exit: 1,
+                        errorId: 'IDX-3',
+                        arg: [(0, ansi_colors_1.italic)(fault), (0, ansi_colors_1.bold)('--<option> <value>')]
+                    });
+                }
+                previousValue[currentValue.slice(2)] = optionArr[currentIndex + 1];
+            }
+            return previousValue;
+        }, {});
+        let data = {};
+        if (publisher !== 'custom') {
+            const publisherModule = yield (_a = '../event_generate/' + (publisher === 'authentication' ? 'user' : publisher), Promise.resolve().then(() => __importStar(require(_a))));
+            data = yield publisherModule.getData(optionMap);
+            if (publisher === 'datastore') {
+                data = Object.assign(Object.assign({}, data), { table_details: {
+                        table_id: publisherModule.sourceId,
+                        table_name: 'Default'
+                    } });
+            }
+            if (publisher === 'authentication' && event !== 'user_signedup') {
+                data = data.user_details;
+            }
+        }
+        Object.keys(eventDataPlaceHolder).forEach((placeholderKey) => {
+            switch (placeholderKey) {
+                case 'version':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), 1 + '');
+                    break;
+                case 'org_id':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getEnvId)() + '');
+                    break;
+                case 'project_id':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getProjectId)() + '');
+                    break;
+                case 'project_name':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getProjectName)() + '');
+                    break;
+                case 'environment':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), (0, project_1.getEnvName)() + '');
+                    break;
+                case 'rule_id':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(18) + '');
+                    break;
+                case 'uuid':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomString(8) +
+                        '-' +
+                        js_1.JS.randomString(4) +
+                        '-' +
+                        js_1.JS.randomString(4) +
+                        '-' +
+                        js_1.JS.randomString(4) +
+                        '-' +
+                        js_1.JS.randomString(11));
+                    break;
+                case 'target_id':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(8) + '');
+                    break;
+                case 'signal_id':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), js_1.JS.randomNumber(17) + '');
+                    break;
+                case 'signal_api_name':
+                    if (publisher !== 'custom') {
+                        const eventRefArr = constants_1.SIGNALS_API_NAMES[remotePublisherName];
+                        const remoteRefevent = event;
+                        (0, logger_1.debug)(`event name provided is : ${remoteRefevent}`);
+                        const indexOfevent = eventRefArr.indexOf(remoteRefevent);
+                        if (indexOfevent < 0) {
+                            const availableEvents = eventRefArr
+                                .map((act) => {
+                                return '* ' + act;
+                            })
+                                .join('\n');
+                            throw new error_1.default('Event name incompatible with the publisher service: ' + eventRefArr, {
+                                exit: 1,
+                                errorId: 'IDX-4',
+                                arg: [
+                                    (0, ansi_colors_1.bold)(event),
+                                    ansi_colors_1.bold.red('X'),
+                                    (0, ansi_colors_1.bold)(publisher),
+                                    (0, ansi_colors_1.bold)(availableEvents)
+                                ]
+                            });
+                        }
+                        event = constants_1.SIGNALS_API_NAMES[remotePublisherName][indexOfevent];
+                    }
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), event);
+                    break;
+                case 'attempt':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), 1 + '');
+                    break;
+                case 'source':
+                    const publisherDetails = `publisher_id:${js_1.JS.randomNumber(17)}` +
+                        `/service:${getPublisherType(publisher)}${publisher === 'custom' ? '' : publisher + '/account:' + js_1.JS.randomNumber(8)}`;
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), publisherDetails);
+                    break;
+                case 'time_in_ms':
+                    eventJsonContent = eventJsonContent === null || eventJsonContent === void 0 ? void 0 : eventJsonContent.replace(new RegExp(eventDataPlaceHolder[placeholderKey], 'g'), Date.now().toString());
+                    break;
+                default:
+                    break;
+            }
+        });
+        eventJsonContent = eventJsonContent.replace(new RegExp(constants_1.PLACEHOLDER.signal_event_data.data, 'g'), JSON.stringify(data));
+        const jsonContent = JSON.parse(eventJsonContent);
+        return jsonContent;
+    });
+}
+exports.generate = generate;
+function getPublisherType(publisher) {
+    for (const [category, services] of Object.entries(constants_1.SIGNALS_PUBLISHERS_TYPE)) {
+        if (services.includes(publisher)) {
+            return category;
+        }
+    }
+    return null;
+}

package/lib/util_modules/constants/lib/urls.d.ts

@@ -9,6 +9,7 @@ export default class URL {
     private static readonly _stratusSuffixBase;
     private static readonly _zohoCDNBase;
     private static readonly _contacts;
+    static get zohoCDNUS(): string;
     static get zohoCDN(): string;
     static get auth(): string;
     static get iamPortal(): string;

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

@@ -7,6 +7,9 @@ const env_js_1 = require("../../env.js");
 const dc_js_1 = require("../../dc.js");
 const dc_type_js_1 = __importDefault(require("./dc-type.js"));
 class URL {
+    static get zohoCDNUS() {
+        return (0, env_js_1.envOverride)('ZOHO_CDN', URL._zohoCDNBase);
+    }
     static get zohoCDN() {
         return (0, env_js_1.envOverride)('ZOHO_CDN', mapDataCenterUrl(URL._zohoCDNBase));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.22.0",
+	"version": "1.22.2",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {

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

@@ -24,9 +24,7 @@ public class {{_CLASS_}} implements CatalystEventHandler{
 
 			Object rawData = paramEventRequest.getRawData();
 			LOGGER.log(Level.SEVERE,"Raw Data is "+rawData.toString());
-			
-			ZCCache.getInstance().putCacheValue("{{_CLASS_}}", "Working", 1l);
-			LOGGER.log(Level.SEVERE,"Project Details "+paramEventRequest.getProjectDetails().toString());
+
 		}
 		catch (Exception e) {
 			LOGGER.log(Level.SEVERE,"Exception in {{_CLASS_}} Function",e);