neon 8.4.3 → 8.4.5

package/README.md

@@ -308,10 +308,10 @@ regression + TAP tests.
 
 ## Subscribe to a Realtime query
 
-`neon subscribe` streams a live SQL query until interrupted:
+`neon realtime subscribe` streams a live SQL query until interrupted:
 
 ```bash
-neon subscribe "SELECT id, title, completed FROM realtime_todos ORDER BY id"
+neon realtime subscribe "SELECT id, title, completed FROM realtime_todos ORDER BY id"
 ```
 
 The default terminal output is append-only. It identifies the selected project,
@@ -325,10 +325,10 @@ For scripts and agents, JSON output is a JSON Lines stream with one complete eve
 per line. YAML output uses one document per event:
 
 ```bash
-neon subscribe --changes --output json "SELECT * FROM realtime_todos" |
+neon realtime subscribe --changes --output json "SELECT * FROM realtime_todos" |
   jq --unbuffered 'select(.type == "batch")'
 
-neon subscribe --output yaml "SELECT * FROM realtime_todos"
+neon realtime subscribe --output yaml "SELECT * FROM realtime_todos"
 ```
 
 Machine-readable output retains the event stream: without `--changes`, each event is

package/dist/analytics.js

@@ -2,7 +2,7 @@ import { a as OAUTH, t as storeFor } from "./_chunks/credential_io-ByNuojoE.js";
 import { getCliAgent, getGithubEnvVars, isCi } from "./env.js";
 import { log } from "./log.js";
 import pkg_default from "./pkg.js";
-import { getApiClient, isNeonApiError } from "./api.js";
+import { UnreadableResponseError, getApiClient, isNeonApiError } from "./api.js";
 import { getAuthContext } from "./auth_context.js";
 import { n as credentialsPath } from "./_chunks/paths-DMq0Lt7a.js";
 import "./config.js";
@@ -271,7 +271,7 @@ const sendError = (err, errCode) => {
 		});
 	});
 	log.debug("Sent CLI error event: %s", errCode);
-	if (errCode === "UNKNOWN_ERROR" && isUnexpectedError(err)) {
+	if (errCode === "UNKNOWN_ERROR" && isUnexpectedError(err) || err instanceof UnreadableResponseError) {
 		const report = import("./error_reporting.js").then(({ reportUnexpectedError }) => reportUnexpectedError(err, redactCredentialTokenIds)).catch((reportError) => {
 			log.debug("Could not report the error to Sentry: %s", reportError);
 		});

package/dist/api.js

@@ -42,6 +42,16 @@ var NeonApiError = class extends Error {
 		this.code = init.code;
 	}
 };
+/**
+* A 2xx response whose body could not be read or parsed. The request succeeded, so this is
+* reported to Sentry as well as counted as an API error.
+*/
+var UnreadableResponseError = class extends NeonApiError {
+	constructor(message, init) {
+		super(message, init);
+		this.name = "UnreadableResponseError";
+	}
+};
 /** Narrow an unknown error to a {@link NeonApiError}. */
 function isNeonApiError(err) {
 	return err instanceof NeonApiError;
@@ -170,6 +180,20 @@ function httpError(response, body) {
 	});
 }
 /**
+* The cause's message is left out: `JSON.parse` quotes the input, and the body can carry a
+* password or token that would reach stderr and analytics.
+*/
+function unreadableBodyError(response, cause) {
+	const base = httpError(response, void 0);
+	const reason = cause instanceof SyntaxError ? "the body is not valid JSON" : "the body could not be read";
+	return new UnreadableResponseError(`Could not read the Neon API response (${response.status} ${response.statusText}) to ${base.requestPath ?? "the request"}: ${reason}`, {
+		status: base.status,
+		statusText: base.statusText,
+		headers: base.headers,
+		requestPath: base.requestPath
+	});
+}
+/**
 * Translate a thrown `fetch` failure into a {@link NeonApiError}. A request
 * timeout uses `ECONNABORTED` (matching the old axios behaviour, and excluded
 * from `isNetworkError`'s connectivity codes so it's still reported as a
@@ -283,6 +307,7 @@ const getApiClient = ({ apiKey, apiHost, requestTimeoutMs = REQUEST_TIMEOUT_MS }
 		const response = result.response;
 		if (!response) throw networkError(result.error ?? /* @__PURE__ */ new Error("No response from Neon API"));
 		if (!response.ok) throw httpError(response, rawErrorBody(result.error) ?? result.data);
