neon 8.4.3 → 8.4.4

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/dev.js

@@ -4,11 +4,11 @@ import { isClaimableEnvTarget } from "../claimable/state.js";
 import { getCliName } from "../utils/cli_name.js";
 import { readEnvFile, resolveEnvFilePath } from "../env_file.js";
 import { l as functionBaseUrlKey } from "../_chunks/env-BpP3Dqpe.js";
-import { branchIdResolve } from "../utils/enrichers.js";
-import { bundleEntry } from "../utils/esbuild.js";
 import { a as resolveDevEnv } from "../_chunks/env-4WGRW2nw.js";
 import { findConfigFunctionBySource, resolveFunctionsFromConfig } from "../dev/functions.js";
 import { resolveWatchInputs } from "../dev/inputs.js";
+import { branchIdResolve } from "../utils/enrichers.js";
+import { bundleEntry } from "../utils/esbuild.js";
 import { existsSync, mkdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/commands/env.js

@@ -8,9 +8,9 @@ import { mergeEnvFile, readEnvFile, resolveEnvFilePath } from "../env_file.js";
 import { t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "../_chunks/env-BpP3Dqpe.js";
 import { ENV_PULL_KEY_HELP, ENV_PULL_SERVICES, envKeysForSelection, envPullFlagValue, ownedEnvServiceKeys, parseEnvPullKeys } from "../env_services.js";
 import { listedServices } from "../utils/staging.js";
+import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "../_chunks/env-4WGRW2nw.js";
 import { fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { warnAiGateway } from "../utils/ai_gateway_notice.js";
-import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "../_chunks/env-4WGRW2nw.js";
 import { formatPulledEnv, pulledBranch } from "./env_output.js";
 import { existsSync } from "node:fs";
 import chalk from "chalk";

package/dist/commands/subscribe.js

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { writer } from "../writer.js";
-import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
 import { o as resolveNeonEnvVars } from "../_chunks/env-4WGRW2nw.js";
+import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
 import YAML from "yaml";
 //#region src/commands/subscribe.ts
 var subscribe_exports = /* @__PURE__ */ __exportAll({
@@ -302,27 +302,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 = [];

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";
@@ -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.4",
   "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.0.3",
+    "@neon/sdk": "7.2.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",