zcatalyst-cli 1.17.1 → 1.17.3

package/README.md

@@ -13,7 +13,6 @@
 
 ![catalyst](https://img.shields.io/badge/%E2%9A%A1-catalyst-blue.svg)
 ![npm](https://img.shields.io/npm/v/zcatalyst-cli.svg?color=blue)
-![Snyk Vulnerabilities for npm package](https://img.shields.io/snyk/vulnerabilities/npm/zcatalyst-cli.svg)
 ![NPM](https://img.shields.io/npm/l/zcatalyst-cli.svg?color=brightgreen)
 <br>
 

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

@@ -224,15 +224,6 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 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,

package/lib/fn-watcher.js

@@ -8,16 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 chokidar_1 = require("chokidar");
-const path_1 = require("path");
-const runtime_store_1 = __importDefault(require("./runtime-store"));
 const languages_1 = require("./shell/prepare/languages");
-const constants_1 = require("./util_modules/constants");
-const fs_1 = require("./util_modules/fs");
 const logger_1 = require("./util_modules/logger");
 const char_1 = require("./util_modules/char");
 const ansi_colors_1 = require("ansi-colors");
@@ -42,7 +35,6 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             target.valid = true;
             target.compilationError = undefined;
             target.compilationWarning = undefined;
-            yield fs_1.ASYNC.chmod((0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name), '755', { recursive: true });
             yield (0, languages_1.prepareFunctions)([target], latestEvent);
             if (currentLatestEvent.at === latestEvent.at) {
                 latestEvent = undefined;

package/lib/init/dependencies/python/pip-install.js

@@ -24,6 +24,7 @@ const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/r
 const env_1 = require("../../../util_modules/env");
 const ensure_python_1 = require("./ensure-python");
 const userConfig_1 = __importDefault(require("../../../userConfig"));
+const logger_1 = require("../../../util_modules/logger");
 const sdkPipOpts = (0, env_1.envOverride)('CATALYST_SDK_PIP_OPTS', 'zcatalyst-sdk');
 const cliqSdkPipOpts = (0, env_1.envOverride)('CATALYST_CLIQ_SDK_PIP_OPTS', 'zcatalyst-cliq');
 const testPypi = (0, env_1.envOverride)('CATALYST_TEST_PYPI', 'false');
@@ -90,6 +91,7 @@ function ensurePyRuntime(pth, stack) {
                 errData.push(chunk);
             });
             child.on('error', (err) => {
+                (0, logger_1.info)(Buffer.concat(errData).toString());
                 reject(new error_1.default(`Error while installing python${stackVersion.replace('_', '.')} runtime`, {
                     original: err,
                     exit: 2
@@ -168,6 +170,7 @@ function installRequirements(reqFile, pth, stackVersion, linuxMode = false) {
                 errData.push(chunk);
             });
             child.on('error', (err) => {
+                (0, logger_1.info)(Buffer.concat(errData).toString());
                 reject(new error_1.default('unable to process requirements.txt', {
                     exit: 2,
                     original: err

package/lib/serve/index.js

@@ -60,9 +60,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (yield fs_1.ASYNC.isPathExists(buildFolder)) {
         try {
             (0, logger_1.debug)('Build folder already exists, starting cleanup');
-            yield fs_1.ASYNC.chmod((0, path_1.join)(buildFolder, constants_1.FOLDERNAME.functions), '755', {
-                recursive: true
-            });
             yield fs_1.ASYNC.deleteDir(buildFolder);
         }
         catch (err) {
@@ -164,11 +161,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         yield advancedServer.start();
         yield advancedServer.wait();
-        isFunctionsServed &&
-            (yield fs_1.ASYNC.chmod((0, path_1.join)(buildFolder, constants_1.FOLDERNAME.functions), '755', {
-                checkPath: false,
-                recursive: true
-            }).catch((err) => (0, logger_1.debug)('Error modifying the permissions: ', err)));
         (0, logger_1.info)('Shutting down server');
         yield Promise.all([
             fs_1.ASYNC.deleteDir(buildFolder).catch((err) => (0, logger_1.debug)('Error while deleting directory ', err)),
@@ -192,9 +184,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     catch (e) {
         (0, logger_1.debug)('Error serving the resources: ', e);
-        yield fs_1.ASYNC.chmod((0, path_1.join)(buildFolder, constants_1.FOLDERNAME.functions), '755', {
-            recursive: true
-        }).catch((err) => (0, logger_1.debug)('Error modifying the permissions: ', err));
         yield Promise.all([
             fs_1.ASYNC.deleteDir(buildFolder).catch(),
             advancedServer ? advancedServer.stop() : undefined,

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

@@ -19,8 +19,8 @@ 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 error_1 = __importDefault(require("../../../../error"));
 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');
@@ -31,7 +31,8 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         '-u',
         (0, path_1.join)(runtimesDir, constants_1.RUNTIME.language.python.value, `zcatalyst_runtime_${stackVersion === null || stackVersion === void 0 ? void 0 : stackVersion.replace('_', '')}`, 'main.py')
     ];
-    return new Promise((res) => {
+    return new Promise((resolve, reject) => {
+        var _a;
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
             cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
             stdio: 'pipe',
@@ -40,10 +41,17 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
             yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());
         }));
+        const errData = [];
+        (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
+            errData.push(chunk);
+        });
         child.on('error', (err) => {
-            (0, logger_1.debug)('Python Child spawn error');
-            (0, logger_1.debug)((0, util_1.inspect)(err));
+            (0, logger_1.info)(Buffer.concat(errData).toString());
+            reject(new error_1.default(`Error while starting python runtime server`, {
+                original: err,
+                exit: 2
+            }));
         });
-        res(child);
+        resolve(child);
     });
 });

package/lib/shell/dependencies/local-function.js

@@ -164,9 +164,9 @@ class LocalFunction {
                 yield fs_1.ASYNC.ensureFile(this.responseFile, true);
                 yield fs_1.ASYNC.ensureFile(this.metaFile, true);
                 slaveOptions.push('-u');
-                slaveOptions.push('main.py');
+                slaveOptions.push((0, path_1.join)(runtimesDir, runtime_1.default.language.python.value, `zcatalyst_runtime_${stackVersion.replace('_', '')}`, 'main.py'));
                 this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
-                    cwd: (0, path_1.join)(runtimesDir, runtime_1.default.language.python.value, `zcatalyst_runtime_${stackVersion.replace('_', '')}`),
+                    cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                     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: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                 }).RAW();

package/lib/shell/index.js

@@ -88,20 +88,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 return target.localFn.shutdown();
             }
         })));
-        yield fs_1.ASYNC.chmod((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions), '755', {
-            recursive: true,
-            checkPath: false
-        }).catch((err) => (0, logger_js_1.debug)('Error modifying permissions: ', err));
         yield fs_1.ASYNC.deleteDir((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)).catch();
         fn_utils_1.fnUtils.common.executeHook({ prefix: 'post', command: 'serve' });
         (0, logger_js_1.info)();
         (0, logger_js_1.success)('shell complete');
     }
     catch (e) {
-        yield fs_1.ASYNC.chmod((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions), '755', {
-            recursive: true,
-            checkPath: false
-        }).catch((err) => (0, logger_js_1.debug)('Error modifying permissions: ', err));
         yield Promise.all([
             fs_1.ASYNC.deleteDir((0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)).catch(),
             httpServer ? httpServer.stop() : undefined

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

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fn_utils_1 = require("../../../fn-utils");
-const common_1 = require("../../../fn-utils/lib/common");
 const java_1 = require("../../../fn-utils/lib/java");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../../util_modules/constants");
@@ -46,7 +45,6 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
         }
         const targetBuildPath = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
         if (yield fs_1.ASYNC.isPathExists(targetBuildPath)) {
-            yield fs_1.ASYNC.chmod(targetBuildPath, '755', { recursive: true });
             yield fs_1.ASYNC.deleteDir(targetBuildPath);
         }
         if (target.type === constants_1.FN_TYPE.advanced ||
@@ -69,9 +67,7 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
                 }
             })));
         }
-        yield (0, common_1.copyModDirPerm)((0, path_1.join)(target.source, constants_1.FOLDERNAME.output), targetBuildPath, '555', {
-            replace: false
-        });
+        yield fs_1.ASYNC.copyDir((0, path_1.join)(target.source, constants_1.FOLDERNAME.output), targetBuildPath);
         throbber.remove('function_serve_' + target.name);
         return target;
     })));

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

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fn_utils_1 = require("../../../fn-utils");
-const common_1 = require("../../../fn-utils/lib/common");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const throbber_1 = __importDefault(require("../../../throbber"));
 const constants_1 = require("../../../util_modules/constants");
+const fs_1 = require("../../../util_modules/fs");
 exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
     if (targets === undefined || targets.length === 0) {
         return;
@@ -36,7 +36,7 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
         return target;
     });
     return Promise.all(nodeTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
-        yield (0, common_1.copyModDirPerm)(target.source, (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name), '555');
+        yield fs_1.ASYNC.copyDir(target.source, (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name));
         throbber.remove('function_serve_' + target.name);
         return target;
     })));

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

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fn_utils_1 = require("../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
-const common_1 = require("../../../fn-utils/lib/common");
 const constants_1 = require("../../../util_modules/constants");
 const fs_1 = require("../../../util_modules/fs");
 const pip_install_1 = require("../../../init/dependencies/python/pip-install");
@@ -58,7 +57,7 @@ exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, f
                 target.failure_reason = error.message;
             }
         }
-        yield (0, common_1.copyModDirPerm)(target.source, buildPath, '555');
+        yield fs_1.ASYNC.copyDir(target.source, buildPath);
         throbber.remove('function_serve_' + target.name);
         return target;
     })));

package/package.json

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