neonctl 0.0.8 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neonctl",
-    "version": "0.0.8",
+    "version": "0.2.1",
     "description": "CLI tool for NeonDB Cloud management",
     "main": "index.js",
     "author": "NeonDB",
@@ -24,6 +24,10 @@
         "openid-client": "^5.1.9",
         "yargs": "^17.5.1"
     },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org/"
+    },
     "scripts": {
         "dev": "node dev.js",
         "debug": "node --inspect-brk dev.js",

package/src/api/gateway.js

@@ -1,9 +1,49 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiCall = void 0;
-const https_1 = require("https");
+exports.apiCall = exports.ApiError = void 0;
+const node_https_1 = require("node:https");
+class ApiError extends Error {
+    constructor(response) {
+        super(response.statusMessage);
+        this.response = response;
+    }
+    getApiError() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const data = [];
+                this.response
+                    .on('data', (chunk) => {
+                    data.push(chunk);
+                })
+                    .on('end', () => {
+                    try {
+                        const json = JSON.parse(data.join(''));
+                        resolve((json === null || json === void 0 ? void 0 : json.message) ||
+                            `${this.response.statusCode}:${this.message}:${data.join('')}`);
+                    }
+                    catch (e) {
+                        reject(e);
+                    }
+                })
+                    .on('error', (e) => {
+                    reject(e);
+                });
+            });
+        });
+    }
+}
+exports.ApiError = ApiError;
 const apiCall = ({ apiHost, token, path, body, method = 'GET', }) => new Promise((resolve, reject) => {
-    const req = (0, https_1.request)(`${apiHost}/api/v1/${path}`, {
+    const req = (0, node_https_1.request)(`${apiHost}/api/v1/${path}`, {
         headers: {
             Authorization: `Bearer ${token}`,
             Accept: 'application/json',
@@ -11,8 +51,8 @@ const apiCall = ({ apiHost, token, path, body, method = 'GET', }) => new Promise
         },
         method,
     }, (res) => {
-        if (res.statusCode !== 200) {
-            reject(new Error(`${res.statusCode}: ${res.statusMessage}`));
+        if (!res.statusCode || res.statusCode >= 400) {
+            reject(new ApiError(res));
             return;
         }
         let result = '';

package/src/api/projects.js

@@ -1,23 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = exports.listProjects = void 0;
 const gateway_1 = require("./gateway");
-const listProjects = (props) => __awaiter(void 0, void 0, void 0, function* () { return (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { path: 'projects', method: 'GET' })); });
+const listProjects = (props) => (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { path: 'projects', method: 'GET' }));
 exports.listProjects = listProjects;
-const createProject = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { body: {
-            instance_handle: props.instanceHandle,
-            platform_id: props.platformId,
-            region_id: props.regionId,
-        }, path: 'projects', method: 'POST' }));
-});
+const createProject = (props) => (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { body: {
+        project: {
+            settings: props.settings,
+        },
+    }, path: 'projects', method: 'POST' }));
 exports.createProject = createProject;

package/src/api/users.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiMe = void 0;
+const gateway_1 = require("./gateway");
+const apiMe = (props) => (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { path: 'users/me', method: 'GET' }));
+exports.apiMe = apiMe;

package/src/auth.js

@@ -19,24 +19,30 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const open_1 = __importDefault(require("open"));
 const log_1 = require("./log");
-// what port to listen on for incoming requests
-const CONFIG_LISTEN_PORT = 5555;
 // oauth server timeouts
 const SERVER_TIMEOUT = 10000;
 // where to wait for incoming redirect request from oauth server to arrive
-const REDIRECT_URI = 'http://127.0.0.1:5555/callback';
+const REDIRECT_URI = (port) => `http://127.0.0.1:${port}/callback`;
 // These scopes cannot be cancelled, they are always needed.
