Merge pull request #4 from pexavc/staging

Refactor using Combing and async/await

Author: pexavc

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -22,6 +22,8 @@ let package = Package(
         .target(
             name: "IPFSKit",
             dependencies: []),
+        .executableTarget(name: "IPFSExecutable",
+                          dependencies: ["IPFSKit"]),
         .testTarget(
             name: "IPFSKitTests",
             dependencies: ["IPFSKit"]),

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

@@ -0,0 +1,28 @@
+//
+//  main.swift
+//  
+//
+//  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))