zcatalyst-cli 1.15.0-beta.5 → 1.15.0-beta.7

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

@@ -92,6 +92,7 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
     }
 };
 function spinUpMaster(listenPort, otherServerDetails) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const projectDetails = {
             id: (0, project_2.getProjectId)(),
@@ -104,7 +105,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
         const customProxyUrl = (0, option_1.getOptionValue)('proxy');
         const app = (0, express_1.default)();
         let systemRoutes;
-        app.use(logger_1.default);
+        app.use((0, logger_1.default)((_a = otherServerDetails.appSail) === null || _a === void 0 ? void 0 : _a.at(0)));
         app.use(cookie_parser_1.default);
         app.use((0, project_1.default)(projectDetails));
         app.use(authenticator_1.default);
@@ -153,9 +154,10 @@ function spinUpMaster(listenPort, otherServerDetails) {
             .on('close', () => (0, logger_2.debug)('proxy closed'));
         const proxyDestroyer = new server_js_1.ConnectionDestroyer(proxy);
         Object.keys(otherServerDetails).forEach((targ) => {
+            var _a, _b, _c, _d;
             switch (targ) {
                 case 'client': {
-                    otherServerDetails.client.forEach((clientDetails) => {
+                    (_a = otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => {
                         const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
                         app.use('/app', (req, res) => {
                             const target = clientDetails.target;
@@ -193,7 +195,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     break;
                 }
                 case 'server': {
-                    otherServerDetails.server.forEach((serverDetail) => {
+                    (_b = otherServerDetails.server) === null || _b === void 0 ? void 0 : _b.forEach((serverDetail) => {
                         var _a;
                         app.use('/server/' + ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
                             proxy.web(req, res, {
@@ -204,7 +206,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     break;
                 }
                 case 'functions': {
-                    otherServerDetails.functions.forEach((fnDetails) => {
+                    (_c = otherServerDetails.functions) === null || _c === void 0 ? void 0 : _c.forEach((fnDetails) => {
                         const fnTarget = fnDetails.target;
                         app.use(`/server/${fnTarget.name}`, (req, res) => {
                             proxy.web(req, res, {
@@ -244,12 +246,11 @@ function spinUpMaster(listenPort, otherServerDetails) {
                     break;
                 }
                 case 'appSail': {
-                    otherServerDetails.appSail.forEach((appSailDetails) => {
-                        var _a;
-                        app.use('/appsail/' +
-                            ((_a = appSailDetails.target.appSail) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
+                    (_d = otherServerDetails.appSail) === null || _d === void 0 ? void 0 : _d.forEach((appSailDetails) => {
+                        app.use('/', (req, res) => {
                             proxy.web(req, res, {
-                                target: `http://127.0.0.1:${appSailDetails.target.port}`,
+                                target: `http://127.0.0.1:${appSailDetails.target.port
+                                    .appsail}`,
                                 ws: true
                             });
                         });
@@ -274,7 +275,6 @@ function spinUpMaster(listenPort, otherServerDetails) {
         expressServer.maxConnections = 100;
         process.on('SIGINT', () => expressDestroyer.destroy(false));
         expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
-            (0, logger_2.info)('Shutting down server');
             yield proxyDestroyer.destroy().catch((err) => (0, logger_2.debug)(err));
         }));
         expressServer.on('upgrade', (...upgradeParam) => {

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

@@ -48,7 +48,9 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
             ];
             throw err;
         });
+        (0, logger_1.info)();
         (0, logger_1.labeled)(`Client[${target.name}]`, `Plugin : "${runtime_store_1.default.get(`context.client.plugins.start${target.source ? '.' + target.source : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+        (0, logger_1.info)();
         return event;
     }
     const clientListener = yield (0, server_js_1.default)(details.httpPort, target.source, {
@@ -57,11 +59,9 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
         notFoundPage: target.notFoundPage
     });
     clientListener.addListener('start', () => {
-        var _a, _b;
-        const appUrl = 'http://localhost:' + masterPort;
-        const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-        (0, logger_1.labeled)(label, `URL : ${appUrl}/app/`).MESSAGE();
-        ((_b = details.target.opts) === null || _b === void 0 ? void 0 : _b.open) && (0, open_1.default)(appUrl).catch();
+        var _a;
+        return ((_a = details.target.opts) === null || _a === void 0 ? void 0 : _a.open) &&
+            (0, open_1.default)('http://localhost:' + masterPort).catch();
     });
     return clientListener;
 });

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

@@ -32,6 +32,8 @@ const logger_2 = require("../../util_modules/logger");
 const project_2 = require("../../util_modules/project");
 const shell_1 = require("../../util_modules/shell");
 const request_1 = __importDefault(require("request"));
+const option_1 = require("../../util_modules/option");
+const server_1 = require("../../util_modules/server");
 const logUrl = (name, pthName, httpPort, masterPort) => {
     (0, logger_2.labeled)(`functions(${name})`, 'URL => http://localhost:' + (masterPort === -1 ? httpPort : masterPort) + pthName).MESSAGE();
 };
@@ -323,6 +325,9 @@ class HttpFunctions {
                                 (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.emit('next');
                             }, 1000);
                         });
+                        if ((0, option_1.getCurrentCommand)() === 'functions:shell') {
+                            logUrl(target.name, new url_1.URL(target.url).pathname, httpPort, masterPort);
+                        }
                     });
                     if (this.repl !== undefined) {
                         this.repl.showPrompt();
@@ -335,10 +340,8 @@ class HttpFunctions {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             const server = yield this._spinUpServer();
-            server.on('connection', (socket) => {
-                socket.unref();
-            });
-            HttpFunctions.server = server;
+            const connDestroyer = new server_1.ConnectionDestroyer(server);
+            this.connDestroyer = connDestroyer;
             return server;
         });
     }
@@ -349,20 +352,13 @@ class HttpFunctions {
                     slave.kill('SIGINT');
                 });
                 this.q.destroy(() => __awaiter(this, void 0, void 0, function* () {
-                    yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _a; return (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.close(); })));
-                    if (HttpFunctions.server !== null) {
-                        HttpFunctions.server.close((err) => {
-                            (0, logger_2.debug)(err);
-                            res();
-                        });
-                    }
-                    else {
-                        res();
-                    }
+                    var _a;
+                    yield Promise.all(this.targets.map((target) => __awaiter(this, void 0, void 0, function* () { var _b; return (_b = target.watcher) === null || _b === void 0 ? void 0 : _b.close(); })));
+                    yield ((_a = this.connDestroyer) === null || _a === void 0 ? void 0 : _a.destroy());
+                    res();
                 }));
             });
         });
     }
 }
-HttpFunctions.server = null;
 exports.default = HttpFunctions;

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

@@ -21,6 +21,7 @@ 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* () {
     if (targets === undefined || targets.length === 0) {
         return;
@@ -55,14 +56,18 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
             const javaInvoker = (0, path_1.join)(__dirname, '../../../serve/server/lib/java/aio_server/JavaaioServer.java');
             (0, java_1.ensureJavaInvoker)(javaServer, javaInvoker);
             const serverFiles = yield fs_1.ASYNC.walk((0, path_1.dirname)(javaServer));
-            yield Promise.all(serverFiles.map((file) => {
-                return fs_1.ASYNC.copyFile(file, (0, path_1.join)(targetBuildPath, (0, path_1.relative)((0, path_1.dirname)(javaServer), file.replace('lib' + path_1.sep, ''))), fs_2.constants.COPYFILE_EXCL).catch((err) => {
+            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);
+                }
+                catch (e) {
+                    const err = error_1.default.getErrorInstance(e).original;
                     if (err.code !== 'EEXIST') {
                         throbber.remove('function_serve_' + target.name);
                         throw err;
                     }
-                });
-            }));
+                }
+            })));
         }
         yield (0, common_1.copyModDirPerm)((0, path_1.join)(target.source, constants_1.FOLDERNAME.output), targetBuildPath, '555', {
             replace: false

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

@@ -12,10 +12,13 @@ exports.default = Object.freeze({
     serve_port: {
         http: {
             master: 3000,
+            appsail: {
+                master: 3000,
+                service: 3060
+            },
             advancedio: 3010,
             basicio: 3040,
             client: 3050,
-            appsail: 3060,
             browser_logic: 3100
         },
         debug: {

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

@@ -47,6 +47,7 @@ exports.default = Object.freeze({
     notification_web: 'ZohoCatalyst.notifications.web',
     search_read: 'ZohoCatalyst.search.READ',
     zia: 'ZohoCatalyst.mlkit.READ',
+    zia_hub: 'ZiaHub.deployment.READ',
     circuits_execute: 'ZohoCatalyst.circuits.execute',
     circuits_exe_read: 'ZohoCatalyst.circuits.execution.READ',
     circuits_exe_delete: 'ZohoCatalyst.circuits.execution.DELETE',

package/lib/util_modules/fs/lib/async.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.isFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
+exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const minimatch_1 = __importDefault(require("minimatch"));
 const os_1 = __importDefault(require("os"));
@@ -39,13 +39,6 @@ function fileExists(pth) {
     });
 }
 exports.fileExists = fileExists;
-function isFile(pth) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat((0, utils_js_1.untildify)(pth)).catch(() => false);
-        return stats && stats.isFile();
-    });
-}
-exports.isFile = isFile;
 function readFile(pth, type) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(yield fileExists(pth))) {
@@ -94,15 +87,16 @@ function walk(dir, { filter = {
     excludeDir: true
 }, depth = -1, includeDirPaths = false } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
+        const stats = yield fs_extra_1.default.lstat(dir);
         if (depth === 0) {
-            return includeDirPaths ? [dir] : [];
+            return includeDirPaths ? [{ path: dir, stats }] : [];
         }
-        const isDir = yield fs_extra_1.default.stat(dir).then((stat) => stat.isDirectory());
+        const isDir = stats.isDirectory() && !stats.isSymbolicLink();
         const files = isDir ? yield fs_extra_1.default.readdir(dir) : [path_1.default.basename(dir)];
         const folderContentPromise = files.map((entry) => __awaiter(this, void 0, void 0, function* () {
             const entryPath = isDir ? path_1.default.join(dir, entry) : dir;
-            const stats = yield fs_extra_1.default.stat(entryPath);
-            const isEntryPthDir = stats.isDirectory();
+            const entryPathStats = yield fs_extra_1.default.lstat(entryPath);
+            const isEntryPthDir = entryPathStats.isDirectory() && !entryPathStats.isSymbolicLink();
             let excludeMatch = false;
             if (!(isEntryPthDir && !filter.excludeDir)) {
                 for (const glob of filter.exclude || []) {
@@ -114,10 +108,10 @@ function walk(dir, { filter = {
             }
             return isEntryPthDir && depth !== 0
                 ? walk(entryPath, { filter, depth: depth - 1, includeDirPaths })
-                : [entryPath];
+                : [{ path: entryPath, stats: entryPathStats }];
         }));
         const folderContents = yield Promise.all(folderContentPromise);
-        return folderContents.reduce((all, folderContent) => all.concat(folderContent), includeDirPaths ? [dir] : []);
+        return folderContents.reduce((all, folderContent) => all.concat(folderContent), includeDirPaths ? [{ path: dir, stats }] : []);
     });
 }
 exports.walk = walk;
@@ -193,7 +187,7 @@ const findAndReplace = (pth) => (templates, finalWords) => __awaiter(void 0, voi
     }
     const files = yield walk(pth);
     yield Promise.all(files.map((file) => __awaiter(void 0, void 0, void 0, function* () {
-        let content = yield readFile(file);
+        let content = yield readFile(file.path);
         if (content === undefined) {
             return Promise.resolve();
         }
@@ -205,7 +199,7 @@ const findAndReplace = (pth) => (templates, finalWords) => __awaiter(void 0, voi
         else {
             content = content.replace(new RegExp(templates, 'g'), finalWords);
         }
-        return writeFile(file, content);
+        return writeFile(file.path, content);
     })));
 });
 exports.findAndReplace = findAndReplace;
@@ -239,7 +233,7 @@ function chmod(path, mode, { checkPath = true, recursive = false } = {}) {
         if (recursive && (yield dirExists(path))) {
             const paths = yield walk(path, { includeDirPaths: true, depth: 1 });
             paths.shift();
-            yield Promise.all(paths.map((_path) => chmod(_path, mode, { recursive, checkPath })));
+            yield Promise.all(paths.map((_path) => chmod(_path.path, mode, { recursive, checkPath })));
         }
         return fs_extra_1.default.chmod(path, mode);
     });

package/lib/util_modules/fs/lib/sync.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.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.fileExists = exports.getReadStream = exports.getWriteStream = void 0;
+exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.fileExists = exports.readSymLink = exports.getReadStream = exports.getWriteStream = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -15,6 +15,10 @@ function getReadStream(pth) {
     return fs_extra_1.default.createReadStream(pth);
 }
 exports.getReadStream = getReadStream;
+function readSymLink(pth) {
+    return fs_extra_1.default.readlinkSync(pth);
+}
+exports.readSymLink = readSymLink;
 function fileExists(pth) {
     try {
         const stats = fs_extra_1.default.statSync(pth);

package/package.json

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

package/templates/init/functions/java/integ/convokraft/FallbackHandler.java

@@ -7,6 +7,7 @@ public class FallbackHandler {
         JSONObject jsonResponse = new JSONObject();
         LOGGER.info("Fallback Handler : : TODO : "+ reqBody.get("todo"));
         jsonResponse.put("message", "Fallback Response: Please define this question and try again");
+        jsonResponse.put("status", "handled");
         return jsonResponse;
     }
 }

package/templates/init/functions/node/integ/convokraft/fallback.js

@@ -5,6 +5,7 @@ export default function handleFallback(request) {
   logger.info('Handling fallback request');
   
   return {
+    "status" : "handled",
     "message": "Fallback Response: Please define this question and try again"
   };
 }

package/templates/init/functions/python/integ/convokraft/fallback_handler.py

@@ -11,5 +11,6 @@ def handle_fallback_request(req_body):
     logging.info('Handling fallback request')
     
     return {
-        'message': 'Fallback Response: Please define this question and try again'
+        'message': 'Fallback Response: Please define this question and try again',
+        'status':'handled'
     }