neon 8.0.0 → 8.0.1

package/dist/analytics.js

@@ -149,12 +149,21 @@ const analyticsMiddleware = async (args) => {
 		context: { direct: true }
 	});
 };
-const closeAnalytics = async (opts) => {
-	if (client) {
+let closing;
+/**
+* Close the client and flush queued events. Later calls share the first flush: the psql
+* launcher starts one while psql runs, and a second `closeAndFlush` would only make the SDK
+* warn about overlapping flushes.
+*/
+const closeAnalytics = (opts) => {
+	if (!client) return Promise.resolve();
+	if (!closing) {
 		log.debug("Flushing CLI analytics");
-		await client.closeAndFlush(opts);
-		log.debug("Flushed CLI analytics");
+		closing = client.closeAndFlush(opts).then(() => {
+			log.debug("Flushed CLI analytics");
+		});
 	}
+	return closing;
 };
 const getErrorAnalyticsEventContext = (_args) => ({
 	version: pkg_default.version,

package/dist/utils/psql.js

@@ -4,7 +4,7 @@ import which from "which";
 import { spawn } from "child_process";
 //#region src/utils/psql.ts
 const FALLBACK_ENV = "NEONCTL_PSQL_FALLBACK";
-/** Max time we wait for the analytics flush before handing off to psql. */
+/** Cap on the analytics flush, counted from when psql launches. */
 const ANALYTICS_FLUSH_TIMEOUT_MS = 3e3;
 /**
 * Decide which psql implementation will run, and why. The PATH probe is
@@ -45,59 +45,60 @@ const planPsql = async (opts) => {
 		nativePath
 	};
 };
-/**
-* Record which psql implementation is about to run, then flush analytics.
-*
-* Both exec paths below call `process.exit()`, which short-circuits the
-* main loop's `closeAnalytics()` — so without flushing here the event (and
-* any earlier queued events, e.g. `CLI Started`) would be dropped. The
-* flush is bounded by {@link ANALYTICS_FLUSH_TIMEOUT_MS} so a slow or
-* unreachable analytics endpoint can't stall the psql launch. No-ops when
-* analytics is disabled (`--analytics false`), since the client is absent.
-*/
-const reportPsqlInvocation = async (plan) => {
-	trackEvent("psql_invoked", {
-		implementation: plan.implementation,
-		reason: plan.reason,
-		nativeAvailable: plan.nativeAvailable
-	});
-	await closeAnalytics({ timeout: ANALYTICS_FLUSH_TIMEOUT_MS });
-};
 const execNative = async (binary, connection_uri, args) => {
-	log.info("Connecting to the database using psql...");
+	log.info(`${connectionSummary(connection_uri, args)}; launching psql...`);
 	const child = spawn(binary, [connection_uri, ...args], { stdio: "inherit" });
 	for (const signame of ["SIGINT", "SIGTERM"]) process.on(signame, (code) => {
 		if (!child.killed && code !== null) child.kill(code);
 	});
-	return new Promise((_, reject) => {
+	return new Promise((resolve, reject) => {
 		child.on("exit", (code) => {
-			process.exit(code === null ? 1 : code);
+			resolve(code === null ? 1 : code);
 		});
 		child.on("error", reject);
 	});
 };
 const execTs = async (connection_uri, args) => {
-	log.info("Connecting to the database using embedded psql (TypeScript)...");
+	log.info(`${connectionSummary(connection_uri, args)}; launching embedded psql (TypeScript)...`);
 	const { runPsql } = await import("../psql/index.js");
-	const code = await runPsql([connection_uri, ...args], {
+	return runPsql([connection_uri, ...args], {
 		stdin: process.stdin,
 		stdout: process.stdout,
 		stderr: process.stderr
 	});
-	process.exit(code);
+};
+const GENERIC_CONNECTING = "Connecting to the database";
+const connectionSummary = (connection_uri, args = []) => {
+	if (args.length > 0) return GENERIC_CONNECTING;
+	try {
+		const url = new URL(connection_uri);
+		const part = (value) => decodeURIComponent(value).replace(/[\u0000-\u001f\u007f]/g, "");
+		const database = part(url.pathname.replace(/^\//, ""));
+		const role = part(url.username);
+		if (!database || !role || !url.host) return GENERIC_CONNECTING;
+		return `Neon connection: ${database} as ${role} on ${url.host}`;
+	} catch {
+		return GENERIC_CONNECTING;
+	}
 };
 const psql = async (connection_uri, args = [], opts = {}) => {
 	const plan = await planPsql(opts);
-	await reportPsqlInvocation(plan);
+	trackEvent("psql_invoked", {
+		implementation: plan.implementation,
+		reason: plan.reason,
+		nativeAvailable: plan.nativeAvailable
+	});
+	const flushed = closeAnalytics({ timeout: ANALYTICS_FLUSH_TIMEOUT_MS });
+	let code;
 	if (plan.implementation === "ts") {
 		if (plan.reason === "fallback_no_native") log.info("psql binary not found on PATH; falling back to embedded TypeScript psql");
-		return execTs(connection_uri, args);
-	}
-	if (plan.nativePath === null) {
+		code = await execTs(connection_uri, args);
+	} else if (plan.nativePath === null) {
 		log.error(`psql is not available in the PATH`);
-		process.exit(1);
-	}
-	return execNative(plan.nativePath, connection_uri, args);
+		code = 1;
+	} else code = await execNative(plan.nativePath, connection_uri, args);
+	await flushed;
+	process.exit(code);
 };
 //#endregion
-export { psql };
+export { connectionSummary, psql };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -64,9 +64,9 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/sdk": "7.0.0",
+    "@neon/config": "1.8.3",
     "@neon/config-runtime": "1.7.3",
-    "@neon/config": "1.8.3"
+    "@neon/sdk": "7.0.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -100,8 +100,8 @@
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
     "@neon-internals/cli-core": "0.0.0",
-    "@neon-internals/env-core": "0.0.26",
     "@neon/e2e-harness": "0.0.0",
+    "@neon-internals/env-core": "0.0.26",
     "@neon/functions": "0.11.0"
   },
   "publishConfig": {