zcatalyst-cli 1.11.1 → 1.13.0

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.11.1",
+	"version": "1.13.0",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
 		"catalyst": "./lib/bin/catalyst.js"
 	},
 	"engines": {
-		"node": ">=12.0.0"
+		"node": ">=14.0.0"
 	},
 	"preferGlobal": true,
 	"keywords": [
@@ -28,65 +28,65 @@
 		"ansi-colors": "^4.1.1",
 		"app-module-path": "^2.2.0",
 		"better-queue": "^3.8.10",
-		"chokidar": "^3.5.2",
+		"chokidar": "^3.5.3",
 		"cli-cursor": "^3.1.0",
-		"cli-table3": "^0.6.0",
-		"commander": "^8.2.0",
-		"conf": "^10.0.2",
+		"commander": "^9.2.0",
+		"conf": "^10.1.2",
 		"cross-spawn": "^7.0.3",
-		"express": "^4.17.1",
-		"fs-extra": "^10.0.0",
+		"express": "^4.17.3",
+		"fs-extra": "^10.1.0",
 		"fuzzy": "^0.1.3",
 		"http-proxy": "^1.18.1",
-		"inquirer": "^8.1.2",
-		"inquirer-autocomplete-prompt": "^1.4.0",
-		"jszip": "^3.7.1",
+		"inquirer": "^8.2.2",
+		"inquirer-autocomplete-prompt": "^2.0.0",
+		"jszip": "^3.9.1",
 		"lodash": "^4.17.21",
-		"minimatch": "^3.0.4",
-		"moment": "^2.29.1",
-		"open": "^8.2.1",
+		"minimatch": "^5.0.1",
+		"moment": "^2.29.3",
+		"open": "^8.4.0",
 		"portfinder": "^1.0.28",
 		"pretty-ms": "^7.0.1",
 		"request": "^2.88.2",
-		"semver": "^7.3.5",
-		"strip-ansi": "^6.0.0",
+		"semver": "^7.3.7",
+		"string-width": "^4.2.3",
+		"strip-ansi": "^6.0.1",
 		"toml": "^3.0.0",
 		"update-notifier": "^5.1.0",
-		"winston": "^3.3.3",
-		"ws": "^8.2.3",
+		"winston": "^3.7.2",
+		"ws": "^8.5.0",
 		"xml2js": "^0.4.23",
-		"yaml": "^1.10.2",
-		"zcatalyst-angular-schematics": "^0.0.1"
+		"yaml": "^2.0.1",
+		"zcatalyst-angular-schematics": "^0.1.0"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",
 		"@types/better-queue": "^3.8.3",
 		"@types/cross-spawn": "^6.0.2",
 		"@types/express": "^4.17.13",
-		"@types/fs-extra": "^9.0.12",
-		"@types/http-proxy": "^1.17.7",
-		"@types/inquirer": "^7.3.3",
-		"@types/inquirer-autocomplete-prompt": "^1.3.3",
-		"@types/jest": "^26.0.24",
-		"@types/lodash": "^4.14.172",
+		"@types/fs-extra": "^9.0.13",
+		"@types/http-proxy": "^1.17.8",
+		"@types/inquirer": "^8.2.1",
+		"@types/inquirer-autocomplete-prompt": "^1.3.4",
+		"@types/jest": "^27.4.1",
+		"@types/lodash": "^4.14.182",
 		"@types/minimatch": "^3.0.5",
-		"@types/node": "^16.6.0",
-		"@types/request": "^2.48.7",
-		"@types/semver": "^7.3.8",
+		"@types/node": "^17.0.25",
+		"@types/request": "^2.48.8",
+		"@types/semver": "^7.3.9",
 		"@types/update-notifier": "^5.1.0",
-		"@types/ws": "^8.2.0",
-		"@types/xml2js": "^0.4.9",
-		"@typescript-eslint/eslint-plugin": "^4.29.1",
-		"@typescript-eslint/parser": "^4.29.1",
-		"eslint": "^7.32.0",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-prettier": "^3.4.0",
+		"@types/ws": "^8.5.3",
+		"@types/xml2js": "^0.4.11",
+		"@typescript-eslint/eslint-plugin": "^5.20.0",
+		"@typescript-eslint/parser": "^5.20.0",
+		"eslint": "^8.13.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-prettier": "^4.0.0",
 		"gulp": "^4.0.2",
-		"jest": "^27.0.6",
+		"jest": "^27.5.1",
 		"npm-run-all": "^4.1.5",
-		"prettier": "^2.3.2",
-		"ts-jest": "^27.0.4",
-		"typescript": "^4.3.5"
+		"prettier": "^2.6.2",
+		"ts-jest": "^27.1.4",
+		"typescript": "^4.6.3"
 	},
 	"scripts": {
 		"build": "gulp build",

package/scripts/postInstall.js

@@ -7,12 +7,12 @@
 try {
 	const semver = require('semver');
 	const ansi = require('ansi-colors');
-	const cliTable = require('cli-table3');
+	const cliTable = require('../lib/cli_table');
 	const packageJson = require('../package.json');
 
 	if (semver.satisfies(process.version, packageJson.engines.node)) {
 		console.log(ansi.green.bold('Installation successful.'));
-		return;
+		process.exit(0);
 	}
 
 	const table = new cliTable({ style: { border: [], header: [] } });
@@ -24,8 +24,9 @@ try {
 			'Compatible version: ': [ansi.green(packageJson.engines.node)]
 		}
 	);
-	console.log(ansi.red('Node.js version is incompatible !!!'));
-	console.log(table.toString());
-	console.log('\n' + ansi.yellow.bold('Please update Node.js to a compatible version.'));
-	console.log(ansi.bold('Reference: ') + ansi.underline('https://nodejs.org/') + '\n');
+	console.error(ansi.red('Node.js version is incompatible !!!'));
+	console.error(table.toString());
+	console.error('\n' + ansi.yellow.bold('Please update Node.js to a compatible version.'));
+	console.error(ansi.bold('Reference: ') + ansi.underline('https://nodejs.org/') + '\n');
+	process.exit(1);
 } catch (err) {}

