hot-updater 0.31.2 → 0.31.4

package/dist/index.mjs

@@ -29319,7 +29319,19 @@ defineLazyProperty(apps, "edge", () => detectPlatformBinary({
 defineLazyProperty(apps, "browser", () => "browser");
 defineLazyProperty(apps, "browserPrivate", () => "browserPrivate");
 //#endregion
+//#region ../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/ranges/intersects.js
+var require_intersects = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	const Range = require_range();
+	const intersects = (r1, r2, options) => {
+		r1 = new Range(r1, options);
+		r2 = new Range(r2, options);
+		return r1.intersects(r2, options);
+	};
+	module.exports = intersects;
+}));
+//#endregion
 //#region src/prompts/getPlatform.ts
+var import_intersects = /* @__PURE__ */ __toESM(require_intersects(), 1);
 const getPlatform = async (message) => {
 	return await p.select({
 		message,
@@ -29643,26 +29655,58 @@ const normalizePatchMaxBaseBundles = (maxBaseBundles) => {
 	if (!Number.isInteger(maxBaseBundles) || maxBaseBundles < 1) throw new Error("Patch maxBaseBundles must be a positive integer");
 	return maxBaseBundles;
 };
+const areTargetAppVersionsPatchCompatible = (a, b) => {
+	const aRange = (0, import_valid.default)(a);
+	const bRange = (0, import_valid.default)(b);
+	if (!aRange || !bRange) return false;
+	return (0, import_intersects.default)(aRange, bRange);
+};
 const getPatchBaseBundles = async ({ bundleId, channel, databasePlugin, maxBaseBundles, platform, target }) => {
-	const where = {
+	const baseWhere = {
 		channel,
 		enabled: true,
 		id: { lt: bundleId },
-		platform,
-		...target.fingerprintHash ? { fingerprintHash: target.fingerprintHash } : {
-			targetAppVersion: target.appVersion,
-			targetAppVersionNotNull: true
-		}
+		platform
 	};
-	const { data } = await databasePlugin.getBundles({
-		limit: maxBaseBundles,
-		orderBy: {
-			direction: "desc",
-			field: "id"
-		},
-		where
-	});
-	return data.filter((bundle) => bundle.id !== bundleId).slice(0, maxBaseBundles);
+	if (target.fingerprintHash) {
+		const { data } = await databasePlugin.getBundles({
+			limit: maxBaseBundles,
+			orderBy: {
+				direction: "desc",
+				field: "id"
+			},
+			where: {
+				...baseWhere,
+				fingerprintHash: target.fingerprintHash
+			}
+		});
+		return data.filter((bundle) => bundle.id !== bundleId).slice(0, maxBaseBundles);
+	}
+	if (!target.appVersion) return [];
+	const pageSize = Math.max(maxBaseBundles * 3, 10);
+	const compatibleBundles = [];
+	let cursorAfter;
+	while (compatibleBundles.length < maxBaseBundles) {
+		const { data, pagination } = await databasePlugin.getBundles({
+			...cursorAfter ? { cursor: { after: cursorAfter } } : {},
+			limit: pageSize,
+			orderBy: {
+				direction: "desc",
+				field: "id"
+			},
+			where: {
+				...baseWhere,
+				targetAppVersionNotNull: true
+			}
+		});
+		for (const bundle of data) {
+			if (bundle.id !== bundleId && bundle.targetAppVersion && areTargetAppVersionsPatchCompatible(target.appVersion, bundle.targetAppVersion)) compatibleBundles.push(bundle);
+			if (compatibleBundles.length >= maxBaseBundles) break;
+		}
+		if (!pagination.hasNextPage || !pagination.nextCursor) break;
+		cursorAfter = pagination.nextCursor;
+	}
+	return compatibleBundles;
 };
 const createAutoPatches = async ({ bundleId, channel, databasePlugin, maxBaseBundles, platform, storagePlugin, target }) => {
 	const baseBundles = await getPatchBaseBundles({
@@ -31103,17 +31147,6 @@ var require_ltr = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = ltr;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/ranges/intersects.js
-var require_intersects = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const Range = require_range();
-	const intersects = (r1, r2, options) => {
-		r1 = new Range(r1, options);
-		r2 = new Range(r2, options);
-		return r1.intersects(r2, options);
-	};
-	module.exports = intersects;
-}));
-//#endregion
 //#region ../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/ranges/simplify.js
 var require_simplify = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const satisfies = require_satisfies();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hot-updater",
   "type": "module",
-  "version": "0.31.2",
+  "version": "0.31.4",
   "engines": {
     "node": ">=20.19.0"
   },
@@ -46,13 +46,13 @@
   },
   "dependencies": {
     "jiti": "2.6.1",
-    "@hot-updater/android-helper": "0.31.2",
-    "@hot-updater/cli-tools": "0.31.2",
-    "@hot-updater/apple-helper": "0.31.2",
-    "@hot-updater/console": "0.31.2",
-    "@hot-updater/core": "0.31.2",
-    "@hot-updater/server": "0.31.2",
-    "@hot-updater/plugin-core": "0.31.2"
+    "@hot-updater/android-helper": "0.31.4",
+    "@hot-updater/apple-helper": "0.31.4",
+    "@hot-updater/cli-tools": "0.31.4",
+    "@hot-updater/console": "0.31.4",
+    "@hot-updater/core": "0.31.4",
+    "@hot-updater/plugin-core": "0.31.4",
+    "@hot-updater/server": "0.31.4"
   },
   "devDependencies": {
     "@bacons/xcode": "1.0.0-alpha.24",
@@ -74,12 +74,12 @@
     "semver": "^7.6.3",
     "sql-formatter": "15.6.10",
     "typescript": "6.0.2",
-    "@hot-updater/aws": "0.31.2",
-    "@hot-updater/cloudflare": "0.31.2",
-    "@hot-updater/firebase": "0.31.2",
-    "@hot-updater/server": "0.31.2",
-    "@hot-updater/supabase": "0.31.2",
-    "@hot-updater/test-utils": "0.31.2"
+    "@hot-updater/aws": "0.31.4",
+    "@hot-updater/cloudflare": "0.31.4",
+    "@hot-updater/firebase": "0.31.4",
+    "@hot-updater/supabase": "0.31.4",
+    "@hot-updater/server": "0.31.4",
+    "@hot-updater/test-utils": "0.31.4"
   },
   "peerDependencies": {
     "@hot-updater/aws": "*",