@hot-updater/vercel 1.0.2 → 1.0.4

package/dist/function/index.mjs

@@ -17558,7 +17558,7 @@ const postgres = (config) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.2";
+const HOT_UPDATER_SERVER_VERSION = "1.0.4";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 const createVersionRouteHandlers = (plugins = []) => {
@@ -53404,10 +53404,10 @@ const storeIdOf = (token) => {
 	if (prefix !== "vercel" || kind !== "blob" || rw !== "rw" || !id) throw new Error("vercelBlobStorage needs the store's read-write token (vercel_blob_rw_...).");
 	return `store_${id}`;
 };
+const access = "private";
 const vercelBlobStorage = (config) => {
-	const { token, access } = config;
+	const { token } = config;
 	const storeId = storeIdOf(token);
-	const host = `${storeId.slice(6).toLowerCase()}.${access}.blob.vercel-storage.com`;
 	const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
 	const getStorageKey = createStorageKeyBuilder(normalizedBasePath);
 	const expiresIn = config.signedUrlExpiresIn ?? 3600;
@@ -53477,7 +53477,6 @@ const vercelBlobStorage = (config) => {
 		async getDownloadUrl({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
 			const pathname = toPathname(key);
-			if (access === "public") return { url: `https://${host}/${pathname.split("/").map(encodeURIComponent).join("/")}` };
 			const validUntil = Date.now() + expiresInMs;
 			const { presignedUrl } = await presignUrl(await delegationUntil(validUntil), {
 				access,
@@ -53564,8 +53563,6 @@ const requireEnv = (name) => {
 	if (!value) throw new Error(`${name} is not set on the Vercel project. Run \`hot-updater init\` again to configure it.`);
 	return value;
 };
-const access = requireEnv("HOT_UPDATER_VERCEL_BLOB_ACCESS");
-if (access !== "public" && access !== "private") throw new Error("HOT_UPDATER_VERCEL_BLOB_ACCESS must be \"public\" or \"private\".");
 const pool = new import_lib$1.default.Pool({
 	connectionString: requireEnv("HOT_UPDATER_VERCEL_DATABASE_URL"),
 	idleTimeoutMillis: 5e3,
@@ -53579,10 +53576,7 @@ const hotUpdater = createHotUpdater({
 		apiKeys(),
 		remoteConfig()
 	],
-	storage: vercelBlobStorage({
-		access,
-		token: requireEnv("HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN")
-	})
+	storage: vercelBlobStorage({ token: requireEnv("HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN") })
 });
 const handler = async (request) => withoutEncodingVary(await hotUpdater.handlers.client(request));
 //#endregion

package/dist/index.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let _vercel_blob = require("@vercel/blob");
+let _hot_updater_postgres = require("@hot-updater/postgres");
 //#region src/vercelBlobStorage.ts
 const PROTOCOL = "vercel-blob";
 const ONE_YEAR_IN_SECONDS = 31536e3;
@@ -61,14 +62,15 @@ const storeIdOf = (token) => {
 	if (prefix !== "vercel" || kind !== "blob" || rw !== "rw" || !id) throw new Error("vercelBlobStorage needs the store's read-write token (vercel_blob_rw_...).");
 	return `store_${id}`;
 };
+/** A private store's objects: only an API key holder's signed URL reaches them. */
+const access = "private";
 /**
-* Bundles in a Vercel Blob store. A public store's objects download from
-* their Blob URL; a private store's from a presigned URL that expires.
+* Bundles in a private Vercel Blob store. Devices download from presigned URLs
+* that expire, so the store's objects never sit at a public address.
 */
 const vercelBlobStorage = (config) => {
-	const { token, access } = config;
+	const { token } = config;
 	const storeId = storeIdOf(token);
-	const host = `${storeId.slice(6).toLowerCase()}.${access}.blob.vercel-storage.com`;
 	const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
 	const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(normalizedBasePath);
 	const expiresIn = config.signedUrlExpiresIn ?? 3600;
@@ -139,7 +141,6 @@ const vercelBlobStorage = (config) => {
 		async getDownloadUrl({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
 			const pathname = toPathname(key);
-			if (access === "public") return { url: `https://${host}/${pathname.split("/").map(encodeURIComponent).join("/")}` };
 			const validUntil = Date.now() + expiresInMs;
 			const { presignedUrl } = await (0, _vercel_blob.presignUrl)(await delegationUntil(validUntil), {
 				access,
@@ -205,4 +206,10 @@ const vercelBlobStorage = (config) => {
 	});
 };
 //#endregion
+Object.defineProperty(exports, "postgres", {
+	enumerable: true,
+	get: function() {
+		return _hot_updater_postgres.postgres;
+	}
+});
 exports.vercelBlobStorage = vercelBlobStorage;

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import { StorageAdapterWith } from "@hot-updater/plugin-core";
+import { PostgresConfig, postgres } from "@hot-updater/postgres";
 //#region src/vercelBlobStorage.d.ts
 interface VercelBlobStorageConfig {
   /**
@@ -6,21 +7,19 @@ interface VercelBlobStorageConfig {
    * the `BLOB_READ_WRITE_TOKEN` Vercel adds to a project the store connects to.
    */
   token: string;
-  /** The store's access, which Vercel fixes when it creates the store. */
-  access: "public" | "private";
   /** Base path where bundles will be stored in the store. */
   basePath?: string;
   /**
-   * Lifetime of a private store's download URLs in seconds, at most seven
-   * days, Vercel's limit. @default 3600
+   * Lifetime of the download URLs in seconds, at most seven days, Vercel's
+   * limit. @default 3600
    */
   signedUrlExpiresIn?: number;
 }
 type VercelBlobStorageOperations = "put" | "get" | "getDownloadUrl" | "exists" | "delete" | "listObjects" | "deleteObjects";
 /**
- * Bundles in a Vercel Blob store. A public store's objects download from
- * their Blob URL; a private store's from a presigned URL that expires.
+ * Bundles in a private Vercel Blob store. Devices download from presigned URLs
+ * that expire, so the store's objects never sit at a public address.
  */
 declare const vercelBlobStorage: (config: VercelBlobStorageConfig) => StorageAdapterWith<VercelBlobStorageOperations>;
 //#endregion
-export { VercelBlobStorageConfig, vercelBlobStorage };
+export { type PostgresConfig, VercelBlobStorageConfig, postgres, vercelBlobStorage };

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { StorageAdapterWith } from "@hot-updater/plugin-core";
+import { PostgresConfig, postgres } from "@hot-updater/postgres";
 //#region src/vercelBlobStorage.d.ts
 interface VercelBlobStorageConfig {
   /**
@@ -6,21 +7,19 @@ interface VercelBlobStorageConfig {
    * the `BLOB_READ_WRITE_TOKEN` Vercel adds to a project the store connects to.
    */
   token: string;
-  /** The store's access, which Vercel fixes when it creates the store. */
-  access: "public" | "private";
   /** Base path where bundles will be stored in the store. */
   basePath?: string;
   /**
-   * Lifetime of a private store's download URLs in seconds, at most seven
-   * days, Vercel's limit. @default 3600
+   * Lifetime of the download URLs in seconds, at most seven days, Vercel's
+   * limit. @default 3600
    */
   signedUrlExpiresIn?: number;
 }
 type VercelBlobStorageOperations = "put" | "get" | "getDownloadUrl" | "exists" | "delete" | "listObjects" | "deleteObjects";
 /**
- * Bundles in a Vercel Blob store. A public store's objects download from
- * their Blob URL; a private store's from a presigned URL that expires.
+ * Bundles in a private Vercel Blob store. Devices download from presigned URLs
+ * that expire, so the store's objects never sit at a public address.
  */
 declare const vercelBlobStorage: (config: VercelBlobStorageConfig) => StorageAdapterWith<VercelBlobStorageOperations>;
 //#endregion
-export { VercelBlobStorageConfig, vercelBlobStorage };
+export { type PostgresConfig, VercelBlobStorageConfig, postgres, vercelBlobStorage };

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { createStorageAdapter, createStorageKeyBuilder, createStorageUri, parseStorageUri } from "@hot-updater/plugin-core";
 import { BlobNotFoundError, del, get, head, issueSignedToken, list, presignUrl, put } from "@vercel/blob";
+import { postgres } from "@hot-updater/postgres";
 //#region src/vercelBlobStorage.ts
 const PROTOCOL = "vercel-blob";
 const ONE_YEAR_IN_SECONDS = 31536e3;
@@ -60,14 +61,15 @@ const storeIdOf = (token) => {
 	if (prefix !== "vercel" || kind !== "blob" || rw !== "rw" || !id) throw new Error("vercelBlobStorage needs the store's read-write token (vercel_blob_rw_...).");
 	return `store_${id}`;
 };
+/** A private store's objects: only an API key holder's signed URL reaches them. */
+const access = "private";
 /**
-* Bundles in a Vercel Blob store. A public store's objects download from
-* their Blob URL; a private store's from a presigned URL that expires.
+* Bundles in a private Vercel Blob store. Devices download from presigned URLs
+* that expire, so the store's objects never sit at a public address.
 */
 const vercelBlobStorage = (config) => {
-	const { token, access } = config;
+	const { token } = config;
 	const storeId = storeIdOf(token);
-	const host = `${storeId.slice(6).toLowerCase()}.${access}.blob.vercel-storage.com`;
 	const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
 	const getStorageKey = createStorageKeyBuilder(normalizedBasePath);
 	const expiresIn = config.signedUrlExpiresIn ?? 3600;
@@ -138,7 +140,6 @@ const vercelBlobStorage = (config) => {
 		async getDownloadUrl({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
 			const pathname = toPathname(key);
-			if (access === "public") return { url: `https://${host}/${pathname.split("/").map(encodeURIComponent).join("/")}` };
 			const validUntil = Date.now() + expiresInMs;
 			const { presignedUrl } = await presignUrl(await delegationUntil(validUntil), {
 				access,
@@ -204,4 +205,4 @@ const vercelBlobStorage = (config) => {
 	});
 };
 //#endregion
-export { vercelBlobStorage };
+export { postgres, vercelBlobStorage };

package/dist/init/index.cjs

@@ -6276,14 +6276,10 @@ const getConfigScaffold = (build) => {
 		}],
 		configString: `vercelBlobStorage({
     token: process.env.HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN!,
-    access:
-      process.env.HOT_UPDATER_VERCEL_BLOB_ACCESS === "public"
-        ? "public"
-        : "private",
   })`
 	}).setDatabase({
 		imports: [{
-			pkg: "@hot-updater/postgres",
+			pkg: "@hot-updater/vercel",
 			named: ["postgres"]
 		}],
 		configString: `postgres({
@@ -6310,7 +6306,6 @@ const getConfigScaffold = (build) => {
 const isVercelProjectName = (value) => value !== void 0 && /^[a-z0-9][a-z0-9._-]{0,99}$/.test(value) && !value.includes("---");
 /** A Blob store name: letters, digits, `_`, and `-`. */
 const isVercelBlobStoreName = (value) => value !== void 0 && /^[A-Za-z0-9][A-Za-z0-9_-]{0,31}$/.test(value);
-const isVercelBlobAccess = (value) => value === "public" || value === "private";
 const isPostgresUrl = (value) => {
 	if (value === void 0) return false;
 	try {
@@ -6363,16 +6358,6 @@ const initProvider = {
 			help: "Blob store ID (store_...), saved by init",
 			optional: true
 		},
-		blobAccess: {
-			envKey: "HOT_UPDATER_VERCEL_BLOB_ACCESS",
-			help: "The Blob store's access: private (the default) or public",
-			optional: true,
-			prompt: {
-				message: "Make the new Blob store private?",
-				type: "confirm"
-			},
-			validate: isVercelBlobAccess
-		},
 		blobReadWriteToken: {
 			envKey: "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN",
 			help: "The Blob store's read-write token, which init reads from the project",
@@ -6551,6 +6536,10 @@ const createVercelApi = ({ token, teamId, fetch: fetchImpl = fetch }) => {
 				envVarPrefix: input.envVarPrefix
 			} });
 		},
+		/** Removes a store's connection, and the variables it added, from a project. */
+		async disconnectBlobStore(storeId, connectionId) {
+			await request("DELETE", `/v1/storage/stores/${encodeURIComponent(storeId)}/connections/${encodeURIComponent(connectionId)}`);
+		},
 		async listProjectEnv(projectId) {
 			return (await paginate(`/v10/projects/${encodeURIComponent(projectId)}/env`, "envs")).flatMap((env) => isRecord(env) && typeof env.id === "string" && typeof env.key === "string" ? [{
 				id: env.id,
@@ -6791,7 +6780,6 @@ const inputs = initProvider.inputs;
 const BLOB_ENV_PREFIX = "HOT_UPDATER_VERCEL_BLOB";
 const BLOB_TOKEN_ENV = inputs.blobReadWriteToken.envKey;
 const DATABASE_URL_ENV = inputs.databaseUrl.envKey;
-const BLOB_ACCESS_ENV = inputs.blobAccess.envKey;
 /** Project env vars a Marketplace Postgres database adds, such as Neon's `DATABASE_URL`. */
 const DATABASE_URL_ENV_PATTERN = /(?:^|_)(?:DATABASE_URL|POSTGRES_URL)$/;
 const cancelled = (value) => _hot_updater_cli_tools.p.isCancel(value);
@@ -6849,10 +6837,39 @@ const resolveProjectName = async (savedName, nonInteractive) => {
 		validate: (value) => isVercelProjectName(value) ? void 0 : "Use up to 100 lowercase letters, digits, '.', '_', or '-', without '---'."
 	}));
 };
-/** The saved store, or one the user selects or creates; undefined to create `name`. */
+/**
+* The saved store, or one the user selects or creates; `replaces` is a saved
+* public store the selection takes the place of.
+*/
 const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) => {
-	const saved = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
+	const found = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
+	const publicStore = found?.access === "public" ? found : void 0;
+	const replacement = publicStore && `Blob store ${publicStore.name} is public. Hot Updater keeps bundles in a private store, and the bundles deployed to ${publicStore.name} stop downloading until you deploy them again.`;
+	const saved = publicStore ? void 0 : found;
+	const privateStores = stores.filter((store) => store.access === "private");
 	if (nonInteractive) {
+		if (publicStore) {
+			const named = stores.find((store) => store.name === savedName);
+			if (savedName && savedName !== publicStore.name) {
+				if (named?.access === "private") {
+					_hot_updater_cli_tools.p.log.warn(replacement);
+					return {
+						kind: "existing",
+						store: named,
+						replaces: publicStore
+					};
+				}
+				if (!named) {
+					_hot_updater_cli_tools.p.log.warn(replacement);
+					return {
+						kind: "create",
+						name: savedName,
+						replaces: publicStore
+					};
+				}
+			}
+			throw new _hot_updater_cli_tools.InitError(`${replacement} Set ${inputs.blobStoreName.envKey} to a private or new store to replace it.`);
+		}
 		if (saved) return {
 			kind: "existing",
 			store: saved
@@ -6863,42 +6880,43 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		};
 		throw new _hot_updater_cli_tools.InitError(`${inputs.blobStoreName.envKey} is required to select the Blob store.`);
 	}
-	if ((savedId || savedName) && !saved) _hot_updater_cli_tools.p.log.warn("The saved Blob store was not found. Select a store again.");
+	if (publicStore) {
+		_hot_updater_cli_tools.p.log.warn(replacement);
+		if (!exitIfCancelled(await _hot_updater_cli_tools.p.confirm({
+			message: `Replace ${publicStore.name} with a private Blob store?`,
+			initialValue: false
+		}))) process.exit(1);
+	} else if ((savedId || savedName) && !saved) _hot_updater_cli_tools.p.log.warn("The saved Blob store was not found. Select a store again.");
 	const createKey = "\0create";
 	const selected = exitIfCancelled(await _hot_updater_cli_tools.p.select({
 		message: "Select the Blob store for bundles",
-		initialValue: saved?.id ?? stores[0]?.id ?? createKey,
-		options: [...stores.map((store) => ({
+		initialValue: saved?.id ?? privateStores[0]?.id ?? createKey,
+		options: [...privateStores.map((store) => ({
 			value: store.id,
-			label: `${store.name} (${store.access}${store.region ? `, ${store.region}` : ""})`
+			label: `${store.name}${store.region ? ` (${store.region})` : ""}`
 		})), {
 			value: createKey,
 			label: "Create a new Blob store"
 		}]
 	}));
-	const store = stores.find((candidate) => candidate.id === selected);
+	const store = privateStores.find((candidate) => candidate.id === selected);
+	const replaces = publicStore ? { replaces: publicStore } : {};
 	if (store) return {
 		kind: "existing",
-		store
+		store,
+		...replaces
 	};
 	const prompt = inputs.blobStoreName.prompt;
 	return {
 		kind: "create",
 		name: exitIfCancelled(await _hot_updater_cli_tools.p.text({
-			...(0, _hot_updater_cli_tools.getInitProviderTextPromptValues)(prompt, savedName),
+			...(0, _hot_updater_cli_tools.getInitProviderTextPromptValues)(prompt, savedName === publicStore?.name ? void 0 : savedName),
 			message: prompt.message,
 			validate: (value) => isVercelBlobStoreName(value) ? void 0 : "Use up to 32 letters, digits, '_', or '-'."
-		}))
+		})),
+		...replaces
 	};
 };
-const resolveNewStoreAccess = async (savedAccess, nonInteractive) => {
-	if (isVercelBlobAccess(savedAccess) && nonInteractive) return savedAccess;
-	if (nonInteractive) return "private";
-	return exitIfCancelled(await _hot_updater_cli_tools.p.confirm({
-		message: inputs.blobAccess.prompt.message,
-		initialValue: savedAccess !== "public"
-	})) ? "private" : "public";
-};
 /**
 * The store's read-write token: from its connection to the project, which
 * init makes when there is none.
@@ -6917,6 +6935,7 @@ const resolveBlobToken = async (api, project, store) => {
 	const env = (await api.listProjectEnv(project.id)).find((candidate) => candidate.key === tokenEnv && candidate.target.includes("production"));
 	const token = env === void 0 ? void 0 : await api.getProjectEnvValue(project.id, env.id);
 	if (!token?.startsWith("vercel_blob_rw_")) throw new _hot_updater_cli_tools.InitError(`Blob store ${store.name} is connected to project ${project.name} without a read-write token for production. Reconnect it from the project's Storage tab with a read-write token, then rerun init.`);
+	if (`store_${token.split("_")[3]}` !== store.id) throw new _hot_updater_cli_tools.InitError(`The production ${tokenEnv} of project ${project.name} belongs to another Blob store, not ${store.name}. Disconnect that store from the project's Storage tab, then rerun init.`);
 	return token;
 };
 /**
@@ -7051,7 +7070,6 @@ const runInit = async ({ build, envFile }) => {
 		...saved.blobStoreId ? { savedId: saved.blobStoreId } : {},
 		...saved.blobStoreName ? { savedName: saved.blobStoreName } : {}
 	});
-	const newStoreAccess = storeSelection.kind === "create" ? await resolveNewStoreAccess(saved.blobAccess, nonInteractive) : void 0;
 	let databaseUrl = nonInteractive ? saved.databaseUrl : void 0;
 	if (nonInteractive && !isPostgresUrl(databaseUrl)) throw new _hot_updater_cli_tools.InitError(`${DATABASE_URL_ENV} must be a postgres:// or postgresql:// URL.`);
 	const project = existingProject ?? await (async () => {
@@ -7068,28 +7086,31 @@ const runInit = async ({ build, envFile }) => {
 		...saved.databaseUrl ? { savedUrl: saved.databaseUrl } : {}
 	});
 	assertPostgresCanInitialize(await readHotUpdaterTables(databaseUrl));
+	for (const connection of storeSelection.replaces?.connections ?? []) {
+		if (connection.projectId !== project.id) continue;
+		await api.disconnectBlobStore(storeSelection.replaces.id, connection.id);
+		_hot_updater_cli_tools.p.log.info(`Disconnected Blob store ${storeSelection.replaces.name} from ${project.name}`);
+	}
 	let store;
 	if (storeSelection.kind === "existing") {
 		store = storeSelection.store;
 		_hot_updater_cli_tools.p.log.info(`Selected Blob store: ${store.name}`);
 	} else {
-		const access = newStoreAccess ?? "private";
 		const { id } = await api.createBlobStore({
-			access,
+			access: "private",
 			name: storeSelection.name
 		});
 		store = {
-			access,
+			access: "private",
 			connections: [],
 			id,
 			name: storeSelection.name,
 			region: void 0
 		};
-		_hot_updater_cli_tools.p.log.info(`Created Blob store: ${store.name} (${access})`);
+		_hot_updater_cli_tools.p.log.info(`Created Blob store: ${store.name} (private)`);
 	}
 	const blobToken = await resolveBlobToken(api, project, store);
 	const resolvedInputs = {
-		blobAccess: store.access,
 		blobReadWriteToken: blobToken,
 		blobStoreId: store.id,
 		blobStoreName: store.name,
@@ -7124,7 +7145,6 @@ const runInit = async ({ build, envFile }) => {
 		title: "Setting the Function's environment variables...",
 		task: async () => {
 			await api.setProductionEnv(project.id, DATABASE_URL_ENV, databaseUrl);
-			await api.setProductionEnv(project.id, BLOB_ACCESS_ENV, store.access);
 			await syncFunctionBlobToken(api, project, store, blobToken);
 			return "Set the Function's environment variables";
 		}

package/dist/init/index.d.cts

@@ -43,16 +43,6 @@ declare const initProvider: {
       readonly help: "Blob store ID (store_...), saved by init";
       readonly optional: true;
     };
-    readonly blobAccess: {
-      readonly envKey: "HOT_UPDATER_VERCEL_BLOB_ACCESS";
-      readonly help: "The Blob store's access: private (the default) or public";
-      readonly optional: true;
-      readonly prompt: {
-        readonly message: "Make the new Blob store private?";
-        readonly type: "confirm";
-      };
-      readonly validate: (value: string | undefined) => value is "public" | "private";
-    };
     readonly blobReadWriteToken: {
       readonly envKey: "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN";
       readonly help: "The Blob store's read-write token, which init reads from the project";

package/dist/init/index.d.mts

@@ -43,16 +43,6 @@ declare const initProvider: {
       readonly help: "Blob store ID (store_...), saved by init";
       readonly optional: true;
     };
-    readonly blobAccess: {
-      readonly envKey: "HOT_UPDATER_VERCEL_BLOB_ACCESS";
-      readonly help: "The Blob store's access: private (the default) or public";
-      readonly optional: true;
-      readonly prompt: {
-        readonly message: "Make the new Blob store private?";
-        readonly type: "confirm";
-      };
-      readonly validate: (value: string | undefined) => value is "public" | "private";
-    };
     readonly blobReadWriteToken: {
       readonly envKey: "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN";
       readonly help: "The Blob store's read-write token, which init reads from the project";

package/dist/init/index.mjs

@@ -6270,14 +6270,10 @@ const getConfigScaffold = (build) => {
 		}],
 		configString: `vercelBlobStorage({
     token: process.env.HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN!,
-    access:
-      process.env.HOT_UPDATER_VERCEL_BLOB_ACCESS === "public"
-        ? "public"
-        : "private",
   })`
 	}).setDatabase({
 		imports: [{
-			pkg: "@hot-updater/postgres",
+			pkg: "@hot-updater/vercel",
 			named: ["postgres"]
 		}],
 		configString: `postgres({
@@ -6304,7 +6300,6 @@ const getConfigScaffold = (build) => {
 const isVercelProjectName = (value) => value !== void 0 && /^[a-z0-9][a-z0-9._-]{0,99}$/.test(value) && !value.includes("---");
 /** A Blob store name: letters, digits, `_`, and `-`. */
 const isVercelBlobStoreName = (value) => value !== void 0 && /^[A-Za-z0-9][A-Za-z0-9_-]{0,31}$/.test(value);
-const isVercelBlobAccess = (value) => value === "public" || value === "private";
 const isPostgresUrl = (value) => {
 	if (value === void 0) return false;
 	try {
@@ -6357,16 +6352,6 @@ const initProvider = {
 			help: "Blob store ID (store_...), saved by init",
 			optional: true
 		},
-		blobAccess: {
-			envKey: "HOT_UPDATER_VERCEL_BLOB_ACCESS",
-			help: "The Blob store's access: private (the default) or public",
-			optional: true,
-			prompt: {
-				message: "Make the new Blob store private?",
-				type: "confirm"
-			},
-			validate: isVercelBlobAccess
-		},
 		blobReadWriteToken: {
 			envKey: "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN",
 			help: "The Blob store's read-write token, which init reads from the project",
@@ -6545,6 +6530,10 @@ const createVercelApi = ({ token, teamId, fetch: fetchImpl = fetch }) => {
 				envVarPrefix: input.envVarPrefix
 			} });
 		},
+		/** Removes a store's connection, and the variables it added, from a project. */
+		async disconnectBlobStore(storeId, connectionId) {
+			await request("DELETE", `/v1/storage/stores/${encodeURIComponent(storeId)}/connections/${encodeURIComponent(connectionId)}`);
+		},
 		async listProjectEnv(projectId) {
 			return (await paginate(`/v10/projects/${encodeURIComponent(projectId)}/env`, "envs")).flatMap((env) => isRecord(env) && typeof env.id === "string" && typeof env.key === "string" ? [{
 				id: env.id,
@@ -6785,7 +6774,6 @@ const inputs = initProvider.inputs;
 const BLOB_ENV_PREFIX = "HOT_UPDATER_VERCEL_BLOB";
 const BLOB_TOKEN_ENV = inputs.blobReadWriteToken.envKey;
 const DATABASE_URL_ENV = inputs.databaseUrl.envKey;
-const BLOB_ACCESS_ENV = inputs.blobAccess.envKey;
 /** Project env vars a Marketplace Postgres database adds, such as Neon's `DATABASE_URL`. */
 const DATABASE_URL_ENV_PATTERN = /(?:^|_)(?:DATABASE_URL|POSTGRES_URL)$/;
 const cancelled = (value) => p.isCancel(value);
@@ -6843,10 +6831,39 @@ const resolveProjectName = async (savedName, nonInteractive) => {
 		validate: (value) => isVercelProjectName(value) ? void 0 : "Use up to 100 lowercase letters, digits, '.', '_', or '-', without '---'."
 	}));
 };
-/** The saved store, or one the user selects or creates; undefined to create `name`. */
+/**
+* The saved store, or one the user selects or creates; `replaces` is a saved
+* public store the selection takes the place of.
+*/
 const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) => {
-	const saved = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
+	const found = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
+	const publicStore = found?.access === "public" ? found : void 0;
+	const replacement = publicStore && `Blob store ${publicStore.name} is public. Hot Updater keeps bundles in a private store, and the bundles deployed to ${publicStore.name} stop downloading until you deploy them again.`;
+	const saved = publicStore ? void 0 : found;
+	const privateStores = stores.filter((store) => store.access === "private");
 	if (nonInteractive) {
+		if (publicStore) {
+			const named = stores.find((store) => store.name === savedName);
+			if (savedName && savedName !== publicStore.name) {
+				if (named?.access === "private") {
+					p.log.warn(replacement);
+					return {
+						kind: "existing",
+						store: named,
+						replaces: publicStore
+					};
+				}
+				if (!named) {
+					p.log.warn(replacement);
+					return {
+						kind: "create",
+						name: savedName,
+						replaces: publicStore
+					};
+				}
+			}
+			throw new InitError(`${replacement} Set ${inputs.blobStoreName.envKey} to a private or new store to replace it.`);
+		}
 		if (saved) return {
 			kind: "existing",
 			store: saved
@@ -6857,42 +6874,43 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		};
 		throw new InitError(`${inputs.blobStoreName.envKey} is required to select the Blob store.`);
 	}
-	if ((savedId || savedName) && !saved) p.log.warn("The saved Blob store was not found. Select a store again.");
+	if (publicStore) {
+		p.log.warn(replacement);
+		if (!exitIfCancelled(await p.confirm({
+			message: `Replace ${publicStore.name} with a private Blob store?`,
+			initialValue: false
+		}))) process.exit(1);
+	} else if ((savedId || savedName) && !saved) p.log.warn("The saved Blob store was not found. Select a store again.");
 	const createKey = "\0create";
 	const selected = exitIfCancelled(await p.select({
 		message: "Select the Blob store for bundles",
-		initialValue: saved?.id ?? stores[0]?.id ?? createKey,
-		options: [...stores.map((store) => ({
+		initialValue: saved?.id ?? privateStores[0]?.id ?? createKey,
+		options: [...privateStores.map((store) => ({
 			value: store.id,
-			label: `${store.name} (${store.access}${store.region ? `, ${store.region}` : ""})`
+			label: `${store.name}${store.region ? ` (${store.region})` : ""}`
 		})), {
 			value: createKey,
 			label: "Create a new Blob store"
 		}]
 	}));
-	const store = stores.find((candidate) => candidate.id === selected);
+	const store = privateStores.find((candidate) => candidate.id === selected);
+	const replaces = publicStore ? { replaces: publicStore } : {};
 	if (store) return {
 		kind: "existing",
-		store
+		store,
+		...replaces
 	};
 	const prompt = inputs.blobStoreName.prompt;
 	return {
 		kind: "create",
 		name: exitIfCancelled(await p.text({
-			...getInitProviderTextPromptValues(prompt, savedName),
+			...getInitProviderTextPromptValues(prompt, savedName === publicStore?.name ? void 0 : savedName),
 			message: prompt.message,
 			validate: (value) => isVercelBlobStoreName(value) ? void 0 : "Use up to 32 letters, digits, '_', or '-'."
-		}))
+		})),
+		...replaces
 	};
 };
-const resolveNewStoreAccess = async (savedAccess, nonInteractive) => {
-	if (isVercelBlobAccess(savedAccess) && nonInteractive) return savedAccess;
-	if (nonInteractive) return "private";
-	return exitIfCancelled(await p.confirm({
-		message: inputs.blobAccess.prompt.message,
-		initialValue: savedAccess !== "public"
-	})) ? "private" : "public";
-};
 /**
 * The store's read-write token: from its connection to the project, which
 * init makes when there is none.
@@ -6911,6 +6929,7 @@ const resolveBlobToken = async (api, project, store) => {
 	const env = (await api.listProjectEnv(project.id)).find((candidate) => candidate.key === tokenEnv && candidate.target.includes("production"));
 	const token = env === void 0 ? void 0 : await api.getProjectEnvValue(project.id, env.id);
 	if (!token?.startsWith("vercel_blob_rw_")) throw new InitError(`Blob store ${store.name} is connected to project ${project.name} without a read-write token for production. Reconnect it from the project's Storage tab with a read-write token, then rerun init.`);
+	if (`store_${token.split("_")[3]}` !== store.id) throw new InitError(`The production ${tokenEnv} of project ${project.name} belongs to another Blob store, not ${store.name}. Disconnect that store from the project's Storage tab, then rerun init.`);
 	return token;
 };
 /**
@@ -7045,7 +7064,6 @@ const runInit = async ({ build, envFile }) => {
 		...saved.blobStoreId ? { savedId: saved.blobStoreId } : {},
 		...saved.blobStoreName ? { savedName: saved.blobStoreName } : {}
 	});
-	const newStoreAccess = storeSelection.kind === "create" ? await resolveNewStoreAccess(saved.blobAccess, nonInteractive) : void 0;
 	let databaseUrl = nonInteractive ? saved.databaseUrl : void 0;
 	if (nonInteractive && !isPostgresUrl(databaseUrl)) throw new InitError(`${DATABASE_URL_ENV} must be a postgres:// or postgresql:// URL.`);
 	const project = existingProject ?? await (async () => {
@@ -7062,28 +7080,31 @@ const runInit = async ({ build, envFile }) => {
 		...saved.databaseUrl ? { savedUrl: saved.databaseUrl } : {}
 	});
 	assertPostgresCanInitialize(await readHotUpdaterTables(databaseUrl));
+	for (const connection of storeSelection.replaces?.connections ?? []) {
+		if (connection.projectId !== project.id) continue;
+		await api.disconnectBlobStore(storeSelection.replaces.id, connection.id);
+		p.log.info(`Disconnected Blob store ${storeSelection.replaces.name} from ${project.name}`);
+	}
 	let store;
 	if (storeSelection.kind === "existing") {
 		store = storeSelection.store;
 		p.log.info(`Selected Blob store: ${store.name}`);
 	} else {
-		const access = newStoreAccess ?? "private";
 		const { id } = await api.createBlobStore({
-			access,
+			access: "private",
 			name: storeSelection.name
 		});
 		store = {
-			access,
+			access: "private",
 			connections: [],
 			id,
 			name: storeSelection.name,
 			region: void 0
 		};
-		p.log.info(`Created Blob store: ${store.name} (${access})`);
+		p.log.info(`Created Blob store: ${store.name} (private)`);
 	}
 	const blobToken = await resolveBlobToken(api, project, store);
 	const resolvedInputs = {
-		blobAccess: store.access,
 		blobReadWriteToken: blobToken,
 		blobStoreId: store.id,
 		blobStoreName: store.name,
@@ -7118,7 +7139,6 @@ const runInit = async ({ build, envFile }) => {
 		title: "Setting the Function's environment variables...",
 		task: async () => {
 			await api.setProductionEnv(project.id, DATABASE_URL_ENV, databaseUrl);
-			await api.setProductionEnv(project.id, BLOB_ACCESS_ENV, store.access);
 			await syncFunctionBlobToken(api, project, store, blobToken);
 			return "Set the Function's environment variables";
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/vercel",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -41,11 +41,11 @@
     "@vercel/cli-auth": "0.3.10",
     "@vercel/cli-config": "0.3.1",
     "pg": "8.13.1",
-    "@hot-updater/cli-tools": "1.0.2",
-    "@hot-updater/plugin-core": "1.0.2",
-    "@hot-updater/postgres": "1.0.2",
-    "@hot-updater/protocol": "1.0.2",
-    "@hot-updater/server": "1.0.2"
+    "@hot-updater/cli-tools": "1.0.4",
+    "@hot-updater/plugin-core": "1.0.4",
+    "@hot-updater/postgres": "1.0.4",
+    "@hot-updater/protocol": "1.0.4",
+    "@hot-updater/server": "1.0.4"
   },
   "devDependencies": {
     "@types/node": "^20",
@@ -54,7 +54,7 @@
     "execa": "9.5.2",
     "kysely": "0.28.17",
     "vitest": "4.1.4",
-    "@hot-updater/test-utils": "1.0.2"
+    "@hot-updater/test-utils": "1.0.4"
   },
   "scripts": {
     "build": "tsdown",