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

package/dist/function/index.mjs

@@ -2470,6 +2470,10 @@ const nativeBuilds = defineTable({
 		type: "string",
 		maxLength: 255,
 		required: false
+	},
+	store_build: {
+		type: "boolean",
+		required: false
 	}
 }, {
 	key: ["id"],
@@ -2482,6 +2486,11 @@ const nativeBuilds = defineTable({
 			eq: ["scope_key", "build_key"],
 			sort: ["id"]
 		},
+		byStoreBuild: {
+			eq: ["scope_key", "store_build"],
+			sort: [],
+			unique: true
+		},
 		byChannel: {
 			eq: ["channel_id"],
 			sort: ["id"],
@@ -2677,10 +2686,7 @@ const LOG_TABLES = [
 const LEASE_TABLE = "aggregate_lease";
 const LEASE = { id: "compaction" };
 const LEASE_MS = 3e4;
-const WINDOW_MS$1 = {
-	log: 6e4,
-	memory: 15e3
-};
+const WINDOW_MS$1 = 6e4;
 const LOG_PAGE = 200;
 const GROUPS = {
 	commit: 1,
@@ -2688,7 +2694,6 @@ const GROUPS = {
 	flush: 256
 };
 const ATTEMPTS = 5;
-const MAX_BUFFERED = 1e4;
 const log = defineTable({
 	id: {
 		type: "string",
@@ -2789,8 +2794,8 @@ const rewrite$1 = (change, key, current) => {
 		previous: current
 	};
 };
-const compile = async (adapter, changes, shard) => {
-	const keys = changes.map(({ model, key }) => [...key.slice(0, -1), shard(model)]);
+const compile = 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]);
@@ -2836,7 +2841,7 @@ const encode = async (changes) => {
 	const zipped = await deflate(json);
 	return zipped !== void 0 && zipped.length < json.length ? `z${zipped}` : json;
 };
-const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "log", windowMs = WINDOW_MS$1[mode] }, now }) => {
+const createAggregateBatches = ({ engine, adapter, schema, batching: { windowMs = WINDOW_MS$1 }, 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 = (name) => schema.models.get(name).table;
@@ -2863,61 +2868,6 @@ const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "l
 		}
 		return changes;
 	};
-	const apply = 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 = () => ops.slice(0, size).filter(isOp);
-			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;
-	};
-	let buffer = /* @__PURE__ */ new Map();
-	let timer;
-	let flushing;
-	const shards = /* @__PURE__ */ new Map();
-	const processShard = (model) => {
-		if (!shards.has(model)) shards.set(model, Math.floor(Math.random() * shapeOf(model).shards));
-		return shards.get(model);
-	};
-	const schedule = () => {
-		if (timer !== void 0 || buffer.size === 0) return;
-		timer = setTimeout(() => {
-			timer = void 0;
-			flushBuffer();
-		}, windowMs);
-		timer.unref?.();
-	};
-	const flushBuffer = () => 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();
-	});
 	let nextDue = 0;
 	let compacting;
 	const known = /* @__PURE__ */ new Map();
@@ -3039,7 +2989,7 @@ const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "l
 			more
 		};
 	};
-	const rowsFor = async (changes) => (await compile(adapter, changes, () => 0)).filter(isOp);
+	const rowsFor = async (changes) => (await compile(adapter, changes)).filter(isOp);
 	const applyGroup = async (held, logs) => {
 		for (let count = logs.length; count > 0; count = Math.floor(count / 2)) {
 			const batch = logs.slice(0, count);
@@ -3119,19 +3069,6 @@ const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "l
 	}))).then((pages) => pages.some((page) => page.rows.length > 0)).finally(() => {
 		checking = void 0;
 	});
-	const committed = 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();
-	};
-	const flush = async () => {
-		await flushBuffer();
-		if (mode === "log" && await hasPending()) await compact(true, GROUPS.flush);
-	};
 	return {
 		async transaction(fn) {
 			let changes = /* @__PURE__ */ new Map();
@@ -3157,7 +3094,7 @@ const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "l
 						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());
@@ -3171,24 +3108,18 @@ const createAggregateBatches = ({ engine, adapter, schema, batching: { mode = "l
 					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);
 		}
 	};
 };
@@ -4147,9 +4078,6 @@ const createDatabaseEngine = ({ batching, now = Date.now, meter, ...options }) =
 		flush: async () => {
 			await batches?.flush();
 		},
