zcatalyst-cli 1.13.2 → 1.14.0

package/lib/readline/features/queue.js

@@ -1 +1,209 @@
-"use strict";
+// 'use strict';
+
+// var _ = require('lodash');
+// var clc = require('cli-color');
+// var readline = require('readline');
+
+// var queueAPI = require('../../endpoints').queue;
+// var logger = require('../../logger');
+// var utils = require('../../utils');
+// var readlineUtil = require('../../readLineUtils');
+
+// var outputStream = process.stdout;
+// var inputStream = process.stdin;
+
+// var consumerTimeout;
+
+// var listAllQueue = function(projectId, resolve) {
+// 	return queueAPI
+// 		.list(projectId)
+// 		.then(function(data) {
+// 			_.forEach(data, function(topic, index) {
+// 				logger.info(
+// 					index + 1 + '. ' + clc.bold(topic.queue_name) + ' ( ' + topic.id + ' )'
+// 				);
+// 			});
+// 			return resolve(true);
+// 		})
+// 		.catch(function(err) {
+// 			logger.debug('There was an error processing the request.' + err);
+// 			logger.info(clc.redBright("couldn't fetch queue details"));
+// 			return resolve(true);
+// 		});
+// };
+
+// var produceToQueue = function(projectId, queueId, obj, resolve) {
+// 	return queueAPI
+// 		.produce(projectId, queueId, obj)
+// 		.then(function() {
+// 			// console.log(data);
+// 			return resolve(false);
+// 		})
+// 		.catch(function(err) {
+// 			logger.debug('There was an error processing the request.' + err);
+// 			logger.info(clc.redBright("couldn't produce to queue. Please check the queue id."));
+// 			return resolve(false);
+// 		});
+// };
+
+// var startConsumerTimeout = function(projectId, queueId, delayInMillis) {
+// 	consumerTimeout = setInterval(function() {
+// 		return queueAPI
+// 			.consume(projectId, queueId)
+// 			.then(function(data) {
+// 				if (data) {
+// 					console.log(data[0].value);
+// 				}
+// 			})
+// 			.catch(function(err) {
+// 				logger.debug('There was an error processing the request.' + err);
+// 				// clearInterval(consumerTimeout);
+// 			});
+// 	}, delayInMillis);
+// };
+
+// module.exports = function(options) {
+// 	var state = 0;
+// 	var queue = '';
+// 	var consumerAlive = false;
+// 	var producerAlive = false;
+
+// 	return new Promise(function(resolve) {
+// 		var prompt = clc.cyanBright('queue > ');
+// 		var prevPrompt = prompt;
+
+// 		function completer(line) {
+// 			var completions = 'list use start-producer start-consumer'.split(' ');
+// 			var hits = completions.filter(function(c) {
+// 				c.startsWith(line);
+// 			});
+// 			// show all completions if none found
+// 			return [hits.length ? hits : completions, line];
+// 		}
+// 		var rl = readline.createInterface({
+// 			input: inputStream,
+// 			output: outputStream,
+// 			prompt: prompt,
+// 			completer: completer
+// 		});
+
+// 		rl.on('line', function(line) {
+// 			var originalLine = line.trim();
+// 			var lineArr = readlineUtil.splitLineIntoArray(originalLine);
+// 			return new Promise(function(resolve) {
+// 				if (producerAlive) {
+// 					if (originalLine === '') {
+// 						readlineUtil.displayHelp('cannot produce a empty msg to queue.');
+// 						return resolve(true);
+// 					}
+// 					var obj = {};
+// 					obj.value = line;
+// 					return produceToQueue(options.project, queue, obj, resolve);
+// 				}
+// 				if (consumerAlive) {
+// 					return resolve(false);
+// 				}
+// 				switch (true) {
+// 					case /^exit/i.test(originalLine):
+// 					case /\\q/i.test(originalLine):
+// 						rl.close();
+// 						break;
+// 					case /^list/i.test(originalLine):
+// 						if (lineArr.length === 1) {
+// 							return listAllQueue(options.project, resolve);
+// 						} else {
+// 							readlineUtil.displayHelp('use of additional params not permitted.');
+// 							return resolve(true);
+// 						}
+// 					case /^use/i.test(originalLine):
+// 						var queueID = lineArr[lineArr.length - 1];
+// 						if (lineArr.length === 2 && /^[0-9]*$/gm.test(queueID)) {
+// 							queue = queueID;
+// 							state = 1;
+// 							prevPrompt = prompt;
+// 							prompt = clc.cyanBright('queue:' + queue + ' > ');
+// 							rl.setPrompt(prompt);
+// 							return resolve(true);
+// 						} else {
+// 							readlineUtil.displayHelp('Queue ID not valid.');
+// 							return resolve(true);
+// 						}
+// 					case /^start-consumer/i.test(line):
+// 						if (state === 0) {
+// 							utils.logWarning(
+// 								'You must select a queue first. Try ' + clc.bold('use <queueId>'),
+// 								'info'
+// 							);
+// 							return resolve(true);
+// 						} else if (lineArr.length === 1) {
+// 							consumerAlive = true;
+// 							prevPrompt = prompt;
+// 							prompt = '';
+// 							rl.setPrompt(prompt);
+// 							startConsumerTimeout(options.project, queue, 5000);
+// 							return resolve(false);
+// 						} else {
+// 							readlineUtil.displayHelp('use of additional params not permitted.');
+// 							return resolve(true);
+// 						}
+// 					case /^start-producer/i.test(line):
+// 						if (state === 0) {
+// 							utils.logWarning(
+// 								'You must select a queue first. Try ' + clc.bold('use <queueId>'),
+// 								'info'
+// 							);
+// 							return resolve(true);
+// 						} else if (lineArr.length === 1) {
+// 							producerAlive = true;
+// 							prevPrompt = prompt;
+// 							prompt = '';
+// 							rl.setPrompt(prompt);
+// 							return resolve(false);
+// 						} else {
+// 							readlineUtil.displayHelp('use of additional params not permitted.');
+// 							return resolve(true);
+// 						}
+// 					case /^help/i.test(originalLine):
+// 					case /^\\h/i.test(originalLine):
+// 						utils.logBullet(
+// 							'Available commands :\t ' +
+// 								clc.bold('list, use, start-producer, start-consumer, exit')
+// 						);
+// 						return resolve(true);
+// 					default:
+// 						logger.info(
+// 							`We might have heard '${clc.bold(
+// 								line.trim()
+// 							)}'\n which is an unknown command!! Use '${clc.bold(
+// 								'help'
+// 							)}' for the list of commands you can use.`
+// 						);
+// 						return resolve(true);
+// 				}
+// 			}).then(function(showPrompt) {
+// 				if (showPrompt) {
+// 					rl.prompt();
+// 				}
+// 			});
+// 		}).on('close', function() {
+// 			logger.info('Have a great day!');
+// 			return resolve();
+// 		});
+
+// 		rl.on('SIGINT', function() {
+// 			if (!producerAlive && !consumerAlive) {
+// 				rl.close();
+// 			} else {
+// 				producerAlive = producerAlive ? !producerAlive : producerAlive;
+// 				consumerAlive = consumerAlive ? !consumerAlive : consumerAlive;
+// 				if (consumerTimeout) {
+// 					clearInterval(consumerTimeout);
+// 				}
+// 				prompt = prevPrompt;
+// 				rl.setPrompt(prompt);
+// 				rl.prompt();
+// 			}
+// 		});
+// 		rl.prompt();
+// 	});
+// };

