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

package/docs/command_needs/rc.toml

@@ -1,7 +1,7 @@
 [RC-1]
 context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available is not available in the ${arg[3]} org.'''
 aid = '''Please use one of the available projects with the ${arg[1]} option or specify the correct org \nThe available projects in the ${arg[3]} org are: \n${arg[2]}'''
-link = 'https://www.zoho.com/catalyst/help/cli-options.html#Project'
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-new-project/'
 
 [RC-2]
 context = '''Unable to load the ${arg[0]} file.'''
@@ -10,18 +10,18 @@ link = ''
 
 [RC-3]
 context = '''Oops!!! It looks like you're not inside a Catalyst app directory because we are unable to locate the ${arg[0]} file.'''
-aid = '''Please run the ${arg[1]} command to initialise or specify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Initialize_All'
+aid = '''Please run the ${arg[1]} command to initialize or specify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/introduction/#Initialize_Alll'
 
 [RC-4]
 context = '''The ${arg[0]} file is corrupted.'''
-aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialise the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Options'
+aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialize the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-5]
-context = '''The project which is currently active doesn't seems to be present in Catalyst remote console.'''
-aid = '''Use the ${arg[0]} command in order to change the existing active project.'''
-link = 'https://www.zoho.com/catalyst/help/cli-projects.html#Use'
+context = '''Oops!!! It looks like you don't have access to the currently initialized project ${arg[0]}.'''
+aid = '''Please contact the owner or an administrator of the project.\nIf you would like to initialize a new project for this directory, please use the below command\n${arg[1]}'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-6]
 context = '''The Catalyst portal initialized in the current project directory is not accessible with the currently logged in user.\n

package/lib/command_needs/rc.js

@@ -192,7 +192,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         });
     }
     if (typeof finalEnvObj !== 'undefined') {
-        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id });
+        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id, printError: false });
         envApi = yield (0, endpoints_1.envAPI)({ auth: true, org: finalEnvObj.id });
     }
     const projectDetails = yield projectApi
