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

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";
@@ -8,10 +8,10 @@ export interface D1RestConfig {
   readonly accountId: string;
   /**
    * An API token with D1 edit permission, or a function that returns it,
-   * such as one that reads it with `secretEnv`: called on the first query,
-   * so a config loads without the token.
+   * such as `secret("<name>")` in `hot-updater.config.ts`: called on the
+   * first query, so a config loads without the token.
    */
-  readonly cloudflareApiToken: string | (() => string | Promise<string>);
+  readonly cloudflareApiToken: Lazy<string>;
 }
 
 /** The REST API binds text: each value goes as JSON and is read back with `json_extract`. */

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-29T02:19:11.482Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-29T15:00:44.535Z.

package/worker/dist/index.js

@@ -4632,7 +4632,7 @@ var createSqlAdapter = /* @__PURE__ */ __name(({ executor, tablePrefix = "", max
 }, "createSqlAdapter");
 
 // ../../packages/server/dist/package.mjs
-var version = "1.2.0-rc.7";
+var version = "1.2.0-rc.9";
 
 // ../../packages/server/dist/version.mjs
 var HOT_UPDATER_SERVER_VERSION = version;
@@ -13683,8 +13683,10 @@ var presignR2GetUrl = /* @__PURE__ */ __name(async ({
 
 // src/r2WorkerStorage.ts
 var PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
+var DELETE_BATCH_SIZE = 1e3;
 function r2WorkerStorage(config) {
   const getStorageKey = createStorageKeyBuilder(config.basePath);
+  const basePrefix = getStorageKey() ? `${getStorageKey()}/` : "";
   const parseAndValidate = /* @__PURE__ */ __name((storageUri) => {
     const parsed = parseStorageUri(storageUri, "r2");
     if (parsed.bucket !== config.bucketName) {
@@ -13761,6 +13763,46 @@ 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 listed2 = await config.bucket.list({
+          prefix: folder ? `${folder}/` : "",
+          ...cursor === void 0 ? {} : { cursor }
+        });
+        for (const object of listed2.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 = listed2.truncated ? listed2.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)
+        );
+      }
     }
   });
 }