@hot-updater/cloudflare 1.2.0-rc.12 → 1.2.0-rc.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/cloudflare",
   "type": "module",
-  "version": "1.2.0-rc.12",
+  "version": "1.2.0-rc.13",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -52,11 +52,11 @@
     "cloudflare": "4.2.0",
     "hono": "4.12.34",
     "uuidv7": "^1.0.2",
-    "@hot-updater/protocol": "1.2.0-rc.12",
-    "@hot-updater/cli-tools": "1.2.0-rc.12",
-    "@hot-updater/plugin-core": "1.2.0-rc.12",
-    "@hot-updater/storage-s3": "1.2.0-rc.12",
-    "@hot-updater/server": "1.2.0-rc.12"
+    "@hot-updater/protocol": "1.2.0-rc.13",
+    "@hot-updater/plugin-core": "1.2.0-rc.13",
+    "@hot-updater/server": "1.2.0-rc.13",
+    "@hot-updater/storage-s3": "1.2.0-rc.13",
+    "@hot-updater/cli-tools": "1.2.0-rc.13"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "3.1066.0",
@@ -75,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.12"
+    "@hot-updater/test-utils": "1.2.0-rc.13"
   },
   "scripts": {
     "build": "tsdown && pnpm build:worker",

package/sql/bundles.sql

@@ -36,12 +36,14 @@ CREATE UNIQUE INDEX IF NOT EXISTS "channels_name" ON "channels" ("name");
 
 CREATE TABLE IF NOT EXISTS "bundle_totals" ("platform_key" TEXT NOT NULL, "_shard" INTEGER NOT NULL, "bundles" INTEGER NOT NULL, "_v" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY ("platform_key", "_shard"));
 
-CREATE TABLE IF NOT EXISTS "native_builds" ("id" TEXT NOT NULL, "scope_key" TEXT NOT NULL, "platform" TEXT NOT NULL, "channel_id" TEXT NOT NULL, "fingerprint_hash" TEXT, "app_version" TEXT, "min_bundle_id" TEXT NOT NULL, "artifact_kind" TEXT NOT NULL, "artifact_storage_uri" TEXT NOT NULL, "byte_size" INTEGER NOT NULL, "git_commit_hash" TEXT, "created_at_ms" INTEGER NOT NULL, "build_key" TEXT, "build_number" TEXT, "submitted_to" TEXT, "submitted_at_ms" INTEGER, "submitted_version" TEXT, "_v" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY ("id"));
+CREATE TABLE IF NOT EXISTS "native_builds" ("id" TEXT NOT NULL, "scope_key" TEXT NOT NULL, "platform" TEXT NOT NULL, "channel_id" TEXT NOT NULL, "fingerprint_hash" TEXT, "app_version" TEXT, "min_bundle_id" TEXT NOT NULL, "artifact_kind" TEXT NOT NULL, "artifact_storage_uri" TEXT NOT NULL, "byte_size" INTEGER NOT NULL, "git_commit_hash" TEXT, "created_at_ms" INTEGER NOT NULL, "build_key" TEXT, "build_number" TEXT, "submitted_to" TEXT, "submitted_at_ms" INTEGER, "submitted_version" TEXT, "store_build" INTEGER, "_v" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY ("id"));
 
 CREATE INDEX IF NOT EXISTS "native_builds_byScope" ON "native_builds" ("scope_key", "id");
 
 CREATE INDEX IF NOT EXISTS "native_builds_byBuildKey" ON "native_builds" ("scope_key", "build_key", "id");
 
+CREATE UNIQUE INDEX IF NOT EXISTS "native_builds_byStoreBuild" ON "native_builds" ("scope_key", "store_build");
+
 CREATE INDEX IF NOT EXISTS "native_builds_byChannel" ON "native_builds" ("channel_id", "id");
 
 CREATE UNIQUE INDEX IF NOT EXISTS "native_builds_min_bundle_id" ON "native_builds" ("min_bundle_id");

package/worker/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-30T04:39:59.029Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-11-03T07:59:35.818Z.

package/worker/dist/index.js

@@ -2600,6 +2600,10 @@ var nativeBuilds = defineTable({
     type: "string",
     maxLength: 255,
     required: false
+  },
+  store_build: {
+    type: "boolean",
+    required: false
   }
 }, {
   key: ["id"],
@@ -2612,6 +2616,11 @@ var nativeBuilds = defineTable({
       eq: ["scope_key", "build_key"],
       sort: ["id"]
     },
+    byStoreBuild: {
+      eq: ["scope_key", "store_build"],
+      sort: [],
+      unique: true
+    },
     byChannel: {
       eq: ["channel_id"],
       sort: ["id"],
@@ -2813,10 +2822,7 @@ var LOG_TABLES = [
 var LEASE_TABLE = "aggregate_lease";
 var LEASE = { id: "compaction" };
 var LEASE_MS = 3e4;
-var WINDOW_MS = {
-  log: 6e4,
-  memory: 15e3
-};
+var WINDOW_MS = 6e4;
 var LOG_PAGE = 200;
 var GROUPS = {
   commit: 1,
@@ -2824,7 +2830,6 @@ var GROUPS = {
   flush: 256
 };
 var ATTEMPTS = 5;
-var MAX_BUFFERED = 1e4;
 var log = defineTable({
   id: {
     type: "string",
@@ -2926,8 +2931,8 @@ var rewrite2 = /* @__PURE__ */ __name((change, key, current) => {
     previous: current
   };
 }, "rewrite");
-var compile = /* @__PURE__ */ __name(async (adapter, changes, shard) => {
-  const keys = changes.map(({ model, key }) => [...key.slice(0, -1), shard(model)]);
+var compile = /* @__PURE__ */ __name(async (adapter, changes) => {
+  const keys = changes.map(({ key }) => [...key.slice(0, -1), 0]);
   const reads = /* @__PURE__ */ new Map();
   changes.forEach((change, at) => {
     if (rewrites(change)) reads.set(change.model, [...reads.get(change.model) ?? [], at]);
@@ -2973,7 +2978,7 @@ var encode2 = /* @__PURE__ */ __name(async (changes) => {
   const zipped = await deflate(json4);
   return zipped !== void 0 && zipped.length < json4.length ? `z${zipped}` : json4;
 }, "encode");
-var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema, batching: { mode = "log", windowMs = WINDOW_MS[mode] }, now }) => {
+var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema, batching: { windowMs = WINDOW_MS }, now }) => {
   if (!schema.models.has(LEASE_TABLE)) throw new DatabaseTransactionError("An engine that batches aggregates needs aggregateBatchingModule in its schema.");
   const holder = crypto.randomUUID().replaceAll("-", "");
   const table = /* @__PURE__ */ __name((name) => schema.models.get(name).table, "table");
@@ -3000,61 +3005,6 @@ var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema,
     }
     return changes;
   }, "decode");
-  const apply = /* @__PURE__ */ __name(async (changes, shard) => {
-    let rest = changes;
-    let ops = [];
-    let read = true;
-    for (let failures = 0; rest.length > 0 && failures < ATTEMPTS; ) try {
-      if (read) ops = await compile(adapter, rest, shard);
-      let size = rest.length;
-      const chunk = /* @__PURE__ */ __name(() => ops.slice(0, size).filter(isOp), "chunk");
-      while (size > 1 && !adapter.fits(chunk())) size = Math.ceil(size / 2);
-      let result = { ok: true };
-      if (chunk().length > 0) result = await adapter.write(chunk()).catch((error) => {
-        warn("flush")(error);
-        return { ok: true };
-      });
-      read = !result.ok && !("retry" in result);
-      if (result.ok) {
-        rest = rest.slice(size);
-        ops = ops.slice(size);
-        failures = 0;
-      } else {
-        failures += 1;
-        if (!read) await sleep(failures);
-      }
-    } catch (error) {
-      warn("flush")(error);
-      return rest;
-    }
-    return rest;
-  }, "apply");
-  let buffer = /* @__PURE__ */ new Map();
-  let timer;
-  let flushing;
-  const shards = /* @__PURE__ */ new Map();
-  const processShard = /* @__PURE__ */ __name((model) => {
-    if (!shards.has(model)) shards.set(model, Math.floor(Math.random() * shapeOf(model).shards));
-    return shards.get(model);
-  }, "processShard");
-  const schedule = /* @__PURE__ */ __name(() => {
-    if (timer !== void 0 || buffer.size === 0) return;
-    timer = setTimeout(() => {
-      timer = void 0;
-      flushBuffer();
-    }, windowMs);
-    timer.unref?.();
-  }, "schedule");
-  const flushBuffer = /* @__PURE__ */ __name(() => flushing ??= (async () => {
-    clearTimeout(timer);
-    timer = void 0;
-    const pending = [...buffer.values()];
-    buffer = /* @__PURE__ */ new Map();
-    mergeAll(buffer, await apply(pending, processShard));
-  })().catch(warn("flush")).finally(() => {
-    flushing = void 0;
-    schedule();
-  }), "flushBuffer");
   let nextDue = 0;
   let compacting;
   const known = /* @__PURE__ */ new Map();
@@ -3176,7 +3126,7 @@ var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema,
       more
     };
   }, "readLogs");
-  const rowsFor = /* @__PURE__ */ __name(async (changes) => (await compile(adapter, changes, () => 0)).filter(isOp), "rowsFor");
+  const rowsFor = /* @__PURE__ */ __name(async (changes) => (await compile(adapter, changes)).filter(isOp), "rowsFor");
   const applyGroup = /* @__PURE__ */ __name(async (held, logs) => {
     for (let count = logs.length; count > 0; count = Math.floor(count / 2)) {
       const batch = logs.slice(0, count);
@@ -3256,19 +3206,6 @@ var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema,
   }))).then((pages) => pages.some((page2) => page2.rows.length > 0)).finally(() => {
     checking = void 0;
   }), "hasPending");
-  const committed = /* @__PURE__ */ __name(async (changes) => {
-    if (mode === "log") {
-      if (now() >= nextDue) await compact(false, GROUPS.commit);
-      return;
-    }
-    mergeAll(buffer, changes.values());
-    schedule();
-    if (buffer.size >= MAX_BUFFERED) await flushBuffer();
-  }, "committed");
-  const flush = /* @__PURE__ */ __name(async () => {
-    await flushBuffer();
-    if (mode === "log" && await hasPending()) await compact(true, GROUPS.flush);
-  }, "flush");
   return {
     async transaction(fn) {
       let changes = /* @__PURE__ */ new Map();
@@ -3294,7 +3231,7 @@ var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema,
             aggregate
           });
           if (failure) throw failure.error;
-          if (mode === "log" && attempt.size > 0) {
+          if (attempt.size > 0) {
             const id = `${now().toString(36).padStart(9, "0")}${holder.slice(0, 8)}${crypto.randomUUID().slice(0, 8)}`;
             const shard = Math.floor(Math.random() * LOG_TABLES.length);
             const merged = mergeAll(/* @__PURE__ */ new Map(), attempt.values());
@@ -3308,24 +3245,18 @@ var createAggregateBatches = /* @__PURE__ */ __name(({ engine, adapter, schema,
           open = false;
         }
       });
-      if (changes.size > 0) await committed(changes);
+      if (changes.size > 0 && now() >= nextDue) await compact(false, GROUPS.commit);
       return result;
     },
     async beforeRead(name) {
       if (!isBatched(schema.models.get(name))) return;
-      if (buffer.size > 0 || flushing !== void 0) await flushBuffer();
-      if (mode === "log") {
-        if (await hasPending().catch((error) => {
-          warn("read")(error);
-          return false;
-        })) await compact(true, GROUPS.read);
-      }
+      if (await hasPending().catch((error) => {
+        warn("read")(error);
+        return false;
+      })) await compact(true, GROUPS.read);
     },
-    flush,
-    async dispose() {
-      clearTimeout(timer);
-      timer = void 0;
-      await flush();
+    async flush() {
+      if (await hasPending()) await compact(true, GROUPS.flush);
     }
   };
 }, "createAggregateBatches");
@@ -4294,13 +4225,10 @@ var createDatabaseEngine = /* @__PURE__ */ __name(({ batching, now = Date.now, m
   }, "barePage");
   return {
     ...engine,
-    /** Applies batched aggregate changes still pending: this process's buffer and the log. */
+    /** Applies the batched aggregate changes still in the log. */
     flush: /* @__PURE__ */ __name(async () => {
       await batches?.flush();
     }, "flush"),
-    dispose: /* @__PURE__ */ __name(async () => {
-      await batches?.dispose();
-    }, "dispose"),
     database(module) {
       const name = /* @__PURE__ */ __name((model) => module.namespace ? `${module.namespace}_${model}` : model, "name");
       return {
@@ -4368,8 +4296,7 @@ var createEngine = /* @__PURE__ */ __name((database, { plugins = [], now = Date.
       if (module === void 0) throw new HotUpdaterConfigError(`Plugin "${plugin.id}" is not one of this engine's plugins.`);
       return engine.database(module);
     }, "database"),
-    flush: /* @__PURE__ */ __name(() => engine.flush(), "flush"),
-    dispose: /* @__PURE__ */ __name(() => engine.dispose(), "dispose")
+    flush: /* @__PURE__ */ __name(() => engine.flush(), "flush")
   };
 }, "createEngine");
 
@@ -4632,7 +4559,7 @@ var createSqlAdapter = /* @__PURE__ */ __name(({ executor, tablePrefix = "", max
 }, "createSqlAdapter");
 
 // ../../packages/server/dist/package.mjs
-var version = "1.2.0-rc.12";
+var version = "1.2.0-rc.13";
 
 // ../../packages/server/dist/version.mjs
 var HOT_UPDATER_SERVER_VERSION = version;
@@ -5807,8 +5734,12 @@ var pick2 = /* @__PURE__ */ __name((row) => ({
   build_number: row.build_number ?? null,
   submitted_to: row.submitted_to ?? null,
   submitted_at_ms: row.submitted_at_ms ?? null,
-  submitted_version: row.submitted_version ?? null
+  submitted_version: row.submitted_version ?? null,
+  store_build: row.store_build === true ? true : null
 }), "pick");
+var SANDBOX_CHANNEL_PREFIX = "sandbox-";
+var OLDER_BUILDS_PAGE = 20;
+var MARK_ATTEMPTS = 8;
 var SUBMISSION_DESTINATIONS = {
   android: "play-internal",
   ios: "testflight"
@@ -5874,7 +5805,8 @@ var createNativeBuildApi = /* @__PURE__ */ __name((db, { now = Date.now } = {})
       build_number: registration.buildNumber ?? null,
       submitted_to: null,
       submitted_at_ms: null,
-      submitted_version: null
+      submitted_version: null,
+      store_build: null
     };
     for (let attempt = 1; ; attempt += 1) {
       await insertChannel(db, {
@@ -5912,21 +5844,45 @@ var createNativeBuildApi = /* @__PURE__ */ __name((db, { now = Date.now } = {})
     const scopeKey = nativeBuildScopeKey(scope);
     const buildKey = options?.buildKey;
     if (buildKey !== void 0 && !BUILD_KEY.test(buildKey)) throw new NativeBuildInputError("Invalid native build key: it must be nbk1: and a SHA-256.");
-    const { rows } = buildKey === void 0 ? await db.findMany("native_builds", {
-      index: "byScope",
-      where: { scope_key: scopeKey },
-      order: "desc",
-      limit: 1
-    }) : await db.findMany("native_builds", {
-      index: "byBuildKey",
-      where: {
+    if (options?.storeBuild) {
+      const marked = await db.findOne("native_builds", {
         scope_key: scopeKey,
-        build_key: buildKey
-      },
-      order: "desc",
-      limit: 1
-    });
-    return rows[0] === void 0 ? null : pick2(rows[0]);
+        store_build: true
+      });
+      return marked === null ? null : pick2(marked);
+    }
+    const read = /* @__PURE__ */ __name((limit, before) => {
+      const page2 = {
+        order: "desc",
+        limit,
+        ...before === void 0 ? {} : { range: { lt: before } }
+      };
+      return buildKey === void 0 ? db.findMany("native_builds", {
+        index: "byScope",
+        where: { scope_key: scopeKey },
+        ...page2
+      }) : db.findMany("native_builds", {
+        index: "byBuildKey",
+        where: {
+          scope_key: scopeKey,
+          build_key: buildKey
+        },
+        ...page2
+      });
+    }, "read");
+    const { rows } = await read(1);
+    const newest = rows[0];
+    if (newest === void 0) return null;
+    const bundleId = options?.builtInOlderThan;
+    if (bundleId === void 0 || newest.min_bundle_id < bundleId) return pick2(newest);
+    for (let before = newest.id; ; ) {
+      const { rows: older } = await read(OLDER_BUILDS_PAGE, before);
+      const usable = older.find(({ min_bundle_id }) => min_bundle_id < bundleId);
+      if (usable !== void 0) return pick2(usable);
+      const last = older.at(-1);
+      if (older.length < OLDER_BUILDS_PAGE || last === void 0) return null;
+      before = last.id;
+    }
   },
   async recordNativeBuildSubmission(id, { destination, version: version2 }) {
     if (version2.trim().length === 0 || version2.length > SUBMITTED_VERSION_MAX_LENGTH) throw new NativeBuildInputError(`Invalid native build submission: version must be the store's label of the build, up to ${SUBMITTED_VERSION_MAX_LENGTH} characters.`);
@@ -5947,6 +5903,49 @@ var createNativeBuildApi = /* @__PURE__ */ __name((db, { now = Date.now } = {})
       };
     });
   },
+  async markNativeBuild(id, { storeBuild }) {
+    for (let attempt = 1; ; attempt += 1) try {
+      return await db.transaction(async (tx) => {
+        const row = await tx.findOne("native_builds", { id });
+        if (row === null) return null;
+        const build = pick2(row);
+        if (!storeBuild) {
+          if (build.store_build !== null) tx.update("native_builds", row, { store_build: null });
+          return {
+            nativeBuild: {
+              ...build,
+              store_build: null
+            },
+            previous: null
+          };
+        }
+        if (decodeChannelKey(build.channel_id.slice(8)).startsWith(SANDBOX_CHANNEL_PREFIX)) throw new NativeBuildInputError("A build on a sandbox channel can't be the store build.");
+        if (build.store_build !== null) return {
+          nativeBuild: build,
+          previous: null
+        };
+        const holder = await tx.findOne("native_builds", {
+          scope_key: build.scope_key,
+          store_build: true
+        });
+        if (holder !== null) tx.update("native_builds", holder, { store_build: null });
+        tx.update("native_builds", row, { store_build: true });
+        return {
+          nativeBuild: {
+            ...build,
+            store_build: true
+          },
+          previous: holder === null ? null : {
+            ...pick2(holder),
+            store_build: null
+          }
+        };
+      });
+    } catch (error) {
+      if (attempt < MARK_ATTEMPTS && error instanceof DatabaseConstraintError && error.reason === "unique") continue;
+      throw error;
+    }
+  },
   async deleteNativeBuild(id) {
     return db.transaction(async (tx) => {
       const row = await tx.findOne("native_builds", { id });
@@ -6984,7 +6983,13 @@ var createAdminRouteHandlers = /* @__PURE__ */ __name(() => ({
     const url = new URL(request.url);
     const scope = nativeBuildScopeOf(url);
     const buildKey = url.searchParams.get("buildKey");
-    return json({ data: await refusingInvalid(() => buildKey === null ? core.findNativeBuild(scope) : core.findNativeBuild(scope, { buildKey })) });
+    const builtInOlderThan = url.searchParams.get("builtInOlderThan");
+    const options = {
+      ...buildKey === null ? {} : { buildKey },
+      ...url.searchParams.get("storeBuild") === "true" ? { storeBuild: true } : {},
+      ...builtInOlderThan === null ? {} : { builtInOlderThan }
+    };
+    return json({ data: await refusingInvalid(() => Object.keys(options).length === 0 ? core.findNativeBuild(scope) : core.findNativeBuild(scope, options)) });
   }),
   getNativeBuild: onCore(async (core, _request, params) => json({ data: await core.getNativeBuild(requireRouteParam(params, "id")) })),
   listNativeBuilds: onCore(async (core, request) => {
@@ -7005,6 +7010,12 @@ var createAdminRouteHandlers = /* @__PURE__ */ __name(() => ({
     };
     return json({ data: await refusingInvalid(() => core.recordNativeBuildSubmission(requireRouteParam(params, "id"), submission)) });
   }),
+  markNativeBuild: onCore(async (core, request, params) => {
+    const input = await body(request);
+    if (!isRecord3(input) || typeof input.storeBuild !== "boolean") throw new HandlerBadRequestError("A native build's store build mark needs storeBuild, true or false.");
+    const mark = { storeBuild: input.storeBuild };
+    return json({ data: await refusingInvalid(() => core.markNativeBuild(requireRouteParam(params, "id"), mark)) });
+  }),
   deleteNativeBuild: onCore(async (core, _request, params) => json({ data: await core.deleteNativeBuild(requireRouteParam(params, "id")) })),
   deleteBundles: onCore(async (core, request) => {
     const { ids } = await body(request);
@@ -7149,6 +7160,11 @@ var ADMIN_ROUTES = [
     path: "/native-builds/:id/submission",
     handler: "recordNativeBuildSubmission"
   },
+  {
+    method: "POST",
+    path: "/native-builds/:id/store-build",
+    handler: "markNativeBuild"
+  },
   {
     method: "DELETE",
     path: "/native-builds/:id",