@@ -200,19 +200,19 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         .catch((err) => __awaiter(void 0, void 0, void 0, function* () {
         if (js_1.JS.hasIn(err, 'context.response.statusCode')) {
             switch (err.context.response.statusCode) {
+                case 401:
                 case 404: {
-                    (0, logger_1.message)('cleaning up ' +
-                        constants_1.FILENAME.rc +
-                        ' since the current active project for this folder is not found in remote');
-                    yield (0, project_2.removeProject)(finalProjectObj.id + '');
                     if (resolveOnNotFound) {
                         finalProjectObj = undefined;
                         return;
                     }
-                    throw new error_1.default('active project not found in remote', {
+                    throw new error_1.default('no access to project: ' + (finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id), {
                         exit: 1,
                         errorId: 'RC-5',
-                        arg: [(0, ansi_colors_1.bold)('catalyst project:use')]
+                        arg: [
+                            (0, ansi_colors_1.bold)(`${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.name}(${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id})`),
+                            (0, ansi_colors_1.bold)((0, ansi_colors_1.cyan)('command: ') + 'catalyst init --force')
+                        ]
                     });
                 }
                 case 403: {

package/lib/commands/appsail/add.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('appsail:add')
     .description('Link an already existing AppSail service to Catalyst Project')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/client/setup.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('client:setup')
     .description('Set up and configure the client directory in your project directory')
     .needs('auth', [constants_1.SCOPE.webapp])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/codelib/install.js

@@ -32,7 +32,7 @@ exports.default = new command_1.default('codelib:install [git-url]')
     .description('Install the code library functionalities into your project')
     .option('-c, --continue <install-id>', 'Continue CodeLib install')
     .needs('auth', [constants_1.SCOPE.project_import_create])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .action((gitUrl) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -72,7 +72,10 @@ exports.default = new command_1.default('codelib:install [git-url]')
         if (!gitUrl) {
             throw new error_1.default('Invalid code lib', { exit: 2 });
         }
-        return;
+        throw new error_1.default(`Error while downloading codelib.`, {
+            exit: 2,
+            original: `Occurred while processing ${gitUrl}`
+        });
     }
     const templateFile = yield (0, code_deck_1.getTemplateFile)(deckZip);
     const templateJson = JSON.parse(templateFile || '');

package/lib/commands/functions/add.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:add')
     .description('Add a function of the required stack to the function directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/functions/setup.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:setup')
     .description('Set up and configure the function directory in your project directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/init.js

@@ -100,8 +100,15 @@ exports.default = new command_1.default('init [feature]')
         return;
     }
     if (feature !== 'project') {
-        yield (0, features_1.project)();
+        try {
+            yield (0, features_1.project)();
+        }
+        catch (er) {
+            (0, logger_1.debug)(er);
+            return;
+        }
     }
+    (0, logger_1.info)();
     const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
         (0, ansi_colors_1.cyan)('<return> ') +
         'to proceed.\n', {

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

@@ -31,6 +31,7 @@ const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 const utils_1 = require("./utils");
 const throbber_1 = __importDefault(require("../../../throbber"));
+const minimatch_1 = __importDefault(require("minimatch"));
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -183,29 +184,42 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
         var _a, _b;
         const targ = _targ.config;
         const prevRes = yield result;
+        const throbberName = `prepare_appsail_${_targ.name}`;
         try {
             if ((_a = targ.scripts) === null || _a === void 0 ? void 0 : _a.predeploy) {
                 executeHook(targ.scripts.predeploy, 'predeploy', _targ.source);
             }
-            const throbberName = `prepare_appsail_${_targ.name}`;
             throbber.add(throbberName, {
                 text: `Preparing AppSail[${_targ.name}]`
             });
-            const zip = new archiver_1.default();
-            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
             const folderPath = targ.build_path;
+            const isBuildPath = yield fs_1.ASYNC.isPathExists(folderPath);
+            if (!isBuildPath) {
+                throw new error_1.default(`the build path doesn't exists: ${folderPath}`, {
+                    exit: 1,
+                    skipHelp: true
+                });
+            }
+            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
+            const excludePatterns = [
+                '**/.DS_Store',
+                '**/.vscode/**/*',
+                `**/${constants_1.FILENAME.log}`,
+                `**/${constants_1.FILENAME.config}`,
+                `**/${constants_1.FILENAME.rc}`,
+                `**/${constants_1.FILENAME.app_config}`,
+                `**/${constants_1.FILENAME.catalyst_ignore}`,
+                ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
+            ];
             const folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {
-                    exclude: [
-                        '**/.DS_Store',
-                        '**/.vscode/**/*',
-                        `**/${constants_1.FILENAME.app_config}`,
-                        `**/${constants_1.FILENAME.catalyst_ignore}`,
-                        ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
-                    ],
+                    exclude: (path) => __awaiter(void 0, void 0, void 0, function* () {
+                        return !!excludePatterns.find((glob) => (0, minimatch_1.default)(path.replace(folderPath + path_1.sep, ''), glob, { dot: true }));
+                    }),
                     excludeDir: true
                 }
             });
+            const zip = new archiver_1.default();
             folderContents.forEach((content) => {
                 zip.add(content.path === folderPath
                     ? (0, path_1.basename)(content.path)
@@ -234,6 +248,7 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
             }
         }
         catch (err) {
+            throbber.remove(throbberName);
             (0, logger_1.debug)(err);
             _targ.validity = {
                 valid: false,

package/lib/endpoints/index.js

@@ -41,10 +41,10 @@ function orgAPI({ auth = true } = {}) {
     });
 }
 exports.orgAPI = orgAPI;
-function projectAPI({ auth = true, org = (0, project_1.getEnvId)() } = {}) {
+function projectAPI({ auth = true, org = (0, project_1.getEnvId)(), printError = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = (yield Promise.resolve().then(() => __importStar(require('./lib/project')))).default;
-        return new project({ authNeeded: auth }, org);
+        return new project({ authNeeded: auth, printError }, org);
     });
 }
 exports.projectAPI = projectAPI;

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

@@ -141,21 +141,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 })
             }))).source
         };
-    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
-    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
     const existingSails = config_1.appSailConfig.raw() || [];
-    yield prompt_1.default.register('file-path');
-    const appSail = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build path of your AppSail service: ', {
-        type: 'file-path',
-        validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
-            const buildPath = (0, path_1.resolve)(runtime_store_1.default.get('cwd'), pth.value);
-            if ((yield fs_1.ASYNC.dirExists(buildPath)) || (yield fs_1.ASYNC.fileExists(buildPath))) {
-                return true;
-            }
-            return 'Path does not exists';
-        }),
-        when: !_appSailConfig.build
-    }), prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
+    const appName = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
         type: 'input',
         default: 'AppSail',
         validate: (name) => {
@@ -172,16 +159,40 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     : true;
         }
     }));
