@hot-updater/cloudflare 1.2.0-rc.0 → 1.2.0-rc.10

package/dist/init/index.mjs

@@ -106,7 +106,12 @@ const encode = ({ sql, params }) => ({
 * time, or a batch D1 runs in one transaction.
 */
 const d1RestRunner = (config) => {
-	const cloudflare = new Cloudflare$1({ apiToken: config.cloudflareApiToken });
+	const { cloudflareApiToken } = config;
+	let client;
+	const connect = () => client ??= (async () => new Cloudflare$1({ apiToken: typeof cloudflareApiToken === "function" ? await cloudflareApiToken() : cloudflareApiToken }))().catch((error) => {
+		client = void 0;
+		throw error;
+	});
 	const batch = async (statements) => {
 		const [first] = statements;
 		if (first === void 0) return [];
@@ -117,7 +122,7 @@ const d1RestRunner = (config) => {
 			account_id: config.accountId,
 			batch: statements.map(encode)
 		};
-		const page = await cloudflare.d1.database.query(config.databaseId, body);
+		const page = await (await connect()).d1.database.query(config.databaseId, body);
 		const results = [];
 		for await (const resultPage of page.iterPages()) for (const result of resultPage.result) results.push(toSqlResult(result));
 		if (results.length !== statements.length) throw new D1ExecutionError();
@@ -11313,7 +11318,12 @@ const initProvider = {
 			},
 			validate: (value) => value === "true" || value === "false"
 		}
-	}
+	},
+	secrets: [
+		"HOT_UPDATER_CLOUDFLARE_API_TOKEN",
+		"HOT_UPDATER_CLOUDFLARE_R2_ACCESS_KEY_ID",
+		"HOT_UPDATER_CLOUDFLARE_R2_SECRET_ACCESS_KEY"
+	]
 };
 //#endregion
 //#region iac/cloudflareInitInputs.ts
