zcatalyst-cli 1.15.0-beta.0 → 1.15.0-beta.2

package/lib/deploy/features/functions/index.js

@@ -64,20 +64,25 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 if (target.type !== undefined && target.type === constants_1.FN_TYPE.advanced) {
                     resp = (yield appAPI.deploy(target.zip_stream, {
                         stack: target.stack,
-                        name: target.name
+                        name: target.name,
+                        memory: target.memory,
+                        envVariables: target.env_var
                     }));
                 }
                 else {
                     resp = (yield fnAPI.deploy(target.zip_stream, {
                         stack: target.stack,
                         name: target.name,
-                        type: constants_1.REMOTE_REF.functions.type[target.type]
+                        type: constants_1.REMOTE_REF.functions.type[target.type],
+                        memory: target.type === constants_1.FN_TYPE.browserLogic
+                            ? !target.memory && !target.id
+                                ? 512
+                                : target.memory
+                            : target.memory,
+                        envVariables: target.env_var
                     }));
                 }
                 target.id = resp.id + '';
-                if (target.id && target.env_var && Object.keys(target.env_var).length > 0) {
-                    yield fnAPI.updateConfig(target.id, target.env_var);
-                }
                 fn_utils_1.fnUtils.common.generateUrlForTarget(target);
             }
             catch (e) {

package/lib/endpoints/lib/applogic.js

@@ -20,7 +20,7 @@ class Applogic {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceFsStream, { stack, name, memory }) {
+    deploy(sourceFsStream, { stack, name, memory, envVariables }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -29,8 +29,17 @@ class Applogic {
             if (sourceFsStream !== undefined) {
                 formData.code = sourceFsStream;
             }
+            const configuration = {};
             if (memory !== undefined) {
-                formData.memory = memory;
+                configuration.memory = memory;
+            }
+            if (envVariables !== undefined) {
+                configuration.environment = {
+                    variables: envVariables
+                };
+            }
+            if (Object.keys(configuration).length > 0) {
+                formData.configuration = JSON.stringify(configuration);
             }
             const res = yield new api_1.default(this.opts).put(`/baas/v1/project/${this.projectId}/server/upsert`, {
                 formData,

package/lib/endpoints/lib/functions.js

@@ -73,18 +73,27 @@ class Functions {
             });
         });
     }
-    deploy(sourceFsStream, { stack, name, type, memory }) {
+    deploy(sourceFsStream, { stack, name, type, memory, envVariables }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
                 name,
                 type
             };
+            const configuration = {};
             if (sourceFsStream !== undefined) {
                 formData.code = sourceFsStream;
             }
             if (memory !== undefined) {
-                formData.memory = memory;
+                configuration.memory = memory;
+            }
+            if (envVariables !== undefined) {
+                configuration.environment = {
+                    variables: envVariables
+                };
+            }
+            if (Object.keys(configuration).length > 0) {
+                formData.configuration = JSON.stringify(configuration);
             }
             const res = yield new api_1.default(this.opts).put(`/baas/v1/project/${this.projectId}/function/upsert`, {
                 formData,

package/lib/express_middlewares/unknownReqProxy.js

@@ -25,13 +25,19 @@ exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
         });
     }
     else {
+        const headers = {};
+        if (req.url.match(/accounts\/p\/[0-9]+\/webclient\/v1\/captcha/g)) {
+            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}`;
+        }
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
             ws: true,
-            headers: req.url.match(/accounts\/p\/[0-9]+\/webclient\/v1\/captcha/g)
-                ? { origin: `https://${req.headers['x-zc-project-domain']}` }
-                : undefined
+            headers
         });
     }
 };

package/lib/fn-utils/lib/common.js

