@hot-updater/react-native 0.18.5 → 0.19.0

package/src/checkForUpdate.ts

@@ -1,12 +1,12 @@
-import type { AppUpdateInfo, GetBundlesArgs } from "@hot-updater/core";
+import type { AppUpdateInfo, UpdateBundleParams } from "@hot-updater/core";
 import { Platform } from "react-native";
 import { HotUpdaterError } from "./error";
 import { type UpdateSource, fetchUpdateInfo } from "./fetchUpdateInfo";
 import {
-  HotUpdaterConstants,
   getAppVersion,
   getBundleId,
   getChannel,
+  getFingerprintHash,
   getMinBundleId,
   updateBundle,
 } from "./native";
@@ -55,30 +55,22 @@ export async function checkForUpdate(
     return null;
   }
 
-  const baseArgs = {
-    bundleId: currentBundleId,
-    platform,
-    minBundleId,
-    channel: channel ?? undefined,
-  };
+  const fingerprintHash = getFingerprintHash();
 
-  return fetchUpdateInfo(
-    options.source,
-    HotUpdaterConstants.UPDATE_STRATEGY === "appVersion"
-      ? {
-          _updateStrategy: HotUpdaterConstants.UPDATE_STRATEGY,
-          appVersion: currentAppVersion,
-          ...baseArgs,
-        }
-      : {
-          _updateStrategy: HotUpdaterConstants.UPDATE_STRATEGY,
-          fingerprintHash: HotUpdaterConstants.FINGERPRINT_HASH!,
-          ...baseArgs,
-        },
-    options.requestHeaders,
-    options.onError,
-    options.requestTimeout,
-  ).then((updateInfo) => {
+  return fetchUpdateInfo({
+    source: options.source,
+    params: {
+      bundleId: currentBundleId,
+      appVersion: currentAppVersion,
+      platform,
+      minBundleId,
+      channel,
+      fingerprintHash,
+    },
+    requestHeaders: options.requestHeaders,
+    onError: options.onError,
+    requestTimeout: options.requestTimeout,
+  }).then((updateInfo) => {
     if (!updateInfo) {
       return null;
     }
@@ -96,13 +88,30 @@ export async function checkForUpdate(
   });
 }
 
-export const getUpdateSource = (baseUrl: string) => (args: GetBundlesArgs) => {
-  switch (args._updateStrategy) {
-    case "appVersion":
-      return `${baseUrl}/app-version/${args.platform}/${args.appVersion}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
-    case "fingerprint":
-      return `${baseUrl}/fingerprint/${args.platform}/${args.fingerprintHash}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
-    default:
-      return baseUrl;
-  }
-};
+export interface GetUpdateSourceOptions {
+  /**
+   * The update strategy to use.
+   * @description
+   * - "fingerprint": Use the fingerprint hash to check for updates.
+   * - "appVersion": Use the target app version to check for updates.
+   */
+  updateStrategy: "appVersion" | "fingerprint";
+}
+
+export const getUpdateSource =
+  (baseUrl: string, options: GetUpdateSourceOptions) =>
+  (params: UpdateBundleParams) => {
+    switch (options.updateStrategy) {
+      case "fingerprint": {
+        if (!params.fingerprintHash) {
+          throw new HotUpdaterError("Fingerprint hash is required");
+        }
+        return `${baseUrl}/fingerprint/${params.platform}/${params.fingerprintHash}/${params.channel}/${params.minBundleId}/${params.bundleId}`;
+      }
+      case "appVersion": {
+        return `${baseUrl}/app-version/${params.platform}/${params.appVersion}/${params.channel}/${params.minBundleId}/${params.bundleId}`;
+      }
+      default:
+        return baseUrl;
+    }
+  };

package/src/fetchUpdateInfo.ts

@@ -1,65 +1,79 @@
-import type { AppUpdateInfo, GetBundlesArgs } from "@hot-updater/core";
+import type {
+  AppUpdateInfo,
+  UpdateBundleParams,
+  UpdateStrategy,
+} from "@hot-updater/core";
 
 export type UpdateSource =
   | string
-  | ((args: GetBundlesArgs) => Promise<AppUpdateInfo | null>)
-  | ((args: GetBundlesArgs) => string);
+  | ((params: UpdateBundleParams) => Promise<AppUpdateInfo | null>)
+  | ((params: UpdateBundleParams) => string);
 
-export const fetchUpdateInfo = async (
-  source: UpdateSource,
-  args: GetBundlesArgs,
+function buildRequestHeaders(
+  params: UpdateBundleParams,
   requestHeaders?: Record<string, string>,
-  onError?: (error: Error) => void,
-  requestTimeout = 5000,
-): Promise<AppUpdateInfo | null> => {
-  if (typeof source === "function") {
-    const url = source(args);
-    if (typeof url !== "string") {
-      return null;
-    }
-    source = url;
-  }
+): Record<string, string> {
+  const updateStrategy: UpdateStrategy = params.fingerprintHash
+    ? "fingerprint"
+    : "appVersion";
 
-  const controller = new AbortController();
-  const timeoutId = setTimeout(() => {
-    controller.abort();
-  }, requestTimeout);
+  return {
+    "Content-Type": "application/json",
+    "x-app-platform": params.platform,
+    "x-bundle-id": params.bundleId,
+    ...(updateStrategy === "fingerprint"
+      ? { "x-fingerprint-hash": params.fingerprintHash! }
+      : { "x-app-version": params.appVersion }),
+    ...(params.minBundleId && { "x-min-bundle-id": params.minBundleId }),
+    ...(params.channel && { "x-channel": params.channel }),
+    ...(requestHeaders ?? {}),
+  };
+}
 
-  try {
-    let headers: Record<string, string> = {};
+async function resolveSource(
+  source: UpdateSource,
+  params: UpdateBundleParams,
+): Promise<{ url: string } | { info: AppUpdateInfo | null }> {
+  if (typeof source !== "function") {
+    return { url: source };
+  }
+  const result = source(params);
+  if (typeof result === "string") {
+    return { url: result };
+  }
+  return { info: await result };
+}
 
-    switch (args._updateStrategy) {
-      case "fingerprint":
-        headers = {
-          "Content-Type": "application/json",
-          "x-app-platform": args.platform,
-          "x-bundle-id": args.bundleId,
-          "x-fingerprint-hash": args.fingerprintHash,
-          ...(args.minBundleId ? { "x-min-bundle-id": args.minBundleId } : {}),
-          ...(args.channel ? { "x-channel": args.channel } : {}),
-          ...requestHeaders,
-        };
-        break;
-      case "appVersion":
-        headers = {
-          "Content-Type": "application/json",
-          "x-app-platform": args.platform,
-          "x-bundle-id": args.bundleId,
-          "x-app-version": args.appVersion,
-          ...(args.minBundleId ? { "x-min-bundle-id": args.minBundleId } : {}),
-          ...(args.channel ? { "x-channel": args.channel } : {}),
-          ...requestHeaders,
-        };
-        break;
-      default:
-        throw new Error("Invalid update strategy");
+export const fetchUpdateInfo = async ({
+  source,
+  params,
+  requestHeaders,
+  onError,
+  requestTimeout = 5000,
+}: {
+  source: UpdateSource;
+  params: UpdateBundleParams;
+  requestHeaders?: Record<string, string>;
+  onError?: (error: Error) => void;
+  requestTimeout?: number;
+}): Promise<AppUpdateInfo | null> => {
+  try {
+    const resolvedSource = await resolveSource(source, params);
+    if ("info" in resolvedSource) {
+      return resolvedSource.info;
     }
 
-    const response = await fetch(source, {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+      controller.abort();
+    }, requestTimeout);
+
+    const headers = buildRequestHeaders(params, requestHeaders);
+
+    const response = await fetch(resolvedSource.url, {
       signal: controller.signal,
       headers,
     });
-
     clearTimeout(timeoutId);
 
     if (response.status !== 200) {
@@ -69,9 +83,9 @@ export const fetchUpdateInfo = async (
   } catch (error: any) {
     if (error.name === "AbortError") {
       onError?.(new Error("Request timed out"));
-      return null;
+    } else {
+      onError?.(error as Error);
     }
-    onError?.(error as Error);
     return null;
   }
 };

package/src/index.ts

@@ -6,7 +6,6 @@ import {
   getChannel,
   getFingerprintHash,
   getMinBundleId,
-  getReleaseChannel,
   reload,
   updateBundle,
 } from "./native";
@@ -79,18 +78,6 @@ export const HotUpdater = {
    * ```
    */
   getChannel,
-  /**
-   * The initial channel of the native app.
-   *
-   * @returns {string} The current release channel of the app
-   * @default "production"
-   * @example
-   * ```ts
-   * const channel = HotUpdater.getReleaseChannel();
-   * console.log(`Current release channel: ${channel}`);
-   * ```
-   */
-  getReleaseChannel,
   /**
    * Adds a listener to HotUpdater events.
    *

package/src/native.ts

@@ -1,5 +1,5 @@
-import type { UpdateStatus, UpdateStrategy } from "@hot-updater/core";
-import { NativeEventEmitter, Platform } from "react-native";
+import type { UpdateStatus } from "@hot-updater/core";
+import { NativeEventEmitter } from "react-native";
 import HotUpdaterNative, {
   type UpdateBundleParams,
 } from "./specs/NativeHotUpdater";
@@ -7,20 +7,9 @@ import HotUpdaterNative, {
 const NIL_UUID = "00000000-0000-0000-0000-000000000000";
 
 declare const __HOT_UPDATER_BUNDLE_ID: string | undefined;
-declare const __HOT_UPDATER_FINGERPRINT_HASH_IOS: string | null;
-declare const __HOT_UPDATER_FINGERPRINT_HASH_ANDROID: string | null;
-declare const __HOT_UPDATER_UPDATE_STRATEGY: UpdateStrategy;
-declare const __HOT_UPDATER_CHANNEL: string | null;
 
 export const HotUpdaterConstants = {
-  OVER_THE_AIR_CHANNEL: __HOT_UPDATER_CHANNEL,
   HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID,
-  FINGERPRINT_HASH: Platform.select({
-    ios: __HOT_UPDATER_FINGERPRINT_HASH_IOS,
-    android: __HOT_UPDATER_FINGERPRINT_HASH_ANDROID,
-    default: null,
-  }),
-  UPDATE_STRATEGY: __HOT_UPDATER_UPDATE_STRATEGY,
 };
 
 export type HotUpdaterEvent = {
@@ -141,14 +130,6 @@ export const getBundleId = (): string => {
  * @returns {string} Resolves with the channel or null if not available.
  */
 export const getChannel = (): string => {
-  if (HotUpdaterConstants.OVER_THE_AIR_CHANNEL) {
-    return HotUpdaterConstants.OVER_THE_AIR_CHANNEL;
-  }
-  const constants = HotUpdaterNative.getConstants();
-  return constants.CHANNEL;
-};
-
-export const getReleaseChannel = (): string => {
   const constants = HotUpdaterNative.getConstants();
   return constants.CHANNEL;
 };
@@ -159,5 +140,6 @@ export const getReleaseChannel = (): string => {
  * @returns {string | null} Resolves with the fingerprint hash
  */
 export const getFingerprintHash = (): string | null => {
-  return HotUpdaterConstants.FINGERPRINT_HASH;
+  const constants = HotUpdaterNative.getConstants();
+  return constants.FINGERPRINT_HASH;
 };

package/src/specs/NativeHotUpdater.ts

@@ -18,6 +18,7 @@ export interface Spec extends TurboModule {
     MIN_BUNDLE_ID: string;
     APP_VERSION: string | null;
     CHANNEL: string;
+    FINGERPRINT_HASH: string | null;
   };
 }