@hot-updater/cloudflare 0.29.2 → 0.29.4

package/src/d1Database.spec.ts

@@ -1,6 +1,7 @@
 import type { DatabasePlugin } from "@hot-updater/plugin-core";
 import { setupBundleMethodsTestSuite } from "@hot-updater/test-utils";
-import { beforeEach, describe, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
 import { d1Database } from "./d1Database";
 
 type D1Row = {
@@ -40,6 +41,18 @@ const getFilteredRows = (sql: string, params: any[]) => {
   let filteredRows = Array.from(rows.values());
   let index = 0;
 
+  const consumeInValues = (pattern: RegExp) => {
+    const match = sql.match(pattern);
+    if (!match) {
+      return null;
+    }
+
+    const count = (match[1]?.match(/\?/g) ?? []).length;
+    const values = params.slice(index, index + count);
+    index += count;
+    return values;
+  };
+
   if (sql.includes("channel = ?")) {
     const channel = params[index++];
     filteredRows = filteredRows.filter((row) => row.channel === channel);
@@ -50,6 +63,78 @@ const getFilteredRows = (sql: string, params: any[]) => {
     filteredRows = filteredRows.filter((row) => row.platform === platform);
   }
 
+  if (sql.includes("enabled = ?")) {
+    const enabled = Number(params[index++]);
+    filteredRows = filteredRows.filter(
+      (row) => Number(row.enabled) === enabled,
+    );
+  }
+
+  const idInValues = consumeInValues(/id IN \(([^)]+)\)/);
+  if (idInValues) {
+    filteredRows = filteredRows.filter((row) => idInValues.includes(row.id));
+  }
+
+  if (sql.includes("id = ?")) {
+    const id = params[index++];
+    filteredRows = filteredRows.filter((row) => row.id === id);
+  }
+
+  if (sql.includes("id > ?")) {
+    const id = params[index++];
+    filteredRows = filteredRows.filter((row) => row.id.localeCompare(id) > 0);
+  }
+
+  if (sql.includes("id >= ?")) {
+    const id = params[index++];
+    filteredRows = filteredRows.filter((row) => row.id.localeCompare(id) >= 0);
+  }
+
+  if (sql.includes("id < ?")) {
+    const id = params[index++];
+    filteredRows = filteredRows.filter((row) => row.id.localeCompare(id) < 0);
+  }
+
+  if (sql.includes("id <= ?")) {
+    const id = params[index++];
+    filteredRows = filteredRows.filter((row) => row.id.localeCompare(id) <= 0);
+  }
+
+  if (sql.includes("target_app_version IS NOT NULL")) {
+    filteredRows = filteredRows.filter(
+      (row) => row.target_app_version !== null,
+    );
+  }
+
+  if (sql.includes("target_app_version IS NULL")) {
+    filteredRows = filteredRows.filter(
+      (row) => row.target_app_version === null,
+    );
+  } else if (sql.includes("target_app_version = ?")) {
+    const targetAppVersion = params[index++];
+    filteredRows = filteredRows.filter(
+      (row) => row.target_app_version === targetAppVersion,
+    );
+  }
+
+  const targetAppVersionInValues = consumeInValues(
+    /target_app_version IN \(([^)]+)\)/,
+  );
+  if (targetAppVersionInValues) {
+    filteredRows = filteredRows.filter((row) =>
+      targetAppVersionInValues.includes(row.target_app_version),
+    );
+  }
+
+  if (sql.includes("fingerprint_hash IS NULL")) {
+    filteredRows = filteredRows.filter((row) => row.fingerprint_hash === null);
+  } else if (sql.includes("fingerprint_hash = ?")) {
+    const fingerprintHash = params[index++];
+    filteredRows = filteredRows.filter(
+      (row) => row.fingerprint_hash === fingerprintHash,
+    );
+  }
+
   return { filteredRows, index };
 };
 
@@ -170,4 +255,44 @@ describe("d1Database plugin", () => {
       await plugin.commitBundle();
     },
   });
+
+  it("refreshes bundle data before merging an update after a previous list request", async () => {
+    const bundleId = "bundle-stale-cache";
+    const initialRow: D1Row = {
+      id: bundleId,
+      channel: "production",
+      enabled: 1,
+      should_force_update: 0,
+      file_hash: "hash-1",
+      git_commit_hash: "commit-1",
+      message: "stale message",
+      platform: "ios",
+      target_app_version: "1.0.0",
+      storage_uri: "s3://bucket/stale.zip",
+      fingerprint_hash: null,
+      metadata: JSON.stringify({ source: "initial" }),
+      rollout_cohort_count: 1000,
+      target_cohorts: null,
+    };
+    rows.set(bundleId, initialRow);
+
+    await plugin.getBundles({ limit: 20, offset: 0 });
+
+    rows.set(bundleId, {
+      ...initialRow,
+      message: "fresh message",
+      metadata: JSON.stringify({ source: "fresh" }),
+    });
+
+    await plugin.updateBundle(bundleId, { enabled: false });
+    await plugin.commitBundle();
+
+    expect(rows.get(bundleId)).toEqual(
+      expect.objectContaining({
+        enabled: 0,
+        message: "fresh message",
+        metadata: JSON.stringify({ source: "fresh" }),
+      }),
+    );
+  });
 });