@@ -11401,8 +11411,27 @@ const inputCloudflareInitSecrets = async ({ accountId, bucketName, apiToken, acc
 };
 //#endregion
 //#region iac/configTemplate.ts
-const getConfigScaffold = (build) => {
-	return createHotUpdaterConfigScaffoldFromBuilder(new ConfigBuilder().setBuildType(build).setStorage({
+/**
+* The config init writes. With the `resources` init set up, it names them,
+* and reads the API token and R2 keys with `secret()`, from the
+* environment and `.env.hotupdater`, then the config's `secrets` adapter.
+* Without them, as the agent scaffold writes it before the agent creates the
+* resources, it reads their IDs from the environment, where the agent
+* records them, and the credentials with `secret()` alike.
+*/
+const getConfigScaffold = (build, resources) => {
+	const builder = new ConfigBuilder().setBuildType(build).setPlugins({
+		imports: [{
+			pkg: "hot-updater/plugins",
+			named: [
+				"apiKeys",
+				"insights",
+				"remoteConfig"
+			]
+		}],
+		configString: "[apiKeys(), insights(), remoteConfig()]"
+	});
+	if (resources === void 0) return createHotUpdaterConfigScaffoldFromBuilder(builder.setStorage({
 		imports: [{
 			pkg: "@hot-updater/cloudflare",
 			named: ["r2Storage"]
@@ -11411,8 +11440,8 @@ const getConfigScaffold = (build) => {
     bucketName: process.env.HOT_UPDATER_CLOUDFLARE_R2_BUCKET_NAME!,
     accountId: process.env.HOT_UPDATER_CLOUDFLARE_ACCOUNT_ID!,
     credentials: {
-      accessKeyId: process.env.HOT_UPDATER_CLOUDFLARE_R2_ACCESS_KEY_ID!,
-      secretAccessKey: process.env.HOT_UPDATER_CLOUDFLARE_R2_SECRET_ACCESS_KEY!,
+      accessKeyId: secret("HOT_UPDATER_CLOUDFLARE_R2_ACCESS_KEY_ID"),
+      secretAccessKey: secret("HOT_UPDATER_CLOUDFLARE_R2_SECRET_ACCESS_KEY"),
     },
   })`
 	}).setDatabase({
@@ -11423,18 +11452,41 @@ const getConfigScaffold = (build) => {
 		configString: `d1Database({
     databaseId: process.env.HOT_UPDATER_CLOUDFLARE_D1_DATABASE_ID!,
     accountId: process.env.HOT_UPDATER_CLOUDFLARE_ACCOUNT_ID!,
-    cloudflareApiToken: process.env.HOT_UPDATER_CLOUDFLARE_API_TOKEN!,
+    cloudflareApiToken: secret("HOT_UPDATER_CLOUDFLARE_API_TOKEN"),
   })`
-	}).setPlugins({
+	}).addImport({
+		pkg: "hot-updater",
+		named: ["secret"]
+	}));
+	const accountId = JSON.stringify(resources.accountId);
+	const storageConfig = {
 		imports: [{
-			pkg: "hot-updater/plugins",
-			named: [
-				"apiKeys",
-				"insights",
-				"remoteConfig"
-			]
+			pkg: "@hot-updater/cloudflare",
+			named: ["r2Storage"]
 		}],
-		configString: "[apiKeys(), insights(), remoteConfig()]"
+		configString: `r2Storage({
+    bucketName: ${JSON.stringify(resources.bucketName)},
+    accountId: ${accountId},
+    credentials: {
+      accessKeyId: secret("HOT_UPDATER_CLOUDFLARE_R2_ACCESS_KEY_ID"),
+      secretAccessKey: secret("HOT_UPDATER_CLOUDFLARE_R2_SECRET_ACCESS_KEY"),
+    },
+  })`
+	};
+	const databaseConfig = {
+		imports: [{
+			pkg: "@hot-updater/cloudflare",
+			named: ["d1Database"]
+		}],
+		configString: `d1Database({
+    databaseId: ${JSON.stringify(resources.d1DatabaseId)},
+    accountId: ${accountId},
+    cloudflareApiToken: secret("HOT_UPDATER_CLOUDFLARE_API_TOKEN"),
+  })`
+	};
+	return createHotUpdaterConfigScaffoldFromBuilder(builder.setStorage(storageConfig).setDatabase(databaseConfig).addImport({
+		pkg: "hot-updater",
+		named: ["secret"]
 	}));
 };
 //#endregion
@@ -11507,10 +11559,10 @@ const deployWorker = async (apiToken, accountId, { credentialSource, d1DatabaseI
 		await removeTmpDir();
 	}
 };
-const runInit = async ({ build, envFile }) => {
+const runInit = async ({ build, envFile, secretsEnv }) => {
 	const cwd = getCwd();
 	const nonInteractive = envFile !== void 0;
-	const initEnvSources = await readHotUpdaterInitEnv(cwd, envFile);
+	const initEnvSources = await readHotUpdaterInitEnv(cwd, envFile, secretsEnv);
 	const { managedEnv } = initEnvSources;
 	const initInputEnv = getHotUpdaterInitInputEnv(initEnvSources, nonInteractive);
 	const existingInputs = resolveCloudflareInitInputs(initInputEnv);
@@ -11860,7 +11912,11 @@ const runInit = async ({ build, envFile }) => {
 		await database.dispose?.();
 	}
 	p.log.success("Generated '.env.hotupdater' file with Cloudflare settings.");
-	await writeHotUpdaterFiles(getConfigScaffold(build), {
+	await writeHotUpdaterFiles(getConfigScaffold(build, {
+		accountId,
+		bucketName: selectedBucketName,
+		d1DatabaseId: selectedD1DatabaseId
+	}), {
 		cwd,
 		settings: "Cloudflare"
 	});

package/dist/worker/index.cjs

@@ -121,8 +121,11 @@ const presignR2GetUrl = async ({ accountId, bucketName, credentials, expiresInSe
 //#region src/r2WorkerStorage.ts
 /** Devices download right after the update check that returns the URL. */
 const PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
+/** Keys the binding deletes in one call. */
+const DELETE_BATCH_SIZE = 1e3;
 function r2WorkerStorage(config) {
 	const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+	const basePrefix = getStorageKey() ? `${getStorageKey()}/` : "";
 	const parseAndValidate = (storageUri) => {
 		const parsed = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
 		if (parsed.bucket !== config.bucketName) throw new Error(`Bucket name mismatch: expected "${config.bucketName}", but found "${parsed.bucket}".`);
@@ -178,6 +181,42 @@ function r2WorkerStorage(config) {
 			const { key } = parseAndValidate(storageUri);
 			await config.bucket.delete(key);
 			return { deleted: true };
+		},
+		async listObjects(prefix) {
+			const folder = getStorageKey(prefix ?? "");
+			const objects = [];
+			let cursor;
+			do {
+				const listed = await config.bucket.list({
+					prefix: folder ? `${folder}/` : "",
+					...cursor === void 0 ? {} : { cursor }
+				});
+				for (const object of listed.objects) {
+					if (!object.key.startsWith(basePrefix)) continue;
+					let storageUri;
+					try {
+						storageUri = (0, _hot_updater_plugin_core.createStorageUri)({
+							protocol: "r2",
+							bucket: config.bucketName,
+							key: object.key
+						});
+					} catch {
+						continue;
+					}
+					objects.push({
+						key: object.key.slice(basePrefix.length),
+						lastModifiedAt: object.uploaded,
+						size: object.size,
+						storageUri
+					});
+				}
+				cursor = listed.truncated ? listed.cursor : void 0;
+			} while (cursor !== void 0);
+			return objects;
+		},
+		async deleteObjects(relativeKeys) {
+			const keys = relativeKeys.map((key) => getStorageKey(key));
+			for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) await config.bucket.delete(keys.slice(offset, offset + DELETE_BATCH_SIZE));
 		}
 	});
 }

package/dist/worker/index.d.cts

@@ -48,6 +48,7 @@ type CloudflareWorkerStorageConfig = {
   readonly accountId?: undefined;
   readonly credentials?: undefined;
 });
+type R2WorkerOperations = "put" | "get" | "exists" | "delete" | "listObjects" | "deleteObjects";
 /**
  * Storage on the Worker's R2 binding. With R2's S3-compatible credentials,
  * its download URLs are presigned and devices download from the bucket;
@@ -56,7 +57,7 @@ type CloudflareWorkerStorageConfig = {
  */
 declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig & {
   readonly credentials: R2Credentials;
-}): StorageAdapterWith<"put" | "get" | "getDownloadUrl" | "exists" | "delete">;
-declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig): StorageAdapterWith<"put" | "get" | "exists" | "delete">;
+}): StorageAdapterWith<R2WorkerOperations | "getDownloadUrl">;
+declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig): StorageAdapterWith<R2WorkerOperations>;
 //#endregion
 export { type CloudflareWorkerStorageConfig, type D1Like, d1Database, r2WorkerStorage as r2Storage };

package/dist/worker/index.d.mts

@@ -48,6 +48,7 @@ type CloudflareWorkerStorageConfig = {
   readonly accountId?: undefined;
   readonly credentials?: undefined;
 });
+type R2WorkerOperations = "put" | "get" | "exists" | "delete" | "listObjects" | "deleteObjects";
 /**
  * Storage on the Worker's R2 binding. With R2's S3-compatible credentials,
  * its download URLs are presigned and devices download from the bucket;
@@ -56,7 +57,7 @@ type CloudflareWorkerStorageConfig = {
  */
 declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig & {
   readonly credentials: R2Credentials;
-}): StorageAdapterWith<"put" | "get" | "getDownloadUrl" | "exists" | "delete">;
-declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig): StorageAdapterWith<"put" | "get" | "exists" | "delete">;
+}): StorageAdapterWith<R2WorkerOperations | "getDownloadUrl">;
+declare function r2WorkerStorage(config: CloudflareWorkerStorageConfig): StorageAdapterWith<R2WorkerOperations>;
 //#endregion
 export { type CloudflareWorkerStorageConfig, type D1Like, d1Database, r2WorkerStorage as r2Storage };

package/dist/worker/index.mjs

@@ -120,8 +120,11 @@ const presignR2GetUrl = async ({ accountId, bucketName, credentials, expiresInSe
 //#region src/r2WorkerStorage.ts
 /** Devices download right after the update check that returns the URL. */
 const PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
+/** Keys the binding deletes in one call. */
+const DELETE_BATCH_SIZE = 1e3;
 function r2WorkerStorage(config) {
 	const getStorageKey = createStorageKeyBuilder(config.basePath);
+	const basePrefix = getStorageKey() ? `${getStorageKey()}/` : "";
 	const parseAndValidate = (storageUri) => {
 		const parsed = parseStorageUri(storageUri, "r2");
 		if (parsed.bucket !== config.bucketName) throw new Error(`Bucket name mismatch: expected "${config.bucketName}", but found "${parsed.bucket}".`);
@@ -177,6 +180,42 @@ function r2WorkerStorage(config) {
 			const { key } = parseAndValidate(storageUri);
 			await config.bucket.delete(key);
 			return { deleted: true };
+		},
+		async listObjects(prefix) {
+			const folder = getStorageKey(prefix ?? "");
+			const objects = [];
+			let cursor;
+			do {
+				const listed = await config.bucket.list({
+					prefix: folder ? `${folder}/` : "",
+					...cursor === void 0 ? {} : { cursor }
+				});
+				for (const object of listed.objects) {
+					if (!object.key.startsWith(basePrefix)) continue;
+					let storageUri;
+					try {
+						storageUri = createStorageUri({
+							protocol: "r2",
+							bucket: config.bucketName,
+							key: object.key
+						});
+					} catch {
+						continue;
+					}
+					objects.push({
+						key: object.key.slice(basePrefix.length),
+						lastModifiedAt: object.uploaded,
+						size: object.size,
+						storageUri
+					});
+				}
+				cursor = listed.truncated ? listed.cursor : void 0;
+			} while (cursor !== void 0);
+			return objects;
+		},
+		async deleteObjects(relativeKeys) {
+			const keys = relativeKeys.map((key) => getStorageKey(key));
+			for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) await config.bucket.delete(keys.slice(offset, offset + DELETE_BATCH_SIZE));
 		}
 	});
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/cloudflare",
   "type": "module",
-  "version": "1.2.0-rc.0",
+  "version": "1.2.0-rc.10",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -49,18 +49,19 @@
     "package.json"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "3.1066.0",
-    "@aws-sdk/lib-storage": "3.1008.0",
-    "@aws-sdk/s3-request-presigner": "3.1066.0",
     "cloudflare": "4.2.0",
     "hono": "4.12.34",
     "uuidv7": "^1.0.2",
-    "@hot-updater/protocol": "1.2.0-rc.0",
-    "@hot-updater/plugin-core": "1.2.0-rc.0",
-    "@hot-updater/server": "1.2.0-rc.0",
-    "@hot-updater/cli-tools": "1.2.0-rc.0"
+    "@hot-updater/protocol": "1.2.0-rc.10",
+    "@hot-updater/cli-tools": "1.2.0-rc.10",
+    "@hot-updater/server": "1.2.0-rc.10",
+    "@hot-updater/storage-s3": "1.2.0-rc.10",
+    "@hot-updater/plugin-core": "1.2.0-rc.10"
   },
   "devDependencies": {
+    "@aws-sdk/client-s3": "3.1066.0",
+    "@aws-sdk/lib-storage": "3.1066.0",
+    "@aws-sdk/s3-request-presigner": "3.1066.0",
     "@cloudflare/vitest-pool-workers": "0.13.0",
     "@cloudflare/workers-types": "^4.20260312.1",
     "@types/node": "^20",
@@ -74,7 +75,7 @@
     "vitest": "4.1.4",
     "wrangler": "^4.69.0",
     "xdg-app-paths": "^8.3.0",
-    "@hot-updater/test-utils": "1.2.0-rc.0"
+    "@hot-updater/test-utils": "1.2.0-rc.10"
   },
   "scripts": {
     "build": "tsdown && pnpm build:worker",

package/src/d1Rest.ts

@@ -1,4 +1,4 @@
-import type { SqlResult, SqlStatement } from "@hot-updater/plugin-core";
+import type { Lazy, SqlResult, SqlStatement } from "@hot-updater/plugin-core";
 import Cloudflare from "cloudflare";
 
 import { D1ExecutionError, type D1ResultLike, toSqlResult } from "./d1Executor";
@@ -6,7 +6,12 @@ import { D1ExecutionError, type D1ResultLike, toSqlResult } from "./d1Executor";
 export interface D1RestConfig {
   readonly databaseId: string;
   readonly accountId: string;
-  readonly cloudflareApiToken: string;
+  /**
+   * An API token with D1 edit permission, or a function that returns it,
+   * such as `secret("<name>")` in `hot-updater.config.ts`: called on the
+   * first query, so a config loads without the token.
+   */
+  readonly cloudflareApiToken: Lazy<string>;
 }
 
 /** The REST API binds text: each value goes as JSON and is read back with `json_extract`. */
@@ -21,9 +26,19 @@ const encode = ({ sql, params }: SqlStatement) => ({
  * time, or a batch D1 runs in one transaction.
  */
 export const d1RestRunner = (config: D1RestConfig) => {
-  const cloudflare = new Cloudflare({
-    apiToken: config.cloudflareApiToken,
-  });
+  const { cloudflareApiToken } = config;
+  let client: Promise<Cloudflare> | undefined;
+  const connect = () =>
+    (client ??= (async () =>
+      new Cloudflare({
+        apiToken:
+          typeof cloudflareApiToken === "function"
+            ? await cloudflareApiToken()
+            : cloudflareApiToken,
+      }))().catch((error: unknown) => {
+      client = undefined;
+      throw error;
+    }));
   const batch = async (
     statements: readonly SqlStatement[],
   ): Promise<SqlResult[]> => {
@@ -33,6 +48,7 @@ export const d1RestRunner = (config: D1RestConfig) => {
       statements.length === 1
         ? { account_id: config.accountId, ...encode(first) }
         : { account_id: config.accountId, batch: statements.map(encode) };
+    const cloudflare = await connect();
     // cloudflare@4 predates the D1 REST API's parameterized batch body type.
     const page = await cloudflare.d1.database.query(
       config.databaseId,

package/src/r2S3Storage.ts

@@ -1,154 +1,31 @@
+import type { StorageAdapterWith } from "@hot-updater/plugin-core";
 import {
-  DeleteObjectCommand,
-  GetObjectCommand,
-  HeadObjectCommand,
-  S3Client,
+  createS3Storage,
   type S3ClientConfig,
-} from "@aws-sdk/client-s3";
-import { Upload } from "@aws-sdk/lib-storage";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import {
-  createStorageKeyBuilder,
-  createStorageAdapter,
-  createStorageUri,
-  parseStorageUri,
-  type StorageAdapterWith,
-} from "@hot-updater/plugin-core";
+  type S3CredentialsOption,
+  type S3StorageOperations,
+} from "@hot-updater/storage-s3";
 
-export interface R2S3StorageConfig extends S3ClientConfig {
+export interface R2S3StorageConfig extends Omit<S3ClientConfig, "credentials"> {
   accountId: string;
   bucketName: string;
-  credentials: NonNullable<S3ClientConfig["credentials"]>;
+  /** The SDK's credentials, or an R2 access key whose fields are lazy. */
+  credentials: NonNullable<S3CredentialsOption>;
   /** Base path where bundles will be stored in the bucket. */
   basePath?: string;
 }
 
-/** Devices download right after the update check that returns the URL. */
-const PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
-
-const isObjectNotFoundError = (error: unknown) => {
-  if (
-    error instanceof Error &&
-    (error.name === "NotFound" || error.name === "NoSuchKey")
-  ) {
-    return true;
-  }
-  return (
-    typeof error === "object" &&
-    error !== null &&
-    "$metadata" in error &&
-    (error as { $metadata?: { httpStatusCode?: number } }).$metadata
-      ?.httpStatusCode === 404
-  );
-};
-
 export const createR2S3Storage = (
   config: R2S3StorageConfig,
-): StorageAdapterWith<
-  "put" | "get" | "getDownloadUrl" | "exists" | "delete"
-> => {
-  const {
-    accountId,
-    basePath,
-    bucketName,
-    endpoint,
-    forcePathStyle,
-    region,
-    ...s3Config
-  } = config;
-  const client = new S3Client({
-    ...s3Config,
-    endpoint: endpoint ?? `https://${accountId}.r2.cloudflarestorage.com`,
-    forcePathStyle: forcePathStyle ?? true,
-    region: region ?? "auto",
-  });
-  const getStorageKey = createStorageKeyBuilder(basePath);
-
-  const parseAndValidate = (storageUri: string) => {
-    const parsed = parseStorageUri(storageUri, "r2");
-    if (parsed.bucket !== bucketName) {
-      throw new Error(
-        `Bucket name mismatch: expected "${bucketName}", but found "${parsed.bucket}".`,
-      );
-    }
-    return parsed;
-  };
-
-  return createStorageAdapter({
-    name: "r2Storage",
-    protocol: "r2",
-    async put({ key, body, contentLength, contentType }) {
-      const storageKey = getStorageKey(key);
-      await new Upload({
-        client,
-        params: {
-          Body: body,
-          Bucket: bucketName,
-          CacheControl: "max-age=31536000",
-          ContentLength: contentLength,
-          ContentType: contentType,
-          Key: storageKey,
-        },
-      }).done();
-      return {
-        storageUri: createStorageUri({
-          protocol: "r2",
-          bucket: bucketName,
-          key: storageKey,
-        }),
-      };
-    },
-    async get({ storageUri }) {
-      const { key } = parseAndValidate(storageUri);
-      try {
-        const response = await client.send(
-          new GetObjectCommand({ Bucket: bucketName, Key: key }),
-        );
-        if (!response.Body) return { response: null };
-        const headers = new Headers();
-        if (response.ContentType)
-          headers.set("content-type", response.ContentType);
-        if (response.ContentLength !== undefined) {
-          headers.set("content-length", String(response.ContentLength));
-        }
-        return {
-          response: new Response(response.Body.transformToWebStream(), {
-            headers,
-          }),
-        };
-      } catch (error) {
-        if (isObjectNotFoundError(error)) return { response: null };
-        throw error;
-      }
-    },
-    async getDownloadUrl({ storageUri }) {
-      const { key } = parseAndValidate(storageUri);
-      return {
-        url: await getSignedUrl(
-          client,
-          new GetObjectCommand({ Bucket: bucketName, Key: key }),
-          { expiresIn: PRESIGNED_URL_EXPIRES_IN_SECONDS },
-        ),
-      };
+): StorageAdapterWith<S3StorageOperations> => {
+  const { accountId, endpoint, forcePathStyle, region, ...s3Config } = config;
+  return createS3Storage(
+    { name: "r2Storage", protocol: "r2" },
+    {
+      ...s3Config,
+      endpoint: endpoint ?? `https://${accountId}.r2.cloudflarestorage.com`,
+      forcePathStyle: forcePathStyle ?? true,
+      region: region ?? "auto",
     },
-    async exists({ storageUri }) {
-      const { key } = parseAndValidate(storageUri);
-      try {
-        await client.send(
-          new HeadObjectCommand({ Bucket: bucketName, Key: key }),
-        );
-        return { exists: true };
-      } catch (error) {
-        if (isObjectNotFoundError(error)) return { exists: false };
-        throw error;
-      }
-    },
-    async delete({ storageUri }) {
-      const { key } = parseAndValidate(storageUri);
-      await client.send(
-        new DeleteObjectCommand({ Bucket: bucketName, Key: key }),
-      );
-      return { deleted: true };
-    },
-  });
+  );
 };

package/src/r2Storage.ts

@@ -1,4 +1,5 @@
 import type { StorageAdapterWith } from "@hot-updater/plugin-core";
+import type { S3StorageOperations } from "@hot-updater/storage-s3";
 
 import { createR2S3Storage, type R2S3StorageConfig } from "./r2S3Storage";
 
@@ -7,9 +8,7 @@ export type { R2S3StorageConfig };
 
 export const r2Storage = (
   config: R2S3StorageConfig,
-): StorageAdapterWith<
-  "put" | "get" | "getDownloadUrl" | "exists" | "delete"
-> => {
+): StorageAdapterWith<S3StorageOperations> => {
   if (!config.credentials) {
     throw new Error(
       "r2Storage requires S3-compatible credentials: pass credentials with an R2 access key ID and secret access key.",

package/src/r2WorkerStorage.ts

@@ -4,6 +4,7 @@ import {
   createStorageUri,
   parseStorageUri,
   type StorageAdapterWith,
+  type StorageObject,
 } from "@hot-updater/plugin-core";
 
 import { presignR2GetUrl, type R2Credentials } from "./presignR2Url";
@@ -28,6 +29,16 @@ export type CloudflareWorkerStorageConfig = {
 
 /** Devices download right after the update check that returns the URL. */
 const PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
+/** Keys the binding deletes in one call. */
+const DELETE_BATCH_SIZE = 1000;
+
+type R2WorkerOperations =
+  | "put"
+  | "get"
+  | "exists"
+  | "delete"
+  | "listObjects"
+  | "deleteObjects";
 
 /**
  * Storage on the Worker's R2 binding. With R2's S3-compatible credentials,
@@ -39,14 +50,15 @@ export function r2WorkerStorage(
   config: CloudflareWorkerStorageConfig & {
     readonly credentials: R2Credentials;
   },
-): StorageAdapterWith<"put" | "get" | "getDownloadUrl" | "exists" | "delete">;
+): StorageAdapterWith<R2WorkerOperations | "getDownloadUrl">;
 export function r2WorkerStorage(
   config: CloudflareWorkerStorageConfig,
-): StorageAdapterWith<"put" | "get" | "exists" | "delete">;
+): StorageAdapterWith<R2WorkerOperations>;
 export function r2WorkerStorage(
   config: CloudflareWorkerStorageConfig,
-): StorageAdapterWith<"put" | "get" | "exists" | "delete"> {
+): StorageAdapterWith<R2WorkerOperations> {
   const getStorageKey = createStorageKeyBuilder(config.basePath);
+  const basePrefix = getStorageKey() ? `${getStorageKey()}/` : "";
 
   const parseAndValidate = (storageUri: string) => {
     const parsed = parseStorageUri(storageUri, "r2");
@@ -128,5 +140,46 @@ export function r2WorkerStorage(
       await config.bucket.delete(key);
       return { deleted: true };
     },
+    async listObjects(prefix) {
+      const folder = getStorageKey(prefix ?? "");
+      const objects: StorageObject[] = [];
+      let cursor: string | undefined;
+      do {
+        const listed = await config.bucket.list({
+          prefix: folder ? `${folder}/` : "",
+          ...(cursor === undefined ? {} : { cursor }),
+        });
+        for (const object of listed.objects) {
+          if (!object.key.startsWith(basePrefix)) continue;
+          // A key no `put` writes, such as a folder marker, has no URI.
+          let storageUri: string;
+          try {
+            storageUri = createStorageUri({
+              protocol: "r2",
+              bucket: config.bucketName,
+              key: object.key,
+            });
+          } catch {
+            continue;
+          }
+          objects.push({
+            key: object.key.slice(basePrefix.length),
+            lastModifiedAt: object.uploaded,
+            size: object.size,
+            storageUri,
+          });
+        }
+        cursor = listed.truncated ? listed.cursor : undefined;
+      } while (cursor !== undefined);
+      return objects;
+    },
+    async deleteObjects(relativeKeys) {
+      const keys = relativeKeys.map((key) => getStorageKey(key));
+      for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) {
+        await config.bucket.delete(
+          keys.slice(offset, offset + DELETE_BATCH_SIZE),
+        );
+      }
+    },
   });
 }

package/worker/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-27T15:32:58.641Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-30T00:58:50.180Z.