+		if (result.error !== void 0 && result.error !== null) throw unreadableBodyError(response, rawErrorBody(result.error));
 		return {
 			data: result.data,
 			status: response.status,
@@ -978,4 +1003,4 @@ const getApiClient = ({ apiKey, apiHost, requestTimeoutMs = REQUEST_TIMEOUT_MS }
 	};
 };
 //#endregion
-export { ContentType, NeonApiError, codeFromBody, getApiClient, isNeonApiError, messageFromBody, retryOnLock };
+export { ContentType, NeonApiError, UnreadableResponseError, codeFromBody, getApiClient, isNeonApiError, messageFromBody, retryOnLock };

package/dist/commands/index.js

@@ -39,7 +39,6 @@ import { t as roles_exports } from "./roles.js";
 import { t as set_context_exports } from "./set_context.js";
 import { t as snapshots_exports } from "./snapshots.js";
 import { t as status_exports } from "./status.js";
-import { t as subscribe_exports } from "./subscribe.js";
 import { t as triggers_exports } from "./triggers.js";
 import { t as user_exports } from "./user.js";
 import { t as vpc_endpoints_exports } from "./vpc_endpoints.js";
@@ -78,7 +77,6 @@ var commands_default = [
 	feedback_exports,
 	data_api_exports,
 	realtime_exports,
-	subscribe_exports,
 	functions_exports,
 	triggers_exports,
 	credentials_exports,

package/dist/commands/manifest.js

@@ -3,7 +3,7 @@ import { REALTIME_COMING_SOON } from "../utils/staging.js";
 import { Parser } from "yargs/helpers";
 //#region src/commands/manifest.ts
 /**
-* Every top-level command, in help order, with the metadata yargs needs to list and route it.
+* Every top-level command, with the metadata yargs needs to list and route it.
 * A command's module (and everything it imports) loads only when yargs selects that command,
 * so `neon --help` and `neon projects list` don't pay for `init`, `dev`, or `psql`.
 *
@@ -193,12 +193,6 @@ const commandManifest = [
 		load: () => import("./realtime.js"),
 		stagingOnly: REALTIME_COMING_SOON
 	},
-	{
-		command: "subscribe <query>",
-		describe: "Subscribe to a live SQL query with Neon Realtime",
-		load: () => import("./subscribe.js"),
-		stagingOnly: REALTIME_COMING_SOON
-	},
 	{
 		command: "functions",
 		aliases: ["function"],

package/dist/commands/realtime.js

@@ -2,6 +2,7 @@ import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { retryOnLock } from "../api.js";
 import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
+import { builder as builder$1, handler as handler$1 } from "./subscribe.js";
 import { defineConfig } from "@neon/config";
 //#region src/commands/realtime.ts
 var realtime_exports = /* @__PURE__ */ __exportAll({
@@ -44,7 +45,7 @@ const builder = (argv) => argv.usage("$0 realtime <sub-command> [options]").opti
 }), (args) => enable({
 	...args,
 	...args.allowedOrigin !== void 0 ? { allowedOrigins: args.allowedOrigin } : {}
-})).command("disable", "Disable Realtime on a branch", (yargs) => yargs.strict(), (args) => disable(args));
+})).command("disable", "Disable Realtime on a branch", (yargs) => yargs.strict(), (args) => disable(args)).command("subscribe <query>", "Subscribe to a live SQL query with Neon Realtime", builder$1, handler$1);
 const handler = (_args) => {};
 //#endregion
 export { builder, command, describe, disable, enable, handler, realtime_exports as t };

