zcatalyst-cli 1.17.0 → 1.17.2

package/lib/fn-utils/lib/ensure-java-userconfig.js

@@ -17,9 +17,9 @@ const semver_1 = require("semver");
 const error_1 = __importDefault(require("../../error"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const userConfig_1 = __importDefault(require("../../userConfig"));
-const env_1 = require("../../util_modules/env");
 const shell_1 = require("../../util_modules/shell");
 const java_1 = require("./java");
+const path_1 = require("path");
 exports.stackVsVersions = {
     java8: {
         version: '1.8.0',
@@ -140,12 +140,6 @@ function getJavaSpawnCommand(spawnCommand, process, stack) {
     if (isUsingJavaDefaultPath === true) {
         return process;
     }
-    if (env_1.isWindows) {
-        spawnCommand = `"${spawnCommand}\\${process}"`;
-    }
-    else {
-        spawnCommand = `${spawnCommand}/${process}`;
-    }
-    return spawnCommand;
+    return (0, path_1.join)(spawnCommand, process);
 }
 exports.getJavaSpawnCommand = getJavaSpawnCommand;

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

@@ -239,10 +239,11 @@ function compileTarget(target) {
         yield Promise.all(entries.map((file) => compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder)
             .then((result) => {
             const [_stdout, stderr, code] = result;
-            if (code === 1) {
+            if (code === null || code >= 1) {
                 const error = [];
                 error === null || error === void 0 ? void 0 : error.push(stderr);
                 target.valid = false;
+                target.failure_reason = 'there was a Java compilation error';
                 target.compilationError = error;
             }
             else if (stderr) {
@@ -250,6 +251,7 @@ function compileTarget(target) {
             }
         })
             .catch((error) => {
+            target.valid = false;
             target.failure_reason = error.message;
         })));
         const currentCommand = (0, option_1.getCurrentCommand)();
@@ -439,10 +441,7 @@ function validate(targets, idx) {
                     skipHelp: !!(0, option_1.getOptionValue)('watch', false)
                 });
             });
-            if (currentTarget.valid === true && !currentTarget.failure_reason) {
-                currentTarget.valid = true;
-                return validate(targets, ++idx);
-            }
+            return validate(targets, ++idx);
         }
         catch (err) {
             currentTarget.valid = false;

package/lib/fn-watcher.js

@@ -40,16 +40,13 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             watcher.emit('preparing');
             target.failure_reason = undefined;
             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;
             }
-            if (target.valid) {
-                watcher.emit('compiled');
-                return;
-            }
-            (0, logger_1.warning)('target [' + target.name + '] is not a valid one reason : ' + target.failure_reason);
             if (target.compilationError) {
                 target.compilationError.forEach((error) => {
                     console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}]`);
@@ -62,6 +59,11 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
                     console.warn(warn);
                 });
             }
+            if (target.valid) {
+                watcher.emit('compiled');
+                return;
+            }
+            (0, logger_1.warning)('target [' + target.name + '] is not a valid one reason : ' + target.failure_reason);
             (0, logger_1.info)('Waiting for correction..');
             (0, logger_1.info)('\n(To exit, press ^C)');
             watcher.emit('next');

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/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/package.json

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

package/templates/init/functions/java/aio/sample.java

@@ -14,7 +14,7 @@ public class {{_CLASS_}} implements CatalystAdvancedIOHandler {
 		try {
 			switch(request.getRequestURI()) {
 				case "/": {
-					String name = (String) request.getParameter("name");
+					String name = request.getParameter("name");
 					LOGGER.log(Level.INFO, "Hello "+name);
 					response.setStatus(200);
 					response.getWriter().write("Hello from {{_CLASS_}}.java");