speechflow 2.2.1 → 2.3.0

package/speechflow-cli/src/speechflow-util-queue.ts

@@ -1,6 +1,6 @@
 /*
 **  SpeechFlow - Speech Processing Flow Graph
-**  Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
+**  Copyright (c) 2024-2026 Dr. Ralf S. Engelschall <rse@engelschall.com>
 **  Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
 */
 
@@ -26,70 +26,6 @@ export function importObject<T> (name: string, arg: object | string, validator:
     return result as T
 }
 
-/*  helper class for single item queue  */
-export class SingleQueue<T> extends EventEmitter {
-    private queue = new Array<T>()
-    write (item: T) {
-        this.queue.unshift(item)
-        this.emit("dequeue")
-    }
-    read () {
-        return new Promise<T>((resolve) => {
-            const tryToConsume = () => {
-                const item = this.queue.pop()
-                if (item !== undefined)
-                    resolve(item)
-                else
-                    this.once("dequeue", tryToConsume)
-            }
-            tryToConsume()
-        })
-    }
-    drain () {
-        const items = this.queue
-        this.queue = new Array<T>()
-        return items
-    }
-}
-
-/*  helper class for double-item queue  */
-export class DoubleQueue<T0, T1> extends EventEmitter {
-    private queue0 = new Array<T0>()
-    private queue1 = new Array<T1>()
-    private notify () {
-        if (this.queue0.length > 0 && this.queue1.length > 0)
-            this.emit("dequeue")
-    }
-    write0 (item: T0) {
-        this.queue0.unshift(item)
-        this.notify()
-    }
-    write1 (item: T1) {
-        this.queue1.unshift(item)
-        this.notify()
-    }
-    read () {
-        return new Promise<[ T0, T1 ]>((resolve) => {
-            const consume = (): [ T0, T1 ] | undefined => {
-                if (this.queue0.length > 0 && this.queue1.length > 0) {
-                    const item0 = this.queue0.pop() as T0
-                    const item1 = this.queue1.pop() as T1
-                    return [ item0, item1 ]
-                }
-                return undefined
-            }
-            const tryToConsume = () => {
-                const items = consume()
-                if (items !== undefined)
-                    resolve(items)
-                else
-                    this.once("dequeue", tryToConsume)
-            }
-            tryToConsume()
-        })
-    }
-}
-
 /*  queue element  */
 export type QueueElement = { type: string }
 
