@hot-updater/postgres 0.27.1 → 0.29.0

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hot-updater/postgres",
   "type": "module",
-  "version": "0.27.1",
+  "version": "0.29.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     },
     "./package.json": "./package.json"
@@ -31,16 +31,23 @@
   "dependencies": {
     "kysely": "^0.28.5",
     "pg": "^8.13.1",
-    "@hot-updater/core": "0.27.1",
-    "@hot-updater/plugin-core": "0.27.1"
+    "@hot-updater/core": "0.29.0",
+    "@hot-updater/plugin-core": "0.29.0"
   },
   "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.27.1",
-    "@hot-updater/test-utils": "0.27.1"
+    "@hot-updater/js": "0.29.0",
+    "@hot-updater/test-utils": "0.29.0"
+  },
+  "inlinedDependencies": {
+    "camelcase": "8.0.0",
+    "camelcase-keys": "9.1.3",
+    "map-obj": "5.0.0",
+    "pg-minify": "1.6.5",
+    "quick-lru": "6.1.2"
   },
   "scripts": {
     "build": "tsdown",

package/sql/bundles.sql

@@ -17,9 +17,14 @@ CREATE TABLE bundles (
     CONSTRAINT check_version_or_fingerprint CHECK (
         (target_app_version IS NOT NULL) OR (fingerprint_hash IS NOT NULL)
     ),
-    metadata jsonb DEFAULT '{}'::jsonb
+    metadata jsonb DEFAULT '{}'::jsonb,
+    rollout_cohort_count INTEGER DEFAULT 1000
+      CHECK (rollout_cohort_count >= 0 AND rollout_cohort_count <= 1000),
+    target_cohorts TEXT[]
 );
 
 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);
+CREATE INDEX bundles_channel_idx ON bundles(channel);
+CREATE INDEX bundles_rollout_idx ON bundles(rollout_cohort_count);
+CREATE INDEX bundles_target_cohorts_idx ON bundles USING GIN (target_cohorts);

package/sql/get_update_info.spec.ts

@@ -12,23 +12,43 @@ import { afterAll, beforeEach, describe } from "vitest";
 import { prepareSql } from "./prepareSql";
 
 const createInsertBundleQuery = (bundle: Bundle) => {
+  const rolloutCohortCount = bundle.rolloutCohortCount ?? 1000;
+  const targetCohorts = bundle.targetCohorts
+    ? `ARRAY[${bundle.targetCohorts.map((id) => `'${id}'`).join(",")}]::TEXT[]`
+    : "NULL";
+
   return `
     INSERT INTO bundles (
       id, file_hash, platform, target_app_version,
-      should_force_update, enabled, git_commit_hash, message, channel, storage_uri, fingerprint_hash
+      should_force_update, enabled, git_commit_hash, message, channel, storage_uri, fingerprint_hash,
+      rollout_cohort_count, target_cohorts
     ) VALUES (
       '${bundle.id}',
       '${bundle.fileHash}',
       '${bundle.platform}',
-      '${bundle.targetAppVersion}',
+      ${bundle.targetAppVersion ? `'${bundle.targetAppVersion}'` : "null"},
       ${bundle.shouldForceUpdate},
       ${bundle.enabled},
       ${bundle.gitCommitHash ? `'${bundle.gitCommitHash}'` : "null"},
       ${bundle.message ? `'${bundle.message}'` : "null"},
       '${bundle.channel}',
       '${bundle.storageUri}',
-      '${bundle.fingerprintHash}'
-    );
+      ${bundle.fingerprintHash ? `'${bundle.fingerprintHash}'` : "null"},
+      ${rolloutCohortCount},
+      ${targetCohorts}
+    ) ON CONFLICT (id) DO UPDATE SET
+      file_hash = EXCLUDED.file_hash,
+      platform = EXCLUDED.platform,
+      target_app_version = EXCLUDED.target_app_version,
+      should_force_update = EXCLUDED.should_force_update,
+      enabled = EXCLUDED.enabled,
+      git_commit_hash = EXCLUDED.git_commit_hash,
+      message = EXCLUDED.message,
+      channel = EXCLUDED.channel,
+      storage_uri = EXCLUDED.storage_uri,
+      fingerprint_hash = EXCLUDED.fingerprint_hash,
+      rollout_cohort_count = EXCLUDED.rollout_cohort_count,
+      target_cohorts = EXCLUDED.target_cohorts;
   `;
 };
 
@@ -49,11 +69,15 @@ const createGetUpdateInfo =
 
     if (_updateStrategy === "fingerprint") {
       const fingerprintHash = args.fingerprintHash;
+      const cohort = args.cohort;
+      const cohortSql = cohort ? `'${cohort}'` : "NULL";
       const result = await db.query<{
         id: string;
         should_force_update: boolean;
         message: string;
         status: string;
+        storage_uri: string | null;
+        file_hash: string | null;
       }>(
         `
       SELECT * FROM get_update_info_by_fingerprint_hash(
@@ -61,14 +85,18 @@ const createGetUpdateInfo =
         '${bundleId}',
         '${minBundleId}',
         '${channel}',
-        '${fingerprintHash}'
+        '${fingerprintHash}',
+        ${cohortSql}
       );
       `,
       );
 
-      return result.rows[0]
-        ? (camelcaseKeys(result.rows[0]) as UpdateInfo)
-        : null;
+      if (!result.rows[0]) {
+        return null;
+      }
+
+      const row = result.rows[0];
+      return camelcaseKeys(row) as UpdateInfo;
     }
 
     const appVersion = args.appVersion;