-const DEFAULT_SCOPES = ['openid', 'offline'];
+const DEFAULT_SCOPES = ['openid', 'offline', 'urn:neoncloud:projects:create'];
 const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, function* () {
     openid_client_1.custom.setHttpOptionsDefaults({
         timeout: SERVER_TIMEOUT,
     });
     log_1.log.info('Discovering oauth server');
     const issuer = yield openid_client_1.Issuer.discover(oauthHost);
+    //
+    // Start HTTP server and wait till /callback is hit
+    //
+    const server = (0, node_http_1.createServer)();
+    server.listen(0, function () {
+        log_1.log.info(`Listening on port ${this.address().port}`);
+    });
+    const listen_port = server.address().port;
     const neonOAuthClient = new issuer.Client({
         token_endpoint_auth_method: 'none',
         client_id: clientId,
-        redirect_uris: [REDIRECT_URI],
+        redirect_uris: [REDIRECT_URI(listen_port)],
         response_types: ['code'],
     });
     // https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.1.8
@@ -45,10 +51,7 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
     const codeVerifier = openid_client_1.generators.codeVerifier();
     const codeChallenge = openid_client_1.generators.codeChallenge(codeVerifier);
     return new Promise((resolve) => {
-        //
-        // Start HTTP server and wait till /callback is hit
-        //
-        const server = (0, node_http_1.createServer)((request, response) => __awaiter(void 0, void 0, void 0, function* () {
+        server.on('request', (request, response) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             //
             // Wait for callback and follow oauth flow.
@@ -60,7 +63,7 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
             }
             log_1.log.info(`Callback received: ${request.url}`);
             const params = neonOAuthClient.callbackParams(request);
-            const tokenSet = yield neonOAuthClient.callback(REDIRECT_URI, params, {
+            const tokenSet = yield neonOAuthClient.callback(REDIRECT_URI(listen_port), params, {
                 code_verifier: codeVerifier,
                 state,
             });
@@ -69,9 +72,6 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
             resolve(tokenSet);
             server.close();
         }));
-        server.listen(CONFIG_LISTEN_PORT, () => {
-            log_1.log.info(`Listening on port ${CONFIG_LISTEN_PORT}`);
-        });
         //
         // Open browser to let user authenticate
         //

package/src/commands/auth.js

@@ -32,11 +32,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureAuth = exports.validateAuth = exports.authFlow = void 0;
+exports.ensureAuth = exports.authFlow = void 0;
 const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const auth_1 = require("../auth");
-const projects_1 = require("../api/projects");
 const log_1 = require("../log");
 const CREDENTIALS_FILE = 'credentials.json';
 const authFlow = ({ configDir, oauthHost, clientId, }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -54,32 +53,22 @@ const authFlow = ({ configDir, oauthHost, clientId, }) => __awaiter(void 0, void
     return tokenSet.access_token || '';
 });
 exports.authFlow = authFlow;
-const validateAuth = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        yield (0, projects_1.listProjects)(props);
-    }
-    catch (e) {
-        if (e.message.startsWith('401:')) {
-            return false;
-        }
-        throw e;
-    }
-    return true;
-});
-exports.validateAuth = validateAuth;
 const ensureAuth = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    if (props._[0] === 'auth') {
+        return;
+    }
     const credentialsPath = (0, node_path_1.join)(props.configDir, CREDENTIALS_FILE);
     if ((0, node_fs_1.existsSync)(credentialsPath)) {
-        const token = (yield Promise.resolve().then(() => __importStar(require(credentialsPath)))).access_token;
-        if (yield (0, exports.validateAuth)(Object.assign(Object.assign({}, props), { token }))) {
+        try {
+            const token = (yield Promise.resolve().then(() => __importStar(require(credentialsPath)))).access_token;
             props.token = token;
         }
-        else {
-            props.token = yield (0, exports.authFlow)(props);
+        catch (e) {
+            throw new Error('Invalid credentials, please re-authenticate');
         }
     }
     else {
-        props.token = yield (0, exports.authFlow)(props);
+        throw new Error('No credentials found, please authenticate');
     }
 });
 exports.ensureAuth = ensureAuth;

package/src/commands/projects.js

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = exports.list = void 0;
 const projects_1 = require("../api/projects");
-exports.default = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    if (props.sub === 'list' || props.sub === undefined) {
-        process.stdout.write(yield (0, projects_1.listProjects)(props));
-    }
-    else if (props.sub === 'create') {
-        process.stdout.write(yield (0, projects_1.createProject)(Object.assign(Object.assign({}, props), { instanceHandle: 'scalable', platformId: 'serverless', regionId: 'us-west-2' })));
-    }
+const list = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    process.stdout.write(yield (0, projects_1.listProjects)(props));
 });
