@hot-updater/react-native 0.16.1 → 0.16.3

package/android/src/main/java/com/hotupdater/ReactIntegrationManagerBase.kt

@@ -16,7 +16,7 @@ open class ReactIntegrationManagerBase(
                 JSBundleLoader.createAssetLoader(
                     context,
                     bundleFileUrl,
-                    true,
+                    false,
                 )
         } else {
             bundleLoader = JSBundleLoader.createFileLoader(bundleFileUrl)

package/dist/checkForUpdate.d.ts

@@ -1,5 +1,6 @@
+import { type UpdateSource } from "./fetchUpdateInfo";
 export interface CheckForUpdateOptions {
-    source: string;
+    source: UpdateSource;
     requestHeaders?: Record<string, string>;
     onError?: (error: Error) => void;
     /**

package/dist/fetchUpdateInfo.d.ts

@@ -1,2 +1,3 @@
 import type { AppUpdateInfo, GetBundlesArgs } from "@hot-updater/core";
-export declare const fetchUpdateInfo: (source: string, { appVersion, bundleId, platform, minBundleId, channel }: GetBundlesArgs, requestHeaders?: Record<string, string>, onError?: (error: Error) => void, requestTimeout?: number) => Promise<AppUpdateInfo | null>;
+export type UpdateSource = string | (() => Promise<AppUpdateInfo | null>);
+export declare const fetchUpdateInfo: (source: UpdateSource, { appVersion, bundleId, platform, minBundleId, channel }: GetBundlesArgs, requestHeaders?: Record<string, string>, onError?: (error: Error) => void, requestTimeout?: number) => Promise<AppUpdateInfo | null>;

package/dist/index.js

@@ -67,6 +67,7 @@ var __webpack_exports__ = {};
         }
     }
     const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBundleId, channel }, requestHeaders, onError, requestTimeout = 5000)=>{
+        if ("function" == typeof source) return source();
         const controller = new AbortController();
         const timeoutId = setTimeout(()=>{
             controller.abort();
@@ -237,7 +238,7 @@ var __webpack_exports__ = {};
     function wrap(options) {
         const { reloadOnForceUpdate = true, ...restOptions } = options;
         return (WrappedComponent)=>{
-            const HotUpdaterHOC = ()=>{
+            const HotUpdaterHOC = (props)=>{
                 const progress = useHotUpdaterStore((state)=>state.progress);
                 const [message, setMessage] = (0, external_react_namespaceObject.useState)(null);
                 const [updateStatus, setUpdateStatus] = (0, external_react_namespaceObject.useState)("CHECK_FOR_UPDATE");
@@ -304,7 +305,7 @@ var __webpack_exports__ = {};
                         message: message
                     });
                 }
-                return /*#__PURE__*/ external_react_default().createElement(WrappedComponent, null);
+                return /*#__PURE__*/ external_react_default().createElement(WrappedComponent, props);
             };
             return HotUpdaterHOC;
         };

package/dist/index.mjs

