zcatalyst-cli 1.20.2 → 1.22.0

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

@@ -3,14 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFnRoutes = void 0;
 const constants_1 = require("../../../../util_modules/constants");
 function addFnRoutes(app, details, proxy) {
+    if (details.isAlive === false) {
+        return;
+    }
     const fnTarget = details.target;
     app.use(`/server/${fnTarget.name}`, (req, res) => {
+        var _a;
+        if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+            res.status(503);
+            res.write(JSON.stringify({ data: 'Error connecting with the function' }));
+            return;
+        }
         proxy.web(req, res, {
             target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
             ws: true
         });
     });
     app.use(`/baas/v1/project/:projectId/function/${fnTarget.name}`, (req, res) => {
+        var _a;
+        if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+            res.status(503);
+            res.write(JSON.stringify({ data: 'Error connecting with the function' }));
+            return;
+        }
         proxy.web(req, res, {
             target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.name}/execute` : ''}`,
             ws: true
@@ -18,12 +33,24 @@ function addFnRoutes(app, details, proxy) {
     });
     if (fnTarget.id) {
         app.use(`/server/${fnTarget.id}`, (req, res) => {
+            var _a;
+            if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                res.status(503);
+                res.write(JSON.stringify({ data: 'Error connecting with the function' }));
+                return;
+            }
             proxy.web(req, res, {
                 target: `http://127.0.0.1:${details.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) => {
+            var _a;
+            if (!((_a = details.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                res.status(503);
+                res.write(JSON.stringify({ data: 'Error connecting with the function' }));
+                return;
+            }
             proxy.web(req, res, {
                 target: `http://127.0.0.1:${details.httpPort}${fnTarget.type === constants_1.FN_TYPE.basic ? `/server/${fnTarget.id}/execute` : ''}`,
                 ws: true

package/lib/serve/server/lib/master/index.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" />
+import { Server } from 'http';
+import { IServerDetails, TServerTargets } from '../../index';
+import { TAppSailServerDetails } from '../../../features/appsail';
+import { TSlateServerDetails } from '../../../features/slate';
+export default function spinUpMaster(listenPort: number, { otherServerDetails, appSailDetails, slateDetails }: {
+    otherServerDetails?: Partial<TServerTargets>;
+    appSailDetails?: IServerDetails<TAppSailServerDetails>;
+    slateDetails?: IServerDetails<TSlateServerDetails>;
+}): Promise<Server>;

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

@@ -26,7 +26,7 @@ const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
 const js_1 = require("../../../../util_modules/js");
-const logger_2 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 const project_2 = require("../../../../util_modules/project");
 const option_1 = require("../../../../util_modules/option");
 const server_js_1 = require("../../../../util_modules/server.js");
@@ -97,7 +97,7 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
             }
         }
         const proxy = (0, utils_1.createProxyServer)(listenPort);
-        const signRedirectUrl = slateDetails ? undefined : '/app/local-redirect';
+        const signRedirectUrl = slateDetails ? '/' : '/app/local-redirect';
         appSailDetails && ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true
             ? proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({
                 signInRedirect: appSailDetails.target.config.login_redirect || '/'
@@ -116,6 +116,9 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
                     case 'server': {
                         (_b = otherServerDetails.server) === null || _b === void 0 ? void 0 : _b.forEach((serverDetail) => {
                             var _a;
+                            if (serverDetail.isAlive === false) {
+                                return;
+                            }
                             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}`
@@ -146,9 +149,14 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
         });
         const expressDestroyer = new server_js_1.ConnectionDestroyer(expressServer);
         expressServer.maxConnections = 100;
-        process.on('SIGINT', () => expressDestroyer.destroy(false));
+        const stopServer = () => expressDestroyer.destroy(!!appSailDetails);
+        utils_1.serverEvent.once('stop', () => {
+            process.removeListener('SIGINT', stopServer);
+            stopServer();
+        });
+        process.once('SIGINT', stopServer);
         expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
-            yield proxyDestroyer.destroy().catch((err) => (0, logger_2.debug)(err));
+            yield proxyDestroyer.destroy().catch((err) => (0, index_1.debug)(err));
         }));
         expressServer.on('upgrade', (...upgradeParam) => {
             app.emit('upgrade', ...upgradeParam);

package/lib/serve/server/lib/master/slate.d.ts

@@ -0,0 +1,5 @@
+import Server from 'http-proxy';
+import { IServerDetails } from '../..';
+import { Express, Request, Response } from 'express';
+import { TSlateServerDetails } from '../../../features/slate';
+export declare function addSlateRoutes(app: Express, details: IServerDetails<TSlateServerDetails>, proxy: Server, unknownProxy: (req: Request, res: Response) => void): void;

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

@@ -11,25 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addSlateRoutes = void 0;
 function addSlateRoutes(app, details, proxy, unknownProxy) {
-    app.use('/__catalyst/sdk/init', (req, res) => __awaiter(this, void 0, void 0, function* () {
+    if (!details.isAlive === false) {
+        return;
+    }
+    app.use(['/accounts', '/oauthorize', '/__catalyst'], (req, res) => {
         req.url = req.originalUrl;
         unknownProxy(req, res);
-    }));
-    app.use(['/accounts', '/oauthorize'], (req, res) => {
-        req.url = req.originalUrl;
-        unknownProxy(req, res);
-    });
-    app.use('/__catalyst', (req, res) => {
-        req.url = req.originalUrl;
-        if (req.url.includes('redirect_url')) {
-            res.redirect(req.url.split('redirect_url=')[1]);
-        }
-        else if (req.url.includes('service_url')) {
-            res.redirect(req.url.split('service_url=')[1]);
-        }
-        else {
-            unknownProxy(req, res);
-        }
     });
     app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
         if (req.header('catalyst-component') === 'true') {

package/lib/serve/server/lib/master/unknown-req-proxy.d.ts

@@ -0,0 +1,4 @@
+import express from 'express';
+import Server from 'http-proxy';
+declare const _default: (proxyInstance: Server, masterPort: number, customProxyUrl?: string) => (req: express.Request, res: express.Response) => void;
+export default _default;

package/lib/serve/server/lib/master/unknown-req-proxy.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
@@ -15,16 +15,14 @@ exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     }
     else if (typeof customProxyUrl === 'string' &&
         !req.url.match(/^(\/baas|\/app|\/server|\/oauthorize|\/__catalyst).*/g)) {
-        (0, logger_1.debug)(`proxying "${req.url}" to "${customProxyUrl}"`);
+        (0, index_1.debug)(`proxying "${req.url}" to "${customProxyUrl}"`);
         proxyInstance.web(req, res, {
             target: customProxyUrl,
             ws: true,
             changeOrigin: true,
             secure: false,
             headers: {
-                'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
-                    '/' +
-                    runtime_store_1.default.get('context.cli.package.version')
+                'User-Agent': runtime_store_1.default.get('cli.package.name') + '/' + runtime_store_1.default.get('cli.package.version')
             }
         });
     }

package/lib/serve/server/lib/master/utils.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="node" />
+import { IncomingMessage, ServerResponse } from 'http';
+import { IAPIGLocal, IAPIGRules } from '../../../../apig-utils';
+import Server from 'http-proxy';
+import EventEmitter from 'events';
+export interface IMatchRule extends IAPIGRules {
+    target_endpoint: string;
+    source_endpoint: string;
+    params: {
+        [x: string]: string;
+    };
+}
+declare class ServerEvent extends EventEmitter {
+}
+export declare const serverEvent: ServerEvent;
+export declare const removeSecure: (str: string) => string;
+export declare const redirectByAuth: (req: IncomingMessage, res: ServerResponse, redirectUrl: string) => void;
+export declare const createProxyServer: (port: number) => Server;
+export declare const proxyResponseHandler: ({ systemRoutes, signInRedirect }: {
+    systemRoutes?: IAPIGLocal | undefined;
+    signInRedirect?: string | undefined;
+}) => (proxyRes: IncomingMessage, req: IncomingMessage, res: ServerResponse) => void;
+export declare const appsailInitJs: () => Promise<string>;
+export {};

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

@@ -12,14 +12,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appsailInitJs = exports.proxyResponseHandler = exports.createProxyServer = exports.redirectByAuth = exports.removeSecure = void 0;
+exports.appsailInitJs = exports.proxyResponseHandler = exports.createProxyServer = exports.redirectByAuth = exports.removeSecure = exports.serverEvent = void 0;
 const http_1 = require("http");
 const constants_1 = require("../../../../util_modules/constants");
 const fs_1 = require("../../../../util_modules/fs");
 const error_1 = __importDefault(require("../../../../error"));
 const project_1 = require("../../../../util_modules/project");
 const http_proxy_1 = require("http-proxy");
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
+const events_1 = __importDefault(require("events"));
+class ServerEvent extends events_1.default {
+}
+exports.serverEvent = new ServerEvent();
 const iam_cookies = [
     'ZD_CSRF_TOKEN',
     '_iamadt_client',
@@ -71,10 +75,10 @@ const createProxyServer = (port) => {
         res.end(JSON.stringify({ error: 'unable to serve the request. ECONNRESET.' }));
         console.log();
         console.log('Connection reset while trying to serve the request ', req.url);
-        (0, logger_1.debug)('Connection reset from target URL : ', targetUrl);
+        (0, index_1.debug)('Connection reset from target URL : ', targetUrl);
         console.error(err);
     })
-        .on('close', () => (0, logger_1.debug)('proxy closed'));
+        .on('close', () => (0, index_1.debug)('proxy closed'));
     return proxy;
 };
 exports.createProxyServer = createProxyServer;
@@ -89,9 +93,11 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect }) => (proxyRes, re
         return cookie;
     });
     if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
-        if (req.url.includes('/signin-redirect') && signInRedirect) {
+        const urlParams = new URLSearchParams(req.url.split('?')[1] || '');
+        const redirectUrl = urlParams.get('redirect_url') || urlParams.get('service_url') || signInRedirect;
+        if (req.url.includes('/signin-redirect') && redirectUrl) {
             if (systemRoutes === undefined) {
-                (0, exports.redirectByAuth)(req, res, signInRedirect);
+                (0, exports.redirectByAuth)(req, res, redirectUrl);
                 return;
             }
             const sourceRedirectUrl = Object.keys(systemRoutes).find((sourceUrl) => {

package/lib/serve/server/lib/master/web-client.d.ts

@@ -0,0 +1,5 @@
+import { Express, Request, Response } from 'express';
+import { IServerDetails } from '../..';
+import { IClientTarget } from '../web_client/types';
+import Server from 'http-proxy';
+export declare function addWebClientRoutes(app: Express, details: IServerDetails<IClientTarget>, proxy: Server, unknownProxy: (req: Request, res: Response) => void): void;

package/lib/serve/server/lib/node/index.d.ts

@@ -0,0 +1,6 @@
+import { ChildProcess } from 'child_process';
+import { IFnTarget } from '../../../../fn-utils/lib/common';
+import { IServerDetails } from '../../index.js';
+import { ContainerEvents } from '@zcatalyst/container-plugin/';
+declare const _default: (details: IServerDetails<IFnTarget>) => Promise<ChildProcess | ContainerEvents>;
+export default _default;

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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -23,21 +46,37 @@ 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 index_1 = require("../../../../util_modules/logger/index");
 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, _d, _e, _f, _g;
-    const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-    const _h = details.target, { ['watcher']: _ } = _h, serialisableTarget = __rest(_h, ['watcher']);
+const container_1 = require("../../../../util_modules/container");
+const container_plugin_1 = require("@zcatalyst/container-plugin/");
+exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    if (!details.target) {
+        throw new error_1.default('Invalid Node function target', { exit: 2 });
+    }
     const projectRoot = runtime_store_1.default.get('project.root');
+    const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
+    const codeLocation = (_b = details.target) === null || _b === void 0 ? void 0 : _b.build;
+    if ((0, container_1.isContainer)()) {
+        (0, index_1.debug)('using container to serve the function: ' + ((_c = details.target) === null || _c === void 0 ? void 0 : _c.name));
+        const container = yield Promise.resolve().then(() => __importStar(require('@zcatalyst/container-plugin')));
+        details.target.env_var = Object.assign({ X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_d = details.target) === null || _d === void 0 ? void 0 : _d.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: '/catalyst', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_ADMIN_CRED_TOKEN: 'Unknown', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[(_e = details.target) === null || _e === void 0 ? void 0 : _e.type] }, (_f = details.target) === null || _f === void 0 ? void 0 : _f.env_var);
+        return container.start({
+            details: details,
+            projectId: (0, project_1.getProjectId)(),
+            ruok: details.debugPort !== undefined && details.debugPort !== -1
+                ? container_plugin_1.RUOK.SKIP
+                : container_plugin_1.RUOK.FINITE
+        });
+    }
+    const label = `${details.type}[${(_g = details.target) === null || _g === void 0 ? void 0 : _g.name}]`;
+    const _o = details.target, { ['watcher']: _ } = _o, serialisableTarget = __rest(_o, ['watcher']);
     serialisableTarget.index = serialisableTarget.index
         ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
         : undefined;
@@ -45,49 +84,21 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
         (0, path_1.join)(__dirname, 'server'),
         details.httpPort + '',
         JSON.stringify({
-            index: ((_b = details.target) === null || _b === void 0 ? void 0 : _b.index)
+            index: ((_h = details.target) === null || _h === void 0 ? void 0 : _h.index)
                 ? details.target.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
                 : undefined,
-            name: (_c = details.target) === null || _c === void 0 ? void 0 : _c.name,
-            type: (_d = details.target) === null || _d === void 0 ? void 0 : _d.type,
-            source: (_e = details.target) === null || _e === void 0 ? void 0 : _e.source
+            name: (_j = details.target) === null || _j === void 0 ? void 0 : _j.name,
+            type: (_k = details.target) === null || _k === void 0 ? void 0 : _k.type,
+            source: (_l = details.target) === null || _l === void 0 ? void 0 : _l.source
         })
     ];
     if (details.debugPort !== -1) {
-        (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
+        (0, index_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
         opts.unshift('--inspect=' + details.debugPort);
     }
-    const targetSource = (_f = details.target) === null || _f === void 0 ? void 0 : _f.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(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
+        cwd: codeLocation,
         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, X_ZOHO_CATALYST_RESOURCE_ID: (_g = details.target) === null || _g === void 0 ? void 0 : _g.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        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, X_ZOHO_CATALYST_RESOURCE_ID: (_m = details.target) === null || _m === void 0 ? void 0 : _m.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), CHROME_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_EXECUTABLE', process.env.CHROME_EXECUTABLE_PATH), CHROMEDRIVER_EXECUTABLE_PATH: runtime_store_1.default.get('CHROME_DRIVER_EXECUTABLE', process.env.CHROMEDRIVER_EXECUTABLE_PATH) }, details.target.env_var)
     }).RAW();
 });

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

@@ -0,0 +1,133 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { IncomingMessage, Server, ServerResponse } from 'http';
+import { inspect } from 'util';
+
+const endTime = 30 * 1000 + Date.now();
+
+/**
+ *
+ * @param {IncomingMessage} req
+ * @param {ServerResponse} res
+ * @returns
+ */
+function buildContext(req, res, locals) {
+	const catalystHeaders = {};
+	Object.entries(req.headers).forEach(([header, value]) => {
+		const _header = header.toLowerCase();
+		if (_header.startsWith('x-zc-')) {
+			catalystHeaders[_header] = value;
+		}
+	});
+	return {
+		catalystHeaders,
+		getMaxExecutionTimeMs: () => 30 * 1000, // 30 sec
+		getRemainingExecutionTimeMs: () => endTime - Date.now(),
+		close: () => {
+			const _finalRes = JSON.stringify({
+				output: locals.finalResponse || ''
+			});
+			res.setHeader('Content-Type', 'application/json');
+			res.setHeader('Content-Length', _finalRes.length);
+			res.write(_finalRes);
+		},
+		// eslint-disable-next-line no-console
+		log: (...params) => console.log(...params)
+	};
+}
+
+/**
+ *
+ * @param {IncomingMessage} req
+ * @param {ServerResponse} res
+ * @returns
+ */
+async function buildBasicIO(req, res, locals) {
+	const urlParts = new URL(`http://${req.headers.host}${req.url}`).searchParams;
+	const userData = JSON.stringify(Object.fromEntries(urlParts.entries()));
+
+	const body = await new Promise((resolve, reject) => {
+		const buff = [];
+		req.on('data', (ch) => buff.push(ch));
+		req.on('end', () => {
+			try {
+				const _jsonStr = Buffer.concat(buff).toString();
+				resolve(_jsonStr ? JSON.parse(_jsonStr) : {});
+			} catch (er) {
+				reject(er);
+			}
+		});
+		req.on('error', reject);
+	});
+	const basicIO = {
+		write: (VALUE) => {
+			if (!typeof VALUE === 'string') {
+				// eslint-disable-next-line no-console
+				console.error(`Expected string but ${typeof VALUE} found!.`);
+			} else {
+				const _res = VALUE.substring(0, 1 * 1024);
+				// eslint-disable-next-line no-console
+				console.log(_res);
+				locals.finalResponse += _res;
+			}
+		},
+		getArgument: (KEY) => userData[KEY] || body[KEY],
+		getAllArguments: () => (userData && Object.keys(userData).length > 0 ? userData : body),
+		/**
+		 * @deprecated use get getArgument instead.
+		 */
+		getParameter: (KEY) => {
+			// eslint-disable-next-line no-console
+			console.error(
+				'CatalystDeprecationWarning: basicIO.getParameter() is deprecated due to usability issues. Please use basicIO.getArgument() method instead.'
+			);
+			return basicIO.getArgument(KEY);
+		},
+		/**
+		 * @deprecated use get getAllArgument instead.
+		 */
+		getAllParameters: () => {
+			// eslint-disable-next-line no-console
+			console.error(
+				'CatalystDeprecationWarning: basicIO.getAllParameters() is deprecated due to usability issues. Please use basicIO.getAllArgument() method instead.'
+			);
+			return basicIO.getAllArguments();
+		},
+		setStatus: (status) => {
+			res.statusCode = status;
+		}
+	};
+	return basicIO;
+}
+
+/**
+ * BasicIO handler
+ */
+export default (index, targetName, type) => async (req, res) => {
+	try {
+		if (index === undefined) {
+			throw new Error(`index of ${type} function is undefined`);
+		}
+		const userModule = await import(index);
+		if (type !== 'bio') {
+			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');
+		}
+		const locals = {
+			finalResponse: ''
+		};
+		const context = buildContext(req, res, locals);
+		const basicIO = await buildBasicIO(req, res, locals);
+		await userModule.default(context, basicIO);
+	} catch (e) {
+		const errorString = inspect(e);
+		// eslint-disable-next-line no-console
+		console.error('[' + targetName + '] ' + errorString);
+		res.writeHead(500);
+		res.end(errorString);
+	}
+};

package/lib/serve/server/lib/node/server/browserlogic/browserlogic-puppeteer.js

@@ -7,7 +7,7 @@ import PUPPETEER_HANDLER from './utils/puppeteer-handler.js';
 
 export const constructFunctionParameters = async (REQUEST, RESPONSE, path) => {
     const browser = await PUPPETEER_HANDLER.getBrowser(path);
-    const context = await browser.createIncognitoBrowserContext();
+    const context = 'createIncognitoBrowserContext' in browser ? await browser.createIncognitoBrowserContext() : await browser.createBrowserContext();
     const page = await context.newPage();
     return [REQUEST, RESPONSE, page];
 };

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

@@ -67,7 +67,28 @@ const browserLogicHandler = async (req, res) => {
 	}
 };
 
-const server = createServer(type === 'browserlogic' ? browserLogicHandler : aioHandler);
+const bioHandler = async (req, res) => {
+	return (await import('./bio.js')).default(index, targetName, type)(req, res);
+};
+
+function getHandler() {
+	switch (type) {
+		case 'browserlogic': {
+			return browserLogicHandler;
+		}
+		case 'aio': {
+			return aioHandler;
+		}
+		case 'bio': {
+			return bioHandler;
+		}
+		default: {
+			throw Error('Invalid function type: ', type);
+		}
+	}
+}
+
+const server = createServer(getHandler());
 
 server.listen(listenPort, '127.0.0.1').on('error', (err) => {
 	// eslint-disable-next-line no-console

package/lib/serve/server/lib/python/index.d.ts

@@ -0,0 +1,6 @@
+import { ChildProcess } from 'child_process';
+import { IServerDetails } from '../..';
+import { IFnTarget, PythonFn } from '../../../../fn-utils/lib/common';
+import { ContainerEvents } from '@zcatalyst/container-plugin';
+declare const _default: (details: IServerDetails<IFnTarget<PythonFn>>) => Promise<ChildProcess | ContainerEvents>;
+export default _default;