para-cli 1.20.0 → 1.20.1

package/index.js

@@ -61,7 +61,7 @@ export function setup(config) {
 				var secret = (secretKey || config.get('secretKey')).trim();
 				var endpoint = (endpoint || config.get('endpoint')).trim();
 				newJWT(access, secret, endpoint, config);
-				var pc = new ParaClient(access, secret, { endpoint: endpoint || defaultConfig.endpoint });
+				var pc = new ParaClient(access, secret, parseEndpoint(endpoint || defaultConfig.endpoint));
 				ping(pc, config);
 				if (access === 'app:para') {
 					listApps(config, {}, access, function () {
@@ -462,7 +462,7 @@ export function listApps(config, flags, parentAccessKey, failureCallback) {
 	var accessKey = selectedEndpoint.accessKey;
 	var secretKey = selectedEndpoint.secretKey;
 	var endpoint = selectedEndpoint.endpoint;
-	var pc = new ParaClient(accessKey, secretKey, {endpoint: endpoint});
+	var pc = new ParaClient(accessKey, secretKey, parseEndpoint(endpoint));
 	var p = new Pager();
 	var results = [];
 	p.sortby = '_docid';
@@ -503,7 +503,7 @@ export function selectApp(input, config, flags) {
 			appid: accessKey,
 			getCredentials: selectedApp
 		}), secretKey, { algorithm: 'HS256' });
-		var paraClient = new ParaClient(accessKey, secretKey, { endpoint: endpoint });
+		var paraClient = new ParaClient(accessKey, secretKey, parseEndpoint(endpoint));
 		paraClient.setAccessToken(jwt);
 		paraClient.me(jwt).then(function (data) {
 			if (data && data.credentials) {
@@ -553,7 +553,7 @@ export function addEndpoint(config) {
 			return;
 		}
 		rl.question(cyan.bold('Para Secret Key (for root app app:para): '), function (secretKey) {
-			var pc = new ParaClient("app:para", secretKey, {endpoint: endpoint});
+			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++) {
@@ -622,6 +622,19 @@ export function selectEndpoint(config, flags) {
 	});
 }
 
+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/' };
+			return x;
+		}
+	} catch (e) {
+		fail('Invalid Para endpoint:', endpoint);
+	}
+	return { endpoint: endpoint };
+}
+
 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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "para-cli",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "license": "Apache-2.0",
   "description": "Command-line tool for Para backend servers",
   "homepage": "https://paraio.org",

package/para-cli.js

@@ -28,7 +28,7 @@ import figlet from 'figlet';
 import chalk from 'chalk';
 import meow from 'meow';
 import {
-	defaultConfig, setup, listApps, selectEndpoint, addEndpoint, removeEndpoint, selectApp, createAll, readAll,
+	defaultConfig, setup, listApps, parseEndpoint, selectEndpoint, addEndpoint, removeEndpoint, selectApp, createAll, readAll,
 	updateAll, deleteAll, search, newKeys, newJWT, newApp, deleteApp, ping, me, appSettings, rebuildIndex, exportData, importData
 } from './index.js';
 
@@ -129,7 +129,7 @@ if (!input[0]) {
 	process.exitCode = 1;
 	setup(config);
 } else {
-	var pc = new ParaClient(accessKey, secretKey, { endpoint: endpoint });
+	var pc = new ParaClient(accessKey, secretKey, parseEndpoint(endpoint));
 
 	if (input[0] === 'setup') {
 		setup(config);