@hot-updater/react-native 0.1.4 → 0.1.6-0

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.1.4",
-  "type": "module",
+  "version": "0.1.6-0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
+  "source": "src/index.ts",
   "react-native": "src/index.ts",
   "types": "dist/index.d.ts",
   "files": [
-    "dist",
     "src",
+    "dist",
     "android",
     "ios",
     "cpp",
     "*.podspec",
+    "react-native.config.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -42,29 +43,45 @@
   "publishConfig": {
     "access": "public"
   },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "dist",
+    "targets": [
+      "codegen"
+    ]
+  },
   "codegenConfig": {
     "name": "HotUpdaterSpec",
     "type": "modules",
-    "jsSrcsDir": "./src/specs",
+    "jsSrcsDir": "src/specs",
+    "outputDir": {
+      "ios": "ios/generated",
+      "android": "android/generated"
+    },
     "android": {
       "javaPackageName": "com.hotupdater"
-    }
+    },
+    "includesGeneratedCode": true
   },
   "peerDependencies": {
     "react-native": "*"
   },
   "devDependencies": {
-    "@types/react": "^18.2.6",
-    "react": "^18.2.0",
-    "react-native": "^0.72.6"
+    "@react-native-community/cli": "15.0.1",
+    "@types/react": "^18.2.44",
+    "del-cli": "^6.0.0",
+    "react": "18.3.1",
+    "react-native": "0.76.2",
+    "react-native-builder-bob": "^0.33.1",
+    "@hot-updater/js": "0.1.6-0"
   },
   "dependencies": {
-    "@hot-updater/utils": "0.1.4"
+    "@hot-updater/core": "0.1.6-0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "test:type": "tsc --noEmit",
     "test": "vitest",
-    "codegen:test": "node ./node_modules/react-native/scripts/generate-codegen-artifacts.js --path ./ --outputPath dist/HotUpdater/generated/ -t ios"
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib"
   }
 }

package/react-native.config.js

@@ -0,0 +1,12 @@
+/**
+ * @type {import('@react-native-community/cli-types').UserDependencyConfig}
+ */
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        cmakeListsPath: 'generated/jni/CMakeLists.txt',
+      },
+    },
+  },
+};

package/src/ensureBundles.ts

@@ -0,0 +1,21 @@
+import type { Bundle, BundleArg } from "@hot-updater/core";
+
+export const ensureBundles = async (bundle: BundleArg) => {
+  try {
+    let bundles: Bundle[] | null = null;
+    if (typeof bundle === "string") {
+      if (bundle.startsWith("http")) {
+        const response = await fetch(bundle);
+        bundles = (await response.json()) as Bundle[];
+      }
+    } else if (typeof bundle === "function") {
+      bundles = await bundle();
+    } else {
+      bundles = bundle;
+    }
+
+    return bundles ?? [];
+  } catch {
+    return [];
+  }
+};

package/src/global.d.ts

@@ -0,0 +1,3 @@
+declare const HotUpdater: {
+  HOT_UPDATER_BUNDLE_ID: string;
+};

package/src/index.ts

@@ -1,15 +1,37 @@
-import { checkForUpdate } from "./checkForUpdate";
+import { NIL_UUID } from "@hot-updater/core";
+import { getUpdateInfo } from "@hot-updater/js";
+import { ensureBundles } from "./ensureBundles";
 import { init } from "./init";
-import { getAppVersion, getBundleVersion, reload } from "./native";
+import {
+  addListener,
+  getAppVersion,
+  getBundleId,
+  reload,
+  updateBundle,
+} from "./native";
+import { hotUpdaterStore } from "./store";
 
 export type * from "./init";
-export type * from "./checkForUpdate";
 export type * from "./native";
 
+export * from "./store";
+
+addListener("onProgress", ({ progress }) => {
+  hotUpdaterStore.setState({ progress });
+});
+
 export const HotUpdater = {
   init,
   reload,
-  checkForUpdate,
   getAppVersion,
-  getBundleVersion,
+  getBundleId,
+  addListener,
+
+  ensureBundles,
+  updateBundle,
+  getUpdateInfo,
+  /**
+   * In production environment, this value will be replaced with a uuidv7.
+   */
+  HOT_UPDATER_BUNDLE_ID: NIL_UUID,
 };

package/src/init.tsx

@@ -1,13 +1,14 @@
-import type { UpdateSourceArg } from "@hot-updater/utils";
+import type { BundleArg } from "@hot-updater/core";
+import { getUpdateInfo } from "@hot-updater/js";
 import { Platform } from "react-native";
