@hot-updater/react-native 0.18.5 → 0.19.0

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

@@ -33,6 +33,13 @@ class HotUpdater : ReactPackage {
          */
         fun getMinBundleId(context: Context): String = HotUpdaterFactory.getInstance(context).getMinBundleId()
 
+        /**
+         * Gets the current fingerprint hash
+         * @param context Application context
+         * @return The fingerprint hash or null if not set
+         */
+        fun getFingerprintHash(context: Context): String? = HotUpdaterFactory.getInstance(context).getFingerprintHash()
+
         /**
          * Gets the current update channel
          * @param context Application context

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

@@ -117,6 +117,19 @@ class HotUpdaterImpl(
             "00000000-0000-0000-0000-000000000000"
         }
 
+    /**
+     * Gets the current fingerprint hash
+     * @return The fingerprint hash or null if not set
+     */
+    fun getFingerprintHash(): String? {
+        val id = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+        return if (id != 0) {
+            context.getString(id).takeIf { it.isNotEmpty() }
+        } else {
+            null
+        }
+    }
+
     /**
      * Gets the current update channel
      * @return The channel name or null if not set

package/android/src/newarch/HotUpdaterModule.kt

@@ -65,6 +65,7 @@ class HotUpdaterModule internal constructor(
         constants["MIN_BUNDLE_ID"] = HotUpdater.getMinBundleId(mReactApplicationContext)
         constants["APP_VERSION"] = HotUpdater.getAppVersion(mReactApplicationContext)
         constants["CHANNEL"] = HotUpdater.getChannel(mReactApplicationContext)
+        constants["FINGERPRINT_HASH"] = HotUpdater.getFingerprintHash(mReactApplicationContext)
         return constants
     }
 

package/android/src/oldarch/HotUpdaterModule.kt

@@ -80,6 +80,7 @@ class HotUpdaterModule internal constructor(
         constants["MIN_BUNDLE_ID"] = HotUpdater.getMinBundleId(mReactApplicationContext)
         constants["APP_VERSION"] = HotUpdater.getAppVersion(mReactApplicationContext)
         constants["CHANNEL"] = HotUpdater.getChannel(mReactApplicationContext)
+        constants["FINGERPRINT_HASH"] = HotUpdater.getFingerprintHash(mReactApplicationContext)
         return constants
     }
 

package/ios/HotUpdater/Internal/HotUpdater.mm

@@ -108,7 +108,8 @@ RCT_EXPORT_MODULE();
     return @{
         @"MIN_BUNDLE_ID": [self getMinBundleId] ?: [NSNull null], // Local
         @"APP_VERSION": [HotUpdaterImpl appVersion] ?: [NSNull null], // Swift
-        @"CHANNEL": [_hotUpdaterImpl getChannel] ?: [NSNull null]        // Swift
+        @"CHANNEL": [_hotUpdaterImpl getChannel] ?: [NSNull null], // Swift
+        @"FINGERPRINT_HASH": [_hotUpdaterImpl getFingerprintHash] ?: [NSNull null] // Swift
     };
 }
 

package/ios/HotUpdater/Internal/HotUpdaterImpl.swift

@@ -69,12 +69,18 @@ import React
      * Gets the current update channel.
      * @return The channel name or nil if not set
      */
-
     public func getChannel() -> String {
         return Bundle.main.object(forInfoDictionaryKey: "HOT_UPDATER_CHANNEL") as? String ?? Self.DEFAULT_CHANNEL
     }
 
-    
+    /**
+     * Gets the current fingerprint hash.
+     * @return The fingerprint hash or nil if not set
+     */
+    public func getFingerprintHash() -> String? {
+        return Bundle.main.object(forInfoDictionaryKey: "HOT_UPDATER_FINGERPRINT_HASH") as? String
+    }
+
     // MARK: - Bundle URL Management
     
     /**

package/lib/commonjs/checkForUpdate.js

@@ -26,21 +26,21 @@ async function checkForUpdate(options) {
     options.onError?.(new _error.HotUpdaterError("Failed to get app version"));
     return null;
   }
-  const baseArgs = {
-    bundleId: currentBundleId,
-    platform,
-    minBundleId,
-    channel: channel ?? undefined
-  };
-  return (0, _fetchUpdateInfo.fetchUpdateInfo)(options.source, _native.HotUpdaterConstants.UPDATE_STRATEGY === "appVersion" ? {
-    _updateStrategy: _native.HotUpdaterConstants.UPDATE_STRATEGY,
-    appVersion: currentAppVersion,
-    ...baseArgs
-  } : {
-    _updateStrategy: _native.HotUpdaterConstants.UPDATE_STRATEGY,
-    fingerprintHash: _native.HotUpdaterConstants.FINGERPRINT_HASH,
-    ...baseArgs
-  }, options.requestHeaders, options.onError, options.requestTimeout).then(updateInfo => {
+  const fingerprintHash = (0, _native.getFingerprintHash)();
+  return (0, _fetchUpdateInfo.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;
     }
@@ -56,12 +56,19 @@ async function checkForUpdate(options) {
     };
   });
 }
-const getUpdateSource = baseUrl => args => {
-  switch (args._updateStrategy) {
-    case "appVersion":
-      return `${baseUrl}/app-version/${args.platform}/${args.appVersion}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
+const getUpdateSource = (baseUrl, options) => params => {
+  switch (options.updateStrategy) {
     case "fingerprint":
-      return `${baseUrl}/fingerprint/${args.platform}/${args.fingerprintHash}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
+      {
+        if (!params.fingerprintHash) {
+          throw new _error.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/lib/commonjs/checkForUpdate.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_error","_fetchUpdateInfo","_native","checkForUpdate","options","__DEV__","includes","Platform","OS","onError","HotUpdaterError","currentAppVersion","getAppVersion","platform","currentBundleId","getBundleId","minBundleId","getMinBundleId","channel","getChannel","baseArgs","bundleId","undefined","fetchUpdateInfo","source","HotUpdaterConstants","UPDATE_STRATEGY","_updateStrategy","appVersion","fingerprintHash","FINGERPRINT_HASH","requestHeaders","requestTimeout","then","updateInfo","updateBundle","id","fileUrl","status","getUpdateSource","baseUrl","args","exports"],"sourceRoot":"../../src","sources":["checkForUpdate.ts"],"mappings":";;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AA4BO,eAAeI,cAAcA,CAClCC,OAA8B,EACQ;EACtC,IAAIC,OAAO,EAAE;IACX,OAAO,IAAI;EACb;EAEA,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAACC,QAAQ,CAACC,qBAAQ,CAACC,EAAE,CAAC,EAAE;IAC7CJ,OAAO,CAACK,OAAO,GACb,IAAIC,sBAAe,CAAC,iDAAiD,CACvE,CAAC;IACD,OAAO,IAAI;EACb;EAEA,MAAMC,iBAAiB,GAAG,IAAAC,qBAAa,EAAC,CAAC;EACzC,MAAMC,QAAQ,GAAGN,qBAAQ,CAACC,EAAuB;EACjD,MAAMM,eAAe,GAAG,IAAAC,mBAAW,EAAC,CAAC;EACrC,MAAMC,WAAW,GAAG,IAAAC,sBAAc,EAAC,CAAC;EACpC,MAAMC,OAAO,GAAG,IAAAC,kBAAU,EAAC,CAAC;EAE5B,IAAI,CAACR,iBAAiB,EAAE;IACtBP,OAAO,CAACK,OAAO,GAAG,IAAIC,sBAAe,CAAC,2BAA2B,CAAC,CAAC;IACnE,OAAO,IAAI;EACb;EAEA,MAAMU,QAAQ,GAAG;IACfC,QAAQ,EAAEP,eAAe;IACzBD,QAAQ;IACRG,WAAW;IACXE,OAAO,EAAEA,OAAO,IAAII;EACtB,CAAC;EAED,OAAO,IAAAC,gCAAe,EACpBnB,OAAO,CAACoB,MAAM,EACdC,2BAAmB,CAACC,eAAe,KAAK,YAAY,GAChD;IACEC,eAAe,EAAEF,2BAAmB,CAACC,eAAe;IACpDE,UAAU,EAAEjB,iBAAiB;IAC7B,GAAGS;EACL,CAAC,GACD;IACEO,eAAe,EAAEF,2BAAmB,CAACC,eAAe;IACpDG,eAAe,EAAEJ,2BAAmB,CAACK,gBAAiB;IACtD,GAAGV;EACL,CAAC,EACLhB,OAAO,CAAC2B,cAAc,EACtB3B,OAAO,CAACK,OAAO,EACfL,OAAO,CAAC4B,cACV,CAAC,CAACC,IAAI,CAAEC,UAAU,IAAK;IACrB,IAAI,CAACA,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IAEA,OAAO;MACL,GAAGA,UAAU;MACbC,YAAY,EAAE,MAAAA,CAAA,KAAY;QACxB,OAAO,IAAAA,oBAAY,EAAC;UAClBd,QAAQ,EAAEa,UAAU,CAACE,EAAE;UACvBC,OAAO,EAAEH,UAAU,CAACG,OAAO;UAC3BC,MAAM,EAAEJ,UAAU,CAACI;QACrB,CAAC,CAAC;MACJ;IACF,CAAC;EACH,CAAC,CAAC;AACJ;AAEO,MAAMC,eAAe,GAAIC,OAAe,IAAMC,IAAoB,IAAK;EAC5E,QAAQA,IAAI,CAACd,eAAe;IAC1B,KAAK,YAAY;MACf,OAAO,GAAGa,OAAO,gBAAgBC,IAAI,CAAC5B,QAAQ,IAAI4B,IAAI,CAACb,UAAU,IAAIa,IAAI,CAACvB,OAAO,IAAIuB,IAAI,CAACzB,WAAW,IAAIyB,IAAI,CAACpB,QAAQ,EAAE;IAC1H,KAAK,aAAa;MAChB,OAAO,GAAGmB,OAAO,gBAAgBC,IAAI,CAAC5B,QAAQ,IAAI4B,IAAI,CAACZ,eAAe,IAAIY,IAAI,CAACvB,OAAO,IAAIuB,IAAI,CAACzB,WAAW,IAAIyB,IAAI,CAACpB,QAAQ,EAAE;IAC/H;MACE,OAAOmB,OAAO;EAClB;AACF,CAAC;AAACE,OAAA,CAAAH,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_error","_fetchUpdateInfo","_native","checkForUpdate","options","__DEV__","includes","Platform","OS","onError","HotUpdaterError","currentAppVersion","getAppVersion","platform","currentBundleId","getBundleId","minBundleId","getMinBundleId","channel","getChannel","fingerprintHash","getFingerprintHash","fetchUpdateInfo","source","params","bundleId","appVersion","requestHeaders","requestTimeout","then","updateInfo","updateBundle","id","fileUrl","status","getUpdateSource","baseUrl","updateStrategy","exports"],"sourceRoot":"../../src","sources":["checkForUpdate.ts"],"mappings":";;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AA4BO,eAAeI,cAAcA,CAClCC,OAA8B,EACQ;EACtC,IAAIC,OAAO,EAAE;IACX,OAAO,IAAI;EACb;EAEA,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAACC,QAAQ,CAACC,qBAAQ,CAACC,EAAE,CAAC,EAAE;IAC7CJ,OAAO,CAACK,OAAO,GACb,IAAIC,sBAAe,CAAC,iDAAiD,CACvE,CAAC;IACD,OAAO,IAAI;EACb;EAEA,MAAMC,iBAAiB,GAAG,IAAAC,qBAAa,EAAC,CAAC;EACzC,MAAMC,QAAQ,GAAGN,qBAAQ,CAACC,EAAuB;EACjD,MAAMM,eAAe,GAAG,IAAAC,mBAAW,EAAC,CAAC;EACrC,MAAMC,WAAW,GAAG,IAAAC,sBAAc,EAAC,CAAC;EACpC,MAAMC,OAAO,GAAG,IAAAC,kBAAU,EAAC,CAAC;EAE5B,IAAI,CAACR,iBAAiB,EAAE;IACtBP,OAAO,CAACK,OAAO,GAAG,IAAIC,sBAAe,CAAC,2BAA2B,CAAC,CAAC;IACnE,OAAO,IAAI;EACb;EAEA,MAAMU,eAAe,GAAG,IAAAC,0BAAkB,EAAC,CAAC;EAE5C,OAAO,IAAAC,gCAAe,EAAC;IACrBC,MAAM,EAAEnB,OAAO,CAACmB,MAAM;IACtBC,MAAM,EAAE;MACNC,QAAQ,EAAEX,eAAe;MACzBY,UAAU,EAAEf,iBAAiB;MAC7BE,QAAQ;MACRG,WAAW;MACXE,OAAO;MACPE;IACF,CAAC;IACDO,cAAc,EAAEvB,OAAO,CAACuB,cAAc;IACtClB,OAAO,EAAEL,OAAO,CAACK,OAAO;IACxBmB,cAAc,EAAExB,OAAO,CAACwB;EAC1B,CAAC,CAAC,CAACC,IAAI,CAAEC,UAAU,IAAK;IACtB,IAAI,CAACA,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IAEA,OAAO;MACL,GAAGA,UAAU;MACbC,YAAY,EAAE,MAAAA,CAAA,KAAY;QACxB,OAAO,IAAAA,oBAAY,EAAC;UAClBN,QAAQ,EAAEK,UAAU,CAACE,EAAE;UACvBC,OAAO,EAAEH,UAAU,CAACG,OAAO;UAC3BC,MAAM,EAAEJ,UAAU,CAACI;QACrB,CAAC,CAAC;MACJ;IACF,CAAC;EACH,CAAC,CAAC;AACJ;AAYO,MAAMC,eAAe,GAC1BA,CAACC,OAAe,EAAEhC,OAA+B,KAChDoB,MAA0B,IAAK;EAC9B,QAAQpB,OAAO,CAACiC,cAAc;IAC5B,KAAK,aAAa;MAAE;QAClB,IAAI,CAACb,MAAM,CAACJ,eAAe,EAAE;UAC3B,MAAM,IAAIV,sBAAe,CAAC,8BAA8B,CAAC;QAC3D;QACA,OAAO,GAAG0B,OAAO,gBAAgBZ,MAAM,CAACX,QAAQ,IAAIW,MAAM,CAACJ,eAAe,IAAII,MAAM,CAACN,OAAO,IAAIM,MAAM,CAACR,WAAW,IAAIQ,MAAM,CAACC,QAAQ,EAAE;MACzI;IACA,KAAK,YAAY;MAAE;QACjB,OAAO,GAAGW,OAAO,gBAAgBZ,MAAM,CAACX,QAAQ,IAAIW,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACN,OAAO,IAAIM,MAAM,CAACR,WAAW,IAAIQ,MAAM,CAACC,QAAQ,EAAE;MACpI;IACA;MACE,OAAOW,OAAO;EAClB;AACF,CAAC;AAACE,OAAA,CAAAH,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/fetchUpdateInfo.js

@@ -4,55 +4,60 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchUpdateInfo = void 0;
-const fetchUpdateInfo = async (source, args, requestHeaders, onError, requestTimeout = 5000) => {
-  if (typeof source === "function") {
-    const url = source(args);
-    if (typeof url !== "string") {
-      return null;
-    }
-    source = url;
+function buildRequestHeaders(params, requestHeaders) {
+  const updateStrategy = params.fingerprintHash ? "fingerprint" : "appVersion";
+  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 ?? {})
+  };
+}
+async function resolveSource(source, params) {
+  if (typeof source !== "function") {
+    return {
+      url: source
+    };
+  }
+  const result = source(params);
+  if (typeof result === "string") {
+    return {
+      url: result
+    };
   }
-  const controller = new AbortController();
-  const timeoutId = setTimeout(() => {
-    controller.abort();
-  }, requestTimeout);
+  return {
+    info: await result
+  };
+}
+const fetchUpdateInfo = async ({
+  source,
+  params,
+  requestHeaders,
+  onError,
+  requestTimeout = 5000
+}) => {
   try {
-    let headers = {};
-    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");
+    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
     });
@@ -64,9 +69,9 @@ const fetchUpdateInfo = async (source, args, requestHeaders, onError, requestTim
   } catch (error) {
     if (error.name === "AbortError") {
       onError?.(new Error("Request timed out"));
-      return null;
+    } else {
+      onError?.(error);
     }
-    onError?.(error);
     return null;
   }
 };

package/lib/commonjs/fetchUpdateInfo.js.map

@@ -1 +1 @@
-{"version":3,"names":["fetchUpdateInfo","source","args","requestHeaders","onError","requestTimeout","url","controller","AbortController","timeoutId","setTimeout","abort","headers","_updateStrategy","platform","bundleId","fingerprintHash","minBundleId","channel","appVersion","Error","response","fetch","signal","clearTimeout","status","statusText","json","error","name","exports"],"sourceRoot":"../../src","sources":["fetchUpdateInfo.ts"],"mappings":";;;;;;AAOO,MAAMA,eAAe,GAAG,MAAAA,CAC7BC,MAAoB,EACpBC,IAAoB,EACpBC,cAAuC,EACvCC,OAAgC,EAChCC,cAAc,GAAG,IAAI,KACa;EAClC,IAAI,OAAOJ,MAAM,KAAK,UAAU,EAAE;IAChC,MAAMK,GAAG,GAAGL,MAAM,CAACC,IAAI,CAAC;IACxB,IAAI,OAAOI,GAAG,KAAK,QAAQ,EAAE;MAC3B,OAAO,IAAI;IACb;IACAL,MAAM,GAAGK,GAAG;EACd;EAEA,MAAMC,UAAU,GAAG,IAAIC,eAAe,CAAC,CAAC;EACxC,MAAMC,SAAS,GAAGC,UAAU,CAAC,MAAM;IACjCH,UAAU,CAACI,KAAK,CAAC,CAAC;EACpB,CAAC,EAAEN,cAAc,CAAC;EAElB,IAAI;IACF,IAAIO,OAA+B,GAAG,CAAC,CAAC;IAExC,QAAQV,IAAI,CAACW,eAAe;MAC1B,KAAK,aAAa;QAChBD,OAAO,GAAG;UACR,cAAc,EAAE,kBAAkB;UAClC,gBAAgB,EAAEV,IAAI,CAACY,QAAQ;UAC/B,aAAa,EAAEZ,IAAI,CAACa,QAAQ;UAC5B,oBAAoB,EAAEb,IAAI,CAACc,eAAe;UAC1C,IAAId,IAAI,CAACe,WAAW,GAAG;YAAE,iBAAiB,EAAEf,IAAI,CAACe;UAAY,CAAC,GAAG,CAAC,CAAC,CAAC;UACpE,IAAIf,IAAI,CAACgB,OAAO,GAAG;YAAE,WAAW,EAAEhB,IAAI,CAACgB;UAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;UACtD,GAAGf;QACL,CAAC;QACD;MACF,KAAK,YAAY;QACfS,OAAO,GAAG;UACR,cAAc,EAAE,kBAAkB;UAClC,gBAAgB,EAAEV,IAAI,CAACY,QAAQ;UAC/B,aAAa,EAAEZ,IAAI,CAACa,QAAQ;UAC5B,eAAe,EAAEb,IAAI,CAACiB,UAAU;UAChC,IAAIjB,IAAI,CAACe,WAAW,GAAG;YAAE,iBAAiB,EAAEf,IAAI,CAACe;UAAY,CAAC,GAAG,CAAC,CAAC,CAAC;UACpE,IAAIf,IAAI,CAACgB,OAAO,GAAG;YAAE,WAAW,EAAEhB,IAAI,CAACgB;UAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;UACtD,GAAGf;QACL,CAAC;QACD;MACF;QACE,MAAM,IAAIiB,KAAK,CAAC,yBAAyB,CAAC;IAC9C;IAEA,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACrB,MAAM,EAAE;MACnCsB,MAAM,EAAEhB,UAAU,CAACgB,MAAM;MACzBX;IACF,CAAC,CAAC;IAEFY,YAAY,CAACf,SAAS,CAAC;IAEvB,IAAIY,QAAQ,CAACI,MAAM,KAAK,GAAG,EAAE;MAC3B,MAAM,IAAIL,KAAK,CAACC,QAAQ,CAACK,UAAU,CAAC;IACtC;IACA,OAAOL,QAAQ,CAACM,IAAI,CAAC,CAAC;EACxB,CAAC,CAAC,OAAOC,KAAU,EAAE;IACnB,IAAIA,KAAK,CAACC,IAAI,KAAK,YAAY,EAAE;MAC/BzB,OAAO,GAAG,IAAIgB,KAAK,CAAC,mBAAmB,CAAC,CAAC;MACzC,OAAO,IAAI;IACb;IACAhB,OAAO,GAAGwB,KAAc,CAAC;IACzB,OAAO,IAAI;EACb;AACF,CAAC;AAACE,OAAA,CAAA9B,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["buildRequestHeaders","params","requestHeaders","updateStrategy","fingerprintHash","platform","bundleId","appVersion","minBundleId","channel","resolveSource","source","url","result","info","fetchUpdateInfo","onError","requestTimeout","resolvedSource","controller","AbortController","timeoutId","setTimeout","abort","headers","response","fetch","signal","clearTimeout","status","Error","statusText","json","error","name","exports"],"sourceRoot":"../../src","sources":["fetchUpdateInfo.ts"],"mappings":";;;;;;AAWA,SAASA,mBAAmBA,CAC1BC,MAA0B,EAC1BC,cAAuC,EACf;EACxB,MAAMC,cAA8B,GAAGF,MAAM,CAACG,eAAe,GACzD,aAAa,GACb,YAAY;EAEhB,OAAO;IACL,cAAc,EAAE,kBAAkB;IAClC,gBAAgB,EAAEH,MAAM,CAACI,QAAQ;IACjC,aAAa,EAAEJ,MAAM,CAACK,QAAQ;IAC9B,IAAIH,cAAc,KAAK,aAAa,GAChC;MAAE,oBAAoB,EAAEF,MAAM,CAACG;IAAiB,CAAC,GACjD;MAAE,eAAe,EAAEH,MAAM,CAACM;IAAW,CAAC,CAAC;IAC3C,IAAIN,MAAM,CAACO,WAAW,IAAI;MAAE,iBAAiB,EAAEP,MAAM,CAACO;IAAY,CAAC,CAAC;IACpE,IAAIP,MAAM,CAACQ,OAAO,IAAI;MAAE,WAAW,EAAER,MAAM,CAACQ;IAAQ,CAAC,CAAC;IACtD,IAAIP,cAAc,IAAI,CAAC,CAAC;EAC1B,CAAC;AACH;AAEA,eAAeQ,aAAaA,CAC1BC,MAAoB,EACpBV,MAA0B,EACiC;EAC3D,IAAI,OAAOU,MAAM,KAAK,UAAU,EAAE;IAChC,OAAO;MAAEC,GAAG,EAAED;IAAO,CAAC;EACxB;EACA,MAAME,MAAM,GAAGF,MAAM,CAACV,MAAM,CAAC;EAC7B,IAAI,OAAOY,MAAM,KAAK,QAAQ,EAAE;IAC9B,OAAO;MAAED,GAAG,EAAEC;IAAO,CAAC;EACxB;EACA,OAAO;IAAEC,IAAI,EAAE,MAAMD;EAAO,CAAC;AAC/B;AAEO,MAAME,eAAe,GAAG,MAAAA,CAAO;EACpCJ,MAAM;EACNV,MAAM;EACNC,cAAc;EACdc,OAAO;EACPC,cAAc,GAAG;AAOnB,CAAC,KAAoC;EACnC,IAAI;IACF,MAAMC,cAAc,GAAG,MAAMR,aAAa,CAACC,MAAM,EAAEV,MAAM,CAAC;IAC1D,IAAI,MAAM,IAAIiB,cAAc,EAAE;MAC5B,OAAOA,cAAc,CAACJ,IAAI;IAC5B;IAEA,MAAMK,UAAU,GAAG,IAAIC,eAAe,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGC,UAAU,CAAC,MAAM;MACjCH,UAAU,CAACI,KAAK,CAAC,CAAC;IACpB,CAAC,EAAEN,cAAc,CAAC;IAElB,MAAMO,OAAO,GAAGxB,mBAAmB,CAACC,MAAM,EAAEC,cAAc,CAAC;IAE3D,MAAMuB,QAAQ,GAAG,MAAMC,KAAK,CAACR,cAAc,CAACN,GAAG,EAAE;MAC/Ce,MAAM,EAAER,UAAU,CAACQ,MAAM;MACzBH;IACF,CAAC,CAAC;IACFI,YAAY,CAACP,SAAS,CAAC;IAEvB,IAAII,QAAQ,CAACI,MAAM,KAAK,GAAG,EAAE;MAC3B,MAAM,IAAIC,KAAK,CAACL,QAAQ,CAACM,UAAU,CAAC;IACtC;IACA,OAAON,QAAQ,CAACO,IAAI,CAAC,CAAC;EACxB,CAAC,CAAC,OAAOC,KAAU,EAAE;IACnB,IAAIA,KAAK,CAACC,IAAI,KAAK,YAAY,EAAE;MAC/BlB,OAAO,GAAG,IAAIc,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC3C,CAAC,MAAM;MACLd,OAAO,GAAGiB,KAAc,CAAC;IAC3B;IACA,OAAO,IAAI;EACb;AACF,CAAC;AAACE,OAAA,CAAApB,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -91,18 +91,6 @@ const HotUpdater = exports.HotUpdater = {
    * ```
    */
   getChannel: _native.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: _native.getReleaseChannel,
   /**
    * Adds a listener to HotUpdater events.
    *

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_checkForUpdate","require","_native","_runUpdateProcess","_store","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_wrap","addListener","progress","hotUpdaterStore","setState","HotUpdater","wrap","reload","getAppVersion","getBundleId","getMinBundleId","getChannel","getReleaseChannel","checkForUpdate","runUpdateProcess","updateBundle","getFingerprintHash"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAWA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAMAI,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AALA,IAAAS,KAAA,GAAAhB,OAAA;AAOA,IAAAiB,mBAAW,EAAC,YAAY,EAAE,CAAC;EAAEC;AAAS,CAAC,KAAK;EAC1CC,sBAAe,CAACC,QAAQ,CAAC;IACvBF;EACF,CAAC,CAAC;AACJ,CAAC,CAAC;AAEK,MAAMG,UAAU,GAAAT,OAAA,CAAAS,UAAA,GAAG;EACxB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,IAAI,EAAJA,UAAI;EACJ;AACF;AACA;EACEC,MAAM,EAANA,cAAM;EACN;AACF;AACA;EACEC,aAAa,EAAbA,qBAAa;EACb;AACF;AACA;EACEC,WAAW,EAAXA,mBAAW;EACX;AACF;AACA;EACEC,cAAc,EAAdA,sBAAc;EACd;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,UAAU,EAAVA,kBAAU;EACV;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,iBAAiB,EAAjBA,yBAAiB;EACjB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEX,WAAW,EAAXA,mBAAW;EACX;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEY,cAAc,EAAdA,8BAAc;EACd;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgB,EAAhBA,kCAAgB;EAChB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,YAAY,EAAZA,oBAAY;EACZ;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,kBAAkB,EAAlBA;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_checkForUpdate","require","_native","_runUpdateProcess","_store","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_wrap","addListener","progress","hotUpdaterStore","setState","HotUpdater","wrap","reload","getAppVersion","getBundleId","getMinBundleId","getChannel","checkForUpdate","runUpdateProcess","updateBundle","getFingerprintHash"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAUA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAMAI,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AALA,IAAAS,KAAA,GAAAhB,OAAA;AAOA,IAAAiB,mBAAW,EAAC,YAAY,EAAE,CAAC;EAAEC;AAAS,CAAC,KAAK;EAC1CC,sBAAe,CAACC,QAAQ,CAAC;IACvBF;EACF,CAAC,CAAC;AACJ,CAAC,CAAC;AAEK,MAAMG,UAAU,GAAAT,OAAA,CAAAS,UAAA,GAAG;EACxB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,IAAI,EAAJA,UAAI;EACJ;AACF;AACA;EACEC,MAAM,EAANA,cAAM;EACN;AACF;AACA;EACEC,aAAa,EAAbA,qBAAa;EACb;AACF;AACA;EACEC,WAAW,EAAXA,mBAAW;EACX;AACF;AACA;EACEC,cAAc,EAAdA,sBAAc;EACd;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,UAAU,EAAVA,kBAAU;EACV;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEV,WAAW,EAAXA,mBAAW;EACX;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEW,cAAc,EAAdA,8BAAc;EACd;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgB,EAAhBA,kCAAgB;EAChB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,YAAY,EAAZA,oBAAY;EACZ;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,kBAAkB,EAAlBA;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/native.js

@@ -3,21 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reload = exports.getReleaseChannel = exports.getMinBundleId = exports.getFingerprintHash = exports.getChannel = exports.getBundleId = exports.getAppVersion = exports.addListener = exports.HotUpdaterConstants = void 0;
+exports.reload = exports.getMinBundleId = exports.getFingerprintHash = exports.getChannel = exports.getBundleId = exports.getAppVersion = exports.addListener = exports.HotUpdaterConstants = void 0;
 exports.updateBundle = updateBundle;
 var _reactNative = require("react-native");
 var _NativeHotUpdater = _interopRequireDefault(require("./specs/NativeHotUpdater.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const NIL_UUID = "00000000-0000-0000-0000-000000000000";
 const HotUpdaterConstants = exports.HotUpdaterConstants = {
-  OVER_THE_AIR_CHANNEL: __HOT_UPDATER_CHANNEL,
-  HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID,
-  FINGERPRINT_HASH: _reactNative.Platform.select({
-    ios: __HOT_UPDATER_FINGERPRINT_HASH_IOS,
-    android: __HOT_UPDATER_FINGERPRINT_HASH_ANDROID,
-    default: null
-  }),
-  UPDATE_STRATEGY: __HOT_UPDATER_UPDATE_STRATEGY
+  HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID
 };
 const addListener = (eventName, listener) => {
   const eventEmitter = new _reactNative.NativeEventEmitter(_NativeHotUpdater.default);
@@ -107,14 +100,6 @@ const getBundleId = () => {
  */
 exports.getBundleId = getBundleId;
 const getChannel = () => {
-  if (HotUpdaterConstants.OVER_THE_AIR_CHANNEL) {
-    return HotUpdaterConstants.OVER_THE_AIR_CHANNEL;
-  }
-  const constants = _NativeHotUpdater.default.getConstants();
-  return constants.CHANNEL;
-};
-exports.getChannel = getChannel;
-const getReleaseChannel = () => {
   const constants = _NativeHotUpdater.default.getConstants();
   return constants.CHANNEL;
 };
@@ -124,9 +109,10 @@ const getReleaseChannel = () => {
  *
  * @returns {string | null} Resolves with the fingerprint hash
  */
-exports.getReleaseChannel = getReleaseChannel;
+exports.getChannel = getChannel;
 const getFingerprintHash = () => {
-  return HotUpdaterConstants.FINGERPRINT_HASH;
+  const constants = _NativeHotUpdater.default.getConstants();
+  return constants.FINGERPRINT_HASH;
 };
 exports.getFingerprintHash = getFingerprintHash;
 //# sourceMappingURL=native.js.map

package/lib/commonjs/native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_NativeHotUpdater","_interopRequireDefault","e","__esModule","default","NIL_UUID","HotUpdaterConstants","exports","OVER_THE_AIR_CHANNEL","__HOT_UPDATER_CHANNEL","HOT_UPDATER_BUNDLE_ID","__HOT_UPDATER_BUNDLE_ID","FINGERPRINT_HASH","Platform","select","ios","__HOT_UPDATER_FINGERPRINT_HASH_IOS","android","__HOT_UPDATER_FINGERPRINT_HASH_ANDROID","UPDATE_STRATEGY","__HOT_UPDATER_UPDATE_STRATEGY","addListener","eventName","listener","eventEmitter","NativeEventEmitter","HotUpdaterNative","subscription","remove","updateBundle","paramsOrBundleId","fileUrl","updateBundleId","bundleId","status","currentBundleId","getBundleId","localeCompare","Error","getAppVersion","constants","getConstants","APP_VERSION","reload","requestAnimationFrame","getMinBundleId","MIN_BUNDLE_ID","getChannel","CHANNEL","getReleaseChannel","getFingerprintHash"],"sourceRoot":"../../src","sources":["native.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_NativeHotUpdater","_interopRequireDefault","e","__esModule","default","NIL_UUID","HotUpdaterConstants","exports","HOT_UPDATER_BUNDLE_ID","__HOT_UPDATER_BUNDLE_ID","addListener","eventName","listener","eventEmitter","NativeEventEmitter","HotUpdaterNative","subscription","remove","updateBundle","paramsOrBundleId","fileUrl","updateBundleId","bundleId","status","currentBundleId","getBundleId","localeCompare","Error","getAppVersion","constants","getConstants","APP_VERSION","reload","requestAnimationFrame","getMinBundleId","MIN_BUNDLE_ID","getChannel","CHANNEL","getFingerprintHash","FINGERPRINT_HASH"],"sourceRoot":"../../src","sources":["native.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/specs/NativeHotUpdater.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../../src","sources":["specs/NativeHotUpdater.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAAmD,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAsBpCC,gCAAmB,CAACC,YAAY,CAAO,YAAY,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../../src","sources":["specs/NativeHotUpdater.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAAmD,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAuBpCC,gCAAmB,CAACC,YAAY,CAAO,YAAY,CAAC","ignoreList":[]}

package/lib/module/checkForUpdate.js

@@ -3,7 +3,7 @@
 import { Platform } from "react-native";
 import { HotUpdaterError } from "./error.js";
 import { fetchUpdateInfo } from "./fetchUpdateInfo.js";
-import { HotUpdaterConstants, getAppVersion, getBundleId, getChannel, getMinBundleId, updateBundle } from "./native.js";
+import { getAppVersion, getBundleId, getChannel, getFingerprintHash, getMinBundleId, updateBundle } from "./native.js";
 export async function checkForUpdate(options) {
   if (__DEV__) {
     return null;
@@ -21,21 +21,21 @@ export async function checkForUpdate(options) {
     options.onError?.(new HotUpdaterError("Failed to get app version"));
     return null;
   }
-  const baseArgs = {
-    bundleId: currentBundleId,
-    platform,
-    minBundleId,
-    channel: channel ?? undefined
-  };
-  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 => {
+  const fingerprintHash = getFingerprintHash();
+  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;
     }
@@ -51,12 +51,19 @@ export async function checkForUpdate(options) {
     };
   });
 }
-export const getUpdateSource = baseUrl => args => {
-  switch (args._updateStrategy) {
-    case "appVersion":
-      return `${baseUrl}/app-version/${args.platform}/${args.appVersion}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
+export const getUpdateSource = (baseUrl, options) => params => {
+  switch (options.updateStrategy) {
     case "fingerprint":
-      return `${baseUrl}/fingerprint/${args.platform}/${args.fingerprintHash}/${args.channel}/${args.minBundleId}/${args.bundleId}`;
+      {
+        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/lib/module/checkForUpdate.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","HotUpdaterError","fetchUpdateInfo","HotUpdaterConstants","getAppVersion","getBundleId","getChannel","getMinBundleId","updateBundle","checkForUpdate","options","__DEV__","includes","OS","onError","currentAppVersion","platform","currentBundleId","minBundleId","channel","baseArgs","bundleId","undefined","source","UPDATE_STRATEGY","_updateStrategy","appVersion","fingerprintHash","FINGERPRINT_HASH","requestHeaders","requestTimeout","then","updateInfo","id","fileUrl","status","getUpdateSource","baseUrl","args"],"sourceRoot":"../../src","sources":["checkForUpdate.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,cAAc;AACvC,SAASC,eAAe,QAAQ,YAAS;AACzC,SAA4BC,eAAe,QAAQ,sBAAmB;AACtE,SACEC,mBAAmB,EACnBC,aAAa,EACbC,WAAW,EACXC,UAAU,EACVC,cAAc,EACdC,YAAY,QACP,aAAU;AAqBjB,OAAO,eAAeC,cAAcA,CAClCC,OAA8B,EACQ;EACtC,IAAIC,OAAO,EAAE;IACX,OAAO,IAAI;EACb;EAEA,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAACC,QAAQ,CAACZ,QAAQ,CAACa,EAAE,CAAC,EAAE;IAC7CH,OAAO,CAACI,OAAO,GACb,IAAIb,eAAe,CAAC,iDAAiD,CACvE,CAAC;IACD,OAAO,IAAI;EACb;EAEA,MAAMc,iBAAiB,GAAGX,aAAa,CAAC,CAAC;EACzC,MAAMY,QAAQ,GAAGhB,QAAQ,CAACa,EAAuB;EACjD,MAAMI,eAAe,GAAGZ,WAAW,CAAC,CAAC;EACrC,MAAMa,WAAW,GAAGX,cAAc,CAAC,CAAC;EACpC,MAAMY,OAAO,GAAGb,UAAU,CAAC,CAAC;EAE5B,IAAI,CAACS,iBAAiB,EAAE;IACtBL,OAAO,CAACI,OAAO,GAAG,IAAIb,eAAe,CAAC,2BAA2B,CAAC,CAAC;IACnE,OAAO,IAAI;EACb;EAEA,MAAMmB,QAAQ,GAAG;IACfC,QAAQ,EAAEJ,eAAe;IACzBD,QAAQ;IACRE,WAAW;IACXC,OAAO,EAAEA,OAAO,IAAIG;EACtB,CAAC;EAED,OAAOpB,eAAe,CACpBQ,OAAO,CAACa,MAAM,EACdpB,mBAAmB,CAACqB,eAAe,KAAK,YAAY,GAChD;IACEC,eAAe,EAAEtB,mBAAmB,CAACqB,eAAe;IACpDE,UAAU,EAAEX,iBAAiB;IAC7B,GAAGK;EACL,CAAC,GACD;IACEK,eAAe,EAAEtB,mBAAmB,CAACqB,eAAe;IACpDG,eAAe,EAAExB,mBAAmB,CAACyB,gBAAiB;IACtD,GAAGR;EACL,CAAC,EACLV,OAAO,CAACmB,cAAc,EACtBnB,OAAO,CAACI,OAAO,EACfJ,OAAO,CAACoB,cACV,CAAC,CAACC,IAAI,CAAEC,UAAU,IAAK;IACrB,IAAI,CAACA,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IAEA,OAAO;MACL,GAAGA,UAAU;MACbxB,YAAY,EAAE,MAAAA,CAAA,KAAY;QACxB,OAAOA,YAAY,CAAC;UAClBa,QAAQ,EAAEW,UAAU,CAACC,EAAE;UACvBC,OAAO,EAAEF,UAAU,CAACE,OAAO;UAC3BC,MAAM,EAAEH,UAAU,CAACG;QACrB,CAAC,CAAC;MACJ;IACF,CAAC;EACH,CAAC,CAAC;AACJ;AAEA,OAAO,MAAMC,eAAe,GAAIC,OAAe,IAAMC,IAAoB,IAAK;EAC5E,QAAQA,IAAI,CAACb,eAAe;IAC1B,KAAK,YAAY;MACf,OAAO,GAAGY,OAAO,gBAAgBC,IAAI,CAACtB,QAAQ,IAAIsB,IAAI,CAACZ,UAAU,IAAIY,IAAI,CAACnB,OAAO,IAAImB,IAAI,CAACpB,WAAW,IAAIoB,IAAI,CAACjB,QAAQ,EAAE;IAC1H,KAAK,aAAa;MAChB,OAAO,GAAGgB,OAAO,gBAAgBC,IAAI,CAACtB,QAAQ,IAAIsB,IAAI,CAACX,eAAe,IAAIW,IAAI,CAACnB,OAAO,IAAImB,IAAI,CAACpB,WAAW,IAAIoB,IAAI,CAACjB,QAAQ,EAAE;IAC/H;MACE,OAAOgB,OAAO;EAClB;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["Platform","HotUpdaterError","fetchUpdateInfo","getAppVersion","getBundleId","getChannel","getFingerprintHash","getMinBundleId","updateBundle","checkForUpdate","options","__DEV__","includes","OS","onError","currentAppVersion","platform","currentBundleId","minBundleId","channel","fingerprintHash","source","params","bundleId","appVersion","requestHeaders","requestTimeout","then","updateInfo","id","fileUrl","status","getUpdateSource","baseUrl","updateStrategy"],"sourceRoot":"../../src","sources":["checkForUpdate.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,cAAc;AACvC,SAASC,eAAe,QAAQ,YAAS;AACzC,SAA4BC,eAAe,QAAQ,sBAAmB;AACtE,SACEC,aAAa,EACbC,WAAW,EACXC,UAAU,EACVC,kBAAkB,EAClBC,cAAc,EACdC,YAAY,QACP,aAAU;AAqBjB,OAAO,eAAeC,cAAcA,CAClCC,OAA8B,EACQ;EACtC,IAAIC,OAAO,EAAE;IACX,OAAO,IAAI;EACb;EAEA,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAACC,QAAQ,CAACZ,QAAQ,CAACa,EAAE,CAAC,EAAE;IAC7CH,OAAO,CAACI,OAAO,GACb,IAAIb,eAAe,CAAC,iDAAiD,CACvE,CAAC;IACD,OAAO,IAAI;EACb;EAEA,MAAMc,iBAAiB,GAAGZ,aAAa,CAAC,CAAC;EACzC,MAAMa,QAAQ,GAAGhB,QAAQ,CAACa,EAAuB;EACjD,MAAMI,eAAe,GAAGb,WAAW,CAAC,CAAC;EACrC,MAAMc,WAAW,GAAGX,cAAc,CAAC,CAAC;EACpC,MAAMY,OAAO,GAAGd,UAAU,CAAC,CAAC;EAE5B,IAAI,CAACU,iBAAiB,EAAE;IACtBL,OAAO,CAACI,OAAO,GAAG,IAAIb,eAAe,CAAC,2BAA2B,CAAC,CAAC;IACnE,OAAO,IAAI;EACb;EAEA,MAAMmB,eAAe,GAAGd,kBAAkB,CAAC,CAAC;EAE5C,OAAOJ,eAAe,CAAC;IACrBmB,MAAM,EAAEX,OAAO,CAACW,MAAM;IACtBC,MAAM,EAAE;MACNC,QAAQ,EAAEN,eAAe;MACzBO,UAAU,EAAET,iBAAiB;MAC7BC,QAAQ;MACRE,WAAW;MACXC,OAAO;MACPC;IACF,CAAC;IACDK,cAAc,EAAEf,OAAO,CAACe,cAAc;IACtCX,OAAO,EAAEJ,OAAO,CAACI,OAAO;IACxBY,cAAc,EAAEhB,OAAO,CAACgB;EAC1B,CAAC,CAAC,CAACC,IAAI,CAAEC,UAAU,IAAK;IACtB,IAAI,CAACA,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IAEA,OAAO;MACL,GAAGA,UAAU;MACbpB,YAAY,EAAE,MAAAA,CAAA,KAAY;QACxB,OAAOA,YAAY,CAAC;UAClBe,QAAQ,EAAEK,UAAU,CAACC,EAAE;UACvBC,OAAO,EAAEF,UAAU,CAACE,OAAO;UAC3BC,MAAM,EAAEH,UAAU,CAACG;QACrB,CAAC,CAAC;MACJ;IACF,CAAC;EACH,CAAC,CAAC;AACJ;AAYA,OAAO,MAAMC,eAAe,GAC1BA,CAACC,OAAe,EAAEvB,OAA+B,KAChDY,MAA0B,IAAK;EAC9B,QAAQZ,OAAO,CAACwB,cAAc;IAC5B,KAAK,aAAa;MAAE;QAClB,IAAI,CAACZ,MAAM,CAACF,eAAe,EAAE;UAC3B,MAAM,IAAInB,eAAe,CAAC,8BAA8B,CAAC;QAC3D;QACA,OAAO,GAAGgC,OAAO,gBAAgBX,MAAM,CAACN,QAAQ,IAAIM,MAAM,CAACF,eAAe,IAAIE,MAAM,CAACH,OAAO,IAAIG,MAAM,CAACJ,WAAW,IAAII,MAAM,CAACC,QAAQ,EAAE;MACzI;IACA,KAAK,YAAY;MAAE;QACjB,OAAO,GAAGU,OAAO,gBAAgBX,MAAM,CAACN,QAAQ,IAAIM,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACH,OAAO,IAAIG,MAAM,CAACJ,WAAW,IAAII,MAAM,CAACC,QAAQ,EAAE;MACpI;IACA;MACE,OAAOU,OAAO;EAClB;AACF,CAAC","ignoreList":[]}

package/lib/module/fetchUpdateInfo.js

@@ -1,54 +1,59 @@
 "use strict";
 
-export const fetchUpdateInfo = async (source, args, requestHeaders, onError, requestTimeout = 5000) => {
-  if (typeof source === "function") {
-    const url = source(args);
-    if (typeof url !== "string") {
-      return null;
-    }
-    source = url;
+function buildRequestHeaders(params, requestHeaders) {
+  const updateStrategy = params.fingerprintHash ? "fingerprint" : "appVersion";
+  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 ?? {})
+  };
+}
+async function resolveSource(source, params) {
+  if (typeof source !== "function") {
+    return {
+      url: source
+    };
+  }
+  const result = source(params);
+  if (typeof result === "string") {
+    return {
+      url: result
+    };
   }
-  const controller = new AbortController();
-  const timeoutId = setTimeout(() => {
-    controller.abort();
-  }, requestTimeout);
+  return {
+    info: await result
+  };
+}
+export const fetchUpdateInfo = async ({
+  source,
+  params,
+  requestHeaders,
+  onError,
+  requestTimeout = 5000
+}) => {
   try {
-    let headers = {};
-    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");
+    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
     });
@@ -60,9 +65,9 @@ export const fetchUpdateInfo = async (source, args, requestHeaders, onError, req
   } catch (error) {
     if (error.name === "AbortError") {
       onError?.(new Error("Request timed out"));
-      return null;
+    } else {
+      onError?.(error);
     }
-    onError?.(error);
     return null;
   }
 };