@@ -42,6 +42,7 @@ class HotUpdaterError extends Error {
     }
 }
 const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBundleId, channel }, requestHeaders, onError, requestTimeout = 5000)=>{
+    if ("function" == typeof source) return source();
     const controller = new AbortController();
     const timeoutId = setTimeout(()=>{
         controller.abort();
@@ -208,7 +209,7 @@ function useEventCallback(fn) {
 function wrap(options) {
     const { reloadOnForceUpdate = true, ...restOptions } = options;
     return (WrappedComponent)=>{
-        const HotUpdaterHOC = ()=>{
+        const HotUpdaterHOC = (props)=>{
             const progress = useHotUpdaterStore((state)=>state.progress);
             const [message, setMessage] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(null);
             const [updateStatus, setUpdateStatus] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)("CHECK_FOR_UPDATE");
@@ -275,7 +276,7 @@ function wrap(options) {
                     message: message
                 });
             }
-            return /*#__PURE__*/ __WEBPACK_EXTERNAL_MODULE_react__["default"].createElement(WrappedComponent, null);
+            return /*#__PURE__*/ __WEBPACK_EXTERNAL_MODULE_react__["default"].createElement(WrappedComponent, props);
         };
         return HotUpdaterHOC;
     };

package/dist/wrap.d.ts

@@ -46,5 +46,5 @@ export interface HotUpdaterOptions extends CheckForUpdateOptions {
      */
     onUpdateProcessCompleted?: (response: RunUpdateProcessResponse) => void;
 }
-export declare function wrap<P>(options: HotUpdaterOptions): (WrappedComponent: React.ComponentType) => React.ComponentType<P>;
+export declare function wrap<P extends React.JSX.IntrinsicAttributes = object>(options: HotUpdaterOptions): (WrappedComponent: React.ComponentType<P>) => React.ComponentType<P>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -81,8 +81,8 @@
   },
   "dependencies": {
     "use-sync-external-store": "1.4.0",
-    "@hot-updater/js": "0.16.1",
-    "@hot-updater/core": "0.16.1"
+    "@hot-updater/js": "0.16.3",
+    "@hot-updater/core": "0.16.3"
   },
   "scripts": {
     "build": "rslib build",

package/src/checkForUpdate.ts

@@ -1,6 +1,6 @@
 import { Platform } from "react-native";
 import { HotUpdaterError } from "./error";
-import { fetchUpdateInfo } from "./fetchUpdateInfo";
+import { type UpdateSource, fetchUpdateInfo } from "./fetchUpdateInfo";
 import {
   getAppVersion,
   getBundleId,
@@ -9,7 +9,7 @@ import {
 } from "./native";
 
 export interface CheckForUpdateOptions {
-  source: string;
+  source: UpdateSource;
   requestHeaders?: Record<string, string>;
   onError?: (error: Error) => void;
   /**

package/src/fetchUpdateInfo.ts

@@ -1,12 +1,18 @@
 import type { AppUpdateInfo, GetBundlesArgs } from "@hot-updater/core";
 
+export type UpdateSource = string | (() => Promise<AppUpdateInfo | null>);
+
 export const fetchUpdateInfo = async (
-  source: string,
+  source: UpdateSource,
   { appVersion, bundleId, platform, minBundleId, channel }: GetBundlesArgs,
   requestHeaders?: Record<string, string>,
   onError?: (error: Error) => void,
   requestTimeout = 5000,
 ): Promise<AppUpdateInfo | null> => {
+  if (typeof source === "function") {
+    return source();
+  }
+
   const controller = new AbortController();
   const timeoutId = setTimeout(() => {
     controller.abort();

package/src/wrap.tsx

@@ -56,25 +56,29 @@ export interface HotUpdaterOptions extends CheckForUpdateOptions {
   onUpdateProcessCompleted?: (response: RunUpdateProcessResponse) => void;
 }
 
-export function wrap<P>(
+export function wrap<P extends React.JSX.IntrinsicAttributes = object>(
   options: HotUpdaterOptions,
-): (WrappedComponent: React.ComponentType) => React.ComponentType<P> {
+): (WrappedComponent: React.ComponentType<P>) => React.ComponentType<P> {
   const { reloadOnForceUpdate = true, ...restOptions } = options;
-  return (WrappedComponent) => {
-    const HotUpdaterHOC: React.FC<P> = () => {
+
+  return (WrappedComponent: React.ComponentType<P>) => {
+    const HotUpdaterHOC: React.FC<P> = (props: P) => {
       const progress = useHotUpdaterStore((state) => state.progress);
 
       const [message, setMessage] = useState<string | null>(null);
       const [updateStatus, setUpdateStatus] =
         useState<UpdateStatus>("CHECK_FOR_UPDATE");
+
       const initHotUpdater = useEventCallback(async () => {
         try {
           setUpdateStatus("CHECK_FOR_UPDATE");
+
           const updateInfo = await checkForUpdate({
             source: restOptions.source,
             requestHeaders: restOptions.requestHeaders,
             onError: restOptions.onError,
           });
+
           setMessage(updateInfo?.message ?? null);
 
           if (!updateInfo) {
@@ -106,6 +110,7 @@ export function wrap<P>(
             updateInfo.id,
             updateInfo.fileUrl,
           );
+
           if (!isSuccess) {
             throw new Error(
               "New update was found but failed to download the bundle.",
@@ -122,6 +127,7 @@ export function wrap<P>(
             shouldForceUpdate: updateInfo.shouldForceUpdate,
             message: updateInfo.message,
           });
+
           setUpdateStatus("UPDATE_PROCESS_COMPLETED");
         } catch (error) {
           if (error instanceof HotUpdaterError) {
@@ -154,9 +160,9 @@ export function wrap<P>(
         );
       }
 
-      return <WrappedComponent />;
+      return <WrappedComponent {...props} />;
     };
 
-    return HotUpdaterHOC;
+    return HotUpdaterHOC as React.ComponentType<P>;
   };
 }