@@ -85,11 +113,15 @@ const createGetUpdateInfo =
       appVersion,
     );
 
+    const cohort = args.cohort;
+    const cohortSql = cohort ? `'${cohort}'` : "NULL";
     const result = await db.query<{
       id: string;
       should_force_update: boolean;
       message: string;
       status: string;
+      storage_uri: string | null;
+      file_hash: string | null;
     }>(
       `
       SELECT * FROM get_update_info_by_app_version(
@@ -98,14 +130,18 @@ const createGetUpdateInfo =
         '${bundleId}',
         '${minBundleId ?? NIL_UUID}',
         '${channel}',
-        ARRAY[${targetAppVersionList.map((v) => `'${v}'`).join(",")}]::text[]
+        ARRAY[${targetAppVersionList.map((v) => `'${v}'`).join(",")}]::text[],
+        ${cohortSql}
       );
       `,
     );
 
-    return result.rows[0]
-      ? (camelcaseKeys(result.rows[0]) as UpdateInfo)
-      : null;
+    if (!result.rows[0]) {
+      return null;
+    }
+
+    const row = result.rows[0];
+    return camelcaseKeys(row) as UpdateInfo;
   };
 
 const createInsertBundleQuerys = (bundles: Bundle[]) => {

package/sql/get_update_info_by_app_version.sql

@@ -1,4 +1,6 @@
--- HotUpdater.get_update_info
+-- HotUpdater.get_update_info_by_app_version
+
+DROP FUNCTION IF EXISTS get_update_info_by_app_version;
 
 CREATE OR REPLACE FUNCTION get_update_info_by_app_version (
     app_platform   platforms,
@@ -6,7 +8,8 @@ CREATE OR REPLACE FUNCTION get_update_info_by_app_version (
     bundle_id  uuid,
     min_bundle_id uuid,
     target_channel text,
-    target_app_version_list text[]
+    target_app_version_list text[],
+    cohort TEXT DEFAULT NULL
 )
 RETURNS TABLE (
     id            uuid,
@@ -23,45 +26,78 @@ DECLARE
     NIL_UUID CONSTANT uuid := '00000000-0000-0000-0000-000000000000';
 BEGIN
     RETURN QUERY
-    WITH update_candidate AS (
+    WITH candidate_bundles AS (
         SELECT
             b.id,
             b.should_force_update,
             b.message,
-            'UPDATE' AS status,
             b.storage_uri,
-            b.file_hash
+            b.file_hash,
+            b.rollout_cohort_count,
+            b.target_cohorts
         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.id >= min_bundle_id
           AND b.target_app_version IN (SELECT unnest(target_app_version_list))
           AND b.channel = target_channel
-        ORDER BY b.id DESC
+    ),
+    current_candidate AS (
+        SELECT
+            cb.id,
+            is_cohort_eligible(
+                cb.id,
+                cohort,
+                cb.rollout_cohort_count,
+                cb.target_cohorts
+            ) AS is_eligible
+        FROM candidate_bundles cb
+        WHERE cb.id = bundle_id
+        LIMIT 1
+    ),
+    eligible_update_candidate AS (
+        SELECT
+            cb.id,
+            cb.should_force_update,
+            cb.message,
+            'UPDATE' AS status,
+            cb.storage_uri,
+            cb.file_hash
+        FROM candidate_bundles cb
+        WHERE cb.id > bundle_id
+          AND is_cohort_eligible(
+              cb.id,
+              cohort,
+              cb.rollout_cohort_count,
+              cb.target_cohorts
+          )
+        ORDER BY cb.id DESC
         LIMIT 1
     ),
     rollback_candidate AS (
         SELECT
-            b.id,
+            cb.id,
             TRUE AS should_force_update,
-            b.message,
+            cb.message,
             'ROLLBACK' AS status,
-            b.storage_uri,
-            b.file_hash
-        FROM bundles b
-        WHERE b.enabled = TRUE
-          AND b.platform = app_platform
-          AND b.id < bundle_id
-          AND b.id > min_bundle_id
-        ORDER BY b.id DESC
+            cb.storage_uri,
+            cb.file_hash
+        FROM candidate_bundles cb
+        WHERE cb.id < bundle_id
+          AND NOT EXISTS (
+              SELECT 1
+              FROM current_candidate
+              WHERE current_candidate.is_eligible = TRUE
+          )
+          AND NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
+        ORDER BY cb.id DESC
         LIMIT 1
     ),
     final_result AS (
-        SELECT * FROM update_candidate
+        SELECT * FROM eligible_update_candidate
         UNION ALL
         SELECT * FROM rollback_candidate
-        WHERE NOT EXISTS (SELECT 1 FROM update_candidate)
+        WHERE NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
     )
     SELECT *
     FROM final_result
@@ -81,10 +117,10 @@ BEGIN
       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
-      );
+          FROM current_candidate
+          WHERE current_candidate.is_eligible = TRUE
+      )
+      AND NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
+      AND NOT EXISTS (SELECT 1 FROM rollback_candidate);
 END;
 $$;

package/sql/get_update_info_by_fingerprint_hash.sql

@@ -1,11 +1,14 @@
--- HotUpdater.get_update_info
+-- HotUpdater.get_update_info_by_fingerprint_hash
+
+DROP FUNCTION IF EXISTS get_update_info_by_fingerprint_hash;
 
 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
+    target_fingerprint_hash text,
+    cohort TEXT DEFAULT NULL
 )
 RETURNS TABLE (
     id            uuid,
@@ -22,47 +25,78 @@ DECLARE
     NIL_UUID CONSTANT uuid := '00000000-0000-0000-0000-000000000000';
 BEGIN
     RETURN QUERY
-    WITH update_candidate AS (
+    WITH candidate_bundles AS (
         SELECT
             b.id,
             b.should_force_update,
             b.message,
-            'UPDATE' AS status,
             b.storage_uri,
-            b.file_hash
+            b.file_hash,
+            b.rollout_cohort_count,
+            b.target_cohorts
         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.id >= min_bundle_id
           AND b.channel = target_channel
           AND b.fingerprint_hash = target_fingerprint_hash
-        ORDER BY b.id DESC
+    ),
+    current_candidate AS (
+        SELECT
+            cb.id,
+            is_cohort_eligible(
+                cb.id,
+                cohort,
+                cb.rollout_cohort_count,
+                cb.target_cohorts
+            ) AS is_eligible
+        FROM candidate_bundles cb
+        WHERE cb.id = bundle_id
+        LIMIT 1
+    ),
+    eligible_update_candidate AS (
+        SELECT
+            cb.id,
+            cb.should_force_update,
+            cb.message,
+            'UPDATE' AS status,
+            cb.storage_uri,
+            cb.file_hash
+        FROM candidate_bundles cb
+        WHERE cb.id > bundle_id
+          AND is_cohort_eligible(
+              cb.id,
+              cohort,
+              cb.rollout_cohort_count,
+              cb.target_cohorts
+          )
+        ORDER BY cb.id DESC
         LIMIT 1
     ),
     rollback_candidate AS (
         SELECT
-            b.id,
+            cb.id,
             TRUE AS should_force_update,
-            b.message,
+            cb.message,
             'ROLLBACK' AS status,
-            b.storage_uri,
-            b.file_hash
-        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
+            cb.storage_uri,
+            cb.file_hash
+        FROM candidate_bundles cb
+        WHERE cb.id < bundle_id
+          AND NOT EXISTS (
+              SELECT 1
+              FROM current_candidate
+              WHERE current_candidate.is_eligible = TRUE
+          )
+          AND NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
+        ORDER BY cb.id DESC
         LIMIT 1
     ),
     final_result AS (
-        SELECT * FROM update_candidate
+        SELECT * FROM eligible_update_candidate
         UNION ALL
         SELECT * FROM rollback_candidate
-        WHERE NOT EXISTS (SELECT 1 FROM update_candidate)
+        WHERE NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
     )
     SELECT *
     FROM final_result
@@ -82,10 +116,10 @@ BEGIN
       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
-      );
+          FROM current_candidate
+          WHERE current_candidate.is_eligible = TRUE
+      )
+      AND NOT EXISTS (SELECT 1 FROM eligible_update_candidate)
+      AND NOT EXISTS (SELECT 1 FROM rollback_candidate);
 END;
 $$;

package/sql/hash_user_id.sql

@@ -0,0 +1,30 @@
+-- Deterministic hash function matching JavaScript implementation
+-- Returns hash value in range [0, 99]
+CREATE OR REPLACE FUNCTION hash_user_id(user_id TEXT)
+RETURNS INTEGER
+LANGUAGE plpgsql
+IMMUTABLE
+AS $$
+DECLARE
+  hash BIGINT := 0;
+  char_code INTEGER;
+  i INTEGER;
+  normalized BIGINT;
+BEGIN
+  -- Replicate JavaScript hash algorithm
+  FOR i IN 1..length(user_id) LOOP
+    char_code := ascii(substring(user_id from i for 1));
+    hash := (hash * 31) + char_code;
+
+    -- Simulate JavaScript's |= 0 by wrapping into a signed 32-bit range.
+    normalized := mod(hash + 2147483648, 4294967296);
+    IF normalized < 0 THEN
+      normalized := normalized + 4294967296;
+    END IF;
+    hash := normalized - 2147483648;
+  END LOOP;
+
+  -- Return absolute value modulo 100
+  RETURN abs(hash % 100);
+END;
+$$;