@hot-updater/postgres 1.0.0-rc.1 → 1.0.0-rc.14

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,11 @@ const countPostgresRows = async (db, input, where) => {
 			const query = rows.select(({ fn }) => fn.countAll().as("count"));
 			return Number((await query.executeTakeFirstOrThrow()).count);
 		}
+		case "bundle_events": {
+			let rows = db.selectFrom("bundle_events");
+			if (where !== void 0) rows = rows.where(where);
+			return Number((await rows.select(({ fn }) => fn.countAll().as("count")).executeTakeFirstOrThrow()).count);
+		}
 	}
 };
 const findManyPostgresRows = async (db, input, where) => {
@@ -152,6 +157,28 @@ const buildWhere = (where) => {
 	return expression;
 };
 const createPostgresImplementation = (db) => ({
+	async recordInsights({ event }) {
+		await db.transaction().execute(async (transaction) => {
+			await transaction.insertInto("bundle_events").values(event).onConflict((oc) => oc.column("id").doNothing()).execute();
+			await kysely.sql`INSERT INTO bundle_event_heads (install_id, id, received_at_ms, user_id, platform, channel, type, from_bundle_id, to_bundle_id)
+SELECT install_id, id, received_at_ms, user_id, platform, channel, type, from_bundle_id, to_bundle_id
+FROM bundle_events WHERE id = ${event.id}
+ON CONFLICT(install_id) DO UPDATE SET
+  id = excluded.id, received_at_ms = excluded.received_at_ms, user_id = excluded.user_id,
+  platform = excluded.platform, channel = excluded.channel, type = excluded.type,
+  from_bundle_id = excluded.from_bundle_id, to_bundle_id = excluded.to_bundle_id
+WHERE (excluded.received_at_ms, excluded.id) > (bundle_event_heads.received_at_ms, bundle_event_heads.id)`.execute(transaction);
+		});
+	},
+	async findLatestInsightsEvents(input) {
+		const where = buildWhere((0, _hot_updater_plugin_core_internal.latestInsightsWhere)(input));
+		return (await kysely.sql`SELECT event.* FROM (SELECT id, install_id FROM bundle_event_heads WHERE ${where} ORDER BY install_id ASC LIMIT ${"installId" in input ? 1 : input.limit}) AS head JOIN bundle_events AS event ON event.id = head.id ORDER BY head.install_id ASC`.execute(db)).rows;
+	},
+	async countLatestInsightsEvents(input) {
+		const where = kysely.sql`(${kysely.sql.join((0, _hot_updater_plugin_core_internal.latestInsightsCountGroups)(input).map((where) => kysely.sql`(${buildWhere(where)})`), kysely.sql` OR `)})`;
+		const result = await kysely.sql`SELECT COUNT(*) AS count FROM bundle_event_heads WHERE ${where}`.execute(db);
+		return Number(result.rows[0]?.count ?? 0);
+	},
 	async create(input) {
 		switch (input.model) {
 			case "bundles": return db.insertInto("bundles").values(input.data).returningAll().executeTakeFirstOrThrow();
@@ -286,7 +313,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

@@ -1,5 +1,5 @@
 import { createDatabasePlugin } from "@hot-updater/plugin-core";
-import { DatabaseRowReferencedError, createDatabasePluginAdapter } from "@hot-updater/plugin-core/internal";
+import { DatabaseRowReferencedError, createDatabasePluginAdapter, latestInsightsCountGroups, latestInsightsWhere } from "@hot-updater/plugin-core/internal";
 import { Kysely, PostgresDialect, sql } from "kysely";
 import pg from "pg";
 //#region src/postgresQuery.ts
@@ -27,6 +27,11 @@ const countPostgresRows = async (db, input, where) => {
 			const query = rows.select(({ fn }) => fn.countAll().as("count"));
 			return Number((await query.executeTakeFirstOrThrow()).count);
 		}
+		case "bundle_events": {
+			let rows = db.selectFrom("bundle_events");
+			if (where !== void 0) rows = rows.where(where);
+			return Number((await rows.select(({ fn }) => fn.countAll().as("count")).executeTakeFirstOrThrow()).count);
+		}
 	}
 };
 const findManyPostgresRows = async (db, input, where) => {
@@ -128,6 +133,28 @@ const buildWhere = (where) => {
 	return expression;
 };
 const createPostgresImplementation = (db) => ({
+	async recordInsights({ event }) {
+		await db.transaction().execute(async (transaction) => {
+			await transaction.insertInto("bundle_events").values(event).onConflict((oc) => oc.column("id").doNothing()).execute();
+			await sql`INSERT INTO bundle_event_heads (install_id, id, received_at_ms, user_id, platform, channel, type, from_bundle_id, to_bundle_id)
+SELECT install_id, id, received_at_ms, user_id, platform, channel, type, from_bundle_id, to_bundle_id
+FROM bundle_events WHERE id = ${event.id}
+ON CONFLICT(install_id) DO UPDATE SET
+  id = excluded.id, received_at_ms = excluded.received_at_ms, user_id = excluded.user_id,
+  platform = excluded.platform, channel = excluded.channel, type = excluded.type,
+  from_bundle_id = excluded.from_bundle_id, to_bundle_id = excluded.to_bundle_id
+WHERE (excluded.received_at_ms, excluded.id) > (bundle_event_heads.received_at_ms, bundle_event_heads.id)`.execute(transaction);
+		});
+	},
+	async findLatestInsightsEvents(input) {
+		const where = buildWhere(latestInsightsWhere(input));
+		return (await sql`SELECT event.* FROM (SELECT id, install_id FROM bundle_event_heads WHERE ${where} ORDER BY install_id ASC LIMIT ${"installId" in input ? 1 : input.limit}) AS head JOIN bundle_events AS event ON event.id = head.id ORDER BY head.install_id ASC`.execute(db)).rows;
+	},
+	async countLatestInsightsEvents(input) {
+		const where = sql`(${sql.join(latestInsightsCountGroups(input).map((where) => sql`(${buildWhere(where)})`), sql` OR `)})`;
+		const result = await sql`SELECT COUNT(*) AS count FROM bundle_event_heads WHERE ${where}`.execute(db);
+		return Number(result.rows[0]?.count ?? 0);
+	},
 	async create(input) {
 		switch (input.model) {
 			case "bundles": return db.insertInto("bundles").values(input.data).returningAll().executeTakeFirstOrThrow();
@@ -262,7 +289,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.1",
+  "version": "1.0.0-rc.14",
   "description": "React Native OTA solution for self-hosted",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -34,8 +34,8 @@
   "dependencies": {
     "kysely": "0.28.17",
     "pg": "8.13.1",
-    "@hot-updater/core": "1.0.0-rc.0",
-    "@hot-updater/plugin-core": "1.0.0-rc.1"
+    "@hot-updater/core": "1.0.0-rc.14",
+    "@hot-updater/plugin-core": "1.0.0-rc.14"
   },
   "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.1"
+    "@hot-updater/test-utils": "1.0.0-rc.14"
   },
   "scripts": {
     "build": "tsdown",

package/sql/bundles.sql

@@ -70,23 +70,32 @@ 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,
-  username text,
+  install_id text collate "C" not null,
+  user_id text collate "C",
   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,
-  cohort text not null,
-  update_strategy text,
-  fingerprint_hash text,
-  sdk_version text,
+  channel text collate "C" not null,
+  metadata JSONB NOT NULL,
   received_at_ms double precision not null
 );
 
+
+create table bundle_event_heads (
+  install_id text collate "C" primary key not null,
+  id uuid not null,
+  received_at_ms double precision not null,
+  user_id text collate "C",
+  platform text collate "C" not null,
+  channel text collate "C" not null,
+  type text not null,
+  from_bundle_id uuid,
+  to_bundle_id uuid not null
+);
+
 create table api_keys (
   id varchar(255) primary key not null,
   hash text not null,
@@ -112,13 +121,9 @@ 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_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 unique index api_keys_hash_key on api_keys(hash);
 create index api_keys_created_at_idx on api_keys(created_at_ms, id);
 
@@ -147,11 +152,11 @@ alter table release_catalogs add constraint release_catalogs_generation_check
 alter table release_catalogs add constraint release_catalogs_byte_size_check
   check (byte_size >= 0 and byte_size <= 262144);
 alter table bundle_events add constraint bundle_events_type_check
-  check (type in ('UPDATE_APPLIED', 'RECOVERED', 'RELEASE_ADOPTED', 'UNCHANGED'));
+  check (type in ('UPDATE_DOWNLOADED', 'UPDATE_APPLIED', 'RECOVERED', 'UNCHANGED'));
 alter table bundle_events add constraint bundle_events_platform_check
   check (platform in ('ios', 'android'));
 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));
+  check (((type in ('UPDATE_DOWNLOADED', 'UPDATE_APPLIED', 'RECOVERED')) and from_bundle_id is not null) or (type = 'UNCHANGED' and from_bundle_id is null));
 alter table bundle_events add constraint bundle_events_received_at_check
   check (received_at_ms >= 0);
 alter table api_keys add constraint api_keys_role_check
@@ -177,3 +182,10 @@ alter table release_catalogs add constraint release_catalogs_channel_id_fk
 insert into private_hot_updater_settings (key, value)
 values ('schema.core', '1.0.0')
 on conflict (key) do update set value = excluded.value;
+
+
+CREATE INDEX bundle_events_latest_idx ON bundle_events(install_id, received_at_ms, id);
+CREATE INDEX bundle_event_heads_user_idx ON bundle_event_heads(user_id, install_id);
+CREATE INDEX bundle_event_heads_scope_idx ON bundle_event_heads(platform, channel, received_at_ms);
+CREATE INDEX bundle_event_heads_from_idx ON bundle_event_heads(type, platform, channel, from_bundle_id, received_at_ms);
+CREATE INDEX bundle_event_heads_to_idx ON bundle_event_heads(type, platform, channel, to_bundle_id, received_at_ms);