zcatalyst-cli 1.16.2 → 1.17.1

package/lib/authentication/login.js

@@ -33,8 +33,10 @@ const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const crypto_1 = require("crypto");
 exports.missingScopes = {
-    [constants_1.DC_TYPE.au.value]: ['quick_ml'],
-    [constants_1.DC_TYPE.eu.value]: ['quick_ml']
+    [constants_1.DC_TYPE.in.value]: ['dataverse'],
+    [constants_1.DC_TYPE.eu.value]: ['quick_ml', 'dataverse'],
+    [constants_1.DC_TYPE.au.value]: ['dataverse'],
+    [constants_1.DC_TYPE.ca.value]: ['quick_ml', 'dataverse']
 };
 class Login {
     constructor(localhost = true, user = true) {
@@ -283,7 +285,7 @@ class Login {
                 var _a;
                 const dcRef = (_a = (0, dc_1.getActiveDCType)()) === null || _a === void 0 ? void 0 : _a.ref;
                 const callbackUrl = this._getCallbackUrl(port);
-                const nonce = encodeURIComponent((0, crypto_1.randomBytes)(16).toString());
+                const nonce = (0, crypto_1.randomBytes)(16).toString('base64');
                 const authUrl = this._getLoginUrl(callbackUrl, nonce);
                 let reqCount = 0;
                 const server = (0, http_1.createServer)((req, res) => __awaiter(this, void 0, void 0, function* () {

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

@@ -23,6 +23,7 @@ const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/r
 const logger_1 = require("../../../util_modules/logger");
 const option_1 = require("../../../util_modules/option");
 const languages_1 = require("./languages");
+const char_1 = require("../../../util_modules/char");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     fn_utils_1.fnUtils.common.executeHook({ prefix: 'pre', command: 'deploy' });
     const targets = yield fn_utils_1.fnUtils.common.validate();
@@ -48,6 +49,20 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, languages_1.java)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java.value)) && target.valid; })),
         (0, languages_1.python)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value)) && target.valid; }))
     ]);
+    refinedTargets === null || refinedTargets === void 0 ? void 0 : refinedTargets.forEach((target) => {
+        if (target.compilationError) {
+            target.compilationError.forEach((error) => {
+                console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}]`);
+                console.log(error);
+            });
+        }
+        if (target.compilationWarning) {
+            target.compilationWarning.forEach((warn) => {
+                console.warn(`${(0, ansi_colors_1.yellow)(char_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
+                console.warn(warn);
+            });
+        }
+    });
     const combinedTarget = [...(nodeTarget || []), ...(javaTarget || []), ...(pythonTarget || [])];
     const batchSize = 1;
     const fnAPI = yield (0, endpoints_1.functionsAPI)();
@@ -99,11 +114,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         })));
     }
     const allTargets = refinedTargets.filter((target) => {
-        if (target.compilationWarning) {
-            target.compilationWarning.forEach((message) => {
-                (0, logger_1.warning)(message);
-            });
-        }
         if (!target.valid) {
             (0, logger_1.warning)('skipping deploy of target [' + target.name + '] since ' + target.failure_reason);
         }

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

@@ -175,7 +175,7 @@ function normaliseClasspath(pth, libFolder) {
                         });
                     }
                 }
