@hot-updater/react-native 0.16.0 → 0.16.2

package/dist/checkForUpdate.d.ts

@@ -1,6 +1,12 @@
+import { type UpdateSource } from "./fetchUpdateInfo";
 export interface CheckForUpdateOptions {
-    source: string;
+    source: UpdateSource;
     requestHeaders?: Record<string, string>;
     onError?: (error: Error) => void;
+    /**
+     * The timeout duration for the request.
+     * @default 5000
+     */
+    requestTimeout?: number;
 }
 export declare function checkForUpdate(options: CheckForUpdateOptions): Promise<import("@hot-updater/core").AppUpdateInfo | null>;

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) => 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

@@ -66,9 +66,15 @@ var __webpack_exports__ = {};
             this.name = "HotUpdaterError";
         }
     }
-    const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBundleId, channel }, requestHeaders, onError)=>{
+    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();
+        }, requestTimeout);
         try {
             const response = await fetch(source, {
+                signal: controller.signal,
                 headers: {
                     "Content-Type": "application/json",
                     "x-app-platform": platform,
@@ -83,9 +89,14 @@ var __webpack_exports__ = {};
                     ...requestHeaders
                 }
             });
+            clearTimeout(timeoutId);
             if (200 !== response.status) throw new Error(response.statusText);
             return response.json();
         } catch (error) {
+            if ("AbortError" === error.name) {
+                onError?.(new Error("Request timed out"));
+                return null;
+            }
             onError?.(error);
             return null;
         }
@@ -157,7 +168,7 @@ var __webpack_exports__ = {};
             platform,
             minBundleId,
             channel: channel ?? void 0
-        }, options.requestHeaders, options.onError);
+        }, options.requestHeaders, options.onError, options.requestTimeout);
     }
     const runUpdateProcess = async ({ reloadOnForceUpdate = true, ...checkForUpdateOptions })=>{
         const updateInfo = await checkForUpdate(checkForUpdateOptions);
@@ -227,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");
@@ -294,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

@@ -41,9 +41,15 @@ class HotUpdaterError extends Error {
         this.name = "HotUpdaterError";
     }
 }
-const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBundleId, channel }, requestHeaders, onError)=>{
+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();
+    }, requestTimeout);
     try {
         const response = await fetch(source, {
+            signal: controller.signal,
             headers: {
                 "Content-Type": "application/json",
                 "x-app-platform": platform,
@@ -58,9 +64,14 @@ const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBund
                 ...requestHeaders
             }
         });
+        clearTimeout(timeoutId);
         if (200 !== response.status) throw new Error(response.statusText);
         return response.json();
     } catch (error) {
+        if ("AbortError" === error.name) {
+            onError?.(new Error("Request timed out"));
+            return null;
+        }
         onError?.(error);
         return null;
     }
@@ -132,7 +143,7 @@ async function checkForUpdate(options) {
         platform,
         minBundleId,
         channel: channel ?? void 0
-    }, options.requestHeaders, options.onError);
+    }, options.requestHeaders, options.onError, options.requestTimeout);
 }
 const runUpdateProcess = async ({ reloadOnForceUpdate = true, ...checkForUpdateOptions })=>{
     const updateInfo = await checkForUpdate(checkForUpdateOptions);
@@ -198,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");
@@ -265,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/ios/HotUpdater/HotUpdater.mm

@@ -32,7 +32,7 @@ RCT_EXPORT_MODULE();
         uuid = @"00000000-0000-0000-0000-000000000000";
         return;
     #else
-        // __DATE__, __TIME__ 은 컴파일 타임 값입니다.
+        // __DATE__, __TIME__ is compile-time
         NSString *compileDateStr = [NSString stringWithFormat:@"%s %s", __DATE__, __TIME__];
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
         [formatter setDateFormat:@"MMM d yyyy HH:mm:ss"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "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.0",
-    "@hot-updater/core": "0.16.0"
+    "@hot-updater/js": "0.16.2",
+    "@hot-updater/core": "0.16.2"
   },
   "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,9 +9,14 @@ import {
 } from "./native";
 
 export interface CheckForUpdateOptions {
-  source: string;
+  source: UpdateSource;
   requestHeaders?: Record<string, string>;
   onError?: (error: Error) => void;
+  /**
+   * The timeout duration for the request.
+   * @default 5000
+   */
+  requestTimeout?: number;
 }
 
 export async function checkForUpdate(options: CheckForUpdateOptions) {
@@ -48,5 +53,6 @@ export async function checkForUpdate(options: CheckForUpdateOptions) {
     },
     options.requestHeaders,
     options.onError,
+    options.requestTimeout,
   );
 }

package/src/fetchUpdateInfo.ts

@@ -1,16 +1,28 @@
 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();
+  }, requestTimeout);
+
   try {
     const response = await fetch(source, {
+      signal: controller.signal,
       headers: {
         "Content-Type": "application/json",
-
         "x-app-platform": platform,
         "x-app-version": appVersion,
         "x-bundle-id": bundleId,
@@ -20,11 +32,17 @@ export const fetchUpdateInfo = async (
       },
     });
 
+    clearTimeout(timeoutId);
+
     if (response.status !== 200) {
       throw new Error(response.statusText);
     }
     return response.json();
-  } catch (error) {
+  } catch (error: any) {
+    if (error.name === "AbortError") {
+      onError?.(new Error("Request timed out"));
+      return null;
+    }
     onError?.(error as Error);
     return null;
   }

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>;
   };
 }