para-cli 1.23.3 → 1.24.0

package/index.js

@@ -25,86 +25,90 @@
 /* eslint indent: ["error", "tab"] */
 /* eslint object-curly-spacing: ["error", "always"] */
 
-import { statSync, readFileSync, writeFileSync } from 'fs';
-import { relative, basename, resolve } from 'path';
-import { TextEncoder } from 'util';
-var encoder = new TextEncoder('utf-8');
-import striptags from 'striptags';
+/* global console, process, Buffer */
+
+import { readFileSync, statSync, writeFileSync } from 'node:fs';
+import { basename, relative, resolve } from 'node:path';
+import { URL } from 'node:url';
+import { TextEncoder } from 'node:util';
+import input from '@inquirer/input';
+import password from '@inquirer/password';
+import chalk from 'chalk';
+import { globbySync } from 'globby';
 import { Parser } from 'htmlparser2';
-import { createInterface } from 'readline';
-import { Writable } from 'stream';
 import jsonwebtoken from 'jsonwebtoken';
 import { lookup } from 'mime-types';
-import { globbySync } from 'globby';
-import chalk from 'chalk';
+import { Pager, ParaClient, ParaObject } from 'para-client-js';
+import striptags from 'striptags';
 import apiClient from 'superagent';
-import { URL } from 'url';
-import { ParaClient, ParaObject, Pager } from 'para-client-js';
 
+const encoder = new TextEncoder('utf-8');
 const { cyan, red, yellow, green } = chalk;
 const { sign } = jsonwebtoken;
-var MAX_FILE_SIZE = 350 * 1024;
+const MAX_FILE_SIZE = 350 * 1024;
 var defaultConfig = { accessKey: '', secretKey: '', endpoint: 'https://paraio.com' };
 
 const _defaultConfig = defaultConfig;
