@hot-updater/react-native 1.0.0-rc.2 → 1.0.0-rc.3

package/src/checkForUpdate.releaseCatalog.spec.ts

@@ -119,7 +119,7 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
-      id: TARGET_BUNDLE_ID,
+      id: RELEASE_ID,
       releaseId: RELEASE_ID,
       transitionKind: "INSTALL",
     });
@@ -191,6 +191,7 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
+      id: RELEASE_ID,
       shouldForceUpdate: false,
       transitionKind: "ADOPT_RELEASE",
     });
@@ -238,7 +239,9 @@ describe("checkForUpdate Release catalog protocol", () => {
 
     expect(sendInsightsEvent).toHaveBeenCalledWith(
       expect.objectContaining({
+        fromBundleId: TARGET_BUNDLE_ID,
         fromReleaseId: MINIMUM_RELEASE_ID,
+        toBundleId: TARGET_BUNDLE_ID,
         toReleaseId: RELEASE_ID,
         type: "RELEASE_ADOPTED",
       }),
@@ -280,7 +283,7 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
-      id: TARGET_BUNDLE_ID,
+      id: RELEASE_ID,
       releaseId: RELEASE_ID,
       status: "UPDATE",
       transitionKind: "INSTALL",
@@ -315,7 +318,7 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
-      id: TARGET_BUNDLE_ID,
+      id: RELEASE_ID,
       releaseId: RELEASE_ID,
       transitionKind: "ADOPT_RELEASE",
     });
@@ -395,7 +398,7 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
-      id: TARGET_BUNDLE_ID,
+      id: RELEASE_ID,
       releaseId: RELEASE_ID,
       shouldForceUpdate: true,
       status: "ROLLBACK",
@@ -448,58 +451,70 @@ describe("checkForUpdate Release catalog protocol", () => {
     });
 
     expect(result).toMatchObject({
-      id: TARGET_BUNDLE_ID,
+      id: RELEASE_ID,
       shouldForceUpdate: true,
       status: "ROLLBACK",
       transitionKind: "INSTALL",
     });
   });
 
