@hot-updater/server 0.32.0 → 0.33.1

package/src/db/pluginCore.spec.ts

@@ -4,6 +4,7 @@ import type {
   DatabasePlugin,
   RequestEnvContext,
 } from "@hot-updater/plugin-core";
+import { createDatabasePluginGetUpdateInfo } from "@hot-updater/plugin-core";
 import { describe, expect, it, vi } from "vitest";
 
 import { createPluginDatabaseCore } from "./pluginCore";
@@ -195,6 +196,428 @@ describe("createPluginDatabaseCore", () => {
     });
   });
 
+  it("uses request bundle identity map for manifest artifact lookups", async () => {
+    const currentBundle = {
+      ...baseBundle,
+      id: "00000000-0000-0000-0000-000000000001",
+      manifestStorageUri: "r2://bucket/current/manifest.json",
+      manifestFileHash: "sig:current-manifest",
+      assetBaseStorageUri: "r2://bucket/current/files",
+    };
+    const targetBundle = {
+      ...baseBundle,
+      id: "00000000-0000-0000-0000-000000000002",
+      fileHash: "hash-2",
+      manifestStorageUri: "r2://bucket/target/manifest.json",
+      manifestFileHash: "sig:target-manifest",
+      assetBaseStorageUri: "r2://bucket/target/files",
+    };
+    const manifests = new Map([
+      [
+        currentBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: currentBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "old-bundle-hash",
+            },
+            "shared.png": {
+              fileHash: "same-image-hash",
+            },
+          },
+        }),
+      ],
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "target-bundle-hash",
+            },
+            "shared.png": {
+              fileHash: "same-image-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    const getBundleById = vi.fn<DatabasePlugin<TestContext>["getBundleById"]>(
+      async (bundleId) => {
+        if (bundleId === currentBundle.id) return currentBundle;
+        if (bundleId === targetBundle.id) return targetBundle;
+        return null;
+      },
+    );
+    const getUpdateInfo = vi.fn<
+      NonNullable<DatabasePlugin<TestContext>["getUpdateInfo"]>
+    >(async () => ({
+      fileHash: targetBundle.fileHash,
+      id: targetBundle.id,
+      message: targetBundle.message,
+      shouldForceUpdate: targetBundle.shouldForceUpdate,
+      status: "UPDATE",
+      storageUri: targetBundle.storageUri,
+    }));
+
+    const plugin: DatabasePlugin<TestContext> = {
+      name: "identity-map-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      getBundleById,
+      getUpdateInfo,
+      async getBundles() {
+        return {
+          data: [targetBundle],
+          pagination: {
+            currentPage: 1,
+            hasNextPage: false,
+            hasPreviousPage: false,
+            total: 1,
+            totalPages: 1,
+          },
+        };
+      },
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async (storageUri) => {
+        if (!storageUri) return null;
+        const url = new URL(storageUri);
+        return `https://assets.example.com/${url.host}${url.pathname}`;
+      },
+      {
+        readStorageText: async (storageUri) =>
+          manifests.get(storageUri) ?? null,
+      },
+    );
+
+    const updateInfo = await core.api.getAppUpdateInfo({
+      ...updateArgs,
+      bundleId: currentBundle.id,
+    });
+    expect(updateInfo).not.toBeNull();
+    if (!updateInfo) {
+      throw new Error("expected app update info");
+    }
+
+    expect(updateInfo).toMatchObject({
+      changedAssets: {
+        "index.ios.bundle": {
+          file: {
+            compression: "br",
+            url: "https://assets.example.com/bucket/target/files/index.ios.bundle.br",
+          },
+          fileHash: "target-bundle-hash",
+        },
+      },
+      manifestFileHash: "sig:target-manifest",
+      manifestUrl: "https://assets.example.com/bucket/target/manifest.json",
+    });
+    expect(updateInfo.changedAssets).not.toHaveProperty("shared.png");
+    expect(getUpdateInfo).toHaveBeenCalledOnce();
+    expect(getBundleById).toHaveBeenCalledTimes(2);
+    expect(getBundleById).toHaveBeenCalledWith(targetBundle.id, undefined);
+    expect(getBundleById).toHaveBeenCalledWith(currentBundle.id, undefined);
+    expect(Object.keys(updateInfo)).not.toContain("__hotUpdaterBundle");
+    expect(Object.keys(updateInfo)).not.toContain("__hotUpdaterCurrentBundle");
+    expect(JSON.stringify(updateInfo)).not.toContain("__hotUpdaterBundle");
+    expect(JSON.stringify(updateInfo)).not.toContain(
+      "__hotUpdaterCurrentBundle",
+    );
+  });
+
+  it("dedupes manifest artifact bundle lookups without request context", async () => {
+    const targetBundle = {
+      ...baseBundle,
+      id: "00000000-0000-0000-0000-000000000002",
+      fileHash: "hash-2",
+      manifestStorageUri: "s3://bucket/target/manifest.json",
+      manifestFileHash: "sig:target-manifest",
+      assetBaseStorageUri: "s3://bucket/target/files",
+    };
+    const manifests = new Map([
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "target-bundle-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    const getBundleById = vi.fn<DatabasePlugin<TestContext>["getBundleById"]>(
+      async (bundleId) => (bundleId === targetBundle.id ? targetBundle : null),
+    );
+    const getUpdateInfo = vi.fn<
+      NonNullable<DatabasePlugin<TestContext>["getUpdateInfo"]>
+    >(async () => ({
+      fileHash: targetBundle.fileHash,
+      id: targetBundle.id,
+      message: targetBundle.message,
+      shouldForceUpdate: targetBundle.shouldForceUpdate,
+      status: "UPDATE",
+      storageUri: targetBundle.storageUri,
+    }));
+
+    const plugin: DatabasePlugin<TestContext> = {
+      name: "undefined-context-identity-map-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      getBundleById,
+      getUpdateInfo,
+      async getBundles() {
+        return {
+          data: [targetBundle],
+          pagination: {
+            currentPage: 1,
+            hasNextPage: false,
+            hasPreviousPage: false,
+            total: 1,
+            totalPages: 1,
+          },
+        };
+      },
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async (storageUri) => {
+        if (!storageUri) return null;
+        const url = new URL(storageUri);
+        return `https://assets.example.com/${url.host}${url.pathname}`;
+      },
+      {
+        readStorageText: async (storageUri) =>
+          manifests.get(storageUri) ?? null,
+      },
+    );
+
+    const updateInfo = await core.api.getAppUpdateInfo({
+      ...updateArgs,
+      bundleId: targetBundle.id,
+    });
+
+    expect(updateInfo).toMatchObject({
+      changedAssets: {},
+      id: targetBundle.id,
+      manifestFileHash: "sig:target-manifest",
+      manifestUrl: "https://assets.example.com/bucket/target/manifest.json",
+    });
+    expect(getBundleById).toHaveBeenCalledOnce();
+    expect(getBundleById).toHaveBeenCalledWith(targetBundle.id, undefined);
+  });
+
+  it("seeds request bundle identity map from provider update lookups", async () => {
+    const targetBundle = {
+      ...baseBundle,
+      id: "00000000-0000-0000-0000-000000000002",
+      fileHash: "hash-2",
+      manifestStorageUri: "s3://bucket/target/manifest.json",
+      manifestFileHash: "sig:target-manifest",
+      assetBaseStorageUri: "s3://bucket/target/files",
+    };
+    const manifests = new Map([
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "target-bundle-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    const getBundleById = vi.fn<DatabasePlugin<TestContext>["getBundleById"]>(
+      async () => {
+        throw new Error("unexpected provider bundle reread");
+      },
+    );
+    const getUpdateInfo = createDatabasePluginGetUpdateInfo<TestContext>({
+      getBundlesByFingerprint: async () => [],
+      getBundlesByTargetAppVersions: async () => [targetBundle],
+      listTargetAppVersions: async () => ["1.0.0"],
+    });
+    const plugin: DatabasePlugin<TestContext> = {
+      name: "seeded-fast-path-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      getBundleById,
+      async getBundles() {
+        return {
+          data: [targetBundle],
+          pagination: {
+            currentPage: 1,
+            hasNextPage: false,
+            hasPreviousPage: false,
+            total: 1,
+            totalPages: 1,
+          },
+        };
+      },
+      getUpdateInfo,
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async (storageUri) => {
+        if (!storageUri) return null;
+        const url = new URL(storageUri);
+        return `https://assets.example.com/${url.host}${url.pathname}`;
+      },
+      {
+        readStorageText: async (storageUri) =>
+          manifests.get(storageUri) ?? null,
+      },
+    );
+    const context: TestContext = {
+      env: {
+        assetHost: "https://assets.example.com",
+      },
+      request: new Request("https://updates.example.com"),
+    };
+
+    const updateInfo = await core.api.getAppUpdateInfo(updateArgs, context);
+
+    expect(updateInfo).toMatchObject({
+      changedAssets: {
+        "index.ios.bundle": {
+          file: {
+            compression: "br",
+            url: "https://assets.example.com/bucket/target/files/index.ios.bundle.br",
+          },
+          fileHash: "target-bundle-hash",
+        },
+      },
+      id: targetBundle.id,
+      manifestFileHash: "sig:target-manifest",
+      manifestUrl: "https://assets.example.com/bucket/target/manifest.json",
+    });
+    expect(getBundleById).not.toHaveBeenCalled();
+  });
+
+  it("does not reread providers for current bundles outside direct update lookup results", async () => {
+    const targetBundle = {
+      ...baseBundle,
+      id: "00000000-0000-0000-0000-000000000003",
+      fileHash: "hash-3",
+      manifestStorageUri: "s3://bucket/target/manifest.json",
+      manifestFileHash: "sig:target-manifest",
+      assetBaseStorageUri: "s3://bucket/target/files",
+    };
+    const manifests = new Map([
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "target-bundle-hash",
+            },
+            "image.png": {
+              fileHash: "target-image-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    const getBundleById = vi.fn<DatabasePlugin<TestContext>["getBundleById"]>(
+      async () => {
+        throw new Error("unexpected provider current bundle reread");
+      },
+    );
+    const getUpdateInfo = createDatabasePluginGetUpdateInfo<TestContext>({
+      getBundlesByFingerprint: async () => [],
+      getBundlesByTargetAppVersions: async () => [targetBundle],
+      listTargetAppVersions: async () => ["1.0.0"],
+    });
+    const plugin: DatabasePlugin<TestContext> = {
+      name: "seeded-current-miss-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      getBundleById,
+      async getBundles() {
+        throw new Error("unexpected provider scan");
+      },
+      getUpdateInfo,
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async (storageUri) => {
+        if (!storageUri) return null;
+        const url = new URL(storageUri);
+        return `https://assets.example.com/${url.host}${url.pathname}`;
+      },
+      {
+        readStorageText: async (storageUri) =>
+          manifests.get(storageUri) ?? null,
+      },
+    );
+    const context: TestContext = {
+      env: {
+        assetHost: "https://assets.example.com",
+      },
+      request: new Request("https://updates.example.com"),
+    };
+
+    const updateInfo = await core.api.getAppUpdateInfo(
+      {
+        ...updateArgs,
+        bundleId: "00000000-0000-0000-0000-0000000000aa",
+      },
+      context,
+    );
+
+    expect(updateInfo).toMatchObject({
+      changedAssets: {
+        "image.png": {
+          file: {
+            url: "https://assets.example.com/bucket/target/files/image.png",
+          },
+          fileHash: "target-image-hash",
+        },
+        "index.ios.bundle": {
+          file: {
+            compression: "br",
+            url: "https://assets.example.com/bucket/target/files/index.ios.bundle.br",
+          },
+          fileHash: "target-bundle-hash",
+        },
+      },
+      id: targetBundle.id,
+      manifestFileHash: "sig:target-manifest",
+      manifestUrl: "https://assets.example.com/bucket/target/manifest.json",
+    });
+    expect(getBundleById).not.toHaveBeenCalled();
+  });
+
   it("resolves manifest changed assets from deterministic content-addressed storage", async () => {
     const currentBundle = {
       ...baseBundle,

package/src/db/pluginCore.ts

@@ -13,6 +13,7 @@ import {
   type DatabaseBundleQueryOrder,
   type DatabaseBundleQueryWhere,
   type DatabasePlugin,
+  createRequestUpdateBundleResolver,
   type HotUpdaterContext,
   semverSatisfies,
 } from "@hot-updater/plugin-core";
@@ -347,9 +348,7 @@ export function createPluginDatabaseCore<TContext = unknown>(
       if (!info) {
         return null;
       }
-      const { storageUri, ...rest } = info as UpdateInfo & {
-        storageUri: string | null;
-      };
+      const { storageUri, ...rest } = info;
 
       const readStorageText = options?.readStorageText;
       if (info.id === NIL_UUID || !readStorageText) {
@@ -358,12 +357,27 @@ export function createPluginDatabaseCore<TContext = unknown>(
         return baseResponse;
       }
 
+      const requestBundles = createRequestUpdateBundleResolver(context);
+      const getCurrentBundle = () => {
+        if (args.bundleId === NIL_UUID) {
+          return null;
+        }
+
+        const seededCurrentBundle = requestBundles.peek(args.bundleId);
+        if (seededCurrentBundle || requestBundles.hasSeededBundles()) {
+          return seededCurrentBundle;
+        }
+
+        return requestBundles.getById(args.bundleId, () =>
+          getPlugin().getBundleById(args.bundleId, context),
+        );
+      };
       const [fileUrl, targetBundle, currentBundle] = await Promise.all([
         resolveFileUrl(storageUri ?? null, context),
-        getPlugin().getBundleById(info.id, context),
-        args.bundleId !== NIL_UUID
-          ? getPlugin().getBundleById(args.bundleId, context)
-          : null,
+        requestBundles.getById(info.id, () =>
+          getPlugin().getBundleById(info.id, context),
+        ),
+        getCurrentBundle(),
       ]);
       const baseResponse: AppUpdateAvailableInfo = { ...rest, fileUrl };
       const manifestArtifacts = await resolveManifestArtifacts({

package/src/runtime.spec.ts

@@ -706,6 +706,41 @@ describe("runtime createHotUpdater", () => {
     });
   });
 
+  it("keeps optional maintenance capabilities lazy", () => {
+    const factory = vi.fn(() => ({
+      async getBundleById() {
+        return null;
+      },
+      async getBundles() {
+        return {
+          data: [],
+          pagination: {
+            hasNextPage: false,
+            hasPreviousPage: false,
+            currentPage: 1,
+            totalPages: 1,
+            total: 0,
+          },
+        };
+      },
+      async getChannels() {
+        return [];
+      },
+      async commitBundle() {},
+    }));
+    const database = createDatabasePlugin({
+      name: "lazyRuntimePlugin",
+      factory,
+    })({});
+
+    createHotUpdater({
+      database,
+      basePath: "/api/check-update",
+    });
+
+    expect(factory).not.toHaveBeenCalled();
+  });
+
   it("clears pending plugin changes after a failed mutation commit", async () => {
     const committedBundles = new Map<string, Bundle>();
     let commitAttempt = 0;

package/src/runtime.ts

@@ -73,14 +73,10 @@ export function createHotUpdater<TContext = unknown>(
       : { readStorageText },
   );
 
-  const api = {
-    ...core.api,
-    handler: createHandler(core.api, {
-      basePath,
-      routes: options.routes,
-    }),
-    adapterName: core.adapterName,
-  };
+  const internalHandler = createHandler(core.api, {
+    basePath,
+    routes: options.routes,
+  });
 
   // Some framework adapters strip the mounted base path or pass extra
   // bindings/execution context arguments. Ignore those extras here so the
@@ -91,17 +87,19 @@ export function createHotUpdater<TContext = unknown>(
     ...extraArgs: unknown[]
   ) => {
     if (extraArgs.length > 0) {
-      return api.handler(request);
+      return internalHandler(request);
     }
 
-    return api.handler(request, context);
+    return internalHandler(request, context);
   };
 
-  return {
-    ...api,
+  const api = {
     basePath,
+    adapterName: core.adapterName,
     handler,
   };
+  Object.defineProperties(api, Object.getOwnPropertyDescriptors(core.api));
+  return api as HotUpdaterAPI<TContext>;
 }
 
 export { createHandler };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.cjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.js
-const TableName = Symbol.for("drizzle:Name");
-//#endregion
-exports.TableName = TableName;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.mjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.js
-const TableName = Symbol.for("drizzle:Name");
-//#endregion
-export { TableName };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.cjs

@@ -1,6 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.js
-const tracer = { startActiveSpan(name, fn) {
-	return fn();
-} };
-//#endregion
-exports.tracer = tracer;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.mjs

@@ -1,6 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.js
-const tracer = { startActiveSpan(name, fn) {
-	return fn();
-} };
-//#endregion
-export { tracer };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.cjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.js
-const ViewBaseConfig = Symbol.for("drizzle:ViewBaseConfig");
-//#endregion
-exports.ViewBaseConfig = ViewBaseConfig;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.mjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.js
-const ViewBaseConfig = Symbol.for("drizzle:ViewBaseConfig");
-//#endregion
-export { ViewBaseConfig };