@hot-updater/postgres 0.18.1 → 0.18.2

package/dist/index.cjs

@@ -63,14 +63,19 @@ const postgres = (config, hooks) => {
 			};
 		},
 		async getBundles(context, options) {
-			const { where, limit, offset = 0 } = options ?? {};
+			const { where, limit, offset } = options ?? {};
+			let countQuery = context.db.selectFrom("bundles");
+			if (where?.channel) countQuery = countQuery.where("channel", "=", where.channel);
+			if (where?.platform) countQuery = countQuery.where("platform", "=", where.platform);
+			const countResult = await countQuery.select(context.db.fn.count("id").as("total")).executeTakeFirst();
+			const total = countResult?.total || 0;
 			let query = context.db.selectFrom("bundles").orderBy("id", "desc");
 			if (where?.channel) query = query.where("channel", "=", where.channel);
 			if (where?.platform) query = query.where("platform", "=", where.platform);
 			if (limit) query = query.limit(limit);
 			if (offset) query = query.offset(offset);
 			const data = await query.selectAll().execute();
-			return data.map((bundle) => ({
+			const bundles = data.map((bundle) => ({
 				enabled: bundle.enabled,
 				shouldForceUpdate: bundle.should_force_update,
 				fileHash: bundle.file_hash,
@@ -83,6 +88,14 @@ const postgres = (config, hooks) => {
 				storageUri: bundle.storage_uri,
 				fingerprintHash: bundle.fingerprint_hash
 			}));
+			const pagination = (0, __hot_updater_plugin_core.calculatePagination)(total, {
+				limit,
+				offset
+			});
+			return {
+				data: bundles,
+				pagination
+			};
 		},
 		async getChannels(context) {
 			const data = await context.db.selectFrom("bundles").select("channel").groupBy("channel").execute();
@@ -674,7 +687,7 @@ var require_lrucache = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_
 	var LRUCache = class {
 		constructor() {
 			this.max = 1e3;
-			this.map = new Map();
+			this.map = /* @__PURE__ */ new Map();
 		}
 		get(key) {
 			const value = this.map.get(key);
@@ -775,7 +788,7 @@ var require_range = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mod
 				return !!comp.match(re$1[t$1.COMPARATORLOOSE]);
 			});
 			debug$1("range list", rangeList);
-			const rangeMap = new Map();
+			const rangeMap = /* @__PURE__ */ new Map();
 			const comparators = rangeList.map((comp) => new Comparator$4(comp, this.options));
 			for (const comp of comparators) {
 				if (isNullSet(comp)) return [comp];
@@ -1287,7 +1300,7 @@ var require_subset = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mo
 		else sub = minimumVersion;
 		if (dom.length === 1 && dom[0].semver === ANY) if (options.includePrerelease) return true;
 		else dom = minimumVersion;
-		const eqSet = new Set();
+		const eqSet = /* @__PURE__ */ new Set();
 		let gt$5, lt$4;
 		for (const c of sub) if (c.operator === ">" || c.operator === ">=") gt$5 = higherGT(gt$5, c, options);
 		else if (c.operator === "<" || c.operator === "<=") lt$4 = lowerLT(lt$4, c, options);
@@ -1440,7 +1453,7 @@ var require_semver = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mo
 		rcompareIdentifiers: identifiers.rcompareIdentifiers
 	};
 } });
-var import_semver = __toESM(require_semver(), 1);
+var import_semver = __toESM(require_semver());
 const semverSatisfies = (targetAppVersion, currentVersion) => {
 	const currentCoerce = import_semver.default.coerce(currentVersion);
 	if (!currentCoerce) return false;
@@ -1489,7 +1502,7 @@ const year = day * 365.25;
 const isObject$1 = (value) => typeof value === "object" && value !== null;
 const isObjectCustom = (value) => isObject$1(value) && !(value instanceof RegExp) && !(value instanceof Error) && !(value instanceof Date);
 const mapObjectSkip = Symbol("mapObjectSkip");
-const _mapObject = (object, mapper, options, isSeen = new WeakMap()) => {
+const _mapObject = (object, mapper, options, isSeen = /* @__PURE__ */ new WeakMap()) => {
 	options = {
 		deep: false,
 		target: {},
@@ -1596,8 +1609,8 @@ var QuickLRU = class extends Map {
 		this.maxSize = options.maxSize;
 		this.maxAge = options.maxAge || Number.POSITIVE_INFINITY;
 		this.onEviction = options.onEviction;
-		this.cache = new Map();
-		this.oldCache = new Map();
+		this.cache = /* @__PURE__ */ new Map();
+		this.oldCache = /* @__PURE__ */ new Map();
 		this._size = 0;
 	}
 	_emitEvictions(cache$1) {
@@ -1629,7 +1642,7 @@ var QuickLRU = class extends Map {
 			this._size = 0;
 			this._emitEvictions(this.oldCache);
 			this.oldCache = this.cache;
-			this.cache = new Map();
+			this.cache = /* @__PURE__ */ new Map();
 		}
 	}
 	_moveToRecent(key, item) {
@@ -1700,12 +1713,12 @@ var QuickLRU = class extends Map {
 		const removeCount = items.length - newSize;
 		if (removeCount < 0) {
 			this.cache = new Map(items);
-			this.oldCache = new Map();
+			this.oldCache = /* @__PURE__ */ new Map();
 			this._size = items.length;
 		} else {
 			if (removeCount > 0) this._emitEvictions(items.slice(0, removeCount));
 			this.oldCache = new Map(items.slice(removeCount));
-			this.cache = new Map();
+			this.cache = /* @__PURE__ */ new Map();
 			this._size = 0;
 		}
 		this.maxSize = newSize;
@@ -2048,7 +2061,7 @@ var require_lib = __commonJS$1({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_
 
 //#endregion
 //#region src/getUpdateInfo.ts
-var import_lib = __toESM$1(require_lib(), 1);
+var import_lib = __toESM$1(require_lib());
 const appVersionStrategy = async (pool, { platform, appVersion, bundleId, minBundleId = __hot_updater_core.NIL_UUID, channel = "production" }) => {
 	const sqlGetTargetAppVersionList = (0, import_lib.default)(`
     SELECT target_app_version 

package/dist/index.d.cts

@@ -6,7 +6,6 @@ import { AppVersionGetBundlesArgs, GetBundlesArgs, UpdateInfo } from "@hot-updat
 //#region src/postgres.d.ts
 interface PostgresConfig extends PoolConfig {}
 declare const postgres: (config: PostgresConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core0.BasePluginArgs) => _hot_updater_plugin_core0.DatabasePlugin;
-
 //#endregion
 //#region src/getUpdateInfo.d.ts
 declare const appVersionStrategy: (pool: pg.Pool, {
@@ -17,6 +16,5 @@ declare const appVersionStrategy: (pool: pg.Pool, {
   channel
 }: AppVersionGetBundlesArgs) => Promise<UpdateInfo | null>;
 declare const getUpdateInfo: (pool: pg.Pool, args: GetBundlesArgs) => Promise<UpdateInfo | null> | null;
-
 //#endregion
 export { PostgresConfig, appVersionStrategy, getUpdateInfo, postgres };

package/dist/index.d.ts

@@ -6,7 +6,6 @@ import { AppVersionGetBundlesArgs, GetBundlesArgs, UpdateInfo } from "@hot-updat
 //#region src/postgres.d.ts
 interface PostgresConfig extends PoolConfig {}
 declare const postgres: (config: PostgresConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core0.BasePluginArgs) => _hot_updater_plugin_core0.DatabasePlugin;
-
 //#endregion
 //#region src/getUpdateInfo.d.ts
 declare const appVersionStrategy: (pool: pg.Pool, {
@@ -17,6 +16,5 @@ declare const appVersionStrategy: (pool: pg.Pool, {
   channel
 }: AppVersionGetBundlesArgs) => Promise<UpdateInfo | null>;
 declare const getUpdateInfo: (pool: pg.Pool, args: GetBundlesArgs) => Promise<UpdateInfo | null> | null;
-
 //#endregion
 export { PostgresConfig, appVersionStrategy, getUpdateInfo, postgres };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { createDatabasePlugin } from "@hot-updater/plugin-core";
+import { calculatePagination, createDatabasePlugin } from "@hot-updater/plugin-core";
 import { Kysely, PostgresDialect } from "kysely";
 import { Pool } from "pg";
 import { NIL_UUID } from "@hot-updater/core";
@@ -65,14 +65,19 @@ const postgres = (config, hooks) => {
 			};
 		},
 		async getBundles(context, options) {
-			const { where, limit, offset = 0 } = options ?? {};
+			const { where, limit, offset } = options ?? {};
+			let countQuery = context.db.selectFrom("bundles");
+			if (where?.channel) countQuery = countQuery.where("channel", "=", where.channel);
+			if (where?.platform) countQuery = countQuery.where("platform", "=", where.platform);
+			const countResult = await countQuery.select(context.db.fn.count("id").as("total")).executeTakeFirst();
+			const total = countResult?.total || 0;
 			let query = context.db.selectFrom("bundles").orderBy("id", "desc");
 			if (where?.channel) query = query.where("channel", "=", where.channel);
 			if (where?.platform) query = query.where("platform", "=", where.platform);
 			if (limit) query = query.limit(limit);
 			if (offset) query = query.offset(offset);
 			const data = await query.selectAll().execute();
-			return data.map((bundle) => ({
+			const bundles = data.map((bundle) => ({
 				enabled: bundle.enabled,
 				shouldForceUpdate: bundle.should_force_update,
 				fileHash: bundle.file_hash,
@@ -85,6 +90,14 @@ const postgres = (config, hooks) => {
 				storageUri: bundle.storage_uri,
 				fingerprintHash: bundle.fingerprint_hash
 			}));
+			const pagination = calculatePagination(total, {
+				limit,
+				offset
+			});
+			return {
+				data: bundles,
+				pagination
+			};
 		},
 		async getChannels(context) {
 			const data = await context.db.selectFrom("bundles").select("channel").groupBy("channel").execute();
@@ -676,7 +689,7 @@ var require_lrucache = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_
 	var LRUCache = class {
 		constructor() {
 			this.max = 1e3;
-			this.map = new Map();
+			this.map = /* @__PURE__ */ new Map();
 		}
 		get(key) {
 			const value = this.map.get(key);
@@ -777,7 +790,7 @@ var require_range = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mod
 				return !!comp.match(re$1[t$1.COMPARATORLOOSE]);
 			});
 			debug$1("range list", rangeList);
-			const rangeMap = new Map();
+			const rangeMap = /* @__PURE__ */ new Map();
 			const comparators = rangeList.map((comp) => new Comparator$4(comp, this.options));
 			for (const comp of comparators) {
 				if (isNullSet(comp)) return [comp];
@@ -1289,7 +1302,7 @@ var require_subset = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mo
 		else sub = minimumVersion;
 		if (dom.length === 1 && dom[0].semver === ANY) if (options.includePrerelease) return true;
 		else dom = minimumVersion;
-		const eqSet = new Set();
+		const eqSet = /* @__PURE__ */ new Set();
 		let gt$5, lt$4;
 		for (const c of sub) if (c.operator === ">" || c.operator === ">=") gt$5 = higherGT(gt$5, c, options);
 		else if (c.operator === "<" || c.operator === "<=") lt$4 = lowerLT(lt$4, c, options);
@@ -1442,7 +1455,7 @@ var require_semver = __commonJS({ "../../node_modules/.pnpm/semver@7.7.2/node_mo
 		rcompareIdentifiers: identifiers.rcompareIdentifiers
 	};
 } });
-var import_semver = __toESM(require_semver(), 1);
+var import_semver = __toESM(require_semver());
 const semverSatisfies = (targetAppVersion, currentVersion) => {
 	const currentCoerce = import_semver.default.coerce(currentVersion);
 	if (!currentCoerce) return false;
@@ -1491,7 +1504,7 @@ const year = day * 365.25;
 const isObject$1 = (value) => typeof value === "object" && value !== null;
 const isObjectCustom = (value) => isObject$1(value) && !(value instanceof RegExp) && !(value instanceof Error) && !(value instanceof Date);
 const mapObjectSkip = Symbol("mapObjectSkip");
-const _mapObject = (object, mapper, options, isSeen = new WeakMap()) => {
+const _mapObject = (object, mapper, options, isSeen = /* @__PURE__ */ new WeakMap()) => {
 	options = {
 		deep: false,
 		target: {},
@@ -1598,8 +1611,8 @@ var QuickLRU = class extends Map {
 		this.maxSize = options.maxSize;
 		this.maxAge = options.maxAge || Number.POSITIVE_INFINITY;
 		this.onEviction = options.onEviction;
-		this.cache = new Map();
-		this.oldCache = new Map();
+		this.cache = /* @__PURE__ */ new Map();
+		this.oldCache = /* @__PURE__ */ new Map();
 		this._size = 0;
 	}
 	_emitEvictions(cache$1) {
@@ -1631,7 +1644,7 @@ var QuickLRU = class extends Map {
 			this._size = 0;
 			this._emitEvictions(this.oldCache);
 			this.oldCache = this.cache;
-			this.cache = new Map();
+			this.cache = /* @__PURE__ */ new Map();
 		}
 	}
 	_moveToRecent(key, item) {
@@ -1702,12 +1715,12 @@ var QuickLRU = class extends Map {
 		const removeCount = items.length - newSize;
 		if (removeCount < 0) {
 			this.cache = new Map(items);
-			this.oldCache = new Map();
+			this.oldCache = /* @__PURE__ */ new Map();
 			this._size = items.length;
 		} else {
 			if (removeCount > 0) this._emitEvictions(items.slice(0, removeCount));
 			this.oldCache = new Map(items.slice(removeCount));
-			this.cache = new Map();
+			this.cache = /* @__PURE__ */ new Map();
 			this._size = 0;
 		}
 		this.maxSize = newSize;
@@ -2050,7 +2063,7 @@ var require_lib = __commonJS$1({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_
 
 //#endregion
 //#region src/getUpdateInfo.ts
-var import_lib = __toESM$1(require_lib(), 1);
+var import_lib = __toESM$1(require_lib());
 const appVersionStrategy = async (pool, { platform, appVersion, bundleId, minBundleId = NIL_UUID, channel = "production" }) => {
 	const sqlGetTargetAppVersionList = (0, import_lib.default)(`
     SELECT target_app_version 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/postgres",
   "type": "module",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -31,15 +31,15 @@
   "dependencies": {
     "kysely": "^0.27.5",
     "pg": "^8.13.1",
-    "@hot-updater/plugin-core": "0.18.1",
-    "@hot-updater/core": "0.18.1"
+    "@hot-updater/core": "0.18.2",
+    "@hot-updater/plugin-core": "0.18.2"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.2.15",
     "@types/pg": "^8.11.10",
     "camelcase-keys": "^9.1.3",
     "pg-minify": "^1.6.5",
-    "@hot-updater/js": "0.18.1"
+    "@hot-updater/js": "0.18.2"
   },
   "scripts": {
     "build": "tsdown",