-    const appSailStack = _appSailConfig.stack ||
-        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const payload = {
-        source: _appSailConfig.source,
-        name: appSail.name
+        source: (0, path_1.relative)((0, project_1.getProjectRoot)(), _appSailConfig.source) || '.',
+        name: appName.name
     };
+    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
+    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
+    if (isAppConfig) {
+        (0, logger_1.info)();
+        (0, logger_1.warning)(`The ${(0, ansi_colors_1.bold)(constants_1.FILENAME.app_config)} file is already present in the appsail directory`);
+    }
+    const overWrite = yield prompt_1.default.ask(prompt_1.default.question('appConfig', 'Do you wish to overwrite the ' + constants_1.FILENAME.app_config, {
+        type: 'confirm',
+        default: false,
+        when: isAppConfig
+    }));
+    const activeWrite = overWrite.appConfig !== false;
+    if (!activeWrite) {
+        runtime_store_1.default.set('payload.appsail.targets', [payload]);
+        return;
+    }
+    const buildPath = yield prompt_1.default.ask(prompt_1.default.question('path', 'Please provide the build path of your AppSail service: ', {
+        type: 'input',
+        rootPath: _appSailConfig.source,
+        when: !_appSailConfig.build && activeWrite
+    }));
+    const appSailStack = _appSailConfig.stack ||
+        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const appConfig = {
         command: _appSailConfig.command ||
-            'echo Please specify the start-up command in the app-config.json file under the key command',
-        build_path: _appSailConfig.build || './' + (0, path_1.relative)(_appSailConfig.source, appSail.buildPath),
+            'echo Please specify the start-up command in the app-config.json file under the key command for AppSail $X_ZC_RESOURCE_NAME',
+        build_path: _appSailConfig.build ||
+            ((0, path_1.isAbsolute)(buildPath.path)
+                ? (0, path_1.relative)(_appSailConfig.source, buildPath.path) || '.'
+                : buildPath.path),
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
@@ -208,10 +219,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     runtime_store_1.default.set('payload.appsail.targets', [payload]);
-    if (isAppConfig) {
-        (0, logger_1.message)((0, ansi_colors_1.bold)(`app-config.json`) + ` file already exist in ${(0, ansi_colors_1.underline)(_appSailConfig.source)}`);
-    }
-    else {
-        yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig);
-    }
+    activeWrite && (yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig));
 });

package/lib/init/features/project.js

@@ -34,26 +34,16 @@ const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const orgAPI = yield (0, endpoints_1.orgAPI)();
-    const projectAPIWithoutOrg = yield (0, endpoints_1.projectAPI)();
     const defaultRCProjectName = (0, project_1.getDefaultProjectName)(null);
     const defaultRCProjectId = (0, project_1.getDefaultProjectId)(null);
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !(0, option_1.getOptionValue)('force', false)) {
-        (0, logger_1.message)(constants_1.FILENAME.rc + ' already has ' + (0, ansi_colors_1.bold)(defaultRCProjectName) + ' as a default project.');
-        try {
-            yield projectAPIWithoutOrg.getProject(defaultRCProjectId);
-            throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
-        }
-        catch (err) {
-            if (js_1.JS.get(err, 'context.response.statusCode') !== 404) {
-                throw err;
-            }
-            (0, logger_1.warning)('cleaning up ' +
-                constants_1.FILENAME.rc +
-                ' since the current default project for this folder is not found in remote');
-            yield (0, project_1.removeProject)(defaultRCProjectId + '');
-        }
+        (0, logger_1.message)(constants_1.FILENAME.rc +
+            ' already has ' +
+            (0, ansi_colors_1.bold)(defaultRCProjectName) +
+            ' as a default project. To overwrite use --force option');
+        throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option', { skipHelp: true, exit: 0 });
     }
     const orgList = yield orgAPI.getAllOrgs();
     if (orgList.length === 0) {

package/lib/internal/api.js

@@ -47,7 +47,7 @@ const project_1 = require("../util_modules/project");
 const fs_1 = require("fs");
 const throbber_1 = __importDefault(require("../throbber"));
 class API {
-    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)() } = {}) {
+    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)(), printError = true } = {}) {
         this.requestOpts = {
             url: origin,
             method: 'GET',
@@ -73,6 +73,7 @@ class API {
         this.maxRetryCount = maxRetry;
         this.retryCount = 0;
         this.showWarning = showWarning;
+        this.printError = printError;
     }
     _logReq() {
         let qs = this.requestOpts.qs
@@ -113,7 +114,9 @@ class API {
             (0, logger_1.debug)('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
             (0, logger_1.debug)('REQUEST PHASES : ' + resp.timingPhases);
         }
-        if (this.logOpts.progress !== undefined) {
+        if (resp.statusCode >= 200 &&
+            resp.statusCode < 300 &&
+            this.logOpts.progress !== undefined) {
             js_1.JS.set(this.logOpts, 'progress.total', resp.headers['content-length']);
             this.downloadProgress = new progress_1.default(this.logOpts.progress);
         }
@@ -153,11 +156,11 @@ class API {
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
             (0, logger_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
-                const errRes = (0, errorResponse_1.default)(resp, body);
+                const errRes = (0, errorResponse_1.default)(resp, body, !this.printError);
                 this._logDownloadProgress({ error: errRes });
                 throw errRes;
             }
-            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, true) });
+            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, !this.printError) });
         }
         return {
             status: resp.statusCode,
@@ -188,6 +191,7 @@ class API {
             return new Promise((resolve, reject) => {
                 const responseBuffer = [];
                 let isJSONResponse = false;
+                let isErrorPage = false;
                 const throbber = throbber_1.default.getInstance();
                 if (this.logOpts.uploadProgress !== undefined &&
                     this.logOpts.stream instanceof fs_1.ReadStream) {
@@ -230,6 +234,7 @@ class API {
                 }))
                     .on('response', (resp) => {
                     isJSONResponse = js_1.JS.includes(resp.headers['content-type'], 'json');
+                    isErrorPage = !(resp.statusCode >= 200 && resp.statusCode < 300);
                     this._logResp(resp);
                 })
                     .on('complete', (resp, body) => __awaiter(this, void 0, void 0, function* () {
@@ -244,7 +249,9 @@ class API {
                     if (isJSONResponse) {
                         responseBuffer.push(data);
                     }
-                    this._logDownloadProgress({ chunk: data });
+                    if (!isErrorPage) {
+                        this._logDownloadProgress({ chunk: data });
+                    }
                 });
             });
         });
@@ -252,6 +259,7 @@ class API {
     fire(method, path, options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.resolveOnHTTPError = js_1.JS.get(options, 'resolveOnError', this.resolveOnHTTPError);
+            this.printError = (options === null || options === void 0 ? void 0 : options.printError) || this.printError;
             this.maxRetryCount = js_1.JS.get(options, 'maxRetry', this.maxRetryCount);
             this.authNeeded = js_1.JS.get(options, 'authNeeded', this.authNeeded);
             this.logOpts = js_1.JS.get(options, 'log', this.logOpts);

package/lib/prompt/types/file-path.js

@@ -36,7 +36,7 @@ class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
     constructor(question, rl, answers) {
         const { rootPath = '.', exclude = [] } = question;
         const questionBase = Object.assign({
-            emptyText: 'No valid file inside current directory!. Try giving the entire path and press ' +
+            emptyText: 'No valid file path inside current directory!. Try giving the entire path and press ' +
                 (0, ansi_colors_1.cyan)('<return> ') +
                 'key'
         }, question, {

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

@@ -40,7 +40,7 @@ const startAppSail = (port, opts) => {
     return (0, shell_1.spawn)('node', _opts, {
         cwd: opts.target,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
+        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,7 +62,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 target,
                 command: targetSail.config.command,
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
@@ -72,7 +73,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 target,
                 command: targetSail.config.command,
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
@@ -103,7 +105,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     type: 'war',
                     command: jettyCommand,
                     memory: targetSail.config.memory || 256,
-                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables)
+                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                    name: targetSail.name
                 });
                 break;
             }
@@ -112,7 +115,8 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                 command: targetSail.config.command,
                 type: 'javase',
                 memory: targetSail.config.memory || 256,
-                env: targetSail.config.env_variables
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }

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

@@ -276,7 +276,7 @@ public class JavacronInvoker {
 			Method runner = cls.getMethod("handleCronExecute", CronRequest.class, Context.class);
 			CRON_STATUS cronStatus = null;
 
-			if(System.getenv("DEBUG").equals("false")) {
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
 				Timer executionTimer = new Timer(true);
 				executionTimer.schedule(new TimerTask() {
 					@Override

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

@@ -14,6 +14,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -231,6 +234,17 @@ public class JavaintegInvoker {
 
 			Method runner = cls.getMethod("runner", ZCIntegRequest.class);
 			ZCIntegResponse integResponse = null;
+
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, 900000L); // 15 mins
+			}
+
 			try {
 				integResponse = (ZCIntegResponse) runner.invoke(cls.getDeclaredConstructor().newInstance(), integRequest);
 			} catch (Exception e) {

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

@@ -20,6 +20,19 @@ const writeAndExit = (resp) => {
 	process.exit(0);
 };
 
+/**
+ * execution timeout of 15 minutes
+ */
+const timeout = 15 * 60 * 1000;
+// const endTime = timeout + Date.now();
+
+// exit on timeout
+process.env.DEBUG === 'false' &&
+	setTimeout(() => {
+		writeToFile('TIMEOUT', 408);
+		process.exit(0);
+	}, timeout);
+
 const integrationRequest = data || {};
 
 integrationRequest.catalystHeaders = Object.assign(projectJson, authJson);

package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java

@@ -10,6 +10,9 @@ import java.net.URLClassLoader;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -233,6 +236,17 @@ public class JavajobInvoker {
 
 			Method runner = cls.getMethod("handleJobExecute", JobRequest.class, Context.class);
 			JOB_STATUS jobStatus = null;
+
+			if(System.getenv("DEBUG") != null && System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, defaultContext.getMaxExecutionTimeMs());
+			}
+
 			try {
 				jobStatus = (JOB_STATUS) runner.invoke(cls.getDeclaredConstructor().newInstance(), jobRequest, context);
 			} catch (Exception e) {

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

@@ -35,12 +35,6 @@ function validateConfig(source, configJson) {
             };
         }
         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'
-            };
-        }
         configJson.build_path = absolutePath;
     }
     if (configJson.catalyst_auth === true) {
@@ -78,7 +72,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) {

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.2",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {

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

package/templates/init/functions/node/bio/types/basicio.d.ts

@@ -0,0 +1,57 @@
+/**
+ * This is a utility file with the type declaration of the BasicIO function parameters
+ */
+
+/**
+ * Type of the BasicIO object. Contains the functional APIs of BasicIO
+ */
+export interface BasicIO {
+    /**
+     * Write to the BasicIO output
+     * @param value input string
+     * @returns 
+     */
+    write: (value: string) => void;
+    /**
+     * Set the BasicIO status code
+     * @param statusCode status code of BasicIO
+     * @returns 
+     */
+    setStatus: (statusCode: number) => void;
+    /**
+     * Get the input argument values of the BasicIO
+     * @param key argument name(key)
+     * @returns argument value as string
+     */
+    getArgument: (key: string) => string;
+    /**
+     * Get all input arguments
+     * @returns all arguments as key value pair
+     */
+    getAllArguments: () => Record<string, string>;
+}
+
+/**
+ * Type of the context object of the function
+ */
+export interface Context {
+    /**
+     * Contains catalyst auth headers (for internal use)
+     */
+    catalystHeaders: Record<string, string>;
+    /**
+     * To indicate the end of a function execution
+     * @returns 
+     */
+    close: () => void;
+    /**
+     * Fetch the remaining execution time of the function
+     * @returns remaining execution time in milliseconds
+     */
+    getRemainingExecutionTimeMs: () => number;
+    /**
+     * Fetch the maximum execution time of the function
+     * @returns maximum execution time in milliseconds
+     */
+    getMaxExecutionTimeMs: () => number;
+}

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

@@ -1,3 +1,8 @@
+/**
+ * 
+ * @param {import('./types/cron').CronDetails} cronDetails 
+ * @param {import('./types/cron').Context} context 
+ */
 module.exports = (cronDetails, context) => {
 	console.log('Hello from {{_MAIN_}}');
 

package/templates/init/functions/node/cron/types/cron.d.ts

@@ -0,0 +1,64 @@
+/**
+ * This is a utility file with the type declaration of the Cron function parameters
+ */
+
+/**
+ * Type of Cron Details object. Contains the details of the scheduled cron
+ */
+export interface CronDetails {
+    /**
+     * Get the input param value of the Cron function
+     * @returns input param value
+     */
+    getCronParam: () => string;
+    /**
+     * Get all input params of the Cron function
+     * @returns all input params as key value pairs
+     */ 
+    getAllCronParam: () => Record<string, string>;
+    /**
+     * Get the remaining execution count of the cron job
+     * @returns remaining execution count
+     */
+    getRemainingExecutionCount: () => number;
+    /**
+     * Get the details of the cron which executed the function
+     * @returns cron details
+     */
+    getCronDetails: () => Record<string, unknown>;
+    /**
+     * Get the current project details
+     * @returns project details
+     */
+    getProjectDetails: () => Record<string, unknown>;
+}
+
+/**
+ * Type of the Context object of the Cron function
+ */
+export interface Context {
+    /**
+     * Contains catalyst auth headers (for internal use)
+     */
+    catalystHeaders: Record<string, string>;
+    /**
+     * Close the Cron function with success response
+     * @returns 
+     */
+    closeWithSuccess: () => void;
+    /**
+     * Close the Cron function failure response
+     * @returns 
+     */
+    closeWithFailure: () => void;
+    /**
+     * Get the remaining execution time of the Cron function
+     * @returns remaining execution time in milliseconds
+     */
+    getRemainingExecutionTimeMs: () => number;
+    /**
+     * Get the maximum possible execution time of the Cron function
+     * @returns maximum possible execution time in milliseconds
+     */
+    getMaxExecutionTimeMs: () => number;
+}

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

@@ -1,20 +1,23 @@
+/**
+ * 
+ * @param {import('./types/event').EventDetails} event 
+ * @param {import('./types/event').Context} context 
+ */
 module.exports = (event, context) => {
 	/* 
         EVENT FUNCTIONALITIES
     */
-	// const DATA = event.data; //event data
-	// const TIME = event.time; //event occured time
+	// const DATA = event.getData(); //event data
+	// const TIME = event.getTime(); //event occurred time
 
-	// const SOURCE_DETAILS = event.getSourceDetails(); //event source details
-	// const SOURCE_ACTION = SOURCE_DETAILS.action; //(insert | fetch | invoke ...)
-	// const SOURCE_TYPE = SOURCE_DETAILS.type; //(datastore | cache | queue ...)
-	// const SOURCE_ENTITY_ID = SOURCE_DETAILS.entityId; //if type is datastore then entity id is tableid
+	// const ACTION = event.getAction(); //(insert | fetch | invoke ...)
+	// const SOURCE = event.getSource(); //(datastore | cache | queue ...)
+	// const SOURCE_ENTITY_ID = event.getSourceEntityId(); //if type is datastore then entity id is tableid
 
-	// const SOURCE_BUS_DETAILS = SOURCE_DETAILS.getBusDetails(); //event bus details
+	// const SOURCE_BUS_DETAILS = event.getBusDetails(); //event bus details
 	// const SOURCE_BUS_ID = SOURCE_BUS_DETAILS.id; //event bus id
 
 	// const PROJECT_DETAILS = event.getProjectDetails(); //event project details
-	// const FUNCTION_DETAILS = event.getFunctionDetails(); //event function details
 
 	console.log('Hello from {{_MAIN_}}');
 

package/templates/init/functions/node/event/types/event.d.ts

@@ -0,0 +1,82 @@
+/**
+ * This is a utility file with the type declaration of the Event function parameters
+ */
+
+/**
+ * Type of Event Details object. Contains the details of the triggered Event
+ */
+export interface EventDetails {
+    /**
+     * Event data
+     */
+    data: Record<string, unknown>;
+    /**
+     * Time of the event
+     */
+    time: number;
+    /**
+     * Get the project details of the event function
+     * @returns project details
+     */
+    getProjectDetails: () => Record<string, unknown>;
+    /**
+     * Functional API to get the data of the event
+     * @returns event data
+     */
+    getData: () => Record<string, unknown>;
+    /**
+     * Functional API to get the time of the event
+     * @returns event time
+     */
+    getTime: () => number;
+    /**
+     * Get the action that triggered the event
+     * @returns action
+     */
+    getAction: () => string;
+    /**
+     * Get the source of the event
+     * @returns event source
+     */
+    getSource: () => string;
+    /**
+     * Get the Id of the entity that triggered the event
+     * @returns source entity's Id
+     */
+    getSourceEntityId: () => string;
+    /**
+     * Get the details of the event bus
+     * @returns event bus details
+     */
+    getEventBusDetails: () => Record<string, unknown>;
+}
+
+/**
+ * Type of the Context object of the Event function
+ */
+export interface Context {
+    /**
+     * Contains catalyst auth headers (for internal use)
+     */
+    catalystHeaders: Record<string, string>;
+    /**
+     * Close the Event function with success response
+     * @returns 
+     */
+    closeWithSuccess: () => void;
+    /**
+     * Close the Event function failure response
+     * @returns 
+     */
+    closeWithFailure: () => void;
+    /**
+     * Get the remaining execution time of the Event function
+     * @returns remaining execution time in milliseconds
+     */
+    getRemainingExecutionTimeMs: () => number;
+    /**
+     * Get the maximum possible execution time of the Event function
+     * @returns maximum possible execution time in milliseconds
+     */
+    getMaxExecutionTimeMs: () => number;
+}

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

@@ -15,7 +15,6 @@ module.exports = (jobRequest, context) => {
 	const projectDetails = jobRequest.getProjectDetails(); // to get the current project details
 	const jobDetails = jobRequest.getJobDetails(); // to get the current job details
 	const jobMetaDetails = jobRequest.getJobMetaDetails(); // to get the current job's meta details
-	const jobpoolDetails = jobRequest.getJobpoolDetails(); // to get the current function job pool's details
 	const getJobCapacityAttributes = jobRequest.getJobCapacityAttributes(); // to get the current jobs capacity
 	const allJobParams = jobRequest.getAllJobParams(); // to get all the parameters supplied to the job function
 	const jobParam = jobRequest.getJobParam('key'); // to get the value of a particular parameter supplied to the job function

package/templates/init/functions/node/job/types/job.d.ts

@@ -18,10 +18,6 @@ export interface JobRequest {
      * @returns Meta details of the current job
      */
     getJobMetaDetails: () => Record<string, unknown>;
-    /**
-     * @returns Job pool details of the current job
-     */
-    getJobpoolDetails: () => Record<string, unknown>;
     /**
      * @returns Capacity attributes of the current job
      */

package/templates/init/functions/python/job/sample.py

@@ -11,7 +11,6 @@ def handler(job_request, context):
     job_details = job_request.get_job_details() # get the details of the current job
     project_details = job_request.get_project_details() # get the details of the current project
     job_meta_details = job_request.get_job_meta_details() # get the job meta of the current job
-    job_pool_details = job_request.get_job_pool_details() # get the current functions job pool details
     job_capacity_attributes = job_request.get_job_capacity_attributes() # get the current jobs capacity
     all_job_params = job_request.get_all_job_params() # get all the parameters supplied to the job function
     job_param = job_request.get_job_param('key') # get the value of a particular parameter supplied to the job function