@hot-updater/server 0.29.5 → 0.29.6

package/dist/db/ormCore.cjs

@@ -18,6 +18,40 @@ const parseTargetCohorts = (value) => {
 };
 const schemas = [require_v0_21_0.v0_21_0, require_v0_29_0.v0_29_0];
 const getLastItem = (items) => items.at(-1);
+const DEFAULT_BUNDLE_ORDER = {
+	field: "id",
+	direction: "desc"
+};
+const mergeIdFilter = (base, patch) => ({
+	...base,
+	...patch
+});
+const mergeWhereWithIdFilter = (where, idFilter) => ({
+	...where,
+	id: mergeIdFilter(where?.id, idFilter)
+});
+const buildCursorPageWhere = (where, cursor, orderBy) => {
+	const direction = orderBy.direction;
+	if (cursor.after) return {
+		reverseData: false,
+		where: mergeWhereWithIdFilter(where, { [direction === "desc" ? "lt" : "gt"]: cursor.after }),
+		orderBy
+	};
+	if (cursor.before) return {
+		reverseData: true,
+		where: mergeWhereWithIdFilter(where, { [direction === "desc" ? "gt" : "lt"]: cursor.before }),
+		orderBy: {
+			field: orderBy.field,
+			direction: direction === "desc" ? "asc" : "desc"
+		}
+	};
+	return {
+		reverseData: false,
+		where: where ?? {},
+		orderBy
+	};
+};
+const buildCountBeforeWhere = (where, firstBundleId, orderBy) => mergeWhereWithIdFilter(where, { [orderBy.direction === "desc" ? "gt" : "lt"]: firstBundleId });
 const HotUpdaterDB = (0, fumadb.fumadb)({
 	namespace: "hot_updater",
 	schemas
@@ -264,7 +298,9 @@ function createOrmDatabaseCore({ database, resolveFileUrl }) {
 			},
 			async getBundles(options) {
 				const orm = await ensureORM();
-				const { where, limit, offset, orderBy } = options;
+				const { where, limit } = options;
+				const orderBy = options.orderBy ?? DEFAULT_BUNDLE_ORDER;
+				const offset = ("offset" in options ? options.offset : void 0) ?? 0;
 				const total = await orm.count("bundles", { where: buildBundleWhere(where) });
 				const selectedColumns = [
 					"id",
@@ -282,39 +318,85 @@ function createOrmDatabaseCore({ database, resolveFileUrl }) {
 					"rollout_cohort_count",
 					"target_cohorts"
 				];
-				return {
-					data: (isMongoAdapter ? (await orm.findMany("bundles", {
+				const mapRowsToBundles = (rows) => rows.map((r) => ({
+					id: r.id,
+					platform: r.platform,
+					shouldForceUpdate: Boolean(r.should_force_update),
+					enabled: Boolean(r.enabled),
+					fileHash: r.file_hash,
+					gitCommitHash: r.git_commit_hash ?? null,
+					message: r.message ?? null,
+					channel: r.channel,
+					storageUri: r.storage_uri,
+					targetAppVersion: r.target_app_version ?? null,
+					fingerprintHash: r.fingerprint_hash ?? null,
+					rolloutCohortCount: r.rollout_cohort_count ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
+					targetCohorts: parseTargetCohorts(r.target_cohorts)
+				}));
+				const findBundles = async ({ where, orderBy, limit, offset }) => {
+					return mapRowsToBundles(isMongoAdapter ? (await orm.findMany("bundles", {
 						select: selectedColumns,
 						where: buildBundleWhere(where)
 					})).sort((a, b) => {
-						const direction = orderBy?.direction ?? "desc";
 						const result = a.id.localeCompare(b.id);
-						return direction === "asc" ? result : -result;
+						return orderBy.direction === "asc" ? result : -result;
 					}).slice(offset, offset + limit) : await orm.findMany("bundles", {
 						select: selectedColumns,
 						where: buildBundleWhere(where),
-						orderBy: [[orderBy?.field ?? "id", orderBy?.direction ?? "desc"]],
+						orderBy: [[orderBy.field, orderBy.direction]],
 						limit,
 						offset
-					})).map((r) => ({
-						id: r.id,
-						platform: r.platform,
-						shouldForceUpdate: Boolean(r.should_force_update),
-						enabled: Boolean(r.enabled),
-						fileHash: r.file_hash,
-						gitCommitHash: r.git_commit_hash ?? null,
-						message: r.message ?? null,
-						channel: r.channel,
-						storageUri: r.storage_uri,
-						targetAppVersion: r.target_app_version ?? null,
-						fingerprintHash: r.fingerprint_hash ?? null,
-						rolloutCohortCount: r.rollout_cohort_count ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
-						targetCohorts: parseTargetCohorts(r.target_cohorts)
-					})),
-					pagination: require_calculatePagination.calculatePagination(total, {
+					}));
+				};
+				if (!options.cursor?.after && !options.cursor?.before) {
+					const data = await findBundles({
+						where,
+						orderBy,
 						limit,
 						offset
-					})
+					});
+					return {
+						data,
+						pagination: {
+							...require_calculatePagination.calculatePagination(total, {
+								limit,
+								offset
+							}),
+							...data.length > 0 && offset + data.length < total ? { nextCursor: data.at(-1)?.id } : {},
+							...data.length > 0 && offset > 0 ? { previousCursor: data[0]?.id } : {}
+						}
+					};
+				}
+				const { where: cursorWhere, orderBy: cursorOrderBy, reverseData } = buildCursorPageWhere(where, options.cursor, orderBy);
+				const cursorPage = await findBundles({
+					where: cursorWhere,
+					orderBy: cursorOrderBy,
+					limit,
+					offset: 0
+				});
+				const data = reverseData ? cursorPage.slice().reverse() : cursorPage;
+				if (data.length === 0) return {
+					data,
+					pagination: {
+						...require_calculatePagination.calculatePagination(total, {
+							limit,
+							offset: options.cursor.after ? total : 0
+						}),
+						...options.cursor.after ? { previousCursor: options.cursor.after } : {},
+						...options.cursor.before ? { nextCursor: options.cursor.before } : {}
+					}
+				};
+				const startIndex = await orm.count("bundles", { where: buildBundleWhere(buildCountBeforeWhere(where, data[0].id, orderBy)) });
+				return {
+					data,
+					pagination: {
+						...require_calculatePagination.calculatePagination(total, {
+							limit,
+							offset: startIndex
+						}),
+						...startIndex + data.length < total ? { nextCursor: data.at(-1)?.id } : {},
+						...startIndex > 0 ? { previousCursor: data[0]?.id } : {}
+					}
 				};
 			},
 			async insertBundle(bundle) {

package/dist/db/ormCore.mjs

@@ -18,6 +18,40 @@ const parseTargetCohorts = (value) => {
 };
 const schemas = [v0_21_0, v0_29_0];
 const getLastItem = (items) => items.at(-1);
+const DEFAULT_BUNDLE_ORDER = {
+	field: "id",
+	direction: "desc"
+};
+const mergeIdFilter = (base, patch) => ({
+	...base,
+	...patch
+});
+const mergeWhereWithIdFilter = (where, idFilter) => ({
+	...where,
+	id: mergeIdFilter(where?.id, idFilter)
+});
+const buildCursorPageWhere = (where, cursor, orderBy) => {
+	const direction = orderBy.direction;
+	if (cursor.after) return {
+		reverseData: false,
+		where: mergeWhereWithIdFilter(where, { [direction === "desc" ? "lt" : "gt"]: cursor.after }),
+		orderBy
+	};
+	if (cursor.before) return {
+		reverseData: true,
+		where: mergeWhereWithIdFilter(where, { [direction === "desc" ? "gt" : "lt"]: cursor.before }),
+		orderBy: {
+			field: orderBy.field,
+			direction: direction === "desc" ? "asc" : "desc"
+		}
+	};
+	return {
+		reverseData: false,
+		where: where ?? {},
+		orderBy
+	};
+};
+const buildCountBeforeWhere = (where, firstBundleId, orderBy) => mergeWhereWithIdFilter(where, { [orderBy.direction === "desc" ? "gt" : "lt"]: firstBundleId });
 const HotUpdaterDB = fumadb({
 	namespace: "hot_updater",
 	schemas
@@ -264,7 +298,9 @@ function createOrmDatabaseCore({ database, resolveFileUrl }) {
 			},
 			async getBundles(options) {
 				const orm = await ensureORM();
-				const { where, limit, offset, orderBy } = options;
+				const { where, limit } = options;
+				const orderBy = options.orderBy ?? DEFAULT_BUNDLE_ORDER;
+				const offset = ("offset" in options ? options.offset : void 0) ?? 0;
 				const total = await orm.count("bundles", { where: buildBundleWhere(where) });
 				const selectedColumns = [
 					"id",
@@ -282,39 +318,85 @@ function createOrmDatabaseCore({ database, resolveFileUrl }) {
 					"rollout_cohort_count",
 					"target_cohorts"
 				];
-				return {
-					data: (isMongoAdapter ? (await orm.findMany("bundles", {
+				const mapRowsToBundles = (rows) => rows.map((r) => ({
+					id: r.id,
+					platform: r.platform,
+					shouldForceUpdate: Boolean(r.should_force_update),
+					enabled: Boolean(r.enabled),
+					fileHash: r.file_hash,
+					gitCommitHash: r.git_commit_hash ?? null,
+					message: r.message ?? null,
+					channel: r.channel,
+					storageUri: r.storage_uri,
+					targetAppVersion: r.target_app_version ?? null,
+					fingerprintHash: r.fingerprint_hash ?? null,
+					rolloutCohortCount: r.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
+					targetCohorts: parseTargetCohorts(r.target_cohorts)
+				}));
+				const findBundles = async ({ where, orderBy, limit, offset }) => {
+					return mapRowsToBundles(isMongoAdapter ? (await orm.findMany("bundles", {
 						select: selectedColumns,
 						where: buildBundleWhere(where)
 					})).sort((a, b) => {
-						const direction = orderBy?.direction ?? "desc";
 						const result = a.id.localeCompare(b.id);
-						return direction === "asc" ? result : -result;
+						return orderBy.direction === "asc" ? result : -result;
 					}).slice(offset, offset + limit) : await orm.findMany("bundles", {
 						select: selectedColumns,
 						where: buildBundleWhere(where),
-						orderBy: [[orderBy?.field ?? "id", orderBy?.direction ?? "desc"]],
+						orderBy: [[orderBy.field, orderBy.direction]],
 						limit,
 						offset
-					})).map((r) => ({
-						id: r.id,
-						platform: r.platform,
-						shouldForceUpdate: Boolean(r.should_force_update),
-						enabled: Boolean(r.enabled),
-						fileHash: r.file_hash,
-						gitCommitHash: r.git_commit_hash ?? null,
-						message: r.message ?? null,
-						channel: r.channel,
-						storageUri: r.storage_uri,
-						targetAppVersion: r.target_app_version ?? null,
-						fingerprintHash: r.fingerprint_hash ?? null,
-						rolloutCohortCount: r.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
-						targetCohorts: parseTargetCohorts(r.target_cohorts)
-					})),
-					pagination: calculatePagination(total, {
+					}));
+				};
+				if (!options.cursor?.after && !options.cursor?.before) {
+					const data = await findBundles({
+						where,
+						orderBy,
 						limit,
 						offset
-					})
+					});
+					return {
+						data,
+						pagination: {
+							...calculatePagination(total, {
+								limit,
+								offset
+							}),
+							...data.length > 0 && offset + data.length < total ? { nextCursor: data.at(-1)?.id } : {},
+							...data.length > 0 && offset > 0 ? { previousCursor: data[0]?.id } : {}
+						}
+					};
+				}
+				const { where: cursorWhere, orderBy: cursorOrderBy, reverseData } = buildCursorPageWhere(where, options.cursor, orderBy);
+				const cursorPage = await findBundles({
+					where: cursorWhere,
+					orderBy: cursorOrderBy,
+					limit,
+					offset: 0
+				});
+				const data = reverseData ? cursorPage.slice().reverse() : cursorPage;
+				if (data.length === 0) return {
+					data,
+					pagination: {
+						...calculatePagination(total, {
+							limit,
+							offset: options.cursor.after ? total : 0
+						}),
+						...options.cursor.after ? { previousCursor: options.cursor.after } : {},
+						...options.cursor.before ? { nextCursor: options.cursor.before } : {}
+					}
+				};
+				const startIndex = await orm.count("bundles", { where: buildBundleWhere(buildCountBeforeWhere(where, data[0].id, orderBy)) });
+				return {
+					data,
+					pagination: {
+						...calculatePagination(total, {
+							limit,
+							offset: startIndex
+						}),
+						...startIndex + data.length < total ? { nextCursor: data.at(-1)?.id } : {},
+						...startIndex > 0 ? { previousCursor: data[0]?.id } : {}
+					}
 				};
 			},
 			async insertBundle(bundle) {

package/dist/db/pluginCore.cjs

@@ -69,13 +69,13 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 		return (0, _hot_updater_core.isCohortEligibleForUpdate)(bundle.id, cohort, bundle.rolloutCohortCount, bundle.targetCohorts);
 	};
 	const findUpdateInfoByScanning = async ({ args, queryWhere, isCandidate, context }) => {
-		let offset = 0;
+		let after;
 		while (true) {
 			const { data, pagination } = await getSortedBundlePage({
 				where: queryWhere,
 				limit: PAGE_SIZE,
-				offset,
-				orderBy: DESC_ORDER
+				orderBy: DESC_ORDER,
+				...after ? { cursor: { after } } : {}
 			}, context);
 			for (const bundle of data) {
 				if (!bundleMatchesQueryWhere(bundle, queryWhere) || !isCandidate(bundle)) continue;
@@ -95,7 +95,8 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 				return makeResponse(bundle, "ROLLBACK");
 			}
 			if (!pagination.hasNextPage) break;
-			offset += PAGE_SIZE;
+			after = data.at(-1)?.id;
+			if (!after) break;
 		}
 		if (args.bundleId === _hot_updater_core.NIL_UUID) return null;
 		if (args.minBundleId && args.bundleId.localeCompare(args.minBundleId) <= 0) return null;

package/dist/db/pluginCore.mjs

@@ -69,13 +69,13 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 		return isCohortEligibleForUpdate(bundle.id, cohort, bundle.rolloutCohortCount, bundle.targetCohorts);
 	};
 	const findUpdateInfoByScanning = async ({ args, queryWhere, isCandidate, context }) => {
-		let offset = 0;
+		let after;
 		while (true) {
 			const { data, pagination } = await getSortedBundlePage({
 				where: queryWhere,
 				limit: PAGE_SIZE,
-				offset,
-				orderBy: DESC_ORDER
+				orderBy: DESC_ORDER,
+				...after ? { cursor: { after } } : {}
 			}, context);
 			for (const bundle of data) {
 				if (!bundleMatchesQueryWhere(bundle, queryWhere) || !isCandidate(bundle)) continue;
@@ -95,7 +95,8 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 				return makeResponse(bundle, "ROLLBACK");
 			}
 			if (!pagination.hasNextPage) break;
-			offset += PAGE_SIZE;
+			after = data.at(-1)?.id;
+			if (!after) break;
 		}
 		if (args.bundleId === NIL_UUID) return null;
 		if (args.minBundleId && args.bundleId.localeCompare(args.minBundleId) <= 0) return null;

package/dist/handler.cjs

@@ -7,7 +7,7 @@ var HandlerBadRequestError = class extends Error {
 	}
 };
 const handleVersion = async () => {
-	return new Response(JSON.stringify({ version: "0.29.5" }), {
+	return new Response(JSON.stringify({ version: "0.29.6" }), {
 		status: 200,
 		headers: { "Content-Type": "application/json" }
 	});
@@ -97,7 +97,13 @@ const handleGetBundles = async (_params, request, api, context) => {
 	const channel = url.searchParams.get("channel") ?? void 0;
 	const platform = url.searchParams.get("platform");
 	const limit = Number(url.searchParams.get("limit")) || 50;
-	const offset = Number(url.searchParams.get("offset")) || 0;
+	const pageParam = url.searchParams.get("page");
+	const offset = url.searchParams.get("offset");
+	const after = url.searchParams.get("after") ?? void 0;
+	const before = url.searchParams.get("before") ?? void 0;
+	const page = pageParam === null ? void 0 : Number.isInteger(Number(pageParam)) && Number(pageParam) > 0 ? Number(pageParam) : null;
+	if (offset !== null) throw new HandlerBadRequestError("The 'offset' query parameter has been removed. Use 'after' or 'before' cursor pagination instead.");
+	if (page === null) throw new HandlerBadRequestError("The 'page' query parameter must be a positive integer.");
 	if (platform !== null && !isPlatform(platform)) throw new HandlerBadRequestError(`Invalid platform: ${platform}. Expected 'ios' or 'android'.`);
 	const result = await api.getBundles({
 		where: {
@@ -105,7 +111,11 @@ const handleGetBundles = async (_params, request, api, context) => {
 			...platform && { platform }
 		},
 		limit,
-		offset
+		page,
+		cursor: after || before ? {
+			after,
+			before
+		} : void 0
 	}, context);
 	return new Response(JSON.stringify(result), {
 		status: 200,

package/dist/handler.mjs

@@ -7,7 +7,7 @@ var HandlerBadRequestError = class extends Error {
 	}
 };
 const handleVersion = async () => {
-	return new Response(JSON.stringify({ version: "0.29.5" }), {
+	return new Response(JSON.stringify({ version: "0.29.6" }), {
 		status: 200,
 		headers: { "Content-Type": "application/json" }
 	});
@@ -97,7 +97,13 @@ const handleGetBundles = async (_params, request, api, context) => {
 	const channel = url.searchParams.get("channel") ?? void 0;
 	const platform = url.searchParams.get("platform");
 	const limit = Number(url.searchParams.get("limit")) || 50;
-	const offset = Number(url.searchParams.get("offset")) || 0;
+	const pageParam = url.searchParams.get("page");
+	const offset = url.searchParams.get("offset");
+	const after = url.searchParams.get("after") ?? void 0;
+	const before = url.searchParams.get("before") ?? void 0;
+	const page = pageParam === null ? void 0 : Number.isInteger(Number(pageParam)) && Number(pageParam) > 0 ? Number(pageParam) : null;
+	if (offset !== null) throw new HandlerBadRequestError("The 'offset' query parameter has been removed. Use 'after' or 'before' cursor pagination instead.");
+	if (page === null) throw new HandlerBadRequestError("The 'page' query parameter must be a positive integer.");
 	if (platform !== null && !isPlatform(platform)) throw new HandlerBadRequestError(`Invalid platform: ${platform}. Expected 'ios' or 'android'.`);
 	const result = await api.getBundles({
 		where: {
@@ -105,7 +111,11 @@ const handleGetBundles = async (_params, request, api, context) => {
 			...platform && { platform }
 		},
 		limit,
-		offset
+		page,
+		cursor: after || before ? {
+			after,
+			before
+		} : void 0
 	}, context);
 	return new Response(JSON.stringify(result), {
 		status: 200,

package/dist/types/index.d.cts

@@ -8,6 +8,8 @@ interface PaginationInfo {
   hasPreviousPage: boolean;
   currentPage: number;
   totalPages: number;
+  nextCursor?: string | null;
+  previousCursor?: string | null;
 }
 interface PaginationOptions {
   limit: number;

package/dist/types/index.d.mts

@@ -8,6 +8,8 @@ interface PaginationInfo {
   hasPreviousPage: boolean;
   currentPage: number;
   totalPages: number;
+  nextCursor?: string | null;
+  previousCursor?: string | null;
 }
 interface PaginationOptions {
   limit: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/server",
-  "version": "0.29.5",
+  "version": "0.29.6",
   "type": "module",
   "description": "React Native OTA solution for self-hosted",
   "sideEffects": false,
@@ -53,9 +53,9 @@
     "fumadb": "0.2.2",
     "rou3": "0.7.9",
     "semver": "^7.7.2",
-    "@hot-updater/core": "0.29.5",
-    "@hot-updater/plugin-core": "0.29.5",
-    "@hot-updater/js": "0.29.5"
+    "@hot-updater/plugin-core": "0.29.6",
+    "@hot-updater/js": "0.29.6",
+    "@hot-updater/core": "0.29.6"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.2.17",
@@ -66,8 +66,8 @@
     "kysely-pglite-dialect": "^1.2.0",
     "msw": "^2.7.0",
     "uuidv7": "^1.0.2",
-    "@hot-updater/standalone": "0.29.5",
-    "@hot-updater/test-utils": "0.29.5"
+    "@hot-updater/test-utils": "0.29.6",
+    "@hot-updater/standalone": "0.29.6"
   },
   "scripts": {
     "build": "tsdown",

package/src/db/ormCore.ts

@@ -13,6 +13,9 @@ import {
   NIL_UUID,
 } from "@hot-updater/core";
 import type {
+  DatabaseBundleCursor,
+  DatabaseBundleIdFilter,
+  DatabaseBundleQueryOrder,
   DatabaseBundleQueryOptions,
   DatabaseBundleQueryWhere,
   HotUpdaterContext,
@@ -53,6 +56,74 @@ const getLastItem = <T extends unknown[]>(
 ): T extends [...infer _, infer Last] ? Last : never =>
   items.at(-1) as T extends [...infer _, infer Last] ? Last : never;
 
+const DEFAULT_BUNDLE_ORDER = { field: "id", direction: "desc" } as const;
+
+const mergeIdFilter = (
+  base: DatabaseBundleIdFilter | undefined,
+  patch: DatabaseBundleIdFilter,
+): DatabaseBundleIdFilter => ({
+  ...base,
+  ...patch,
+});
+
+const mergeWhereWithIdFilter = (
+  where: DatabaseBundleQueryWhere | undefined,
+  idFilter: DatabaseBundleIdFilter,
+): DatabaseBundleQueryWhere => ({
+  ...where,
+  id: mergeIdFilter(where?.id, idFilter),
+});
+
+const buildCursorPageWhere = (
+  where: DatabaseBundleQueryWhere | undefined,
+  cursor: DatabaseBundleCursor,
+  orderBy: DatabaseBundleQueryOrder,
+): {
+  reverseData: boolean;
+  where: DatabaseBundleQueryWhere;
+  orderBy: DatabaseBundleQueryOrder;
+} => {
+  const direction = orderBy.direction;
+
+  if (cursor.after) {
+    return {
+      reverseData: false,
+      where: mergeWhereWithIdFilter(where, {
+        [direction === "desc" ? "lt" : "gt"]: cursor.after,
+      }),
+      orderBy,
+    };
+  }
+
+  if (cursor.before) {
+    return {
+      reverseData: true,
+      where: mergeWhereWithIdFilter(where, {
+        [direction === "desc" ? "gt" : "lt"]: cursor.before,
+      }),
+      orderBy: {
+        field: orderBy.field,
+        direction: direction === "desc" ? "asc" : "desc",
+      },
+    };
+  }
+
+  return {
+    reverseData: false,
+    where: where ?? {},
+    orderBy,
+  };
+};
+
+const buildCountBeforeWhere = (
+  where: DatabaseBundleQueryWhere | undefined,
+  firstBundleId: string,
+  orderBy: DatabaseBundleQueryOrder,
+): DatabaseBundleQueryWhere =>
+  mergeWhereWithIdFilter(where, {
+    [orderBy.direction === "desc" ? "gt" : "lt"]: firstBundleId,
+  });
+
 export const HotUpdaterDB = fumadb({
   namespace: "hot_updater",
   schemas,
@@ -511,7 +582,12 @@ export function createOrmDatabaseCore<TContext = unknown>({
       options: DatabaseBundleQueryOptions,
     ): Promise<Paginated<Bundle[]>> {
       const orm = await ensureORM();
-      const { where, limit, offset, orderBy } = options;
+      const { where, limit } = options;
+      const orderBy = options.orderBy ?? DEFAULT_BUNDLE_ORDER;
+      const offset =
+        (("offset" in options ? options.offset : undefined) as
+          | number
+          | undefined) ?? 0;
 
       const total = await orm.count("bundles", {
         where: buildBundleWhere(where),
@@ -549,49 +625,129 @@ export function createOrmDatabaseCore<TContext = unknown>({
         "target_cohorts",
       ];
 
-      const rows = isMongoAdapter
-        ? (
-            await orm.findMany("bundles", {
+      const mapRowsToBundles = (rows: any[]): Bundle[] =>
+        rows.map(
+          (r): Bundle => ({
+            id: r.id,
+            platform: r.platform as Platform,
+            shouldForceUpdate: Boolean(r.should_force_update),
+            enabled: Boolean(r.enabled),
+            fileHash: r.file_hash,
+            gitCommitHash: r.git_commit_hash ?? null,
+            message: r.message ?? null,
+            channel: r.channel,
+            storageUri: r.storage_uri,
+            targetAppVersion: r.target_app_version ?? null,
+            fingerprintHash: r.fingerprint_hash ?? null,
+            rolloutCohortCount:
+              r.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
+            targetCohorts: parseTargetCohorts(r.target_cohorts),
+          }),
+        );
+
+      const findBundles = async ({
+        where,
+        orderBy,
+        limit,
+        offset,
+      }: {
+        where?: DatabaseBundleQueryWhere;
+        orderBy: DatabaseBundleQueryOrder;
+        limit: number;
+        offset: number;
+      }) => {
+        const rows = isMongoAdapter
+          ? (
+              await orm.findMany("bundles", {
+                select: selectedColumns,
+                where: buildBundleWhere(where),
+              })
+            )
+              .sort((a, b) => {
+                const result = a.id.localeCompare(b.id);
+                return orderBy.direction === "asc" ? result : -result;
+              })
+              .slice(offset, offset + limit)
+          : await orm.findMany("bundles", {
               select: selectedColumns,
               where: buildBundleWhere(where),
-            })
-          )
-            .sort((a, b) => {
-              const direction = orderBy?.direction ?? "desc";
-              const result = a.id.localeCompare(b.id);
-              return direction === "asc" ? result : -result;
-            })
-            .slice(offset, offset + limit)
-        : await orm.findMany("bundles", {
-            select: selectedColumns,
-            where: buildBundleWhere(where),
-            orderBy: [[orderBy?.field ?? "id", orderBy?.direction ?? "desc"]],
-            limit,
-            offset,
-          });
+              orderBy: [[orderBy.field, orderBy.direction]],
+              limit,
+              offset,
+            });
 
-      const data: Bundle[] = rows.map(
-        (r): Bundle => ({
-          id: r.id,
-          platform: r.platform as Platform,
-          shouldForceUpdate: Boolean(r.should_force_update),
-          enabled: Boolean(r.enabled),
-          fileHash: r.file_hash,
-          gitCommitHash: r.git_commit_hash ?? null,
-          message: r.message ?? null,
-          channel: r.channel,
-          storageUri: r.storage_uri,
-          targetAppVersion: r.target_app_version ?? null,
-          fingerprintHash: r.fingerprint_hash ?? null,
-          rolloutCohortCount:
-            r.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
-          targetCohorts: parseTargetCohorts(r.target_cohorts),
-        }),
-      );
+        return mapRowsToBundles(rows);
+      };
+
+      if (!options.cursor?.after && !options.cursor?.before) {
+        const data = await findBundles({
+          where,
+          orderBy,
+          limit,
+          offset,
+        });
+
+        return {
+          data,
+          pagination: {
+            ...calculatePagination(total, { limit, offset }),
+            ...(data.length > 0 && offset + data.length < total
+              ? { nextCursor: data.at(-1)?.id }
+              : {}),
+            ...(data.length > 0 && offset > 0
+              ? { previousCursor: data[0]?.id }
+              : {}),
+          },
+        };
+      }
+
+      const {
+        where: cursorWhere,
+        orderBy: cursorOrderBy,
+        reverseData,
+      } = buildCursorPageWhere(where, options.cursor, orderBy);
+      const cursorPage = await findBundles({
+        where: cursorWhere,
+        orderBy: cursorOrderBy,
+        limit,
+        offset: 0,
+      });
+      const data = reverseData ? cursorPage.slice().reverse() : cursorPage;
+
+      if (data.length === 0) {
+        const emptyStartIndex = options.cursor.after ? total : 0;
+        return {
+          data,
+          pagination: {
+            ...calculatePagination(total, {
+              limit,
+              offset: emptyStartIndex,
+            }),
+            ...(options.cursor.after
+              ? { previousCursor: options.cursor.after }
+              : {}),
+            ...(options.cursor.before
+              ? { nextCursor: options.cursor.before }
+              : {}),
+          },
+        };
+      }
+
+      const startIndex = await orm.count("bundles", {
+        where: buildBundleWhere(
+          buildCountBeforeWhere(where, data[0]!.id, orderBy),
+        ),
+      });
 
       return {
         data,
-        pagination: calculatePagination(total, { limit, offset }),
+        pagination: {
+          ...calculatePagination(total, { limit, offset: startIndex }),
+          ...(startIndex + data.length < total
+            ? { nextCursor: data.at(-1)?.id }
+            : {}),
+          ...(startIndex > 0 ? { previousCursor: data[0]?.id } : {}),
+        },
       };
     },
 

package/src/db/pluginCore.spec.ts

@@ -82,6 +82,47 @@ describe("createPluginDatabaseCore", () => {
     expect(getBundles).not.toHaveBeenCalled();
   });
 
+  it("does not fall back to scanning when plugin getUpdateInfo returns null", async () => {
+    const getBundles = vi.fn<DatabasePlugin["getBundles"]>(async () => ({
+      data: [baseBundle],
+      pagination: {
+        currentPage: 1,
+        hasNextPage: false,
+        hasPreviousPage: false,
+        total: 1,
+        totalPages: 1,
+      },
+    }));
+    const getUpdateInfo = vi.fn<NonNullable<DatabasePlugin["getUpdateInfo"]>>(
+      async () => null,
+    );
+
+    const plugin: DatabasePlugin = {
+      name: "null-fast-path-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      async getBundleById() {
+        return null;
+      },
+      getBundles,
+      getUpdateInfo,
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async () => null,
+    );
+
+    await expect(core.api.getUpdateInfo(updateArgs)).resolves.toBeNull();
+    expect(getUpdateInfo).toHaveBeenCalledWith(updateArgs);
+    expect(getBundles).not.toHaveBeenCalled();
+  });
+
   it("falls back to scanning when plugin getUpdateInfo is absent", async () => {
     const latestBundle = {
       ...baseBundle,

package/src/db/pluginCore.ts

@@ -172,15 +172,21 @@ export function createPluginDatabaseCore<TContext = unknown>(
     isCandidate: (bundle: Bundle) => boolean;
     context?: HotUpdaterContext<TContext>;
   }): Promise<UpdateInfo | null> => {
-    let offset = 0;
+    let after: string | undefined;
 
     while (true) {
       const { data, pagination } = await getSortedBundlePage(
         {
           where: queryWhere,
           limit: PAGE_SIZE,
-          offset,
           orderBy: DESC_ORDER,
+          ...(after
+            ? {
+                cursor: {
+                  after,
+                },
+              }
+            : {}),
         },
         context,
       );
@@ -223,7 +229,10 @@ export function createPluginDatabaseCore<TContext = unknown>(
         break;
       }
 
-      offset += PAGE_SIZE;
+      after = data.at(-1)?.id;
+      if (!after) {
+        break;
+      }
     }
 
     if (args.bundleId === NIL_UUID) {

package/src/db/pluginUpdateCheck.bench.ts

@@ -6,7 +6,7 @@ import type {
   DatabasePlugin,
 } from "../../../../plugins/plugin-core/src";
 import {
-  calculatePagination,
+  paginateBundles,
   semverSatisfies,
 } from "../../../../plugins/plugin-core/src";
 import type {
@@ -124,17 +124,19 @@ const createBenchPlugin = (bundles: Bundle[]): DatabasePlugin => {
       return bundlesById.get(bundleId) ?? null;
     },
     async getBundles(options: DatabaseBundleQueryOptions) {
-      const { where, limit, offset, orderBy } = options;
+      const { where, limit, cursor, orderBy } = options;
       const source = sortByDirection(orderBy?.direction);
       const matched = source.filter((bundle) =>
         bundleMatchesWhere(bundle, where),
       );
-      const page = matched.slice(offset, offset + limit).map(cloneBundle);
-
-      return {
-        data: page,
-        pagination: calculatePagination(matched.length, { limit, offset }),
-      };
+      const paginated = paginateBundles({
+        bundles: matched.map(cloneBundle),
+        limit,
+        cursor,
+        orderBy,
+      });
+
+      return paginated;
     },
     async getChannels() {
       return [...new Set(bundles.map((bundle) => bundle.channel))];
@@ -164,7 +166,6 @@ const oldPluginCoreGetUpdateInfo = async (
   const { pagination } = await plugin.getBundles({
     where,
     limit: 1,
-    offset: 0,
   });
 
   if (pagination.total === 0) {
@@ -174,7 +175,6 @@ const oldPluginCoreGetUpdateInfo = async (
   const { data } = await plugin.getBundles({
     where,
     limit: pagination.total,
-    offset: 0,
   });
 
   for (const bundle of data) {

package/src/handler-standalone.integration.spec.ts

@@ -234,7 +234,7 @@ describe("Handler <-> Standalone Repository Integration", () => {
     })();
 
     // Get all bundles
-    const result = await repo.getBundles({ limit: 50, offset: 0 });
+    const result = await repo.getBundles({ limit: 50 });
 
     expect(result.data).toHaveLength(3);
     expect(result.pagination.total).toBe(3);
@@ -243,7 +243,6 @@ describe("Handler <-> Standalone Repository Integration", () => {
     const prodResult = await repo.getBundles({
       where: { channel: "production" },
       limit: 50,
-      offset: 0,
     });
 
     expect(prodResult.data).toHaveLength(2);

package/src/handler.spec.ts

@@ -179,7 +179,7 @@ describe("createHandler", () => {
 
     const response = await handler(
       new Request(
-        "http://localhost/hot-updater/api/bundles?channel=production&platform=ios&limit=2&offset=10",
+        "http://localhost/hot-updater/api/bundles?channel=production&platform=ios&limit=2",
       ),
     );
 
@@ -202,12 +202,162 @@ describe("createHandler", () => {
           platform: "ios",
         },
         limit: 2,
-        offset: 10,
+        page: undefined,
       },
       undefined,
     );
   });
 
+  it("passes cursor pagination params through to getBundles", async () => {
+    const api = createApi();
+    api.getBundles.mockResolvedValue({
+      data: [testBundle],
+      pagination: {
+        total: 51,
+        hasNextPage: true,
+        hasPreviousPage: true,
+        currentPage: 2,
+        totalPages: 26,
+        nextCursor: "bundle-1",
+        previousCursor: "bundle-9",
+      },
+    });
+    const handler = createHandler(api, { basePath: "/hot-updater" });
+
+    const response = await handler(
+      new Request(
+        "http://localhost/hot-updater/api/bundles?channel=production&limit=20&after=bundle-20",
+      ),
+    );
+
+    expect(response.status).toBe(200);
+    expect(api.getBundles).toHaveBeenCalledWith(
+      {
+        where: {
+          channel: "production",
+        },
+        limit: 20,
+        page: undefined,
+        cursor: {
+          after: "bundle-20",
+          before: undefined,
+        },
+      },
+      undefined,
+    );
+  });
+
+  it("supports cursor pagination without a legacy offset query param", async () => {
+    const api = createApi();
+    api.getBundles.mockResolvedValue({
+      data: [testBundle],
+      pagination: {
+        total: 1,
+        hasNextPage: false,
+        hasPreviousPage: false,
+        currentPage: 1,
+        totalPages: 1,
+        nextCursor: null,
+        previousCursor: null,
+      },
+    });
+    const handler = createHandler(api, { basePath: "/hot-updater" });
+
+    const response = await handler(
+      new Request(
+        "http://localhost/hot-updater/api/bundles?channel=production&limit=20&after=bundle-20",
+      ),
+    );
+
+    expect(response.status).toBe(200);
+    expect(api.getBundles).toHaveBeenCalledWith(
+      {
+        where: {
+          channel: "production",
+        },
+        limit: 20,
+        page: undefined,
+        cursor: {
+          after: "bundle-20",
+          before: undefined,
+        },
+      },
+      undefined,
+    );
+  });
+
+  it("returns 400 when bundle list requests still send offset pagination", async () => {
+    const api = createApi();
+    const handler = createHandler(api, { basePath: "/hot-updater" });
+
+    const response = await handler(
+      new Request(
+        "http://localhost/hot-updater/api/bundles?limit=20&offset=40",
+      ),
+    );
+
+    expect(response.status).toBe(400);
+    await expect(response.json()).resolves.toEqual({
+      error:
+        "The 'offset' query parameter has been removed. Use 'after' or 'before' cursor pagination instead.",
+    });
+    expect(api.getBundles).not.toHaveBeenCalled();
+  });
+
+  it("passes page-aligned pagination params through to getBundles", async () => {
+    const api = createApi();
+    api.getBundles.mockResolvedValue({
+      data: [testBundle],
+      pagination: {
+        total: 121,
+        hasNextPage: true,
+        hasPreviousPage: true,
+        currentPage: 2,
+        totalPages: 7,
+        nextCursor: "bundle-1",
+        previousCursor: "bundle-9",
+      },
+    });
+    const handler = createHandler(api, { basePath: "/hot-updater" });
+
+    const response = await handler(
+      new Request(
+        "http://localhost/hot-updater/api/bundles?channel=production&limit=20&page=2&after=bundle-20",
+      ),
+    );
+
+    expect(response.status).toBe(200);
+    expect(api.getBundles).toHaveBeenCalledWith(
+      {
+        where: {
+          channel: "production",
+        },
+        limit: 20,
+        page: 2,
+        cursor: {
+          after: "bundle-20",
+          before: undefined,
+        },
+      },
+      undefined,
+    );
+  });
+
+  it("returns 400 when bundle list requests send an invalid page", async () => {
+    const api = createApi();
+    const handler = createHandler(api, { basePath: "/hot-updater" });
+
+    const response = await handler(
+      new Request("http://localhost/hot-updater/api/bundles?limit=20&page=0"),
+    );
+
+    expect(response.status).toBe(400);
+    await expect(response.json()).resolves.toEqual({
+      error: "The 'page' query parameter must be a positive integer.",
+    });
+    expect(api.getBundles).not.toHaveBeenCalled();
+  });
+
   it("returns 400 when the platform route parameter is invalid", async () => {
     const api = createApi();
     const handler = createHandler(api, { basePath: "/hot-updater" });

package/src/handler.ts

@@ -243,7 +243,28 @@ const handleGetBundles: RouteHandler = async (
   const channel = url.searchParams.get("channel") ?? undefined;
   const platform = url.searchParams.get("platform");
   const limit = Number(url.searchParams.get("limit")) || 50;
-  const offset = Number(url.searchParams.get("offset")) || 0;
+  const pageParam = url.searchParams.get("page");
+  const offset = url.searchParams.get("offset");
+  const after = url.searchParams.get("after") ?? undefined;
+  const before = url.searchParams.get("before") ?? undefined;
+  const page =
+    pageParam === null
+      ? undefined
+      : Number.isInteger(Number(pageParam)) && Number(pageParam) > 0
+        ? Number(pageParam)
+        : null;
+
+  if (offset !== null) {
+    throw new HandlerBadRequestError(
+      "The 'offset' query parameter has been removed. Use 'after' or 'before' cursor pagination instead.",
+    );
+  }
+
+  if (page === null) {
+    throw new HandlerBadRequestError(
+      "The 'page' query parameter must be a positive integer.",
+    );
+  }
 
   if (platform !== null && !isPlatform(platform)) {
     throw new HandlerBadRequestError(
@@ -258,7 +279,14 @@ const handleGetBundles: RouteHandler = async (
         ...(platform && { platform }),
       },
       limit,
-      offset,
+      page,
+      cursor:
+        after || before
+          ? {
+              after,
+              before,
+            }
+          : undefined,
     },
     context,
   );

package/src/types/index.ts

@@ -9,6 +9,8 @@ export interface PaginationInfo {
   hasPreviousPage: boolean;
   currentPage: number;
   totalPages: number;
+  nextCursor?: string | null;
+  previousCursor?: string | null;
 }
 
 export interface PaginationOptions {