package/src/d1Database.ts

@@ -176,7 +176,6 @@ function transformRowToBundle(row: SnakeCaseBundle): Bundle {
 export const d1Database = createDatabasePlugin<D1DatabaseConfig>({
   name: "d1Database",
   factory: (config) => {
-    let bundles: Bundle[] = [];
     const cf = new Cloudflare({
       apiToken: config.cloudflareApiToken,
     });
@@ -233,11 +232,6 @@ export const d1Database = createDatabasePlugin<D1DatabaseConfig>({
 
     return {
       async getBundleById(bundleId) {
-        const found = bundles.find((b) => b.id === bundleId);
-        if (found) {
-          return found;
-        }
-
         const sql = minify(/* sql */ `
           SELECT * FROM bundles WHERE id = ? LIMIT 1`);
         const singlePage = await cf.d1.database.query(config.databaseId, {
@@ -262,7 +256,12 @@ export const d1Database = createDatabasePlugin<D1DatabaseConfig>({
         const totalCount = await getTotalCount(where);
 
         // 2. Get paginated bundles
-        bundles = await getPaginatedBundles(where, limit, offset, orderBy);
+        const bundles = await getPaginatedBundles(
+          where,
+          limit,
+          offset,
+          orderBy,
+        );
 
         // 3. Calculate pagination metadata
         const paginationOptions: PaginationOptions = { limit, offset };
@@ -306,9 +305,6 @@ export const d1Database = createDatabasePlugin<D1DatabaseConfig>({
               sql: deleteSql,
               params: [op.data.id],
             });
-
-            // Update local bundles array
-            bundles = bundles.filter((b) => b.id !== op.data.id);
           } else if (op.operation === "insert" || op.operation === "update") {
             // Handle insert and update operations
             const bundle = op.data;

package/src/r2Storage.ts

@@ -1,3 +1,5 @@
+import path from "path";
+
 import {
   createStorageKeyBuilder,
   createStoragePlugin,
@@ -6,7 +8,6 @@ import {
 } from "@hot-updater/plugin-core";
 import { ExecaError } from "execa";
 
-import path from "path";
 import { createWrangler } from "./utils/createWrangler";
 
 export interface R2StorageConfig {

package/src/r2WorkerStorage.ts

@@ -44,8 +44,8 @@ const resolveJwtSecretFromContext = (
 };
 
 export const r2WorkerStorage = <
-  TContext extends
-    RequestEnvContext<CloudflareWorkerStorageEnv> = RequestEnvContext<CloudflareWorkerStorageEnv>,
+  TContext extends RequestEnvContext<CloudflareWorkerStorageEnv> =
+    RequestEnvContext<CloudflareWorkerStorageEnv>,
 >(
   config: CloudflareWorkerStorageConfig<TContext>,
 ) => {

package/src/worker/index.ts

@@ -1,6 +1,7 @@
 export { verifyJwtSignedUrl } from "@hot-updater/js";
 
 import type { RequestEnvContext as BaseRequestEnvContext } from "@hot-updater/plugin-core";
+
 import {
   type CloudflareWorkerDatabaseEnv,
   d1WorkerDatabase,
@@ -14,20 +15,19 @@ import {
 export type { CloudflareWorkerDatabaseEnv, CloudflareWorkerStorageEnv };
 
 export interface CloudflareWorkerRuntimeEnv
-  extends CloudflareWorkerDatabaseEnv,
-    CloudflareWorkerStorageEnv {}
+  extends CloudflareWorkerDatabaseEnv, CloudflareWorkerStorageEnv {}
 
 export type RequestEnvContext<TEnv = CloudflareWorkerRuntimeEnv> =
   BaseRequestEnvContext<TEnv>;
 
 export const d1Database = <
-  TContext extends
-    RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>,
+  TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> =
+    RequestEnvContext<CloudflareWorkerRuntimeEnv>,
 >() => d1WorkerDatabase<TContext>();
 
 export const r2Storage = <
-  TContext extends
-    RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>,
+  TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> =
+    RequestEnvContext<CloudflareWorkerRuntimeEnv>,
 >(
   config: CloudflareWorkerStorageConfig<TContext>,
 ) => r2WorkerStorage<TContext>(config);

package/worker/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "hot-updater" generated at 2026-04-03T14:22:57.023Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-04-07T10:08:43.621Z.

package/worker/dist/index.js

@@ -3326,12 +3326,12 @@ function mergeBundleUpdate(baseBundle, patch) {
 __name(mergeBundleUpdate, "mergeBundleUpdate");
 function createDatabasePlugin(options) {
   return (config2, hooks) => {
+    let cachedMethods = null;
+    const getMethods = /* @__PURE__ */ __name(() => {
+      if (!cachedMethods) cachedMethods = options.factory(config2);
+      return cachedMethods;
+    }, "getMethods");
     return () => {
-      let cachedMethods = null;
-      const getMethods = /* @__PURE__ */ __name(() => {
-        if (!cachedMethods) cachedMethods = options.factory(config2);
-        return cachedMethods;
-      }, "getMethods");
       const changedMap = /* @__PURE__ */ new Map();
       const markChanged = /* @__PURE__ */ __name((operation, data) => {
         changedMap.set(data.id, {
@@ -3362,8 +3362,8 @@ function createDatabasePlugin(options) {
           const params = { changedSets: Array.from(changedMap.values()) };
           if (context2 === void 0) await methods.commitBundle(params);
           else await methods.commitBundle(params, context2);
-          await hooks?.onDatabaseUpdated?.();
           changedMap.clear();
+          await hooks?.onDatabaseUpdated?.();
         },
         async updateBundle(targetBundleId, newBundle, context2) {
           const pendingChange = changedMap.get(targetBundleId);
@@ -3460,18 +3460,28 @@ var INIT_BUNDLE_ROLLBACK_UPDATE_INFO = {
   storageUri: null,
   fileHash: null
 };
-function createPluginDatabaseCore(plugin, resolveFileUrl) {
-  const getSortedBundlePage = /* @__PURE__ */ __name(async (options, context2) => {
-    const result = await plugin.getBundles(
+function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
+  const runWithMutationPlugin = /* @__PURE__ */ __name(async (operation) => {
+    const plugin = options?.createMutationPlugin?.() ?? getPlugin();
+    try {
+      return await operation(plugin);
+    } finally {
+      if (options?.createMutationPlugin) {
+        await options.cleanupMutationPlugin?.(plugin);
+      }
+    }
+  }, "runWithMutationPlugin");
+  const getSortedBundlePage = /* @__PURE__ */ __name(async (options2, context2) => {
+    const result = await getPlugin().getBundles(
       {
-        ...options,
-        orderBy: options.orderBy ?? DESC_ORDER
+        ...options2,
+        orderBy: options2.orderBy ?? DESC_ORDER
       },
       context2
     );
     return {
       ...result,
-      data: sortBundles(result.data, options.orderBy ?? DESC_ORDER)
+      data: sortBundles(result.data, options2.orderBy ?? DESC_ORDER)
     };
   }, "getSortedBundlePage");
   const isEligibleForUpdate = /* @__PURE__ */ __name((bundle, cohort) => {
@@ -3551,7 +3561,7 @@ function createPluginDatabaseCore(plugin, resolveFileUrl) {
   }), "getBaseWhere");
   const api = {
     async getBundleById(id, context2) {
-      return plugin.getBundleById(id, context2);
+      return getPlugin().getBundleById(id, context2);
     },
     async getUpdateInfo(args, context2) {
       const channel2 = args.channel ?? "production";
@@ -3595,31 +3605,37 @@ function createPluginDatabaseCore(plugin, resolveFileUrl) {
       return { ...rest, fileUrl };
     },
     async getChannels(context2) {
-      return plugin.getChannels(context2);
+      return getPlugin().getChannels(context2);
     },
-    async getBundles(options, context2) {
-      return plugin.getBundles(options, context2);
+    async getBundles(options2, context2) {
+      return getPlugin().getBundles(options2, context2);
     },
     async insertBundle(bundle, context2) {
-      await plugin.appendBundle(bundle, context2);
-      await plugin.commitBundle(context2);
+      await runWithMutationPlugin(async (plugin) => {
+        await plugin.appendBundle(bundle, context2);
+        await plugin.commitBundle(context2);
+      });
     },
     async updateBundleById(bundleId, newBundle, context2) {
-      await plugin.updateBundle(bundleId, newBundle, context2);
-      await plugin.commitBundle(context2);
+      await runWithMutationPlugin(async (plugin) => {
+        await plugin.updateBundle(bundleId, newBundle, context2);
+        await plugin.commitBundle(context2);
+      });
     },
     async deleteBundleById(bundleId, context2) {
-      const bundle = await plugin.getBundleById(bundleId, context2);
-      if (!bundle) {
-        return;
-      }
-      await plugin.deleteBundle(bundle, context2);
-      await plugin.commitBundle(context2);
+      await runWithMutationPlugin(async (plugin) => {
+        const bundle = await plugin.getBundleById(bundleId, context2);
+        if (!bundle) {
+          return;
+        }
+        await plugin.deleteBundle(bundle, context2);
+        await plugin.commitBundle(context2);
+      });
     }
   };
   return {
     api,
-    adapterName: plugin.name,
+    adapterName: getPlugin().name,
     createMigrator: /* @__PURE__ */ __name(() => {
       throw new Error(
         "createMigrator is only available for Kysely/Prisma/Drizzle database adapters."
@@ -3856,7 +3872,7 @@ var handleGetBundles = /* @__PURE__ */ __name(async (_params, request, api, cont
     },
     context2
   );
-  return new Response(JSON.stringify(result.data), {
+  return new Response(JSON.stringify(result), {
     status: 200,
     headers: { "Content-Type": "application/json" }
   });
@@ -3893,7 +3909,12 @@ var handleDeleteBundle = /* @__PURE__ */ __name(async (params, _request, api, co
 }, "handleDeleteBundle");
 var handleGetChannels = /* @__PURE__ */ __name(async (_params, _request, api, context2) => {
   const channels = await api.getChannels(context2);
-  return new Response(JSON.stringify({ channels }), {
+  const response = {
+    data: {
+      channels
+    }
+  };
+  return new Response(JSON.stringify(response), {
     status: 200,
     headers: { "Content-Type": "application/json" }
   });
@@ -4006,6 +4027,7 @@ var normalizeBasePath = /* @__PURE__ */ __name((basePath) => {
 
 // ../../packages/server/src/runtime.ts
 function createHotUpdater(options) {
+  const database = options.database;
   const basePath = normalizeBasePath(options.basePath ?? "/api");
   const storagePlugins = (options.storages ?? options.storagePlugins ?? []).map(
     (plugin2) => typeof plugin2 === "function" ? plugin2() : plugin2
@@ -4031,15 +4053,18 @@ function createHotUpdater(options) {
     }
     return fileUrl;
   }, "resolveStoragePluginUrl");
-  if (!isDatabasePluginFactory(options.database) && !isDatabasePlugin(options.database)) {
+  if (!isDatabasePluginFactory(database) && !isDatabasePlugin(database)) {
     throw new Error(
       "@hot-updater/server/runtime only supports database plugins."
     );
   }
-  const plugin = isDatabasePluginFactory(options.database) ? options.database() : options.database;
+  const plugin = isDatabasePluginFactory(database) ? database() : database;
   const core = createPluginDatabaseCore(
-    plugin,
-    resolveStoragePluginUrl
+    () => plugin,
+    resolveStoragePluginUrl,
+    isDatabasePluginFactory(database) ? {
+      createMutationPlugin: /* @__PURE__ */ __name(() => database(), "createMutationPlugin")
+    } : void 0
   );
   const api = {
     ...core.api,
@@ -8828,7 +8853,6 @@ var resolveDbFromContext = /* @__PURE__ */ __name((context2) => {
 var d1WorkerDatabase = /* @__PURE__ */ __name(() => createDatabasePlugin({
   name: "d1WorkerDatabase",
   factory: /* @__PURE__ */ __name((config2) => {
-    let bundles = [];
     const queryAll = /* @__PURE__ */ __name(async (sql, params = [], context2) => {
       const result = await config2.getDb(context2).prepare(sql).bind(...params).all();
       return result.results ?? [];
@@ -8839,10 +8863,6 @@ var d1WorkerDatabase = /* @__PURE__ */ __name(() => createDatabasePlugin({
     }, "queryFirst");
     return {
       async getBundleById(bundleId, context2) {
-        const found = bundles.find((bundle) => bundle.id === bundleId);
-        if (found) {
-          return found;
-        }
         const row = await queryFirst(
           "SELECT * FROM bundles WHERE id = ? LIMIT 1",
           [bundleId],
@@ -8865,7 +8885,7 @@ var d1WorkerDatabase = /* @__PURE__ */ __name(() => createDatabasePlugin({
           [...params, limit, offset],
           context2
         );
-        bundles = rows.map(transformRowToBundle);
+        const bundles = rows.map(transformRowToBundle);
         const paginationOptions = { limit, offset };
         return {
           data: bundles,
@@ -8888,9 +8908,6 @@ var d1WorkerDatabase = /* @__PURE__ */ __name(() => createDatabasePlugin({
         for (const operation of changedSets) {
           if (operation.operation === "delete") {
             await db.prepare("DELETE FROM bundles WHERE id = ?").bind(operation.data.id).run();
-            bundles = bundles.filter(
-              (bundle2) => bundle2.id !== operation.data.id
-            );
             continue;
           }
           const bundle = operation.data;