echogarden 0.11.18 → 0.11.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/Server.js +2 -1
- package/dist/server/Server.js.map +1 -1
- package/dist/server/Worker.d.ts +1 -0
- package/dist/server/Worker.js +32 -17
- package/dist/server/Worker.js.map +1 -1
- package/dist/server/WorkerStarter.js +2 -1
- package/dist/server/WorkerStarter.js.map +1 -1
- package/dist/synthesis/MicrosoftEdgeTTS.d.ts +2 -4
- package/dist/synthesis/MicrosoftEdgeTTS.js +11 -3
- package/dist/synthesis/MicrosoftEdgeTTS.js.map +1 -1
- package/package.json +22 -21
- package/src/server/Server.ts +2 -1
- package/src/server/Worker.ts +41 -18
- package/src/server/WorkerStarter.ts +3 -1
- package/src/synthesis/MicrosoftEdgeTTS.ts +13 -3
package/dist/server/Server.js
CHANGED
|
@@ -4,7 +4,7 @@ import { logToStderr } from '../utilities/Utilities.js';
|
|
|
4
4
|
import { OpenPromise } from '../utilities/OpenPromise.js';
|
|
5
5
|
import { readFile, existsSync } from '../utilities/FileSystem.js';
|
|
6
6
|
import { extendDeep } from '../utilities/ObjectUtilities.js';
|
|
7
|
-
import { sendMessageToWorker, addListenerToWorkerMessages, startNewWorkerThread } from './Worker.js';
|
|
7
|
+
import { sendMessageToWorker, addListenerToWorkerMessages, startNewWorkerThread, startMessageChannel } from './Worker.js';
|
|
8
8
|
import chalk from 'chalk';
|
|
9
9
|
const log = logToStderr;
|
|
10
10
|
export async function startServer(serverOptions, onStarted) {
|
|
@@ -62,6 +62,7 @@ export async function startServer(serverOptions, onStarted) {
|
|
|
62
62
|
workerThread.on('message', onWorkerMessage);
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
|
+
startMessageChannel();
|
|
65
66
|
addListenerToWorkerMessages(onWorkerMessage);
|
|
66
67
|
}
|
|
67
68
|
const serverOpenPromise = new OpenPromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/server/Server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAoC,MAAM,IAAI,CAAA;AACjF,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,cAAc,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/server/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/server/Worker.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { AlignmentOptions, AlignmentResult } from "../api/Alignment.js";
|
|
|
6
6
|
import { SpeechTranslationOptions, SpeechTranslationResult } from "../api/Translation.js";
|
|
7
7
|
import { Worker } from 'node:worker_threads';
|
|
8
8
|
import { SpeechLanguageDetectionOptions, SpeechLanguageDetectionResult, TextLanguageDetectionOptions, TextLanguageDetectionResult } from "../api/LanguageDetection.js";
|
|
9
|
+
export declare function startMessageChannel(): void;
|
|
9
10
|
export declare function shouldCancelCurrentTask(): boolean;
|
|
10
11
|
export declare function processMessage(message: WorkerRequestMessage, sendMessage: MessageFunc): Promise<void>;
|
|
11
12
|
export interface SynthesisRequestMessage extends WorkerMessageBase {
|
package/dist/server/Worker.js
CHANGED
|
@@ -11,24 +11,30 @@ import { Worker, SHARE_ENV } from 'node:worker_threads';
|
|
|
11
11
|
import { detectSpeechLanguage, detectTextLanguage } from "../api/LanguageDetection.js";
|
|
12
12
|
import chalk from "chalk";
|
|
13
13
|
const log = logToStderr;
|
|
14
|
-
|
|
15
|
-
messageChannel.port1.start();
|
|
16
|
-
messageChannel.port2.start();
|
|
14
|
+
let messageChannel = undefined;
|
|
17
15
|
const canceledRequests = new Set();
|
|
18
16
|
let cancelCurrentTask = false;
|
|
17
|
+
const messageQueue = new Queue();
|
|
18
|
+
let isProcessing = false;
|
|
19
|
+
export function startMessageChannel() {
|
|
20
|
+
if (messageChannel != null) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
messageChannel = new MessageChannel();
|
|
24
|
+
messageChannel.port1.start();
|
|
25
|
+
messageChannel.port2.start();
|
|
26
|
+
addListenerToClientMessages((message) => {
|
|
27
|
+
if (message.messageType == "CancelationRequest") {
|
|
28
|
+
//log(`CANCEL REQUESTED FOR ${message.requestId}`)
|
|
29
|
+
canceledRequests.add(message.requestId);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
enqueueAndProcessIfIdle(message);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
19
35
|
export function shouldCancelCurrentTask() {
|
|
20
36
|
return cancelCurrentTask;
|
|
21
37
|
}
|
|
22
|
-
addListenerToClientMessages((message) => {
|
|
23
|
-
if (message.messageType == "CancelationRequest") {
|
|
24
|
-
//log(`CANCEL REQUESTED FOR ${message.requestId}`)
|
|
25
|
-
canceledRequests.add(message.requestId);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
enqueueAndProcessIfIdle(message);
|
|
29
|
-
});
|
|
30
|
-
const messageQueue = new Queue();
|
|
31
|
-
let isProcessing = false;
|
|
32
38
|
function enqueueAndProcessIfIdle(message) {
|
|
33
39
|
messageQueue.enqueue(message);
|
|
34
40
|
processQueueIfIdle();
|
|
@@ -206,21 +212,30 @@ async function processTextLanguageDetectionRequest(message, sendMessage) {
|
|
|
206
212
|
// Messaging methods
|
|
207
213
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
208
214
|
export function sendMessageToWorker(message) {
|
|
209
|
-
|
|
215
|
+
ensureMessageChannelCreated();
|
|
216
|
+
messageChannel?.port1.postMessage(message);
|
|
210
217
|
}
|
|
211
218
|
export function addListenerToWorkerMessages(handler) {
|
|
212
|
-
|
|
219
|
+
ensureMessageChannelCreated();
|
|
220
|
+
messageChannel?.port1.addEventListener('message', (event) => {
|
|
213
221
|
handler(event.data);
|
|
214
222
|
});
|
|
215
223
|
}
|
|
216
224
|
function sendMessageToClient(message) {
|
|
217
|
-
|
|
225
|
+
ensureMessageChannelCreated();
|
|
226
|
+
messageChannel?.port2.postMessage(message);
|
|
218
227
|
}
|
|
219
228
|
function addListenerToClientMessages(handler) {
|
|
220
|
-
|
|
229
|
+
ensureMessageChannelCreated();
|
|
230
|
+
messageChannel?.port2.addEventListener('message', (event) => {
|
|
221
231
|
handler(event.data);
|
|
222
232
|
});
|
|
223
233
|
}
|
|
234
|
+
function ensureMessageChannelCreated() {
|
|
235
|
+
if (messageChannel == null) {
|
|
236
|
+
throw new Error(`Message channel has not been created`);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
224
239
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
225
240
|
// Worker thread methods
|
|
226
241
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Worker.js","sourceRoot":"","sources":["../../src/server/Worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiH,gBAAgB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACjL,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAEzE,OAAO,EAAyC,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACxF,OAAO,EAAqC,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAqD,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC1G,OAAO,EAAU,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAA4H,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChN,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,GAAG,GAAG,WAAW,CAAA;AAEvB,
|
|
1
|
+
{"version":3,"file":"Worker.js","sourceRoot":"","sources":["../../src/server/Worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { isMainThread, parentPort } from 'node:worker_threads';
|
|
2
|
-
import { sendMessageToWorker, addListenerToWorkerMessages } from './Worker.js';
|
|
2
|
+
import { sendMessageToWorker, addListenerToWorkerMessages, startMessageChannel } from './Worker.js';
|
|
3
3
|
import { OpenPromise } from '../utilities/OpenPromise.js';
|
|
4
4
|
async function startIfInWorkerThread() {
|
|
5
5
|
if (isMainThread || !parentPort) {
|
|
6
6
|
return;
|
|
7
7
|
}
|
|
8
|
+
startMessageChannel();
|
|
8
9
|
addListenerToWorkerMessages((message) => {
|
|
9
10
|
parentPort?.postMessage(message);
|
|
10
11
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerStarter.js","sourceRoot":"","sources":["../../src/server/WorkerStarter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"WorkerStarter.js","sourceRoot":"","sources":["../../src/server/WorkerStarter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAEzD,KAAK,UAAU,qBAAqB;IACnC,IAAI,YAAY,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAM;IACP,CAAC;IAED,mBAAmB,EAAE,CAAA;IAErB,2BAA2B,CAAC,CAAC,OAAO,EAAE,EAAE;QACvC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,IAAI,WAAW,EAAQ,CAAA;IAE/C,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QACtC,IAAI,OAAO,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAA;YAC1C,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAA;YAElD,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,EAAE,EAAE;gBAC/B,UAAW,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;gBACxD,OAAO,IAAI,CAAA;YACZ,CAAC,CAAA;YAED,eAAe,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;IACF,CAAC,CAAC,CAAA;IAEF,MAAM,eAAe,CAAC,OAAO,CAAA;IAE7B,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAY,EAAE,EAAE;QACzC,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACH,CAAC;AAED,2CAA2C;AAC3C,qBAAqB,EAAE,CAAA"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import WebSocket from "ws";
|
|
2
|
+
import { RawAudio } from "../audio/AudioUtilities.js";
|
|
2
3
|
export declare function synthesize(text: string, trustedClientToken: string, voice?: string, ssmlPitchString?: string, ssmlRateString?: string, ssmlVolumeString?: string): Promise<{
|
|
3
|
-
rawAudio:
|
|
4
|
-
audioChannels: Float32Array[];
|
|
5
|
-
sampleRate: number;
|
|
6
|
-
};
|
|
4
|
+
rawAudio: RawAudio;
|
|
7
5
|
timeline: import("../utilities/Timeline.js").Timeline;
|
|
8
6
|
}>;
|
|
9
7
|
export declare function initializeWebsocketConnection(trustedClientToken: string): Promise<WebSocket>;
|
|
@@ -7,15 +7,23 @@ import * as FFMpegTranscoder from "../codecs/FFMpegTranscoder.js";
|
|
|
7
7
|
import { Logger } from "../utilities/Logger.js";
|
|
8
8
|
import { OpenPromise } from "../utilities/OpenPromise.js";
|
|
9
9
|
import { getRandomHexString, logToStderr } from "../utilities/Utilities.js";
|
|
10
|
-
import { getRawAudioDuration } from "../audio/AudioUtilities.js";
|
|
10
|
+
import { getEmptyRawAudio, getRawAudioDuration } from "../audio/AudioUtilities.js";
|
|
11
11
|
const traceEnabled = false;
|
|
12
12
|
const log = traceEnabled ? logToStderr : () => { };
|
|
13
|
-
export async function synthesize(text, trustedClientToken, voice = "Microsoft Server Speech Text to Speech Voice (en-US,
|
|
13
|
+
export async function synthesize(text, trustedClientToken, voice = "Microsoft Server Speech Text to Speech Voice (en-US, AvaNeural)", ssmlPitchString = "+0Hz", ssmlRateString = "+0%", ssmlVolumeString = "+0%") {
|
|
14
14
|
const logger = new Logger();
|
|
15
15
|
logger.start("Request synthesis from Microsoft Edge cloud API");
|
|
16
16
|
const { audioData, events } = await requestSynthesis(text, trustedClientToken, voice, ssmlPitchString, ssmlRateString, ssmlVolumeString);
|
|
17
17
|
logger.end();
|
|
18
|
-
|
|
18
|
+
//logToStderr(`Audio length: ${audioData.length}`)
|
|
19
|
+
let rawAudio;
|
|
20
|
+
try {
|
|
21
|
+
rawAudio = await FFMpegTranscoder.decodeToChannels(audioData, 24000, 1);
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
rawAudio = getEmptyRawAudio(1, 24000);
|
|
25
|
+
}
|
|
26
|
+
//logToStderr(`Raw audio length: ${rawAudio.audioChannels[0].length}`)
|
|
19
27
|
logger.start("Convert boundary events to timeline");
|
|
20
28
|
const timeline = AzureCognitiveServicesTTS.boundaryEventsToTimeline(events, getRawAudioDuration(rawAudio));
|
|
21
29
|
logger.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MicrosoftEdgeTTS.js","sourceRoot":"","sources":["../../src/synthesis/MicrosoftEdgeTTS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,WAAW,MAAM,cAAc,CAAA;AAEtC,OAAO,KAAK,yBAAyB,MAAM,gCAAgC,CAAA;AAC3E,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"MicrosoftEdgeTTS.js","sourceRoot":"","sources":["../../src/synthesis/MicrosoftEdgeTTS.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "echogarden",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.19",
|
|
4
4
|
"description": "An integrated speech toolset, providing a variety of synthesis, recognition, alignment, and other processing tools, designed to be directly accessible to end-users.",
|
|
5
5
|
"author": "Rotem Dan",
|
|
6
6
|
"license": "GPL-3.0",
|
|
@@ -54,8 +54,8 @@
|
|
|
54
54
|
"echogarden": "./dist/cli/CLILauncher.js"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@aws-sdk/client-polly": "^3.
|
|
58
|
-
"@aws-sdk/client-transcribe-streaming": "^3.
|
|
57
|
+
"@aws-sdk/client-polly": "^3.515.0",
|
|
58
|
+
"@aws-sdk/client-transcribe-streaming": "^3.518.0",
|
|
59
59
|
"@echogarden/espeak-ng-emscripten": "^0.1.2",
|
|
60
60
|
"@echogarden/fasttext-wasm": "^0.1.0",
|
|
61
61
|
"@echogarden/flite-wasi": "^0.1.1",
|
|
@@ -66,41 +66,42 @@
|
|
|
66
66
|
"@echogarden/sonic-wasm": "^0.1.1",
|
|
67
67
|
"@echogarden/speex-resampler-wasm": "^0.1.1",
|
|
68
68
|
"@echogarden/svoxpico-wasm": "^0.1.0",
|
|
69
|
-
"@mozilla/readability": "^0.
|
|
69
|
+
"@mozilla/readability": "^0.5.0",
|
|
70
70
|
"alawmulaw": "^6.0.0",
|
|
71
71
|
"buffer-split": "^1.0.0",
|
|
72
72
|
"chalk": "^5.3.0",
|
|
73
73
|
"cldr-segmentation": "^2.2.0",
|
|
74
74
|
"command-exists": "^1.2.9",
|
|
75
|
-
"compromise": "^14.
|
|
76
|
-
"compromise-dates": "^3.
|
|
77
|
-
"fs-extra": "^11.
|
|
78
|
-
"gaxios": "^6.
|
|
75
|
+
"compromise": "^14.12.0",
|
|
76
|
+
"compromise-dates": "^3.5.0",
|
|
77
|
+
"fs-extra": "^11.2.0",
|
|
78
|
+
"gaxios": "^6.3.0",
|
|
79
79
|
"graceful-fs": "^4.2.11",
|
|
80
80
|
"html-escaper": "^3.0.3",
|
|
81
81
|
"html-to-text": "^9.0.5",
|
|
82
82
|
"import-meta-resolve": "^4.0.0",
|
|
83
83
|
"jieba-wasm": "^0.0.2",
|
|
84
|
-
"jsdom": "^
|
|
84
|
+
"jsdom": "^24.0.0",
|
|
85
85
|
"json5": "^2.2.3",
|
|
86
86
|
"kuromoji": "^0.1.2",
|
|
87
|
-
"microsoft-cognitiveservices-speech-sdk": "^1.
|
|
87
|
+
"microsoft-cognitiveservices-speech-sdk": "^1.35.0",
|
|
88
88
|
"moving-median": "^1.0.0",
|
|
89
89
|
"msgpack-lite": "^0.1.26",
|
|
90
90
|
"ndarray": "^1.0.19",
|
|
91
91
|
"ndarray-ops": "^1.2.2",
|
|
92
|
-
"onnxruntime-node": "^1.
|
|
92
|
+
"onnxruntime-node": "^1.17.0",
|
|
93
93
|
"sam-js": "^0.2.1",
|
|
94
94
|
"strip-ansi": "^7.1.0",
|
|
95
95
|
"tar": "^6.2.0",
|
|
96
96
|
"tinyld": "^1.3.4",
|
|
97
|
-
|
|
98
|
-
"
|
|
97
|
+
|
|
98
|
+
"ws": "^8.16.0",
|
|
99
|
+
"wtf_wikipedia": "^10.3.0"
|
|
99
100
|
},
|
|
100
101
|
"peerDependencies": {
|
|
101
102
|
"@echogarden/vosk": "^0.3.39-patched.1",
|
|
102
103
|
"speaker": "^0.5.4",
|
|
103
|
-
"winax": "^3.4.
|
|
104
|
+
"winax": "^3.4.2"
|
|
104
105
|
},
|
|
105
106
|
"peerDependenciesMeta": {
|
|
106
107
|
"@echogarden/vosk": {
|
|
@@ -121,14 +122,14 @@
|
|
|
121
122
|
"@types/msgpack-lite": "^0.1.11",
|
|
122
123
|
"@types/ndarray": "^1.0.14",
|
|
123
124
|
"@types/ndarray-ops": "^1.2.7",
|
|
124
|
-
"@types/node": "^20.
|
|
125
|
+
"@types/node": "^20.11.20",
|
|
125
126
|
"@types/recursive-readdir": "^2.2.4",
|
|
126
|
-
"@types/tar": "^6.1.
|
|
127
|
+
"@types/tar": "^6.1.11",
|
|
127
128
|
"@types/ws": "^8.5.10",
|
|
128
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
129
|
-
"@typescript-eslint/parser": "^
|
|
130
|
-
"eslint": "^8.
|
|
131
|
-
"ts-json-schema-generator": "^1.
|
|
132
|
-
"typescript": "^5.3.
|
|
129
|
+
"@typescript-eslint/eslint-plugin": "^7.0.2",
|
|
130
|
+
"@typescript-eslint/parser": "^7.0.2",
|
|
131
|
+
"eslint": "^8.56.0",
|
|
132
|
+
"ts-json-schema-generator": "^1.5.0",
|
|
133
|
+
"typescript": "^5.3.3"
|
|
133
134
|
}
|
|
134
135
|
}
|
package/src/server/Server.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { logToStderr } from '../utilities/Utilities.js'
|
|
|
4
4
|
import { OpenPromise } from '../utilities/OpenPromise.js'
|
|
5
5
|
import { readFile, existsSync } from '../utilities/FileSystem.js'
|
|
6
6
|
import { extendDeep } from '../utilities/ObjectUtilities.js'
|
|
7
|
-
import { sendMessageToWorker, addListenerToWorkerMessages, startNewWorkerThread } from './Worker.js'
|
|
7
|
+
import { sendMessageToWorker, addListenerToWorkerMessages, startNewWorkerThread, startMessageChannel } from './Worker.js'
|
|
8
8
|
import { Worker } from 'node:worker_threads'
|
|
9
9
|
import { IncomingMessage, ServerResponse } from 'node:http'
|
|
10
10
|
import { Logger } from '../utilities/Logger.js'
|
|
@@ -87,6 +87,7 @@ export async function startServer(serverOptions: ServerOptions, onStarted: (opti
|
|
|
87
87
|
workerThread = await startNewWorkerThread()
|
|
88
88
|
workerThread.on('message', onWorkerMessage)
|
|
89
89
|
} else {
|
|
90
|
+
startMessageChannel()
|
|
90
91
|
addListenerToWorkerMessages(onWorkerMessage)
|
|
91
92
|
}
|
|
92
93
|
|
package/src/server/Worker.ts
CHANGED
|
@@ -14,29 +14,38 @@ import chalk from "chalk"
|
|
|
14
14
|
|
|
15
15
|
const log = logToStderr
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
messageChannel.port1.start()
|
|
19
|
-
messageChannel.port2.start()
|
|
17
|
+
let messageChannel: MessageChannel | undefined = undefined
|
|
20
18
|
|
|
21
19
|
const canceledRequests = new Set<string>()
|
|
20
|
+
|
|
22
21
|
let cancelCurrentTask = false
|
|
23
22
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
23
|
+
const messageQueue = new Queue<any>()
|
|
24
|
+
let isProcessing = false
|
|
27
25
|
|
|
28
|
-
|
|
29
|
-
if (
|
|
30
|
-
//log(`CANCEL REQUESTED FOR ${message.requestId}`)
|
|
31
|
-
canceledRequests.add(message.requestId)
|
|
26
|
+
export function startMessageChannel() {
|
|
27
|
+
if (messageChannel != null) {
|
|
32
28
|
return
|
|
33
29
|
}
|
|
34
30
|
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
messageChannel = new MessageChannel()
|
|
32
|
+
messageChannel.port1.start()
|
|
33
|
+
messageChannel.port2.start()
|
|
37
34
|
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
addListenerToClientMessages((message) => {
|
|
36
|
+
if (message.messageType == "CancelationRequest") {
|
|
37
|
+
//log(`CANCEL REQUESTED FOR ${message.requestId}`)
|
|
38
|
+
canceledRequests.add(message.requestId)
|
|
39
|
+
return
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
enqueueAndProcessIfIdle(message)
|
|
43
|
+
})
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function shouldCancelCurrentTask() {
|
|
47
|
+
return cancelCurrentTask
|
|
48
|
+
}
|
|
40
49
|
|
|
41
50
|
function enqueueAndProcessIfIdle(message: any) {
|
|
42
51
|
messageQueue.enqueue(message)
|
|
@@ -344,25 +353,39 @@ export interface TextLanguageDetectionResponseMessage extends WorkerMessageBase,
|
|
|
344
353
|
// Messaging methods
|
|
345
354
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
346
355
|
export function sendMessageToWorker(message: any) {
|
|
347
|
-
|
|
356
|
+
ensureMessageChannelCreated()
|
|
357
|
+
|
|
358
|
+
messageChannel?.port1.postMessage(message)
|
|
348
359
|
}
|
|
349
360
|
|
|
350
361
|
export function addListenerToWorkerMessages(handler: MessageFunc) {
|
|
351
|
-
|
|
362
|
+
ensureMessageChannelCreated()
|
|
363
|
+
|
|
364
|
+
messageChannel?.port1.addEventListener('message', (event) => {
|
|
352
365
|
handler(event.data)
|
|
353
366
|
})
|
|
354
367
|
}
|
|
355
368
|
|
|
356
369
|
function sendMessageToClient(message: any) {
|
|
357
|
-
|
|
370
|
+
ensureMessageChannelCreated()
|
|
371
|
+
|
|
372
|
+
messageChannel?.port2.postMessage(message)
|
|
358
373
|
}
|
|
359
374
|
|
|
360
375
|
function addListenerToClientMessages(handler: MessageFunc) {
|
|
361
|
-
|
|
376
|
+
ensureMessageChannelCreated()
|
|
377
|
+
|
|
378
|
+
messageChannel?.port2.addEventListener('message', (event) => {
|
|
362
379
|
handler(event.data)
|
|
363
380
|
})
|
|
364
381
|
}
|
|
365
382
|
|
|
383
|
+
function ensureMessageChannelCreated() {
|
|
384
|
+
if (messageChannel == null) {
|
|
385
|
+
throw new Error(`Message channel has not been created`)
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
|
|
366
389
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
367
390
|
// Worker thread methods
|
|
368
391
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isMainThread, parentPort } from 'node:worker_threads'
|
|
2
|
-
import { sendMessageToWorker, addListenerToWorkerMessages } from './Worker.js'
|
|
2
|
+
import { sendMessageToWorker, addListenerToWorkerMessages, startMessageChannel } from './Worker.js'
|
|
3
3
|
import { OpenPromise } from '../utilities/OpenPromise.js'
|
|
4
4
|
|
|
5
5
|
async function startIfInWorkerThread() {
|
|
@@ -7,6 +7,8 @@ async function startIfInWorkerThread() {
|
|
|
7
7
|
return
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
+
startMessageChannel()
|
|
11
|
+
|
|
10
12
|
addListenerToWorkerMessages((message) => {
|
|
11
13
|
parentPort?.postMessage(message)
|
|
12
14
|
})
|
|
@@ -10,7 +10,7 @@ import * as FFMpegTranscoder from "../codecs/FFMpegTranscoder.js"
|
|
|
10
10
|
import { Logger } from "../utilities/Logger.js"
|
|
11
11
|
import { OpenPromise } from "../utilities/OpenPromise.js"
|
|
12
12
|
import { getRandomHexString, logToStderr } from "../utilities/Utilities.js"
|
|
13
|
-
import { getRawAudioDuration } from "../audio/AudioUtilities.js"
|
|
13
|
+
import { RawAudio, getEmptyRawAudio, getRawAudioDuration } from "../audio/AudioUtilities.js"
|
|
14
14
|
|
|
15
15
|
const traceEnabled = false
|
|
16
16
|
|
|
@@ -19,7 +19,7 @@ const log: typeof logToStderr = traceEnabled ? logToStderr : () => { }
|
|
|
19
19
|
export async function synthesize(
|
|
20
20
|
text: string,
|
|
21
21
|
trustedClientToken: string,
|
|
22
|
-
voice = "Microsoft Server Speech Text to Speech Voice (en-US,
|
|
22
|
+
voice = "Microsoft Server Speech Text to Speech Voice (en-US, AvaNeural)",
|
|
23
23
|
ssmlPitchString = "+0Hz",
|
|
24
24
|
ssmlRateString = "+0%",
|
|
25
25
|
ssmlVolumeString = "+0%") {
|
|
@@ -30,7 +30,17 @@ export async function synthesize(
|
|
|
30
30
|
const { audioData, events } = await requestSynthesis(text, trustedClientToken, voice, ssmlPitchString, ssmlRateString, ssmlVolumeString)
|
|
31
31
|
logger.end()
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
//logToStderr(`Audio length: ${audioData.length}`)
|
|
34
|
+
|
|
35
|
+
let rawAudio: RawAudio
|
|
36
|
+
|
|
37
|
+
try {
|
|
38
|
+
rawAudio = await FFMpegTranscoder.decodeToChannels(audioData, 24000, 1)
|
|
39
|
+
} catch (e) {
|
|
40
|
+
rawAudio = getEmptyRawAudio(1, 24000)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
//logToStderr(`Raw audio length: ${rawAudio.audioChannels[0].length}`)
|
|
34
44
|
|
|
35
45
|
logger.start("Convert boundary events to timeline")
|
|
36
46
|
const timeline = AzureCognitiveServicesTTS.boundaryEventsToTimeline(events, getRawAudioDuration(rawAudio))
|