Clean up some things from the Speech demo. (#1214)

Author: mluisbrown

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Client.swift

@@ -4,7 +4,7 @@ import Speech
 
 struct SpeechClient {
   var finishTask: () -> Effect<Never, Never>
-  var recognitionTask: (SFSpeechAudioBufferRecognitionRequest) -> Effect<Action, Error>
+  var recognitionTask: (SFSpeechAudioBufferRecognitionRequest) -> Effect<SpeechRecognitionResult, Error>
   var requestAuthorization: () -> Effect<SFSpeechRecognizerAuthorizationStatus, Never>
 
   enum Action: Equatable {

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Live.swift

@@ -19,19 +19,11 @@ extension SpeechClient {
       recognitionTask: { request in
         Effect { subscriber, lifetime in
           let speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US"))!
-          let speechRecognizerDelegate = SpeechRecognizerDelegate(
-            availabilityDidChange: { available in
-              subscriber.send(value: .availabilityDidChange(isAvailable: available))
-            }
-          )
-          speechRecognizer.delegate = speechRecognizerDelegate
-
           let cancellable = AnyDisposable {
             audioEngine?.stop()
             inputNode?.removeTap(onBus: 0)
             recognitionTask?.cancel()
             _ = speechRecognizer
-            _ = speechRecognizerDelegate
           }
 
           lifetime += cancellable
@@ -50,7 +42,7 @@ extension SpeechClient {
           recognitionTask = speechRecognizer.recognitionTask(with: request) { result, error in
             switch (result, error) {
             case let (.some(result), _):
-              subscriber.send(value: .taskResult(SpeechRecognitionResult(result)))
+              subscriber.send(value: SpeechRecognitionResult(result))
             case (_, .some):
               subscriber.send(error: .taskError)
             case (.none, .none):

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

@@ -19,7 +19,7 @@ struct AppState: Equatable {
 enum AppAction: Equatable {
   case dismissAuthorizationStateAlert
   case recordButtonTapped
-  case speech(Result<SpeechClient.Action, SpeechClient.Error>)
+  case speech(Result<SpeechRecognitionResult, SpeechClient.Error>)
   case speechRecognizerAuthorizationStatusResponse(SFSpeechRecognizerAuthorizationStatus)
 }
 
@@ -50,10 +50,7 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
         .fireAndForget()
     }
 
-  case let .speech(.success(.availabilityDidChange(isAvailable))):
-    return .none
-
-  case let .speech(.success(.taskResult(result))):
+  case let .speech(.success(result)):
     state.transcribedText = result.bestTranscription.formattedString
     if result.isFinal {
       return environment.speechClient.finishTask()
@@ -188,30 +185,29 @@ extension SpeechClient {
         """
         var text = ""
 
-        return .run { subscriber in
-          return Timer.publish(every: 0.33, on: .main, in: .default)
-            .autoconnect()
-            .prefix { _ in !finalText.isEmpty && isRunning }
-            .sink { _ in
+        return Effect { subscriber, lifetime in
+          let disposable = Effect.timer(interval: .milliseconds(330), on: QueueScheduler.main)
+            .take(while: { _ in !finalText.isEmpty && isRunning })
+            .startWithValues { _ in
               let word = finalText.prefix { $0 != " " }
               finalText.removeFirst(word.count)
               if finalText.first == " " {
                 finalText.removeFirst()
               }
               text += word + " "
               subscriber.send(
-                .taskResult(
-                  .init(
-                    bestTranscription: .init(
-                      formattedString: text,
-                      segments: []
-                    ),
-                    isFinal: false,
-                    transcriptions: []
-                  )
+                value: .init(
+                  bestTranscription: .init(
+                    formattedString: text,
+                    segments: []
+                  ),
+                  isFinal: false,
+                  transcriptions: []
                 )
               )
             }
+
+            lifetime += disposable
         }
       },
       requestAuthorization: {

Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift

@@ -5,7 +5,7 @@ import XCTest
 @testable import SpeechRecognition
 
 class SpeechRecognitionTests: XCTestCase {
-  let recognitionTaskSubject = Signal<SpeechClient.Action, SpeechClient.Error>.pipe()
+  let recognitionTaskSubject = Signal<SpeechRecognitionResult, SpeechClient.Error>.pipe()
 
   func testDenyAuthorization() {
     var speechClient = SpeechClient.unimplemented
@@ -96,13 +96,13 @@ class SpeechRecognitionTests: XCTestCase {
       $0.speechRecognizerAuthorizationStatus = .authorized
     }
 
-    self.recognitionTaskSubject.input.send(value: .taskResult(result))
-    store.receive(.speech(.success(.taskResult(result)))) {
+    self.recognitionTaskSubject.input.send(value: result)
+    store.receive(.speech(.success(result))) {
       $0.transcribedText = "Hello"
     }
 
-    self.recognitionTaskSubject.input.send(value: .taskResult(finalResult))
-    store.receive(.speech(.success(.taskResult(finalResult)))) {
+    self.recognitionTaskSubject.input.send(value: finalResult)
+    store.receive(.speech(.success(finalResult))) {
       $0.transcribedText = "Hello world"
     }
   }