echogarden 2.0.12 → 2.0.14

package/docs/Tasklist.md

@@ -2,11 +2,13 @@
 
 ## Bugs
 
-
-### eSpeak
+### eSpeak-ng
 
 * IPA -> Kirshenbaum translation is still not completely similar to what is output by eSpeak. Also, in rare situations, it outputs characters that are not accepted by eSpeak and eSpeak errors. Investigate when that happens and how to improve on this
 
+### Subtitles
+* Phrase splitting may split on number separators like the `,` in `100,000`. The new segmentation library would resolve that
+
 ### Browser extension
 * Investigate why WebSpeech events sometimes completely stop working in the middle of an utterance for no apparent reason. Sometimes this is permanent, until the extension is restarted. Is this a browser issue?
 * If a request is made and the server takes too much time to respond, the service worker may sleep and the request never canceled
@@ -16,28 +18,24 @@
 
 ### External bugs
 
-* `espeak-ng`: 'Oh dear!”' is read as "oh dear exclamation mark", because of the special quote character following the exclamation mark
 * `espeak-ng`: [Marker right after sentence end is not reported as an event](https://github.com/espeak-ng/espeak-ng/issues/920)
-* `espeak-ng`: On Japanese text, it says "Chinese character" or "Japanese character" for characters it doesn't know
+* `espeak-ng`: On Japanese text, it says "Chinese letter" or "Japanese letter" for characters it doesn't support
 * `espeak-ng`: Broken markers on the Korean voice
 * `wtf_wikipedia` Sometimes fails on `getResult.js` without throwing a humanly readable error
 * `wtf_wikipedia` Sometimes captures markup like `.svg` etc.
 * `msspeech`: Initialization fails on Chinese and Japanese voices (but not Korean)
 * `compromise`: Slow initialization time. Currently, it takes more than a second
-* Chromium doesn't fire timer events when cursor is positioned over scrollbar or body margins
-* `whisper.cpp`: Timestamps aren't very accurate when `enableDTW` is set. There's a constant lag
-* Node.js WASI for `flite` on Node `v21.7.2` and `v20.12.1` is intermittently crashing the process when `run` is called
+* Browser extension: Chromium doesn't fire timer events when cursor is positioned over scrollbar or body margins
 
 ## Features and enhancements
 
 ### CLI
 * Show names of files written to disk. This is useful for cases where a file is auto-renamed to prevent overwriting existing data
 * Restrict input media file extensions to ensure that invalid files are not passed to FFmpeg
-* Consider what to do with non-supported templates like `[hello]`
 * Show a message when a new version is available
 * Figure out which terminal outputs should go to stdout, or if that's a good idea at all
 * Print available synthesis voices when no voice matches (or suggest near matches)
-* `transcribe` may also accept `http://` and `https://` URLs and pull the remote media file
+* `transcribe`: accept `http://` and `https://` URLs and pull the remote media file
 * Make `enum` options case-insensitive if possible
 * More fine-grained intermediate progress report for operations
 * Suggest possible correction on the error of not using `=`, e.g. `speed 0.9` instead of `speed=0.9`
@@ -93,13 +91,11 @@
 ### Text language detection
 * Deploy and add the new n-gram based text language detection model
 
-### Segmentation
-* See if it's possible or useful to reliably use eSpeak as a segmentation engine.
-
 ### Subtitles
-* Split long words if needed. This is especially important for Chinese and Japanese
-* If a subtitle is too short and at the end of the audio, try to extend it back if possible (for example, if the previous subtitle is already extended, take back from it)
+* Split long words if needed
+* Clauses shouldn't be split in the middle of numbers, like the `,` in `123,456`
 * Decide how many punctuation characters to allow before breaking to a new line (currently it's infinite)
+* If a subtitle is too short and at the end of the audio, try to extend it back if possible (for example, if the previous subtitle is already extended, take back from it)
 * Add more clause separators, for even more special cases
 * Add option to output usable word or phoneme-level caption files (investigate how it's done on YouTube auto-captions)
 * Parse VTT's language
@@ -155,7 +151,6 @@
 ### Alignment
 
 ### Alignment / DTW
-* Accept percentages like `20%` in the `windowDuration` option
 * For the `granularity` option, add more granularities like `xxx-low` and `xxxx-low` (should the naming be changed? Maybe transition to a new naming scheme?)
 * Add and test official support for more than 6 hours of audio
 
@@ -255,17 +250,16 @@
 * [PlayHT](https://play.ht/) speech synthesis cloud service
 * [Deepgram](https://deepgram.com/) cloud text-to-speech API
 * [Assembly AI](https://www.assemblyai.com/) cloud speech recognition API
+* [Picovoice Orca](https://github.com/Picovoice/orca) local text-to-speech
 * Coqui STT server connection
 * [MarbleNet VAD](https://github.com/NVIDIA/NeMo/blob/main/tutorials/asr/Online_Offline_Microphone_VAD_Demo.ipynb), included of the NVIDIA NeMo framework, can be exported to ONNX
 * Silero text enhancement engine can be ported to ONNX
-* See what can be done for supporting WinRT speech: in particular `windows.media.speechsynthesis` and `windows.media.speechrecognition` support, possibly using NodeRT or some other method
 * Figure out how to support `julius` speech recognition via WASM
 * Any way to support RHVoice?
 
 ## Maybe?
 
 * Using a machine translation model to provide speech translation to languages other than English
-* Is it possible to get sentence boundaries without punctuation using NLP techniques like part-of-speech tagging?
 
 ## May or may not be good ideas
 
@@ -274,6 +268,7 @@
 
 ## Other ideas
 
+* Speaker diarization
 * Support alignment of EPUB 3 eBooks with a corresponding audiobook
 * Voice cloning
 * Speech-to-speech voice conversion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "echogarden",
-	"version": "2.0.12",
+	"version": "2.0.14",
 	"description": "An easy-to-use speech toolset. Includes tools for synthesis, recognition, alignment, speech translation, language detection, source separation and more.",
 	"author": "Rotem Dan",
 	"license": "GPL-3.0",
@@ -52,9 +52,9 @@
 		"echogarden": "./dist/cli/CLILauncher.js"
 	},
 	"dependencies": {
-		"@aws-sdk/client-polly": "^3.699.0",
-		"@aws-sdk/client-transcribe-streaming": "^3.699.0",
-		"@echogarden/audio-io": "^0.2.3",
+		"@aws-sdk/client-polly": "^3.716.0",
+		"@aws-sdk/client-transcribe-streaming": "^3.716.0",
+		"@echogarden/audio-io": "^0.3.0",
 		"@echogarden/espeak-ng-emscripten": "^0.3.3",
 		"@echogarden/fasttext-wasm": "^0.1.0",
 		"@echogarden/flite-wasi": "^0.1.1",
@@ -68,7 +68,7 @@
 		"@echogarden/transformers-nodejs-lite": "^2.17.1-lite.3",
 		"@mozilla/readability": "^0.5.0",
 		"alawmulaw": "^6.0.0",
-		"chalk": "^5.3.0",
+		"chalk": "^5.4.1",
 		"cldr-segmentation": "^2.2.1",
 		"command-exists": "^1.2.9",
 		"compromise": "^14.14.3",
@@ -81,14 +81,14 @@
 		"jsdom": "^25.0.1",
 		"json5": "^2.2.3",
 		"kuromoji": "^0.1.2",
-		"microsoft-cognitiveservices-speech-sdk": "^1.41.0",
+		"microsoft-cognitiveservices-speech-sdk": "^1.42.0",
 		"msgpack-lite": "^0.1.26",
 		"onnxruntime-node": "^1.20.1",
-		"openai": "^4.76.0",
+		"openai": "^4.77.0",
 		"sam-js": "^0.3.1",
 		"strip-ansi": "^7.1.0",
 		"tar": "^7.4.3",
-		"tiktoken": "^1.0.17",
+		"tiktoken": "^1.0.18",
 		"tinyld": "^1.3.4",
 		"wasm-feature-detect": "^1.8.0",
 		"ws": "^8.18.0",
@@ -111,7 +111,7 @@
 		"@types/graceful-fs": "^4.1.9",
 		"@types/jsdom": "^21.1.7",
 		"@types/msgpack-lite": "^0.1.11",
-		"@types/node": "^22.10.1",
+		"@types/node": "^22.10.2",
 		"@types/tar": "^6.1.13",
 		"@types/ws": "^8.5.13",
 		"ts-json-schema-generator": "^2.3.0",

package/src/data-structures/DynamicTypedArray.ts

@@ -1,4 +1,4 @@
-import { TypedArray, TypedArrayConstructor } from "../typings/TypedArray.js"
+import { TypedArray, TypedArrayConstructor } from '../typings/TypedArray.js'
 
 export class DynamicTypedArray<T extends TypedArray> {
 	elements: TypedArray
@@ -9,14 +9,14 @@ export class DynamicTypedArray<T extends TypedArray> {
 	}
 
 	add(newElement: number) {
-		const length = this.length
+		const newLength = this.length + 1
 
-		if (length === this.elements.length) {
-			this.ensureCapacity(length + 1)
+		if (newLength > this.capacity) {
+			this.ensureCapacity(newLength)
 		}
 
-		this.elements[length] = newElement
-		this.length += 1
+		this.elements[this.length] = newElement
+		this.length = newLength
 	}
 
 	addMany(...newElements: number[]) {
@@ -24,16 +24,18 @@ export class DynamicTypedArray<T extends TypedArray> {
 	}
 
 	addArray(newElements: ArrayLike<number>) {
-		const addedCount = newElements.length
+		const newLength = this.length + newElements.length
 
-		this.ensureCapacity(this.length + addedCount)
+		if (newLength > this.capacity) {
+			this.ensureCapacity(newLength)
+		}
 
 		this.elements.set(newElements, this.length)
-		this.length += addedCount
+		this.length = newLength
 	}
 
 	ensureCapacity(requiredCapacity: number) {
-		if (requiredCapacity > this.elements.length) {
+		if (requiredCapacity > this.capacity) {
 			const newCapacity = requiredCapacity * 2
 
 			const newElements = new this.TypedArrayConstructor(newCapacity)
@@ -43,6 +45,10 @@ export class DynamicTypedArray<T extends TypedArray> {
 		}
 	}
 
+	get capacity() {
+		return this.elements.length
+	}
+
 	toTypedArray() {
 		return this.elements.subarray(0, this.length) as T
 	}

package/src/recognition/WhisperSTT.ts

@@ -1569,7 +1569,7 @@ export class Whisper {
 
 		const timestampTokensCount = 1501
 
-		for (let i = 0; i < timestampTokensCount; i++) {
+		for (let i = 0; i <= timestampTokensCount; i++) {
 			const tokenIndex = this.tokenConfig.timestampTokensStart + i
 			const tokenTime = this.timestampTokenToSeconds(tokenIndex)
 
@@ -1727,11 +1727,15 @@ export class Whisper {
 			throw new Error(`Invalid timestamp token: ${timestampToken}`)
 		}
 
-		return (timestampToken - this.tokenConfig.timestampTokensStart) * 0.02
+		let seconds = (timestampToken - this.tokenConfig.timestampTokensStart) * 0.02
+		seconds = clip(seconds, 0.0, 30.0)
+
+		return seconds
 	}
 
 	isValidToken(token: number) {
-		return token < this.tokenConfig.timestampTokensEnd
+		//return token < this.tokenConfig.timestampTokensEnd
+		return token <= this.tokenConfig.timestampTokensEnd
 	}
 
 	assertIsValidToken(token: number) {

package/dist/encodings/LPVarInt.d.ts

@@ -1,11 +0,0 @@
-import { DynamicUint8Array } from "../data-structures/DynamicTypedArray.js";
-export declare function encodeUnsignedInt31(value: number, outEncodedData: DynamicUint8Array): void;
-export declare function decodeUnsignedInt31(encodedData: ArrayLike<number>, readOffset: number): DecodedValueAndReadOffset;
-export declare function encodeSignedInt32(value: number, outEncodedData: DynamicUint8Array): void;
-export declare function decodeSignedInt32(encodedData: ArrayLike<number>, readOffset: number): DecodedValueAndReadOffset;
-export interface DecodedValueAndReadOffset {
-    decodedValue: number;
-    readOffset: number;
-}
-export declare function testLPVarintSigned(): void;
-export declare function testLPVarintUnsigned(): void;

package/dist/encodings/LPVarInt.js

@@ -1,187 +0,0 @@
-import { createDynamicUint8Array } from "../data-structures/DynamicTypedArray.js";
-import { logToStderr } from "../utilities/Utilities.js";
-////////////////////////////////////////////////////////////////////////////////////
-// Encode unsigned integer
-////////////////////////////////////////////////////////////////////////////////////
-export function encodeUnsignedInt31(value, outEncodedData) {
-    value = value >>> 0;
-    if (value < (2 ** 7)) {
-        outEncodedData.add(value);
-    }
-    else if (value < (2 ** 14)) {
-        outEncodedData.addMany((value & 0b00111111) | 0b10000000, value >>> 6);
-    }
-    else if (value < (2 ** 21)) {
-        outEncodedData.addMany((value & 0b00011111) | 0b11000000, value >>> 5, value >>> 13);
-    }
-    else if (value < (2 ** 28)) {
-        outEncodedData.addMany((value & 0b00001111) | 0b11100000, value >>> 4, value >>> 12, value >>> 20);
-    }
-    else {
-        outEncodedData.addMany(0b11110000, value, value >>> 8, value >>> 16, value >>> 24);
-    }
-}
-////////////////////////////////////////////////////////////////////////////////////
-// Decode unsigned integer
-////////////////////////////////////////////////////////////////////////////////////
-export function decodeUnsignedInt31(encodedData, readOffset) {
-    readOffset = readOffset | 0;
-    const byte0 = encodedData[readOffset++];
-    if ((byte0 & 0b10000000) === 0) {
-        // 1 byte
-        let decodedValue = byte0;
-        return { decodedValue, readOffset };
-    }
-    const byte1 = encodedData[readOffset++];
-    if ((byte0 & 0b01000000) === 0) {
-        // 2 bytes
-        let decodedValue = (byte0 & 0b00111111) |
-            (byte1 << 6);
-        return { decodedValue, readOffset };
-    }
-    const byte2 = encodedData[readOffset++];
-    if ((byte0 & 0b00100000) === 0) {
-        // 3 bytes
-        let decodedValue = (byte0 & 0b00011111) |
-            (byte1 << 5) |
-            (byte2 << 13);
-        return { decodedValue, readOffset };
-    }
-    const byte3 = encodedData[readOffset++];
-    if ((byte0 & 0b00010000) === 0) {
-        // 4 bytes
-        let decodedValue = (byte0 & 0b00001111) |
-            (byte1 << 4) |
-            (byte2 << 12) |
-            (byte3 << 20);
-        return { decodedValue, readOffset };
-    }
-    const byte4 = encodedData[readOffset++];
-    if (byte0 === 0b11110000) {
-        // 5 bytes
-        let decodedValue = (byte1) |
-            (byte2 << 8) |
-            (byte3 << 16) |
-            (byte4 << 24);
-        return { decodedValue, readOffset };
-    }
-    throw new Error(`Encountered a value that is encoded with more than 5 bytes (beyond Unsigned Int31 range).`);
-}
-////////////////////////////////////////////////////////////////////////////////////
-// Encode signed integer
-////////////////////////////////////////////////////////////////////////////////////
-export function encodeSignedInt32(value, outEncodedData) {
-    const absValue = Math.abs(value | 0);
-    if (absValue < (2 ** 6)) {
-        outEncodedData.add(value & 0b01111111);
-    }
-    else if (absValue < (2 ** 13)) {
-        outEncodedData.addMany((value & 0b00111111) | 0b10000000, value >> 6);
-    }
-    else if (absValue < (2 ** 20)) {
-        outEncodedData.addMany((value & 0b00011111) | 0b11000000, value >> 5, value >> 13);
-    }
-    else if (absValue < (2 ** 27)) {
-        outEncodedData.addMany((value & 0b00001111) | 0b11100000, value >> 4, value >> 12, value >> 20);
-    }
-    else {
-        outEncodedData.addMany(0b11110000, value, value >> 8, value >> 16, value >> 24);
-    }
-}
-////////////////////////////////////////////////////////////////////////////////////
-// Decode signed integer
-////////////////////////////////////////////////////////////////////////////////////
-export function decodeSignedInt32(encodedData, readOffset) {
-    const byte0 = encodedData[readOffset++];
-    if ((byte0 & 0b10000000) === 0) {
-        // 1 byte
-        let decodedValue = byte0;
-        if ((byte0 & 0b01000000) !== 0) {
-            decodedValue |= (-1 << 7);
-        }
-        return { decodedValue, readOffset };
-    }
-    const byte1 = encodedData[readOffset++];
-    if ((byte0 & 0b01000000) === 0) {
-        // 2 bytes
-        let decodedValue = (byte0 & 0b00111111) |
-            (byte1 << 6);
-        if ((byte1 & 0b10000000) !== 0) {
-            decodedValue |= (-1 << 14);
-        }
-        return { decodedValue, readOffset };
-    }
-    const byte2 = encodedData[readOffset++];
-    if ((byte0 & 0b00100000) === 0) {
-        // 3 bytes
-        let decodedValue = (byte0 & 0b00011111) |
-            (byte1 << 5) |
-            (byte2 << 13);
-        if ((byte2 & 0b10000000) !== 0) {
-            decodedValue |= (-1 << 21);
-        }
-        return { decodedValue, readOffset };
-    }
-    const byte3 = encodedData[readOffset++];
-    if ((byte0 & 0b00010000) === 0) {
-        // 4 bytes
-        let decodedValue = (byte0 & 0b00001111) |
-            (byte1 << 4) |
-            (byte2 << 12) |
-            (byte3 << 20);
-        if ((byte3 & 0b10000000) !== 0) {
-            decodedValue |= (-1 << 28);
-        }
-        return { decodedValue, readOffset };
-    }
-    const byte4 = encodedData[readOffset++];
-    if (byte0 === 0b11110000) {
-        // 5 bytes
-        let decodedValue = (byte1) |
-            (byte2 << 8) |
-            (byte3 << 16) |
-            (byte4 << 24);
-        return { decodedValue, readOffset };
-    }
-    throw new Error(`Encountered a value that is encoded with more than 5 bytes (beyond int32 range).`);
-}
-////////////////////////////////////////////////////////////////////////////////////
-// Tests
-////////////////////////////////////////////////////////////////////////////////////
-export function testLPVarintSigned() {
-    const encodedBytes = createDynamicUint8Array();
-    function runTest(testValue) {
-        encodedBytes.clear();
-        encodeSignedInt32(testValue, encodedBytes);
-        const { decodedValue } = decodeSignedInt32(encodedBytes.elements, 0);
-        if (decodedValue !== testValue) {
-            throw new Error(`Expected ${testValue} but got ${decodedValue}`);
-        }
-    }
-    for (let i = -(2 ** 26); i < 2 ** 26; i++) {
-        if (i % 1000000 === 0) {
-            logToStderr(i);
-        }
-        runTest(i);
-    }
-    const x = 1;
-}
-export function testLPVarintUnsigned() {
-    const encodedBytes = createDynamicUint8Array();
-    function runTest(testValue) {
-        encodedBytes.clear();
-        encodeUnsignedInt31(testValue, encodedBytes);
-        const { decodedValue } = decodeUnsignedInt31(encodedBytes.elements, 0);
-        if (decodedValue !== testValue) {
-            throw new Error(`Expected ${testValue} but got ${decodedValue}`);
-        }
-    }
-    for (let i = 0; i < 2 ** 31; i++) {
-        if (i % 1000000 === 0) {
-            logToStderr(i);
-        }
-        runTest(i);
-    }
-    const x = 1;
-}
-//# sourceMappingURL=LPVarInt.js.map

package/dist/encodings/LPVarInt.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LPVarInt.js","sourceRoot":"","sources":["../../src/encodings/LPVarInt.ts"],"names":[],"mappings":"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"}