-                row.path = (0, path_1.join)((0, path_1.basename)(libFolder), jarName);
+                row.path = (0, path_1.basename)(libFolder) + '/' + jarName;
                 if ((0, path_1.dirname)(libPath) === (0, path_1.dirname)(libFolder)) {
                     try {
                         yield fs_1.ASYNC.deleteFile(libPath);
@@ -238,15 +238,20 @@ function compileTarget(target) {
         const targetVersion = getTargetVersion(target.stack);
         yield Promise.all(entries.map((file) => compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder)
             .then((result) => {
-            const code = result[2];
-            if (code === 1) {
+            const [_stdout, stderr, code] = result;
+            if (code === null || code >= 1) {
                 const error = [];
-                error === null || error === void 0 ? void 0 : error.push(result[1]);
+                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) {
+                target.compilationWarning = [stderr];
+            }
         })
             .catch((error) => {
+            target.valid = false;
             target.failure_reason = error.message;
         })));
         const currentCommand = (0, option_1.getCurrentCommand)();
@@ -282,6 +287,7 @@ function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outpu
                 '*' + module.exports.classPathSep + '.',
                 '-g',
                 '-Xprefer:source',
+                '-Xlint',
                 file.replace(targetSource, outputFolder)
             ], {
                 cwd: outputFolder,
@@ -435,15 +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);
-            }
-            throw new error_1.default('there was a compilation error!', {
-                exit: 1,
-                errorId: 'JAVA-7',
-                skipHelp: !!(0, option_1.getOptionValue)('watch', false)
-            });
+            return validate(targets, ++idx);
         }
         catch (err) {
             currentTarget.valid = false;

package/lib/fn-watcher.js

@@ -19,6 +19,8 @@ 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");
 exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((res) => {
         let paused = false;
@@ -38,11 +40,25 @@ 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.compilationError) {
+                target.compilationError.forEach((error) => {
+                    console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}]`);
+                    console.log(error);
+                });
+            }
+            if (target.compilationWarning) {
+                target.compilationWarning.forEach((warn) => {
+                    console.warn(`${(0, ansi_colors_1.yellow)(char_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
+                    console.warn(warn);
+                });
+            }
             if (target.valid) {
                 watcher.emit('compiled');
                 return;

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

@@ -30,6 +30,7 @@ const error_1 = __importDefault(require("../../../error"));
 const python_1 = require("../../../fn-utils/lib/python");
 const throbber_1 = __importDefault(require("../../../throbber"));
 const ensure_java_userconfig_1 = require("../../../fn-utils/lib/ensure-java-userconfig");
+const char_1 = require("../../../util_modules/char");
 function selFnsPrompt(targs, fnDirPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const choicesObj = targs.reduce((accumulator, fn) => {
@@ -202,6 +203,18 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         else if (!target.valid && ((_c = target.failure_reason) === null || _c === void 0 ? void 0 : _c.startsWith('unable to locate python'))) {
             (0, logger_1.warning)(`skipping pull of function(${target.name}) since ${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}]`);
+                console.log(error);
+            });
+        }
+        if (target.compilationWarning) {
+            target.compilationWarning.forEach((warn) => {
+                console.warn(`${(0, ansi_colors_1.yellow)(char_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
+                console.warn(warn);
+            });
+        }
         return target.valid;
     });
     if (isFnPulled) {

package/lib/serve/index.js

@@ -51,7 +51,6 @@ const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const features = __importStar(require("./features"));
 const server_1 = __importDefault(require("./server"));
-const char_1 = require("../util_modules/char");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const serveTargets = runtime_store_1.default.get('context.targets', []);
     const advancedServer = new server_1.default();
@@ -90,11 +89,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         const functionTargets = rawTargets.filter((target) => {
             var _a;
-            if (target.compilationError) {
-                target.compilationError.forEach((error) => {
-                    console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}] : ${error}`);
-                });
-            }
             if (!target.valid) {
                 (0, logger_1.warning)('skipping serve of function [' +
                     target.name +
@@ -102,11 +96,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     target.failure_reason);
                 return false;
             }
-            if (target.compilationWarning) {
-                target.compilationWarning.forEach((message) => {
-                    (0, logger_1.warning)(message);
-                });
-            }
             if (target.type === constants_1.FN_TYPE.advanced) {
                 advancedServer.add('server', target);
             }

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

@@ -24,9 +24,9 @@ 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;
-    const cwd = runtime_store_1.default.get('cwd');
-    const javaServer = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, '.catalyst', 'aioserver', 'JavaaioServer');
-    const targetDir = (0, path_1.join)(cwd, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, (_a = details.target) === null || _a === void 0 ? void 0 : _a.name);
+    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);
     const label = `${details.type}[${(_b = details.target) === null || _b === void 0 ? void 0 : _b.name}]`;
     const opts = [
         '-cp',
@@ -52,7 +52,7 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     const userConfigCmd = userConfig_1.default.get(configKey);
     const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'java', (_e = details.target) === null || _e === void 0 ? void 0 : _e.stack);
     return (0, shell_1.spawn)(spawnCommand, opts, {
-        cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
+        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)
     }).RAW();

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

@@ -37,9 +37,9 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     var _a, _b;
     const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
     const _c = details.target, { ['watcher']: _ } = _c, serialisableTarget = __rest(_c, ['watcher']);
-    const cwd = runtime_store_1.default.get('cwd');
+    const projectRoot = runtime_store_1.default.get('project.root');
     serialisableTarget.index = serialisableTarget.index
-        ? serialisableTarget.index.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build))
+        ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
         : undefined;
     const opts = [
         (0, path_1.join)(__dirname, 'server'),
@@ -79,7 +79,7 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
         return event;
     }
     return (0, shell_1.spawn)('node', opts, {
-        cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
+        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({ 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, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();

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

@@ -26,7 +26,6 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
     const projectRoot = runtime_store_1.default.get('project.root');
     const targetSource = (_a = details.target) === null || _a === void 0 ? void 0 : _a.source;
     const runtimesDir = constants_1.ENVPATH.runtimes.data;
-    const cwd = runtime_store_1.default.get('cwd');
     const stackVersion = (_b = details.target.stack) === null || _b === void 0 ? void 0 : _b.replace('python_', '');
     const opts = [
         '-u',
@@ -34,7 +33,7 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
     ];
     return new Promise((res) => {
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
-            cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(cwd, (0, path_1.join)(cwd, constants_1.FOLDERNAME.build)),
+            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_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();

package/lib/shell/prepare/index.js

@@ -12,6 +12,7 @@ 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 fn_utils_1 = require("../../fn-utils");
 const common_1 = require("../../fn-utils/lib/common");
 const pip_install_1 = require("../../init/dependencies/python/pip-install");
@@ -20,6 +21,7 @@ const throbber_1 = __importDefault(require("../../throbber"));
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const languages_1 = require("./languages");
+const char_1 = require("../../util_modules/char");
 exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
     fn_utils_1.fnUtils.common.executeHook({ prefix: 'pre', command: 'serve' });
     const throbber = throbber_1.default.getInstance();
@@ -42,6 +44,20 @@ exports.default = (fnTypes) => __awaiter(void 0, void 0, void 0, function* () {
     });
     runtime_store_1.default.set('context.functions.targets', refinedTargets);
     yield (0, languages_1.prepareFunctions)(refinedTargets);
+    refinedTargets.forEach((target) => {
+        if (target.compilationError) {
+            target.compilationError.forEach((error) => {
+                console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}]`);
+                console.log(error);
+            });
+        }
+        if (target.compilationWarning) {
+            target.compilationWarning.forEach((warn) => {
+                console.warn(`${(0, ansi_colors_1.yellow)(char_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
+                console.warn(warn);
+            });
+        }
+    });
     const pyStacks = [];
     refinedTargets.filter((target) => {
         var _a;

package/lib/util_modules/constants/lib/dc-type.js

@@ -32,5 +32,13 @@ exports.default = Object.freeze({
         w_auth: 'us',
         m_auth: 'us',
         ext: '.com.au'
+    },
+    ca: {
+        loc: 'Canada',
+        ref: 'ca',
+        value: 'ca',
+        w_auth: 'us',
+        m_auth: 'us',
+        ext: '.ca'
     }
 });

package/lib/util_modules/constants/lib/urls.js

@@ -12,6 +12,9 @@ class URL {
         if (dc === undefined) {
             return URL._auth;
         }
+        if (dc.value === dc_type_js_1.default.ca.value) {
+            return URL._auth.replace('.zoho.com', '.zohocloud.ca');
+        }
         return URL._auth.replace('.com', dc.ext);
     }
     static get admin() {
@@ -19,6 +22,9 @@ class URL {
         if (dc === undefined) {
             return URL._admin;
         }
+        if (dc.value === dc_type_js_1.default.ca.value) {
+            return URL._admin.replace('.zoho.com', '.zohocloud.ca');
+        }
         return URL._admin.replace('.com', dc.ext);
     }
     static get app() {
@@ -33,6 +39,9 @@ class URL {
         if (dc === undefined) {
             return URL._zohoStatic;
         }
+        if (dc.value === dc_type_js_1.default.ca.value) {
+            return URL._zohoStatic.replace('.zoho.com', '.zohocloud.ca');
+        }
         return URL._zohoStatic.replace(dc_type_js_1.default.us.ext, dc.ext);
     }
     static get console() {
@@ -40,6 +49,9 @@ class URL {
         if (dc === undefined) {
             return URL._console;
         }
+        if (dc.value === dc_type_js_1.default.ca.value) {
+            return URL._console.replace('.zoho.com', '.zohocloud.ca');
+        }
         return URL._console.replace('.com', dc.ext);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.16.2",
+	"version": "1.17.1",
 	"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");