speechflow 1.4.4 → 1.5.0
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/CHANGELOG.md +37 -0
- package/README.md +273 -7
- package/etc/claude.md +70 -0
- package/etc/speechflow.png +0 -0
- package/etc/speechflow.yaml +29 -11
- package/etc/stx.conf +7 -0
- package/package.json +7 -6
- package/speechflow-cli/dst/speechflow-node-a2a-compressor-wt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-compressor-wt.js +155 -0
- package/speechflow-cli/dst/speechflow-node-a2a-compressor-wt.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-compressor.d.ts +15 -0
- package/speechflow-cli/dst/speechflow-node-a2a-compressor.js +287 -0
- package/speechflow-cli/dst/speechflow-node-a2a-compressor.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics-wt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics-wt.js +208 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics-wt.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics.d.ts +15 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics.js +312 -0
- package/speechflow-cli/dst/speechflow-node-a2a-dynamics.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander-wt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander-wt.js +161 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander-wt.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander.d.ts +13 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander.js +208 -0
- package/speechflow-cli/dst/speechflow-node-a2a-expander.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-ffmpeg.js +13 -3
- package/speechflow-cli/dst/speechflow-node-a2a-ffmpeg.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-filler.d.ts +14 -0
- package/speechflow-cli/dst/speechflow-node-a2a-filler.js +233 -0
- package/speechflow-cli/dst/speechflow-node-a2a-filler.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-gain.d.ts +12 -0
- package/speechflow-cli/dst/speechflow-node-a2a-gain.js +125 -0
- package/speechflow-cli/dst/speechflow-node-a2a-gain.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-gender.d.ts +0 -1
- package/speechflow-cli/dst/speechflow-node-a2a-gender.js +28 -12
- package/speechflow-cli/dst/speechflow-node-a2a-gender.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-meter.d.ts +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-meter.js +35 -53
- package/speechflow-cli/dst/speechflow-node-a2a-meter.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-mute.js +2 -1
- package/speechflow-cli/dst/speechflow-node-a2a-mute.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise-wt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise-wt.js +55 -0
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise-wt.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise.d.ts +14 -0
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise.js +184 -0
- package/speechflow-cli/dst/speechflow-node-a2a-rnnoise.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-speex.d.ts +14 -0
- package/speechflow-cli/dst/speechflow-node-a2a-speex.js +156 -0
- package/speechflow-cli/dst/speechflow-node-a2a-speex.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2a-vad.js +3 -3
- package/speechflow-cli/dst/speechflow-node-a2a-vad.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2a-wav.js +22 -17
- package/speechflow-cli/dst/speechflow-node-a2a-wav.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2t-awstranscribe.d.ts +18 -0
- package/speechflow-cli/dst/speechflow-node-a2t-awstranscribe.js +317 -0
- package/speechflow-cli/dst/speechflow-node-a2t-awstranscribe.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-a2t-deepgram.js +16 -33
- package/speechflow-cli/dst/speechflow-node-a2t-deepgram.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-a2t-openaitranscribe.d.ts +19 -0
- package/speechflow-cli/dst/speechflow-node-a2t-openaitranscribe.js +351 -0
- package/speechflow-cli/dst/speechflow-node-a2t-openaitranscribe.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-t2a-awspolly.d.ts +16 -0
- package/speechflow-cli/dst/speechflow-node-t2a-awspolly.js +171 -0
- package/speechflow-cli/dst/speechflow-node-t2a-awspolly.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-t2a-elevenlabs.js +19 -14
- package/speechflow-cli/dst/speechflow-node-t2a-elevenlabs.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2a-kokoro.js +11 -6
- package/speechflow-cli/dst/speechflow-node-t2a-kokoro.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-awstranslate.d.ts +13 -0
- package/speechflow-cli/dst/speechflow-node-t2t-awstranslate.js +141 -0
- package/speechflow-cli/dst/speechflow-node-t2t-awstranslate.js.map +1 -0
- package/speechflow-cli/dst/speechflow-node-t2t-deepl.js +13 -15
- package/speechflow-cli/dst/speechflow-node-t2t-deepl.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-format.js +10 -15
- package/speechflow-cli/dst/speechflow-node-t2t-format.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-ollama.js +44 -31
- package/speechflow-cli/dst/speechflow-node-t2t-ollama.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-openai.js +44 -45
- package/speechflow-cli/dst/speechflow-node-t2t-openai.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-sentence.js +8 -8
- package/speechflow-cli/dst/speechflow-node-t2t-sentence.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-subtitle.js +10 -12
- package/speechflow-cli/dst/speechflow-node-t2t-subtitle.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-t2t-transformers.js +22 -27
- package/speechflow-cli/dst/speechflow-node-t2t-transformers.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-x2x-filter.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-x2x-filter.js +50 -15
- package/speechflow-cli/dst/speechflow-node-x2x-filter.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-x2x-trace.js +17 -18
- package/speechflow-cli/dst/speechflow-node-x2x-trace.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-xio-device.js +13 -21
- package/speechflow-cli/dst/speechflow-node-xio-device.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-xio-mqtt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-node-xio-mqtt.js +22 -16
- package/speechflow-cli/dst/speechflow-node-xio-mqtt.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node-xio-websocket.js +19 -19
- package/speechflow-cli/dst/speechflow-node-xio-websocket.js.map +1 -1
- package/speechflow-cli/dst/speechflow-node.d.ts +6 -3
- package/speechflow-cli/dst/speechflow-node.js +13 -2
- package/speechflow-cli/dst/speechflow-node.js.map +1 -1
- package/speechflow-cli/dst/speechflow-utils-audio-wt.d.ts +1 -0
- package/speechflow-cli/dst/speechflow-utils-audio-wt.js +124 -0
- package/speechflow-cli/dst/speechflow-utils-audio-wt.js.map +1 -0
- package/speechflow-cli/dst/speechflow-utils-audio.d.ts +13 -0
- package/speechflow-cli/dst/speechflow-utils-audio.js +137 -0
- package/speechflow-cli/dst/speechflow-utils-audio.js.map +1 -0
- package/speechflow-cli/dst/speechflow-utils.d.ts +18 -0
- package/speechflow-cli/dst/speechflow-utils.js +123 -35
- package/speechflow-cli/dst/speechflow-utils.js.map +1 -1
- package/speechflow-cli/dst/speechflow.js +114 -27
- package/speechflow-cli/dst/speechflow.js.map +1 -1
- package/speechflow-cli/etc/oxlint.jsonc +112 -11
- package/speechflow-cli/etc/stx.conf +2 -2
- package/speechflow-cli/etc/tsconfig.json +1 -1
- package/speechflow-cli/package.d/@shiguredo+rnnoise-wasm+2025.1.5.patch +25 -0
- package/speechflow-cli/package.json +102 -94
- package/speechflow-cli/src/lib.d.ts +24 -0
- package/speechflow-cli/src/speechflow-node-a2a-compressor-wt.ts +151 -0
- package/speechflow-cli/src/speechflow-node-a2a-compressor.ts +303 -0
- package/speechflow-cli/src/speechflow-node-a2a-expander-wt.ts +158 -0
- package/speechflow-cli/src/speechflow-node-a2a-expander.ts +212 -0
- package/speechflow-cli/src/speechflow-node-a2a-ffmpeg.ts +13 -3
- package/speechflow-cli/src/speechflow-node-a2a-filler.ts +223 -0
- package/speechflow-cli/src/speechflow-node-a2a-gain.ts +98 -0
- package/speechflow-cli/src/speechflow-node-a2a-gender.ts +31 -17
- package/speechflow-cli/src/speechflow-node-a2a-meter.ts +37 -56
- package/speechflow-cli/src/speechflow-node-a2a-mute.ts +3 -2
- package/speechflow-cli/src/speechflow-node-a2a-rnnoise-wt.ts +62 -0
- package/speechflow-cli/src/speechflow-node-a2a-rnnoise.ts +164 -0
- package/speechflow-cli/src/speechflow-node-a2a-speex.ts +137 -0
- package/speechflow-cli/src/speechflow-node-a2a-vad.ts +3 -3
- package/speechflow-cli/src/speechflow-node-a2a-wav.ts +20 -13
- package/speechflow-cli/src/speechflow-node-a2t-awstranscribe.ts +308 -0
- package/speechflow-cli/src/speechflow-node-a2t-deepgram.ts +16 -33
- package/speechflow-cli/src/speechflow-node-a2t-openaitranscribe.ts +337 -0
- package/speechflow-cli/src/speechflow-node-t2a-awspolly.ts +187 -0
- package/speechflow-cli/src/speechflow-node-t2a-elevenlabs.ts +19 -14
- package/speechflow-cli/src/speechflow-node-t2a-kokoro.ts +12 -7
- package/speechflow-cli/src/speechflow-node-t2t-awstranslate.ts +152 -0
- package/speechflow-cli/src/speechflow-node-t2t-deepl.ts +13 -15
- package/speechflow-cli/src/speechflow-node-t2t-format.ts +10 -15
- package/speechflow-cli/src/speechflow-node-t2t-ollama.ts +55 -42
- package/speechflow-cli/src/speechflow-node-t2t-openai.ts +58 -58
- package/speechflow-cli/src/speechflow-node-t2t-sentence.ts +10 -10
- package/speechflow-cli/src/speechflow-node-t2t-subtitle.ts +15 -16
- package/speechflow-cli/src/speechflow-node-t2t-transformers.ts +27 -32
- package/speechflow-cli/src/speechflow-node-x2x-filter.ts +20 -16
- package/speechflow-cli/src/speechflow-node-x2x-trace.ts +20 -19
- package/speechflow-cli/src/speechflow-node-xio-device.ts +15 -23
- package/speechflow-cli/src/speechflow-node-xio-mqtt.ts +23 -16
- package/speechflow-cli/src/speechflow-node-xio-websocket.ts +19 -19
- package/speechflow-cli/src/speechflow-node.ts +21 -8
- package/speechflow-cli/src/speechflow-utils-audio-wt.ts +172 -0
- package/speechflow-cli/src/speechflow-utils-audio.ts +147 -0
- package/speechflow-cli/src/speechflow-utils.ts +125 -32
- package/speechflow-cli/src/speechflow.ts +118 -30
- package/speechflow-ui-db/dst/index.css +1 -1
- package/speechflow-ui-db/dst/index.js +31 -31
- package/speechflow-ui-db/etc/eslint.mjs +0 -1
- package/speechflow-ui-db/etc/tsc-client.json +3 -3
- package/speechflow-ui-db/package.json +11 -10
- package/speechflow-ui-db/src/app.vue +96 -78
- package/speechflow-ui-st/dst/index.js +26 -26
- package/speechflow-ui-st/etc/eslint.mjs +0 -1
- package/speechflow-ui-st/etc/tsc-client.json +3 -3
- package/speechflow-ui-st/package.json +11 -10
- package/speechflow-ui-st/src/app.vue +5 -12
|
@@ -77,7 +77,7 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
77
77
|
{ role: "assistant", content: "Ich liebe meine Frau." },
|
|
78
78
|
{ role: "user", content: "The weather is wonderful." },
|
|
79
79
|
{ role: "assistant", content: "Das Wetter ist wunderschön." },
|
|
80
|
-
{ role: "user", content: "The
|
|
80
|
+
{ role: "user", content: "The life is awesome." },
|
|
81
81
|
{ role: "assistant", content: "Das Leben ist einfach großartig." }
|
|
82
82
|
]
|
|
83
83
|
},
|
|
@@ -90,9 +90,9 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
90
90
|
"Do not chat.\n" +
|
|
91
91
|
"Do not show any explanations.\n" +
|
|
92
92
|
"Do not show any introduction.\n" +
|
|
93
|
-
"Do not show any preamble
|
|
94
|
-
"Do not show any prolog
|
|
95
|
-
"Do not show any epilog
|
|
93
|
+
"Do not show any preamble.\n" +
|
|
94
|
+
"Do not show any prolog.\n" +
|
|
95
|
+
"Do not show any epilog.\n" +
|
|
96
96
|
"Get to the point.\n" +
|
|
97
97
|
"Preserve the original meaning, tone, and nuance.\n" +
|
|
98
98
|
"Directly translate text from German (DE) to fluent and natural English (EN) language.\n",
|
|
@@ -102,7 +102,7 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
102
102
|
{ role: "user", content: "Das Wetter ist wunderschön." },
|
|
103
103
|
{ role: "assistant", content: "The weather is wonderful." },
|
|
104
104
|
{ role: "user", content: "Das Leben ist einfach großartig." },
|
|
105
|
-
{ role: "assistant", content: "The
|
|
105
|
+
{ role: "assistant", content: "The life is awesome." }
|
|
106
106
|
]
|
|
107
107
|
}
|
|
108
108
|
};
|
|
@@ -133,7 +133,7 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
133
133
|
artifact += `:${progress.file}`;
|
|
134
134
|
let percent = 0;
|
|
135
135
|
if (typeof progress.loaded === "number" && typeof progress.total === "number")
|
|
136
|
-
percent = progress.loaded / progress.total * 100;
|
|
136
|
+
percent = (progress.loaded / progress.total) * 100;
|
|
137
137
|
else if (typeof progress.progress === "number")
|
|
138
138
|
percent = progress.progress;
|
|
139
139
|
if (percent > 0)
|
|
@@ -142,7 +142,7 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
142
142
|
const interval = setInterval(() => {
|
|
143
143
|
for (const [artifact, percent] of progressState) {
|
|
144
144
|
this.log("info", `downloaded ${percent.toFixed(2)}% of artifact "${artifact}"`);
|
|
145
|
-
if (percent >=
|
|
145
|
+
if (percent >= 100.0)
|
|
146
146
|
progressState.delete(artifact);
|
|
147
147
|
}
|
|
148
148
|
}, 1000);
|
|
@@ -179,9 +179,8 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
179
179
|
const translate = async (text) => {
|
|
180
180
|
if (this.params.model === "OPUS") {
|
|
181
181
|
const result = await this.translator(text);
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
result.translation_text;
|
|
182
|
+
const single = Array.isArray(result) ? result[0] : result;
|
|
183
|
+
return single.translation_text;
|
|
185
184
|
}
|
|
186
185
|
else if (this.params.model === "SmolLM3") {
|
|
187
186
|
const key = `SmolLM3:${this.params.src}-${this.params.dst}`;
|
|
@@ -200,13 +199,11 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
200
199
|
skip_special_tokens: true
|
|
201
200
|
})
|
|
202
201
|
});
|
|
203
|
-
const
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
const response = typeof generatedText === "string" ?
|
|
202
|
+
const single = Array.isArray(result) ? result[0] : result;
|
|
203
|
+
const generatedText = single.generated_text;
|
|
204
|
+
return typeof generatedText === "string" ?
|
|
207
205
|
generatedText :
|
|
208
206
|
generatedText.at(-1).content;
|
|
209
|
-
return response;
|
|
210
207
|
}
|
|
211
208
|
else
|
|
212
209
|
throw new Error("invalid model");
|
|
@@ -220,21 +217,19 @@ class SpeechFlowNodeTransformers extends speechflow_node_1.default {
|
|
|
220
217
|
transform(chunk, encoding, callback) {
|
|
221
218
|
if (Buffer.isBuffer(chunk.payload))
|
|
222
219
|
callback(new Error("invalid chunk payload type"));
|
|
220
|
+
else if (chunk.payload === "") {
|
|
221
|
+
this.push(chunk);
|
|
222
|
+
callback();
|
|
223
|
+
}
|
|
223
224
|
else {
|
|
224
|
-
|
|
225
|
+
translate(chunk.payload).then((payload) => {
|
|
226
|
+
chunk = chunk.clone();
|
|
227
|
+
chunk.payload = payload;
|
|
225
228
|
this.push(chunk);
|
|
226
229
|
callback();
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
chunk = chunk.clone();
|
|
231
|
-
chunk.payload = payload;
|
|
232
|
-
this.push(chunk);
|
|
233
|
-
callback();
|
|
234
|
-
}).catch((err) => {
|
|
235
|
-
callback(err);
|
|
236
|
-
});
|
|
237
|
-
}
|
|
230
|
+
}).catch((err) => {
|
|
231
|
+
callback(err);
|
|
232
|
+
});
|
|
238
233
|
}
|
|
239
234
|
},
|
|
240
235
|
final(callback) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speechflow-node-t2t-transformers.js","sourceRoot":"","sources":["../src/speechflow-node-t2t-transformers.ts"],"names":[],"mappings":";AAAA;;;;EAIE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,6BAA6B;AAC7B,0DAA8B;AAC9B,8DAAgC;AAEhC,6BAA6B;AAC7B,wEAAyD;AAEzD,6BAA6B;AAC7B,wEAAmE;AAMnE,iEAAiE;AACjE,MAAqB,0BAA2B,SAAQ,yBAAc;IAClE,kCAAkC;IAC3B,MAAM,CAAC,IAAI,GAAG,cAAc,CAAA;IAEnC,sBAAsB;IACd,UAAU,GAA+C,IAAI,CAAA;IAC7D,SAAS,GAAgD,IAAI,CAAA;IAErE,0BAA0B;IAClB,KAAK,GAAW;QACpB,wDAAwD;QACxD,eAAe,EAAE;YACb,YAAY,EACR,aAAa;gBACb,yBAAyB;gBACzB,mCAAmC;gBACnC,wBAAwB;gBACxB,gBAAgB;gBAChB,iCAAiC;gBACjC,iCAAiC;gBACjC,6BAA6B;gBAC7B,2BAA2B;gBAC3B,2BAA2B;gBAC3B,qBAAqB;gBACrB,oDAAoD;gBACpD,yFAAyF;YAC7F,IAAI,EAAE;gBACF,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"speechflow-node-t2t-transformers.js","sourceRoot":"","sources":["../src/speechflow-node-t2t-transformers.ts"],"names":[],"mappings":";AAAA;;;;EAIE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,6BAA6B;AAC7B,0DAA8B;AAC9B,8DAAgC;AAEhC,6BAA6B;AAC7B,wEAAyD;AAEzD,6BAA6B;AAC7B,wEAAmE;AAMnE,iEAAiE;AACjE,MAAqB,0BAA2B,SAAQ,yBAAc;IAClE,kCAAkC;IAC3B,MAAM,CAAC,IAAI,GAAG,cAAc,CAAA;IAEnC,sBAAsB;IACd,UAAU,GAA+C,IAAI,CAAA;IAC7D,SAAS,GAAgD,IAAI,CAAA;IAErE,0BAA0B;IAClB,KAAK,GAAW;QACpB,wDAAwD;QACxD,eAAe,EAAE;YACb,YAAY,EACR,aAAa;gBACb,yBAAyB;gBACzB,mCAAmC;gBACnC,wBAAwB;gBACxB,gBAAgB;gBAChB,iCAAiC;gBACjC,iCAAiC;gBACjC,6BAA6B;gBAC7B,2BAA2B;gBAC3B,2BAA2B;gBAC3B,qBAAqB;gBACrB,oDAAoD;gBACpD,yFAAyF;YAC7F,IAAI,EAAE;gBACF,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,iBAAiB,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,uBAAuB,EAAE;gBACvD,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,2BAA2B,EAAE;gBAC3D,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,6BAA6B,EAAE;gBAC7D,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,sBAAsB,EAAE;gBACtD,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kCAAkC,EAAE;aACrE;SACJ;QAED,wDAAwD;QACxD,eAAe,EAAE;YACb,YAAY,EACR,aAAa;gBACb,yBAAyB;gBACzB,mCAAmC;gBACnC,wBAAwB;gBACxB,gBAAgB;gBAChB,iCAAiC;gBACjC,iCAAiC;gBACjC,6BAA6B;gBAC7B,2BAA2B;gBAC3B,2BAA2B;gBAC3B,qBAAqB;gBACrB,oDAAoD;gBACpD,yFAAyF;YAC7F,IAAI,EAAE;gBACF,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,uBAAuB,EAAE;gBACvD,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE;gBACjD,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,6BAA6B,EAAE;gBAC7D,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,2BAA2B,EAAE;gBAC3D,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,kCAAkC,EAAE;gBAClE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,sBAAsB,EAAE;aACzD;SACJ;KACJ,CAAA;IAED,sBAAsB;IACtB,YAAa,EAAU,EAAE,GAA4B,EAAE,IAA6B,EAAE,IAAW;QAC7F,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAE1B,6CAA6C;QAC7C,IAAI,CAAC,SAAS,CAAC;YACX,GAAG,EAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE;YAClE,GAAG,EAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE;YAClE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE;SACtE,CAAC,CAAA;QAEF,+BAA+B;QAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,CAAC,GAAG;YACnC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;QAE1E,wCAAwC;QACxC,IAAI,CAAC,KAAK,GAAI,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,iBAAiB;IACjB,KAAK,CAAC,IAAI;QACN,IAAI,KAAK,GAAG,EAAE,CAAA;QAEd,gFAAgF;QAChF,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAA;QAC/C,MAAM,gBAAgB,GAAkC,CAAC,QAAa,EAAE,EAAE;YACtE,IAAI,QAAQ,GAAG,KAAK,CAAA;YACpB,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ;gBACjC,QAAQ,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAA;YACnC,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBACzE,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAA;iBACjD,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;gBAC1C,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAC/B,IAAI,OAAO,GAAG,CAAC;gBACX,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC5C,CAAC,CAAA;QACD,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAC9B,KAAK,MAAM,CAAE,QAAQ,EAAE,OAAO,CAAE,IAAI,aAAa,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,QAAQ,GAAG,CAAC,CAAA;gBAC/E,IAAI,OAAO,IAAI,KAAK;oBAChB,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACtC,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAA;QAER,iDAAiD;QACjD,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC/B,KAAK,GAAG,0BAA0B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;YACtE,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,EAAE;gBACzD,SAAS,EAAE,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAC1D,KAAK,EAAM,IAAI;gBACf,MAAM,EAAK,MAAM;gBACjB,iBAAiB,EAAE,gBAAgB;aACtC,CAAC,CAAA;YACF,IAAI,CAAC,UAAU,GAAG,MAAM,QAAQ,CAAA;YAChC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;gBACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QACpE,CAAC;aACI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACvC,KAAK,GAAG,+BAA+B,CAAA;YACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE;gBAC7D,SAAS,EAAE,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAC1D,KAAK,EAAM,IAAI;gBACf,MAAM,EAAK,MAAM;gBACjB,iBAAiB,EAAE,gBAAgB;aACtC,CAAC,CAAA;YACF,IAAI,CAAC,SAAS,GAAG,MAAM,QAAQ,CAAA;YAC/B,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI;gBACvB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QACnE,CAAC;;YAEG,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QAEpC,qCAAqC;QACrC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAEvB,wCAAwC;QACxC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAW,CAAC,IAAI,CAAC,CAAA;gBAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBACzD,OAAQ,MAAyC,CAAC,gBAAgB,CAAA;YACtE,CAAC;iBACI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,GAAG,GAAG,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;gBAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC3B,MAAM,QAAQ,GAAG;oBACb,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE;oBAC7C,GAAG,GAAG,CAAC,IAAI;oBACX,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;iBAClC,CAAA;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,EAAE;oBAC3C,cAAc,EAAE,GAAG;oBACnB,WAAW,EAAK,GAAG;oBACnB,KAAK,EAAW,IAAI;oBACpB,QAAQ,EAAE,IAAI,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,SAAU,CAAC,SAAS,EAAE;wBAC/D,WAAW,EAAU,IAAI;wBACzB,mBAAmB,EAAE,IAAI;qBAC5B,CAAC;iBACL,CAAC,CAAA;gBACF,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBACzD,MAAM,aAAa,GAAI,MAA4C,CAAC,cAAc,CAAA;gBAClF,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC;oBACtC,aAAa,CAAC,CAAC;oBACf,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAA;YACrC,CAAC;;gBAEG,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,gEAAgE;QAChE,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAM,CAAC,SAAS,CAAC;YAC/B,kBAAkB,EAAE,IAAI;YACxB,kBAAkB,EAAE,IAAI;YACxB,aAAa,EAAO,KAAK;YACzB,aAAa,EAAO,CAAC;YACrB,SAAS,CAAE,KAAsB,EAAE,QAAQ,EAAE,QAAQ;gBACjD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC9B,QAAQ,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAA;qBAChD,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;oBAC5B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAChB,QAAQ,EAAE,CAAA;gBACd,CAAC;qBACI,CAAC;oBACF,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;wBACtC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;wBACrB,KAAK,CAAC,OAAO,GAAG,OAAO,CAAA;wBACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;wBAChB,QAAQ,EAAE,CAAA;oBACd,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;wBACb,QAAQ,CAAC,GAAG,CAAC,CAAA;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC;YACL,CAAC;YACD,KAAK,CAAE,QAAQ;gBACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACf,QAAQ,EAAE,CAAA;YACd,CAAC;SACJ,CAAC,CAAA;IACN,CAAC;IAED,kBAAkB;IAClB,KAAK,CAAC,KAAK;QACP,oBAAoB;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;YACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QACtB,CAAC;QAED,6BAA6B;QAC7B,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;YACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;QAC1B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAA;YACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACzB,CAAC;IACL,CAAC;;AA9NL,6CA+NC"}
|
|
@@ -4,6 +4,39 @@
|
|
|
4
4
|
** Copyright (c) 2024-2025 Dr. Ralf S. Engelschall <rse@engelschall.com>
|
|
5
5
|
** Licensed under GPL 3.0 <https://spdx.org/licenses/GPL-3.0-only>
|
|
6
6
|
*/
|
|
7
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
8
|
+
if (k2 === undefined) k2 = k;
|
|
9
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
10
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
11
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
12
|
+
}
|
|
13
|
+
Object.defineProperty(o, k2, desc);
|
|
14
|
+
}) : (function(o, m, k, k2) {
|
|
15
|
+
if (k2 === undefined) k2 = k;
|
|
16
|
+
o[k2] = m[k];
|
|
17
|
+
}));
|
|
18
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
19
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
20
|
+
}) : function(o, v) {
|
|
21
|
+
o["default"] = v;
|
|
22
|
+
});
|
|
23
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
24
|
+
var ownKeys = function(o) {
|
|
25
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
26
|
+
var ar = [];
|
|
27
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
28
|
+
return ar;
|
|
29
|
+
};
|
|
30
|
+
return ownKeys(o);
|
|
31
|
+
};
|
|
32
|
+
return function (mod) {
|
|
33
|
+
if (mod && mod.__esModule) return mod;
|
|
34
|
+
var result = {};
|
|
35
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
36
|
+
__setModuleDefault(result, mod);
|
|
37
|
+
return result;
|
|
38
|
+
};
|
|
39
|
+
})();
|
|
7
40
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
41
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
42
|
};
|
|
@@ -12,10 +45,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
45
|
const node_stream_1 = __importDefault(require("node:stream"));
|
|
13
46
|
/* internal dependencies */
|
|
14
47
|
const speechflow_node_1 = __importDefault(require("./speechflow-node"));
|
|
48
|
+
const utils = __importStar(require("./speechflow-utils"));
|
|
15
49
|
/* SpeechFlow node for data flow filtering (based on meta information) */
|
|
16
50
|
class SpeechFlowNodeFilter extends speechflow_node_1.default {
|
|
17
51
|
/* declare official node name */
|
|
18
52
|
static name = "filter";
|
|
53
|
+
/* cached regular expression instance */
|
|
54
|
+
cachedRegExp = new utils.CachedRegExp();
|
|
19
55
|
/* construct node */
|
|
20
56
|
constructor(id, cfg, opts, args) {
|
|
21
57
|
super(id, cfg, opts, args);
|
|
@@ -47,27 +83,26 @@ class SpeechFlowNodeFilter extends speechflow_node_1.default {
|
|
|
47
83
|
const regexp = (val2 instanceof RegExp ?
|
|
48
84
|
val2 :
|
|
49
85
|
typeof val2 === "string" ?
|
|
50
|
-
|
|
51
|
-
|
|
86
|
+
this.cachedRegExp.compile(val2) :
|
|
87
|
+
this.cachedRegExp.compile(val2.toString()));
|
|
88
|
+
if (regexp === null) {
|
|
89
|
+
/* fallback to literal string comparison on invalid regex */
|
|
90
|
+
this.log("warning", `invalid regular expression: "${val2}"`);
|
|
91
|
+
return (op === "~~" ? (str === val2) : (str !== val2));
|
|
92
|
+
}
|
|
52
93
|
return (op === "~~" ? regexp.test(str) : !regexp.test(str));
|
|
53
94
|
}
|
|
54
95
|
else {
|
|
55
96
|
/* non-equal comparison */
|
|
56
|
-
const coerceNum = (val) =>
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
Number(val)));
|
|
60
|
-
};
|
|
97
|
+
const coerceNum = (val) => typeof val === "number" ? val : (typeof val === "string" && val.match(/^[\d+-]+$/) ? Number.parseInt(val, 10) : (typeof val === "string" && val.match(/^[\d.+-]+$/) ?
|
|
98
|
+
Number.parseFloat(val) :
|
|
99
|
+
Number(val)));
|
|
61
100
|
const num1 = coerceNum(val1);
|
|
62
101
|
const num2 = coerceNum(val2);
|
|
63
|
-
return (op === "<" ?
|
|
64
|
-
(num1
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
op === ">=" ?
|
|
68
|
-
(num1 >= num2) :
|
|
69
|
-
op === ">" ?
|
|
70
|
-
(num1 > num2) :
|
|
102
|
+
return (op === "<" ? (num1 < num2) :
|
|
103
|
+
op === "<=" ? (num1 <= num2) :
|
|
104
|
+
op === ">=" ? (num1 >= num2) :
|
|
105
|
+
op === ">" ? (num1 > num2) :
|
|
71
106
|
false);
|
|
72
107
|
}
|
|
73
108
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speechflow-node-x2x-filter.js","sourceRoot":"","sources":["../src/speechflow-node-x2x-filter.ts"],"names":[],"mappings":";AAAA;;;;EAIE
|
|
1
|
+
{"version":3,"file":"speechflow-node-x2x-filter.js","sourceRoot":"","sources":["../src/speechflow-node-x2x-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,20 @@ class SpeechFlowNodeTrace extends speechflow_node_1.default {
|
|
|
41
41
|
else
|
|
42
42
|
this.log(level, msg);
|
|
43
43
|
};
|
|
44
|
+
/* helper functions for formatting */
|
|
45
|
+
const fmtTime = (t) => t.toFormat("hh:mm:ss.SSS");
|
|
46
|
+
const fmtMeta = (meta) => {
|
|
47
|
+
if (meta.size === 0)
|
|
48
|
+
return "none";
|
|
49
|
+
else
|
|
50
|
+
return `{ ${Array.from(meta.entries())
|
|
51
|
+
.map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
|
|
52
|
+
.join(", ")} }`;
|
|
53
|
+
};
|
|
54
|
+
const fmtChunkBase = (chunk) => `chunk: type=${chunk.type} ` +
|
|
55
|
+
`kind=${chunk.kind} ` +
|
|
56
|
+
`start=${fmtTime(chunk.timestampStart)} ` +
|
|
57
|
+
`end=${fmtTime(chunk.timestampEnd)} `;
|
|
44
58
|
/* provide Transform stream */
|
|
45
59
|
const self = this;
|
|
46
60
|
this.stream = new node_stream_1.default.Transform({
|
|
@@ -50,21 +64,9 @@ class SpeechFlowNodeTrace extends speechflow_node_1.default {
|
|
|
50
64
|
highWaterMark: 1,
|
|
51
65
|
transform(chunk, encoding, callback) {
|
|
52
66
|
let error;
|
|
53
|
-
const fmtTime = (t) => t.toFormat("hh:mm:ss.SSS");
|
|
54
|
-
const fmtMeta = (meta) => {
|
|
55
|
-
if (meta.size === 0)
|
|
56
|
-
return "none";
|
|
57
|
-
else
|
|
58
|
-
return `{ ${Array.from(meta.entries())
|
|
59
|
-
.map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
|
|
60
|
-
.join(", ")} }`;
|
|
61
|
-
};
|
|
62
67
|
if (Buffer.isBuffer(chunk.payload)) {
|
|
63
68
|
if (self.params.type === "audio")
|
|
64
|
-
log("debug",
|
|
65
|
-
`kind=${chunk.kind} ` +
|
|
66
|
-
`start=${fmtTime(chunk.timestampStart)} ` +
|
|
67
|
-
`end=${fmtTime(chunk.timestampEnd)} ` +
|
|
69
|
+
log("debug", fmtChunkBase(chunk) +
|
|
68
70
|
`payload-type=Buffer payload-length=${chunk.payload.byteLength} ` +
|
|
69
71
|
`meta=${fmtMeta(chunk.meta)}`);
|
|
70
72
|
else
|
|
@@ -72,15 +74,12 @@ class SpeechFlowNodeTrace extends speechflow_node_1.default {
|
|
|
72
74
|
}
|
|
73
75
|
else {
|
|
74
76
|
if (self.params.type === "text") {
|
|
75
|
-
log("debug",
|
|
76
|
-
`kind=${chunk.kind} ` +
|
|
77
|
-
`start=${fmtTime(chunk.timestampStart)} ` +
|
|
78
|
-
`end=${fmtTime(chunk.timestampEnd)} ` +
|
|
77
|
+
log("debug", fmtChunkBase(chunk) +
|
|
79
78
|
`payload-type=String payload-length=${chunk.payload.length} ` +
|
|
80
79
|
`payload-content="${chunk.payload.toString()}" ` +
|
|
81
80
|
`meta=${fmtMeta(chunk.meta)}`);
|
|
82
81
|
if (self.params.dashboard !== "")
|
|
83
|
-
self.
|
|
82
|
+
self.sendDashboard("text", self.params.dashboard, chunk.kind, chunk.payload.toString());
|
|
84
83
|
}
|
|
85
84
|
else
|
|
86
85
|
error = new Error(`${self.params.type} chunk: seen String instead of Buffer chunk type`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speechflow-node-x2x-trace.js","sourceRoot":"","sources":["../src/speechflow-node-x2x-trace.ts"],"names":[],"mappings":";AAAA;;;;EAIE;;;;;AAEF,6BAA6B;AAC7B,8DAAgC;AAKhC,6BAA6B;AAC7B,wEAAmE;AAEnE,6CAA6C;AAC7C,MAAqB,mBAAoB,SAAQ,yBAAc;IAC3D,kCAAkC;IAC3B,MAAM,CAAC,IAAI,GAAG,OAAO,CAAA;IAE5B,sBAAsB;IACtB,YAAa,EAAU,EAAE,GAA4B,EAAE,IAA6B,EAAE,IAAW;QAC7F,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAE1B,6CAA6C;QAC7C,IAAI,CAAC,SAAS,CAAC;YACX,IAAI,EAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE;YAC9E,IAAI,EAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE;YACnD,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAU,GAAG,EAAE,EAAE,EAAE;SACjD,CAAC,CAAA;QAEF,+BAA+B;QAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO;YAC5D,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;QAEhF,wCAAwC;QACxC,IAAI,CAAC,KAAK,GAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAClC,CAAC;IAED,iBAAiB;IACjB,KAAK,CAAC,IAAI;QACN,iCAAiC;QACjC,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;YACvC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;gBAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAA;;gBAEhD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC5B,CAAC,CAAA;QAED,
|
|
1
|
+
{"version":3,"file":"speechflow-node-x2x-trace.js","sourceRoot":"","sources":["../src/speechflow-node-x2x-trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,15 +93,13 @@ class SpeechFlowNodeDevice extends speechflow_node_1.default {
|
|
|
93
93
|
const devices = naudiodon_1.default.getDevices();
|
|
94
94
|
for (const device of devices)
|
|
95
95
|
this.log("info", `found audio device "${device.name}" ` +
|
|
96
|
-
`(inputs: ${device.maxInputChannels}, outputs: ${device.maxOutputChannels}`);
|
|
97
|
-
const device = devices.find((device) =>
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
&& device.hostAPIName === api.name);
|
|
104
|
-
});
|
|
96
|
+
`(inputs: ${device.maxInputChannels}, outputs: ${device.maxOutputChannels})`);
|
|
97
|
+
const device = devices.find((device) => (((mode === "r" && device.maxInputChannels > 0)
|
|
98
|
+
|| (mode === "w" && device.maxOutputChannels > 0)
|
|
99
|
+
|| (mode === "rw" && device.maxInputChannels > 0 && device.maxOutputChannels > 0)
|
|
100
|
+
|| (mode === "any" && (device.maxInputChannels > 0 || device.maxOutputChannels > 0)))
|
|
101
|
+
&& device.name.match(name)
|
|
102
|
+
&& device.hostAPIName === api.name));
|
|
105
103
|
if (!device)
|
|
106
104
|
throw new Error(`invalid audio device "${name}" (of audio API type "${type}")`);
|
|
107
105
|
return device;
|
|
@@ -206,20 +204,14 @@ class SpeechFlowNodeDevice extends speechflow_node_1.default {
|
|
|
206
204
|
async close() {
|
|
207
205
|
/* shutdown PortAudio */
|
|
208
206
|
if (this.io !== null) {
|
|
209
|
-
await new Promise((resolve
|
|
210
|
-
this.io.abort((
|
|
211
|
-
|
|
212
|
-
reject(err);
|
|
213
|
-
else
|
|
214
|
-
resolve();
|
|
207
|
+
await new Promise((resolve) => {
|
|
208
|
+
this.io.abort(() => {
|
|
209
|
+
resolve();
|
|
215
210
|
});
|
|
216
211
|
});
|
|
217
|
-
await new Promise((resolve
|
|
218
|
-
this.io.quit((
|
|
219
|
-
|
|
220
|
-
reject(err);
|
|
221
|
-
else
|
|
222
|
-
resolve();
|
|
212
|
+
await new Promise((resolve) => {
|
|
213
|
+
this.io.quit(() => {
|
|
214
|
+
resolve();
|
|
223
215
|
});
|
|
224
216
|
});
|
|
225
217
|
this.io = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speechflow-node-xio-device.js","sourceRoot":"","sources":["../src/speechflow-node-xio-device.ts"],"names":[],"mappings":";AAAA;;;;EAIE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,6BAA6B;AAC7B,8DAA0C;AAE1C,6BAA6B;AAC7B,iEAA+C;AAE/C,6BAA6B;AAC7B,wEAAgD;AAChD,0DAAiD;AAEjD,yCAAyC;AACzC,MAAqB,oBAAqB,SAAQ,yBAAc;IAC5D,kCAAkC;IAC3B,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAA;IAE7B,sBAAsB;IACd,EAAE,GAGG,IAAI,CAAA;IAEjB,sBAAsB;IACtB,YAAa,EAAU,EAAE,GAA4B,EAAE,IAA6B,EAAE,IAAW;QAC7F,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAE1B,6CAA6C;QAC7C,IAAI,CAAC,SAAS,CAAC;YACX,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAI,KAAK,EAAE,cAAc,EAAE;YACpE,IAAI,EAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE;YACpE,KAAK,EAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAG,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;SAC5F,CAAC,CAAA;QAEF,wCAAwC;QACxC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,GAAI,OAAO,CAAA;YACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;QACzB,CAAC;aACI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,GAAI,MAAM,CAAA;YACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;QACzB,CAAC;aACI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,GAAI,OAAO,CAAA;YACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACxB,CAAC;IACL,CAAC;IAED,kFAAkF;IAC1E,kBAAkB,CAAE,IAA8B,EAAE,GAAW;QACnE,iBAAiB;QACjB,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACnC,IAAI,CAAC,KAAK,IAAI;YACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,GAAG,CAAC,CAAA;QACxD,MAAM,CAAE,AAAD,EAAG,IAAI,EAAE,IAAI,CAAE,GAAG,CAAC,CAAA;QAE1B,2BAA2B;QAC3B,MAAM,IAAI,GAAG,mBAAS,CAAC,WAAW,EAAE,CAAA;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QACtF,IAAI,CAAC,GAAG;YACJ,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,GAAG,CAAC,CAAA;QAEvD,qCAAqC;QACrC,MAAM,OAAO,GAAG,mBAAS,CAAC,UAAU,EAAE,CAAA;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO;YACxB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,MAAM,CAAC,IAAI,IAAI;gBACnD,YAAY,MAAM,CAAC,gBAAgB,cAAc,MAAM,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"speechflow-node-xio-device.js","sourceRoot":"","sources":["../src/speechflow-node-xio-device.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ class SpeechFlowNodeMQTT extends speechflow_node_1.default {
|
|
|
56
56
|
/* internal state */
|
|
57
57
|
broker = null;
|
|
58
58
|
clientId = (new pure_uuid_1.default(1)).format();
|
|
59
|
+
chunkQueue = null;
|
|
59
60
|
/* construct node */
|
|
60
61
|
constructor(id, cfg, opts, args) {
|
|
61
62
|
super(id, cfg, opts, args);
|
|
@@ -92,6 +93,10 @@ class SpeechFlowNodeMQTT extends speechflow_node_1.default {
|
|
|
92
93
|
throw new Error("writing to MQTT requires a topicWrite parameter");
|
|
93
94
|
if ((this.params.mode === "r" || this.params.mode === "rw") && this.params.topicRead === "")
|
|
94
95
|
throw new Error("reading from MQTT requires a topicRead parameter");
|
|
96
|
+
if (this.params.username !== "" && this.params.password === "")
|
|
97
|
+
throw new Error("username provided but password is missing");
|
|
98
|
+
if (this.params.username === "" && this.params.password !== "")
|
|
99
|
+
throw new Error("password provided but username is missing");
|
|
95
100
|
/* connect remotely to a MQTT broker */
|
|
96
101
|
this.broker = mqtt_1.default.connect(this.params.url, {
|
|
97
102
|
protocolId: "MQTT",
|
|
@@ -113,7 +118,7 @@ class SpeechFlowNodeMQTT extends speechflow_node_1.default {
|
|
|
113
118
|
if (this.params.mode !== "w" && !packet.sessionPresent)
|
|
114
119
|
this.broker.subscribe([this.params.topicRead], (err) => {
|
|
115
120
|
if (err)
|
|
116
|
-
this.log("
|
|
121
|
+
this.log("warning", `failed to subscribe to MQTT topic "${this.params.topicRead}": ${err.message}`);
|
|
117
122
|
});
|
|
118
123
|
});
|
|
119
124
|
this.broker.on("reconnect", () => {
|
|
@@ -122,55 +127,56 @@ class SpeechFlowNodeMQTT extends speechflow_node_1.default {
|
|
|
122
127
|
this.broker.on("disconnect", (packet) => {
|
|
123
128
|
this.log("info", `connection closed to MQTT ${this.params.url}`);
|
|
124
129
|
});
|
|
125
|
-
|
|
130
|
+
this.chunkQueue = new utils.SingleQueue();
|
|
126
131
|
this.broker.on("message", (topic, payload, packet) => {
|
|
127
|
-
if (topic !== this.params.topicRead)
|
|
132
|
+
if (topic !== this.params.topicRead || this.params.mode === "w")
|
|
128
133
|
return;
|
|
129
134
|
try {
|
|
130
135
|
const chunk = utils.streamChunkDecode(payload);
|
|
131
|
-
chunkQueue.write(chunk);
|
|
136
|
+
this.chunkQueue.write(chunk);
|
|
132
137
|
}
|
|
133
138
|
catch (_err) {
|
|
134
139
|
this.log("warning", `received invalid CBOR chunk from MQTT ${this.params.url}`);
|
|
135
140
|
}
|
|
136
141
|
});
|
|
137
|
-
const
|
|
138
|
-
const topicWrite = this.params.topicWrite;
|
|
139
|
-
const type = this.params.type;
|
|
140
|
-
const mode = this.params.mode;
|
|
142
|
+
const self = this;
|
|
141
143
|
this.stream = new node_stream_1.default.Duplex({
|
|
142
144
|
writableObjectMode: true,
|
|
143
145
|
readableObjectMode: true,
|
|
144
146
|
decodeStrings: false,
|
|
145
147
|
highWaterMark: 1,
|
|
146
148
|
write(chunk, encoding, callback) {
|
|
147
|
-
if (mode === "r")
|
|
149
|
+
if (self.params.mode === "r")
|
|
148
150
|
callback(new Error("write operation on read-only node"));
|
|
149
|
-
else if (chunk.type !== type)
|
|
150
|
-
callback(new Error(`written chunk is not of ${type} type`));
|
|
151
|
-
else if (!broker.connected)
|
|
151
|
+
else if (chunk.type !== self.params.type)
|
|
152
|
+
callback(new Error(`written chunk is not of ${self.params.type} type`));
|
|
153
|
+
else if (!self.broker.connected)
|
|
152
154
|
callback(new Error("still no MQTT connection available"));
|
|
153
155
|
else {
|
|
154
156
|
const data = Buffer.from(utils.streamChunkEncode(chunk));
|
|
155
|
-
broker.publish(topicWrite, data, { qos: 2, retain: false }, (err) => {
|
|
157
|
+
self.broker.publish(self.params.topicWrite, data, { qos: 2, retain: false }, (err) => {
|
|
156
158
|
if (err)
|
|
157
|
-
callback(new Error(`failed to publish to MQTT topic "${topicWrite}": ${err}`));
|
|
159
|
+
callback(new Error(`failed to publish to MQTT topic "${self.params.topicWrite}": ${err}`));
|
|
158
160
|
else
|
|
159
161
|
callback();
|
|
160
162
|
});
|
|
161
163
|
}
|
|
162
164
|
},
|
|
163
165
|
read(size) {
|
|
164
|
-
if (mode === "w")
|
|
166
|
+
if (self.params.mode === "w")
|
|
165
167
|
throw new Error("read operation on write-only node");
|
|
166
|
-
chunkQueue.read().then((chunk) => {
|
|
168
|
+
self.chunkQueue.read().then((chunk) => {
|
|
167
169
|
this.push(chunk, "binary");
|
|
170
|
+
}).catch((err) => {
|
|
171
|
+
self.log("warning", `read on chunk queue operation failed: ${err}`);
|
|
168
172
|
});
|
|
169
173
|
}
|
|
170
174
|
});
|
|
171
175
|
}
|
|
172
176
|
/* close node */
|
|
173
177
|
async close() {
|
|
178
|
+
/* clear chunk queue reference */
|
|
179
|
+
this.chunkQueue = null;
|
|
174
180
|
/* close MQTT broker */
|
|
175
181
|
if (this.broker !== null) {
|
|
176
182
|
if (this.broker.connected)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speechflow-node-xio-mqtt.js","sourceRoot":"","sources":["../src/speechflow-node-xio-mqtt.ts"],"names":[],"mappings":";AAAA;;;;EAIE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,6BAA6B;AAC7B,8DAAgC;AAEhC,6BAA6B;AAC7B,gDAAyB;AACzB,0DAA8B;AAE9B,6BAA6B;AAC7B,wEAAmE;AACnE,0DAAoE;AAEpE,2CAA2C;AAC3C,MAAqB,kBAAmB,SAAQ,yBAAc;IAC1D,kCAAkC;IAC3B,MAAM,CAAC,IAAI,GAAG,MAAM,CAAA;IAE3B,sBAAsB;IACd,MAAM,GAA2B,IAAI,CAAA;IACrC,QAAQ,GAAW,CAAC,IAAI,mBAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"speechflow-node-xio-mqtt.js","sourceRoot":"","sources":["../src/speechflow-node-xio-mqtt.ts"],"names":[],"mappings":"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"}
|