@hot-updater/server 0.29.4 → 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;
@@ -113,6 +114,8 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 				return getPlugin().getBundleById(id, context);
 			},
 			async getUpdateInfo(args, context) {
+				const directGetUpdateInfo = getPlugin().getUpdateInfo;
+				if (directGetUpdateInfo) return context === void 0 ? await directGetUpdateInfo(args) : await directGetUpdateInfo(args, context);
 				const channel = args.channel ?? "production";
 				const minBundleId = args.minBundleId ?? _hot_updater_core.NIL_UUID;
 				const baseWhere = getBaseWhere({

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;
@@ -113,6 +114,8 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 				return getPlugin().getBundleById(id, context);
 			},
 			async getUpdateInfo(args, context) {
+				const directGetUpdateInfo = getPlugin().getUpdateInfo;
+				if (directGetUpdateInfo) return context === void 0 ? await directGetUpdateInfo(args) : await directGetUpdateInfo(args, context);
 				const channel = args.channel ?? "production";
 				const minBundleId = args.minBundleId ?? NIL_UUID;
 				const baseWhere = getBaseWhere({

package/dist/handler.cjs

@@ -7,7 +7,7 @@ var HandlerBadRequestError = class extends Error {
 	}
 };
 const handleVersion = async () => {
-	return new Response(JSON.stringify({ version: "0.29.4" }), {
+	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.4" }), {
+	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.4",
+  "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/plugin-core": "0.29.4",
-    "@hot-updater/core": "0.29.4",
-    "@hot-updater/js": "0.29.4"
+    "@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.4",
-    "@hot-updater/test-utils": "0.29.4"
+    "@hot-updater/test-utils": "0.29.6",
+    "@hot-updater/standalone": "0.29.6"
   },
   "scripts": {
     "build": "tsdown",