@@ -126,7 +126,7 @@ function validate() {
 exports.validate = validate;
 function refineTargets(rawTargets, mapRemoteFn = true) {
     return __awaiter(this, void 0, void 0, function* () {
-        let remoteFnIdMap = {};
+        let remoteFnMap = {};
         let runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime', { runtimes: [] });
         if (mapRemoteFn) {
             const fnAPI = yield (0, endpoints_1.functionsAPI)();
@@ -141,12 +141,13 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
             if (!Array.isArray(allRemoteFns) || allRemoteFns.length === 0) {
                 allRemoteFns = [];
             }
-            remoteFnIdMap = allRemoteFns.reduce((accumulator, fn) => {
-                accumulator[fn.name] = fn.id + '';
+            remoteFnMap = allRemoteFns.reduce((accumulator, fn) => {
+                accumulator[fn.name] = fn;
                 return accumulator;
-            }, remoteFnIdMap);
+            }, remoteFnMap);
         }
         return Promise.all(rawTargets.map((fnPath) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             fnPath = (0, project_1.resolveProjectPath)(fnPath);
             const catalystJsonPth = (0, path_1.join)(fnPath, constants_1.FILENAME.catalyst_config);
             const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth, {
@@ -193,7 +194,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
             switch (eol) {
                 case 1:
                 case 2:
-                    if (eol === 2 && remoteFnIdMap[fnName] === undefined) {
+                    if (eol === 2 && remoteFnMap[fnName] === undefined) {
                         return {
                             name: fnName,
                             source: fnPath,
@@ -223,6 +224,16 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 const catalystJsonString = JSON.stringify(catalystJson, null, 2) + '\n';
                 yield fs_1.ASYNC.writeFile(catalystJsonPth, catalystJsonString, 'utf8');
             }
+            const fnMemory = js_1.JS.get(catalystJson, 'deployment.memory', js_1.JS.get(remoteFnMap[fnName], 'configuration.memory'));
+            if (fnMemory && !runtime_1.default.memory.includes(fnMemory)) {
+                return {
+                    name: fnName,
+                    source: fnPath,
+                    valid: false,
+                    type: fnType,
+                    failure_reason: `The memory configuration ${fnMemory} is not supported. The supported values are ${runtime_1.default.memory.join(', ')}.`
+                };
+            }
             const fnTarget = {
                 name: fnName,
                 stack: userStack,
@@ -231,10 +242,11 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 source: fnPath,
                 valid: true,
                 integ_config: js_1.JS.get(catalystJson, 'deployment.integration_config'),
-                env_var: refineEnvVariables(js_1.JS.get(catalystJson, 'deployment.env_variables'))
+                env_var: refineEnvVariables(js_1.JS.get(catalystJson, 'deployment.env_variables')),
+                memory: fnMemory
             };
-            if (mapRemoteFn && remoteFnIdMap[fnTarget.name] !== undefined) {
-                fnTarget.id = remoteFnIdMap[fnTarget.name];
+            if (mapRemoteFn && remoteFnMap[fnTarget.name] !== undefined) {
+                fnTarget.id = (_a = remoteFnMap[fnTarget.name]) === null || _a === void 0 ? void 0 : _a.id;
             }
             return fnTarget;
         })));

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

@@ -54,7 +54,7 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
             proxyRes.headers['set-cookie'] = result;
         }
     }
-    else if (req.url.startsWith('/baas')) {
+    else if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
         if (req.url.includes('/signin-redirect')) {
             if (systemRoutes === undefined) {
                 redirectByAuth(req, res, '/app/local-redirect');

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

@@ -41,4 +41,4 @@ export const close = async (REQUEST, RESPONSE, driver) => {
     catch (ERROR) {
         console.error(ERROR);
     }
-};
+};

package/lib/serve/server/lib/node/browserlogic/utils/deferred_promise.js

@@ -18,4 +18,4 @@ export default class DeferredPromise {
     get [Symbol.toStringTag]() {
         return 'Promise';
     }
-};
+};

package/lib/serve/server/lib/node/browserlogic/utils/playwright-handler.js

@@ -31,4 +31,4 @@ async function getBrowser() {
     })
 }
 
-export default { getBrowser };
+export default { getBrowser };

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

@@ -32,4 +32,4 @@ async function getBrowser(path) {
     })
 }
 
-export default {getBrowser}
+export default {getBrowser}

package/lib/serve/server/lib/node/browserlogic/utils/selenium-handler.js

@@ -56,4 +56,4 @@ function isConnected()
     return false;
 }
 
-export default {getBrowser}
+export default {getBrowser}

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

@@ -44,7 +44,7 @@ app.all('/server/:fnId/execute', async (req, res) => {
 	}
 });
 
-app.all('/', async (req, res) => {
+app.all('/*', async (req, res) => {
 	try {
 		if (index === undefined) {
 			throw new Error(`index of ${type} function is undefined`);

package/lib/shell/index.js

@@ -46,13 +46,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default({ repl: replServer });
     const projectRoot = runtime_store_1.default.get('project.root');
     try {
-        yield (0, prepare_1.default)([
-            constants_1.FN_TYPE.basic,
-            constants_1.FN_TYPE.cron,
-            constants_1.FN_TYPE.event,
-            constants_1.FN_TYPE.integration,
-            constants_1.FN_TYPE.browserLogic
-        ]);
+        yield (0, prepare_1.default)([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
         const targets = runtime_store_1.default
             .get('context.functions.targets', [])
             .filter((target) => {

package/lib/util_modules/constants/lib/runtime.js

@@ -5,6 +5,7 @@ const RUNTIME = Object.freeze({
         nodejs: 'node',
         java: 'java',
         python: 'python'
-    }
+    },
+    memory: [128, 256, 512]
 });
 exports.default = RUNTIME;

package/package.json

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

package/templates/init/functions/node/browserlogic/playwright/catalyst-config.json

@@ -8,4 +8,4 @@
   "execution": {
     "main": "{{_MAIN_}}"
   }
-}
+}

package/templates/init/functions/node/browserlogic/puppeteer/catalyst-config.json

@@ -8,4 +8,4 @@
   "execution": {
     "main": "{{_MAIN_}}"
   }
-}
+}

package/templates/init/functions/node/browserlogic/selenium/catalyst-config.json

@@ -8,4 +8,4 @@
   "execution": {
     "main": "{{_MAIN_}}"
   }
-}
+}