+
 export { _defaultConfig as defaultConfig };
 
 export async function setup(config) {
-	var secretPrompt = cyan.bold('Para Secret Key: ');
-	var mutableStdout = new Writable({
-		write: function (chunk, encoding, callback) {
-			if (!this.muted || (chunk.toString() === secretPrompt))
-				process.stdout.write(chunk, encoding);
-			else if (this.muted && chunk.length === 1)
-				process.stdout.write(Buffer.from("*".repeat(Math.random() * 5)), encoding);
-			callback();
-		}
-	});
-	var rl = createInterface({
-		input: process.stdin,
-		output: mutableStdout,
-		terminal: true
-	});
-	mutableStdout.muted = false;
-	rl.question(cyan.bold('Para Access Key: '), function (accessKey) {
-		mutableStdout.muted = true;
-		rl.question(secretPrompt, function (secretKey) {
-			mutableStdout.muted = false;
-			rl.question(cyan.bold('Para Endpoint (Press enter for ' + defaultConfig.endpoint + '): '), function (endpoint) {
-				var access = (accessKey || config.get('accessKey') || "app:para").trim();
-				var secret = (secretKey || config.get('secretKey')).trim();
-				var endpoint = (endpoint || defaultConfig.endpoint).trim();
-				newJWT(access, secret, endpoint, config);
-				var pc = new ParaClient(access, secret, parseEndpoint(endpoint));
-				ping(pc, config);
-				if (access === 'app:para') {
-					listApps(config, {}, access, function () {
-						// if none, ask to create one
-						rl.question(cyan.bold('Would you like to create a new Para app? [Y/n] '), function (Yn) {
-							Yn = Yn.trim();
-							if ('' === Yn || 'y' === Yn || 'Y' === Yn) {
-								rl.question(cyan.bold('App name: '), function (appname) {
-									newApp(pc, ['', appname], {});
-									rl.close();
-								});
-							} else {
-								rl.close();
-							}
-						});
+	try {
+		const accessKey = await input({
+			message: 'Para Access Key:',
+			default: config.get('accessKey') || 'app:para'
+		});
+
+		const secretKey = await password({
+			message: 'Para Secret Key:',
+			mask: '*'
+		});
+
+		const endpoint = await input({
+			message: 'Para Endpoint:',
+			default: defaultConfig.endpoint
+		});
+
+		var access = (accessKey || config.get('accessKey') || 'app:para').trim();
+		var secret = (secretKey || config.get('secretKey')).trim();
+		var endpointValue = (endpoint || defaultConfig.endpoint).trim();
+
+		newJWT(access, secret, endpointValue, config);
+		ping(config);
+
+		if (access === 'app:para') {
+			listApps(config, {}, access, async () => {
+				// if none, ask to create one
+				const shouldCreate = await input({
+					message: 'Would you like to create a new Para app? [Y/n]',
+					default: 'Y'
+				});
+
+				const Yn = shouldCreate.trim();
+				if ('' === Yn || 'y' === Yn.toLowerCase()) {
+					const appname = await input({
+						message: 'App name:'
 					});
+					newApp(['', appname], config, {});
 				}
-				rl.close();
 			});
-		});
-	});
+		}
+	} catch (error) {
+		if (error.name === 'ExitPromptError') {
+			console.log('\nSetup cancelled.');
+		} else {
+			throw error;
+		}
+	}
 }
 
-export function createAll(pc, input, flags) {
+export function createAll(input, config, flags = {}) {
 	if (!input[1]) {
 		fail('No files specified.');
 		return;
 	}
 
+	const pc = getClient(config, flags);
 	var files = globbySync(input[1], { realpath: true });
 	var totalSize = 0;
 	var totalObjects = 0;
@@ -120,7 +124,7 @@ export function createAll(pc, input, flags) {
 		var fileBody = '';
 		var id;
 
-		if (!stats || !stats.isFile()) {
+		if (!stats?.isFile()) {
 			console.error(red('✖'), yellow(file), 'is not a file.');
 			continue;
 		}
@@ -141,13 +145,12 @@ export function createAll(pc, input, flags) {
 				json.text = json.text.replace(/[^0-9\p{L}]+/giu, ' ').replace(/[\s]+/gi, ' ');
 			}
 
-			id = (i === 0 && flags.id) ? flags.id : (json.url || filePath);
+			id = i === 0 && flags.id ? flags.id : json.url || filePath;
 			console.log(green('✔'), 'Creating', yellow(id));
 			var textEncoded = encoder.encode(json.text);
 			//batchSize += textEncoded.length;
 			if (textEncoded.length > MAX_FILE_SIZE) {
-				console.log(red('!'), yellow('File is larger than',
-					MAX_FILE_SIZE / 1024, 'KB - splitting into chunks...'));
+				console.log(red('!'), yellow('File is larger than', MAX_FILE_SIZE / 1024, 'KB - splitting into chunks...'));
 				sendFileChunk(1, textEncoded, json, id, flags, 0, MAX_FILE_SIZE, pc);
 			} else {
 				if (batchSize > MAX_FILE_SIZE) {
@@ -162,7 +165,7 @@ export function createAll(pc, input, flags) {
 			}
 		} else if (fileType === 'application/json') {
 			totalObjects++;
-			id = (i === 0 && flags.id) ? flags.id : filePath;
+			id = i === 0 && flags.id ? flags.id : filePath;
 			totalSize += stats.size;
 			batchSize += stats.size;
 			if (batchSize > MAX_FILE_SIZE) {
@@ -175,47 +178,53 @@ export function createAll(pc, input, flags) {
 			addObjectsToBatch(batches[batchId], JSON.parse(readFile(file)), id, flags);
 			console.log(green('✔'), 'Creating', yellow(id));
 		} else {
-			console.error(red('✖'), 'Skipping', yellow(file), '- isn\'t JSON, HTML nor text.');
+			console.error(red('✖'), 'Skipping', yellow(file), "- isn't JSON, HTML nor text.");
 		}
 	}
 
 	for (var k = 0; k < batches.length; k++) {
 		var objectsList = batches[k];
 		if (objectsList.length > 0) {
-			pc.createAll(objectsList).then(function (data) {
-				console.log(green('✔'), 'Created', data.length, 'objects.');
-			}).catch(function (err) {
-				fail('Failed to create documents:', err);
-			});
+			pc.createAll(objectsList)
+				.then((data) => {
+					console.log(green('✔'), 'Created', data.length, 'objects.');
+				})
+				.catch((err) => {
+					fail('Failed to create documents:', err);
+				});
 		}
 	}
 
 	console.log(green('✔'), 'Created', totalObjects, 'objects with a total size of', Math.round(totalSize / 1024), 'KB.');
 }
 
-export function readAll(pc, flags) {
+export function readAll(config, flags = {}) {
+	const pc = getClient(config, flags);
 	if (flags.id) {
 		var readIds = flags.id;
-		if (!(readIds instanceof Array)) {
+		if (!Array.isArray(readIds)) {
 			readIds = [readIds];
 		}
 
-		pc.readAll(readIds).then(function (data) {
-			console.log(JSON.stringify(data, null, 2));
-		}).catch(function (err) {
-			fail('Failed to read object:', err);
-		});
+		pc.readAll(readIds)
+			.then((data) => {
+				console.log(JSON.stringify(data, null, 2));
+			})
+			.catch((err) => {
+				fail('Failed to read object:', err);
+			});
 	} else {
 		fail('Must specify object id(s).');
 	}
 }
 
-export function updateAll(pc, input, flags) {
+export function updateAll(input, config, flags = {}) {
 	if (!input[1]) {
 		fail('No files specified.');
 		return;
 	}
 
+	const pc = getClient(config, flags);
 	var files = globbySync(input[1], { realpath: true });
 	var updateList = [];
 
@@ -230,52 +239,60 @@ export function updateAll(pc, input, flags) {
 			continue;
 		}
 
-		if (!stats || !stats.isFile()) {
+		if (!stats?.isFile()) {
 			console.error(red('✖'), yellow(file), 'is not a file.');
 			continue;
 		}
 
 		var fileJSON = JSON.parse(readFile(file));
-		var id = (fileJSON.id || defaultId);
+		var id = fileJSON.id || defaultId;
 		addObjectsToBatch(updateList, fileJSON, id, flags);
 		console.log(green('✔'), 'Updating', yellow(id));
 	}
 
-	pc.updateAll(updateList).then(function () {
-		console.log(green('✔'), 'Updated', updateList.length, 'files.');
-	}).catch(function (err) {
-		fail('Failed to read object:', err);
-	});
+	pc.updateAll(updateList)
+		.then(() => {
+			console.log(green('✔'), 'Updated', updateList.length, 'files.');
+		})
+		.catch((err) => {
+			fail('Failed to read object:', err);
+		});
 }
 
-export function deleteAll(pc, input, flags) {
+export function deleteAll(input, config, flags = {}) {
+	const pc = getClient(config, flags);
 	if (flags.id || input[1]) {
 		var deleteIds = globbySync(input[1] || ' ', { realpath: true });
 		if (deleteIds.length === 0) {
-			deleteIds = flags.id instanceof Array ? flags.id : [String(flags.id)];
+			deleteIds = Array.isArray(flags.id) ? flags.id : [String(flags.id)];
 		}
 
 		for (var i = 0; i < deleteIds.length; i++) {
 			deleteIds[i] = basename(String(deleteIds[i]));
 		}
 
-		pc.deleteAll(deleteIds).then(function () {
-			console.log(green('✔'), 'Deleted objects "', deleteIds, '" from Para.');
-		}).catch(function (err) {
-			fail('Failed to delete objects:', err);
-		});
+		pc.deleteAll(deleteIds)
+			.then(() => {
+				console.log(green('✔'), 'Deleted objects "', deleteIds, '" from Para.');
+			})
+			.catch((err) => {
+				fail('Failed to delete objects:', err);
+			});
 	} else {
 		fail('No files specified.');
 	}
 }
 
-export function newKeys(pc, config) {
-	pc.newKeys().then(function (keys) {
-		config.set('secretKey', keys.secretKey);
-		console.log(green('✔'), 'New JWT generated and saved in', yellow(config.path));
-	}).catch(function (err) {
-		fail('Failed to generate new secret key:', err);
-	});
+export function newKeys(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.newKeys()
+		.then((keys) => {
+			config.set('secretKey', keys.secretKey);
+			console.log(green('✔'), 'New JWT generated and saved in', yellow(config.path));
+		})
+		.catch((err) => {
+			fail('Failed to generate new secret key:', err);
+		});
 }
 
 export function newJWT(accessKey, secretKey, endpoint, config, flags) {
@@ -284,15 +301,15 @@ export function newJWT(accessKey, secretKey, endpoint, config, flags) {
 		return;
 	}
 
-	var now = Math.round(new Date().getTime() / 1000);
+	var now = Math.round(Date.now() / 1000);
 	var sClaim = JSON.stringify({
-		exp: now + (7 * 24 * 60 * 60),
+		exp: now + 7 * 24 * 60 * 60,
 		iat: now,
 		nbf: now - 5, // allow for 5 seconds time difference in clocks
 		appid: accessKey
 	});
 	var selectedApp = config.get('selectedApp');
-	if (selectedApp && selectedApp.secretKey) {
+	if (selectedApp?.secretKey) {
 		selectedApp.accessKey = accessKey;
 		selectedApp.secretKey = secretKey;
 		config.set('selectedApp', selectedApp);
@@ -302,141 +319,176 @@ export function newJWT(accessKey, secretKey, endpoint, config, flags) {
 	}
 	config.set('endpoint', endpoint || config.get('endpoint'));
 	config.set('jwt', sign(sClaim, secretKey, { algorithm: 'HS256' }));
-	if (flags && flags.print) {
+	if (flags?.print) {
 		console.log(yellow(config.get('jwt')));
 	} else {
 		console.log(green('✔'), 'New JWT generated and saved in', yellow(config.path));
 	}
 }
 
-export function newApp(pc, input, flags) {
+export function newApp(input, config, flags = {}) {
 	if (!input[1]) {
 		fail('App name not specified.');
 		return;
 	}
 
+	const pc = getClient(config, flags);
 	var appid = input[1];
-	var req = pc.invokeGet('_setup/' + appid, { name: (flags.name || appid), shared: (flags.shared || false) });
-	pc.getEntity(req).then(function (resp) {
-		if (resp && resp.secretKey) {
-			console.log(green('✔'), 'App created:');
-			console.log(JSON.stringify(resp, null, 2));
-		} else {
-			console.log(green('✔'), yellow('App "' + appid + '" already exists.'));
-		}
-	}).catch(function (err) {
-		fail('Failed to create app:', err);
-	});
+	var req = pc.invokeGet(`_setup/${appid}`, { name: flags.name || appid, shared: flags.shared || false });
+	pc.getEntity(req)
+		.then((resp) => {
+			if (resp?.secretKey) {
+				console.log(green('✔'), 'App created:');
+				console.log(JSON.stringify(resp, null, 2));
+			} else {
+				console.log(green('✔'), yellow(`App "${appid}" already exists.`));
+			}
+		})
+		.catch((err) => {
+			fail('Failed to create app:', err);
+		});
 }
 
-export function deleteApp(pc, input, flags) {
-	if (!input[1]) {
+export async function deleteApp(inputArgs, config, flags = {}) {
+	if (!inputArgs[1]) {
 		fail('App id not specified.');
 		return;
 	}
-	var appid = input[1];
+	const pc = getClient(config, flags);
+	var appid = inputArgs[1];
 	if (appid.indexOf('app:') < 0) {
-		appid = 'app:' + appid;
+		appid = `app:${appid}`;
 	}
-	var rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
-	});
-	rl.question(red.bold('Are you sure you want to delete ' + appid +
-			'? ALL DATA FOR THAT APP WILL BE LOST! ') + 'yes/No ', function (confirm) {
-		if (confirm === "yes") {
-			pc.invokeDelete('apps/' + appid, {}).then(function (resp) {
-				if (resp && resp.ok) {
-					console.log(green('✔'), 'App ' + red.bold(appid) + ' was deleted!');
-				} else {
-					console.log(green('✔'), yellow('App "' + appid + '" could not be deleted.'));
-				}
-			}).catch(function (err) {
-				fail('Failed to delete app:', err);
-			});
+
+	try {
+		const confirm = await input({
+			message: `${red.bold(`Are you sure you want to delete ${appid}? ALL DATA FOR THAT APP WILL BE LOST! `)}yes/No`
+		});
+
+		if (confirm === 'yes') {
+			pc.invokeDelete(`apps/${appid}`, {})
+				.then((resp) => {
+					if (resp?.ok) {
+						console.log(green('✔'), `App ${red.bold(appid)} was deleted!`);
+					} else {
+						console.log(green('✔'), yellow(`App "${appid}" could not be deleted.`));
+					}
+				})
+				.catch((err) => {
+					fail('Failed to delete app:', err);
+				});
 		}
-		rl.close();
-	});
+	} catch (error) {
+		if (error.name === 'ExitPromptError') {
+			console.log('\nDelete cancelled.');
+		} else {
+			throw error;
+		}
+	}
 }
 
-export function ping(pc, config) {
-	pc.me().then(function (mee) {
-		pc.getServerVersion().then(function (ver) {
-			console.log(green('✔'), 'Connected to Para server ' + cyan.bold('v' + ver),
-				'on ' + cyan(pc.endpoint) + '. Authenticated as:',
-				cyan(mee.type + ' ' + mee.name + ' (' + mee.id + ')'));
-		}).catch(function () {
+export function ping(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.me()
+		.then((mee) => {
+			pc.getServerVersion()
+				.then((ver) => {
+					console.log(
+						green('✔'),
+						`Connected to Para server ${cyan.bold(`v${ver}`)}`,
+						`on ${cyan(pc.endpoint)}. Authenticated as:`,
+						cyan(`${mee.type} ${mee.name} (${mee.id})`)
+					);
+				})
+				.catch(() => {
+					fail('Connection failed. Run "para-cli setup" or check the configuration file', yellow(config.path));
+					process.exit(1);
+				});
+		})
+		.catch(() => {
 			fail('Connection failed. Run "para-cli setup" or check the configuration file', yellow(config.path));
 			process.exit(1);
 		});
-	}).catch(function () {
-		fail('Connection failed. Run "para-cli setup" or check the configuration file', yellow(config.path));
-		process.exit(1);
-	});
 }
 
-export function me(pc, config) {
-	pc.me().then(function (mee) {
-		console.log(JSON.stringify(mee, null, 2));
-	}).catch(function () {
-		fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
-	});
+export function me(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.me()
+		.then((mee) => {
+			console.log(JSON.stringify(mee, null, 2));
+		})
+		.catch(() => {
+			fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
+		});
 }
 
-export function types(pc, config) {
-	const types = pc.getEntity(pc.invokeGet("_types")).then(function (data) {
-		console.log(JSON.stringify(data, null, 2));
-	}).catch(function () {
-		fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
-	});
+export function types(config, flags = {}) {
+	const pc = getClient(config, flags);
+	const _types = pc
+		.getEntity(pc.invokeGet('_types'))
+		.then((data) => {
+			console.log(JSON.stringify(data, null, 2));
+		})
+		.catch(() => {
+			fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
+		});
 }
 
-export function exportData(pc, config) {
-	pc.invokeGet('/_export').then(function (data) {
-		try {
-			var filename = (data.headers['content-disposition'] || 'export.zip');
-			var filesize = Math.round(((data.headers['content-length'] || 0) / 1000000) * 100) / 100;
-			filename = filename.substring(filename.lastIndexOf('=') + 1);
-			writeFileSync(filename, data.body);
-			console.log(green('✔'), yellow('Exported ' + filesize + 'MB of data to file ' + filename));
-		} catch (e) {
-			console.error(e);
-		}
-	}).catch(function () {
-		fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
-	});
+export function exportData(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.invokeGet('/_export')
+		.then((data) => {
+			try {
+				var filename = data.headers['content-disposition'] || 'export.zip';
+				var filesize = Math.round(((data.headers['content-length'] || 0) / 1000000) * 100) / 100;
+				filename = filename.substring(filename.lastIndexOf('=') + 1);
+				writeFileSync(filename, data.body);
+				console.log(green('✔'), yellow(`Exported ${filesize}MB of data to file ${filename}`));
+			} catch (e) {
+				console.error(e);
+			}
+		})
+		.catch(() => {
+			fail('Connection failed. Server might be down. Check the configuration file', yellow(config.path));
+		});
 }
 
-export function importData(pc, input, config) {
+export function importData(input, config, flags = {}) {
 	if (!input[1]) {
 		fail('No file to import.');
 		return;
 	}
+	const pc = getClient(config, flags);
 	if (!config.get('jwt')) {
 		newJWT(config.get('accessKey'), config.get('secretKey'), config.get('endpoint'), config);
 	}
 	var headers = {
 		'User-Agent': 'Para CLI tool',
 		'Content-Type': 'application/zip',
-		'Authorization': 'Bearer ' + config.get('jwt')
+		Authorization: `Bearer ${config.get('jwt')}`
 	};
 	try {
-		apiClient.put(pc.endpoint + '/v1/_import').set(headers).send(readFileSync(resolve(input[1]))).then(function(res) {
-			console.log(green('✔'), yellow('Imported ' + res.body.count + ' object into app "' + res.body.appid) + '"');
-		}).catch(function (e) {
-			fail('Import request failed. ' + e);
-		});
+		apiClient
+			.put(`${pc.endpoint}/v1/_import`)
+			.set(headers)
+			.send(readFileSync(resolve(input[1])))
+			.then((res) => {
+				console.log(green('✔'), `${yellow(`Imported ${res.body.count} object into app "${res.body.appid}`)}"`);
+			})
+			.catch((e) => {
+				fail(`Import request failed. ${e}`);
+			});
 	} catch (e) {
-		fail('Import request failed: ' + e);
+		fail(`Import request failed: ${e}`);
 	}
 }
 
 function promiseWhile(results, fn) {
-	return new Promise(function (resolve, _reject) {
+	return new Promise((resolve, _reject) => {
 		function loop() {
-			return Promise.resolve(fn()).then(function (result) {
+			return Promise.resolve(fn()).then((result) => {
 				if (result && result.length > 0) {
-					result.forEach(function (res) {
+					result.forEach((res) => {
 						results.push(res);
 					});
 					return loop();
@@ -448,7 +500,8 @@ function promiseWhile(results, fn) {
 	});
 }
 
-export function search(pc, input, flags) {
+export function search(input, config, flags = {}) {
+	const pc = getClient(config, flags);
 	var p = new Pager(flags.page, flags.sort, flags.desc, flags.limit);
 	if (flags.lastKey) {
 		p.lastKey = flags.lastKey;
@@ -459,97 +512,118 @@ export function search(pc, input, flags) {
 		p.sortby = '_docid';
 		p.page = 1;
 
-		promiseWhile(results, function () {
-			return pc.findQuery(getType(flags.type), String(input[1]) || '', p);
-		}).then(function () {
-			console.log(JSON.stringify(results, null, 2));
-		}).catch(function (err) {
-			fail('Search failed.', err);
-		});
+		promiseWhile(results, () => pc.findQuery(getType(flags.type), String(input[1]) || '', p))
+			.then(() => {
+				console.log(JSON.stringify(results, null, 2));
+			})
+			.catch((err) => {
+				fail('Search failed.', err);
+			});
 	} else {
-		pc.findQuery(getType(flags.type), String(input[1]) || '', p).then(function (resp) {
-			console.log(JSON.stringify(resp, null, 2));
-		}).catch(function (err) {
-			fail('Search failed.', err);
-		});
+		pc.findQuery(getType(flags.type), String(input[1]) || '', p)
+			.then((resp) => {
+				console.log(JSON.stringify(resp, null, 2));
+			})
+			.catch((err) => {
+				fail('Search failed.', err);
+			});
 	}
 }
 
-export function appSettings(pc, config) {
-	pc.appSettings().then(function (settings) {
-		console.log(JSON.stringify(settings, null, 2));
-	}).catch(function () {
-		fail('Connection failed. Check the configuration file', yellow(config.path));
-	});
+export function appSettings(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.appSettings()
+		.then((settings) => {
+			console.log(JSON.stringify(settings, null, 2));
+		})
+		.catch(() => {
+			fail('Connection failed. Check the configuration file', yellow(config.path));
+		});
 }
 
-export function rebuildIndex(pc, config, flags) {
-	pc.rebuildIndex(flags.destinationIndex).then(function (response) {
-		console.log(JSON.stringify(response, null, 2));
-	}).catch(function (err) {
-		fail('Reindex failed.', err);
-	});
+export function rebuildIndex(config, flags = {}) {
+	const pc = getClient(config, flags);
+	pc.rebuildIndex(flags.destinationIndex)
+		.then((response) => {
+			console.log(JSON.stringify(response, null, 2));
+		})
+		.catch((err) => {
+			fail('Reindex failed.', err);
+		});
 }
 
 export function listApps(config, flags, parentAccessKey, failureCallback) {
+	var pc = getClient(config, flags);
 	var selectedEndpoint = getSelectedEndpoint(config, flags);
-	var accessKey = selectedEndpoint.accessKey;
-	var secretKey = selectedEndpoint.secretKey;
-	var endpoint = selectedEndpoint.endpoint;
-	var pc = new ParaClient(accessKey, secretKey, parseEndpoint(endpoint));
 	var p = new Pager();
 	var results = [];
 	p.sortby = '_docid';
 	p.page = 1;
-	promiseWhile(results, function () {
-		return pc.findQuery('app', '*', p);
-	}).then(function () {
-		var apps = results.map(function (app) {return app.appIdentifier.trim();});
-		if (apps.length) {
-			console.log('Found', p.count, 'apps on ' + cyan(endpoint) + ':\n', yellow('[') + green(apps.join(yellow('] ['))) + yellow(']'));
-			console.log('\nTyping', cyan('para-cli select'), green(apps[0]), 'will switch to that app. \nCurrent app:',
-				green(parentAccessKey));
-			process.exit(0);
-		} else {
+	promiseWhile(results, () => pc.findQuery('app', '*', p))
+		.then(() => {
+			var apps = results.map((app) => app.appIdentifier.trim());
+			if (apps.length) {
+				console.log(
+					'Found',
+					p.count,
+					`apps on ${cyan(selectedEndpoint.endpoint)}:\n`,
+					yellow('[') + green(apps.join(yellow('] ['))) + yellow(']')
+				);
+				console.log(
+					'\nTyping',
+					cyan('para-cli select'),
+					green(apps[0]),
+					'will switch to that app. \nCurrent app:',
+					green(parentAccessKey)
+				);
+				process.exit(0);
+			} else {
+				failureCallback();
+			}
+		})
+		.catch((_err) => {
 			failureCallback();
-		}
-	}).catch(function (err) {
-		failureCallback();
-	});
+		});
 }
 
 export function selectApp(input, config, flags) {
 	var selectedEndpoint = getSelectedEndpoint(config, flags);
 	var accessKey = selectedEndpoint.accessKey;
 	var secretKey = selectedEndpoint.secretKey;
-	var endpoint = selectedEndpoint.endpoint;
 	if (accessKey === 'app:para' && secretKey) {
-		var selectedApp = 'app:' + (input[1] || 'para').trim();
+		var selectedApp = `app:${(input[1] || 'para').trim()}`;
 		if (selectedApp === 'app:para') {
-			config.delete('selectedApp');
+			config.set('selectedApp', selectedEndpoint);
 			console.log(green('✔'), 'Selected', green(selectedApp), 'as the current app.');
 			return;
 		}
-		var now = Math.round(new Date().getTime() / 1000);
-		var jwt = sign(JSON.stringify({
-			iat: now,
-			exp: now + 10,
-			nbf: now - 5, // allow for 5 seconds time difference in clocks
-			appid: accessKey,
-			getCredentials: selectedApp
-		}), secretKey, { algorithm: 'HS256' });
-		var paraClient = new ParaClient(accessKey, secretKey, parseEndpoint(endpoint));
+		var now = Math.round(Date.now() / 1000);
+		var jwt = sign(
+			JSON.stringify({
+				iat: now,
+				exp: now + 10,
+				nbf: now - 5, // allow for 5 seconds time difference in clocks
+				appid: accessKey,
+				getCredentials: selectedApp
+			}),
+			secretKey,
+			{ algorithm: 'HS256' }
+		);
+		var paraClient = getClient(config, flags);
 		paraClient.setAccessToken(jwt);
-		paraClient.me(jwt).then(function (data) {
-			if (data && data.credentials) {
-				config.set('selectedApp', data.credentials);
-				console.log(green('✔'), 'Selected', green(selectedApp), 'as the current app.');
-			} else {
-				fail('That did not work -' + red(input[1]) + ' try updating Para to the latest version.');
-			}
-		}).catch(function (err) {
-			fail('App ' + red(input[1]) + ' not found!');
-		});
+		paraClient
+			.me(jwt)
+			.then((data) => {
+				if (data?.credentials) {
+					config.set('selectedApp', data.credentials);
+					console.log(green('✔'), 'Selected', green(selectedApp), 'as the current app.');
+				} else {
+					fail(`That did not work -${red(input[1])} try updating Para to the latest version.`);
+				}
+			})
+			.catch((_err) => {
+				fail(`App ${red(input[1])} not found!`);
+			});
 	} else {
 		fail('This command only works when Para CLI is configured to use the keys for the root app.');
 	}
@@ -560,7 +634,7 @@ export function listEndpoints(config, flags, failureCallback) {
 	var secretKey = flags.secretKey || process.env.PARA_SECRET_KEY || config.get('secretKey');
 	var endpoint = flags.endpoint || process.env.PARA_ENDPOINT || config.get('endpoint');
 	var endpoints = config.get('endpoints') || [];
-	var list = [{endpoint: endpoint, accessKey: accessKey, secretKey: secretKey}].concat(endpoints);
+	var list = [{ endpoint: endpoint, accessKey: accessKey, secretKey: secretKey }].concat(endpoints);
 	if (list.length === 0) {
 		failureCallback();
 		return [];
@@ -569,55 +643,65 @@ export function listEndpoints(config, flags, failureCallback) {
 		var ep = list[i];
 		var selected = (config.get('selectedEndpoint') || 0) === i;
 		var rootAppConfigured = ep.accessKey === 'app:para' && ep.secretKey.length > 10;
-		console.log(yellow((selected ? ' ➤' : '  '), (i + 1) + '. ') + cyan(ep.endpoint), rootAppConfigured ?
-			green('✔ root app configured') : red('root app not configured'));
+		console.log(
+			yellow(selected ? ' ➤' : '  ', `${i + 1}. `) + cyan(ep.endpoint),
+			rootAppConfigured ? green('✔ root app configured') : red('root app not configured')
+		);
 	}
 	return list;
 }
 
-export function addEndpoint(config) {
-	var endpoints = config.get('endpoints') || [];
-	var rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
-	});
-	rl.question(cyan.bold('Para Endpoint: '), function (endpoint) {
+export async function addEndpoint(config) {
+	try {
+		const endpoint = await input({
+			message: 'Para Endpoint:'
+		});
+
 		if (!isValidUrl(endpoint)) {
 			fail('Endpoint must be a valid URL.');
-			rl.close();
 			return;
 		}
-		rl.question(cyan.bold('Para Secret Key (for root app app:para): '), function (secretKey) {
-			var pc = new ParaClient("app:para", secretKey, parseEndpoint(endpoint));
-			var endpoints = config.get('endpoints') || [];
-			var existing = false;
-			for (var i = 0; i < endpoints.length; i++) {
-				var ep = endpoints[i];
-				if (ep.endpoint === endpoint) {
-					ep.secretKey = secretKey;
-					existing = true;
-				}
-			}
-			if (!existing) {
-				endpoints.push({accessKey: 'app:para', secretKey: secretKey, endpoint: endpoint});
-			}
-			config.set('endpoints', endpoints);
-			ping(pc, config);
-			rl.close();
+
+		const secretKey = await password({
+			message: 'Para Secret Key (for root app app:para):',
+			mask: '*'
 		});
-	});
+
+		var endpoints = config.get('endpoints') || [];
+		var existing = false;
+		for (var i = 0; i < endpoints.length; i++) {
+			var ep = endpoints[i];
+			if (ep.endpoint === endpoint) {
+				ep.secretKey = secretKey;
+				existing = true;
+			}
+		}
+		if (!existing) {
+			endpoints.push({ accessKey: 'app:para', secretKey: secretKey, endpoint: endpoint });
+		}
+		config.set('endpoints', endpoints);
+		ping(config);
+	} catch (error) {
+		if (error.name === 'ExitPromptError') {
+			console.log('\nAdd endpoint cancelled.');
+		} else {
+			throw error;
+		}
+	}
 }
 
-export function removeEndpoint(config, flags) {
-	var list = listEndpoints(config, flags, function () {console.log('No endpoints found.');});
-	var rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
+export async function removeEndpoint(config, flags) {
+	var list = listEndpoints(config, flags, () => {
+		console.log('No endpoints found.');
 	});
 
-	rl.question(yellow.bold('Type the number of the Para endpoint to remove: '), function (index) {
+	try {
+		const index = await input({
+			message: 'Type the number of the Para endpoint to remove:'
+		});
+
 		var selectedEndpoint = 0;
-		if (!isNaN(index) && index <= list.length && index >= 1) {
+		if (!Number.isNaN(index) && index <= list.length && index >= 1) {
 			selectedEndpoint = index - 1;
 		}
 		var url = list[selectedEndpoint].endpoint;
@@ -634,38 +718,51 @@ export function removeEndpoint(config, flags) {
 			list.shift();
 			config.set('endpoints', list);
 		}
-		console.log("Removed endpoint: " + cyan(url));
-		rl.close();
-	});
+		console.log(`Removed endpoint: ${cyan(url)}`);
+	} catch (error) {
+		if (error.name === 'ExitPromptError') {
+			console.log('\nRemove endpoint cancelled.');
+		} else {
+			throw error;
+		}
+	}
 }
 
-export function selectEndpoint(config, flags) {
-	var list = listEndpoints(config, flags, function () {console.log('No endpoints found.');});
-	var rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
+export async function selectEndpoint(config, flags) {
+	var list = listEndpoints(config, flags, () => {
+		console.log('No endpoints found.');
 	});
-	rl.question(yellow.bold('Type the number of the Para endpoint to select: '), function (index) {
+
+	try {
+		const index = await input({
+			message: 'Type the number of the Para endpoint to select:'
+		});
+
 		var selectedEndpoint = 0;
-		if (!isNaN(index) && index <= list.length && index >= 1) {
+		if (!Number.isNaN(index) && index <= list.length && index >= 1) {
 			selectedEndpoint = index - 1;
 		}
 		config.delete('selectedApp');
 		config.set('selectedEndpoint', selectedEndpoint);
-		console.log("Selected endpoint: " + cyan(list[selectedEndpoint].endpoint));
-		rl.close();
-	});
+		console.log(`Selected endpoint: ${cyan(list[selectedEndpoint].endpoint)}`);
+	} catch (error) {
+		if (error.name === 'ExitPromptError') {
+			console.log('\nSelect endpoint cancelled.');
+		} else {
+			throw error;
+		}
+	}
 }
 
 export function parseEndpoint(endpoint) {
 	try {
 		var url = new URL(endpoint);
 		if (url.pathname !== '/') {
-			var x = { endpoint: url.protocol + '//' + url.host, apiPath: url.pathname.replace(/\/*$/, '') + '/v1/' };
+			var x = { endpoint: `${url.protocol}//${url.host}`, apiPath: `${url.pathname.replace(/\/*$/, '')}/v1/` };
 			return x;
 		}
 	} catch (e) {
-		fail('Invalid Para endpoint: ' + endpoint, e);
+		fail(`Invalid Para endpoint: ${endpoint}`, e);
 	}
 	return { endpoint: endpoint };
 }
@@ -674,15 +771,26 @@ function getSelectedEndpoint(config, flags) {
 	var accessKey = flags.accessKey || process.env.PARA_ACCESS_KEY || config.get('accessKey');
 	var secretKey = flags.secretKey || process.env.PARA_SECRET_KEY || config.get('secretKey');
 	var endpoint = flags.endpoint || process.env.PARA_ENDPOINT || config.get('endpoint');
-	var endpoints = [{endpoint: endpoint, accessKey: accessKey, secretKey: secretKey}].concat(config.get('endpoints') || []);
+	var endpoints = [{ endpoint: endpoint, accessKey: accessKey, secretKey: secretKey }].concat(
+		config.get('endpoints') || []
+	);
 	try {
 		return endpoints[config.get('selectedEndpoint') || 0];
-	} catch (e) {
+	} catch (_e) {
 		config.delete('selectedEndpoint');
 		return endpoints[0];
 	}
 }
 
+function getClient(config, flags = {}) {
+	var selectedEndpoint = getSelectedEndpoint(config, flags);
+	return new ParaClient(
+		selectedEndpoint.accessKey,
+		selectedEndpoint.secretKey,
+		parseEndpoint(selectedEndpoint.endpoint)
+	);
+}
+
 function sendFileChunk(chunkId, textEncoded, json, id, flags, start, end, pc, decoder) {
 	if (start > 0 && textEncoded[start] !== 32) {
 		for (var i = 0; i < 100 && start - i >= 0; i++) {
@@ -712,23 +820,41 @@ function sendFileChunk(chunkId, textEncoded, json, id, flags, start, end, pc, de
 
 	var chunk = textEncoded.slice(start, end);
 	var text = decoder.decode(chunk);
-	var obj = getParaObject(Object.assign({}, json, { text: text }), id + '_chunk' + chunkId, flags);
+	var obj = getParaObject(Object.assign({}, json, { text: text }), `${id}_chunk${chunkId}`, flags);
 	if (text && text.trim().length > 0) {
 		obj.chunkid = chunkId;
-		pc.create(obj).then(function () {
-			console.log(green('✔'), 'Created object chunk', yellow(chunkId), 'with size',
-				Math.round(chunk.length / 1024), 'KB.');
-			if (end < textEncoded.length) {
-				sendFileChunk(++chunkId, textEncoded, json, id, flags, start + MAX_FILE_SIZE, end + MAX_FILE_SIZE, pc, decoder);
-			}
-		}).catch(function (err) {
-			fail('Failed to create chunk:', err);
-		});
+		pc.create(obj)
+			.then(() => {
+				console.log(
+					green('✔'),
+					'Created object chunk',
+					yellow(chunkId),
+					'with size',
+					Math.round(chunk.length / 1024),
+					'KB.'
+				);
+				if (end < textEncoded.length) {
+					sendFileChunk(
+						++chunkId,
+						textEncoded,
+						json,
+						id,
+						flags,
+						start + MAX_FILE_SIZE,
+						end + MAX_FILE_SIZE,
+						pc,
+						decoder
+					);
+				}
+			})
+			.catch((err) => {
+				fail('Failed to create chunk:', err);
+			});
 	}
 }
 
 function addObjectsToBatch(list, json, id, flags) {
-	var objects = (json instanceof Array) ? json : [json];
+	var objects = Array.isArray(json) ? json : [json];
 	for (var i = 0; i < objects.length; i++) {
 		list.push(getParaObject(objects[i], id, flags));
 	}
@@ -738,7 +864,7 @@ function addObjectsToBatch(list, json, id, flags) {
 
 function getParaObject(json, id, flags) {
 	var pobj = new ParaObject();
-	if (flags && flags.type) {
+	if (flags?.type) {
 		pobj.setType(getType(flags.type));
 	}
 
@@ -768,29 +894,32 @@ function parseHTML(file) {
 	var text = '';
 	var inScript = false;
 	var inAnchor = false;
-	var parser = new Parser({
-		onopentag: function (tag, attribs) {
-			if (tag === 'meta' && attribs.property === 'og:title') {
-				title = attribs.content;
-			}
+	var parser = new Parser(
+		{
+			onopentag: (tag, attribs) => {
+				if (tag === 'meta' && attribs.property === 'og:title') {
+					title = attribs.content;
+				}
 
-			if (tag === 'meta' && attribs.property === 'og:url') {
-				url = attribs.content;
-			}
+				if (tag === 'meta' && attribs.property === 'og:url') {
+					url = attribs.content;
+				}
 
-			inScript = tag === 'script';
-			inAnchor = (tag === 'a' && attribs.href && !attribs.href.match(/^http/i));
-		},
-		ontext: function (txt) {
-			if (!inScript && !inAnchor) {
-				text += ' ' + txt;
+				inScript = tag === 'script';
+				inAnchor = tag === 'a' && attribs.href && !attribs.href.match(/^http/i);
+			},
+			ontext: (txt) => {
+				if (!inScript && !inAnchor) {
+					text += ` ${txt}`;
+				}
+			},
+			onclosetag: () => {
+				inScript = false;
+				inAnchor = false;
 			}
 		},
-		onclosetag: function () {
-			inScript = false;
-			inAnchor = false;
-		}
-	}, { decodeEntities: true });
+		{ decodeEntities: true }
+	);
 	parser.write(file);
 	parser.end();
 	return {
@@ -804,7 +933,7 @@ function isValidUrl(url) {
 	try {
 		new URL(url);
 		return true;
-	} catch (err) {
+	} catch (_err) {
 		return false;
 	}
 }
@@ -814,8 +943,8 @@ function readFile(filePath) {
 }
 
 function fail(msg, err) {
-	var errMsg = err && err.response && err.response.body && err.response.body.message ? err.response.body.message : err || '';
-	var code = err && err.response && err.response.status ? '(' + err.response.status + ' ' + err.response.res.statusMessage + ')' : '';
+	var errMsg = err?.response?.body?.message ? err.response.body.message : err || '';
+	var code = err?.response?.status ? `(${err.response.status} ${err.response.res.statusMessage})` : '';
 	console.error(red('✖'), msg || 'Forgive me, I have failed you!', red(errMsg), red(code));
 	process.exitCode = 1;
 }