@hot-updater/server 0.28.0 → 0.29.0

package/package.json

@@ -1,37 +1,41 @@
 {
   "name": "@hot-updater/server",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "type": "module",
   "description": "React Native OTA solution for self-hosted",
   "sideEffects": false,
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     },
     "./adapters/drizzle": {
-      "import": "./dist/adapters/drizzle.js",
+      "import": "./dist/adapters/drizzle.mjs",
       "require": "./dist/adapters/drizzle.cjs"
     },
     "./adapters/kysely": {
-      "import": "./dist/adapters/kysely.js",
+      "import": "./dist/adapters/kysely.mjs",
       "require": "./dist/adapters/kysely.cjs"
     },
     "./adapters/mongodb": {
-      "import": "./dist/adapters/mongodb.js",
+      "import": "./dist/adapters/mongodb.mjs",
       "require": "./dist/adapters/mongodb.cjs"
     },
     "./adapters/prisma": {
-      "import": "./dist/adapters/prisma.js",
+      "import": "./dist/adapters/prisma.mjs",
       "require": "./dist/adapters/prisma.cjs"
     },
     "./node": {
-      "import": "./dist/node.js",
+      "import": "./dist/node.mjs",
       "require": "./dist/node.cjs"
     },
+    "./runtime": {
+      "import": "./dist/runtime.mjs",
+      "require": "./dist/runtime.cjs"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -49,25 +53,21 @@
     "fumadb": "0.2.2",
     "rou3": "0.7.9",
     "semver": "^7.7.2",
-    "@hot-updater/core": "0.28.0",
-    "@hot-updater/plugin-core": "0.28.0",
-    "@hot-updater/js": "0.28.0"
+    "@hot-updater/core": "0.29.0",
+    "@hot-updater/plugin-core": "0.29.0",
+    "@hot-updater/js": "0.29.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.2.17",
     "@types/node": "^20",
     "@types/semver": "^7.5.8",
-    "execa": "^9.5.2",
+    "execa": "9.5.2",
     "kysely": "^0.28.9",
     "kysely-pglite-dialect": "^1.2.0",
     "msw": "^2.7.0",
     "uuidv7": "^1.0.2",
-    "@hot-updater/aws": "0.28.0",
-    "@hot-updater/cloudflare": "0.28.0",
-    "@hot-updater/standalone": "0.28.0",
-    "@hot-updater/supabase": "0.28.0",
-    "@hot-updater/test-utils": "0.28.0",
-    "@hot-updater/firebase": "0.28.0"
+    "@hot-updater/test-utils": "0.29.0",
+    "@hot-updater/standalone": "0.29.0"
   },
   "scripts": {
     "build": "tsdown",

package/src/db/index.spec.ts

@@ -1,11 +1,14 @@
 import { PGlite } from "@electric-sql/pglite";
-import { s3Storage } from "@hot-updater/aws";
-import { r2Storage } from "@hot-updater/cloudflare";
 import type { Bundle, GetBundlesArgs, UpdateInfo } from "@hot-updater/core";
 import { NIL_UUID } from "@hot-updater/core";
-import { firebaseStorage } from "@hot-updater/firebase";
-import { supabaseStorage } from "@hot-updater/supabase";
-import { setupGetUpdateInfoTestSuite } from "@hot-updater/test-utils";
+import type {
+  StoragePlugin,
+  StorageResolveContext,
+} from "@hot-updater/plugin-core";
+import {
+  setupBundleMethodsTestSuite,
+  setupGetUpdateInfoTestSuite,
+} from "@hot-updater/test-utils";
 import { Kysely } from "kysely";
 import { PGliteDialect } from "kysely-pglite-dialect";
 import {
@@ -21,6 +24,28 @@ import {
 import { kyselyAdapter } from "../adapters/kysely";
 import { createHotUpdater } from "./index";
 
+function createTestStoragePlugin(
+  protocol: string,
+  resolveFileUrl: (
+    storageUri: string,
+    context?: StorageResolveContext,
+  ) => string,
+): StoragePlugin {
+  return {
+    name: `${protocol}TestStorage`,
+    supportedProtocol: protocol,
+    async upload(key) {
+      return {
+        storageUri: `${protocol}://test-bucket/${key}`,
+      };
+    },
+    async delete() {},
+    async getDownloadUrl(storageUri, context) {
+      return { fileUrl: resolveFileUrl(storageUri, context) };
+    },
+  };
+}
+
 describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
   const db = new PGlite();
 
@@ -32,27 +57,29 @@ describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
       provider: "postgresql",
     }),
     storages: [
-      s3Storage({
-        region: "us-east-1",
-        credentials: {
-          accessKeyId: "test-access-key",
-          secretAccessKey: "test-secret-key",
-        },
-        bucketName: "test-bucket",
-      }),
-      r2Storage({
-        cloudflareApiToken: "test-token",
-        accountId: "test-account-id",
-        bucketName: "test-bucket",
-      }),
-      supabaseStorage({
-        supabaseUrl: "https://test.supabase.co",
-        supabaseAnonKey: "test-anon-key",
-        bucketName: "test-bucket",
-      }),
-      firebaseStorage({
-        storageBucket: "test-bucket.appspot.com",
-      }),
+      createTestStoragePlugin("s3", (storageUri) =>
+        storageUri
+          .replace("s3://", "https://s3.example.com/")
+          .replace(/([^:]\/)\/+/g, "$1"),
+      ),
+      createTestStoragePlugin("r2", (storageUri) =>
+        storageUri
+          .replace("r2://", "https://r2.example.com/")
+          .replace(/([^:]\/)\/+/g, "$1"),
+      ),
+      createTestStoragePlugin("supabase-storage", (storageUri) =>
+        storageUri
+          .replace(
+            "supabase-storage://",
+            "https://supabase.example.com/storage/v1/object/sign/",
+          )
+          .replace(/([^:]\/)\/+/g, "$1"),
+      ),
+      createTestStoragePlugin("gs", (storageUri) =>
+        storageUri
+          .replace("gs://", "https://firebase.example.com/")
+          .replace(/([^:]\/)\/+/g, "$1"),
+      ),
     ],
   });
 
