neonctl 2.21.0 → 2.21.2

package/analytics.js

@@ -11,11 +11,33 @@ const WRITE_KEY = '3SQXn5ejjXWLEJ8xU2PRYhAotLtTaeeV';
 let client;
 let clientInitialized = false;
 let userId = '';
-export const analyticsMiddleware = async (args) => {
+/**
+ * Phase 1: Run before validation so the Segment client exists if any
+ * middleware (e.g. auth) fails. Enables sendError() in the fail handler.
+ * Does not resolve user id or send CLI Started.
+ */
+export const initAnalyticsClientMiddleware = (args) => {
     if (!args.analytics || clientInitialized) {
         return;
     }
     clientInitialized = true;
+    client = new Analytics({
+        writeKey: WRITE_KEY,
+        host: 'https://track.neon.tech',
+    });
+    log.debug('Initialized CLI analytics client');
+    client.identify({
+        userId: 'anonymous',
+    });
+};
+/**
+ * Phase 2: Run after auth. Resolves user id from credentials,
+ * identifies the user, and sends CLI Started.
+ */
+export const analyticsMiddleware = async (args) => {
+    if (!client || !args.analytics) {
+        return;
+    }
     try {
         const credentialsPath = join(args.configDir, CREDENTIALS_FILE);
         const credentials = readFileSync(credentialsPath, { encoding: 'utf-8' });
@@ -50,11 +72,6 @@ export const analyticsMiddleware = async (args) => {
     catch (err) {
         log.debug('Failed to get user id from api', err);
     }
-    client = new Analytics({
-        writeKey: WRITE_KEY,
-        host: 'https://track.neon.tech',
-    });
-    log.debug('Initialized CLI analytics');
     client.identify({
         userId: userId?.toString() ?? 'anonymous',
     });

package/index.js

@@ -20,7 +20,7 @@ import { defaultClientID } from './auth.js';
 import { fillInArgs } from './utils/middlewares.js';
 import pkg from './pkg.js';
 import commands from './commands/index.js';
-import { analyticsMiddleware, closeAnalytics, getAnalyticsEventProperties, sendError, trackEvent, } from './analytics.js';
+import { analyticsMiddleware, initAnalyticsClientMiddleware, closeAnalytics, getAnalyticsEventProperties, sendError, trackEvent, } from './analytics.js';
 import { isAxiosError } from 'axios';
 import { matchErrorCode } from './errors.js';
 import { showHelp } from './help.js';
@@ -107,10 +107,17 @@ builder = builder
         type: 'boolean',
         default: true,
     },
+    analytics: {
+        describe: 'Manage analytics. Example: --no-analytics, --analytics false',
+        group: 'Global options:',
+        type: 'boolean',
+        default: true,
+    },
 })
     .middleware((args) => {
     fillInArgs(args);
 }, true)
+    .middleware(initAnalyticsClientMiddleware, true)
     .help(false)
     .group('help', 'Global options:')
     .option('help', {
@@ -128,15 +135,9 @@ builder = builder
 })
     .middleware(ensureAuth)
     .middleware(enrichFromContext)
+    .middleware(analyticsMiddleware)
     .command(commands)
     .strictCommands()
-    .option('analytics', {
-    describe: 'Manage analytics. Example: --no-analytics, --analytics false',
-    group: 'Global options:',
-    type: 'boolean',
-    default: true,
-})
-    .middleware(analyticsMiddleware, true)
     .version(pkg.version)
     .group('version', 'Global options:')
     .alias('version', 'v')

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",
@@ -62,7 +62,7 @@
     "cli-table": "^0.3.11",
     "crypto-random-string": "^5.0.0",
     "diff": "^5.2.0",
-    "neon-init": "^0.13.0",
+    "neon-init": "^0.13.1",
     "open": "^10.1.0",
     "openid-client": "^6.8.1",
     "prompts": "2.4.2",