+exports.list = list;
+const create = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    process.stdout.write(yield (0, projects_1.createProject)(Object.assign(Object.assign({}, props), { settings: {} })));
+});
+exports.create = create;

package/src/commands/users.js

@@ -0,0 +1,17 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.me = void 0;
+const users_1 = require("../api/users");
+const me = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    process.stdout.write(yield (0, users_1.apiMe)(props));
+});
+exports.me = me;

package/src/index.js

@@ -37,23 +37,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const yargs = __importStar(require("yargs"));
 const package_json_1 = __importDefault(require("../package.json"));
+const gateway_1 = require("./api/gateway");
 const auth_1 = require("./commands/auth");
 const config_1 = require("./config");
+const log_1 = require("./log");
+const wrapWithHelp = (yargs) => __awaiter(void 0, void 0, void 0, function* () {
+    const { _ } = yield yargs.argv;
+    if (_.length === 1) {
+        yargs.showHelp();
+    }
+    return yargs;
+});
 const builder = yargs
     .scriptName(package_json_1.default.name)
-    .usage('$0 <cmd> [args]')
+    .usage('usage: $0 <cmd> [args]')
     .help()
     .option('apiHost', {
     describe: 'The API host',
     default: 'https://console.neon.tech',
-})
-    .option('oauthHost', {
-    description: 'URL to Neon OAUTH host',
-    default: 'https://oauth2.neon.tech',
-})
-    .option('clientId', {
-    description: 'OAuth client id',
-    type: 'string',
 })
     // Setup config directory
     .option('configDir', {
@@ -63,7 +64,16 @@ const builder = yargs
 })
     .middleware(config_1.ensureConfigDir)
     // Auth flow
-    .command('auth', 'Authenticate user', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+    .command('auth', 'Authenticate user', (yargs) => yargs
+    .option('oauthHost', {
+    description: 'URL to Neon OAUTH host',
+    default: 'https://oauth2.neon.tech',
+})
+    .option('clientId', {
+    description: 'OAuth client id',
+    type: 'string',
+    demandOption: true,
+}), (args) => __awaiter(void 0, void 0, void 0, function* () {
     (yield Promise.resolve().then(() => __importStar(require('./commands/auth')))).authFlow(args);
 }))
     // Ensure auth token
@@ -73,13 +83,25 @@ const builder = yargs
     default: '',
 })
     .middleware(auth_1.ensureAuth)
-    .command('projects [sub]', 'Manage projects', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
-    return yargs.positional('sub', {
-        describe: 'Subcommand',
-        choices: ['list', 'create'],
-    });
-}), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).default(args);
+    .command('me', 'Get user info', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (yield Promise.resolve().then(() => __importStar(require('./commands/users')))).me(args);
+}))
+    .command('projects', 'Manage projects', (yargs) => wrapWithHelp(yargs
+    .usage('usage: $0 projects <cmd> [args]')
+    .command('list', 'List projects', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).list(args);
+}))
+    .command('create', 'Create a project', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).create(args);
+}))))
+    .fail((msg, err) => __awaiter(void 0, void 0, void 0, function* () {
+    if (err instanceof gateway_1.ApiError) {
+        log_1.log.error(yield err.getApiError());
+    }
+    else {
+        log_1.log.error(msg || err.message);
+    }
+    process.exit(1);
 }));
 (() => __awaiter(void 0, void 0, void 0, function* () {
     if ((yield builder.argv)._.length === 0) {

package/src/log.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = void 0;
+const node_util_1 = require("node:util");
 exports.log = {
-    info: (message) => {
-        process.stderr.write(`${message}\n`);
+    info: (...args) => {
+        process.stderr.write(`INFO: ${(0, node_util_1.format)(...args)}\n`);
+    },
+    error: (...args) => {
+        process.stderr.write(`ERROR: ${(0, node_util_1.format)(...args)}\n`);
     },
 };

package/src/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });