@hot-updater/postgres 1.0.0-rc.0 → 1.0.0-rc.2

package/dist/index.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -25,7 +25,7 @@ let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let _hot_updater_plugin_core_internal = require("@hot-updater/plugin-core/internal");
 let kysely = require("kysely");
 let pg = require("pg");
-pg = __toESM(pg);
+pg = __toESM(pg, 1);
 //#region src/postgresQuery.ts
 const applyOrder = (order, clause) => {
 	const directed = clause.direction === "asc" ? order.asc() : order.desc();
@@ -51,6 +51,13 @@ const countPostgresRows = async (db, input, where) => {
 			const query = rows.select(({ fn }) => fn.countAll().as("count"));
 			return Number((await query.executeTakeFirstOrThrow()).count);
 		}
+		case "bundle_events":
+		case "bundle_installations": {
+			let rows = db.selectFrom(input.model);
+			if (where !== void 0) rows = rows.where(where);
+			const query = rows.select(({ fn }) => fn.countAll().as("count"));
+			return Number((await query.executeTakeFirstOrThrow()).count);
+		}
 	}
 };
 const findManyPostgresRows = async (db, input, where) => {
@@ -75,6 +82,12 @@ const findManyPostgresRows = async (db, input, where) => {
 			for (const clause of input.orderBy ?? []) query = query.orderBy(clause.field, (order) => applyOrder(order, clause));
 			return query.limit(input.limit).offset(input.offset).execute();
 		}
+		case "bundle_installations": {
+			let query = db.selectFrom("bundle_installations").selectAll();
+			if (where !== void 0) query = query.where(where);
+			for (const clause of input.orderBy ?? []) query = query.orderBy(clause.field, (order) => applyOrder(order, clause));
+			return query.limit(input.limit).offset(input.offset).execute();
+		}
 		case "channels": {
 			let query = db.selectFrom("channels").selectAll();
 			if (where !== void 0) query = query.where(where);
@@ -152,11 +165,31 @@ const buildWhere = (where) => {
 	return expression;
 };
 const createPostgresImplementation = (db) => ({
+	async recordInsights({ event, installation }) {
+		const eventColumns = Object.keys(event);
+		const installationColumns = Object.keys(installation);
+		await kysely.sql`
+      WITH accepted_event AS (
+        INSERT INTO bundle_events (${kysely.sql.join(eventColumns.map(kysely.sql.ref))})
+        VALUES (${kysely.sql.join(Object.values(event))})
+        ON CONFLICT (id) DO NOTHING RETURNING id
+      )
+      INSERT INTO bundle_installations (${kysely.sql.join(installationColumns.map(kysely.sql.ref))})
+      SELECT ${kysely.sql.join(Object.values(installation))} FROM accepted_event
+      ON CONFLICT (install_id) DO UPDATE SET ${kysely.sql.join(installationColumns.filter((column) => column !== "install_id").map((column) => kysely.sql`${kysely.sql.ref(column)} = ${kysely.sql.ref(`excluded.${column}`)}`))}
+      WHERE (excluded.received_at_ms, excluded.id) >
+        (bundle_installations.received_at_ms, bundle_installations.id)
+    `.execute(db);
+	},
 	async create(input) {
 		switch (input.model) {
 			case "bundles": return db.insertInto("bundles").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "bundle_patches": return db.insertInto("bundle_patches").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "bundle_events": return db.insertInto("bundle_events").values(input.data).returningAll().executeTakeFirstOrThrow();
+			case "bundle_installations": {
+				const query = db.insertInto("bundle_installations").values(input.data);
+				return await (input.onConflict === "ignore" ? query.onConflict((conflict) => conflict.column("install_id").doNothing()) : query).returningAll().executeTakeFirst() ?? await db.selectFrom("bundle_installations").selectAll().where("install_id", "=", input.data.install_id).executeTakeFirstOrThrow();
+			}
 			case "releases": return db.insertInto("releases").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "release_catalogs": return db.insertInto("release_catalogs").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "channels": {
@@ -183,6 +216,11 @@ const createPostgresImplementation = (db) => ({
 			if (where !== void 0) query = query.where(where);
 			return await query.returningAll().executeTakeFirst() ?? null;
 		}
+		if (input.model === "bundle_installations") {
+			let query = db.updateTable("bundle_installations").set(input.update);
+			if (where !== void 0) query = query.where(where);
+			return await query.returningAll().executeTakeFirst() ?? null;
+		}
 		let query = db.updateTable("bundles").set(input.update);
 		if (where !== void 0) query = query.where(where);
 		return await query.returningAll().executeTakeFirst() ?? null;
@@ -253,6 +291,11 @@ const createPostgresImplementation = (db) => ({
 				if (where !== void 0) query = query.where(where);
 				return await query.executeTakeFirst() ?? null;
 			}
+			case "bundle_installations": {
+				let query = db.selectFrom("bundle_installations").selectAll();
+				if (where !== void 0) query = query.where(where);
+				return await query.executeTakeFirst() ?? null;
+			}
 		}
 	},
 	findMany: (input) => findManyPostgresRows(db, input, buildWhere(input.where)),
@@ -286,7 +329,11 @@ const createPostgresImplementation = (db) => ({
 });
 const postgres = (config) => {
 	const { dialect, ...poolConfig } = config;
-	const adapter = (0, _hot_updater_plugin_core_internal.createDatabasePluginAdapter)("postgres", dialect !== void 0 ? createPostgresImplementation(new kysely.Kysely({ dialect })) : createPostgresImplementation(new kysely.Kysely({ dialect: new kysely.PostgresDialect({ pool: new Pool(poolConfig) }) })));
+	const implementation = dialect !== void 0 ? createPostgresImplementation(new kysely.Kysely({ dialect })) : (() => {
+		const pool = new Pool(poolConfig);
+		return createPostgresImplementation(new kysely.Kysely({ dialect: new kysely.PostgresDialect({ pool }) }));
+	})();
+	const adapter = (0, _hot_updater_plugin_core_internal.createDatabasePluginAdapter)("postgres", implementation);
 	return (0, _hot_updater_plugin_core.createDatabasePlugin)({
 		name: "postgres",
 		models: adapter.models,

package/dist/index.d.cts

@@ -1,11 +1,9 @@
-import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
 import { Dialect } from "kysely";
 import { PoolConfig } from "pg";
-
 //#region src/postgres.d.ts
 type PostgresConfig = PoolConfig & {
   readonly dialect?: Dialect;
 };
-declare const postgres: (config: PostgresConfig) => _$_hot_updater_plugin_core0.DatabasePlugin;
+declare const postgres: (config: PostgresConfig) => import("@hot-updater/plugin-core").DatabasePlugin;
 //#endregion
 export { PostgresConfig, postgres };

package/dist/index.d.mts

@@ -1,11 +1,9 @@
-import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
 import { Dialect } from "kysely";
 import { PoolConfig } from "pg";
-
 //#region src/postgres.d.ts
 type PostgresConfig = PoolConfig & {
   readonly dialect?: Dialect;
 };
-declare const postgres: (config: PostgresConfig) => _$_hot_updater_plugin_core0.DatabasePlugin;
+declare const postgres: (config: PostgresConfig) => import("@hot-updater/plugin-core").DatabasePlugin;
 //#endregion
 export { PostgresConfig, postgres };

package/dist/index.mjs

@@ -27,6 +27,13 @@ const countPostgresRows = async (db, input, where) => {
 			const query = rows.select(({ fn }) => fn.countAll().as("count"));
 			return Number((await query.executeTakeFirstOrThrow()).count);
 		}
+		case "bundle_events":
+		case "bundle_installations": {
+			let rows = db.selectFrom(input.model);
+			if (where !== void 0) rows = rows.where(where);
+			const query = rows.select(({ fn }) => fn.countAll().as("count"));
+			return Number((await query.executeTakeFirstOrThrow()).count);
+		}
 	}
 };
 const findManyPostgresRows = async (db, input, where) => {
@@ -51,6 +58,12 @@ const findManyPostgresRows = async (db, input, where) => {
 			for (const clause of input.orderBy ?? []) query = query.orderBy(clause.field, (order) => applyOrder(order, clause));
 			return query.limit(input.limit).offset(input.offset).execute();
 		}
+		case "bundle_installations": {
+			let query = db.selectFrom("bundle_installations").selectAll();
+			if (where !== void 0) query = query.where(where);
+			for (const clause of input.orderBy ?? []) query = query.orderBy(clause.field, (order) => applyOrder(order, clause));
+			return query.limit(input.limit).offset(input.offset).execute();
+		}
 		case "channels": {
 			let query = db.selectFrom("channels").selectAll();
 			if (where !== void 0) query = query.where(where);
@@ -128,11 +141,31 @@ const buildWhere = (where) => {
 	return expression;
 };
 const createPostgresImplementation = (db) => ({
+	async recordInsights({ event, installation }) {
+		const eventColumns = Object.keys(event);
+		const installationColumns = Object.keys(installation);
+		await sql`
+      WITH accepted_event AS (
+        INSERT INTO bundle_events (${sql.join(eventColumns.map(sql.ref))})
+        VALUES (${sql.join(Object.values(event))})
+        ON CONFLICT (id) DO NOTHING RETURNING id
+      )
+      INSERT INTO bundle_installations (${sql.join(installationColumns.map(sql.ref))})
+      SELECT ${sql.join(Object.values(installation))} FROM accepted_event
+      ON CONFLICT (install_id) DO UPDATE SET ${sql.join(installationColumns.filter((column) => column !== "install_id").map((column) => sql`${sql.ref(column)} = ${sql.ref(`excluded.${column}`)}`))}
+      WHERE (excluded.received_at_ms, excluded.id) >
+        (bundle_installations.received_at_ms, bundle_installations.id)
+    `.execute(db);
+	},
 	async create(input) {
 		switch (input.model) {
 			case "bundles": return db.insertInto("bundles").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "bundle_patches": return db.insertInto("bundle_patches").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "bundle_events": return db.insertInto("bundle_events").values(input.data).returningAll().executeTakeFirstOrThrow();
+			case "bundle_installations": {
+				const query = db.insertInto("bundle_installations").values(input.data);
+				return await (input.onConflict === "ignore" ? query.onConflict((conflict) => conflict.column("install_id").doNothing()) : query).returningAll().executeTakeFirst() ?? await db.selectFrom("bundle_installations").selectAll().where("install_id", "=", input.data.install_id).executeTakeFirstOrThrow();
+			}
 			case "releases": return db.insertInto("releases").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "release_catalogs": return db.insertInto("release_catalogs").values(input.data).returningAll().executeTakeFirstOrThrow();
 			case "channels": {
@@ -159,6 +192,11 @@ const createPostgresImplementation = (db) => ({
 			if (where !== void 0) query = query.where(where);
 			return await query.returningAll().executeTakeFirst() ?? null;
 		}
+		if (input.model === "bundle_installations") {
+			let query = db.updateTable("bundle_installations").set(input.update);
+			if (where !== void 0) query = query.where(where);
+			return await query.returningAll().executeTakeFirst() ?? null;
+		}
 		let query = db.updateTable("bundles").set(input.update);
 		if (where !== void 0) query = query.where(where);
 		return await query.returningAll().executeTakeFirst() ?? null;
@@ -229,6 +267,11 @@ const createPostgresImplementation = (db) => ({
 				if (where !== void 0) query = query.where(where);
 				return await query.executeTakeFirst() ?? null;
 			}
+			case "bundle_installations": {
+				let query = db.selectFrom("bundle_installations").selectAll();
+				if (where !== void 0) query = query.where(where);
+				return await query.executeTakeFirst() ?? null;
+			}
 		}
 	},
 	findMany: (input) => findManyPostgresRows(db, input, buildWhere(input.where)),
@@ -262,7 +305,11 @@ const createPostgresImplementation = (db) => ({
 });
 const postgres = (config) => {
 	const { dialect, ...poolConfig } = config;
-	const adapter = createDatabasePluginAdapter("postgres", dialect !== void 0 ? createPostgresImplementation(new Kysely({ dialect })) : createPostgresImplementation(new Kysely({ dialect: new PostgresDialect({ pool: new Pool(poolConfig) }) })));
+	const implementation = dialect !== void 0 ? createPostgresImplementation(new Kysely({ dialect })) : (() => {
+		const pool = new Pool(poolConfig);
+		return createPostgresImplementation(new Kysely({ dialect: new PostgresDialect({ pool }) }));
+	})();
+	const adapter = createDatabasePluginAdapter("postgres", implementation);
 	return createDatabasePlugin({
 		name: "postgres",
 		models: adapter.models,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/postgres",
   "type": "module",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0-rc.2",
   "description": "React Native OTA solution for self-hosted",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -35,7 +35,7 @@
     "kysely": "0.28.17",
     "pg": "8.13.1",
     "@hot-updater/core": "1.0.0-rc.0",
-    "@hot-updater/plugin-core": "1.0.0-rc.0"
+    "@hot-updater/plugin-core": "1.0.0-rc.2"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.4.1",
@@ -44,7 +44,7 @@
     "camelcase-keys": "^9.1.3",
     "kysely-pglite-dialect": "1.2.0",
     "pg-minify": "^1.6.5",
-    "@hot-updater/test-utils": "1.0.0-rc.0"
+    "@hot-updater/test-utils": "1.0.0-rc.2"
   },
   "scripts": {
     "build": "tsdown",

package/sql/bundles.sql

@@ -70,16 +70,16 @@ create table release_catalogs (
 create table bundle_events (
   id uuid primary key not null,
   type text not null,
-  install_id text not null,
-  user_id text,
+  install_id text collate "C" not null,
+  user_id text collate "C",
   username text,
   from_release_id uuid,
   from_bundle_id uuid,
   to_release_id uuid,
   to_bundle_id uuid not null,
-  platform text not null,
+  platform text collate "C" not null,
   app_version text not null,
-  channel text not null,
+  channel text collate "C" not null,
   cohort text not null,
   update_strategy text,
   fingerprint_hash text,
@@ -87,6 +87,20 @@ create table bundle_events (
   received_at_ms double precision not null
 );
 
+create table bundle_installations (
+  install_id text collate "C" primary key not null,
+  id uuid not null,
+  user_id text collate "C",
+  username text,
+  to_bundle_id uuid not null,
+  type text not null,
+  platform text collate "C" not null,
+  app_version text not null,
+  channel text collate "C" not null,
+  cohort text not null,
+  received_at_ms double precision not null
+);
+
 create table api_keys (
   id varchar(255) primary key not null,
   hash text not null,
@@ -112,13 +126,13 @@ create index releases_fingerprint_hash_idx on releases(fingerprint_hash);
 create index releases_enabled_idx on releases(enabled);
 create index release_catalogs_channel_idx on release_catalogs(channel_id);
 create index bundle_events_received_at_idx on bundle_events(received_at_ms, id);
-create index bundle_events_install_idx on bundle_events(install_id, received_at_ms, id);
-create index bundle_events_user_id_idx on bundle_events(user_id, received_at_ms, id);
-create index bundle_events_username_idx on bundle_events(username, received_at_ms, id);
-create index bundle_events_to_bundle_idx on bundle_events(type, to_bundle_id, received_at_ms, id);
-create index bundle_events_from_bundle_idx on bundle_events(type, from_bundle_id, received_at_ms, id);
-create index bundle_events_to_release_idx on bundle_events(type, to_release_id, received_at_ms, id);
-create index bundle_events_from_release_idx on bundle_events(type, from_release_id, received_at_ms, id);
+create index bundle_events_install_idx on bundle_events(install_id, type, received_at_ms, id);
+create index bundle_installations_user_id_idx on bundle_installations(user_id, install_id);
+create index bundle_installations_received_at_idx on bundle_installations(received_at_ms);
+create index bundle_events_from_bundle_idx on bundle_events(type, platform, channel, from_bundle_id, received_at_ms, id);
+create index bundle_events_to_bundle_idx on bundle_events(type, platform, channel, to_bundle_id, received_at_ms, id);
+create index bundle_installations_scope_idx on bundle_installations(platform, channel, received_at_ms);
+create index bundle_installations_bundle_idx on bundle_installations(platform, channel, to_bundle_id, received_at_ms);
 create unique index api_keys_hash_key on api_keys(hash);
 create index api_keys_created_at_idx on api_keys(created_at_ms, id);
 
@@ -154,6 +168,12 @@ alter table bundle_events add constraint bundle_events_shape_check
   check (((type in ('UPDATE_APPLIED', 'RECOVERED', 'RELEASE_ADOPTED')) and from_bundle_id is not null and update_strategy is not null and update_strategy in ('fingerprint', 'appVersion')) or (type = 'UNCHANGED' and from_bundle_id is null and update_strategy is null));
 alter table bundle_events add constraint bundle_events_received_at_check
   check (received_at_ms >= 0);
+alter table bundle_installations add constraint bundle_installations_type_check
+  check (type in ('UPDATE_APPLIED', 'RECOVERED', 'RELEASE_ADOPTED', 'UNCHANGED'));
+alter table bundle_installations add constraint bundle_installations_platform_check
+  check (platform in ('ios', 'android'));
+alter table bundle_installations add constraint bundle_installations_received_at_check
+  check (received_at_ms >= 0);
 alter table api_keys add constraint api_keys_role_check
   check (role = 'client');
 alter table api_keys add constraint api_keys_created_at_check