package/lib/readline/features/zcql.js

@@ -1 +1,237 @@
-"use strict";
+// 'use strict';
+
+// var _ = require('lodash');
+// var clc = require('cli-color');
+// var readline = require('readline');
+// var Table = require('cli-table');
+
+// var zcqlAPI = require('../../endpoints').zcql;
+// var dataStoreAPI = require('../../endpoints').datastore;
+// var logger = require('../../logger');
+
+// var outputStream = process.stdout;
+// var inputStream = process.stdin;
+
+// module.exports = function(options) {
+// 	return new Promise(function(resolve) {
+// 		function getHeadTable(headArr) {
+// 			headArr = headArr || [];
+// 			return new Table({
+// 				head: headArr,
+// 				chars: {
+// 					top: ' ',
+// 					'top-mid': '',
+// 					'top-left': '',
+// 					'top-right': '',
+// 					bottom: '-',
+// 					'bottom-mid': '+',
+// 					'bottom-left': ' ',
+// 					'bottom-right': ' ',
+// 					left: ' ',
+// 					'left-mid': ' ',
+// 					mid: '',
+// 					'mid-mid': '',
+// 					right: '',
+// 					'right-mid': '',
+// 					middle: '|'
+// 				},
+// 				style: {
+// 					head: ['yellow']
+// 				}
+// 			});
+// 		}
+
+// 		function getRowTable() {
+// 			return new Table({
+// 				chars: {
+// 					top: ' ',
+// 					'top-mid': '',
+// 					'top-left': '',
+// 					'top-right': '',
+// 					bottom: ' ',
+// 					'bottom-mid': '',
+// 					'bottom-left': '',
+// 					'bottom-right': '',
+// 					left: ' ',
+// 					'left-mid': '',
+// 					mid: ' ',
+// 					'mid-mid': '',
+// 					right: ' ',
+// 					'right-mid': '',
+// 					middle: '|'
+// 				}
+// 			});
+// 		}
+
+// 		function parseHrtimeToSeconds(hrtime) {
+// 			var seconds = (hrtime[0] + hrtime[1] / 1e9).toFixed(3);
+// 			return seconds;
+// 		}
+
+// 		function completer(line) {
+// 			var completions = 'show select'.split(' ');
+// 			var hits = completions.filter(function(c) {
+// 				c.startsWith(line);
+// 			});
+// 			// show all completions if none found
+// 			return [hits.length ? hits : completions, line];
+// 		}
+// 		var prompt = clc.cyanBright('query > ');
+// 		var rl = readline.createInterface({
+// 			input: inputStream,
+// 			output: outputStream,
+// 			prompt: prompt,
+// 			completer: completer
+// 		});
+
+// 		rl.prompt();
+
+// 		rl.on('line', function(line) {
+// 			var originalLine = line.trim();
+// 			return new Promise(function(resolve) {
+// 				switch (true) {
+// 					case /^exit/i.test(originalLine):
+// 					case /\\q/i.test(originalLine):
+// 						rl.close();
+// 						break;
+// 					case /^show tables$/i.test(originalLine):
+// 					case /^show tables;$/i.test(originalLine):
+// 						var startShowTime = process.hrtime();
+// 						var totalTableRows = 0;
+// 						return dataStoreAPI
+// 							.getAllTables(options.project)
+// 							.then(function(data) {
+// 								var elapsedSeconds = parseHrtimeToSeconds(
+// 									process.hrtime(startShowTime)
+// 								);
+// 								var table = getHeadTable(['Tables_in_' + options.project]);
+// 								// style override
+// 								table.options.chars = {
+// 									top: '-',
+// 									'top-left': '+',
+// 									'top-right': '+',
+// 									bottom: '-',
+// 									'bottom-left': '+',
+// 									'bottom-right': '+',
+// 									left: '|',
+// 									'left-mid': '|',
+// 									mid: '-',
+// 									'mid-mid': '+',
+// 									right: '|',
+// 									'right-mid': '|',
+// 									middle: '|'
+// 								};
+// 								data.forEach(function(tableDetails) {
+// 									var row = [tableDetails.table_name];
+// 									table.push(row);
+// 									totalTableRows++;
+// 								});
+// 								if (totalTableRows > 0) {
+// 									console.log(table.toString());
+// 									console.log(
+// 										totalTableRows +
+// 											' rows in set (' +
+// 											elapsedSeconds +
+// 											'sec)\n'
+// 									);
+// 								} else {
+// 									console.log('Empty set (' + elapsedSeconds + 'sec)\n');
+// 								}
+// 								return resolve();
+// 							})
+// 							.catch(function(err) {
+// 								logger.debug('There was an error processing the request.' + err);
+// 								logger.info(clc.redBright("couldn't fetch any details"));
+// 								return resolve();
+// 							});
+// 					case /^select/i.test(originalLine):
+// 						var startTime = process.hrtime();
+// 						var totalRows = 0;
+// 						var containsJoin =
+// 							_.words(originalLine).indexOf('join') >= 0 ||
+// 							_.words(originalLine).indexOf('JOIN') >= 0;
+// 						return zcqlAPI
+// 							.query(options.project, originalLine.replace(';', ''))
+// 							.then(function(data) {
+// 								var elapsedSeconds = parseHrtimeToSeconds(
+// 									process.hrtime(startTime)
+// 								);
+// 								var globalMaxWidthArr = [];
+// 								var globalHeadArr = [];
+// 								var headTable = getHeadTable();
+// 								var rowTable = getRowTable();
+// 								data.forEach(function(rowDetails) {
+// 									var row = [];
+// 									_.keysIn(rowDetails).forEach(function(tableKeys) {
+// 										var maxWidthArr = [];
+// 										var tableHead = [];
+// 										var tableDetails = _.get(rowDetails, tableKeys);
+// 										_.forIn(tableDetails, function(value, key) {
+// 											//null handling
+// 											value = (value || '') + '';
+// 											var headerName = key;
+// 											if (containsJoin) {
+// 												headerName = tableKeys + '.' + key;
+// 											}
+// 											tableHead.push(headerName);
+// 											maxWidthArr.push(
+// 												headerName.length + 2 > value.length + 2
+// 													? headerName.length + 2
+// 													: value.length + 2
+// 											);
+// 											row.push(value);
+// 										});
+// 										globalMaxWidthArr =
+// 											globalMaxWidthArr.length > 0
+// 												? globalMaxWidthArr
+// 												: maxWidthArr;
+// 										maxWidthArr.forEach(function(maxLen, index) {
+// 											globalMaxWidthArr[index] =
+// 												maxLen > globalMaxWidthArr[index]
+// 													? maxLen
+// 													: globalMaxWidthArr[index];
+// 										});
+// 										globalHeadArr = _.union(globalHeadArr, tableHead);
+// 									});
+// 									rowTable.push(row);
+// 									totalRows++;
+// 								});
+// 								if (totalRows > 0) {
+// 									var colAlignmentArr = new Array(globalMaxWidthArr.length);
+// 									colAlignmentArr.fill('middle');
+// 									headTable.options.head = globalHeadArr;
+// 									headTable.options.colAligns = colAlignmentArr;
+// 									headTable.options.colWidths = globalMaxWidthArr;
+// 									rowTable.options.colAligns = colAlignmentArr;
+// 									rowTable.options.colWidths = globalMaxWidthArr;
+// 									console.log(headTable.toString() + '\n' + rowTable.toString());
+// 									console.log(
+// 										totalRows + ' rows in set (' + elapsedSeconds + 'sec)\n'
+// 									);
+// 								} else {
+// 									console.log('Empty set (' + elapsedSeconds + 'sec)\n');
+// 								}
+// 								return resolve();
+// 							})
+// 							.catch(function(err) {
+// 								logger.debug('There was an error processing the request.' + err);
+// 								logger.info(clc.redBright("couldn't fetch any details"));
+// 								return resolve();
+// 							});
+// 					default:
+// 						logger.info(
+// 							`We might have heard '${clc.bold(
+// 								line.trim()
+// 							)}'\n which is an unknown command!! Try a SQL Query instead.`
+// 						);
+// 						return resolve();
+// 				}
+// 			}).then(function() {
+// 				rl.prompt();
+// 			});
+// 		}).on('close', function() {
+// 			logger.info('Have a great day!');
+// 			return resolve();
+// 		});
+// 	});
+// };