@@ -87,6 +114,14 @@ describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
   };
 
   setupGetUpdateInfoTestSuite({ getUpdateInfo });
+  setupBundleMethodsTestSuite({
+    getBundleById: hotUpdater.getBundleById.bind(hotUpdater),
+    getChannels: hotUpdater.getChannels.bind(hotUpdater),
+    insertBundle: hotUpdater.insertBundle.bind(hotUpdater),
+    getBundles: hotUpdater.getBundles.bind(hotUpdater),
+    updateBundleById: hotUpdater.updateBundleById.bind(hotUpdater),
+    deleteBundleById: hotUpdater.deleteBundleById.bind(hotUpdater),
+  });
 
   describe("getBundleById", () => {
     it("should retrieve bundle by id without Prisma validation errors", async () => {
@@ -223,7 +258,7 @@ describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
 
       expect(updateInfo).not.toBeNull();
       expect(updateInfo?.fileUrl).toBe(
-        "https://test-bucket.s3.us-east-1.amazonaws.com/bundles/bundle.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=test-access-key%2F20251015%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20251015T122100Z&X-Amz-Expires=3600&X-Amz-Signature=4fa782e86a842ce2eacbfa6534d1f5d5145d733092959cf6ad755cc306bbe98e&X-Amz-SignedHeaders=host&x-amz-checksum-mode=ENABLED&x-id=GetObject",
+        "https://s3.example.com/test-bucket/bundles/bundle.zip",
       );
     });
 
@@ -253,7 +288,7 @@ describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
 
       expect(updateInfo).not.toBeNull();
       expect(updateInfo?.fileUrl).toBe(
-        "https://bundle.s3.us-east-1.amazonaws.com/bundle.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=test-access-key%2F20251015%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20251015T122100Z&X-Amz-Expires=3600&X-Amz-Signature=b83d9cfc9bd23275e5eb3baf792776fd7b49730f3aa2f5172d067c9dfb10cd94&X-Amz-SignedHeaders=host&x-amz-checksum-mode=ENABLED&x-id=GetObject",
+        "https://s3.example.com/bundle/bundle.zip",
       );
     });
 
@@ -322,7 +357,7 @@ describe("server/db hotUpdater getUpdateInfo (PGlite + Kysely)", async () => {
 
       expect(updateInfo).not.toBeNull();
       expect(updateInfo?.fileUrl).toBe(
-        "https://test-bucket.s3.us-east-1.amazonaws.com/fp-bundle.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=test-access-key%2F20251015%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20251015T122100Z&X-Amz-Expires=3600&X-Amz-Signature=d70e9b699dccbb51cf32f3e5b7912f2567d38f7e508b1f30091a8fee0d0abb65&X-Amz-SignedHeaders=host&x-amz-checksum-mode=ENABLED&x-id=GetObject",
+        "https://s3.example.com/test-bucket/fp-bundle.zip",
       );
     });
   });

package/src/db/index.ts

