PR Improvements

Source/Internal/HAConnectionImpl.swift

@@ -392,15 +392,22 @@ extension HAConnectionImpl {
         }
     }
 
-    private func sendWrite(_ sttBinaryHandlerId: UInt8, audioDataString: String?) {
+    private func sendWrite(identifier: HARequestIdentifier?, sttBinaryHandlerId: UInt8, audioDataString: String?) {
         // If there is no audioData, handlerID will be the payload alone indicating end of audio
         var audioData = Data(base64Encoded: audioDataString ?? "") ?? Data()
 
         // Prefix audioData with handler ID so the API can map the binary data
         audioData.insert(sttBinaryHandlerId, at: 0)
         workQueue.async { [connection] in
             connection?.write(data: audioData) { [weak self] in
-                self?.responseController.didWrite()
+                guard let self else { return }
+                self.responseController.didWrite()
+                if let identifier, let request = self.requestController.single(for: identifier) {
+                    callbackQueue.async {
+                        request.resolve(.success(.empty))
+                    }
+                    requestController.clear(invocation: request)
+                }
             }
         }
     }
@@ -415,7 +422,11 @@ extension HAConnectionImpl {
         case let .rest(method, command):
             sendRest(identifier: identifier!, request: request, method: method, command: command)
         case let .sttData(data):
-            sendWrite(data.rawValue, audioDataString: request.data["audioData"] as? String)
+            sendWrite(
+                identifier: identifier,
+                sttBinaryHandlerId: data.rawValue,
+                audioDataString: request.data["audioData"] as? String
+            )
         }
     }
 }

Source/Requests/HASttData.swift

@@ -9,10 +9,13 @@ public struct HASttHandlerId: Hashable {
 
 public extension HATypedRequest {
     /// Send binary stream STT data
+    /// - Parameters:
+    ///   - sttHandlerId: Handler Id provided by run-start event from Assist pipeline
+    ///   - audioDataBase64Encoded: Audio data base 64 encoded
     /// - Returns: A typed request that can be sent via `HAConnection`
     static func sendSttData(sttHandlerId: UInt8, audioDataBase64Encoded: String) -> HATypedRequest<HAResponseVoid> {
         .init(request: .init(type: .sttData(.init(rawValue: sttHandlerId)), data: [
-            "audioData": audioDataBase64Encoded
+            "audioData": audioDataBase64Encoded,
         ]))
     }
 }

Tests/HAConnectionImpl.test.swift

@@ -1518,7 +1518,7 @@ internal class HAConnectionImplTests: XCTestCase {
         })
     }
 
-    func testWriteSttRequestCommand() {
+    func testSendSttRequestCommand() {
         let expectedData = "Fake data".data(using: .utf8)!
         let request = HARequest(
             type: .sttData(.init(rawValue: 1)),
@@ -1536,6 +1536,24 @@ internal class HAConnectionImplTests: XCTestCase {
         XCTAssertEqual(request.type.command, "")
         XCTAssertEqual(request.type < request2.type, false)
     }
+
+    func testSendSttRequestSentSuccessful() throws {
+        let expectation = self.expectation(description: "completion")
+        responseController.phase = .command(version: "2024.4")
+        _ = connection.send(.sendSttData(sttHandlerId: 1, audioDataBase64Encoded: ""), completion: { _ in
+            expectation.fulfill()
+        })
+        let added = try XCTUnwrap(requestController.added.first as? HARequestInvocationSingle)
+        added.resolve(.success(.empty))
+        waitForExpectations(timeout: 10.0)
+    }
+
+    func testSendSttDataTypedRequest() {
+        let request: HATypedRequest<HAResponseVoid> = .sendSttData(sttHandlerId: 1, audioDataBase64Encoded: "a")
+
+        XCTAssertEqual(request.request.data as? [String: String], ["audioData": "a"])
+        XCTAssertEqual(request.request.type, .sttData(.init(rawValue: 1)))
+    }
 }
 
 extension WebSocketEvent: Equatable {