'Cancel' for PromiseKit

Author: dougzilla32

Cartfile.resolved

@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.3.3"
+github "mxcl/PromiseKit" "6.3.4"

Sources/SKProductsRequest+Promise.swift

@@ -50,3 +50,40 @@ fileprivate class SKDelegate: NSObject, SKProductsRequestDelegate {
 //        return true
 //    }
 //}
+
+//////////////////////////////////////////////////////////// Cancellation
+
+extension SKProductsRequest {
+    /**
+     Sends the request to the Apple App Store.
+     
+     - Returns: A cancellable promise that fulfills if the request succeeds.
+     */
+    public func startCC(_: PMKNamespacer) -> CancellablePromise<SKProductsResponse> {
+        let proxy = SKDelegate()
+        delegate = proxy
+        proxy.retainCycle = proxy
+        let cp = CancellablePromise(task: SKRequestTask(self, proxy), promise: proxy.promise, resolver: proxy.seal)
+
+        start()
+        return cp
+    }
+}
+
+fileprivate class SKRequestTask: CancellableTask {
+    let request: SKRequest
+    let proxy: SKDelegate
+
+    init(_ request: SKRequest, _ proxy: SKDelegate) {
+        self.request = request
+        self.proxy = proxy
+    }
+    
+    var isCancelled = false
+    
+    func cancel() {
+        request.cancel()
+        proxy.retainCycle = nil
+        isCancelled = true
+    }
+}

Sources/SKReceiptRefreshRequest+Promise.swift

@@ -9,7 +9,7 @@ extension SKReceiptRefreshRequest {
     }
 }
 
-private class ReceiptRefreshObserver: NSObject, SKRequestDelegate {
+private class ReceiptRefreshObserver: NSObject, SKRequestDelegate, CancellableTask {
     let (promise, seal) = Promise<SKReceiptRefreshRequest>.pending()
     let request: SKReceiptRefreshRequest
     var retainCycle: ReceiptRefreshObserver?
@@ -32,4 +32,21 @@ private class ReceiptRefreshObserver: NSObject, SKRequestDelegate {
         seal.reject(error)
         retainCycle = nil
     }
+
+    var isCancelled = false
+    
+    func cancel() {
+        request.cancel()
+        retainCycle = nil
+        isCancelled = true
+    }
+}
+
+//////////////////////////////////////////////////////////// Cancellation
+
+extension SKReceiptRefreshRequest {
+    public func promiseCC() -> CancellablePromise<SKReceiptRefreshRequest> {
+        let rro = ReceiptRefreshObserver(request: self)
+        return CancellablePromise(task: rro, promise: rro.promise, resolver: rro.seal)
+    }
 }

Tests/TestStoreKit.swift

@@ -20,3 +20,33 @@ class SKProductsRequestTests: XCTestCase {
         waitForExpectations(timeout: 1, handler: nil)
     }
 }
+
+//////////////////////////////////////////////////////////// Cancellation
+
+extension SKProductsRequestTests {
+    func testCancel() {
+        class MockProductsRequest: SKProductsRequest {            
+            var isCancelled = false
+
+            override func start() {
+                after(seconds: 0.1).done {
+                    if !self.isCancelled {
+                        self.delegate?.productsRequest(self, didReceive: SKProductsResponse())
+                    }
+                }
+            }
+        }
+        
+        let ex = expectation(description: "")
+        
+        let request = MockProductsRequest()
+        request.startCC(.promise).done { _ in
+            XCTFail()
+        }.catch(policy: .allErrors) {
+            $0.isCancelled ? ex.fulfill() : XCTFail()
+        }.cancel()
+        request.isCancelled = true
+        
+        waitForExpectations(timeout: 1, handler: nil)
+    }
+}