@hot-updater/server 0.30.12 → 0.31.1

package/src/db/pluginCore.spec.ts

@@ -82,6 +82,298 @@ describe("createPluginDatabaseCore", () => {
     expect(getBundles).not.toHaveBeenCalled();
   });
 
+  it("resolves manifest artifacts through storage text reader", 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",
+            },
+          },
+        }),
+      ],
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "new-bundle-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    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: "manifest-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      async getBundleById(bundleId) {
+        if (bundleId === currentBundle.id) return currentBundle;
+        if (bundleId === targetBundle.id) return targetBundle;
+        return null;
+      },
+      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,
+      },
+    );
+
+    await expect(
+      core.api.getAppUpdateInfo({
+        ...updateArgs,
+        bundleId: currentBundle.id,
+      }),
+    ).resolves.toMatchObject({
+      changedAssets: {
+        "index.ios.bundle": {
+          file: {
+            compression: "br",
+            url: "https://assets.example.com/bucket/target/files/index.ios.bundle.br",
+          },
+          fileHash: "new-bundle-hash",
+        },
+      },
+      manifestFileHash: "sig:target-manifest",
+      manifestUrl: "https://assets.example.com/bucket/target/manifest.json",
+    });
+  });
+
+  it("falls back to archive metadata when manifest changed assets cannot be resolved", 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",
+            },
+          },
+        }),
+      ],
+      [
+        targetBundle.manifestStorageUri,
+        JSON.stringify({
+          bundleId: targetBundle.id,
+          assets: {
+            "index.ios.bundle": {
+              fileHash: "new-bundle-hash",
+            },
+          },
+        }),
+      ],
+    ]);
+    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: "manifest-unresolved-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      async getBundleById(bundleId) {
+        if (bundleId === currentBundle.id) return currentBundle;
+        if (bundleId === targetBundle.id) return targetBundle;
+        return null;
+      },
+      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);
+        if (url.pathname.endsWith("/files/index.ios.bundle.br")) {
+          return null;
+        }
+        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).toMatchObject({
+      fileHash: "hash-2",
+      fileUrl: "https://assets.example.com/bucket/bundle.zip",
+      id: targetBundle.id,
+      status: "UPDATE",
+    });
+    expect(updateInfo).not.toHaveProperty("changedAssets");
+    expect(updateInfo).not.toHaveProperty("manifestFileHash");
+    expect(updateInfo).not.toHaveProperty("manifestUrl");
+  });
+
+  it("propagates manifest storage read failures", async () => {
+    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 storageError = new Error("storage read failed");
+    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: "manifest-error-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      async getBundleById(bundleId) {
+        return bundleId === targetBundle.id ? targetBundle : null;
+      },
+      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 () => {
+          throw storageError;
+        },
+      },
+    );
+
+    await expect(core.api.getAppUpdateInfo(updateArgs)).rejects.toThrow(
+      "storage read failed",
+    );
+  });
+
   it("does not fall back to scanning when plugin getUpdateInfo returns null", async () => {
     const getBundles = vi.fn<DatabasePlugin["getBundles"]>(async () => ({
       data: [baseBundle],
@@ -169,4 +461,97 @@ describe("createPluginDatabaseCore", () => {
     });
     expect(getBundles).toHaveBeenCalledOnce();
   });
+
+  it("rejects invalid bundles before appendBundle is called", async () => {
+    const appendBundle = vi.fn<DatabasePlugin["appendBundle"]>();
+    const commitBundle = vi.fn<DatabasePlugin["commitBundle"]>();
+
+    const plugin: DatabasePlugin = {
+      name: "validation-plugin",
+      appendBundle,
+      commitBundle,
+      async deleteBundle() {},
+      async getBundleById() {
+        return null;
+      },
+      async getBundles() {
+        return {
+          data: [],
+          pagination: {
+            currentPage: 1,
+            hasNextPage: false,
+            hasPreviousPage: false,
+            total: 0,
+            totalPages: 1,
+          },
+        };
+      },
+      async getChannels() {
+        return ["production"];
+      },
+      async updateBundle() {},
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async () => null,
+    );
+
+    await expect(
+      core.api.insertBundle({
+        ...baseBundle,
+        targetAppVersion: null,
+        fingerprintHash: null,
+      }),
+    ).rejects.toThrow(
+      "Bundle must define either targetAppVersion or fingerprintHash.",
+    );
+    expect(appendBundle).not.toHaveBeenCalled();
+    expect(commitBundle).not.toHaveBeenCalled();
+  });
+
+  it("rejects invalid updates before plugin.updateBundle is called", async () => {
+    const updateBundle = vi.fn<DatabasePlugin["updateBundle"]>();
+
+    const plugin: DatabasePlugin = {
+      name: "update-validation-plugin",
+      async appendBundle() {},
+      async commitBundle() {},
+      async deleteBundle() {},
+      async getBundleById(bundleId) {
+        return bundleId === baseBundle.id ? baseBundle : null;
+      },
+      async getBundles() {
+        return {
+          data: [],
+          pagination: {
+            currentPage: 1,
+            hasNextPage: false,
+            hasPreviousPage: false,
+            total: 0,
+            totalPages: 1,
+          },
+        };
+      },
+      async getChannels() {
+        return ["production"];
+      },
+      updateBundle,
+    };
+
+    const core = createPluginDatabaseCore(
+      () => plugin,
+      async () => null,
+    );
+
+    await expect(
+      core.api.updateBundleById(baseBundle.id, {
+        targetAppVersion: null,
+        fingerprintHash: null,
+      }),
+    ).rejects.toThrow(
+      "Bundle must define either targetAppVersion or fingerprintHash.",
+    );
+    expect(updateBundle).not.toHaveBeenCalled();
+  });
 });

package/src/db/pluginCore.ts

@@ -1,5 +1,5 @@
 import type {
-  AppUpdateInfo,
+  AppUpdateAvailableInfo,
   AppVersionGetBundlesArgs,
   Bundle,
   FingerprintGetBundlesArgs,
@@ -17,7 +17,9 @@ import {
   semverSatisfies,
 } from "@hot-updater/plugin-core";
 
+import { assertBundlePersistenceConstraints } from "./schemaEnhancements";
 import type { DatabaseAPI } from "./types";
+import { resolveManifestArtifacts } from "./updateArtifacts";
 
 const PAGE_SIZE = 100;
 const DESC_ORDER = { field: "id", direction: "desc" } as const;
@@ -110,6 +112,10 @@ export function createPluginDatabaseCore<TContext = unknown>(
     cleanupMutationPlugin?: (
       plugin: DatabasePlugin<TContext>,
     ) => Promise<void> | void;
+    readStorageText?: (
+      storageUri: string,
+      context?: HotUpdaterContext<TContext>,
+    ) => Promise<string | null>;
   },
 ): {
   api: DatabaseAPI<TContext>;
@@ -336,7 +342,7 @@ export function createPluginDatabaseCore<TContext = unknown>(
     async getAppUpdateInfo(
       args: GetBundlesArgs,
       context?: HotUpdaterContext<TContext>,
-    ): Promise<AppUpdateInfo | null> {
+    ): Promise<AppUpdateAvailableInfo | null> {
       const info = await this.getUpdateInfo(args, context);
       if (!info) {
         return null;
@@ -344,8 +350,37 @@ export function createPluginDatabaseCore<TContext = unknown>(
       const { storageUri, ...rest } = info as UpdateInfo & {
         storageUri: string | null;
       };
-      const fileUrl = await resolveFileUrl(storageUri ?? null, context);
-      return { ...rest, fileUrl };
+
+      const readStorageText = options?.readStorageText;
+      if (info.id === NIL_UUID || !readStorageText) {
+        const fileUrl = await resolveFileUrl(storageUri ?? null, context);
+        const baseResponse: AppUpdateAvailableInfo = { ...rest, fileUrl };
+        return baseResponse;
+      }
+
+      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,
+      ]);
+      const baseResponse: AppUpdateAvailableInfo = { ...rest, fileUrl };
+      const manifestArtifacts = await resolveManifestArtifacts({
+        currentBundle,
+        resolveFileUrl,
+        readStorageText,
+        targetBundle,
+        context,
+      });
+      if (!manifestArtifacts) {
+        return baseResponse;
+      }
+
+      return {
+        ...baseResponse,
+        ...manifestArtifacts,
+      };
     },
 
     async getChannels(
@@ -362,6 +397,7 @@ export function createPluginDatabaseCore<TContext = unknown>(
       bundle: Bundle,
       context?: HotUpdaterContext<TContext>,
     ): Promise<void> {
+      assertBundlePersistenceConstraints(bundle);
       await runWithMutationPlugin(async (plugin) => {
         await plugin.appendBundle(bundle, context);
         await plugin.commitBundle(context);
@@ -374,6 +410,11 @@ export function createPluginDatabaseCore<TContext = unknown>(
       context?: HotUpdaterContext<TContext>,
     ): Promise<void> {
       await runWithMutationPlugin(async (plugin) => {
+        const current = await plugin.getBundleById(bundleId, context);
+        if (!current) {
+          throw new Error("targetBundleId not found");
+        }
+        assertBundlePersistenceConstraints({ ...current, ...newBundle });
         await plugin.updateBundle(bundleId, newBundle, context);
         await plugin.commitBundle(context);
       });