package/templates/init/functions/java/integ/cliq/com/handlers/BotHandler.java

@@ -31,6 +31,7 @@ import com.zc.cliq.requests.BotParticipationHandlerRequest;
 import com.zc.cliq.requests.BotWebhookHandlerRequest;
 import com.zc.cliq.requests.BotWelcomeHandlerRequest;
 import com.zc.cliq.util.ZCCliqUtil;
+import com.zc.component.cache.ZCCache;
 
 public class BotHandler implements com.zc.cliq.interfaces.BotHandler {
 	Logger LOGGER = Logger.getLogger(BotHandler.class.getName());
@@ -82,7 +83,13 @@ public class BotHandler implements com.zc.cliq.interfaces.BotHandler {
 				param2.addSuggestion("IT");
 				param2.addSuggestion("MECH");
 
-				context.setParams(param1, param2);
+				BotContextParam param3 = BotContextParam.getInstance();
+				param3.setName("cache");
+				param3.setQuestion("Do you wish to put this detail in Catalyst Cache ?");
+				param3.addSuggestion("YES");
+				param3.addSuggestion("NO");
+
+				context.setParams(param1, param2, param3);
 				resp.put("context", context);
 			} else if (message.equalsIgnoreCase("button")) {
 
@@ -117,8 +124,19 @@ public class BotHandler implements com.zc.cliq.interfaces.BotHandler {
 		if (req.getContextId().equals("personal_details")) {
 			Map<String, String> answers = req.getAnswers();
 			StringBuilder str = new StringBuilder();
-			str.append("Name: ").append(answers.get("name")).append("\n");
-			str.append("Department: ").append(answers.get("dept")).append("\n");
+			str.append("*Name*: ").append(answers.get("name")).append("\n");
+			str.append("*Department*: ").append(answers.get("dept")).append("\n");
+
+			if(answers.get("cache").equals("YES")) {
+				try {
+					ZCCache cache = ZCCache.getInstance();
+					cache.putCacheValue("Name", answers.get("name"), 1L);
+					cache.putCacheValue("Department", answers.get("dept"), 1L);
+					str.append("This data is now available in Catalyst Cache's default segment.");
+				} catch(Exception ex) {
+					System.out.print("Error putting the value to cache: " + ex.toString());
+				}
+			}
 
 			resp.put("text", "Nice ! I have collected your info: \n" + str.toString());
 		}
@@ -156,10 +174,10 @@ public class BotHandler implements com.zc.cliq.interfaces.BotHandler {
 		String summary;
 		String bodyStr = new StringBuilder("*From*: ").append(reqBody.getString("fromAddress")).append("\n*Subject*: ").append(reqBody.getString("subject")).append("\n*Content*: ").append((summary = reqBody.getString("summary")).length() > 100 ? summary.substring(0, 100) : summary).toString();
 		Message msg = Message.getInstance(bodyStr);
-		msg.setBot("PostPerson", "https://previews.123rf.com/images/nastyatrel/nastyatrel2006/nastyatrel200600035/149438272-flat-vector-illustration-chat-bot-icon-flat-line-style-vector-.jpg");
+		msg.setBot("PostPerson", "https://www.zoho.com/sites/default/files/catalyst/functions-images/icon-robot.jpg");
 		CardDetails card = CardDetails.getInstance();
 		card.setTitle("New Mail");
-		card.setThumbnail("https://seekicon.com/free-icon-download/mail-icon_18.svg");
+		card.setThumbnail("https://www.zoho.com/sites/default/files/catalyst/functions-images/mail.svg");
 		msg.setCard(card);
 
 		ButtonObject button = new ButtonObject();

package/templates/init/functions/node/integ/cliq/handlers/bot-handler.js

@@ -46,8 +46,14 @@ botHandler.messageHandler(async (req, res) => {
             param2.addSuggestion('CSE');
             param2.addSuggestion('IT');
             param2.addSuggestion('MECH');
+
+            const param3 = context.newParam();
+            param3.name = 'cache';
+            param3.question = "Do you wish to put this detail in Catalyst Cache ?"
+            param3.addSuggestion('YES');
+            param3.addSuggestion('NO');
             
-            context.addParams(param1, param2);
+            context.addParams(param1, param2, param3);
             res.context = context;
         }
         else if (comp(msg, 'button')) {
@@ -77,13 +83,23 @@ botHandler.messageHandler(async (req, res) => {
     }
 });
 
-botHandler.contextHandler(async (req, res) => {
+botHandler.contextHandler(async (req, res, app) => {
     if(req.context_id === 'personal_details') {
         const answer = req.answers;
-        const department = answer.dept.text;
-        const str = `Name: ${answer.name.text}\nDepartment: ${department}\n`;
+        let text = `Nice! I have collected your info: \n*Name*: ${answer.name.text} \n*Department*: ${answer.dept.text}`
+
+        if(answer.cache.text === 'YES') {
+            try {
+                const segment = app.cache().segment();
+                await segment.put('Name', answer.name.text);
+                await segment.put('Department', answer.dept.text);
+                text += '\nThis data is now available in Catalyst Cache\'s default segment.'
+            } catch(err) {
+                console.error('Error putting value in cache', err);
+            }
+        }
 
-        res.setText('Nice ! I have collected your info: \n' + str);
+        res.setText(text);
     }
     return res;
 });
@@ -117,12 +133,11 @@ botHandler.webHookHandler(async (req, res) => {
     const summary =  reqBody.summary || '';
     const bodyStr = `*From*: ${reqBody.fromAddress} \n *Subject*: ${reqBody.subject} \n *Content*: ${ summary.length > 100 ? summary.substring(0, 100): summary}`;
     
-    res.bot = res.newBotDetails('PostPerson',
-             'https://previews.123rf.com/images/nastyatrel/nastyatrel2006/nastyatrel200600035/149438272-flat-vector-illustration-chat-bot-icon-flat-line-style-vector-.jpg');
+    res.bot = res.newBotDetails('PostPerson', 'https://www.zoho.com/sites/default/files/catalyst/functions-images/icon-robot.jpg');
     
     const card = res.newCard();
     card.title = 'New Mail';
-    card.thumbnail = 'https://seekicon.com/free-icon-download/mail-icon_18.svg';
+    card.thumbnail = 'https://www.zoho.com/sites/default/files/catalyst/functions-images/mail.svg';
     res.card = card;
 
     const button = res.newButton();

package/templates/init/functions/node/integ/cliq/handlers/command-handler.js

@@ -36,17 +36,17 @@ command.executionHandler(async (req, res) => {
 
 command.suggestionHandler(async (req, res) => {
     if(comp(req.name,'catalystresource')) {
-        const suggestion1 = command.newCommandSugestion();
+        const suggestion1 = command.newCommandSuggestion();
         suggestion1.title = 'API doc';
         suggestion1.description = 'Catalyst API documentation';
         suggestion1.imageurl = 'https://www.zohowebstatic.com/sites/default/files/styles/product-home-page/public/catalyst-icon.png';
 
-        const suggestion2 = command.newCommandSugestion();
+        const suggestion2 = command.newCommandSuggestion();
         suggestion2.title = 'CLI doc';
         suggestion2.description = 'Catalyst CLI documentation';
         suggestion2.imageurl = 'https://www.zohowebstatic.com/sites/default/files/styles/product-home-page/public/catalyst-icon.png';
 
-        const suggestion3 = command.newCommandSugestion();
+        const suggestion3 = command.newCommandSuggestion();
         suggestion3.title = 'Help docs';
         suggestion3.description = 'Catalyst help documentation';
         suggestion3.imageurl = 'https://www.zohowebstatic.com/sites/default/files/styles/product-home-page/public/catalyst-icon.png';

package/templates/init/functions/node/integ/cliq/package.json

@@ -4,6 +4,7 @@
 	"main": "{{_MAIN_}}",
 	"author": "{{_AUTHOR_}}",
 	"dependencies": {
-		"zcatalyst-integ-cliq": "latest"
+		"zcatalyst-integ-cliq": "latest",
+		"zcatalyst-sdk-node": "^2.1.0"
 	}
 }

package/templates/init/functions/node/integ/cliq/sample.js

@@ -1,9 +1,11 @@
 'use strict';
 const Cliq = require('zcatalyst-integ-cliq');
+const catalyst = require('zcatalyst-sdk-node');
 
 module.exports = async (request, response) => {
 	try {
-		const handlerResponse = await Cliq.default(request);
+		const app = catalyst.initialize(request);
+		const handlerResponse = await Cliq.default(request, app);
 		response.end(handlerResponse);
 	} catch (err) {
 		console.log('Error while executing handler. ', err);