@hot-updater/standalone 1.2.0-rc.7 → 1.2.0-rc.9

package/dist/index.cjs

@@ -12,11 +12,13 @@ var StandaloneDatabaseError = class extends Error {
 	}
 };
 const isRecord$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+/** `headers` with each lazy value resolved. */
+const resolveHeaders = async (headers = {}) => Object.fromEntries(await Promise.all(Object.entries(headers).map(async ([name, value]) => [name, await (0, _hot_updater_plugin_core.resolveLazy)(value)])));
 const createStandaloneHttp = (config) => {
 	const buildUrl = (path) => `${config.baseUrl.replace(/\/+$/, "")}${path}`;
-	const headers = (routeHeaders) => ({
+	const headers = async (routeHeaders) => ({
 		"Content-Type": "application/json",
-		...config.commonHeaders,
+		...await resolveHeaders(config.commonHeaders),
 		...routeHeaders
 	});
 	const requestFailed = async (response) => {
@@ -108,7 +110,7 @@ const createStandaloneCoreApi = (config) => {
 	const http = createStandaloneHttp(config);
 	let checked;
 	const checkProtocol = async () => {
-		const response = await fetch(http.buildUrl("/version"), { headers: http.headers({ "Cache-Control": "no-cache" }) });
+		const response = await fetch(http.buildUrl("/version"), { headers: await http.headers({ "Cache-Control": "no-cache" }) });
 		const body = response.status === 404 ? {} : await http.parseJson(response);
 		const protocol = isRecord(body) ? body.adminProtocol : void 0;
 		if (typeof protocol !== "number" || protocol < 2) throw new StandaloneDatabaseError("request-failed", `The server at ${config.baseUrl} does not report Hot Updater admin API protocol 2 at /version. Set baseUrl to the path where the server mounts handlers.admin, such as https://example.com/hot-updater/admin.`, response.status);
@@ -125,7 +127,7 @@ const createStandaloneCoreApi = (config) => {
 		for (const [key, value] of Object.entries(query)) url.searchParams.set(key, value);
 		const response = await fetch(url, {
 			method,
-			headers: http.headers(method === "GET" ? { "Cache-Control": "no-cache" } : void 0),
+			headers: await http.headers(method === "GET" ? { "Cache-Control": "no-cache" } : void 0),
 			...body === void 0 ? {} : { body: JSON.stringify(body) }
 		});
 		if (response.status === 204) return null;
@@ -252,8 +254,8 @@ const standaloneRepository = (config) => {
 	return Object.freeze({
 		name: "standalone-repository",
 		core: createStandaloneCoreApi(config),
-		fetchAdmin: (path, init = {}) => {
-			const headers = new Headers(http.headers({ "Cache-Control": "no-cache" }));
+		fetchAdmin: async (path, init = {}) => {
+			const headers = new Headers(await http.headers({ "Cache-Control": "no-cache" }));
 			new Headers(init.headers).forEach((value, name) => {
 				headers.set(name, value);
 			});
@@ -270,8 +272,12 @@ const defaultRoutes = {
 	put: () => ({ path: "/upload" }),
 	get: () => ({ path: "/get" }),
 	exists: () => ({ path: "/exists" }),
-	delete: () => ({ path: "/delete" })
+	delete: () => ({ path: "/delete" }),
+	listObjects: () => ({ path: "/list" }),
+	deleteObjects: () => ({ path: "/delete-objects" })
 };
+/** Keys sent in one `deleteObjects` request. */
+const DELETE_BATCH_SIZE = 1e3;
 const createRoute = (defaultRoute, customRoute) => ({
 	path: customRoute?.path ?? defaultRoute.path,
 	headers: {
@@ -280,8 +286,8 @@ const createRoute = (defaultRoute, customRoute) => ({
 	}
 });
 const standaloneStorage = (config) => {
-	const getHeaders = (routeHeaders) => ({
-		...config.commonHeaders,
+	const getHeaders = async (routeHeaders) => ({
+		...await resolveHeaders(config.commonHeaders),
 		...routeHeaders
 	});
 	const resolveRoute = (name, args) => {
@@ -289,6 +295,14 @@ const standaloneStorage = (config) => {
 		const custom = config.routes?.[name];
 		return createRoute(fallback(...args), custom?.(...args));
 	};
+	const postJson = async (path, headers, body) => fetch(`${config.baseUrl}${path}`, {
+		method: "POST",
+		headers: {
+			"content-type": "application/json",
+			...await getHeaders(headers)
+		},
+		body: JSON.stringify(body)
+	});
 	const requestStorageUri = async (routeName, storageUri) => {
 		(0, _hot_updater_plugin_core.parseStorageUri)(storageUri, config.protocol);
 		const { path, headers } = resolveRoute(routeName, [{ storageUri }]);
@@ -296,7 +310,7 @@ const standaloneStorage = (config) => {
 			method: routeName === "delete" ? "DELETE" : "POST",
 			headers: {
 				"content-type": "application/json",
-				...getHeaders(headers)
+				...await getHeaders(headers)
 			},
 			body: JSON.stringify({ storageUri })
 		});
@@ -319,7 +333,7 @@ const standaloneStorage = (config) => {
 			formData.append("key", key);
 			const response = await fetch(`${config.baseUrl}${path}`, {
 				method: "POST",
-				headers: getHeaders(headers),
+				headers: await getHeaders(headers),
 				body: formData
 			});
 			if (!response.ok) throw new Error(`Failed to upload bundle: ${response.statusText}`);
@@ -340,6 +354,39 @@ const standaloneStorage = (config) => {
 		async delete({ storageUri }) {
 			await requestStorageUri("delete", storageUri);
 			return { deleted: true };
+		},
+		async listObjects(prefix) {
+			const { path, headers } = resolveRoute("listObjects", [{ prefix }]);
+			const objects = [];
+			let cursor;
+			do {
+				const response = await postJson(path, headers, {
+					prefix,
+					cursor
+				});
+				if (response.status === 404) throw new Error(`The storage service has no ${path} route, which storage prune needs.`);
+				if (!response.ok) throw new Error(`Failed to list storage objects: ${response.statusText}`);
+				const page = await response.json();
+				for (const object of page.objects) {
+					(0, _hot_updater_plugin_core.parseStorageUri)(object.storageUri, config.protocol);
+					objects.push({
+						key: object.key,
+						storageUri: object.storageUri,
+						size: object.size,
+						...object.lastModifiedAt === void 0 ? {} : { lastModifiedAt: new Date(object.lastModifiedAt) }
+					});
+				}
+				cursor = page.cursor;
+			} while (cursor !== void 0);
+			return objects;
+		},
+		async deleteObjects(keys) {
+			for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) {
+				const batch = keys.slice(offset, offset + DELETE_BATCH_SIZE);
+				const { path, headers } = resolveRoute("deleteObjects", [{ keys: batch }]);
+				const response = await postJson(path, headers, { keys: batch });
+				if (!response.ok) throw new Error(`Failed to delete storage objects: ${response.statusText}`);
+			}
 		}
 	});
 };

package/dist/index.d.cts

@@ -1,10 +1,14 @@
-import { HotUpdaterCoreApi, RemoteDatabase, StorageDeleteInput, StorageExistsInput, StorageGetInput, StoragePutInput } from "@hot-updater/plugin-core";
+import { HotUpdaterCoreApi, Lazy, RemoteDatabase, StorageDeleteInput, StorageExistsInput, StorageGetInput, StorageObject, StoragePutInput } from "@hot-updater/plugin-core";
 //#region src/standaloneRoutes.d.ts
 interface StandaloneRepositoryConfig {
   /** Base URL of the Hot Updater admin handler. */
   readonly baseUrl: string;
-  /** Headers sent with every admin request, such as its authorization. */
-  readonly commonHeaders?: Readonly<Record<string, string>>;
+  /**
+   * Headers sent with every admin request, such as its authorization. A
+   * value may be a function that returns it, such as `secret("<name>")` in
+   * `hot-updater.config.ts`, called on the first request.
+   */
+  readonly commonHeaders?: Readonly<Record<string, Lazy<string>>>;
 }
 //#endregion
 //#region src/standaloneCore.d.ts
@@ -48,12 +52,25 @@ interface StorageRoutes {
   get: (input: StorageGetInput) => RouteConfig;
   exists: (input: StorageExistsInput) => RouteConfig;
   delete: (input: StorageDeleteInput) => RouteConfig;
+  /** Lists objects for `hot-updater storage prune`. */
+  listObjects: (input: {
+    readonly prefix?: string;
+  }) => RouteConfig;
+  /** Deletes exact keys for `hot-updater storage prune --yes`. */
+  deleteObjects: (input: {
+    readonly keys: readonly string[];
+  }) => RouteConfig;
 }
 interface StandaloneStorageConfig {
   baseUrl: string;
   /** Storage URI protocol owned by the remote implementation. */
   protocol: string;
-  commonHeaders?: Record<string, string>;
+  /**
+   * Headers sent with every request. A value may be a function that returns
+   * it, such as `secret("<name>")` in `hot-updater.config.ts`, called on
+   * the first request.
+   */
+  commonHeaders?: Record<string, Lazy<string>>;
   routes?: Partial<StorageRoutes>;
 }
 declare const standaloneStorage: (config: StandaloneStorageConfig) => {
@@ -71,6 +88,8 @@ declare const standaloneStorage: (config: StandaloneStorageConfig) => {
   readonly delete: ({ storageUri }: StorageDeleteInput) => Promise<{
     deleted: true;
   }>;
+  readonly listObjects: (prefix?: string) => Promise<StorageObject[]>;
+  readonly deleteObjects: (keys: readonly string[]) => Promise<void>;
 };
 //#endregion
 export { RouteConfig, STANDALONE_ADMIN_PROTOCOL, StandaloneDatabaseError, StandaloneRepository, type StandaloneRepositoryConfig, StandaloneStorageConfig, StorageRoutes, createStandaloneCoreApi, standaloneRepository, standaloneStorage };

package/dist/index.d.mts

@@ -1,10 +1,14 @@
-import { HotUpdaterCoreApi, RemoteDatabase, StorageDeleteInput, StorageExistsInput, StorageGetInput, StoragePutInput } from "@hot-updater/plugin-core";
+import { HotUpdaterCoreApi, Lazy, RemoteDatabase, StorageDeleteInput, StorageExistsInput, StorageGetInput, StorageObject, StoragePutInput } from "@hot-updater/plugin-core";
 //#region src/standaloneRoutes.d.ts
 interface StandaloneRepositoryConfig {
   /** Base URL of the Hot Updater admin handler. */
   readonly baseUrl: string;
-  /** Headers sent with every admin request, such as its authorization. */
-  readonly commonHeaders?: Readonly<Record<string, string>>;
+  /**
+   * Headers sent with every admin request, such as its authorization. A
+   * value may be a function that returns it, such as `secret("<name>")` in
+   * `hot-updater.config.ts`, called on the first request.
+   */
+  readonly commonHeaders?: Readonly<Record<string, Lazy<string>>>;
 }
 //#endregion
 //#region src/standaloneCore.d.ts
@@ -48,12 +52,25 @@ interface StorageRoutes {
   get: (input: StorageGetInput) => RouteConfig;
   exists: (input: StorageExistsInput) => RouteConfig;
   delete: (input: StorageDeleteInput) => RouteConfig;
+  /** Lists objects for `hot-updater storage prune`. */
+  listObjects: (input: {
+    readonly prefix?: string;
+  }) => RouteConfig;
+  /** Deletes exact keys for `hot-updater storage prune --yes`. */
+  deleteObjects: (input: {
+    readonly keys: readonly string[];
+  }) => RouteConfig;
 }
 interface StandaloneStorageConfig {
   baseUrl: string;
   /** Storage URI protocol owned by the remote implementation. */
   protocol: string;
-  commonHeaders?: Record<string, string>;
+  /**
+   * Headers sent with every request. A value may be a function that returns
+   * it, such as `secret("<name>")` in `hot-updater.config.ts`, called on
+   * the first request.
+   */
+  commonHeaders?: Record<string, Lazy<string>>;
   routes?: Partial<StorageRoutes>;
 }
 declare const standaloneStorage: (config: StandaloneStorageConfig) => {
@@ -71,6 +88,8 @@ declare const standaloneStorage: (config: StandaloneStorageConfig) => {
   readonly delete: ({ storageUri }: StorageDeleteInput) => Promise<{
     deleted: true;
   }>;
+  readonly listObjects: (prefix?: string) => Promise<StorageObject[]>;
+  readonly deleteObjects: (keys: readonly string[]) => Promise<void>;
 };
 //#endregion
 export { RouteConfig, STANDALONE_ADMIN_PROTOCOL, StandaloneDatabaseError, StandaloneRepository, type StandaloneRepositoryConfig, StandaloneStorageConfig, StorageRoutes, createStandaloneCoreApi, standaloneRepository, standaloneStorage };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { DatabaseBundleNotFoundError, ReleaseCatalogMutationError, ReleaseManagementError, createStorageAdapter, parseStorageUri } from "@hot-updater/plugin-core";
+import { DatabaseBundleNotFoundError, ReleaseCatalogMutationError, ReleaseManagementError, createStorageAdapter, parseStorageUri, resolveLazy } from "@hot-updater/plugin-core";
 //#region src/standaloneHttp.ts
 var StandaloneDatabaseError = class extends Error {
 	code;
@@ -11,11 +11,13 @@ var StandaloneDatabaseError = class extends Error {
 	}
 };
 const isRecord$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+/** `headers` with each lazy value resolved. */
+const resolveHeaders = async (headers = {}) => Object.fromEntries(await Promise.all(Object.entries(headers).map(async ([name, value]) => [name, await resolveLazy(value)])));
 const createStandaloneHttp = (config) => {
 	const buildUrl = (path) => `${config.baseUrl.replace(/\/+$/, "")}${path}`;
-	const headers = (routeHeaders) => ({
+	const headers = async (routeHeaders) => ({
 		"Content-Type": "application/json",
-		...config.commonHeaders,
+		...await resolveHeaders(config.commonHeaders),
 		...routeHeaders
 	});
 	const requestFailed = async (response) => {
@@ -107,7 +109,7 @@ const createStandaloneCoreApi = (config) => {
 	const http = createStandaloneHttp(config);
 	let checked;
 	const checkProtocol = async () => {
-		const response = await fetch(http.buildUrl("/version"), { headers: http.headers({ "Cache-Control": "no-cache" }) });
+		const response = await fetch(http.buildUrl("/version"), { headers: await http.headers({ "Cache-Control": "no-cache" }) });
 		const body = response.status === 404 ? {} : await http.parseJson(response);
 		const protocol = isRecord(body) ? body.adminProtocol : void 0;
 		if (typeof protocol !== "number" || protocol < 2) throw new StandaloneDatabaseError("request-failed", `The server at ${config.baseUrl} does not report Hot Updater admin API protocol 2 at /version. Set baseUrl to the path where the server mounts handlers.admin, such as https://example.com/hot-updater/admin.`, response.status);
@@ -124,7 +126,7 @@ const createStandaloneCoreApi = (config) => {
 		for (const [key, value] of Object.entries(query)) url.searchParams.set(key, value);
 		const response = await fetch(url, {
 			method,
-			headers: http.headers(method === "GET" ? { "Cache-Control": "no-cache" } : void 0),
+			headers: await http.headers(method === "GET" ? { "Cache-Control": "no-cache" } : void 0),
 			...body === void 0 ? {} : { body: JSON.stringify(body) }
 		});
 		if (response.status === 204) return null;
@@ -251,8 +253,8 @@ const standaloneRepository = (config) => {
 	return Object.freeze({
 		name: "standalone-repository",
 		core: createStandaloneCoreApi(config),
-		fetchAdmin: (path, init = {}) => {
-			const headers = new Headers(http.headers({ "Cache-Control": "no-cache" }));
+		fetchAdmin: async (path, init = {}) => {
+			const headers = new Headers(await http.headers({ "Cache-Control": "no-cache" }));
 			new Headers(init.headers).forEach((value, name) => {
 				headers.set(name, value);
 			});
@@ -269,8 +271,12 @@ const defaultRoutes = {
 	put: () => ({ path: "/upload" }),
 	get: () => ({ path: "/get" }),
 	exists: () => ({ path: "/exists" }),
-	delete: () => ({ path: "/delete" })
+	delete: () => ({ path: "/delete" }),
+	listObjects: () => ({ path: "/list" }),
+	deleteObjects: () => ({ path: "/delete-objects" })
 };
+/** Keys sent in one `deleteObjects` request. */
+const DELETE_BATCH_SIZE = 1e3;
 const createRoute = (defaultRoute, customRoute) => ({
 	path: customRoute?.path ?? defaultRoute.path,
 	headers: {
@@ -279,8 +285,8 @@ const createRoute = (defaultRoute, customRoute) => ({
 	}
 });
 const standaloneStorage = (config) => {
-	const getHeaders = (routeHeaders) => ({
-		...config.commonHeaders,
+	const getHeaders = async (routeHeaders) => ({
+		...await resolveHeaders(config.commonHeaders),
 		...routeHeaders
 	});
 	const resolveRoute = (name, args) => {
@@ -288,6 +294,14 @@ const standaloneStorage = (config) => {
 		const custom = config.routes?.[name];
 		return createRoute(fallback(...args), custom?.(...args));
 	};
+	const postJson = async (path, headers, body) => fetch(`${config.baseUrl}${path}`, {
+		method: "POST",
+		headers: {
+			"content-type": "application/json",
+			...await getHeaders(headers)
+		},
+		body: JSON.stringify(body)
+	});
 	const requestStorageUri = async (routeName, storageUri) => {
 		parseStorageUri(storageUri, config.protocol);
 		const { path, headers } = resolveRoute(routeName, [{ storageUri }]);
@@ -295,7 +309,7 @@ const standaloneStorage = (config) => {
 			method: routeName === "delete" ? "DELETE" : "POST",
 			headers: {
 				"content-type": "application/json",
-				...getHeaders(headers)
+				...await getHeaders(headers)
 			},
 			body: JSON.stringify({ storageUri })
 		});
@@ -318,7 +332,7 @@ const standaloneStorage = (config) => {
 			formData.append("key", key);
 			const response = await fetch(`${config.baseUrl}${path}`, {
 				method: "POST",
-				headers: getHeaders(headers),
+				headers: await getHeaders(headers),
 				body: formData
 			});
 			if (!response.ok) throw new Error(`Failed to upload bundle: ${response.statusText}`);
@@ -339,6 +353,39 @@ const standaloneStorage = (config) => {
 		async delete({ storageUri }) {
 			await requestStorageUri("delete", storageUri);
 			return { deleted: true };
+		},
+		async listObjects(prefix) {
+			const { path, headers } = resolveRoute("listObjects", [{ prefix }]);
+			const objects = [];
+			let cursor;
+			do {
+				const response = await postJson(path, headers, {
+					prefix,
+					cursor
+				});
+				if (response.status === 404) throw new Error(`The storage service has no ${path} route, which storage prune needs.`);
+				if (!response.ok) throw new Error(`Failed to list storage objects: ${response.statusText}`);
+				const page = await response.json();
+				for (const object of page.objects) {
+					parseStorageUri(object.storageUri, config.protocol);
+					objects.push({
+						key: object.key,
+						storageUri: object.storageUri,
+						size: object.size,
+						...object.lastModifiedAt === void 0 ? {} : { lastModifiedAt: new Date(object.lastModifiedAt) }
+					});
+				}
+				cursor = page.cursor;
+			} while (cursor !== void 0);
+			return objects;
+		},
+		async deleteObjects(keys) {
+			for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) {
+				const batch = keys.slice(offset, offset + DELETE_BATCH_SIZE);
+				const { path, headers } = resolveRoute("deleteObjects", [{ keys: batch }]);
+				const response = await postJson(path, headers, { keys: batch });
+				if (!response.ok) throw new Error(`Failed to delete storage objects: ${response.statusText}`);
+			}
 		}
 	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/standalone",
-  "version": "1.2.0-rc.7",
+  "version": "1.2.0-rc.9",
   "type": "module",
   "description": "React Native OTA solution for self-hosted",
   "sideEffects": false,
@@ -42,8 +42,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@hot-updater/protocol": "1.2.0-rc.7",
-    "@hot-updater/plugin-core": "1.2.0-rc.7"
+    "@hot-updater/protocol": "1.2.0-rc.9",
+    "@hot-updater/plugin-core": "1.2.0-rc.9"
   },
   "devDependencies": {
     "mime": "2.6.0",
@@ -52,12 +52,7 @@
     "msw": "^2.7.0",
     "verkit": "0.4.0",
     "vitest": "4.1.4",
-    "@hot-updater/test-utils": "1.2.0-rc.7"
-  },
-  "nx": {
-    "implicitDependencies": [
-      "!@hot-updater/test-utils"
-    ]
+    "@hot-updater/test-utils": "1.2.0-rc.9"
   },
   "scripts": {
     "build": "tsdown",