Change findProvs api (bw compatible)

Add ability to add number of providers and also to use streaming json.

Author: NeoTeo

SwiftIpfsApi/HttpIo.swift

@@ -147,6 +147,7 @@ public class StreamHandler : NSObject, URLSessionDataDelegate {
 
         do {
             // fire the update handler
+            // FIX: Use the return value of the update handler to signal that we want to end the stream.
             try _ = updateHandler(data, dataTask)
         } catch {
             print("In StreamHandler: updateHandler error: \(error)")

SwiftIpfsApi/JsonType.swift

@@ -28,6 +28,9 @@ public extension JsonType {
         case let value as Swift.String: return .String(value)
 
         case let value as NSNumber: return .Number(value)
+            
+        case let value as JsonType: return value
+            
         default: return .null
         }
     }

SwiftIpfsApi/Subcommands/Dht.swift

@@ -9,14 +9,97 @@
 
 import SwiftMultihash
 import SwiftMultiaddr
+import Foundation
 
 public class Dht : ClientSubCommand {
 
     var parent: IpfsApiClient?
 
     /** FindProviders will return a list of peers who are able to provide the value requested. */
-    public func findProvs(_ hash: Multihash, completionHandler: @escaping (JsonType) -> Void) throws {
-        try parent!.fetchJson("dht/findprovs?arg=" + b58String(hash), completionHandler: completionHandler)
+//    public func findProvs(_ hash: Multihash, numProviders: Int = 20, completionHandler: @escaping (JsonType) -> Void) throws {
+//        try parent!.fetchJson("dht/findprovs?arg=\(b58String(hash))&num-providers=\(numProviders)", completionHandler: completionHandler)
+//    }
+    public func findProvs(_ hash: Multihash, numProviders: Int = 20, completionHandler: @escaping (JsonType) -> Void) throws {
+        /// Two test closures to be passed to the fetchStreamJson as parameters.
+        let comp = { (result: AnyObject) -> Void in
+            print("Job done")
+        }
+        
+        let update : ((Data, URLSessionDataTask) -> Bool) = { (data: Data, task: URLSessionDataTask) -> Bool in
+
+            func getHash(from obj: [String : JsonType], forResponse type: Int) -> [String]? {
+                
+                if obj["Type"]?.number?.intValue == type {
+                    if let responses = obj["Responses"]?.array {
+                        // only keep the responses that contain an ID.
+                        return responses.compactMap { $0.object?["ID"]?.string }
+                    }
+                }
+                return nil
+            }
+            
+
+            print("updates")
+            let fixed = fixStreamJson(data)
+            let json = try? JSONSerialization.jsonObject(with: fixed, options: JSONSerialization.ReadingOptions.allowFragments)
+            let parsedJ = JsonType.parse(json as AnyObject)
+            
+            var providers = [JsonType]()
+            // A valid response can either be an array of objects or an object.
+            switch parsedJ {
+            case JsonType.Array(let array):
+//                print("we iz got de arrays")
+                providers += array.filter { $0.object?["Type"]?.number == 4 }
+//                for obj in array {
+//                    if let jobj = obj.object, jobj["Type"]?.number == 4 {
+//                            providers += jobj
+//                    }
+//                }
+            case JsonType.Object(let obj):
+//                print("we iz got de hobj innit? \(obj)")
+                if obj["Type"]?.number == 4 {
+                    providers.append(parsedJ)
+                }
+//                if let provs = getHash(from: obj, forResponse: 4) {
+//                    providers += provs
+//                }
+                
+            default:
+                print("fukkal")
+            }
+            
+            
+            if providers.count >= numProviders {
+                print("We found these providers \(providers)")
+                let provs = JsonType.parse(providers as AnyObject)
+                completionHandler(provs)
+                
+            }
+
+//            guard let jarray = parsedJ.array else {
+//                print("No array in parsed json update \(parsedJ)")
+//                return true
+//            }
+//
+//            for obj in jarray {
+//                print("json: \(String(describing: obj.object?["Type"]))")
+//            }
+            
+//            print("json: \(json)")
+//
+//            if let arr = json as? [AnyObject] {
+//                for res in arr {
+//                    print(res)
+//                }
+//            } else {
+//                if let dict = json as? [String: AnyObject] {
+//                    print("It's a dict!:",dict )
+//                }
+//            }
+            return true
+        }
+        
+        try parent!.fetchStreamJson("dht/findprovs?arg=\(b58String(hash))&num-providers=\(numProviders)", updateHandler: update, completionHandler: comp)
     }
 
     /** Run a 'findClosestPeers' query through the DHT */

SwiftIpfsApi/Subcommands/Swarm.swift

@@ -23,7 +23,11 @@ public class Swarm : ClientSubCommand {
             var addresses: [Multiaddr] = []
             if let swarmPeers = result.object?[IpfsCmdString.Peers.rawValue]?.array {
                 /// Make an array of Multiaddr from each peer in swarmPeers.
-                addresses = try swarmPeers.map { try newMultiaddr($0.string!) }
+                addresses = try swarmPeers.map {
+                    guard let peer = $0.object?["Addr"]?.string else {  throw IpfsApiError.nilData }
+                    // Broken until multiaddr can deal with p2p-circuit multiaddr
+                    return try newMultiaddr(peer)
+                }
             }
 
             /// convert the data into a Multiaddr array and pass it to the handler