Merge pull request #49 from torusresearch/replace_fatal_error

fix: replace fatal error
torusresearch · Jul 5, 2024 · 4bd96c3 · 4bd96c3
2 parents 22bfadf + 8c9d28d
commit 4bd96c3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/Sources/CommonSources/Error.swift b/Sources/CommonSources/Error.swift
@@ -7,9 +7,10 @@
 
 import Foundation
 
-/// An error that occurs during the decoding of a value.
 public enum FetchNodeError : Error {
+    case InvalidURL
+    case InvalidInput
+    case GeneralError(String)
     case InvalidNetwork(String)
     case InvalidMigrationNetwork(String)
-
 }
diff --git a/Sources/FetchNodeDetails/NodeDetailManager.swift b/Sources/FetchNodeDetails/NodeDetailManager.swift
@@ -49,8 +49,15 @@ open class NodeDetailManager {
         fndResult = nodeDetails
 
         do {
-            guard let url = URL(string: "\(fndServerEndpoint)?network=\(network.name)&verifier=\(verifier)&verifierId=\(verifierID)") else {
-                fatalError("Invalid URL ")
+            guard let urlEncodedVerifier = verifier.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
+                  let urlEncodedVerifierID = verifierID.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
+                  let urlEncodedNetwork = network.name.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+            else {
+                throw FetchNodeError.InvalidInput
+            }
+
+            guard let url = URL(string: "\(fndServerEndpoint)?network=\(urlEncodedNetwork)&verifier=\(urlEncodedVerifier)&verifierId=\(urlEncodedVerifierID)") else {
+                throw FetchNodeError.InvalidURL
             }
             let (data, _) = try await URLSession.shared.data(from: url)
             let response = try JSONDecoder().decode(NodeDetailsResponse.self, from: data)
@@ -60,7 +67,8 @@ open class NodeDetailManager {
         } catch let error {
             os_log("Failed to fetch node details from server, using local. %s", log: getTorusLogger(log: FNDLogger.core, type: .error), type: .error, error.localizedDescription)
         }
-        let nodeDetails = try fetchLocalConfig(network: self.network)!
+
+        let nodeDetails = try fetchLocalConfig(network: self.network)
         fndResult.setNodeDetails(nodeDetails: nodeDetails, updated: false)
         return fndResult
     }

diff --git a/Sources/FndBase/Endpoints/Endpoints.swift b/Sources/FndBase/Endpoints/Endpoints.swift
@@ -20,7 +20,7 @@ func getSSSEndpoints(network: TorusNetwork) throws -> [String] {
         case .sapphire(let network) :
 
             guard let endpoints = SAPPHIRE_NETWORK_URLS[network] else {
-                fatalError("Unsupported network: \(network)")
+                throw FetchNodeError.InvalidNetwork("Unsupported network: \(network)")
             }
 
             return endpoints.map { "\($0)/sss/jrpc" }
@@ -44,7 +44,7 @@ func getRSSEndpoints(network: TorusNetwork) throws -> [String] {
         case .sapphire(let network) :
 
             guard let endpoints = SAPPHIRE_NETWORK_URLS[network] else {
-                fatalError("Unsupported network: \(network)")
+                throw FetchNodeError.InvalidNetwork("Unsupported network: \(network)")
             }
 
             return endpoints.map { "\($0)/rss" }
@@ -67,7 +67,7 @@ func getTSSEndpoints(network: TorusNetwork) throws -> [String] {
         case .sapphire(let network) :
 
             guard let endpoints = SAPPHIRE_NETWORK_URLS[network] else {
-                fatalError("Unsupported network: \(network)")
+                throw FetchNodeError.InvalidNetwork("Unsupported network: \(network)")
             }
 
             return endpoints.map { "\($0)/tss" }

diff --git a/Sources/FndBase/Utils/Utils.swift b/Sources/FndBase/Utils/Utils.swift
@@ -1,11 +1,11 @@
-public func fetchLocalConfig(network: TorusNetwork) throws -> AllNodeDetailsModel? {
+public func fetchLocalConfig(network: TorusNetwork) throws -> AllNodeDetailsModel {
 
     switch network {
         case .legacy(let network ) :
         if (network.migration_map.migrationCompleted) {
             return try SapphireConfig(network: network.migration_map.networkMigratedTo )
         }
-        return nil
+        throw FetchNodeError.InvalidNetwork("Unsupported network: \(network)")
 
         case .sapphire(let network) :
             return try SapphireConfig(network: network)

diff --git a/Torus-fetchNodeDetails.podspec b/Torus-fetchNodeDetails.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "Torus-fetchNodeDetails"
-  spec.version      = "6.0.2"
+  spec.version      = "6.0.3"
   spec.ios.deployment_target = '13.0'
   spec.summary      = "Fetches the node details from torus nodelist smart contract"
   spec.homepage     = "https://github.com/torusresearch/fetch-node-details-swift"