@hot-updater/postgres 0.17.0 → 0.18.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/postgres",
   "type": "module",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -31,18 +31,18 @@
   "dependencies": {
     "kysely": "^0.27.5",
     "pg": "^8.13.1",
-    "@hot-updater/plugin-core": "0.17.0",
-    "@hot-updater/core": "0.17.0"
+    "@hot-updater/plugin-core": "0.18.1",
+    "@hot-updater/core": "0.18.1"
   },
   "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.17.0"
+    "@hot-updater/js": "0.18.1"
   },
   "scripts": {
-    "build": "rslib build",
+    "build": "tsdown",
     "test:type": "tsc --noEmit"
   }
 }

package/sql/bundles.sql

@@ -5,13 +5,21 @@ CREATE TYPE platforms AS ENUM ('ios', 'android');
 CREATE TABLE bundles (
     id uuid PRIMARY KEY,
     platform platforms NOT NULL,
-    target_app_version text NOT NULL,
     should_force_update boolean NOT NULL,
     enabled boolean NOT NULL,
     file_hash text NOT NULL,
     git_commit_hash text,
     message text,
-    channel text NOT NULL DEFAULT 'production'
+    channel text NOT NULL DEFAULT 'production',
+    storage_uri text NOT NULL,
+    target_app_version text,
+    fingerprint_hash text,
+    CONSTRAINT check_version_or_fingerprint CHECK (
+        (target_app_version IS NOT NULL) OR (fingerprint_hash IS NOT NULL)
+    ),
+    metadata jsonb DEFAULT '{}'::jsonb
 );
 
 CREATE INDEX bundles_target_app_version_idx ON bundles(target_app_version);
+CREATE INDEX bundles_fingerprint_hash_idx ON bundles(fingerprint_hash);
+CREATE INDEX bundles_channel_idx ON bundles(channel);

package/sql/get_update_info.spec.ts

@@ -15,7 +15,7 @@ const createInsertBundleQuery = (bundle: Bundle) => {
   return `
     INSERT INTO bundles (
       id, file_hash, platform, target_app_version,
-      should_force_update, enabled, git_commit_hash, message, channel
+      should_force_update, enabled, git_commit_hash, message, channel, storage_uri, fingerprint_hash
     ) VALUES (
       '${bundle.id}',
       '${bundle.fileHash}',
@@ -25,7 +25,9 @@ const createInsertBundleQuery = (bundle: Bundle) => {
       ${bundle.enabled},
       ${bundle.gitCommitHash ? `'${bundle.gitCommitHash}'` : "null"},
       ${bundle.message ? `'${bundle.message}'` : "null"},
-      '${bundle.channel}'
+      '${bundle.channel}',
+      '${bundle.storageUri}',
+      '${bundle.fingerprintHash}'
     );
   `;
 };
