Try closing writer

swift-cloud · Sep 27, 2023 · a3f736e · a3f736e
1 parent ffc4a3e
commit a3f736e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Sources/Compute/Fastly/FastlyBody.swift b/Sources/Compute/Fastly/FastlyBody.swift
@@ -33,6 +33,10 @@ extension Fastly {
             try wasi(fastly_http_body__close(handle))
         }
 
+        public mutating func abandon() throws {
+            try wasi(fastly_http_body__abandon(handle))
+        }
+
         @discardableResult
         public mutating func write(_ bytes: [UInt8], location: BodyWriteEnd = .back) throws -> Int {
             defer { used = true }

diff --git a/Sources/Compute/Fastly/FastlyCache.swift b/Sources/Compute/Fastly/FastlyCache.swift
@@ -18,7 +18,7 @@ extension Fastly {
             let state = try trx.getState()
 
             // If state is usable then return the body from cache
-            if state.contains(.usable) {
+            guard state.contains(.mustInsertOrUpdate) else {
                 return trx
             }
 
@@ -37,6 +37,9 @@ extension Fastly {
                     try writer.body.write(bytes)
                 }
 
+                // Finish the body
+                try writer.body.close()
+
                 return writer.transaction
             } catch {
                 // Cancel the transaction if something went wrong

diff --git a/Sources/Compute/Fastly/FastlyStubs.swift b/Sources/Compute/Fastly/FastlyStubs.swift
@@ -57,6 +57,8 @@ func fastly_http_body__append(_ dest: WasiHandle, _ src: WasiHandle) -> Int32 {
 
 func fastly_http_body__close(_ handle: WasiHandle) -> Int32 { fatalError() }
 
+func fastly_http_body__abandon(_ handle: WasiHandle) -> Int32 { fatalError() }
+
 func fastly_http_body__write(_ handle: WasiHandle, _ data: UnsafePointer<UInt8>!, _ data_len: Int, _ body_end: Int32, _ nwritten: UnsafeMutablePointer<Int>!) -> Int32 { fatalError() }
 
 func fastly_http_body__read(_ handle: WasiHandle, _ data: UnsafeMutablePointer<UInt8>!, _ data_max_len: Int, _ nwritten: UnsafeMutablePointer<Int>!) -> Int32 { fatalError() }

diff --git a/Sources/ComputeRuntime/include/ComputeRuntime.h b/Sources/ComputeRuntime/include/ComputeRuntime.h
@@ -78,6 +78,9 @@ int fastly_http_body__append(WasiHandle dest, WasiHandle src);
 WASM_IMPORT("fastly_http_body", "close")
 int fastly_http_body__close(WasiHandle handle);
 
+WASM_IMPORT("fastly_http_body", "abandon")
+int fastly_http_body__abandon(WasiHandle handle);
+
 WASM_IMPORT("fastly_http_body", "write")
 int fastly_http_body__write(WasiHandle handle, const uint8_t* data, size_t data_len, int body_end, size_t* nwritten);