zcatalyst-cli 1.15.0-beta.3 → 1.15.0-beta.4

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

@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+/* eslint-disable @typescript-eslint/no-var-requires */
+const EXEC_SYNC = require('child_process').execSync;
+
+const WAR = 'war';
+const JAVASE = 'javase';
+const NODEJS = 'nodejs';
+const PYTHON = 'python';
+
+// const WAR_DEFAULT = "";
+const JAVASE_DEFAULT = 'java Main';
+const NODEJS_DEFAULT = 'node main.js';
+const PYTHON_DEFAULT = 'python main.py';
+
+function parseCmdArg() {
+	const args = {};
+
+	for (let i = 0; i < process.argv.length; i++) {
+		switch (process.argv[i]) {
+			case '-t':
+			case '--type':
+				args.rtType = process.argv[i + 1];
+				break;
+			case '-c':
+			case '--command':
+				args.command = process.argv.slice(i + 1);
+				break;
+			default:
+				break;
+		}
+	}
+
+	return args;
+}
+
+function getWarCommand(command) {
+	if (process.env.JAVA_OPTS) {
+		command += ` ${process.env.JAVA_OPTS}`;
+	}
+
+	const DRYRUN_OUTPUT = EXEC_SYNC(command.toString(), {
+		stdio: 'pipe',
+		cwd: process.env.JETTY_BASE
+	}).toString();
+	return `java ${DRYRUN_OUTPUT}`;
+}
+
+function main() {
+	const CMD_ARGS = parseCmdArg();
+
+	let command = '';
+	switch (CMD_ARGS.rtType) {
+		case WAR:
+			if (!CMD_ARGS.command) {
+				throw new Error(`command not found`);
+			}
+			command = getWarCommand(CMD_ARGS.command);
+			break;
+		case JAVASE:
+			command = CMD_ARGS.command || JAVASE_DEFAULT;
+			break;
+		case NODEJS:
+			command = CMD_ARGS.command || NODEJS_DEFAULT;
+			break;
+		case PYTHON:
+			command = CMD_ARGS.command || PYTHON_DEFAULT;
+			break;
+		default:
+			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
+	}
+
+	EXEC_SYNC(command.toString(), { stdio: 'inherit' });
+}
+
+main();

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