package/lib/readline/index.js

@@ -1 +1,30 @@
-"use strict";
+// 'use strict';
+
+// var _ = require('lodash');
+// var clc = require('cli-color');
+
+// var logger = require('../logger');
+// var utils = require('../utils');
+
+// var features = require('./features');
+
+// var replServer = function(setup, options) {
+// 	var feature = setup.repl.feature;
+// 	if (feature) {
+// 		if (!features[feature]) {
+// 			return utils.reject(
+// 				clc.bold(feature) +
+// 					' is not a valid feature. Must be one of ' +
+// 					_.without(_.keys(features)).join(',')
+// 			);
+// 		}
+// 		logger.info();
+// 		logger.info(
+// 			clc.bold(clc.white('===> Your personalized ') + _.capitalize(feature) + ' console')
+// 		);
+// 		return features[feature](options);
+// 	}
+// 	return Promise.resolve();
+// };
+
+// module.exports = replServer;

package/lib/serve/index.js

@@ -35,6 +35,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 path_1 = require("path");
 const client_utils_1 = require("../client-utils");
 const error_1 = __importDefault(require("../error"));
@@ -44,6 +45,7 @@ const port_resolver_1 = __importDefault(require("../port-resolver"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const http_functions_1 = __importDefault(require("../shell/dependencies/http-functions"));
 const constants_1 = require("../util_modules/constants");
+const runtime_1 = __importDefault(require("../util_modules/constants/lib/runtime"));
 const fs_1 = require("../util_modules/fs");
 const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
@@ -53,6 +55,25 @@ 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();
     const basicFnServer = new http_functions_1.default({ primary: false });
+    const projectRoot = runtime_store_1.default.get('project.root');
+    const buildFolder = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build);
+    if (yield fs_1.ASYNC.isPathExists(buildFolder)) {
+        try {
+            (0, logger_1.debug)('Build folder already exists, staring 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) {
+            throw new error_1.default('Error running pre cleanup', {
+                original: err,
+                exit: 1,
+                errorId: 'SERVE-2',
+                arg: [(0, ansi_colors_1.bold)(constants_1.FOLDERNAME.build), ansi_colors_1.italic.red(buildFolder)]
+            });
+        }
+    }
     try {
         const masterPort = yield port_resolver_1.default.getPort('master', 'http', 'master', false);
         runtime_store_1.default.set('context.port.http.master', masterPort);
@@ -62,7 +83,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         if (watchOpt) {
             yield Promise.all(rawTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () { return (target.valid ? (0, fn_watcher_1.default)(target) : undefined); })));
         }
-        const funtionTargets = rawTargets.filter((target) => {
+        const functionTargets = rawTargets.filter((target) => {
+            var _a;
             if (!target.valid) {
                 (0, logger_1.warning)('skipping serve of function [' +
                     target.name +
@@ -73,6 +95,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             if (target.type === constants_1.FN_TYPE.advanced) {
                 advancedServer.add('server', target);
             }
+            if (target.type === constants_1.FN_TYPE.basic &&
+                ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python))) {
+                advancedServer.add('functions', target);
+            }
             return target.valid;
         });
         if (serveTargets.includes('client')) {
@@ -88,13 +114,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 serveTargets.splice(serveTargets.indexOf('client'), 1);
             }
         }
-        if (serveTargets.includes('functions') && funtionTargets.length === 0) {
+        const isFunctionsServed = serveTargets.includes('functions');
+        if (isFunctionsServed && functionTargets.length === 0) {
             (0, logger_1.labeled)('functions', 'No targets are ready to be served in local').WARN();
             serveTargets.splice(serveTargets.indexOf('functions'), 1);
             runtime_store_1.default.set('context.targets', serveTargets);
         }
-        if (serveTargets.includes('functions')) {
-            runtime_store_1.default.set('context.functions.targets', funtionTargets);
+        if (isFunctionsServed) {
+            runtime_store_1.default.set('context.functions.targets', functionTargets);
         }
         if (serveTargets.length === 0 ||
             (serveTargets.length === 1 && serveTargets[0] === 'apig')) {
@@ -102,14 +129,24 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         const basicFn = runtime_store_1.default
             .get('context.functions.targets', [])
-            .find((target) => target.type === constants_1.FN_TYPE.basic && target.valid);
+            .find((target) => {
+            var _a;
+            return target.type === constants_1.FN_TYPE.basic &&
+                !((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) &&
+                target.valid;
+        });
         if (basicFn) {
             yield basicFnServer.start();
         }
         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)));
         yield Promise.all([
-            fs_1.ASYNC.deleteDir((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir(buildFolder).catch(),
             advancedServer ? advancedServer.stop() : undefined,
             basicFnServer ? basicFnServer.stop() : undefined
         ]);
@@ -129,8 +166,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, logger_1.success)('Shutdown complete');
     }
     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((0, path_1.join)(runtime_store_1.default.get('cwd'), '.build')).catch(),
+            fs_1.ASYNC.deleteDir(buildFolder).catch(),
             advancedServer ? advancedServer.stop() : undefined,
             basicFnServer ? basicFnServer.stop() : undefined
         ]);