Refactor HybridVersionCheck for improved error handling and timeout settings; update App.tsx to clarify error messages. Adjust index.ts to ensure consistent function calls for country, store URL, and latest version retrieval.

Author: AlshehriAli0

example/App.tsx

@@ -19,7 +19,7 @@ export default function App() {
         setStoreUrl(url);
         setLatestVersion(latest);
       } catch {
-        setError("App not found in store");
+        setError("App not found in store"); // this is not an error, it's just a fallback
       }
       setLoading(false);
     };

package/android/src/main/java/com/margelo/nitro/nitroversioncheck/HybridVersionCheck.kt

@@ -2,31 +2,31 @@ package com.margelo.nitro.nitroversioncheck
 
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
+import java.net.HttpURLConnection
 import java.net.URL
 
-
-class HybridVersionCheck: HybridVersionCheckSpec(){
+class HybridVersionCheck : HybridVersionCheckSpec() {
     companion object {
+        private const val TIMEOUT_MS = 15_000
         private val context = NitroModules.applicationContext
         private val packageInfo = context?.packageManager?.getPackageInfo(context.packageName, 0)
-
     }
+
     public override val version = packageInfo?.versionName ?: "unknown"
 
     public override val buildNumber = if (android.os.Build.VERSION.SDK_INT >= 28) {
-        if (packageInfo?.longVersionCode != null)  packageInfo.longVersionCode.toString() else "unknown"
+        if (packageInfo?.longVersionCode != null) packageInfo.longVersionCode.toString() else "unknown"
     } else {
         @Suppress("DEPRECATION")
-        if (packageInfo?.versionCode != null)  packageInfo.versionCode.toString() else "unknown"
+        if (packageInfo?.versionCode != null) packageInfo.versionCode.toString() else "unknown"
     }
 
+    public override val packageName = packageInfo?.packageName ?: "unknown"
 
     override fun getCountry(): String {
-      return java.util.Locale.getDefault().country ?: "unknown"
+        return java.util.Locale.getDefault().country ?: "unknown"
     }
 
-    public override val packageName= packageInfo?.packageName ?: "unknown"
-
     override fun getStoreUrl(): Promise<String> {
         return Promise.async {
             "https://play.google.com/store/apps/details?id=$packageName"
@@ -37,8 +37,12 @@ class HybridVersionCheck: HybridVersionCheckSpec(){
         return Promise.async {
             try {
                 val url = URL("https://play.google.com/store/apps/details?id=$packageName&hl=en")
-                val html = url.readText()
-                val regex = Regex("""\[\[\["(\d+\.\d+[\.\d+]*)"\]\]""")
+                val connection = url.openConnection() as HttpURLConnection
+                connection.connectTimeout = TIMEOUT_MS
+                connection.readTimeout = TIMEOUT_MS
+                connection.setRequestProperty("User-Agent", "Mozilla/5.0")
+                val html = connection.inputStream.bufferedReader().use { it.readText() }
+                val regex = Regex("""\]\]\],\s*"(\d+\.\d+[\d.]*\d)"""")
                 val match = regex.find(html)
                 match?.groupValues?.get(1)
                     ?: throw Exception("Could not parse latest version from Play Store page")
@@ -58,4 +62,4 @@ class HybridVersionCheck: HybridVersionCheckSpec(){
             }
         }
     }
-}
+}

package/ios/HybridVersionCheck.swift

@@ -1,24 +1,33 @@
 import Foundation
 import NitroModules
 
-
 class HybridVersionCheck: HybridVersionCheckSpec {
+    private static let session: URLSession = {
+        let config = URLSessionConfiguration.default
+        config.timeoutIntervalForRequest = 15
+        config.timeoutIntervalForResource = 30
+        return URLSession(configuration: config)
+    }()
+
     var version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "unknown"
     var buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "unknown"
     var packageName = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? "unknown"
-    
+
     func getCountry() throws -> String {
-        Locale.current.regionCode ?? "unknown"
+        if #available(iOS 16, *) {
+            return Locale.current.region?.identifier ?? "unknown"
+        }
+        return Locale.current.regionCode ?? "unknown"
     }
 
     func getStoreUrl() throws -> Promise<String> {
         return Promise.async {
             let bundleId = Bundle.main.bundleIdentifier ?? ""
             let url = URL(string: "https://itunes.apple.com/lookup?bundleId=\(bundleId)")!
-            let (data, _) = try await URLSession.shared.data(from: url)
-            let json = try JSONSerialization.jsonObject(with: data) as? [String: Any]
-            let results = json?["results"] as? [[String: Any]]
-            guard let trackViewUrl = results?.first?["trackViewUrl"] as? String else {
+            let (data, _) = try await HybridVersionCheck.session.data(from: url)
+            guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
+                  let results = json["results"] as? [[String: Any]],
+                  let trackViewUrl = results.first?["trackViewUrl"] as? String else {
                 throw NSError(domain: "VersionCheck", code: 1, userInfo: [NSLocalizedDescriptionKey: "App not found on App Store"])
             }
             return trackViewUrl
@@ -29,11 +38,10 @@ class HybridVersionCheck: HybridVersionCheckSpec {
         return Promise.async {
             let bundleId = Bundle.main.bundleIdentifier ?? ""
             let url = URL(string: "https://itunes.apple.com/lookup?bundleId=\(bundleId)")!
-            let (data, _) = try await URLSession.shared.data(from: url)
-            let json = try JSONSerialization.jsonObject(with: data) as? [String: Any]
-            let results = json?["results"] as? [[String: Any]]
-            
-            guard let latestVersion = results?.first?["version"] as? String else {
+            let (data, _) = try await HybridVersionCheck.session.data(from: url)
+            guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
+                  let results = json["results"] as? [[String: Any]],
+                  let latestVersion = results.first?["version"] as? String else {
                 throw NSError(domain: "VersionCheck", code: 2, userInfo: [NSLocalizedDescriptionKey: "App not found on App Store"])
             }
             return latestVersion

package/src/index.ts

@@ -50,7 +50,7 @@ export const packageName = VersionCheck.packageName;
  * getCountry() // "US"
  * ```
  */
-export const getCountry = VersionCheck.getCountry;
+export const getCountry = () => VersionCheck.getCountry();
 
 /**
  * Returns the store URL for this app.
@@ -63,7 +63,7 @@ export const getCountry = VersionCheck.getCountry;
  * Linking.openURL(url);
  * ```
  */
-export const getStoreUrl = VersionCheck.getStoreUrl;
+export const getStoreUrl = () => VersionCheck.getStoreUrl();
 
 /**
  * Fetches the latest version of this app available in the store.
@@ -73,7 +73,7 @@ export const getStoreUrl = VersionCheck.getStoreUrl;
  * const latest = await getLatestVersion(); // "1.3.0"
  * ```
  */
-export const getLatestVersion = VersionCheck.getLatestVersion;
+export const getLatestVersion = () => VersionCheck.getLatestVersion();
 
 /**
  * Checks whether an app update is available.
@@ -88,6 +88,6 @@ export const getLatestVersion = VersionCheck.getLatestVersion;
  * }
  * ```
  */
-export const needsUpdate = VersionCheck.needsUpdate;
+export const needsUpdate = () => VersionCheck.needsUpdate();
 
 export { VersionCheck };