Convert to combine/async/await. Easier interface for data upload to networks.

Progress towards a more swifty data structures and interfacing

Author: pexavc

README.md

@@ -1,8 +1,7 @@
 # IPFSKit
 
-![Travis CI Build](https://app.travis-ci.com/0xKala/IPFSKit.svg?branch=main)
-[![Swift 5.3](https://img.shields.io/badge/swift-5.5-brightgreen.svg)](https://github.com/apple/swift)
-[![xcode-version](https://img.shields.io/badge/xcode-12.5-brightgreen)](https://developer.apple.com/xcode/)
+[![Swift 5.7](https://img.shields.io/badge/swift-5.7-brightgreen.svg)](https://github.com/apple/swift)
+[![xcode-version](https://img.shields.io/badge/xcode-14.2-brightgreen)](https://developer.apple.com/xcode/)
 
 Based on: https://github.com/ipfs-shipyard/swift-ipfs-http-client
 Converted into a standalone Swift Package.
@@ -20,46 +19,43 @@ Add this repo link as a swift package to your XCode project.
 ```swift
 import IPFSKit
 
-let client: IPFSClient?
+struct InfuraGateway: IPFSGateway {
+    var host: IPFSHost {
+        InfuraHost(id: "...",//On Infura, this is simply the API_KEY
+                   secret: "...")//API_KEY_SECRET
+    }
 
-public init() {
-    client = try? IPFSClient.init(
-        host: "ipfs.infura.io", 
-        port: 5001, 
-        ssl: true, 
-        id: "INFURA-PROJECT-ID", 
-        secret: "INFURA-SECRET"
-    )
+    var gateway: String {
+        "https://neatia.infura-ipfs.io"
+    }
 }
+
+IPFSKit.gateway = InfuraGateway()
 ```
 
 ### Adding data to IPFS
 
 ```swift
-if let data = result.data.pngData() {
-    do {
-        try state.service.client?.add(data) { nodes in // Adding data to IPFS
-            // use 'nodes' to pin content
-        }
-    } catch let error {
-        GraniteLogger.info("error adding new image:\n\(error)", .expedition, focus: true)
-    }
-}
+
+let data: Data = "Hello World".data(using: .utf8)!
+
+let response = await IPFS.upload(data)
+
+print(IPFSKit.gateway?.url(for: response))
 
 ```
 
 Convert any type of object into a `Data` type to prepare for adding.
 
 ### Pinning data to IPFS
 
+> Infura seems to have updated their services to automatically pin data that is added via the `/add` endpoint. This step is uncessary depending on the provider used or edge cases involved.
+
 ```swift
-do {
-    if let addHash = nodes.first?.hash { // the `nodes` from the closure of the previous code example
-        try client?.pin.add(addHash) { pinHash in
-            let gatewayHash = b58String(pinHash) // IPFS public hash gateway for the pinned content
-        }
-    }
-} catch let error {
-    GraniteLogger.info("error pinning:\n\(error)", .expedition, focus: true)
-}
+
+let data: Data = "Hello World".data(using: .utf8)!
+
+let response = await IPFS.upload(data)
+
+let gatewayHash = await IPFS.pin(response)
 ```

Sources/IPFSExecutable/main.swift

@@ -1,9 +1,28 @@
 //
-//  File.swift
+//  main.swift
 //  
 //
-//  Created by Ritesh Pakala on 7/11/23.
+//  Created by PEXAVC on 7/11/23.
 //
 
 import Foundation
 import IPFSKit
+
+struct InfuraGateway: IPFSGateway {
+    var host: IPFSHost {
+        InfuraHost(id: "...",//On Infura, this is simply the API_KEY
+                   secret: "...")//API_KEY_SECRET
+    }
+    
+    var gateway: String {
+        "https://neatia.infura-ipfs.io"
+    }
+}
+
+IPFSKit.gateway = InfuraGateway()
+
+let data: Data = "Hello World".data(using: .utf8)!
+
+let response = await IPFS.upload(data)
+
+print(IPFSKit.gateway?.url(for: response))

Sources/IPFSKit/Client/GraniteLogger.swift

@@ -69,12 +69,6 @@ public struct GraniteLogger {
 
         var disable: Bool {
             return true
-//            switch self {
-//            case .expedition:
-//                return false
-//            default:
-//                return true
-//            }
         }
     }
 

Sources/IPFSKit/Client/HttpIo.swift

@@ -9,6 +9,8 @@
 //  Licensed under MIT See LICENCE file in the root of this project for details.
 
 import Foundation
+import SwiftUI
+import Combine
 
 enum HttpIoError : Error {
     case urlError(String)
@@ -18,26 +20,31 @@ enum HttpIoError : Error {
 public struct HttpIo : NetworkIo {
     let auth: String
 
-    public func receiveFrom(_ source: String, completionHandler: @escaping (Data) throws -> Void) throws {
+    public func receiveFrom(_ source: String) throws -> AnyPublisher<Data, URLError> {
         guard let url = URL(string: source) else { throw HttpIoError.urlError("Invalid URL") }
         GraniteLogger.info("HttpIo receiveFrom url is \(url)")
-        let task = URLSession.shared.dataTask(with: url) {
-            (data: Data?, response: URLResponse?, error: Error?) in
-            
-            do {
-                guard error == nil else { throw HttpIoError.transmissionError((error?.localizedDescription)!) }
-                guard let data = data else { throw IpfsApiError.nilData }
-                
-//                GraniteLogger.info("The data:",NSString(data: data, encoding: String.Encoding.utf8.rawValue))
-                
-                try completionHandler(data)
-                
-            } catch {
-                GraniteLogger.info("Error \(error) in completionHandler passed to fetchData ")
-            }
-        }
+//        let task = URLSession.shared.dataTask(with: url) {
+//            (data: Data?, response: URLResponse?, error: Error?) in
+//
+//            do {
+//                guard error == nil else { throw HttpIoError.transmissionError((error?.localizedDescription)!) }
+//                guard let data = data else { throw IpfsApiError.nilData }
+//
+////                GraniteLogger.info("The data:",NSString(data: data, encoding: String.Encoding.utf8.rawValue))
+//
+//                try completionHandler(data)
+//
+//            } catch {
+//                GraniteLogger.info("Error \(error) in completionHandler passed to fetchData ")
+//            }
+//        }
+//
+//        task.resume()
 
-        task.resume()
+        return URLSession.shared
+            .dataTaskPublisher(for: url)
+            .map { $0.data }
+            .eraseToAnyPublisher()
     }
 
 
@@ -54,21 +61,22 @@ public struct HttpIo : NetworkIo {
         task.resume()
     }
 
-    public func sendTo(_ target: String, content: Data, completionHandler: @escaping (Data) -> Void) throws {
+    public func sendTo(_ target: String, content: Data) throws -> AnyPublisher<Data, URLError> {
 
         var multipart = try Multipart(targetUrl: target, encoding: .utf8, auth: self.auth)
         multipart = try Multipart.addFilePart(multipart, fileName: nil , fileData: content)
-        Multipart.finishMultipart(multipart, completionHandler: completionHandler)
+        
+        return Multipart.finishMultipart(multipart)
     }
 
 
-    public func sendTo(_ target: String, filePath: String, completionHandler: @escaping (Data) -> Void) throws {
+    public func sendTo(_ target: String, filePath: String) throws -> AnyPublisher<Data, URLError> {
 
         var multipart = try Multipart(targetUrl: target, encoding: .utf8, auth: self.auth)
 
         multipart = try handle(oldMultipart: multipart, files: [filePath])
 
-        Multipart.finishMultipart(multipart, completionHandler: completionHandler)
+        return Multipart.finishMultipart(multipart)
 
     }