-  it("returns a forced built-in rollback only for an active OTA", async () => {
-    const active: PersistedSelectionReceipt = {
-      catalogId: CATALOG_ID,
-      bundleId: CURRENT_BUNDLE_ID,
-      catalogHash: `sha256:${"b".repeat(64)}`,
-      channel: CHANNEL,
-      generation: 1,
-      kind: "BUNDLE",
-      releaseId: ACTIVE_RELEASE_ID,
-      scopeKey: SCOPE_KEY,
-      selectionContextHash: "old-context",
-    };
-    mocks.getActiveUpdateState.mockReturnValueOnce({
-      activeSelection: active,
-      highestSeenCatalogs: {},
-      stableSelection: active,
-      verificationPending: false,
-    });
-    const { checkForUpdate } = await import("./checkForUpdate");
-    const { client } = createClient(
-      createCatalog({ releases: [], rollbackReleases: [] }),
-    );
+  it.each(["EMBEDDED", "BUILTIN"] as const)(
+    "returns a forced %s rollback with its console ID or built-in fallback",
+    async (kind) => {
+      const active: PersistedSelectionReceipt = {
+        catalogId: CATALOG_ID,
+        bundleId: CURRENT_BUNDLE_ID,
+        catalogHash: `sha256:${"b".repeat(64)}`,
+        channel: CHANNEL,
+        generation: 1,
+        kind: "BUNDLE",
+        releaseId: MINIMUM_RELEASE_ID,
+        scopeKey: SCOPE_KEY,
+        selectionContextHash: "old-context",
+      };
+      mocks.getActiveUpdateState.mockReturnValueOnce({
+        activeSelection: active,
+        highestSeenCatalogs: {},
+        stableSelection: active,
+        verificationPending: false,
+      });
+      const { checkForUpdate } = await import("./checkForUpdate");
+      const { client, resolveArtifact } = createClient(
+        createCatalog({
+          releases:
+            kind === "EMBEDDED"
+              ? [{ ...createCatalog().releases[0]!, kind, bundleId: null }]
+              : [],
+          rollbackReleases: [],
+        }),
+      );
 
-    const result = await checkForUpdate({
-      client,
-      updateStrategy: "appVersion",
-    });
+      const result = await checkForUpdate({
+        client,
+        updateStrategy: "appVersion",
+      });
 
-    expect(result).toMatchObject({
-      id: MINIMUM_RELEASE_ID,
-      releaseId: null,
-      shouldForceUpdate: true,
-      status: "ROLLBACK",
-      transitionKind: "USE_BUILTIN",
-    });
-    await expect(result?.updateBundle()).resolves.toBe(true);
-    expect(mocks.commitReleaseSelection).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selection: expect.objectContaining({
-          kind: "BUILTIN",
-          releaseId: null,
+      expect(result).toMatchObject({
+        id: kind === "EMBEDDED" ? RELEASE_ID : MINIMUM_RELEASE_ID,
+        releaseId: kind === "EMBEDDED" ? RELEASE_ID : null,
+        shouldForceUpdate: true,
+        status: "ROLLBACK",
+        transitionKind: kind === "EMBEDDED" ? "USE_EMBEDDED" : "USE_BUILTIN",
+      });
+      await expect(result?.updateBundle()).resolves.toBe(true);
+      expect(mocks.commitReleaseSelection).toHaveBeenCalledWith(
+        expect.objectContaining({
+          selection: expect.objectContaining({
+            bundleId: MINIMUM_RELEASE_ID,
+            kind,
+            releaseId: kind === "EMBEDDED" ? RELEASE_ID : null,
+          }),
         }),
-      }),
-    );
-  });
+      );
+      expect(resolveArtifact).not.toHaveBeenCalled();
+      expect(mocks.updateBundle).not.toHaveBeenCalled();
+    },
+  );
 
   it("does not surface a rollback when the app already uses built-in bytes", async () => {
     mocks.getBundleId.mockReturnValueOnce(MINIMUM_RELEASE_ID);

package/src/checkForUpdate.ts

@@ -383,7 +383,7 @@ async function checkForReleaseCatalogUpdate(input: {
   return {
     fileHash: null,
     fileUrl: null,
-    id: desired.bundleId,
+    id: desired.releaseId ?? desired.bundleId,
     message: release?.message ?? null,
     releaseId: desired.releaseId,
     rolloutCohortCount: release?.rolloutCohortCount ?? 1000,

package/src/index.spec.ts

@@ -22,7 +22,7 @@ const mocks = vi.hoisted(() => {
     })),
     getAppVersion: vi.fn(() => "1.0.0"),
     getBaseURL: vi.fn(() => null),
-    getBundleId: vi.fn(() => "bundle-id"),
+    getUpdateId: vi.fn(() => "release-id"),
     getChannel: vi.fn(() => "production"),
     getCohort: vi.fn(() => "123"),
     getCrashHistory: vi.fn(() => []),
@@ -31,7 +31,6 @@ const mocks = vi.hoisted(() => {
     getInstallId: vi.fn(() => "install-id"),
     getManifest: vi.fn(() => null),
     getMinBundleId: vi.fn(() => "min-bundle-id"),
-    getReleaseId: vi.fn(async () => null),
     init: vi.fn(),
     isChannelSwitched: vi.fn(() => false),
     notifyAppReady: vi.fn(() => ({ status: "UNCHANGED" as const })),
@@ -59,7 +58,7 @@ vi.mock("./native", () => ({
   getPublicActiveUpdateState: mocks.getActiveUpdateState,
   getAppVersion: mocks.getAppVersion,
   getBaseURL: mocks.getBaseURL,
-  getBundleId: mocks.getBundleId,
+  getUpdateId: mocks.getUpdateId,
   getChannel: mocks.getChannel,
   getCohort: mocks.getCohort,
   getCrashHistory: mocks.getCrashHistory,
@@ -68,7 +67,6 @@ vi.mock("./native", () => ({
   getInstallId: mocks.getInstallId,
   getManifest: mocks.getManifest,
   getMinBundleId: mocks.getMinBundleId,
-  getReleaseId: mocks.getReleaseId,
   isChannelSwitched: mocks.isChannelSwitched,
   notifyAppReady: mocks.notifyAppReady,
   reload: mocks.reload,
@@ -97,6 +95,14 @@ describe("HotUpdater client initialization", () => {
     mocks.wrap.mockImplementation((Component: unknown) => Component);
   });
 
+  it("exposes the console ID through the existing getter only", async () => {
+    const HotUpdater = await importHotUpdater();
+
+    expect(HotUpdater.getBundleId()).toBe("release-id");
+    expect(HotUpdater).not.toHaveProperty("getReleaseId");
+    expect(HotUpdater).not.toHaveProperty("getUpdateId");
+  });
+
   it("initializes a private HTTP client from the required baseURL", async () => {
     const client = { createSession: vi.fn() };
     mocks.createHttpClient.mockReturnValue(client as never);

package/src/index.ts

@@ -10,7 +10,7 @@ import {
   clearCrashHistory,
   getAppVersion,
   getBaseURL,
-  getBundleId,
+  getUpdateId,
   getChannel,
   getCohort,
   getCrashHistory,
@@ -19,7 +19,6 @@ import {
   getInstallId,
   getManifest,
   getMinBundleId,
-  getReleaseId,
   isChannelSwitched,
   notifyAppReady,
   reload,
@@ -336,16 +335,14 @@ function createHotUpdaterClient() {
     getActiveUpdateState: async () => getPublicActiveUpdateState(),
 
     /**
-     * Fetches the current bundle ID of the app.
+     * Returns the selected update ID, matching the ID shown in the console.
+     * A staged update can change this ID before the app reloads.
      */
-    getBundleId,
+    getBundleId: getUpdateId,
 
     /** Returns the minimum bundle ID based on the native app build time. */
     getMinBundleId,
 
-    /** Returns the active Release identity, or null for BUILTIN/legacy state. */
-    getReleaseId,
-
     /**
      * Fetches the current manifest for the active bundle.
      */

package/src/native.spec.ts

@@ -52,6 +52,13 @@ vi.mock("./specs/NativeHotUpdater", () => ({
 describe("notifyAppReady", () => {
   beforeEach(() => {
     vi.resetModules();
+    nativeModuleMock.getActiveUpdateState.mockReset();
+    nativeModuleMock.getActiveUpdateState.mockReturnValue({
+      activeSelection: null,
+      stableSelection: null,
+      verificationPending: false,
+      highestSeenCatalogs: {},
+    });
     nativeModuleMock.notifyAppReady.mockReset();
     nativeModuleMock.getBaseURL.mockReset();
     nativeModuleMock.getBundleId.mockReset();
@@ -122,6 +129,89 @@ describe("notifyAppReady", () => {
     });
   });
 
+  it("tracks same-file promotions without changing artifact or crash identities", async () => {
+    const state = {
+      activeSelection: {
+        kind: "BUNDLE",
+        bundleId: "bundle-123",
+        releaseId: "release-1",
+      },
+    };
+    nativeModuleMock.getActiveUpdateState.mockImplementation(() => state);
+    nativeModuleMock.getBundleId.mockReturnValue("bundle-123");
+    nativeModuleMock.getManifest.mockReturnValue({ assets: {} });
+    nativeModuleMock.getCrashHistory.mockReturnValue(["bundle-failed"]);
+    const { getUpdateId, getBundleId, getManifest, getCrashHistory } =
+      await import("./native");
+
+    expect(getUpdateId()).toBe("release-1");
+    state.activeSelection.releaseId = "release-2";
+    expect(getUpdateId()).toBe("release-2");
+    expect(getBundleId()).toBe("bundle-123");
+    expect(getManifest().bundleId).toBe("bundle-123");
+    expect(getCrashHistory()).toEqual(["bundle-failed"]);
+  });
+
+  it.each([
+    [null, "min-bundle-id"],
+    ["legacy-bundle", "legacy-bundle"],
+  ])(
+    "preserves the fallback ID for native bundle %s",
+    async (bundleId, expected) => {
+      nativeModuleMock.getBundleId.mockReturnValue(bundleId);
+      const { getUpdateId } = await import("./native");
+
+      expect(getUpdateId()).toBe(expected);
+    },
+  );
+
+  it("reports a staged update while the manifest still identifies the running file", async () => {
+    const runningSelection = {
+      kind: "BUNDLE",
+      bundleId: "running-file",
+      releaseId: "running-update",
+    };
+    const state = {
+      activeSelection: runningSelection,
+      stableSelection: runningSelection,
+    };
+    nativeModuleMock.getActiveUpdateState.mockImplementation(() => state);
+    nativeModuleMock.getBundleId.mockReturnValue("running-file");
+    nativeModuleMock.getManifest.mockReturnValue({
+      assets: {},
+      bundleId: "running-file",
+    });
+    const { getUpdateId, getBundleId, getManifest } = await import("./native");
+
+    expect(getUpdateId()).toBe("running-update");
+    state.activeSelection = {
+      kind: "BUNDLE",
+      bundleId: "staged-file",
+      releaseId: "staged-update",
+    };
+
+    expect(getUpdateId()).toBe("staged-update");
+    expect(getBundleId()).toBe("running-file");
+    expect(getManifest().bundleId).toBe("running-file");
+  });
+
+  it("reports an explicit built-in rollback by its update ID", async () => {
+    nativeModuleMock.getActiveUpdateState.mockReturnValue(
+      JSON.stringify({
+        activeSelection: {
+          kind: "EMBEDDED",
+          releaseId: "rollback-1",
+          bundleId: "min-bundle-id",
+        },
+      }),
+    );
+    nativeModuleMock.getBundleId.mockReturnValue(null);
+    const { getUpdateId, getBundleId } = await import("./native");
+
+    expect(getUpdateId()).toBe("rollback-1");
+    expect(getBundleId()).toBe("min-bundle-id");
+  });
+
   it("normalizes legacy PROMOTED launch reports to UPDATE_APPLIED", async () => {
     nativeModuleMock.notifyAppReady.mockReturnValue(
       JSON.stringify({

package/src/native.ts

@@ -599,8 +599,9 @@ export const getMinBundleId = (): string => {
   return constants.MIN_BUNDLE_ID;
 };
 
-export const getReleaseId = async (): Promise<string | null> =>
-  getActiveUpdateState().activeSelection?.releaseId ?? null;
+/** Returns the selected update ID shown in the console, including staged updates. */
+export const getUpdateId = (): string =>
+  getActiveUpdateState().activeSelection?.releaseId ?? getBundleId();
 
 /**
  * Fetches the current bundle version id.

package/src/sdkVersion.ts

@@ -1 +1 @@
-export const HOT_UPDATER_SDK_VERSION = "1.0.0-rc.2";
+export const HOT_UPDATER_SDK_VERSION = "1.0.0-rc.3";

package/src/wrap.spec.ts

@@ -1,5 +1,8 @@
-import type React from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+// @vitest-environment jsdom
+
+import { cleanup, render, waitFor } from "@testing-library/react";
+import { createElement, type ComponentType } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import type {
   NotifyAppReadyInsightsEvent,
@@ -32,6 +35,7 @@ const mocks = vi.hoisted(() => ({
   checkForUpdate: vi.fn(),
   getAppVersion: vi.fn(() => "1.0.0"),
   getBundleId: vi.fn(() => "bundle-id"),
+  getUpdateId: vi.fn(() => "release-id"),
   getChannel: vi.fn(() => "production"),
   getCohort: vi.fn(() => "123"),
   getFingerprintHash: vi.fn(() => "fingerprint-hash"),
@@ -55,6 +59,7 @@ vi.mock("./native", () => ({
   addListener: mocks.addListener,
   getAppVersion: mocks.getAppVersion,
   getBundleId: mocks.getBundleId,
+  getUpdateId: mocks.getUpdateId,
   getChannel: mocks.getChannel,
   getCohort: mocks.getCohort,
   getFingerprintHash: mocks.getFingerprintHash,
@@ -92,6 +97,7 @@ describe("HotUpdater wrap initialization", () => {
     mocks.getAppVersion.mockReturnValue("1.0.0");
     mocks.getPersistedUserIdentity.mockReturnValue({});
     mocks.getBundleId.mockReturnValue("bundle-id");
+    mocks.getUpdateId.mockReturnValue("release-id");
     mocks.getChannel.mockReturnValue("production");
     mocks.getCohort.mockReturnValue("123");
     mocks.getFingerprintHash.mockReturnValue("fingerprint-hash");
@@ -99,6 +105,39 @@ describe("HotUpdater wrap initialization", () => {
     mocks.readNotifyAppReady.mockReturnValue(createNotifyReadResult());
   });
 
+  afterEach(cleanup);
+
+  it("reports the console ID when up to date while retaining file IDs in insights", async () => {
+    const onUpdateProcessCompleted = vi.fn();
+    const { client, sendInsightsEvent } = createClient();
+    const { wrap } = await import("./wrap");
+    const WrappedComponent = wrap({
+      insights: true,
+      client,
+      onUpdateProcessCompleted,
+      updateStrategy: "appVersion",
+    })(() => null);
+
+    render(createElement(WrappedComponent));
+
+    await waitFor(() =>
+      expect(onUpdateProcessCompleted).toHaveBeenCalledWith({
+        id: "release-id",
+        message: null,
+        shouldForceUpdate: false,
+        status: "UP_TO_DATE",
+      }),
+    );
+    await waitFor(() =>
+      expect(sendInsightsEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toBundleId: "bundle-id",
+          type: "UNCHANGED",
+        }),
+      ),
+    );
+  });
+
   it("returns void from init and defers notifyAppReady to the next frame", async () => {
     vi.useFakeTimers();
 
@@ -344,14 +383,14 @@ describe("HotUpdater wrap initialization", () => {
 
   it("preserves wrapped component prop inference", async () => {
     const { wrap } = await import("./wrap");
-    const Component: React.ComponentType<{ title: string }> = () => null;
+    const Component: ComponentType<{ title: string }> = () => null;
 
     const WrappedComponent = wrap({
       client: createClient().client,
       updateStrategy: "appVersion",
     })(Component);
 
-    const acceptsTitleProps: React.ComponentType<{ title: string }> =
+    const acceptsTitleProps: ComponentType<{ title: string }> =
       WrappedComponent;
     expect(acceptsTitleProps).toBe(WrappedComponent);
   });

package/src/wrap.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 
 import { checkForUpdate } from "./checkForUpdate";
 import { useEventCallback } from "./hooks/useEventCallback";
-import { getBundleId, reload } from "./native";
+import { getUpdateId, reload } from "./native";
 import { handleNotifyAppReady } from "./notifyAppReadyInsights";
 import { useHotUpdaterStore } from "./store";
 import type {
@@ -61,7 +61,7 @@ export function wrap(
               status: "UP_TO_DATE",
               shouldForceUpdate: false,
               message: null,
-              id: getBundleId(),
+              id: getUpdateId(),
             });
             setUpdateStatus("UPDATE_PROCESS_COMPLETED");
             return;