zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

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

@@ -25,6 +25,7 @@ const option_1 = require("../../../../util_modules/option");
 const execute_script_1 = require("../../../../execute-script");
 const master_1 = __importDefault(require("../master"));
 const ansi_colors_1 = require("ansi-colors");
+const common_1 = require("../../../../init/util/common");
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -38,56 +39,72 @@ const startAppSail = (port, opts) => {
     if (opts.command) {
         _opts.push('-c', opts.command);
     }
-    return (0, shell_1.spawn)('node', _opts, {
+    const child = (0, shell_1.spawn)('node', _opts, {
         cwd: opts.target,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
+        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PORTAL_DOMAIN: constants_1.ORIGIN.iamPortal, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
+    return new Promise((_res, _rej) => {
+        child.on('spawn', () => _res(child));
+        child.on('error', (reason) => _rej(reason));
+    });
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     let child;
     const targetSail = serverDetails.target;
-    if (!targetSail || !targetSail.appSail) {
+    if (!targetSail || !targetSail.config) {
         throw new error_1.default('AppSail details not found');
     }
-    if ((_a = targetSail.appSail.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
-        executeHook(targetSail.appSail.scripts.preserve, `AppSail [PRESERVE] [${(_b = targetSail.appSail) === null || _b === void 0 ? void 0 : _b.name}]`, targetSail.appSail.source);
+    if ((_a = targetSail.config.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
+        executeHook(targetSail.config.scripts.preserve, `AppSail [PRESERVE] [${targetSail.name}]`, targetSail.source);
     }
-    const buildPath = targetSail.appSail.buildPath
-        ? targetSail.appSail.buildPath
-        : (_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.build_path;
-    if (!(yield fs_1.ASYNC.isPathExists(buildPath))) {
-        throw new error_1.default(`Build path does not exists [${buildPath}]`, {
+    const buildPath = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path;
+    const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
+    if (!(yield fs_1.ASYNC.isPathExists(target))) {
+        if ((0, path_1.isAbsolute)(((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.raw.build_path) || '')) {
+            throw new error_1.default('The given AppSail build path does not exists', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-1',
+                arg: [ansi_colors_1.italic.underline.red(target), (0, ansi_colors_1.bold)(targetSail.name)]
+            });
+        }
+        throw new error_1.default('The given AppSail build path does not exists: ' + targetSail.name, {
             exit: 1,
-            errorId: 'SERVE-APPSAIL-1',
-            arg: [ansi_colors_1.italic.red(buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
+            errorId: 'SERVE-APPSAIL-2',
+            arg: [
+                (0, ansi_colors_1.underline)(((_d = targetSail.config) === null || _d === void 0 ? void 0 : _d.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(targetSail.config.raw.source_path || ''),
+                ansi_colors_1.italic.underline(((_e = targetSail.config) === null || _e === void 0 ? void 0 : _e.raw.build_path) || ''),
+                ansi_colors_1.italic.underline(target)
+            ]
         });
     }
-    const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
     switch (true) {
-        case targetSail.appSail.stack.startsWith('node'): {
-            child = startAppSail(targetSail.port.appsail, {
+        case targetSail.config.stack.startsWith('node'): {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'nodejs',
                 target,
-                command: targetSail.appSail.command,
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                command: targetSail.config.command,
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
-        case targetSail.appSail.stack.startsWith('python'): {
-            child = startAppSail(targetSail.port.appsail, {
+        case targetSail.config.stack.startsWith('python'): {
+            child = yield startAppSail(targetSail.port.appsail, {
                 type: 'python',
                 target,
-                command: targetSail.appSail.command,
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                command: targetSail.config.command,
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
-        case targetSail.appSail.stack.startsWith('java'): {
-            if (targetSail.appSail.platform === 'war') {
+        case targetSail.config.stack.startsWith('java'): {
+            if (targetSail.config.platform === 'war') {
                 const jettyPath = (0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty');
                 if (!(yield fs_1.ASYNC.fileExists((0, path_1.join)(jettyPath, 'start.jar')).catch((err) => (0, logger_1.debug)(err)))) {
                     try {
@@ -108,30 +125,41 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
                     }
                 }
                 const jettyCommand = `java -jar "${(0, path_1.join)(jettyPath, 'start.jar')}" -Djetty.deploy.monitoredPath="${(0, project_1.resolveProjectPath)(target)}" -Djetty.http.port=${targetSail.port.appsail}`;
-                child = startAppSail(targetSail.port.appsail, {
+                child = yield startAppSail(targetSail.port.appsail, {
                     target,
                     type: 'war',
                     command: jettyCommand,
-                    memory: targetSail.appSail.memory || 256,
-                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.appSail.env_variables)
+                    memory: targetSail.config.memory || 256,
+                    env: Object.assign({ JETTY_BASE: (0, path_1.join)(jettyPath, 'JETTY_BASE') }, targetSail.config.env_variables),
+                    name: targetSail.name
                 });
                 break;
             }
-            child = startAppSail(targetSail.port.appsail, {
+            child = yield startAppSail(targetSail.port.appsail, {
                 target,
-                command: targetSail.appSail.command,
+                command: targetSail.config.command,
                 type: 'javase',
-                memory: targetSail.appSail.memory || 256,
-                env: targetSail.appSail.env_variables
+                memory: targetSail.config.memory || 256,
+                env: targetSail.config.env_variables,
+                name: targetSail.name
             });
             break;
         }
         default: {
-            throw new error_1.default('Invalid AppSail stack');
+            const appSailRuntime = yield (0, common_1.getRuntimeDetails)();
+            throw new error_1.default('Invalid AppSail stack', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-4',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ansi_colors_1.bold.red(targetSail.config.stack),
+                    appSailRuntime.runtimes.map((val) => (0, ansi_colors_1.bold)(`* ${val}`)).join('\n')
+                ]
+            });
         }
     }
     const masterServe = yield (0, master_1.default)(targetSail.port.proxy, {
-        appSail: [serverDetails]
+        appSailDetails: serverDetails
     });
     child.once('exit', () => {
         masterServe.close((err) => {
@@ -140,14 +168,36 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_d = targetSail.appSail.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
+    if ((_g = (_f = targetSail.config) === null || _f === void 0 ? void 0 : _f.scripts) === null || _g === void 0 ? void 0 : _g.postserve) {
         child.once('exit', () => {
-            var _a, _b, _c, _d;
-            if (!((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.scripts)) {
+            var _a, _b, _c;
+            if (!((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.scripts)) {
                 return;
             }
-            executeHook((_b = targetSail.appSail.scripts) === null || _b === void 0 ? void 0 : _b.postserve, `AppSail [POSTSERVE] [${(_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, (_d = targetSail.appSail) === null || _d === void 0 ? void 0 : _d.source);
+            executeHook((_c = (_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.scripts) === null || _c === void 0 ? void 0 : _c.postserve, `AppSail [POSTSERVE] [${targetSail.name}]`, targetSail.source);
         });
     }
+    process.on('SIGINT', () => {
+        targetSail.trigger.kill = true;
+    });
+    child.once('exit', (code) => {
+        var _a, _b, _c;
+        if (code === 150) {
+            targetSail.validity = {
+                valid: false,
+                reason: 'Unable to start the AppSail'
+            };
+            throw new error_1.default('Unable to start the AppSail', {
+                exit: 1,
+                errorId: 'SERVE-APPSAIL-3',
+                arg: [
+                    (0, ansi_colors_1.bold)(targetSail.name),
+                    ((_a = targetSail.config) === null || _a === void 0 ? void 0 : _a.command) || '',
+                    (0, ansi_colors_1.underline)(((_b = targetSail.config) === null || _b === void 0 ? void 0 : _b.build_path) || ''),
+                    ((_c = targetSail.config) === null || _c === void 0 ? void 0 : _c.stack) || ''
+                ]
+            });
+        }
+    });
     return child;
 });

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 /* eslint-disable @typescript-eslint/no-var-requires */
+
+// exit codes
+// 150 - start up command failure
+
 const EXEC_SYNC = require('child_process').execSync;
 
 const WAR = 'war';
@@ -58,7 +62,11 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	try {
+		EXEC_SYNC(command.toString(), { stdio: 'inherit', cwd });
+	} catch (er) {
+		process.exit(150);
+	}
 }
 
 main();

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

@@ -23,7 +23,7 @@ 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, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const projectRoot = runtime_store_1.default.get('project.root');
     const javaServer = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
     const targetDir = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
@@ -54,6 +54,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)(spawnCommand, opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, 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)
+        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, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.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)
     }).RAW();
 });

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

@@ -0,0 +1,53 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAppSailRoutes = void 0;
+const utils_1 = require("./utils");
+function addAppSailRoutes(app, details, proxy, unknownProxy) {
+    var _a, _b;
+    app.use('/__catalyst/sdk/init.js', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        const initJs = yield (0, utils_1.appsailInitJs)();
+        const _write = res.write;
+        res.write = () => {
+            res.setHeader('Content-Length', initJs.length);
+            return _write.call(res, initJs, 'utf-8');
+        };
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    }));
+    app.use('/__catalyst', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        req.url = req.originalUrl;
+        unknownProxy(req, res);
+    }));
+    ((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true &&
+        app.use(['/accounts', '/oauthorize'], (req, res) => {
+            if (req.url.includes('/appsail/logout_redirect')) {
+                res.redirect(typeof req.query.service_url === 'string' ? req.query.service_url : '/');
+                return;
+            }
+            req.url = req.originalUrl;
+            unknownProxy(req, res);
+        });
+    app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _c, _d;
+        if (req.header('catalyst-component') === 'true') {
+            ((_d = (_c = details.target) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.catalyst_auth) === true
+                ? unknownProxy(req, res)
+                : res.sendStatus(400);
+            return;
+        }
+        proxy.web(req, res, {
+            target: `http://127.0.0.1:${details.target.port.appsail}`,
+            ws: true
+        });
+    }));
+}
+exports.addAppSailRoutes = addAppSailRoutes;

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFnRoutes = void 0;
+const constants_1 = require("../../../../util_modules/constants");
+function addFnRoutes(app, details, proxy) {
+    const fnTarget = details.target;
+    app.use(`/server/${fnTarget.name}`, (req, res) => {
+        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) => {
+        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
+        });
+    });
+    if (fnTarget.id) {
+        app.use(`/server/${fnTarget.id}`, (req, res) => {
+            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) => {
+            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
+            });
+        });
+    }
+}
+exports.addFnRoutes = addFnRoutes;

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

@@ -0,0 +1,155 @@
+'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 express_1 = __importDefault(require("express"));
+const error_1 = __importDefault(require("../../../../error"));
+const apig_matcher_1 = __importDefault(require("../../../../express_middlewares/apig-matcher"));
+const auth_checker_1 = __importDefault(require("../../../../express_middlewares/auth-checker"));
+const authenticator_1 = __importDefault(require("../../../../express_middlewares/authenticator"));
+const cookie_parser_1 = __importDefault(require("../../../../express_middlewares/cookie-parser"));
+const error_handler_1 = __importDefault(require("../../../../express_middlewares/error-handler"));
+const logger_1 = __importDefault(require("../../../../express_middlewares/logger"));
+const project_1 = __importDefault(require("../../../../express_middlewares/project"));
+const unknown_req_proxy_1 = __importDefault(require("./unknown-req-proxy"));
+const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/url-rewriter"));
+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 project_2 = require("../../../../util_modules/project");
+const option_1 = require("../../../../util_modules/option");
+const server_js_1 = require("../../../../util_modules/server.js");
+const utils_1 = require("./utils");
+const appsail_1 = require("./appsail");
+const web_client_1 = require("./web-client");
+const functions_1 = require("./functions");
+function spinUpMaster(listenPort, { otherServerDetails, appSailDetails }) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if ((otherServerDetails && appSailDetails) || (!otherServerDetails && !appSailDetails)) {
+            throw new error_1.default('Either functions/client or AppSail is need to start the master server. But both cannot use the same master', { exit: 2 });
+        }
+        const projectDetails = {
+            id: (0, project_2.getProjectId)(),
+            domain_prefix: (0, project_2.getDomainPrefix)(),
+            domain: constants_1.ORIGIN.app.replace('https://', ''),
+            key: (0, project_2.getDomainKey)(),
+            env_name: (0, project_2.getEnvName)()
+        };
+        const rules = runtime_store_1.default.get('context.apig.local.config', -1);
+        const customProxyUrl = (0, option_1.getOptionValue)('proxy');
+        const app = (0, express_1.default)();
+        let systemRoutes;
+        const nonApigURL = ['/accounts', '/clientoauth', '/_wms', '/wmssrv'];
+        app.use((0, logger_1.default)(appSailDetails));
+        app.use(cookie_parser_1.default);
+        app.use((0, project_1.default)(projectDetails));
+        app.use(authenticator_1.default);
+        !appSailDetails &&
+            app.use(nonApigURL, (req, res) => {
+                req.url = req.originalUrl;
+                unknownProxy(req, res);
+            });
+        !appSailDetails &&
+            app.use('*/.catalyst%2Freload-script.js', (req, res) => {
+                var _a;
+                req.url = '/.catalyst%2Freload-script.js';
+                (_a = otherServerDetails === null || otherServerDetails === void 0 ? void 0 : otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => {
+                    const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
+                    proxy.web(req, res, {
+                        target: appTarget,
+                        changeOrigin: true
+                    });
+                });
+            });
+        if (rules !== -1 && !appSailDetails) {
+            for (const [sourceURL, methodByConfig] of Object.entries(rules)) {
+                const router = app.route(sourceURL);
+                for (const [method, config] of Object.entries(methodByConfig)) {
+                    if (config.system) {
+                        if (systemRoutes === undefined) {
+                            systemRoutes = {};
+                        }
+                        js_1.JS.set(systemRoutes, [sourceURL, method], config);
+                    }
+                    router[method]((req, res, next) => {
+                        if (res.locals.apigRules === undefined) {
+                            res.locals.apigRules = [];
+                        }
+                        res.locals.apigRules.push(Object.assign({ source_endpoint: sourceURL, params: req.params }, config));
+                        next();
+                    });
+                }
+            }
+            app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
+        }
+        const proxy = (0, utils_1.createProxyServer)(listenPort);
+        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 || '/'
+            }))
+            : proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({ systemRoutes }));
+        const proxyDestroyer = new server_js_1.ConnectionDestroyer(proxy);
+        const unknownProxy = (0, unknown_req_proxy_1.default)(proxy, listenPort, customProxyUrl);
+        otherServerDetails &&
+            Object.keys(otherServerDetails).forEach((targ) => {
+                var _a, _b, _c;
+                switch (targ) {
+                    case 'client': {
+                        (_a = otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => (0, web_client_1.addWebClientRoutes)(app, clientDetails, proxy, unknownProxy));
+                        break;
+                    }
+                    case 'server': {
+                        (_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, {
+                                    target: `http://127.0.0.1:${serverDetail.httpPort}`
+                                });
+                            });
+                        });
+                        break;
+                    }
+                    case 'functions': {
+                        (_c = otherServerDetails.functions) === null || _c === void 0 ? void 0 : _c.forEach((fnDetails) => (0, functions_1.addFnRoutes)(app, fnDetails, proxy));
+                        break;
+                    }
+                    default:
+                        throw new error_1.default('Unknown type provided to master server ' + targ, {
+                            exit: 2
+                        });
+                }
+            });
+        appSailDetails && (0, appsail_1.addAppSailRoutes)(app, appSailDetails, proxy, unknownProxy);
+        app.use('/', (0, unknown_req_proxy_1.default)(proxy, listenPort, customProxyUrl));
+        app.use(error_handler_1.default);
+        const expressServer = app.listen(listenPort, '127.0.0.1').on('error', (err) => {
+            if (proxy) {
+                proxyDestroyer.destroy();
+            }
+            console.error(err);
+        });
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(expressServer);
+        expressServer.maxConnections = 100;
+        process.on('SIGINT', () => expressDestroyer.destroy(false));
+        expressServer.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            yield proxyDestroyer.destroy().catch((err) => (0, logger_2.debug)(err));
+        }));
+        expressServer.on('upgrade', (...upgradeParam) => {
+            app.emit('upgrade', ...upgradeParam);
+        });
+        return expressServer;
+    });
+}
+exports.default = spinUpMaster;

package/lib/{express_middlewares/unknownReqProxy.js → serve/server/lib/master/unknown-req-proxy.js}

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const runtime_store_1 = __importDefault(require("../runtime-store"));
-const logger_1 = require("../util_modules/logger");
-exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
+const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
+const logger_1 = require("../../../../util_modules/logger");
+exports.default = (proxyInstance, masterPort, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
     }
-    else if (req.url.match(/accounts\/p\/[0-9]+\/clientidprequest/g)) {
+    else if (req.url.startsWith('/accounts') && req.url.endsWith('clientidprequest')) {
         res.redirect(308, `https://${req.headers['x-zc-project-domain']}${req.url}`);
         return;
     }
@@ -30,20 +30,20 @@ exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
     }
     else {
         const headers = {};
-        if (req.url.match(/accounts\/p\/[0-9]+\/webclient\/v1\/captcha/g)) {
+        if (req.url.startsWith('/accounts') && req.url.endsWith('captcha')) {
             headers['origin'] = `https://${req.headers['x-zc-project-domain']}`;
         }
         if (req.url.includes('/__catalyst/auth/')) {
-            const masterPort = runtime_store_1.default.get('context.port.http.master', 3000);
-            headers['catalyst-redirect-domain'] = `http://localhost:${masterPort}`;
+            headers['catalyst-redirect-domain'] = `http://localhost:${masterPort || 3000}`;
         }
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
+            cookieDomainRewrite: {
+                [req.headers['x-zc-project-domain'] + '']: 'localhost'
+            },
             ws: true,
             headers
-        }, (err) => {
-            (0, logger_1.debug)('Unknown proxy error: ', err);
         });
     }
 };