base future on throwspromise

Author: lukasIO

agents/src/utils.ts

@@ -122,17 +122,17 @@ export class Queue<T> {
 }
 
 /** @internal */
-export class Future<T = void> {
-  #await: Promise<T>;
+export class Future<T = void, E extends Error = Error> {
+  #await: ThrowsPromise<T, E>;
   #resolvePromise!: (value: T) => void;
-  #rejectPromise!: (error: Error) => void;
+  #rejectPromise!: (error: E) => void;
   #done: boolean = false;
   #rejected: boolean = false;
   #result: T | undefined = undefined;
   #error: Error | undefined = undefined;
 
   constructor() {
-    this.#await = new ThrowsPromise<T, Error>((resolve, reject) => {
+    this.#await = new ThrowsPromise<T, E>((resolve, reject) => {
       this.#resolvePromise = resolve;
       this.#rejectPromise = reject;
     });
@@ -169,7 +169,7 @@ export class Future<T = void> {
     this.#resolvePromise(value);
   }
 
-  reject(error: Error) {
+  reject(error: E) {
     this.#done = true;
     this.#rejected = true;
     this.#error = error;

agents/src/voice/agent_activity.ts

@@ -169,7 +169,7 @@ export class AgentActivity implements RecognitionHooks {
   private _drainBlockedTasks: Task<any>[] = [];
   private _currentSpeech?: SpeechHandle;
   private speechQueue: Heap<[number, number, SpeechHandle]>; // [priority, timestamp, speechHandle]
-  private q_updated: Future;
+  private q_updated: Future<void, never>;
   private speechTasks: Set<Task<void>> = new Set();
   private lock = new Mutex();
   private audioStream = new MultiInputStream<AudioFrame>();
@@ -1316,7 +1316,7 @@ export class AgentActivity implements RecognitionHooks {
   }
 
   private async mainTask(signal: AbortSignal): Promise<void> {
-    const abortFuture = new Future();
+    const abortFuture = new Future<void, never>();
     const abortHandler = () => {
       abortFuture.resolve();
       signal.removeEventListener('abort', abortHandler);

agents/src/voice/generation.ts

@@ -83,7 +83,7 @@ export interface _TTSGenerationData {
   /**
    * Future that resolves to a stream of timed transcripts, or null if TTS doesn't support it.
    */
-  timedTextsFut: Future<ReadableStream<TimedString> | null>;
+  timedTextsFut: Future<ReadableStream<TimedString> | null, never>;
   /** Time to first byte (set when first audio frame is received) */
   ttfb?: number;
 }
@@ -566,7 +566,7 @@ export function performTTSInference(
   const outputWriter = audioStream.writable.getWriter();
   const audioOutputStream = audioStream.readable;
 
-  const timedTextsFut = new Future<ReadableStream<TimedString> | null>();
+  const timedTextsFut = new Future<ReadableStream<TimedString> | null, never>();
   const timedTextsStream = new IdentityTransform<TimedString>();
   const timedTextsWriter = timedTextsStream.writable.getWriter();
 

agents/src/voice/room_io/_output.ts

@@ -15,7 +15,6 @@ import {
   TrackPublishOptions,
   TrackSource,
 } from '@livekit/rtc-node';
-import { ThrowsPromise } from '@livekit/throws-transformer/throws';
 import {
   ATTRIBUTE_TRANSCRIPTION_FINAL,
   ATTRIBUTE_TRANSCRIPTION_SEGMENT_ID,