@@ -0,0 +1,54 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const fn_utils_1 = require("../../../../fn-utils");
+const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const constants_1 = require("../../../../util_modules/constants");
+const logger_1 = require("../../../../util_modules/logger");
+const project_1 = require("../../../../util_modules/project");
+const shell_1 = require("../../../../util_modules/shell");
+exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    const cwd = runtime_store_1.default.get('cwd');
+    const javaServer = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
+    const targetDir = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
+    const label = `${details.type}[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
+    const opts = [
+        '-cp',
+        (0, path_1.join)(targetDir, '*') + fn_utils_1.fnUtils.java.classPathSep + targetDir + path_1.sep,
+        `-DCATALYST_FUNCTION_TYPE=${constants_1.REMOTE_REF.functions.type[details.target.type]}`
+    ];
+    if (details.debugPort !== -1) {
+        (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
+        opts.push('-Xdebug');
+        opts.push('-Xrunjdwp:transport=dt_socket,address=' + details.debugPort + ',server=y,suspend=y');
+    }
+    opts.push((0, path_1.basename)(javaServer));
+    opts.push(details.httpPort + '');
+    const targetSource = (_c = details.target) === null || _c === void 0 ? void 0 : _c.source;
+    const configType = details.type === 'server' ? 'functions' : details.type;
+    const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
+    if (typeof servePlugin === 'function') {
+        const event = servePlugin(details, masterPort);
+        (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+        return event;
+    }
+    return (0, shell_1.spawn)('java', opts, {
+        cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
+        stdio: 'pipe',
+        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, 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) }, details.target.env_var)
+    }).RAW();
+});

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

@@ -152,88 +152,112 @@ function spinUpMaster(listenPort, otherServerDetails) {
             .on('proxyRes', proxyResponseHandler(systemRoutes))
             .on('close', () => (0, logger_2.debug)('proxy closed'));
         const proxyDestroyer = new server_js_1.ConnectionDestroyer(proxy);
-        otherServerDetails.forEach((serverDetail) => {
-            var _a;
-            switch (serverDetail.type) {
-                case 'client':
-                    const appTarget = `http://127.0.0.1:${serverDetail.httpPort}/app/`;
-                    app.use('/app', (req, res) => {
-                        const target = serverDetail.target;
-                        if (req.url === '/' && target.homepage.includes('/__catalyst')) {
-                            req.url = target.homepage;
-                            (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
-                        }
-                        else if (req.url.startsWith('/local-redirect') && target.login_redirect) {
-                            const isUrl = target.login_redirect.startsWith('/');
-                            if (isUrl) {
-                                res.redirect(target.login_redirect);
+        Object.keys(otherServerDetails).forEach((targ) => {
+            switch (targ) {
+                case 'client': {
+                    otherServerDetails.client.forEach((clientDetails) => {
+                        const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
+                        app.use('/app', (req, res) => {
+                            const target = clientDetails.target;
+                            if (req.url === '/' && target.homepage.includes('/__catalyst')) {
+                                req.url = target.homepage;
+                                (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
+                            }
+                            else if (req.url.startsWith('/local-redirect') && target.login_redirect) {
+                                const isUrl = target.login_redirect.startsWith('/');
+                                if (isUrl) {
+                                    res.redirect(target.login_redirect);
+                                }
+                                else {
+                                    res.redirect('/app/' + target.login_redirect);
+                                }
                             }
                             else {
-                                res.redirect('/app/' + target.login_redirect);
+                                proxy.web(req, res, {
+                                    target: appTarget,
+                                    changeOrigin: true
+                                });
                             }
-                        }
-                        else {
-                            proxy.web(req, res, {
-                                target: appTarget,
+                        });
+                        const appTargetUrl = new URL(appTarget);
+                        appTargetUrl.pathname = '';
+                        appTargetUrl.protocol = 'ws';
+                        app.addListener('upgrade', (...upgradeParam) => {
+                            proxy.ws(upgradeParam[0], upgradeParam[1], upgradeParam[2], {
+                                target: appTargetUrl.href,
+                                ws: true,
                                 changeOrigin: true
                             });
-                        }
-                    });
-                    const appTargetUrl = new URL(appTarget);
-                    appTargetUrl.pathname = '';
-                    appTargetUrl.protocol = 'ws';
-                    app.addListener('upgrade', (...upgradeParam) => {
-                        proxy.ws(upgradeParam[0], upgradeParam[1], upgradeParam[2], {
-                            target: appTargetUrl.href,
-                            ws: true,
-                            changeOrigin: true
                         });
                     });
                     break;
-                case 'server':
-                    app.use('/server/' + ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
-                        proxy.web(req, res, {
-                            target: `http://127.0.0.1:${serverDetail.httpPort}`
+                }
+                case 'server': {
+                    otherServerDetails.server.forEach((serverDetail) => {
+                        var _a;
+                        app.use('/server/' + ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.name), (req, res) => {
+                            proxy.web(req, res, {
+                                target: `http://127.0.0.1:${serverDetail.httpPort}`
+                            });
                         });
                     });
                     break;
-                case 'functions':
-                    const fnTarget = serverDetail.target;
-                    app.use(`/server/${fnTarget.name}${fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''}`, (req, res) => {
-                        proxy.web(req, res, {
-                            target: `http://127.0.0.1:${serverDetail.httpPort}/server/${fnTarget.name}${fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''}`,
-                            ws: true
-                        });
-                    });
-                    app.use('/baas/v1/project/:projectId/function/' +
-                        fnTarget.name +
-                        (fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''), (req, res) => {
-                        proxy.web(req, res, {
-                            target: `http://127.0.0.1:${serverDetail.httpPort}/server/${fnTarget.name}${fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''}`,
-                            ws: true
+                }
+                case 'functions': {
+                    otherServerDetails.functions.forEach((fnDetails) => {
+                        const fnTarget = fnDetails.target;
+                        app.use(`/server/${fnTarget.name}`, (req, res) => {
+                            proxy.web(req, res, {
+                                target: `http://127.0.0.1:${fnDetails.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic
+                                    ? `/server/${fnTarget.name}/execute`
+                                    : ''}`,
+                                ws: true
+                            });
                         });
-                    });
-                    if (fnTarget.id) {
-                        app.use('/server/' +
-                            fnTarget.id +
-                            (fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''), (req, res) => {
+                        app.use(`/baas/v1/project/:projectId/function/${fnTarget.name}`, (req, res) => {
                             proxy.web(req, res, {
-                                target: `http://127.0.0.1:${serverDetail.httpPort}/server/${fnTarget.id}${fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''}`,
+                                target: `http://127.0.0.1:${fnDetails.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic
+                                    ? `/server/${fnTarget.name}/execute`
+                                    : ''}`,
                                 ws: true
                             });
                         });
-                        app.use('/baas/v1/project/:projectId/function/' +
-                            fnTarget.id +
-                            (fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''), (req, res) => {
+                        if (fnTarget.id) {
+                            app.use(`/server/${fnTarget.id}`, (req, res) => {
+                                proxy.web(req, res, {
+                                    target: `http://127.0.0.1:${fnDetails.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic
+                                        ? `/server/${fnTarget.id}/execute`
+                                        : ''}`,
+                                    ws: true
+                                });
+                            });
+                            app.use(`/baas/v1/project/:projectId/function/${fnTarget.id}`, (req, res) => {
+                                proxy.web(req, res, {
+                                    target: `http://127.0.0.1:${fnDetails.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic
+                                        ? `/server/${fnTarget.id}/execute`
+                                        : ''}`,
+                                    ws: true
+                                });
+                            });
+                        }
+                    });
+                    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) => {
                             proxy.web(req, res, {
-                                target: `http://127.0.0.1:${serverDetail.httpPort}/server/${fnTarget.id}${fnTarget.type === constants_1.FN_TYPE.browserLogic ? '/execute' : ''}`,
+                                target: `http://127.0.0.1:${appSailDetails.target.port}`,
                                 ws: true
                             });
                         });
-                    }
+                    });
                     break;
+                }
                 default:
-                    throw new error_1.default('Unknown type provided to master server ' + serverDetail.type, {
+                    throw new error_1.default('Unknown type provided to master server ' + targ, {
                         exit: 2
                     });
             }

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

@@ -1,75 +1,86 @@
-'use strict';
-
-import express from 'express';
-import { inspect } from 'util';
-import { pathToFileURL } from 'url';
-
-const args = process.argv.slice(2);
-const listenPort = parseInt(args[0], 10);
-const fnDetails = JSON.parse(args[1]);
-
-const app = express();
-
-const targetName = fnDetails.name;
-const index = pathToFileURL(fnDetails.index);
-const type = fnDetails.type;
-
-app.all('/server/:fnId/execute', async (req, res) => {
-	try {
-		if (index === undefined) {
-			throw new Error(`index of ${type} function is undefined`);
-		}
-		if (type !== 'browserlogic') {
-			throw new Error('Invalid URL pattern for the functions type: ' + type);
-		}
-		const userModule = await import(index);
-		const browserLogic = await import('./browserlogic/index.js');
-		const browserModule = await browserLogic.default(userModule);
-		const fnParams = await browserModule.constructFunctionParameters(
-			req,
-			res,
-			fnDetails.source
-		);
-		try {
-			await browserModule.logic(...fnParams);
-		} catch (err) {
-			browserModule.close(...fnParams);
-		}
-	} catch (er) {
-		const errorString = inspect(er);
-		// eslint-disable-next-line no-console
-		console.error('[' + targetName + '] ' + errorString);
-		res.writeHead(500);
-		res.end(errorString);
-	}
-});
-
-app.all('/*', async (req, res) => {
-	try {
-		if (index === undefined) {
-			throw new Error(`index of ${type} function is undefined`);
-		}
-		const userModule = await import(index);
-		if (type !== 'aio') {
-			throw new Error('Invalid URL pattern for the functions type: ' + type);
-		}
-		if (!('default' in userModule)) {
-			throw new Error('Could not find any default export');
-		}
-		if (typeof userModule.default !== 'function') {
-			throw new Error('The default export is not a function');
-		}
-		await userModule.default(req, res);
-	} catch (e) {
-		const errorString = inspect(e);
-		// eslint-disable-next-line no-console
-		console.error('[' + targetName + '] ' + errorString);
-		res.writeHead(500);
-		res.end(errorString);
-	}
-});
-
-app.listen(listenPort).on('error', (err) => {
-	// eslint-disable-next-line no-console
-	console.error(err);
+"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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
+const path_1 = require("path");
+const stream_1 = require("stream");
+const error_1 = __importDefault(require("../../../../error"));
+const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const constants_1 = require("../../../../util_modules/constants");
+const logger_1 = require("../../../../util_modules/logger");
+const project_1 = require("../../../../util_modules/project");
+const shell_1 = require("../../../../util_modules/shell");
+exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
+    const _c = details.target, { ['watcher']: _ } = _c, serialisableTarget = __rest(_c, ['watcher']);
+    const cwd = runtime_store_1.default.get('cwd');
+    serialisableTarget.index = serialisableTarget.index
+        ? serialisableTarget.index.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build))
+        : undefined;
+    const opts = [
+        (0, path_1.join)(__dirname, 'server'),
+        details.httpPort + '',
+        JSON.stringify(serialisableTarget)
+    ];
+    if (details.debugPort !== -1) {
+        (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
+        opts.unshift('--inspect=' + details.debugPort);
+    }
+    const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
+    const servePlugin = yield (0, plugin_loader_1.default)('functions', 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
+    if (typeof servePlugin === 'function') {
+        const logStreamPlugin = yield (0, plugin_loader_1.default)('functions', 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));
+        if (typeof logStreamPlugin === 'function') {
+            const stream = yield logStreamPlugin();
+            if (stream instanceof stream_1.Stream) {
+                const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+                stream.on('data', streamLogFn);
+            }
+        }
+        const event = servePlugin(details, masterPort).catch((e) => {
+            var _a;
+            const err = error_1.default.getErrorInstance(e, {
+                fileName: __filename,
+                skipHelp: false
+            });
+            err.errorId = 'SERVE-IDX-1';
+            err.arg = [
+                'functions',
+                (0, ansi_colors_1.bold)(((_a = details.target.plugins) === null || _a === void 0 ? void 0 : _a.start)[targetSource] || 'start'),
+                (0, ansi_colors_1.bold)('Error: ') + ansi_colors_1.italic.red(err.message)
+            ];
+            throw err;
+        });
+        (0, logger_1.labeled)(label, `Plugin : "${runtime_store_1.default.get(`context.functions.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
+        return event;
+    }
+    return (0, shell_1.spawn)('node', opts, {
+        cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
+        stdio: 'pipe',
+        env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+    }).RAW();
 });

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

@@ -0,0 +1,77 @@
+'use strict';
+
+import express from 'express';
+import { inspect } from 'util';
+import { pathToFileURL } from 'url';
+
+const args = process.argv.slice(2);
+const listenPort = parseInt(args[0], 10);
+const fnDetails = JSON.parse(args[1]);
+
+const app = express();
+
+const targetName = fnDetails.name;
+const index = pathToFileURL(fnDetails.index);
+const type = fnDetails.type;
+
+const aioHandler = async (req, res) => {
+	try {
+		if (index === undefined) {
+			throw new Error(`index of ${type} function is undefined`);
+		}
+		const userModule = await import(index);
+		if (type !== 'aio') {
+			throw new Error('Invalid URL pattern for the functions type: ' + type);
+		}
+		if (!('default' in userModule)) {
+			throw new Error('Could not find any default export');
+		}
+		if (typeof userModule.default !== 'function') {
+			throw new Error('The default export is not a function');
+		}
+		await userModule.default(req, res);
+	} catch (e) {
+		const errorString = inspect(e);
+		// eslint-disable-next-line no-console
+		console.error('[' + targetName + '] ' + errorString);
+		res.writeHead(500);
+		res.end(errorString);
+	}
+};
+
+const browserLogicHandler = async (req, res) => {
+	try {
+		if (index === undefined) {
+			throw new Error(`index of ${type} function is undefined`);
+		}
+		if (type !== 'browserlogic') {
+			throw new Error('Invalid URL pattern for the functions type: ' + type);
+		}
+		const userModule = await import(index);
+		const browserLogic = await import('./browserlogic/index.js');
+		const browserModule = await browserLogic.default(userModule);
+		const fnParams = await browserModule.constructFunctionParameters(
+			req,
+			res,
+			fnDetails.source
+		);
+		try {
+			await browserModule.logic(...fnParams);
+		} catch (err) {
+			browserModule.close(...fnParams);
+		}
+	} catch (er) {
+		const errorString = inspect(er);
+		// eslint-disable-next-line no-console
+		console.error('[' + targetName + '] ' + errorString);
+		res.writeHead(500);
+		res.end(errorString);
+	}
+};
+
+app.use('/', type === 'browserlogic' ? browserLogicHandler : aioHandler);
+
+app.listen(listenPort).on('error', (err) => {
+	// eslint-disable-next-line no-console
+	console.error(err);
+});

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

@@ -0,0 +1,46 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const http_functions_1 = require("../../../../shell/dependencies/http-functions");
+const userConfig_1 = __importDefault(require("../../../../userConfig"));
+const constants_1 = require("../../../../util_modules/constants");
+const project_1 = require("../../../../util_modules/project");
+const shell_1 = require("../../../../util_modules/shell");
+const logger_1 = require("../../../../util_modules/logger");
+const util_1 = require("util");
+exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const projectRoot = runtime_store_1.default.get('project.root');
+    const opts = ['-u', 'main.py'];
+    const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
+    const runtimesDir = constants_1.ENVPATH.runtimes.data;
+    const stackVersion = (_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.replace('python_', '');
+    return new Promise((res) => {
+        const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
+            cwd: (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`),
+            stdio: 'pipe',
+            env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        }).RAW();
+        child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
+        }));
+        child.on('error', (err) => {
+            (0, logger_1.debug)('Python Child spawn error');
+            (0, logger_1.debug)((0, util_1.inspect)(err));
+        });
+        res(child);
+    });
+});

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

@@ -15,9 +15,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const open_1 = __importDefault(require("open"));
 const logger_1 = require("../../../../util_modules/logger");
 const server_js_1 = __importDefault(require("./server.js"));
+const plugin_loader_1 = __importDefault(require("../../../../plugin-loader"));
+const stream_1 = require("stream");
+const error_1 = __importDefault(require("../../../../error"));
+const ansi_colors_1 = require("ansi-colors");
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const target = details.target;
+    const servePlugin = yield (0, plugin_loader_1.default)('client', 'start', target.source).catch((err) => (0, logger_1.debug)(err));
+    if (typeof servePlugin === 'function') {
+        process.env.X_CATALYST_WEBAPP_PATH = target.source;
+        const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs', target.source).catch((err) => (0, logger_1.debug)(err));
+        if (typeof logStreamPlugin === 'function') {
+            const stream = yield logStreamPlugin();
+            if (stream instanceof stream_1.Stream) {
+                const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+                stream.on('data', streamLogFn);
+            }
+        }
+        const event = servePlugin(details, masterPort).catch((e) => {
+            var _a;
+            const err = error_1.default.getErrorInstance(e, {
+                fileName: __filename,
+                skipHelp: false
+            });
+            err.errorId = 'SERVE-IDX-1';
+            err.arg = [
+                'client',
+                (0, ansi_colors_1.bold)(((_a = target.plugins) === null || _a === void 0 ? void 0 : _a.start)[target.source] || 'start'),
+                (0, ansi_colors_1.bold)('Error: ') + ansi_colors_1.italic.red(err.message)
+            ];
+            throw err;
+        });
+        (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();
+        return event;
+    }
     const clientListener = yield (0, server_js_1.default)(details.httpPort, target.source, {
         homepage: target.homepage,
         enableWatch: ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false,