@@ -34,16 +36,42 @@ const createGetUpdateInfo =
   (db: PGlite) =>
   async (
     bundles: Bundle[],
-    {
-      appVersion,
+    args: GetBundlesArgs,
+  ): Promise<UpdateInfo | null> => {
+    const {
       bundleId,
       platform,
       minBundleId = NIL_UUID,
       channel = "production",
-    }: GetBundlesArgs,
-  ): Promise<UpdateInfo | null> => {
+      _updateStrategy,
+    } = args;
     await db.exec(createInsertBundleQuerys(bundles));
 
+    if (_updateStrategy === "fingerprint") {
+      const fingerprintHash = args.fingerprintHash;
+      const result = await db.query<{
+        id: string;
+        should_force_update: boolean;
+        message: string;
+        status: string;
+      }>(
+        `
+      SELECT * FROM get_update_info_by_fingerprint_hash(
+        '${platform}',
+        '${bundleId}',
+        '${minBundleId}',
+        '${channel}',
+        '${fingerprintHash}'
+      );
+      `,
+      );
+
+      return result.rows[0]
+        ? (camelcaseKeys(result.rows[0]) as UpdateInfo)
+        : null;
+    }
+
+    const appVersion = args.appVersion;
     const { rows: appVersionList } = await db.query<{
       target_app_version: string;
     }>(
@@ -64,7 +92,7 @@ const createGetUpdateInfo =
       status: string;
     }>(
       `
-      SELECT * FROM get_update_info(
+      SELECT * FROM get_update_info_by_app_version(
         '${platform}',
         '${appVersion}',
         '${bundleId}',

package/sql/{get_update_info.sql → get_update_info_by_app_version.sql}

@@ -1,6 +1,6 @@
 -- HotUpdater.get_update_info
 
-CREATE OR REPLACE FUNCTION get_update_info (
+CREATE OR REPLACE FUNCTION get_update_info_by_app_version (
     app_platform   platforms,
     app_version text,
     bundle_id  uuid,
@@ -12,7 +12,8 @@ RETURNS TABLE (
     id            uuid,
     should_force_update  boolean,
     message       text,
-    status        text
+    status        text,
+    storage_uri   text
 )
 LANGUAGE plpgsql
 AS
@@ -26,7 +27,8 @@ BEGIN
             b.id,
             b.should_force_update,
             b.message,
-            'UPDATE' AS status
+            'UPDATE' AS status,
+            b.storage_uri
         FROM bundles b
         WHERE b.enabled = TRUE
           AND b.platform = app_platform
@@ -42,7 +44,8 @@ BEGIN
             b.id,
             TRUE AS should_force_update,
             b.message,
-            'ROLLBACK' AS status
+            'ROLLBACK' AS status,
+            b.storage_uri
         FROM bundles b
         WHERE b.enabled = TRUE
           AND b.platform = app_platform
@@ -67,7 +70,8 @@ BEGIN
         NIL_UUID      AS id,
         TRUE          AS should_force_update,
         NULL          AS message,
-        'ROLLBACK'    AS status
+        'ROLLBACK'    AS status,
+        NULL          AS storage_uri
     WHERE (SELECT COUNT(*) FROM final_result) = 0
       AND bundle_id != NIL_UUID
       AND bundle_id > min_bundle_id

package/sql/get_update_info_by_fingerprint_hash.sql

@@ -0,0 +1,87 @@
+-- HotUpdater.get_update_info
+
+CREATE OR REPLACE FUNCTION get_update_info_by_fingerprint_hash (
+    app_platform   platforms,
+    bundle_id  uuid,
+    min_bundle_id uuid,
+    target_channel text,
+    target_fingerprint_hash text
+)
+RETURNS TABLE (
+    id            uuid,
+    should_force_update  boolean,
+    message       text,
+    status        text,
+    storage_uri   text
+)
+LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    NIL_UUID CONSTANT uuid := '00000000-0000-0000-0000-000000000000';
+BEGIN
+    RETURN QUERY
+    WITH update_candidate AS (
+        SELECT
+            b.id,
+            b.should_force_update,
+            b.message,
+            'UPDATE' AS status,
+            b.storage_uri
+        FROM bundles b
+        WHERE b.enabled = TRUE
+          AND b.platform = app_platform
+          AND b.id >= bundle_id
+          AND b.id > min_bundle_id
+          AND b.channel = target_channel
+          AND b.fingerprint_hash = target_fingerprint_hash
+        ORDER BY b.id DESC
+        LIMIT 1
+    ),
+    rollback_candidate AS (
+        SELECT
+            b.id,
+            TRUE AS should_force_update,
+            b.message,
+            'ROLLBACK' AS status,
+            b.storage_uri
+        FROM bundles b
+        WHERE b.enabled = TRUE
+          AND b.platform = app_platform
+          AND b.id < bundle_id
+          AND b.id > min_bundle_id
+          AND b.channel = target_channel
+          AND b.fingerprint_hash = target_fingerprint_hash
+        ORDER BY b.id DESC
+        LIMIT 1
+    ),
+    final_result AS (
+        SELECT * FROM update_candidate
+        UNION ALL
+        SELECT * FROM rollback_candidate
+        WHERE NOT EXISTS (SELECT 1 FROM update_candidate)
+    )
+    SELECT *
+    FROM final_result
+    WHERE final_result.id != bundle_id
+
+    UNION ALL
+
+    SELECT
+        NIL_UUID      AS id,
+        TRUE          AS should_force_update,
+        NULL          AS message,
+        'ROLLBACK'    AS status,
+        NULL          AS storage_uri
+    WHERE (SELECT COUNT(*) FROM final_result) = 0
+      AND bundle_id != NIL_UUID
+      AND bundle_id > min_bundle_id
+      AND NOT EXISTS (
+          SELECT 1
+          FROM bundles b
+          WHERE b.id = bundle_id
+            AND b.enabled = TRUE
+            AND b.platform = app_platform
+      );
+END;
+$$;

package/dist/getUpdateInfo.d.ts

@@ -1,3 +0,0 @@
-import { type GetBundlesArgs, type UpdateInfo } from "@hot-updater/core";
-import type pg from "pg";
-export declare const getUpdateInfo: (pool: pg.Pool, { platform, appVersion, bundleId, minBundleId, channel, }: GetBundlesArgs) => Promise<UpdateInfo | null>;

package/dist/postgres.d.ts

@@ -1,5 +0,0 @@
-import type { DatabasePluginHooks } from "@hot-updater/plugin-core";
-import { type PoolConfig } from "pg";
-export interface PostgresConfig extends PoolConfig {
-}
-export declare const postgres: (config: PostgresConfig, hooks?: DatabasePluginHooks) => (options: import("@hot-updater/plugin-core").BasePluginArgs) => import("@hot-updater/plugin-core").DatabasePlugin;

package/dist/types.d.ts

@@ -1,4 +0,0 @@
-import type { SnakeCaseBundle } from "@hot-updater/core";
-export interface Database {
-    bundles: SnakeCaseBundle;
-}