Add PostServiceRemoteUpdatePostError

Author: kean

WordPressKit/PostServiceRemote.h

@@ -103,7 +103,4 @@
  */
 - (NSDictionary *)dictionaryWithRemoteOptions:(id <PostServiceRemoteOptions>)options;
 
-/// Returns a remote post with the given data.
-+ (RemotePost *)remotePostFromJSONDictionary:(NSDictionary *)jsonPost;
-
 @end

WordPressKit/PostServiceRemoteExtended.swift

@@ -5,5 +5,15 @@ public protocol PostServiceRemoteExtended: PostServiceRemote {
     func createPost(with parameters: RemotePostCreateParameters) async throws -> RemotePost
 
     /// Performs a partial update to the existing post.
+    ///
+    /// - throws: ``PostServiceRemoteUpdatePostError`` or oher underlying errors
+    /// (see ``WordPressAPIError``)
     func patchPost(withID postID: Int, parameters: RemotePostUpdateParameters) async throws -> RemotePost
 }
+
+public enum PostServiceRemoteUpdatePostError: Error {
+    /// 409 (Conflict)
+    case conflict
+    /// 404 (Not Found)
+    case notFound
+}

WordPressKit/PostServiceRemoteREST+Extended.swift

@@ -5,38 +5,37 @@ extension PostServiceRemoteREST: PostServiceRemoteExtended {
         let path = self.path(forEndpoint: "sites/\(siteID)/posts/new?context=edit", withVersion: ._1_2)
         let parameters = try makeParameters(from: RemotePostCreateParametersWordPressComEncoder(parameters: parameters))
 
-        let response = try await withUnsafeThrowingContinuation { continuation in
-            wordPressComRestApi.POST(path, parameters: parameters) { object, _ in
-                continuation.resume(returning: object)
-            } failure: { error, _ in
-                continuation.resume(throwing: error)
-            }
-        }
-        return try await decodePost(from: response)
+        let response = try await wordPressComRestApi.perform(.post, URLString: path, parameters: parameters).get()
+        return try await decodePost(from: response.body)
     }
 
     public func patchPost(withID postID: Int, parameters: RemotePostUpdateParameters) async throws -> RemotePost {
         let path = self.path(forEndpoint: "sites/\(siteID)/posts/\(postID)?context=edit", withVersion: ._1_2)
         let parameters = try makeParameters(from: RemotePostUpdateParametersWordPressComEncoder(parameters: parameters))
 
-        let response = try await withUnsafeThrowingContinuation { continuation in
-            wordPressComRestApi.POST(path, parameters: parameters) { object, _ in
-                continuation.resume(returning: object)
-            } failure: { error, _ in
-                continuation.resume(throwing: error)
+        let result = await wordPressComRestApi.perform(.post, URLString: path, parameters: parameters)
+        switch result {
+        case .success(let response):
+            return try await decodePost(from: response.body)
+        case .failure(let error):
+            guard case .endpointError(let error) = error else {
+                throw error
+            }
+            switch error.apiErrorCode ?? "" {
+            case "unknown_post": throw PostServiceRemoteUpdatePostError.notFound
+            case "old-revision": throw PostServiceRemoteUpdatePostError.conflict
+            default: throw error
             }
         }
-        return try await decodePost(from: response)
     }
 }
 
 // Decodes the post in the background.
 private func decodePost(from object: AnyObject) async throws -> RemotePost {
-    guard let dictionary = object as? [AnyHashable: Any],
-          let post = PostServiceRemoteREST.remotePost(fromJSONDictionary: dictionary) else {
+    guard let dictionary = object as? [AnyHashable: Any] else {
         throw WordPressAPIError<WordPressComRestApiEndpointError>.unparsableResponse(response: nil, body: nil)
     }
-    return post
+    return PostServiceRemoteREST.remotePost(fromJSONDictionary: dictionary)
 }
 
 private func makeParameters<T: Encodable>(from value: T) throws -> [String: AnyObject] {

WordPressKit/PostServiceRemoteREST.h

@@ -76,4 +76,7 @@
                   success:(void (^ _Nullable)(NSArray<RemoteLikeUser *> * _Nonnull users, NSNumber * _Nonnull found))success
                   failure:(void (^ _Nullable)(NSError * _Nullable))failure;
 
+/// Returns a remote post with the given data.
++ (nonnull RemotePost *)remotePostFromJSONDictionary:(nonnull NSDictionary *)jsonPost;
+
 @end

WordPressKit/PostServiceRemoteXMLRPC+Extended.swift

@@ -5,14 +5,8 @@ extension PostServiceRemoteXMLRPC: PostServiceRemoteExtended {
     public func createPost(with parameters: RemotePostCreateParameters) async throws -> RemotePost {
         let dictionary = try makeParameters(from: RemotePostCreateParametersXMLRPCEncoder(parameters: parameters, type: .post))
         let parameters = xmlrpcArguments(withExtra: dictionary) as [AnyObject]
-        let response = try await withUnsafeThrowingContinuation { continuation in
-            api.callMethod("metaWeblog.newPost", parameters: parameters) { object, _ in
-                continuation.resume(returning: object)
-            } failure: { error, _ in
-                continuation.resume(throwing: error)
-            }
-        }
-        guard let postID = (response as? NSNumber) else {
+        let response = try await api.call(method: "metaWeblog.newPost", parameters: parameters).get()
+        guard let postID = (response.body as? NSNumber) else {
             throw URLError(.unknown) // Should never happen
         }
         return try await getPost(withID: postID)
@@ -24,14 +18,20 @@ extension PostServiceRemoteXMLRPC: PostServiceRemoteExtended {
         if parameters.count > 0 {
             parameters[0] = postID as NSNumber
         }
-        try await withUnsafeThrowingContinuation { continuation in
-            api.callMethod("metaWeblog.editPost", parameters: parameters) { _, _ in
-                continuation.resume(returning: ())
-            } failure: { error, _ in
-                continuation.resume(throwing: error)
+        let result = await api.call(method: "metaWeblog.editPost", parameters: parameters)
+        switch result {
+        case .success:
+            return try await getPost(withID: postID as NSNumber)
+        case .failure(let error):
+            guard case .endpointError(let error) = error else {
+                throw error
+            }
+            switch error.code ?? 0 {
+            case 404: throw PostServiceRemoteUpdatePostError.notFound
+            case 409: throw PostServiceRemoteUpdatePostError.conflict
+            default: throw error
             }
         }
-        return try await getPost(withID: postID as NSNumber)
     }
 
     private func getPost(withID postID: NSNumber) async throws -> RemotePost {

WordPressKit/WordPressOrgXMLRPCApi.swift

@@ -180,7 +180,7 @@ open class WordPressOrgXMLRPCApi: NSObject {
     /// - Parameters:
     ///   - streaming: set to `true` if there are large data (i.e. uploading files) in given `parameters`. `false` by default.
     /// - Returns: A `Result` type that contains the XMLRPC success or failure result.
-    func call(method: String, parameters: [AnyObject]?, fulfilling progress: Progress, streaming: Bool = false) async -> WordPressAPIResult<HTTPAPIResponse<AnyObject>, WordPressOrgXMLRPCApiFault> {
+    func call(method: String, parameters: [AnyObject]?, fulfilling progress: Progress? = nil, streaming: Bool = false) async -> WordPressAPIResult<HTTPAPIResponse<AnyObject>, WordPressOrgXMLRPCApiFault> {
         let session = streaming ? uploadURLSession : urlSession
         let builder = HTTPRequestBuilder(url: endpoint)
             .method(.post)