package/dist/commands/subscribe.js

@@ -1,37 +1,18 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { writer } from "../writer.js";
-import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
+import { branchIdFromProps } from "../utils/enrichers.js";
 import { o as resolveNeonEnvVars } from "../_chunks/env-4WGRW2nw.js";
 import YAML from "yaml";
 //#region src/commands/subscribe.ts
-var subscribe_exports = /* @__PURE__ */ __exportAll({
-	builder: () => builder,
-	command: () => command,
-	describe: () => describe,
-	handler: () => handler,
-	subscribe: () => subscribe
-});
-const command = "subscribe <query>";
-const describe = "Subscribe to a live SQL query with Neon Realtime";
-const builder = (argv) => argv.usage("$0 subscribe \"<query>\" [options]").positional("query", {
+const builder = (argv) => argv.usage("$0 realtime subscribe \"<query>\" [options]").positional("query", {
 	describe: "SELECT query to subscribe to",
 	type: "string"
-}).options({
-	"project-id": {
-		describe: "Project ID",
-		type: "string"
-	},
-	branch: {
-		describe: "Branch ID or name",
-		type: "string"
-	},
-	changes: {
-		describe: "Show raw resets and transaction batches",
-		type: "boolean",
-		default: false
-	}
-}).example("$0 subscribe \"SELECT * FROM items\"", "Print the initial result followed by a readable transaction log").example("$0 subscribe --changes \"SELECT * FROM items\"", "Print raw reset and delta events").epilogue("The subscription runs until interrupted. Terminal output is an append-only snapshot and transaction log; JSON output is newline-delimited; YAML output uses one document per event.").middleware(fillSingleProject).strict();
-const handler = async (props) => {
+}).options({ changes: {
+	describe: "Show raw resets and transaction batches",
+	type: "boolean",
+	default: false
+} }).example("$0 realtime subscribe \"SELECT * FROM items\"", "Print the initial result followed by a readable transaction log").example("$0 realtime subscribe --changes \"SELECT * FROM items\"", "Print raw reset and delta events").epilogue("The subscription runs until interrupted. Terminal output is an append-only snapshot and transaction log; JSON output is newline-delimited; YAML output uses one document per event.").strict();
+const handler = async (args) => {
+	const props = args;
 	const controller = new AbortController();
 	const stop = (exitCode) => {
 		controller.abort();
@@ -302,27 +283,24 @@ const rowFields = (rows) => {
 	for (const row of rows) for (const key of Object.keys(row)) seen.add(key);
 	return [...seen];
 };
-const consumeSnapshots = async (subscription, render, signal) => consumeSubscription(subscription, (fail) => [subscription.onReset(() => attempt(fail, () => {
-	const rows = subscription.getSnapshot().data;
-	if (rows !== void 0) render({
-		type: "snapshot",
-		rows
-	});
-})), subscription.onBatch(() => attempt(fail, () => {
+const consumeSnapshots = async (subscription, render, signal) => consumeSubscription(subscription, (fail) => [subscription.onUpdate(() => attempt(fail, () => {
 	const rows = subscription.getSnapshot().data;
 	if (rows !== void 0) render({
 		type: "snapshot",
 		rows
 	});
 }))], render, signal);
-const consumeChanges = async (subscription, render, signal) => consumeSubscription(subscription, (fail) => [subscription.onReset((rows) => attempt(fail, () => render({
-	type: "reset",
-	rows
-}))), subscription.onBatch((changes, batch) => attempt(fail, () => render({
-	type: "batch",
-	txids: batch.txids,
-	changes
-})))], render, signal);
+const consumeChanges = async (subscription, render, signal) => consumeSubscription(subscription, (fail) => [subscription.onUpdate((update) => {
+	if (update.type === "rows") attempt(fail, () => render({
+		type: "reset",
+		rows: update.rows
+	}));
+	else attempt(fail, () => render({
+		type: "batch",
+		txids: update.batch.txids,
+		changes: update.changes
+	}));
+})], render, signal);
 const consumeSubscription = (subscription, listenForData, render, signal) => new Promise((resolve, reject) => {
 	let settled = false;
 	let detachData = [];
@@ -360,4 +338,4 @@ const attempt = (fail, action) => {
 	}
 };
 //#endregion
-export { builder, command, describe, handler, subscribe, subscribe_exports as t };
+export { builder, handler, subscribe };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { log } from "./log.js";
 import pkg_default from "./pkg.js";
-import { codeFromBody, isNeonApiError, messageFromBody } from "./api.js";
+import { UnreadableResponseError, codeFromBody, isNeonApiError, messageFromBody } from "./api.js";
 import { getAuthContext } from "./auth_context.js";
 import { r as defaultDir } from "./_chunks/paths-DMq0Lt7a.js";
 import { ensureConfigDir } from "./config.js";
@@ -30,7 +30,6 @@ const NO_SUBCOMMANDS_VERBS = [
 	"cs",
 	"connection-string",
 	"psql",
-	"subscribe",
 	"set-context",
 	"checkout",
 	"link",
@@ -52,6 +51,7 @@ const NO_SUBCOMMANDS_VERBS = [
 let builder = yargs(hideBin(process.argv));
 builder = builder.scriptName(pkg_default.name).locale("en").usage("$0 <command> [options]").parserConfiguration({
 	"populate--": true,
+	"sort-commands": true,
 	"parse-positional-numbers": false
 }).help().option("output", {
 	alias: "o",
@@ -188,6 +188,7 @@ async function handleError(msg, err, canRetry) {
 		} else {
 			const serverMessage = messageFromBody(err.data);
 			if (serverMessage) log.error(serverMessage);
+			else if (err instanceof UnreadableResponseError) log.error(err.message);
 			else log.error([`HTTP ${err.status ?? ""} ${err.statusText ?? ""}`.trim(), err.requestPath].filter(Boolean).join(" | "));
 			log.debug("status: %d %s | path: %s", err.status, err.statusText, err.requestPath);
 			sendError(err, "API_ERROR");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.4.3",
+  "version": "8.4.5",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -66,10 +66,10 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config-runtime": "1.9.1",
     "@neon/config": "1.9.1",
-    "@neon/sdk": "7.2.0",
-    "@neon/realtime": "0.0.1"
+    "@neon/config-runtime": "1.9.1",
+    "@neon/realtime": "0.1.0",
+    "@neon/sdk": "7.2.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -77,7 +77,6 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "12.1.0",
-    "hono": "^4.12.25",
     "@rollup/plugin-commonjs": "25.0.8",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
@@ -94,6 +93,7 @@
     "@yao-pkg/pkg": "6.10.0",
     "emocks": "3.0.4",
     "express": "4.19.2",
+    "hono": "^4.12.25",
     "node-pty": "1.1.0",
     "oauth2-mock-server": "8.1.0",
     "openapi-types": "12.1.3",
@@ -103,8 +103,9 @@
     "tsx": "4.22.3",
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
-    "@neon-internals/cli-core": "0.0.0",
     "@neon-internals/env-core": "0.0.32",
+    "@neon-internals/cli-core": "0.0.0",
+    "@neon/env": "1.6.2",
     "@neon/e2e-harness": "0.0.0",
     "@neon/functions": "0.11.0"
   },
@@ -137,7 +138,7 @@
     "lint:fix": "pnpm typecheck && biome check src --write",
     "test": "pnpm --filter neonctl... build && vitest run",
     "test:ci": "pnpm build && vitest run",
-    "test:e2e": "pnpm build && vitest run --config vitest.e2e.config.ts",
+    "test:e2e": "pnpm --filter \"@neon/env...\" build && pnpm build && vitest run --config vitest.e2e.config.ts",
     "test:perf": "pnpm --filter neon... build && vitest run src/perf_budget.test.ts",
     "perf": "tsx scripts/perf/perf.ts",
     "perf:ci-report": "tsx scripts/perf/ci-report.ts",