@hot-updater/postgres 0.1.5 → 0.1.6-0

package/dist/index.cjs

@@ -46,18 +46,20 @@ var postgres = (config, hooks) => (_) => {
           tx.insertInto("bundles").values({
             id: bundle.id,
             enabled: bundle.enabled,
-            file: bundle.file,
+            file_url: bundle.fileUrl,
             force_update: bundle.forceUpdate,
-            hash: bundle.hash,
+            file_hash: bundle.fileHash,
+            git_commit_hash: bundle.gitCommitHash,
             message: bundle.message,
             platform: bundle.platform,
             target_version: bundle.targetVersion
           }).onConflict(
             (oc) => oc.column("id").doUpdateSet({
               enabled: bundle.enabled,
-              file: bundle.file,
+              file_url: bundle.fileUrl,
               force_update: bundle.forceUpdate,
-              hash: bundle.hash,
+              file_hash: bundle.fileHash,
+              git_commit_hash: bundle.gitCommitHash,
               message: bundle.message,
               platform: bundle.platform,
               target_version: bundle.targetVersion
@@ -89,9 +91,10 @@ var postgres = (config, hooks) => (_) => {
       }
       return {
         enabled: data.enabled,
-        file: data.file,
+        fileUrl: data.file_url,
         forceUpdate: data.force_update,
-        hash: data.hash,
+        fileHash: data.file_hash,
+        gitCommitHash: data.git_commit_hash,
         id: data.id,
         message: data.message,
         platform: data.platform,
@@ -105,9 +108,10 @@ var postgres = (config, hooks) => (_) => {
       const data = await db.selectFrom("bundles").selectAll().execute();
       return data.map((bundle) => ({
         enabled: bundle.enabled,
-        file: bundle.file,
+        fileUrl: bundle.file_url,
         forceUpdate: bundle.force_update,
-        hash: bundle.hash,
+        fileHash: bundle.file_hash,
+        gitCommitHash: bundle.git_commit_hash,
         id: bundle.id,
         message: bundle.message,
         platform: bundle.platform,

package/dist/index.js

@@ -20,18 +20,20 @@ var postgres = (config, hooks) => (_) => {
           tx.insertInto("bundles").values({
             id: bundle.id,
             enabled: bundle.enabled,
-            file: bundle.file,
+            file_url: bundle.fileUrl,
             force_update: bundle.forceUpdate,
-            hash: bundle.hash,
+            file_hash: bundle.fileHash,
+            git_commit_hash: bundle.gitCommitHash,
             message: bundle.message,
             platform: bundle.platform,
             target_version: bundle.targetVersion
           }).onConflict(
             (oc) => oc.column("id").doUpdateSet({
               enabled: bundle.enabled,
-              file: bundle.file,
+              file_url: bundle.fileUrl,
               force_update: bundle.forceUpdate,
-              hash: bundle.hash,
+              file_hash: bundle.fileHash,
+              git_commit_hash: bundle.gitCommitHash,
               message: bundle.message,
               platform: bundle.platform,
               target_version: bundle.targetVersion
@@ -63,9 +65,10 @@ var postgres = (config, hooks) => (_) => {
       }
       return {
         enabled: data.enabled,
-        file: data.file,
+        fileUrl: data.file_url,
         forceUpdate: data.force_update,
-        hash: data.hash,
+        fileHash: data.file_hash,
+        gitCommitHash: data.git_commit_hash,
         id: data.id,
         message: data.message,
         platform: data.platform,
@@ -79,9 +82,10 @@ var postgres = (config, hooks) => (_) => {
       const data = await db.selectFrom("bundles").selectAll().execute();
       return data.map((bundle) => ({
         enabled: bundle.enabled,
-        file: bundle.file,
+        fileUrl: bundle.file_url,
         forceUpdate: bundle.force_update,
-        hash: bundle.hash,
+        fileHash: bundle.file_hash,
+        gitCommitHash: bundle.git_commit_hash,
         id: bundle.id,
         message: bundle.message,
         platform: bundle.platform,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/postgres",
   "type": "module",
-  "version": "0.1.5",
+  "version": "0.1.6-0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -18,15 +18,19 @@
   },
   "files": [
     "dist",
+    "sql",
     "package.json"
   ],
   "dependencies": {
-    "@hot-updater/plugin-core": "0.1.5",
+    "@hot-updater/core": "0.1.6-0",
+    "@hot-updater/plugin-core": "0.1.6-0",
     "kysely": "^0.27.4",
     "pg": "^8.13.1"
   },
   "devDependencies": {
-    "@types/pg": "^8.11.10"
+    "@electric-sql/pglite": "^0.2.15",
+    "@types/pg": "^8.11.10",
+    "camelcase-keys": "^9.1.3"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",

package/sql/bundles.sql

@@ -0,0 +1,13 @@
+CREATE TYPE platforms AS ENUM ('ios', 'android');
+
+CREATE TABLE bundles (
+    id uuid PRIMARY KEY,
+    platform platforms NOT NULL,
+    target_version text NOT NULL,
+    force_update boolean NOT NULL,
+    enabled boolean NOT NULL,
+    file_url text NOT NULL,
+    file_hash text NOT NULL,
+    git_commit_hash text,
+    message text
+);

package/sql/get_update_info.sql

@@ -0,0 +1,79 @@
+CREATE OR REPLACE FUNCTION get_update_info (
+    current_platform   platforms,
+    current_app_version text,
+    current_bundle_id  uuid
+)
+RETURNS TABLE (
+    id            uuid,
+    force_update  boolean,
+    file_url      text,
+    file_hash     text,
+    status        text
+)
+LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    NIL_UUID CONSTANT uuid := '00000000-0000-0000-0000-000000000000';
+BEGIN
+    RETURN QUERY
+    WITH rollback_candidate AS (
+        SELECT
+            b.id,
+            -- If status is 'ROLLBACK', force_update is always TRUE
+            TRUE AS force_update,
+            b.file_url,
+            b.file_hash,
+            'ROLLBACK' AS status
+        FROM bundles b
+        WHERE b.enabled = TRUE
+          AND b.platform = current_platform
+          AND b.id < current_bundle_id
+        ORDER BY b.id DESC
+        LIMIT 1
+    ),
+    update_candidate AS (
+        SELECT
+            b.id,
+            b.force_update,
+            b.file_url,
+            b.file_hash,
+            'UPDATE' AS status
+        FROM bundles b
+        WHERE b.enabled = TRUE
+          AND b.platform = current_platform
+          AND b.id >= current_bundle_id
+          AND semver_satisfies(b.target_version, current_app_version)
+        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 != current_bundle_id
+
+    UNION ALL
+    /*
+      When there are no final results and current_bundle_id != NIL_UUID,
+      add one fallback row.
+      This fallback row is also ROLLBACK so forceUpdate = TRUE.
+    */
+    SELECT
+        NIL_UUID      AS id,
+        TRUE          AS force_update,  -- Always TRUE
+        NULL          AS file_url,
+        NULL          AS file_hash,
+        'ROLLBACK'    AS status
+    WHERE (SELECT COUNT(*) FROM final_result) = 0
+      AND current_bundle_id != NIL_UUID;
+
+END;
+$$;

package/sql/get_update_info.test.ts

@@ -0,0 +1,74 @@
+import { PGlite } from "@electric-sql/pglite";
+import type { Bundle, GetBundlesArgs, UpdateInfo } from "@hot-updater/core";
+import { setupGetUpdateInfoTestSuite } from "@hot-updater/core/test-utils";
+import camelcaseKeys from "camelcase-keys";
+import { afterAll, beforeEach, describe } from "vitest";
+import { prepareSql } from "./prepareSql";
+
+const createInsertBundleQuery = (bundle: Bundle) => {
+  return `
+    INSERT INTO bundles (
+      id, file_url, file_hash, platform, target_version,
+      force_update, enabled, git_commit_hash, message
+    ) VALUES (
+      '${bundle.id}',
+      '${bundle.fileUrl}',
+      '${bundle.fileHash}',
+      '${bundle.platform}',
+      '${bundle.targetVersion}',
+      ${bundle.forceUpdate},
+      ${bundle.enabled},
+      ${bundle.gitCommitHash ? `'${bundle.gitCommitHash}'` : "null"},
+      ${bundle.message ? `'${bundle.message}'` : "null"}
+    );
+  `;
+};
+
+const createGetUpdateInfo =
+  (db: PGlite) =>
+  async (
+    bundles: Bundle[],
+    { appVersion, bundleId, platform }: GetBundlesArgs,
+  ): Promise<UpdateInfo | null> => {
+    await db.exec(createInsertBundleQuerys(bundles));
+
+    const result = await db.query<{
+      id: string;
+      force_update: boolean;
+      file_url: string;
+      file_hash: string;
+      status: string;
+    }>(
+      `
+      SELECT * FROM get_update_info('${platform}', '${appVersion}', '${bundleId}')
+    `,
+    );
+
+    return result.rows[0]
+      ? (camelcaseKeys(result.rows[0]) as UpdateInfo)
+      : null;
+  };
+
+const createInsertBundleQuerys = (bundles: Bundle[]) => {
+  return bundles.map(createInsertBundleQuery).join("\n");
+};
+
+const db = new PGlite();
+
+const sql = await prepareSql();
+await db.exec(sql);
+const getUpdateInfo = createGetUpdateInfo(db);
+
+describe("getUpdateInfo", () => {
+  beforeEach(async () => {
+    await db.exec("DELETE FROM bundles");
+  });
+
+  afterAll(async () => {
+    await db.close();
+  });
+
+  setupGetUpdateInfoTestSuite({
+    getUpdateInfo: getUpdateInfo,
+  });
+});

package/sql/prepareSql.ts

@@ -0,0 +1,11 @@
+import path from "path";
+import fs from "fs/promises";
+
+export const prepareSql = async () => {
+  const files = await fs.readdir(__dirname);
+  const sqlFiles = files.filter((file) => file.endsWith(".sql"));
+  const contents = await Promise.all(
+    sqlFiles.map((file) => fs.readFile(path.join(__dirname, file), "utf-8")),
+  );
+  return contents.join("\n");
+};

package/sql/semver.sql

@@ -0,0 +1,97 @@
+CREATE OR REPLACE FUNCTION semver_satisfies(range_expression TEXT, version TEXT)
+RETURNS BOOLEAN AS $$
+DECLARE
+    version_parts TEXT[];
+    version_major INT;
+    version_minor INT;
+    version_patch INT;
+    satisfies BOOLEAN := FALSE;
+BEGIN
+    -- Split the version into major, minor, and patch
+    version_parts := string_to_array(version, '.');
+    version_major := version_parts[1]::INT;
+    version_minor := version_parts[2]::INT;
+    version_patch := version_parts[3]::INT;
+
+    -- Parse range expression and evaluate
+    IF range_expression ~ '^\d+\.\d+\.\d+$' THEN
+        -- Exact match
+        satisfies := (range_expression = version);
+
+    ELSIF range_expression = '*' THEN
+        -- Matches any version
+        satisfies := TRUE;
+
+    ELSIF range_expression ~ '^\d+\.x\.x$' THEN
+        -- Matches major.x.x
+        DECLARE
+            major_range INT := split_part(range_expression, '.', 1)::INT;
+        BEGIN
+            satisfies := (version_major = major_range);
+        END;
+
+    ELSIF range_expression ~ '^\d+\.\d+\.x$' THEN
+        -- Matches major.minor.x
+        DECLARE
+            major_range INT := split_part(range_expression, '.', 1)::INT;
+            minor_range INT := split_part(range_expression, '.', 2)::INT;
+        BEGIN
+            satisfies := (version_major = major_range AND version_minor = minor_range);
+        END;
+
+    ELSIF range_expression ~ '^\d+\.\d+$' THEN
+        -- Matches major.minor
+        DECLARE
+            major_range INT := split_part(range_expression, '.', 1)::INT;
+            minor_range INT := split_part(range_expression, '.', 2)::INT;
+        BEGIN
+            satisfies := (version_major = major_range AND version_minor = minor_range);
+        END;
+
+    ELSIF range_expression ~ '^\d+\.\d+\.\d+ - \d+\.\d+\.\d+$' THEN
+        -- Matches range e.g., 1.2.3 - 1.2.7
+        DECLARE
+            lower_bound TEXT := split_part(range_expression, ' - ', 1);
+            upper_bound TEXT := split_part(range_expression, ' - ', 2);
+        BEGIN
+            satisfies := (version >= lower_bound AND version <= upper_bound);
+        END;
+
+    ELSIF range_expression ~ '^>=\d+\.\d+\.\d+ <\d+\.\d+\.\d+$' THEN
+        -- Matches range with inequalities
+        DECLARE
+            lower_bound TEXT := regexp_replace(range_expression, '>=([\d\.]+) <.*', '\1');
+            upper_bound TEXT := regexp_replace(range_expression, '.*<([\d\.]+)', '\1');
+        BEGIN
+            satisfies := (version >= lower_bound AND version < upper_bound);
+        END;
+
+    ELSIF range_expression ~ '^~\d+\.\d+\.\d+$' THEN
+        -- Matches ~1.2.3 (>=1.2.3 <1.3.0)
+        DECLARE
+            lower_bound TEXT := regexp_replace(range_expression, '~', '');
+            upper_bound_major INT := split_part(lower_bound, '.', 1)::INT;
+            upper_bound_minor INT := split_part(lower_bound, '.', 2)::INT + 1;
+            upper_bound TEXT := upper_bound_major || '.' || upper_bound_minor || '.0';
+        BEGIN
+            satisfies := (version >= lower_bound AND version < upper_bound);
+        END;
+
+    ELSIF range_expression ~ '^\^\d+\.\d+\.\d+$' THEN
+        -- Matches ^1.2.3 (>=1.2.3 <2.0.0)
+        DECLARE
+            lower_bound TEXT := regexp_replace(range_expression, '\^', '');
+            upper_bound_major INT := split_part(lower_bound, '.', 1)::INT + 1;
+            upper_bound TEXT := upper_bound_major || '.0.0';
+        BEGIN
+            satisfies := (version >= lower_bound AND version < upper_bound);
+        END;
+
+    ELSE
+        RAISE EXCEPTION 'Unsupported range expression: %', range_expression;
+    END IF;
+
+    RETURN satisfies;
+END;
+$$ LANGUAGE plpgsql;
+

package/sql/semver_satisfies.test.ts

@@ -0,0 +1,26 @@
+import { PGlite } from "@electric-sql/pglite";
+import { setupSemverSatisfiesTestSuite } from "@hot-updater/core/test-utils";
+import { afterAll, describe } from "vitest";
+import { prepareSql } from "./prepareSql";
+
+const db = new PGlite();
+const sql = await prepareSql();
+await db.exec(sql);
+
+const createSemverSatisfies =
+  (db: PGlite) => async (targetVersion: string, currentVersion: string) => {
+    const result = await db.query<{ actual: boolean }>(`
+    SELECT semver_satisfies('${targetVersion}', '${currentVersion}') AS actual;
+  `);
+    return result.rows[0].actual;
+  };
+
+const semverSatisfies = createSemverSatisfies(db);
+
+describe("semverSatisfies", () => {
+  afterAll(async () => {
+    await db.close();
+  });
+
+  setupSemverSatisfiesTestSuite({ semverSatisfies });
+});