@@ -1,5 +1,9 @@
-import type { StoragePlugin } from "@hot-updater/plugin-core";
-import { createHandler } from "../handler";
+import type {
+  HotUpdaterContext,
+  StoragePlugin,
+} from "@hot-updater/plugin-core";
+import { createHandler, type HandlerRoutes } from "../handler";
+import { normalizeBasePath } from "../route";
 import {
   createOrmDatabaseCore,
   type HotUpdaterClient,
@@ -17,41 +21,45 @@ import {
 export type { HotUpdaterClient, Migrator } from "./ormCore";
 export { HotUpdaterDB } from "./ormCore";
 
-type OrmCore = ReturnType<typeof createOrmDatabaseCore>;
-type PluginCore = ReturnType<typeof createPluginDatabaseCore>;
-type HotUpdaterCoreInternal = OrmCore | PluginCore;
-
-export type HotUpdaterAPI = DatabaseAPI & {
-  handler: (request: Request) => Promise<Response>;
+export type HotUpdaterAPI<TContext = unknown> = DatabaseAPI<TContext> & {
+  basePath: string;
+  handler: (
+    request: Request,
+    context?: HotUpdaterContext<TContext>,
+  ) => Promise<Response>;
   adapterName: string;
   createMigrator: () => Migrator;
   generateSchema: HotUpdaterClient["generateSchema"];
 };
 
-interface HotUpdaterOptions {
-  database: DatabaseAdapter;
+export interface CreateHotUpdaterOptions<TContext = unknown> {
+  database: DatabaseAdapter<TContext>;
   /**
    * Storage plugins for handling file uploads and downloads.
    */
-  storages?: (StoragePlugin | StoragePluginFactory)[];
+  storages?: (StoragePlugin<TContext> | StoragePluginFactory<TContext>)[];
   /**
    * @deprecated Use `storages` instead. This field will be removed in a future version.
    */
-  storagePlugins?: (StoragePlugin | StoragePluginFactory)[];
+  storagePlugins?: (StoragePlugin<TContext> | StoragePluginFactory<TContext>)[];
   basePath?: string;
   cwd?: string;
+  routes?: HandlerRoutes;
 }
 
-export function createHotUpdater(options: HotUpdaterOptions): HotUpdaterAPI {
+export function createHotUpdater<TContext = unknown>(
+  options: CreateHotUpdaterOptions<TContext>,
+): HotUpdaterAPI<TContext> {
+  const basePath = normalizeBasePath(options.basePath ?? "/api");
+
   // Initialize storage plugins - call factories if they are functions
-  const storagePlugins = (
-    options?.storages ??
-    options?.storagePlugins ??
-    []
-  ).map((plugin) => (typeof plugin === "function" ? plugin() : plugin));
+  const storagePlugins = (options.storages ?? options.storagePlugins ?? []).map(
+    (plugin) => (typeof plugin === "function" ? plugin() : plugin),
+  );
 
-  const resolveFileUrl = async (
+  const resolveStoragePluginUrl = async (
     storageUri: string | null,
+    context?: HotUpdaterContext<TContext>,
   ): Promise<string | null> => {
     if (!storageUri) {
       return null;
@@ -66,35 +74,47 @@ export function createHotUpdater(options: HotUpdaterOptions): HotUpdaterAPI {
     if (!plugin) {
       throw new Error(`No storage plugin for protocol: ${protocol}`);
     }
-    const { fileUrl } = await plugin.getDownloadUrl(storageUri);
+    const { fileUrl } = await plugin.getDownloadUrl(storageUri, context);
     if (!fileUrl) {
       throw new Error("Storage plugin returned empty fileUrl");
     }
     return fileUrl;
   };
 
-  let core: HotUpdaterCoreInternal;
+  const resolveFileUrl = async (
+    storageUri: string | null,
+    context?: HotUpdaterContext<TContext>,
+  ) => {
+    return resolveStoragePluginUrl(storageUri, context);
+  };
 
   const database = options.database;
 
-  if (isDatabasePluginFactory(database) || isDatabasePlugin(database)) {
-    const plugin = isDatabasePluginFactory(database) ? database() : database;
-    core = createPluginDatabaseCore(plugin, resolveFileUrl);
-  } else {
-    core = createOrmDatabaseCore({
-      database,
-      resolveFileUrl,
-    });
-  }
+  const core =
+    isDatabasePluginFactory(database) || isDatabasePlugin(database)
+      ? createPluginDatabaseCore<TContext>(
+          isDatabasePluginFactory(database) ? database() : database,
+          resolveFileUrl,
+        )
+      : createOrmDatabaseCore<TContext>({
+          database,
+          resolveFileUrl,
+        });
 
-  return {
+  const api = {
     ...core.api,
-    handler: createHandler(
-      core.api,
-      options?.basePath ? { basePath: options.basePath } : {},
-    ),
+    handler: createHandler(core.api, {
+      basePath,
+      routes: options.routes,
+    }),
     adapterName: core.adapterName,
     createMigrator: core.createMigrator,
     generateSchema: core.generateSchema,
   };
+
+  return {
+    ...api,
+    basePath,
+    handler: api.handler,
+  };
 }