neonctl 1.29.3 → 1.29.5

package/auth.js

@@ -5,6 +5,8 @@ import { join } from 'node:path';
 import open from 'open';
 import { log } from './log.js';
 import { fileURLToPath } from 'node:url';
+import { sendError } from './analytics.js';
+import { matchErrorCode } from './errors.js';
 // oauth server timeouts
 const SERVER_TIMEOUT = 10000;
 // where to wait for incoming redirect request from oauth server to arrive
@@ -18,6 +20,7 @@ const NEONCTL_SCOPES = [
     'urn:neoncloud:projects:update',
     'urn:neoncloud:projects:delete',
 ];
+const AUTH_TIMEOUT_SECONDS = 60;
 export const defaultClientID = 'neonctl';
 custom.setHttpOptionsDefaults({
     timeout: SERVER_TIMEOUT,
@@ -38,6 +41,7 @@ export const auth = async ({ oauthHost, clientId }) => {
     //
     // Start HTTP server and wait till /callback is hit
     //
+    log.debug('Starting HTTP Server for callback');
     const server = createServer();
     server.listen(0, '127.0.0.1', function () {
         log.debug(`Listening on port ${this.address().port}`);
@@ -55,7 +59,10 @@ export const auth = async ({ oauthHost, clientId }) => {
     // we store the code_verifier in memory
     const codeVerifier = generators.codeVerifier();
     const codeChallenge = generators.codeChallenge(codeVerifier);
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new Error(`Authentication timed out after ${AUTH_TIMEOUT_SECONDS} seconds`));
+        }, AUTH_TIMEOUT_SECONDS * 1000);
         server.on('request', async (request, response) => {
             //
             // Wait for callback and follow oauth flow.
@@ -83,6 +90,7 @@ export const auth = async ({ oauthHost, clientId }) => {
             });
             response.writeHead(200, { 'Content-Type': 'text/html' });
             createReadStream(join(fileURLToPath(new URL('.', import.meta.url)), './callback.html')).pipe(response);
+            clearTimeout(timer);
             resolve(tokenSet);
             server.close();
         });
@@ -96,6 +104,12 @@ export const auth = async ({ oauthHost, clientId }) => {
             code_challenge: codeChallenge,
             code_challenge_method: 'S256',
         });
-        open(authUrl);
+        log.info('Awaiting authentication in web browser.');
+        log.info(`Auth Url: ${authUrl}`);
+        open(authUrl).catch((err) => {
+            const msg = `Failed to open web browser. Please copy & paste auth url to authenticate in browser.`;
+            sendError(err || new Error(msg), matchErrorCode(msg || err?.message));
+            log.error(msg || err?.message);
+        });
     });
 };

package/commands/auth.test.js

@@ -6,7 +6,7 @@ import { runMockServer } from '../test_utils/mock_server';
 jest.unstable_mockModule('open', () => ({
     __esModule: true,
     default: jest.fn((url) => {
-        axios.get(url);
+        return axios.get(url);
     }),
 }));
 // "open" module should be imported after mocking

package/commands/connection_string.js

@@ -95,20 +95,22 @@ export const handler = async (props) => {
                 .map((r) => r.name)
                 .join(', ')}`);
         }));
+    const { data: { databases: branchDatabases }, } = await props.apiClient.listProjectBranchDatabases(projectId, branchId);
     const database = props.databaseName ||
-        (await props.apiClient
-            .listProjectBranchDatabases(projectId, branchId)
-            .then(({ data }) => {
-            if (data.databases.length === 0) {
+        (() => {
+            if (branchDatabases.length === 0) {
                 throw new Error(`No databases found for the branch: ${branchId}`);
             }
-            if (data.databases.length === 1) {
-                return data.databases[0].name;
+            if (branchDatabases.length === 1) {
+                return branchDatabases[0].name;
             }
-            throw new Error(`Multiple databases found for the branch, please provide one with the --database-name option: ${data.databases
+            throw new Error(`Multiple databases found for the branch, please provide one with the --database-name option: ${branchDatabases
                 .map((d) => d.name)
                 .join(', ')}`);
-        }));
+        })();
+    if (!branchDatabases.find((d) => d.name === database)) {
+        throw new Error(`Database not found: ${database}`);
+    }
     const { data: { password }, } = await props.apiClient.getProjectBranchRolePassword(props.projectId, endpoint.branch_id, role);
     let host = props.pooled
         ? endpoint.host.replace(endpoint.id, `${endpoint.id}-pooler`)
@@ -116,7 +118,7 @@ export const handler = async (props) => {
     if (parsedPIT.tag !== 'head') {
         host = endpoint.host.replace(endpoint.id, endpoint.branch_id);
     }
-    const connectionString = new URL(`postgres://${host}`);
+    const connectionString = new URL(`postgresql://${host}`);
     connectionString.pathname = database;
     connectionString.username = role;
     connectionString.password = password;

package/commands/connection_string.test.js

@@ -1,4 +1,4 @@
-import { describe } from '@jest/globals';
+import { describe, expect } from '@jest/globals';
 import { testCliCommand } from '../test_utils/test_cli_command';
 describe('connection_string', () => {
     testCliCommand({
@@ -233,4 +233,21 @@ describe('connection_string', () => {
             snapshot: true,
         },
     });
+    testCliCommand({
+        name: 'connection_string fails for non-existing database',
+        args: [
+            'connection-string',
+            'test_branch',
+            '--project-id',
+            'test',
+            '--database-name',
+            'non_existing_db',
+            '--role-name',
+            'test_role',
+        ],
+        expected: {
+            code: 1,
+            stderr: expect.stringMatching(/Database not found/),
+        },
+    });
 });

package/errors.js

@@ -1,6 +1,7 @@
 const ERROR_MATCHERS = [
     [/^Unknown command: (.*)$/, 'UNKNOWN_COMMAND'],
     [/^Missing required argument: (.*)$/, 'MISSING_ARGUMENT'],
+    [/^Failed to open web browser. (.*)$/, 'AUTH_BROWSER_FAILED'],
 ];
 export const matchErrorCode = (message) => {
     if (!message) {

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "1.29.3",
+  "version": "1.29.5",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",
@@ -60,8 +60,8 @@
     "chalk": "^5.2.0",
     "cli-table": "^0.3.11",
     "inquirer": "^9.2.6",
-    "open": "^8.4.0",
-    "openid-client": "^5.1.9",
+    "open": "^10.1.0",
+    "openid-client": "^5.6.5",
     "which": "^3.0.1",
     "yaml": "^2.1.1",
     "yargs": "^17.7.2"