zcatalyst-cli 1.17.6 → 1.18.0-beta.1

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

@@ -0,0 +1,173 @@
+"use strict";
+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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _TunnelServer_contextMap, _TunnelServer_server, _TunnelServer_destroyer, _TunnelServer_repel, _TunnelServer_projectId;
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const error_1 = __importDefault(require("../../error"));
+const logger_1 = require("../../util_modules/logger");
+const port_resolver_1 = __importDefault(require("../../port-resolver"));
+const server_1 = require("../../util_modules/server");
+const ansi_colors_1 = require("ansi-colors");
+const util_1 = require("util");
+const project_1 = require("../../util_modules/project");
+class TunnelServer {
+    constructor(repel) {
+        _TunnelServer_contextMap.set(this, {});
+        _TunnelServer_server.set(this, void 0);
+        _TunnelServer_destroyer.set(this, void 0);
+        _TunnelServer_repel.set(this, void 0);
+        _TunnelServer_projectId.set(this, (0, project_1.getProjectId)());
+        __classPrivateFieldSet(this, _TunnelServer_repel, repel, "f");
+    }
+    startServer() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tunnelPortOpt = Number.parseInt(runtime_store_1.default.get('context.port.tunnel'));
+            if (Number.isNaN(tunnelPortOpt)) {
+                return;
+            }
+            const port = yield port_resolver_1.default.getFreePort(tunnelPortOpt).catch((e) => (0, logger_1.debug)(e));
+            if (!port || tunnelPortOpt !== port) {
+                throw new error_1.default(`Port unavailable ${tunnelPortOpt}`, {
+                    exit: 1,
+                    errorId: 'TUNNEL-1',
+                    arg: [ansi_colors_1.bold.red(tunnelPortOpt + ''), (0, ansi_colors_1.bold)('--tunnel')]
+                });
+            }
+            const app = (0, express_1.default)();
+            app.use(express_1.default.json());
+            app.all('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const body = req.body;
+                    if (!body.function_details || !body.function_data) {
+                        res.status(400);
+                        res.send();
+                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid tunnel request: ' + (0, util_1.inspect)(body));
+                        return;
+                    }
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                    __classPrivateFieldGet(this, _TunnelServer_repel, "f").write((0, ansi_colors_1.bold)(`Received tunnel request from ${body.function_details.function_name}(${body.function_details.function_id})`));
+                    const target = body.function_details.function_id in __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")
+                        ? __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[body.function_details.function_id]
+                        : (() => {
+                            if (__classPrivateFieldGet(this, _TunnelServer_projectId, "f") !== body.function_details.project_id) {
+                                res.status(403);
+                                res.send();
+                                __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                                __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('Invalid access: the tunnel is trying to access the functions from a different project');
+                                __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                                __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('[STATUS]');
+                                __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('FORBIDDEN');
+                                return;
+                            }
+                            const namedFn = __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[body.function_details.function_name];
+                            if (namedFn) {
+                                return namedFn;
+                            }
+                            res.status(404);
+                            res.send();
+                            __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                            __classPrivateFieldGet(this, _TunnelServer_repel, "f").write(`The tunneled function ${(0, ansi_colors_1.bold)(body.function_details.function_name)} is not present in local project directory`);
+                            __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                            __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('[STATUS]');
+                            __classPrivateFieldGet(this, _TunnelServer_repel, "f").write('NOT_FOUND');
+                            return;
+                        }).bind(this)();
+                    if (!target) {
+                        return;
+                    }
+                    const fnData = typeof body.function_data === 'string'
+                        ? JSON.parse(body.function_data)
+                        : body.function_data;
+                    target.call(false)(fnData);
+                    const errorHandler = (e) => {
+                        res.status(500);
+                        res.send();
+                        (0, logger_1.debug)('Target error: ' + e);
+                    };
+                    target.once('error', errorHandler);
+                    const response = yield new Promise((resolve, reject) => {
+                        target.once('response', (response) => {
+                            target.removeListener('error', errorHandler);
+                            if (!response.Status && !response.status) {
+                                return reject(response);
+                            }
+                            resolve(response);
+                        });
+                    });
+                    response.ContentType && res.setHeader('Content-Type', response.ContentType);
+                    res.status(response.status || 200);
+                    res.send(response.responseBody);
+                }
+                catch (e) {
+                    res.status(500);
+                    res.send();
+                    (0, logger_1.debug)(e);
+                }
+            }));
+            return new Promise((res, rej) => {
+                try {
+                    __classPrivateFieldSet(this, _TunnelServer_server, app.listen(port, 'localhost', () => {
+                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write();
+                        __classPrivateFieldGet(this, _TunnelServer_repel, "f").write((0, ansi_colors_1.bold)('Tunneling server running on port: ' + (0, ansi_colors_1.green)(port + '')));
+                        res();
+                    }), "f");
+                    __classPrivateFieldSet(this, _TunnelServer_destroyer, new server_1.ConnectionDestroyer(__classPrivateFieldGet(this, _TunnelServer_server, "f")), "f");
+                    __classPrivateFieldGet(this, _TunnelServer_server, "f").on('error', (err) => {
+                        throw new error_1.default('Tunneling server error', {
+                            original: err,
+                            exit: 2
+                        });
+                    });
+                }
+                catch (er) {
+                    rej(new error_1.default('Unable to start the tunneling server', {
+                        exit: 2,
+                        original: er
+                    }));
+                }
+            });
+        });
+    }
+    addContext(name, target) {
+        if (!__classPrivateFieldGet(this, _TunnelServer_server, "f")) {
+            return this;
+        }
+        __classPrivateFieldGet(this, _TunnelServer_contextMap, "f")[name] = target;
+        return this;
+    }
+    stopServer() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!__classPrivateFieldGet(this, _TunnelServer_server, "f")) {
+                return;
+            }
+            return (_a = __classPrivateFieldGet(this, _TunnelServer_destroyer, "f")) === null || _a === void 0 ? void 0 : _a.destroy();
+        });
+    }
+}
+exports.default = TunnelServer;
+_TunnelServer_contextMap = new WeakMap(), _TunnelServer_server = new WeakMap(), _TunnelServer_destroyer = new WeakMap(), _TunnelServer_repel = new WeakMap(), _TunnelServer_projectId = new WeakMap();

package/lib/shell/index.js

@@ -27,7 +27,10 @@ const http_functions_1 = __importDefault(require("./dependencies/http-functions"
 const local_function_1 = __importDefault(require("./dependencies/local-function"));
 const prepare_1 = __importDefault(require("./prepare"));
 const fn_watcher_1 = __importDefault(require("../fn-watcher"));
+const tunnel_server_1 = __importDefault(require("./dependencies/tunnel-server"));
+const endpoints_1 = require("../endpoints");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const replServer = new repl_server_1.default({
         prompt: 'functions > ',
         writer: (output) => {
@@ -44,9 +47,16 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     });
     const httpServer = new http_functions_1.default({ repl: replServer });
+    const tunnelServer = new tunnel_server_1.default(replServer);
     const projectRoot = runtime_store_1.default.get('project.root');
     try {
-        yield (0, prepare_1.default)([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
+        yield (0, prepare_1.default)([
+            constants_1.FN_TYPE.basic,
+            constants_1.FN_TYPE.cron,
+            constants_1.FN_TYPE.event,
+            constants_1.FN_TYPE.integration,
+            constants_1.FN_TYPE.job
+        ]);
         const targets = runtime_store_1.default
             .get('context.functions.targets', [])
             .filter((target) => {
@@ -55,6 +65,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     target.name +
                     '] is not a valid one reason : ' +
                     target.failure_reason);
+                Array.isArray(target.compilationError) &&
+                    target.compilationError.forEach((er) => (0, logger_js_1.error)(er));
+                Array.isArray(target.compilationWarning) &&
+                    target.compilationWarning.forEach((warn) => (0, logger_js_1.warning)(warn));
             }
             return target.valid;
         });
@@ -65,6 +79,33 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         }
         replServer.start();
+        yield tunnelServer.startServer();
+        const tunnelUrl = runtime_store_1.default.get('context.fn_shell.enable_tunnel', undefined);
+        const _tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+        if (tunnelUrl) {
+            try {
+                yield _tunnelAPI.enableTunnel(typeof tunnelUrl === 'string' ? tunnelUrl : undefined);
+            }
+            catch (er) {
+                const _er = error_1.default.getErrorInstance(er);
+                !replServer.closed && replServer.close();
+                yield tunnelServer.stopServer();
+                if (_er.status === 400) {
+                    const data = (_a = _er.context) === null || _a === void 0 ? void 0 : _a.body.data;
+                    throw new error_1.default('Unable to enable tunnel: ' + _er.message, {
+                        exit: 1,
+                        original: _er,
+                        errorId: 'SHELL-IDX-2',
+                        arg: [ansi_colors_1.italic.red(data.message + ''), ansi_colors_1.italic.red(data.error_code + '')]
+                    });
+                }
+                throw new error_1.default('Unable to enable tunnel: ' + _er.message, {
+                    exit: 2,
+                    original: _er
+                });
+            }
+            replServer.write(ansi_colors_1.green.bold('Tunneling enabled'));
+        }
         const watchOpt = (0, option_1.getOptionValue)('watch');
         if (watchOpt === true) {
             (0, logger_js_1.info)();
@@ -75,7 +116,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 yield (0, fn_watcher_1.default)(target);
             }
             const localFn = new local_function_1.default(replServer, target);
-            replServer.setContext(target.name, localFn.call);
+            replServer.setContext(target.name, localFn.call());
+            tunnelServer.addContext(target.id || target.name, localFn);
             target.localFn = localFn;
         })));
         if (runtime_store_1.default.get('context.port.http.' + constants_1.FN_TYPE.basic, false)) {
@@ -83,6 +125,23 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         yield replServer.wait();
         yield httpServer.stop();
+        yield tunnelServer.stopServer().finally(() => __awaiter(void 0, void 0, void 0, function* () {
+            if (!tunnelUrl) {
+                return;
+            }
+            try {
+                const tunnelDetails = yield _tunnelAPI.getTunnel();
+                if (tunnelDetails.tunnel_status === 'Enabled') {
+                    yield _tunnelAPI.disableTunnel();
+                    (0, logger_js_1.info)();
+                    (0, logger_js_1.info)(ansi_colors_1.green.bold('Tunneling disabled'));
+                }
+            }
+            catch (er) {
+                (0, logger_js_1.error)('Error disabling the tunnel');
+                (0, logger_js_1.debug)(er);
+            }
+        }));
         yield Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
             if (target.localFn) {
                 return target.localFn.shutdown();
@@ -94,6 +153,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, logger_js_1.success)('shell complete');
     }
     catch (e) {
+        !replServer.closed && replServer.close();
         yield Promise.all([
             fs_1.ASYNC.deleteDir((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)).catch(),
             httpServer ? httpServer.stop() : undefined

package/lib/shell/prepare/languages/index.js

@@ -47,17 +47,17 @@ function java(targets) {
         return (yield Promise.resolve().then(() => __importStar(require('./java')))).default(targets);
     });
 }
-function python(targets, fnWatchEvent) {
+function python(targets) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield Promise.resolve().then(() => __importStar(require('./python')))).default(targets, fnWatchEvent);
+        return (yield Promise.resolve().then(() => __importStar(require('./python')))).default(targets);
     });
 }
-function prepareFunctions(targets, fnWatchEvent) {
+function prepareFunctions(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return Promise.all([
             node(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) && target.valid; })),
             java(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) && target.valid; })),
-            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }), fnWatchEvent)
+            python(targets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }))
         ]);
     });
 }

package/lib/shell/prepare/languages/java.js

@@ -18,7 +18,6 @@ const java_1 = require("../../../fn-utils/lib/java");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../../util_modules/constants");
 const fs_1 = require("../../../util_modules/fs");
-const fs_2 = require("fs");
 const throbber_1 = __importDefault(require("../../../throbber"));
 const error_1 = __importDefault(require("../../../error"));
 exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
@@ -56,7 +55,7 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
             const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
             yield Promise.all(serverFiles.map((file) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
-                    return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.path.replace('lib' + path_1.sep, ''))), fs_2.constants.COPYFILE_EXCL);
+                    return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.path.replace('lib' + path_1.sep, ''))), false);
                 }
                 catch (e) {
                     const err = error_1.default.getErrorInstance(e).original;

package/lib/shell/prepare/languages/python.js

@@ -21,7 +21,7 @@ const pip_install_1 = require("../../../init/dependencies/python/pip-install");
 const error_1 = __importDefault(require("../../../error"));
 const fs_extra_1 = require("fs-extra");
 const throbber_1 = __importDefault(require("../../../throbber"));
-exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
     }