@@ -126,7 +62,7 @@ export class QueuePointer<T extends QueueElement> extends EventEmitter {
     position (index?: number): number {
         if (index !== undefined) {
             this.index = Math.max(0, Math.min(index, this.queue.elements.length))
-            this.notify("position", this.index)
+            this.notify("position", { start: this.index })
         }
         return this.index
     }
@@ -139,35 +75,53 @@ export class QueuePointer<T extends QueueElement> extends EventEmitter {
         if (this.index !== indexOld)
             this.notify("position", { start: this.index })
     }
-    walkForwardUntil (type: T["type"]) {
+    walkForwardUntil (type: T["type"]): boolean {
         while (this.index < this.queue.elements.length
             && this.queue.elements[this.index].type !== type)
             this.index++
         this.notify("position", { start: this.index })
+        return this.index < this.queue.elements.length
+            && this.queue.elements[this.index].type === type
     }
-    walkBackwardUntil (type: T["type"]) {
-        while (this.index > 0
-            && this.queue.elements[this.index].type !== type)
+    walkBackwardUntil (type: T["type"]): boolean {
+        if (this.index === this.queue.elements.length && this.index > 0)
             this.index--
+        while (this.index < this.queue.elements.length
+            && this.queue.elements[this.index].type !== type) {
+            if (this.index === 0)
+                break
+            this.index--
+        }
         this.notify("position", { start: this.index })
+        return this.index < this.queue.elements.length
+            && this.queue.elements[this.index].type === type
     }
 
     /*  search operations  */
-    searchForward (type: T["type"]) {
+    searchForward (type: T["type"]): number {
         let position = this.index
         while (position < this.queue.elements.length
             && this.queue.elements[position].type !== type)
             position++
-        this.notify("search", { start: this.index, end: position })
-        return position
+        const found = position < this.queue.elements.length
+            && this.queue.elements[position].type === type
+        this.notify("search", { start: this.index, end: found ? position : this.index })
+        return found ? position : -1
     }
-    searchBackward (type: T["type"]) {
+    searchBackward (type: T["type"]): number {
         let position = this.index
-        while (position > 0
-            && this.queue.elements[position].type !== type)
+        if (position === this.queue.elements.length && position > 0)
             position--
-        this.notify("search", { start: position, end: this.index })
-        return position
+        while (position < this.queue.elements.length
+            && this.queue.elements[position].type !== type) {
+            if (position === 0)
+                break
+            position--
+        }
+        const found = position < this.queue.elements.length
+            && this.queue.elements[position].type === type
+        this.notify("search", { start: found ? position : this.index, end: this.index })
+        return found ? position : -1
     }
 
     /*  reading operations  */
@@ -269,6 +223,7 @@ export class Queue<T extends QueueElement> extends EventEmitter {
             for (const pointer of this.pointers.values())
                 pointer.position(pointer.position() - min)
 
+            /*  notify (start/end refer to pre-splice indices)  */
             this.notify("write", { start: 0, end: min, op: "trim" })
         }
     }
@@ -301,9 +256,12 @@ export class TimeStore<T> extends EventEmitter {
 
 /*  asynchronous queue  */
 export class AsyncQueue<T> {
-    private queue: Array<T> = []
+    private queue = new Array<T>()
     private resolvers: { resolve: (v: T) => void, reject: (err: Error) => void }[] = []
+    public destroyed = false
     write (v: T) {
+        if (this.destroyed)
+            return
         const resolver = this.resolvers.shift()
         if (resolver)
             resolver.resolve(v)
@@ -319,7 +277,13 @@ export class AsyncQueue<T> {
     empty () {
         return this.queue.length === 0
     }
+    drain () {
+        const items = this.queue
+        this.queue = new Array<T>()
+        return items
+    }
     destroy () {
+        this.destroyed = true
         for (const resolver of this.resolvers)
             resolver.reject(new Error("AsyncQueue destroyed"))
         this.resolvers = []
@@ -359,7 +323,22 @@ export class PromiseSet<T> {
             this.promises.delete(promise)
         }).catch(() => {})
     }
-    async awaitAll () {
-        await Promise.all(this.promises)
+    async awaitAll (timeout = 0) {
+        const deadline = timeout > 0 ? Date.now() + timeout : 0
+        while (this.promises.size > 0) {
+            const snapshot = [ ...this.promises ]
+            const remaining = deadline > 0 ? deadline - Date.now() : 0
+            if (deadline > 0 && remaining <= 0)
+                break
+            if (deadline > 0)
+                await Promise.race([
+                    Promise.all(snapshot),
+                    new Promise((resolve) => { setTimeout(resolve, remaining) })
+                ])
+            else
+                await Promise.all(snapshot)
+            if (deadline > 0 && Date.now() >= deadline)
+                break
+        }
     }
 }

package/speechflow-cli/src/speechflow-util-stream.ts

@@ -1,6 +1,6 @@
 /*
 **  SpeechFlow - Speech Processing Flow Graph
-**  Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
+**  Copyright (c) 2024-2026 Dr. Ralf S. Engelschall <rse@engelschall.com>
 **  Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
 */
 
@@ -59,7 +59,10 @@ export function ensureStreamChunk (type: "audio" | "text", chunk: SpeechFlowChun
 export function createTransformStreamForReadableSide (
     type: "text" | "audio",
     getTimeZero: () => DateTime,
-    writableHighWaterMark?: number
+    writableHighWaterMark?: number,
+    sampleRate?: number,
+    bitDepth?: number,
+    channels?: number
 ) {
     return new Stream.Transform({
         writableObjectMode:    false,
@@ -72,7 +75,8 @@ export function createTransformStreamForReadableSide (
             const start = DateTime.now().diff(timeZero)
             let end = start
             if (type === "audio") {
-                const duration = util.audioBufferDuration(chunk as Buffer)
+                const duration = util.audioBufferDuration(chunk as Buffer,
+                    sampleRate, bitDepth, channels)
                 end = start.plus(duration * 1000)
             }
             const payload = ensureStreamChunk(type, chunk) as Buffer | string
@@ -185,9 +189,33 @@ export class StreamWrapper extends Stream.Transform {
             return
         }
         try {
-            if (typeof this.foreignStream.end === "function")
+            if (typeof this.foreignStream.end === "function") {
                 this.foreignStream.end()
-            callback()
+
+                /*  wait for the foreign stream to finish flushing
+                    before signaling completion of this Transform stream  */
+                const ac = new AbortController()
+                Promise.race([
+                    new Promise<void>((resolve, reject) => {
+                        if (typeof this.foreignStream.once === "function") {
+                            this.foreignStream.once("finish", () => { resolve() })
+                            this.foreignStream.once("error",  (err: Error) => { reject(err) })
+                        }
+                        else
+                            resolve()
+                    }),
+                    util.timeout(5000, "foreign stream flush timeout", ac.signal)
+                ]).finally(() => {
+                    ac.abort()
+                }).then(() => {
+                    callback()
+                }).catch(() => {
+                    /*  ignore timeout -- stream will be destroyed anyway  */
+                    callback()
+                })
+            }
+            else
+                callback()
         }
         catch (err: unknown) {
             callback(util.ensureError(err))
@@ -211,15 +239,19 @@ export async function destroyStream (
     if ((  stream instanceof Stream.Duplex
         || stream instanceof Stream.Transform
         || stream instanceof Stream.Writable )
-        && (!stream.writableEnded && !stream.destroyed))
+        && (!stream.writableEnded && !stream.destroyed)) {
+        const ac = new AbortController()
         await Promise.race([
             new Promise<void>((resolve) => {
                 stream.end(() => { resolve() })
             }),
-            util.timeout(5000, "stream end timeout")
-        ]).catch(() => {
+            util.timeout(5000, "stream end timeout", ac.signal)
+        ]).finally(() => {
+            ac.abort()
+        }).catch(() => {
             /*  ignore timeout -- stream will be destroyed anyway  */
         })
+    }
 
     /*  destroy the stream  */
     stream.destroy()

package/speechflow-cli/src/speechflow-util.ts

@@ -1,6 +1,6 @@
 /*
 **  SpeechFlow - Speech Processing Flow Graph
-**  Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
+**  Copyright (c) 2024-2026 Dr. Ralf S. Engelschall <rse@engelschall.com>
 **  Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
 */
 

package/speechflow-cli/src/speechflow.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /*!
 **  SpeechFlow - Speech Processing Flow Graph
-**  Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
+**  Copyright (c) 2024-2026 Dr. Ralf S. Engelschall <rse@engelschall.com>
 **  Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
 */
 

package/speechflow-ui-db/dst/index.html

@@ -2,7 +2,7 @@
 <!--
 **
 **  SpeechFlow - Speech Processing Flow Graph
-**  Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
+**  Copyright (c) 2024-2026 Dr. Ralf S. Engelschall <rse@engelschall.com>
 **  Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
 **
 -->