Cancel trx on error

swift-cloud · Sep 13, 2023 · 5b6356e · 5b6356e
1 parent f36f418
commit 5b6356e
Showing 1 changed file with 29 additions and 21 deletions.
diff --git a/Sources/Compute/Fastly/FastlyCache.swift b/Sources/Compute/Fastly/FastlyCache.swift
@@ -63,11 +63,11 @@ extension Fastly {
 
 extension Fastly.Cache {
 
-    internal enum HandlerData {
+    public enum HandlerData {
         case body(_ body: Fastly.Body, length: Int)
         case bytes(_ bytes: [UInt8])
 
-        var length: Int {
+        public var length: Int {
             switch self {
             case .body(_, let length):
                 return length
@@ -77,7 +77,7 @@ extension Fastly.Cache {
         }
     }
 
-    internal static func getOrSet(_ key: String, _ handler: () async throws -> (HandlerData, CachePolicy)) async throws -> ReadableBody {
+    public static func getOrSet(_ key: String, _ handler: () async throws -> (HandlerData, CachePolicy)) async throws -> ReadableBody {
         // Open the transaction
         let trx = try await Transaction.lookup(key)
 
@@ -90,22 +90,30 @@ extension Fastly.Cache {
             return ReadableWasiBody(body)
         }
 
-        // If its not usable then begin executing handler with new value
-        let (data, cachePolicy) = try await handler()
+        do {
+            // If its not usable then begin executing handler with new value
+            let (data, cachePolicy) = try await handler()
 
-        // Get an instance to the insert handle
-        var writer = try await trx.insertAndStreamBack(cachePolicy: cachePolicy, length: data.length)
+            // Get an instance to the insert handle
+            var writer = try await trx.insertAndStreamBack(cachePolicy: cachePolicy, length: data.length)
 
-        // Append bytes from handler to writeable body
-        switch data {
-        case .body(let body, _):
-            try writer.body.append(body)
-        case .bytes(let bytes):
-            try writer.body.write(bytes)
-        }
+            // Append bytes from handler to writeable body
+            switch data {
+            case .body(let body, _):
+                try writer.body.append(body)
+            case .bytes(let bytes):
+                try writer.body.write(bytes)
+            }
 
-        // Get handle to reabable body out from cache
-        return try await ReadableWasiBody(writer.transaction.getBody())
+            // Get handle to reabable body out from cache
+            return try await ReadableWasiBody(writer.transaction.getBody())
+        } catch {
+            // Cancel the transaction if something went wrong
+            try await trx.cancel()
+
+            // Rethrow original error
+            throw error
+        }
     }
 }
 
@@ -118,15 +126,15 @@ extension Fastly.Cache {
             self.handle = handle
         }
 
-        internal static func lookup(_ key: String) async throws -> Transaction {
+        public static func lookup(_ key: String) async throws -> Transaction {
             var handle: WasiHandle = 0
             let options = CacheLookupOptions.reserved
             var config = CacheLookupConfig()
             try wasi(fastly_cache__cache_transaction_lookup(key, key.utf8.count, options.rawValue, &config, &handle))
             return Transaction(handle)
         }
 
-        internal func insertAndStreamBack(cachePolicy: CachePolicy, length: Int) async throws -> (body: Fastly.Body, transaction: Transaction) {
+        public func insertAndStreamBack(cachePolicy: CachePolicy, length: Int) async throws -> (body: Fastly.Body, transaction: Transaction) {
             var bodyHandle: WasiHandle = 0
             var cacheHandle: WasiHandle = 0
             let options: CacheWriteOptions = [.initialAgeNs, .staleWhileRevalidateNs, .length]
@@ -138,21 +146,21 @@ extension Fastly.Cache {
             return (.init(bodyHandle), .init(cacheHandle))
         }
 
-        internal func getState() async throws -> CacheState {
+        public func getState() async throws -> CacheState {
             var value: UInt8 = 0
             try wasi(fastly_cache__cache_get_state(handle, &value))
             return CacheState(rawValue: value)
         }
 
-        internal func getBody() async throws -> Fastly.Body {
+        public func getBody() async throws -> Fastly.Body {
             var bodyHandle: WasiHandle = 0
             let options = CacheGetBodyOptions.reserved
             var config = CacheGetBodyConfig()
             try wasi(fastly_cache__cache_get_body(handle, options.rawValue, &config, &bodyHandle))
             return .init(bodyHandle)
         }
 
-        internal func cancel() async throws {
+        public func cancel() async throws {
             try wasi(fastly_cache__cache_transaction_cancel(handle))
         }
     }