@@ -42,22 +42,16 @@ exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, f
         var _a;
         const buildPath = (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
         const reqFile = (0, path_1.join)(target.source, constants_1.FILENAME.functions.python_requirements);
-        const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
-        const watch = fnWatchEvent
-            ? fnWatchEvent.pth === constants_1.FILENAME.functions.python_requirements
-            : true;
-        if (requirementsExists && watch) {
-            yield (0, fs_extra_1.ensureDir)(buildPath);
-            try {
-                yield (0, pip_install_1.installRequirements)(reqFile, buildPath, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''));
-            }
-            catch (err) {
-                const error = error_1.default.getErrorInstance(err);
-                target.valid = false;
-                target.failure_reason = error.message;
-            }
-        }
+        yield (0, fs_extra_1.ensureDir)(buildPath);
         yield fs_1.ASYNC.emptyDir(buildPath);
+        try {
+            yield (0, pip_install_1.installRequirements)(reqFile, buildPath, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''));
+        }
+        catch (err) {
+            const error = error_1.default.getErrorInstance(err);
+            target.valid = false;
+            target.failure_reason = error.message;
+        }
         yield fs_1.ASYNC.copyDir(target.source, buildPath);
         throbber.remove('function_serve_' + target.name);
         return target;

package/lib/throbber/index.js

@@ -42,7 +42,9 @@ class Throbber {
             options.text = name;
         }
         const spinnerProperties = Object.assign(Object.assign({}, this.options), options);
-        this.spinners[name] = spinnerProperties;
+        if (this.spin) {
+            this.spinners[name] = spinnerProperties;
+        }
         this.updateSpinnerState();
         return spinnerProperties;
     }
@@ -94,6 +96,9 @@ class Throbber {
         return !!Object.values(this.spinners).find(({ status }) => status === 'spinning');
     }
     setSpinnerProperties(name, options, status = 'spinning') {
+        if (!this.spin) {
+            return;
+        }
         if (!this.spinners[name]) {
             throw new error_js_1.default(`No spinner initialized with name ${name}`);
         }

package/lib/userConfig.js

@@ -9,7 +9,13 @@ const path_1 = __importDefault(require("path"));
 const error_1 = __importDefault(require("./error"));
 class UserConfig {
     constructor() {
-        this.validKeys = ['python3_9.bin', 'java8.bin', 'java11.bin', 'java17.bin'];
+        this.validKeys = [
+            'python3_9.bin',
+            'java8.bin',
+            'java11.bin',
+            'java17.bin',
+            'javac.disable_warnings'
+        ];
         this.configFilePath = path_1.default.join(constants_1.ENVPATH.userConfig.config, '.zcconfig');
         this.config = fs_1.SYNC.readJSONFile(this.configFilePath, { checkpath: true }) || {};
     }

package/lib/util_modules/config/index.js

@@ -30,5 +30,5 @@ const clientConfig = __importStar(require("./lib/client"));
 exports.clientConfig = clientConfig;
 const functionsConfig = __importStar(require("./lib/functions"));
 exports.functionsConfig = functionsConfig;
-const appSailConfig = __importStar(require("./lib/appSail.js"));
+const appSailConfig = __importStar(require("./lib/appsail"));
 exports.appSailConfig = appSailConfig;

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

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

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

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

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

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

package/lib/util_modules/constants/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENVPATH = exports.RUNTIME = exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
+exports.NEEDED_SCOPES = exports.ENVPATH = exports.RUNTIME = exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
 var apig_rules_1 = require("./lib/apig-rules");
 Object.defineProperty(exports, "APIG_RULES", { enumerable: true, get: function () { return __importDefault(apig_rules_1).default; } });
 var auth_1 = require("./lib/auth");
@@ -48,3 +48,5 @@ var runtime_1 = require("./lib/runtime");
 Object.defineProperty(exports, "RUNTIME", { enumerable: true, get: function () { return __importDefault(runtime_1).default; } });
 var env_path_1 = require("./lib/env-path");
 Object.defineProperty(exports, "ENVPATH", { enumerable: true, get: function () { return __importDefault(env_path_1).default; } });
+var needed_scopes_1 = require("./lib/needed-scopes");
+Object.defineProperty(exports, "NEEDED_SCOPES", { enumerable: true, get: function () { return __importDefault(needed_scopes_1).default; } });

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

@@ -17,7 +17,7 @@ exports.default = Object.freeze({
             browser_logic: 4400,
             appsail: {
                 master: 3000,
-                service: 4500
+                service: 4600
             },
             client: 5000
         },

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

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

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

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