-		dispose: async () => {
-			await batches?.dispose();
-		},
 		database(module) {
 			const name = (model) => module.namespace ? `${module.namespace}_${model}` : model;
 			return {
@@ -4217,8 +4145,7 @@ const createEngine = (database, { plugins = [], now = Date.now } = {}) => {
 			if (module === void 0) throw new HotUpdaterConfigError(`Plugin "${plugin.id}" is not one of this engine's plugins.`);
 			return engine.database(module);
 		},
-		flush: () => engine.flush(),
-		dispose: () => engine.dispose()
+		flush: () => engine.flush()
 	};
 };
 //#endregion
@@ -17698,7 +17625,7 @@ const postgres = (config) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.12";
+const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.13";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 const createVersionRouteHandlers = (plugins = []) => {
@@ -18806,8 +18733,12 @@ const pick = (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
 });
+const SANDBOX_CHANNEL_PREFIX = "sandbox-";
+const OLDER_BUILDS_PAGE = 20;
+const MARK_ATTEMPTS = 8;
 const SUBMISSION_DESTINATIONS = {
 	android: "play-internal",
 	ios: "testflight"
@@ -18873,7 +18804,8 @@ const createNativeBuildApi = (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, {
@@ -18911,21 +18843,45 @@ const createNativeBuildApi = (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 : pick(rows[0]);
+				store_build: true
+			});
+			return marked === null ? null : pick(marked);
+		}
+		const read = (limit, before) => {
+			const page = {
+				order: "desc",
+				limit,
+				...before === void 0 ? {} : { range: { lt: before } }
+			};
+			return buildKey === void 0 ? db.findMany("native_builds", {
+				index: "byScope",
+				where: { scope_key: scopeKey },
+				...page
+			}) : db.findMany("native_builds", {
+				index: "byBuildKey",
+				where: {
+					scope_key: scopeKey,
+					build_key: buildKey
+				},
+				...page
+			});
+		};
+		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 pick(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 pick(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 }) {
 		if (version.trim().length === 0 || version.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.`);
@@ -18946,6 +18902,49 @@ const createNativeBuildApi = (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 = pick(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 : {
+						...pick(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 });
@@ -19972,7 +19971,13 @@ const createAdminRouteHandlers = () => ({
 		const url = new URL(request.url);
 		const scope = nativeBuildScopeOf(url);
 		const buildKey = url.searchParams.get("buildKey");
-		return json$2({ 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$2({ data: await refusingInvalid(() => Object.keys(options).length === 0 ? core.findNativeBuild(scope) : core.findNativeBuild(scope, options)) });
 	}),
 	getNativeBuild: onCore(async (core, _request, params) => json$2({ data: await core.getNativeBuild(requireRouteParam(params, "id")) })),
 	listNativeBuilds: onCore(async (core, request) => {
@@ -19993,6 +19998,12 @@ const createAdminRouteHandlers = () => ({
 		};
 		return json$2({ data: await refusingInvalid(() => core.recordNativeBuildSubmission(requireRouteParam(params, "id"), submission)) });
 	}),
+	markNativeBuild: onCore(async (core, request, params) => {
+		const input = await body(request);
+		if (!isRecord$5(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$2({ data: await refusingInvalid(() => core.markNativeBuild(requireRouteParam(params, "id"), mark)) });
+	}),
 	deleteNativeBuild: onCore(async (core, _request, params) => json$2({ data: await core.deleteNativeBuild(requireRouteParam(params, "id")) })),
 	deleteBundles: onCore(async (core, request) => {
 		const { ids } = await body(request);
@@ -20137,6 +20148,11 @@ const 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",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/vercel",
   "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",
@@ -41,11 +41,11 @@
     "@vercel/cli-auth": "0.3.10",
     "@vercel/cli-config": "0.3.1",
     "pg": "8.13.1",
-    "@hot-updater/cli-tools": "1.2.0-rc.12",
-    "@hot-updater/plugin-core": "1.2.0-rc.12",
-    "@hot-updater/postgres": "1.2.0-rc.12",
-    "@hot-updater/server": "1.2.0-rc.12",
-    "@hot-updater/protocol": "1.2.0-rc.12"
+    "@hot-updater/cli-tools": "1.2.0-rc.13",
+    "@hot-updater/protocol": "1.2.0-rc.13",
+    "@hot-updater/postgres": "1.2.0-rc.13",
+    "@hot-updater/server": "1.2.0-rc.13",
+    "@hot-updater/plugin-core": "1.2.0-rc.13"
   },
   "devDependencies": {
     "@types/node": "^20",
@@ -54,7 +54,7 @@
     "execa": "9.5.2",
     "kysely": "0.28.17",
     "vitest": "4.1.4",
-    "@hot-updater/test-utils": "1.2.0-rc.12"
+    "@hot-updater/test-utils": "1.2.0-rc.13"
   },
   "scripts": {
     "build": "tsdown",