-import { checkForUpdate } from "./checkForUpdate";
+import { ensureBundles } from "./ensureBundles";
 import { HotUpdaterError } from "./error";
-import { initializeOnAppUpdate, reload, updateBundle } from "./native";
+import { getAppVersion, getBundleId, reload, updateBundle } from "./native";
 
 export type HotUpdaterStatus = "INSTALLING_UPDATE" | "UP_TO_DATE";
 
 export interface HotUpdaterInitConfig {
-  source: UpdateSourceArg;
+  source: BundleArg;
   onSuccess?: (status: HotUpdaterStatus) => void;
   onError?: (error: HotUpdaterError) => void;
 }
@@ -28,18 +29,35 @@ export const init = async (config: HotUpdaterInitConfig) => {
     config?.onError?.(error);
     throw error;
   }
-  await initializeOnAppUpdate();
 
-  const update = await checkForUpdate(config.source);
+  const currentAppVersion = await getAppVersion();
+  const platform = Platform.OS as "ios" | "android";
+  const currentBundleId = await getBundleId();
+
+  if (!currentAppVersion) {
+    const error = new HotUpdaterError("Failed to get app version");
+    config?.onError?.(error);
+    throw error;
+  }
+
+  const bundles = await ensureBundles(config.source);
+
+  const update = await getUpdateInfo(bundles, {
+    appVersion: currentAppVersion,
+    bundleId: currentBundleId,
+    platform,
+  });
+
   if (!update) {
     config?.onSuccess?.("UP_TO_DATE");
     return;
   }
 
   try {
-    const isSuccess = await updateBundle(update.bundleVersion, update.file);
+    const isSuccess = await updateBundle(update.id, update.fileUrl || "");
     if (isSuccess && update.forceUpdate) {
       reload();
+
       config?.onSuccess?.("INSTALLING_UPDATE");
     }
   } catch (error) {

package/src/native.ts

@@ -1,72 +1,80 @@
-import { NativeModules } from "react-native";
-import { HotUpdaterError } from "./error";
+import { NIL_UUID } from "@hot-updater/core";
+import { NativeEventEmitter, NativeModules, Platform } from "react-native";
 
-const { HotUpdater } = NativeModules;
+const LINKING_ERROR =
+  // biome-ignore lint/style/useTemplate: <explanation>
+  `The package '@hot-updater/react-native' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: "" }) +
+  "- You rebuilt the app after installing the package\n" +
+  "- You are not using Expo Go\n";
+
+// @ts-expect-error
+const isTurboModuleEnabled = global.__turboModuleProxy != null;
+
+const HotUpdaterModule = isTurboModuleEnabled
+  ? require("./specs/NativeHotUpdater").default
+  : NativeModules.HotUpdater;
+
+const HotUpdaterNative = HotUpdaterModule
+  ? HotUpdaterModule
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      },
+    );
+
+export type HotUpdaterEvent = {
+  onProgress: {
+    progress: number;
+  };
+};
+
+export const addListener = <T extends keyof HotUpdaterEvent>(
+  eventName: T,
+  listener: (event: HotUpdaterEvent[T]) => void,
+) => {
+  const eventEmitter = new NativeEventEmitter(HotUpdaterNative);
+
+  eventEmitter?.addListener(eventName, listener);
+};
 
 /**
  * Fetches the current bundle version id.
  *
  * @async
- * @returns {Promise<number>} Resolves with the current version id or null if not available.
+ * @returns {Promise<string>} Resolves with the current version id or null if not available.
  */
-export const getBundleVersion = async (): Promise<number> => {
-  return new Promise((resolve) => {
-    HotUpdater.getBundleVersion((version: number | null) => {
-      resolve(version ?? -1);
-    });
-  });
+export const getBundleId = (): string => {
+  return HotUpdater.HOT_UPDATER_BUNDLE_ID ?? NIL_UUID;
 };
 
 /**
  * Downloads files from given URLs.
  *
- * @async
- * @param {string} bundleVersion - identifier for the bundle version.
+ * @param {string} bundleId - identifier for the bundle version.
  * @param {string | null} zipUrl - zip file URL.
  * @returns {Promise<boolean>} Resolves with true if download was successful, otherwise rejects with an error.
  */
 export const updateBundle = (
-  bundleVersion: number,
+  bundleId: string,
   zipUrl: string | null,
 ): Promise<boolean> => {
-  return new Promise((resolve, reject) => {
-    HotUpdater.updateBundle(
-      String(bundleVersion),
-      zipUrl,
-      (success: boolean) => {
-        if (success) {
-          resolve(success);
-        } else {
-          reject(
-            new HotUpdaterError("Failed to download and install the update"),
-          );
-        }
-      },
-    );
-  });
+  return HotUpdaterNative.updateBundle(bundleId, zipUrl);
 };
 
 /**
  * Fetches the current app version.
  */
-export const getAppVersion = async (): Promise<string | null> => {
-  return new Promise((resolve) => {
-    HotUpdater.getAppVersion((version: string | null) => {
-      resolve(version);
-    });
-  });
+export const getAppVersion = (): Promise<string | null> => {
+  return HotUpdaterNative.getAppVersion();
 };
 
 /**
  * Reloads the app.
  */
 export const reload = () => {
-  HotUpdater.reload();
-};
-
-/**
- * Initializes the HotUpdater.
- */
-export const initializeOnAppUpdate = () => {
-  HotUpdater.initializeOnAppUpdate();
+  HotUpdaterNative.reload();
 };

package/src/specs/{NativeHotUpdaterModule.ts → NativeHotUpdater.ts}

@@ -2,15 +2,14 @@ import type { TurboModule } from "react-native";
 import { TurboModuleRegistry } from "react-native";
 
 interface Spec extends TurboModule {
+  // Methods
   reload(): void;
-  updateBundle(
-    prefix: string,
-    zipUrl: string | null,
-    callback: (success: boolean) => void,
-  ): Promise<boolean>;
-  initializeOnAppUpdate(): void;
+  updateBundle(bundleId: string, zipUrl: string): Promise<boolean>;
   getAppVersion(): Promise<string | null>;
-  getBundleVersion(): Promise<number | null>;
+
+  // EventEmitter
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
 }
 
 export default TurboModuleRegistry.get<Spec>("HotUpdater");

package/src/store.ts

@@ -0,0 +1,48 @@
+import { useSyncExternalStore } from "react";
+
+export type HotUpdaterState = {
+  progress: number;
+};
+
+const createHotUpdaterStore = () => {
+  let state: HotUpdaterState = {
+    progress: 0,
+  };
+
+  const getState = () => {
+    return state;
+  };
+
+  const listeners = new Set<() => void>();
+
+  const emitChange = () => {
+    for (const listener of listeners) {
+      listener();
+    }
+  };
+
+  const setState = (newState: Partial<HotUpdaterState>) => {
+    state = {
+      ...state,
+      ...newState,
+    };
+    emitChange();
+  };
+
+  const subscribe = (listener: () => void) => {
+    listeners.add(listener);
+    return () => listeners.delete(listener);
+  };
+
+  return { getState, setState, subscribe };
+};
+
+export const hotUpdaterStore = createHotUpdaterStore();
+
+export const useHotUpdaterStore = () => {
+  return useSyncExternalStore(
+    hotUpdaterStore.subscribe,
+    hotUpdaterStore.getState,
+    hotUpdaterStore.getState,
+  );
+};

package/dist/index.cjs

@@ -1,220 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  HotUpdater: () => HotUpdater2
-});
-module.exports = __toCommonJS(src_exports);
-
-// src/checkForUpdate.ts
-var import_utils = require("@hot-updater/utils");
-var import_react_native2 = require("react-native");
-
-// src/native.ts
-var import_react_native = require("react-native");
-
-// src/error.ts
-var HotUpdaterError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "HotUpdaterError";
-  }
-};
-
-// src/native.ts
-var { HotUpdater } = import_react_native.NativeModules;
-var getBundleVersion = async () => {
-  return new Promise((resolve) => {
-    HotUpdater.getBundleVersion((version) => {
-      resolve(version ?? -1);
-    });
-  });
-};
-var updateBundle = (bundleVersion, zipUrl) => {
-  return new Promise((resolve, reject) => {
-    HotUpdater.updateBundle(
-      String(bundleVersion),
-      zipUrl,
-      (success) => {
-        if (success) {
-          resolve(success);
-        } else {
-          reject(
-            new HotUpdaterError("Failed to download and install the update")
-          );
-        }
-      }
-    );
-  });
-};
-var getAppVersion = async () => {
-  return new Promise((resolve) => {
-    HotUpdater.getAppVersion((version) => {
-      resolve(version);
-    });
-  });
-};
-var reload = () => {
-  HotUpdater.reload();
-};
-var initializeOnAppUpdate = () => {
-  HotUpdater.initializeOnAppUpdate();
-};
-
-// src/utils.ts
-var isNullable = (value) => value === null || value === void 0;
-
-// src/checkForUpdate.ts
-var findLatestSources = (sources) => {
-  return sources?.filter((item) => item.enabled)?.sort((a, b) => b.bundleVersion - a.bundleVersion)?.[0] ?? null;
-};
-var checkForRollback = (sources, currentBundleVersion) => {
-  const enabled = sources?.find(
-    (item) => item.bundleVersion === currentBundleVersion
-  )?.enabled;
-  const availableOldVersion = sources?.find(
-    (item) => item.bundleVersion < currentBundleVersion && item.enabled
-  )?.enabled;
-  if (isNullable(enabled)) {
-    return availableOldVersion;
-  }
-  return !enabled;
-};
-var ensureUpdateSource = async (updateSource) => {
-  let source = null;
-  if (typeof updateSource === "string") {
-    if (updateSource.startsWith("http")) {
-      const response = await fetch(updateSource);
-      source = await response.json();
-    }
-  } else if (typeof updateSource === "function") {
-    source = await updateSource();
-  } else {
-    source = updateSource;
-  }
-  if (!source) {
-    throw new Error("Invalid source");
-  }
-  return source;
-};
-var checkForUpdate = async (updateSources) => {
-  const sources = await ensureUpdateSource(updateSources);
-  const currentAppVersion = await getAppVersion();
-  const platform = import_react_native2.Platform.OS;
-  const appVersionSources = currentAppVersion ? (0, import_utils.filterTargetVersion)(sources, currentAppVersion, platform) : [];
-  const currentBundleVersion = await getBundleVersion();
-  const isRollback = checkForRollback(appVersionSources, currentBundleVersion);
-  const latestSource = await findLatestSources(appVersionSources);
-  if (!latestSource) {
-    if (isRollback) {
-      return {
-        bundleVersion: 0,
-        forceUpdate: true,
-        file: null,
-        hash: null,
-        status: "ROLLBACK"
-      };
-    }
-    return null;
-  }
-  if (latestSource.file) {
-    if (isRollback) {
-      if (latestSource.bundleVersion === currentBundleVersion) {
-        return null;
-      }
-      if (latestSource.bundleVersion > currentBundleVersion) {
-        return {
-          bundleVersion: latestSource.bundleVersion,
-          forceUpdate: latestSource.forceUpdate,
-          file: latestSource.file,
-          hash: latestSource.hash,
-          status: "UPDATE"
-        };
-      }
-      return {
-        bundleVersion: latestSource.bundleVersion,
-        forceUpdate: true,
-        file: latestSource.file,
-        hash: latestSource.hash,
-        status: "ROLLBACK"
-      };
-    }
-  }
-  if (latestSource.bundleVersion > currentBundleVersion) {
-    return {
-      bundleVersion: latestSource.bundleVersion,
-      forceUpdate: latestSource.forceUpdate,
-      file: latestSource.file,
-      hash: latestSource.hash,
-      status: "UPDATE"
-    };
-  }
-  return null;
-};
-
-// src/init.tsx
-var import_react_native3 = require("react-native");
-var init = async (config) => {
-  if (__DEV__) {
-    console.warn(
-      "[HotUpdater] __DEV__ is true, HotUpdater is only supported in production"
-    );
-    return;
-  }
-  if (!["ios", "android"].includes(import_react_native3.Platform.OS)) {
-    const error = new HotUpdaterError(
-      "HotUpdater is only supported on iOS and Android"
-    );
-    config?.onError?.(error);
-    throw error;
-  }
-  await initializeOnAppUpdate();
-  const update = await checkForUpdate(config.source);
-  if (!update) {
-    config?.onSuccess?.("UP_TO_DATE");
-    return;
-  }
-  try {
-    const isSuccess = await updateBundle(update.bundleVersion, update.file);
-    if (isSuccess && update.forceUpdate) {
-      reload();
-      config?.onSuccess?.("INSTALLING_UPDATE");
-    }
-  } catch (error) {
-    if (error instanceof HotUpdaterError) {
-      config?.onError?.(error);
-    }
-    throw error;
-  }
-};
-
-// src/index.ts
-var HotUpdater2 = {
-  init,
-  reload,
-  checkForUpdate,
-  getAppVersion,
-  getBundleVersion
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  HotUpdater
-});