Reduce use of stringly typed lookups. Fix boundary bug.

Author: NeoTeo

SwiftIpfsApi.xcodeproj/xcshareddata/xcschemes/SwiftIpfsApi.xcscheme

@@ -78,6 +78,13 @@
             ReferencedContainer = "container:SwiftIpfsApi.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CFNETWORK_DIAGNOSTICS"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

SwiftIpfsApi/HttpIo.swift

@@ -101,13 +101,9 @@ public struct HttpIo : NetworkIo {
             } else {
 
                 /// Add the contents of the file to multipart message.
-                
                 let fileUrl = URL(fileURLWithPath: path)
-                
                 guard let fileData = try? Data(contentsOf: fileUrl) else { throw MultipartError.failedURLCreation }
 
-//                var fileName = fileUrl.absoluteString //.lastPathComponent
-//                fileName = fileName.substring(from: file.index(file.startIndex, offsetBy:7))
                 let fileName = NSString(string: fileUrl.absoluteString).replacingOccurrences(of: "file://", with: "")
 
                 multipart = try Multipart.addFilePart(multipart, fileName: fileName, fileData: fileData)

SwiftIpfsApi/IpfsApi.swift

@@ -145,6 +145,22 @@ enum IpfsApiError : Error {
     case bootstrapError(String)
 }
 
+// map command names to string to avoid "stringly typed" lookups.
+enum IpfsCmdString : String {
+    case Ref     = "Ref"
+    case Path    = "Path"
+    case Version = "Version"
+    case Name    = "Name"
+    case Pinned  = "Pinned"
+    case Keys    = "Keys"
+    case Peers   = "Peers"
+    case ID      = "ID"
+    case Addrs   = "Addrs"
+    case Value   = "Value"
+    case Message = "Message"
+    
+}
+
 public class IpfsApi : IpfsApiClient {
 
     public var baseUrl: String = ""
@@ -170,7 +186,6 @@ public class IpfsApi : IpfsApiClient {
     public let stats      = Stats()
     public let config     = Config()
     public let update     = Update()
-
 
     public convenience init(addr: Multiaddr) throws {
         /// Get the host and port number from the Multiaddr
@@ -232,16 +247,13 @@ public class IpfsApi : IpfsApiClient {
 
     public func add(_ filePaths: [String], completionHandler: @escaping ([MerkleNode]) -> Void) throws {
 
-        try net.sendTo(baseUrl+"add?stream-channels=true", content: filePaths) {
-//        try net.sendTo(baseUrl+"add?r", content: filePaths) {
+        try net.sendTo(baseUrl+"add?s", content: filePaths) {
             data in
             do {
                 /// If there was no data fetched pass an empty dictionary and return.
                 let fixedData = fixStreamJson(data)
 
-                
                 let json = JsonType.parse(try JSONSerialization.jsonObject(with: fixedData, options: JSONSerialization.ReadingOptions.allowFragments) as AnyObject)
-                print(json)
 
                 let res = try merkleNodesFromJson(json)
                 guard res.count > 0 else { throw IpfsApiError.jsonSerializationFailed }
@@ -321,7 +333,7 @@ public class IpfsApi : IpfsApiClient {
             var refs: [Multihash] = []
 
             for obj in results {
-                if let ref = obj.object?["Ref"]?.string {
+                if let ref = obj.object?[IpfsCmdString.Ref.rawValue]?.string {
                     let mh = try fromB58String(ref)
                     refs.append(mh)
                 }
@@ -339,7 +351,7 @@ public class IpfsApi : IpfsApiClient {
         try fetchJson("dns?arg=" + domain) {
             result in
 
-                guard let path = result.object?["Path"]?.string else { throw IpfsApiError.resultMissingData("No Path found") }
+                guard let path = result.object?[IpfsCmdString.Path.rawValue]?.string else { throw IpfsApiError.resultMissingData("No Path found") }
                 completionHandler(path)
         }
     }
@@ -377,7 +389,7 @@ public class IpfsApi : IpfsApiClient {
     public func version(_ completionHandler: @escaping (String) -> Void) throws {
         try fetchJson("version") {
             json in
-            let version = json.object?["Version"]?.string ?? ""
+            let version = json.object?[IpfsCmdString.Version.rawValue]?.string ?? ""
             completionHandler(version)
         }
     }

SwiftIpfsApi/Multipart.swift

@@ -65,8 +65,8 @@ extension Multipart {
         for _ in 0 ..< count {
             let r = Int(arc4random_uniform(UInt32(maxCount)))
             let randomIndex = allowed.index(allowed.startIndex, offsetBy: r)
-//            output += String(allowed.characters[allowed.characters.index(allowed.startIndex, offsetBy: r)])
-			output += allowed[..<randomIndex]
+
+			output += String(allowed[randomIndex])
         }
 
         return output
@@ -144,12 +144,12 @@ extension Multipart {
     public static func finishMultipart(_ multipart: Multipart, completionHandler: @escaping (Data) -> Void) {
 
         let outString = "--" + multipart.boundary + "--" + lineFeed
+        
         multipart.body.append(outString.data(using: String.Encoding.utf8)!)
 
         multipart.request.setValue(String(multipart.body.length), forHTTPHeaderField: "content-length")
         multipart.request.httpBody = multipart.body as Data
-        
-        
+
         /// Send off the request
         let task = URLSession.shared.dataTask(with: (multipart.request as URLRequest)) {
             (data: Data?, response: URLResponse?, error: Error?) -> Void in

SwiftIpfsApi/Subcommands/Bootstrap.swift

@@ -58,7 +58,7 @@ public class Bootstrap : ClientSubCommand {
             result in
 
             var addresses: [Multiaddr] = []
-            if let peers = result.object?["Peers"]?.array {
+            if let peers = result.object?[IpfsCmdString.Peers.rawValue]?.array {
                 /// Make an array of Multiaddr from each peer
                 addresses = try peers.map { try newMultiaddr($0.string!) }
             }

SwiftIpfsApi/Subcommands/Config.swift

@@ -28,8 +28,8 @@ public class Config : ClientSubCommand {
     public func get(_ key: String, completionHandler: @escaping (JsonType) throws -> Void) throws {
         try parent!.fetchJson("config?arg=" + key) {
             result in
-            guard let value = result.object?["Value"] else {
-                throw IpfsApiError.swarmError("Config get error: \(String(describing: result.object?["Message"]?.string))")
+            guard let value = result.object?[IpfsCmdString.Value.rawValue] else {
+                throw IpfsApiError.swarmError("Config get error: \(String(describing: result.object?[IpfsCmdString.Message.rawValue]?.string))")
             }
 
             try completionHandler(value)

SwiftIpfsApi/Subcommands/Name.swift

@@ -35,7 +35,7 @@ public class Name : ClientSubCommand {
         try parent!.fetchJson(request) {
             result in
 
-            let resolvedName = result.object?["Path"]?.string ?? ""
+            let resolvedName = result.object?[IpfsCmdString.Path.rawValue]?.string ?? ""
             completionHandler(resolvedName)
         }
 //        try parent!.fetchData(request) {

SwiftIpfsApi/Subcommands/Pin.swift

@@ -19,7 +19,7 @@ public class Pin : ClientSubCommand {
         try parent!.fetchJson("pin/add?stream-channels=true&arg=\(b58String(hash))") {
             result in
 
-            guard let objects = result.object?["Pinned"]?.array else {
+            guard let objects = result.object?[IpfsCmdString.Pinned.rawValue]?.array else {
                 throw IpfsApiError.pinError("Pin.add error: No Pinned objects in JSON data.")
             }
 
@@ -53,7 +53,7 @@ public class Pin : ClientSubCommand {
         try parent!.fetchJson("pin/ls?stream-channels=true&t=" + pinType.rawValue) {
             result in
 
-            guard let objects = result.object?["Keys"] else {
+            guard let objects = result.object?[IpfsCmdString.Keys.rawValue] else {
                 throw IpfsApiError.pinError("Pin.ls error: No Keys Dictionary in JSON data.")
             }
 
@@ -70,7 +70,7 @@ public class Pin : ClientSubCommand {
         try parent!.fetchJson("pin/rm?stream-channels=true&r=\(recursive)&arg=\(b58String(hash))") {
             result in
 
-            guard let objects = result.object?["Pinned"]?.array else {
+            guard let objects = result.object?[IpfsCmdString.Pinned.rawValue]?.array else {
                 throw IpfsApiError.pinError("Pin.rm error: No Pinned objects in JSON data.")
             }
 

SwiftIpfsApi/Subcommands/Swarm.swift

@@ -21,7 +21,7 @@ public class Swarm : ClientSubCommand {
             result in
 
             var addresses: [Multiaddr] = []
-            if let swarmPeers = result.object?["Peers"]?.array {
+            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!) }
             }
@@ -36,7 +36,7 @@ public class Swarm : ClientSubCommand {
 
         try parent!.fetchJson("swarm/addrs?stream-channels=true") {
             result in
-            guard let addrsData = result.object?["Addrs"] else {
+            guard let addrsData = result.object?[IpfsCmdString.Addrs.rawValue] else {
                 throw IpfsApiError.swarmError("Swarm.addrs error: No Addrs key in JSON data.")
             }
             try completionHandler(addrsData)

SwiftIpfsApiTests/SwiftIpfsApiTests.swift

@@ -14,7 +14,8 @@ import SwiftMultihash
 
 class SwiftIpfsApiTests: XCTestCase {
 
-    var hostString      = "127.0.0.1" //"192.168.5.8"
+//    var hostString      = "ipfs-thing.localhost"//192.168.5.9" //127.0.0.1" //"192.168.5.8"
+    var hostString      = "127.0.0.1"
     let hostPort        = 5001
 
     /// Your own IPNS node hash
@@ -847,14 +848,17 @@ class SwiftIpfsApiTests: XCTestCase {
     func testIds() {
 
         do {
+//            let api = try IpfsApi(host: self.hostString, port: self.hostPort, ssl: true)
             let api = try IpfsApi(host: self.hostString, port: self.hostPort)
             let idString = self.nodeIdString
 
             let id = { (dispatchGroup: DispatchGroup) throws -> Void in
                 try api.id(idString) {
                     result in
 
-                    XCTAssert(result.object?["ID"]?.string == idString)
+////                    XCTAssert(result.object?["ID"]?.string == idString)
+                    XCTAssert(result.object?[IpfsCmdString.ID.rawValue]?.string == idString)
+                    
                     dispatchGroup.leave()
                 }
             }
@@ -1038,7 +1042,7 @@ class SwiftIpfsApiTests: XCTestCase {
 //                                "file:///Users/teo/tmp/notred.png",
 //                                "file:///Users/teo/tmp/F4115_WU5086.jpeg"]
 //            let filePaths = [   "file:///Users/teo/Library/Services/FilesToIpfs.workflow"]
-            let filePaths = [   "file:///Users/teo/tmp/addtest3"]
+            let filePaths = [   "file:///Users/teo/tmp/addtest5"]
 
             let api = try IpfsApi(host: self.hostString, port: self.hostPort)