@cogitator-ai/channels 0.2.5 → 0.4.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/README.md +142 -40
- package/dist/assistant-config.d.ts +1 -0
- package/dist/assistant-config.d.ts.map +1 -1
- package/dist/assistant-config.js +1 -0
- package/dist/assistant-config.js.map +1 -1
- package/dist/channels/discord.d.ts +4 -0
- package/dist/channels/discord.d.ts.map +1 -1
- package/dist/channels/discord.js +123 -59
- package/dist/channels/discord.js.map +1 -1
- package/dist/channels/slack.d.ts +9 -0
- package/dist/channels/slack.d.ts.map +1 -1
- package/dist/channels/slack.js +153 -34
- package/dist/channels/slack.js.map +1 -1
- package/dist/channels/telegram.d.ts +13 -0
- package/dist/channels/telegram.d.ts.map +1 -1
- package/dist/channels/telegram.js +206 -111
- package/dist/channels/telegram.js.map +1 -1
- package/dist/channels/terminal.d.ts +10 -0
- package/dist/channels/terminal.d.ts.map +1 -1
- package/dist/channels/terminal.js +46 -10
- package/dist/channels/terminal.js.map +1 -1
- package/dist/channels/webchat.d.ts +7 -2
- package/dist/channels/webchat.d.ts.map +1 -1
- package/dist/channels/webchat.js +112 -50
- package/dist/channels/webchat.js.map +1 -1
- package/dist/channels/whatsapp.d.ts +19 -3
- package/dist/channels/whatsapp.d.ts.map +1 -1
- package/dist/channels/whatsapp.js +204 -66
- package/dist/channels/whatsapp.js.map +1 -1
- package/dist/cron.d.ts +2 -0
- package/dist/cron.d.ts.map +1 -0
- package/dist/cron.js +9 -0
- package/dist/cron.js.map +1 -0
- package/dist/envelope.d.ts.map +1 -1
- package/dist/envelope.js +7 -6
- package/dist/envelope.js.map +1 -1
- package/dist/formatters/code-protect.d.ts +2 -0
- package/dist/formatters/code-protect.d.ts.map +1 -0
- package/dist/formatters/code-protect.js +12 -0
- package/dist/formatters/code-protect.js.map +1 -0
- package/dist/formatters/markdown.d.ts +1 -1
- package/dist/formatters/markdown.d.ts.map +1 -1
- package/dist/formatters/markdown.js +79 -21
- package/dist/formatters/markdown.js.map +1 -1
- package/dist/formatters/whatsapp-markdown.d.ts.map +1 -1
- package/dist/formatters/whatsapp-markdown.js +7 -21
- package/dist/formatters/whatsapp-markdown.js.map +1 -1
- package/dist/gateway.d.ts +32 -3
- package/dist/gateway.d.ts.map +1 -1
- package/dist/gateway.js +275 -174
- package/dist/gateway.js.map +1 -1
- package/dist/heartbeat.d.ts +9 -2
- package/dist/heartbeat.d.ts.map +1 -1
- package/dist/heartbeat.js +121 -84
- package/dist/heartbeat.js.map +1 -1
- package/dist/inbound-debounce.js +2 -2
- package/dist/inbound-debounce.js.map +1 -1
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/media/audio-format.d.ts +3 -0
- package/dist/media/audio-format.d.ts.map +1 -0
- package/dist/media/audio-format.js +20 -0
- package/dist/media/audio-format.js.map +1 -0
- package/dist/media/deepgram-stt.d.ts +1 -1
- package/dist/media/deepgram-stt.d.ts.map +1 -1
- package/dist/media/deepgram-stt.js +4 -3
- package/dist/media/deepgram-stt.js.map +1 -1
- package/dist/media/media-processor.d.ts +12 -1
- package/dist/media/media-processor.d.ts.map +1 -1
- package/dist/media/media-processor.js +75 -18
- package/dist/media/media-processor.js.map +1 -1
- package/dist/media/whisper-api.d.ts.map +1 -1
- package/dist/media/whisper-api.js +21 -33
- package/dist/media/whisper-api.js.map +1 -1
- package/dist/media/whisper-local.d.ts +1 -0
- package/dist/media/whisper-local.d.ts.map +1 -1
- package/dist/media/whisper-local.js +106 -50
- package/dist/media/whisper-local.js.map +1 -1
- package/dist/message-queue.d.ts +1 -0
- package/dist/message-queue.d.ts.map +1 -1
- package/dist/message-queue.js +17 -10
- package/dist/message-queue.js.map +1 -1
- package/dist/middleware/auto-extract.d.ts +2 -0
- package/dist/middleware/auto-extract.d.ts.map +1 -1
- package/dist/middleware/auto-extract.js +94 -30
- package/dist/middleware/auto-extract.js.map +1 -1
- package/dist/middleware/dm-policy.d.ts +2 -1
- package/dist/middleware/dm-policy.d.ts.map +1 -1
- package/dist/middleware/dm-policy.js +26 -27
- package/dist/middleware/dm-policy.js.map +1 -1
- package/dist/middleware/owner-commands.d.ts +1 -1
- package/dist/middleware/owner-commands.d.ts.map +1 -1
- package/dist/middleware/owner-commands.js +8 -7
- package/dist/middleware/owner-commands.js.map +1 -1
- package/dist/middleware/pairing-codes.d.ts +12 -0
- package/dist/middleware/pairing-codes.d.ts.map +1 -0
- package/dist/middleware/pairing-codes.js +26 -0
- package/dist/middleware/pairing-codes.js.map +1 -0
- package/dist/middleware/pairing.d.ts +3 -3
- package/dist/middleware/pairing.d.ts.map +1 -1
- package/dist/middleware/pairing.js +18 -25
- package/dist/middleware/pairing.js.map +1 -1
- package/dist/middleware/rate-limit.d.ts +3 -1
- package/dist/middleware/rate-limit.d.ts.map +1 -1
- package/dist/middleware/rate-limit.js +21 -6
- package/dist/middleware/rate-limit.js.map +1 -1
- package/dist/runtime-builder.d.ts +11 -0
- package/dist/runtime-builder.d.ts.map +1 -1
- package/dist/runtime-builder.js +212 -62
- package/dist/runtime-builder.js.map +1 -1
- package/dist/simple-timer-store.d.ts +6 -0
- package/dist/simple-timer-store.d.ts.map +1 -1
- package/dist/simple-timer-store.js +8 -1
- package/dist/simple-timer-store.js.map +1 -1
- package/dist/stream-buffer.d.ts +14 -7
- package/dist/stream-buffer.d.ts.map +1 -1
- package/dist/stream-buffer.js +129 -84
- package/dist/stream-buffer.js.map +1 -1
- package/dist/tools/path-guard.d.ts +4 -0
- package/dist/tools/path-guard.d.ts.map +1 -0
- package/dist/tools/path-guard.js +53 -0
- package/dist/tools/path-guard.js.map +1 -0
- package/dist/tools/self-config.d.ts +12 -2
- package/dist/tools/self-config.d.ts.map +1 -1
- package/dist/tools/self-config.js +53 -16
- package/dist/tools/self-config.js.map +1 -1
- package/package.json +27 -21
- package/dist/media/index.d.ts +0 -7
- package/dist/media/index.d.ts.map +0 -1
- package/dist/media/index.js +0 -5
- package/dist/media/index.js.map +0 -1
|
@@ -8,12 +8,23 @@ export interface MediaProcessResult {
|
|
|
8
8
|
transcribedText: string | null;
|
|
9
9
|
systemNotes: string[];
|
|
10
10
|
}
|
|
11
|
+
export interface MediaProcessorOptions {
|
|
12
|
+
/** Maximum number of characters inlined from a text file attachment. Default: 20000. */
|
|
13
|
+
maxInlineTextChars?: number;
|
|
14
|
+
/** Maximum attachment size fetched from a URL, in bytes. Default: 25 MiB. */
|
|
15
|
+
maxDownloadBytes?: number;
|
|
16
|
+
}
|
|
11
17
|
export declare class MediaProcessor {
|
|
12
18
|
private whisper;
|
|
13
19
|
private checkVision;
|
|
14
20
|
private sttProvider?;
|
|
15
|
-
|
|
21
|
+
private readonly maxInlineTextChars;
|
|
22
|
+
private readonly maxDownloadBytes;
|
|
23
|
+
constructor(whisper: LocalWhisper | null, checkVision: (modelId: string) => boolean, sttProvider?: (SttProvider | null) | undefined, options?: MediaProcessorOptions);
|
|
16
24
|
process(attachments: Attachment[], modelId: string): Promise<MediaProcessResult>;
|
|
25
|
+
private isTextFile;
|
|
26
|
+
private processFile;
|
|
27
|
+
private loadBuffer;
|
|
17
28
|
private transcribeAudio;
|
|
18
29
|
private normalizeImageMime;
|
|
19
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-processor.d.ts","sourceRoot":"","sources":["../../src/media/media-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"media-processor.d.ts","sourceRoot":"","sources":["../../src/media/media-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,wFAAwF;IACxF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,6EAA6E;IAC7E,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAaD,qBAAa,cAAc;IAKvB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW,CAAC;IANtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;gBAGhC,OAAO,EAAE,YAAY,GAAG,IAAI,EAC5B,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,WAAW,CAAC,GAAE,WAAW,GAAG,IAAI,aAAA,EACxC,OAAO,GAAE,qBAA0B;IAM/B,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiDtF,OAAO,CAAC,UAAU;YAKJ,WAAW;YAmBX,UAAU;YAwBV,eAAe;IAqC7B,OAAO,CAAC,kBAAkB;CAK3B"}
|
|
@@ -1,27 +1,34 @@
|
|
|
1
|
+
import { baseMimeType } from './audio-format.js';
|
|
2
|
+
const TEXT_MIME_RE = /^(text\/|application\/(json|xml|yaml|x-yaml|toml|javascript|typescript|x-sh|csv|sql|markdown))/;
|
|
3
|
+
const TEXT_EXT_RE = /\.(txt|md|markdown|json|ya?ml|toml|csv|tsv|xml|html?|css|js|mjs|cjs|ts|tsx|jsx|py|rb|go|rs|java|kt|c|h|cpp|hpp|cs|sh|sql|log|ini|env)$/i;
|
|
4
|
+
function attachmentLabel(att) {
|
|
5
|
+
return att.filename ? `"${att.filename}" (${att.mimeType})` : att.mimeType;
|
|
6
|
+
}
|
|
1
7
|
export class MediaProcessor {
|
|
2
8
|
whisper;
|
|
3
9
|
checkVision;
|
|
4
10
|
sttProvider;
|
|
5
|
-
|
|
11
|
+
maxInlineTextChars;
|
|
12
|
+
maxDownloadBytes;
|
|
13
|
+
constructor(whisper, checkVision, sttProvider, options = {}) {
|
|
6
14
|
this.whisper = whisper;
|
|
7
15
|
this.checkVision = checkVision;
|
|
8
16
|
this.sttProvider = sttProvider;
|
|
17
|
+
this.maxInlineTextChars = options.maxInlineTextChars ?? 20_000;
|
|
18
|
+
this.maxDownloadBytes = options.maxDownloadBytes ?? 25 * 1024 * 1024;
|
|
9
19
|
}
|
|
10
20
|
async process(attachments, modelId) {
|
|
11
21
|
const images = [];
|
|
12
|
-
|
|
22
|
+
const transcripts = [];
|
|
13
23
|
const systemNotes = [];
|
|
14
24
|
const imageAttachments = attachments.filter((a) => a.type === 'image');
|
|
15
|
-
const audioAttachments = attachments.filter((a) => a.type === 'audio');
|
|
16
25
|
if (imageAttachments.length > 0) {
|
|
17
|
-
|
|
18
|
-
if (hasVision) {
|
|
26
|
+
if (this.checkVision(modelId)) {
|
|
19
27
|
for (const att of imageAttachments) {
|
|
20
28
|
if (att.buffer) {
|
|
21
|
-
const mimeType = this.normalizeImageMime(att.mimeType);
|
|
22
29
|
images.push({
|
|
23
30
|
data: Buffer.from(att.buffer).toString('base64'),
|
|
24
|
-
mimeType,
|
|
31
|
+
mimeType: this.normalizeImageMime(att.mimeType),
|
|
25
32
|
});
|
|
26
33
|
}
|
|
27
34
|
else if (att.url) {
|
|
@@ -33,13 +40,66 @@ export class MediaProcessor {
|
|
|
33
40
|
systemNotes.push('[System: the user sent an image but your model does not support image recognition. Let them know politely.]');
|
|
34
41
|
}
|
|
35
42
|
}
|
|
36
|
-
|
|
37
|
-
const
|
|
38
|
-
if (
|
|
39
|
-
|
|
43
|
+
for (const att of attachments.filter((a) => a.type === 'audio')) {
|
|
44
|
+
const buffer = await this.loadBuffer(att, systemNotes);
|
|
45
|
+
if (!buffer)
|
|
46
|
+
continue;
|
|
47
|
+
const text = await this.transcribeAudio(buffer, baseMimeType(att.mimeType), systemNotes);
|
|
48
|
+
if (text)
|
|
49
|
+
transcripts.push(text);
|
|
50
|
+
}
|
|
51
|
+
for (const att of attachments.filter((a) => a.type === 'video')) {
|
|
52
|
+
systemNotes.push(`[System: the user sent a video ${attachmentLabel(att)}. Video content cannot be analyzed directly.]`);
|
|
53
|
+
}
|
|
54
|
+
for (const att of attachments.filter((a) => a.type === 'file')) {
|
|
55
|
+
await this.processFile(att, systemNotes);
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
images,
|
|
59
|
+
transcribedText: transcripts.length > 0 ? transcripts.join('\n') : null,
|
|
60
|
+
systemNotes,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
isTextFile(att) {
|
|
64
|
+
const mime = baseMimeType(att.mimeType);
|
|
65
|
+
return TEXT_MIME_RE.test(mime) || (!!att.filename && TEXT_EXT_RE.test(att.filename));
|
|
66
|
+
}
|
|
67
|
+
async processFile(att, systemNotes) {
|
|
68
|
+
if (!this.isTextFile(att)) {
|
|
69
|
+
systemNotes.push(`[System: the user attached a file ${attachmentLabel(att)} that cannot be read directly.]`);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const buffer = await this.loadBuffer(att, systemNotes);
|
|
73
|
+
if (!buffer)
|
|
74
|
+
return;
|
|
75
|
+
const content = buffer.toString('utf-8');
|
|
76
|
+
const truncated = content.length > this.maxInlineTextChars;
|
|
77
|
+
const body = truncated ? content.slice(0, this.maxInlineTextChars) : content;
|
|
78
|
+
systemNotes.push(`[System: the user attached a file ${attachmentLabel(att)}${truncated ? ', truncated' : ''}. Contents:]\n${body}`);
|
|
79
|
+
}
|
|
80
|
+
async loadBuffer(att, systemNotes) {
|
|
81
|
+
if (att.buffer)
|
|
82
|
+
return Buffer.from(att.buffer);
|
|
83
|
+
if (!att.url)
|
|
84
|
+
return null;
|
|
85
|
+
try {
|
|
86
|
+
const res = await fetch(att.url);
|
|
87
|
+
if (!res.ok)
|
|
88
|
+
throw new Error(`HTTP ${res.status}`);
|
|
89
|
+
const declared = Number(res.headers.get('content-length') ?? 0);
|
|
90
|
+
if (declared > this.maxDownloadBytes) {
|
|
91
|
+
throw new Error(`attachment exceeds ${this.maxDownloadBytes} bytes`);
|
|
40
92
|
}
|
|
93
|
+
const buffer = Buffer.from(await res.arrayBuffer());
|
|
94
|
+
if (buffer.byteLength > this.maxDownloadBytes) {
|
|
95
|
+
throw new Error(`attachment exceeds ${this.maxDownloadBytes} bytes`);
|
|
96
|
+
}
|
|
97
|
+
return buffer;
|
|
98
|
+
}
|
|
99
|
+
catch (err) {
|
|
100
|
+
systemNotes.push(`[System: the user sent ${attachmentLabel(att)} but it could not be downloaded: ${err.message}.]`);
|
|
101
|
+
return null;
|
|
41
102
|
}
|
|
42
|
-
return { images, transcribedText, systemNotes };
|
|
43
103
|
}
|
|
44
104
|
async transcribeAudio(buffer, mimeType, systemNotes) {
|
|
45
105
|
if (this.sttProvider) {
|
|
@@ -68,12 +128,9 @@ export class MediaProcessor {
|
|
|
68
128
|
return null;
|
|
69
129
|
}
|
|
70
130
|
normalizeImageMime(mime) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return 'image/gif';
|
|
75
|
-
if (mime === 'image/webp')
|
|
76
|
-
return 'image/webp';
|
|
131
|
+
const base = baseMimeType(mime);
|
|
132
|
+
if (base === 'image/png' || base === 'image/gif' || base === 'image/webp')
|
|
133
|
+
return base;
|
|
77
134
|
return 'image/jpeg';
|
|
78
135
|
}
|
|
79
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-processor.js","sourceRoot":"","sources":["../../src/media/media-processor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"media-processor.js","sourceRoot":"","sources":["../../src/media/media-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whisper-api.d.ts","sourceRoot":"","sources":["../../src/media/whisper-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"whisper-api.d.ts","sourceRoot":"","sources":["../../src/media/whisper-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgCrD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEnB,MAAM,EAAE,aAAa;IAK3B,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAUpE;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEnB,MAAM,EAAE,eAAe;IAK7B,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAUpE"}
|
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
import { audioExtension, baseMimeType } from './audio-format.js';
|
|
2
|
+
async function transcribeOpenAICompatible(endpoint, apiKey, model, buffer, mimeType, provider) {
|
|
3
|
+
const blob = new Blob([new Uint8Array(buffer)], { type: baseMimeType(mimeType) });
|
|
4
|
+
const form = new FormData();
|
|
5
|
+
form.append('file', blob, `audio.${audioExtension(mimeType)}`);
|
|
6
|
+
form.append('model', model);
|
|
7
|
+
const res = await fetch(endpoint, {
|
|
8
|
+
method: 'POST',
|
|
9
|
+
headers: { Authorization: `Bearer ${apiKey}` },
|
|
10
|
+
body: form,
|
|
11
|
+
});
|
|
12
|
+
if (!res.ok) {
|
|
13
|
+
const body = await res.text();
|
|
14
|
+
throw new Error(`${provider} STT failed (${res.status}): ${body}`);
|
|
15
|
+
}
|
|
16
|
+
const data = (await res.json());
|
|
17
|
+
return typeof data.text === 'string' ? data.text.trim() : '';
|
|
18
|
+
}
|
|
1
19
|
export class GroqSttProvider {
|
|
2
20
|
apiKey;
|
|
3
21
|
model;
|
|
@@ -6,22 +24,7 @@ export class GroqSttProvider {
|
|
|
6
24
|
this.model = config.model ?? 'whisper-large-v3';
|
|
7
25
|
}
|
|
8
26
|
async transcribe(buffer, mimeType) {
|
|
9
|
-
|
|
10
|
-
const blob = new Blob([new Uint8Array(buffer)], { type: mimeType });
|
|
11
|
-
const form = new FormData();
|
|
12
|
-
form.append('file', blob, `audio.${ext}`);
|
|
13
|
-
form.append('model', this.model);
|
|
14
|
-
const res = await fetch('https://api.groq.com/openai/v1/audio/transcriptions', {
|
|
15
|
-
method: 'POST',
|
|
16
|
-
headers: { Authorization: `Bearer ${this.apiKey}` },
|
|
17
|
-
body: form,
|
|
18
|
-
});
|
|
19
|
-
if (!res.ok) {
|
|
20
|
-
const body = await res.text();
|
|
21
|
-
throw new Error(`Groq STT failed (${res.status}): ${body}`);
|
|
22
|
-
}
|
|
23
|
-
const data = (await res.json());
|
|
24
|
-
return data.text.trim();
|
|
27
|
+
return transcribeOpenAICompatible('https://api.groq.com/openai/v1/audio/transcriptions', this.apiKey, this.model, buffer, mimeType, 'Groq');
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
export class OpenAISttProvider {
|
|
@@ -29,25 +32,10 @@ export class OpenAISttProvider {
|
|
|
29
32
|
model;
|
|
30
33
|
constructor(config) {
|
|
31
34
|
this.apiKey = config.apiKey;
|
|
32
|
-
this.model = config.model ?? '
|
|
35
|
+
this.model = config.model ?? 'gpt-transcribe';
|
|
33
36
|
}
|
|
34
37
|
async transcribe(buffer, mimeType) {
|
|
35
|
-
|
|
36
|
-
const blob = new Blob([new Uint8Array(buffer)], { type: mimeType });
|
|
37
|
-
const form = new FormData();
|
|
38
|
-
form.append('file', blob, `audio.${ext}`);
|
|
39
|
-
form.append('model', this.model);
|
|
40
|
-
const res = await fetch('https://api.openai.com/v1/audio/transcriptions', {
|
|
41
|
-
method: 'POST',
|
|
42
|
-
headers: { Authorization: `Bearer ${this.apiKey}` },
|
|
43
|
-
body: form,
|
|
44
|
-
});
|
|
45
|
-
if (!res.ok) {
|
|
46
|
-
const body = await res.text();
|
|
47
|
-
throw new Error(`OpenAI STT failed (${res.status}): ${body}`);
|
|
48
|
-
}
|
|
49
|
-
const data = (await res.json());
|
|
50
|
-
return data.text.trim();
|
|
38
|
+
return transcribeOpenAICompatible('https://api.openai.com/v1/audio/transcriptions', this.apiKey, this.model, buffer, mimeType, 'OpenAI');
|
|
51
39
|
}
|
|
52
40
|
}
|
|
53
41
|
//# sourceMappingURL=whisper-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whisper-api.js","sourceRoot":"","sources":["../../src/media/whisper-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"whisper-api.js","sourceRoot":"","sources":["../../src/media/whisper-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9D,KAAK,UAAU,0BAA0B,CACvC,QAAgB,EAChB,MAAc,EACd,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,QAAgB;IAEhB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAElF,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE5B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE;QAC9C,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,gBAAgB,GAAG,CAAC,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAuB,CAAC;IACtD,OAAO,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/D,CAAC;AAOD,MAAM,OAAO,eAAe;IACT,MAAM,CAAS;IACf,KAAK,CAAS;IAE/B,YAAY,MAAqB;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,kBAAkB,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,QAAgB;QAC/C,OAAO,0BAA0B,CAC/B,qDAAqD,EACrD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,KAAK,EACV,MAAM,EACN,QAAQ,EACR,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAOD,MAAM,OAAO,iBAAiB;IACX,MAAM,CAAS;IACf,KAAK,CAAS;IAE/B,YAAY,MAAuB;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,QAAgB;QAC/C,OAAO,0BAA0B,CAC/B,gDAAgD,EAChD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,KAAK,EACV,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whisper-local.d.ts","sourceRoot":"","sources":["../../src/media/whisper-local.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"whisper-local.d.ts","sourceRoot":"","sources":["../../src/media/whisper-local.ts"],"names":[],"mappings":"AAYA,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,QAAQ,CAAC,EAAE,MAAM;IAI7B,iBAAiB,IAAI,OAAO;IAgBtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBzB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAgB1D,MAAM;YAoBN,YAAY;YA8BZ,UAAU;YAqBV,gBAAgB;YAIhB,SAAS;IAsBvB,OAAO,CAAC,SAAS;IAsEjB,OAAO,CAAC,QAAQ;CAajB"}
|
|
@@ -4,6 +4,10 @@ import { join } from 'node:path';
|
|
|
4
4
|
import { homedir } from 'node:os';
|
|
5
5
|
const WHISPER_MODEL = 'Xenova/whisper-tiny';
|
|
6
6
|
const SAMPLE_RATE = 16000;
|
|
7
|
+
const RUNTIME_DEPS = {
|
|
8
|
+
'@huggingface/transformers': '^4.3.0',
|
|
9
|
+
'ogg-opus-decoder': '^1.7.3',
|
|
10
|
+
};
|
|
7
11
|
export class LocalWhisper {
|
|
8
12
|
pipeline = null;
|
|
9
13
|
loading = null;
|
|
@@ -42,42 +46,46 @@ export class LocalWhisper {
|
|
|
42
46
|
if (!this.pipeline) {
|
|
43
47
|
await this.ensureLoaded();
|
|
44
48
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
49
|
+
const pcmFloat32 = await this.decode(audioBuffer, mimeType);
|
|
50
|
+
const pipe = this.pipeline;
|
|
51
|
+
const result = await pipe(pcmFloat32, { return_timestamps: false });
|
|
52
|
+
return result.text.trim();
|
|
53
|
+
}
|
|
54
|
+
async decode(buffer, mimeType) {
|
|
55
|
+
const mime = mimeType.split(';')[0]?.trim().toLowerCase() ?? '';
|
|
56
|
+
if (mime === 'audio/wav' || mime === 'audio/wave' || mime === 'audio/x-wav') {
|
|
57
|
+
return this.decodeWav(buffer);
|
|
48
58
|
}
|
|
49
|
-
|
|
50
|
-
|
|
59
|
+
if (mime === 'audio/ogg' ||
|
|
60
|
+
mime === 'audio/opus' ||
|
|
61
|
+
buffer.subarray(0, 4).toString() === 'OggS') {
|
|
62
|
+
return this.decodeOgg(buffer);
|
|
51
63
|
}
|
|
52
|
-
|
|
53
|
-
|
|
64
|
+
if (buffer.subarray(0, 4).toString() === 'RIFF') {
|
|
65
|
+
return this.decodeWav(buffer);
|
|
54
66
|
}
|
|
55
|
-
|
|
56
|
-
const startToken = pipe.model.config.decoder_start_token_id;
|
|
57
|
-
const noTsToken = pipe.model.generation_config.no_timestamps_token_id;
|
|
58
|
-
const result = await pipe(pcmFloat32, {
|
|
59
|
-
decoder_input_ids: [startToken, noTsToken],
|
|
60
|
-
});
|
|
61
|
-
return result.text.trim();
|
|
67
|
+
throw new Error(`Local Whisper supports only OGG/Opus and WAV audio (got ${mimeType}). Configure a cloud STT provider for other formats.`);
|
|
62
68
|
}
|
|
63
69
|
async ensureLoaded() {
|
|
64
70
|
if (this.pipeline)
|
|
65
71
|
return;
|
|
66
|
-
if (this.loading) {
|
|
72
|
+
if (!this.loading) {
|
|
73
|
+
this.loading = (async () => {
|
|
74
|
+
const transformers = await this.loadTransformers();
|
|
75
|
+
const { env, pipeline } = transformers;
|
|
76
|
+
env.cacheDir = this.modelDir;
|
|
77
|
+
env.allowLocalModels = true;
|
|
78
|
+
this.pipeline = await pipeline('automatic-speech-recognition', WHISPER_MODEL, {
|
|
79
|
+
dtype: 'q8',
|
|
80
|
+
});
|
|
81
|
+
})();
|
|
82
|
+
}
|
|
83
|
+
try {
|
|
67
84
|
await this.loading;
|
|
68
|
-
return;
|
|
69
85
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
env.cacheDir = this.modelDir;
|
|
74
|
-
env.allowLocalModels = true;
|
|
75
|
-
this.pipeline = await pipeline('automatic-speech-recognition', WHISPER_MODEL, {
|
|
76
|
-
dtype: 'q8',
|
|
77
|
-
});
|
|
78
|
-
})();
|
|
79
|
-
await this.loading;
|
|
80
|
-
this.loading = null;
|
|
86
|
+
finally {
|
|
87
|
+
this.loading = null;
|
|
88
|
+
}
|
|
81
89
|
}
|
|
82
90
|
async ensureDeps() {
|
|
83
91
|
const missing = [];
|
|
@@ -96,7 +104,8 @@ export class LocalWhisper {
|
|
|
96
104
|
if (missing.length === 0)
|
|
97
105
|
return;
|
|
98
106
|
console.log(`[whisper] Installing dependencies: ${missing.join(', ')}...`);
|
|
99
|
-
const
|
|
107
|
+
const specs = missing.map((name) => `${name}@${RUNTIME_DEPS[name]}`);
|
|
108
|
+
const cmd = `npm install --no-save ${specs.map((spec) => JSON.stringify(spec)).join(' ')}`;
|
|
100
109
|
execSync(cmd, { stdio: 'pipe', timeout: 120_000 });
|
|
101
110
|
console.log('[whisper] Dependencies installed');
|
|
102
111
|
}
|
|
@@ -107,32 +116,79 @@ export class LocalWhisper {
|
|
|
107
116
|
const mod = (await import('ogg-opus-decoder'));
|
|
108
117
|
const OggOpusDecoder = mod.OggOpusDecoder;
|
|
109
118
|
const decoder = new OggOpusDecoder();
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
119
|
+
try {
|
|
120
|
+
await decoder.ready;
|
|
121
|
+
const result = await decoder.decode(new Uint8Array(buffer));
|
|
122
|
+
const samples = result.channelData[0];
|
|
123
|
+
if (!samples)
|
|
124
|
+
throw new Error('OGG stream contains no audio');
|
|
125
|
+
if (result.sampleRate === SAMPLE_RATE)
|
|
126
|
+
return samples;
|
|
127
|
+
return this.resample(samples, result.sampleRate, SAMPLE_RATE);
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
decoder.free();
|
|
131
|
+
}
|
|
117
132
|
}
|
|
118
133
|
decodeWav(buffer) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
134
|
+
if (buffer.length < 12 || buffer.toString('ascii', 0, 4) !== 'RIFF') {
|
|
135
|
+
throw new Error('Invalid WAV file: missing RIFF header');
|
|
136
|
+
}
|
|
137
|
+
let format = null;
|
|
138
|
+
let dataOffset = -1;
|
|
139
|
+
let dataSize = 0;
|
|
140
|
+
let offset = 12;
|
|
141
|
+
while (offset + 8 <= buffer.length) {
|
|
142
|
+
const id = buffer.toString('ascii', offset, offset + 4);
|
|
143
|
+
const size = buffer.readUInt32LE(offset + 4);
|
|
144
|
+
const body = offset + 8;
|
|
145
|
+
if (id === 'fmt ') {
|
|
146
|
+
format = {
|
|
147
|
+
audioFormat: buffer.readUInt16LE(body),
|
|
148
|
+
channels: buffer.readUInt16LE(body + 2),
|
|
149
|
+
sampleRate: buffer.readUInt32LE(body + 4),
|
|
150
|
+
bits: buffer.readUInt16LE(body + 14),
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
else if (id === 'data') {
|
|
154
|
+
dataOffset = body;
|
|
155
|
+
dataSize = Math.min(size, buffer.length - body);
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
offset = body + size + (size % 2);
|
|
159
|
+
}
|
|
160
|
+
if (!format || dataOffset < 0)
|
|
161
|
+
throw new Error('Invalid WAV file: missing fmt or data chunk');
|
|
162
|
+
const { audioFormat, channels, sampleRate, bits } = format;
|
|
163
|
+
const bytesPerSample = bits / 8;
|
|
164
|
+
const isFloat = audioFormat === 3;
|
|
165
|
+
if (![8, 16, 24, 32].includes(bits) || channels < 1) {
|
|
166
|
+
throw new Error(`Unsupported WAV format: ${bits}-bit, ${channels} channel(s)`);
|
|
167
|
+
}
|
|
168
|
+
const frameSize = bytesPerSample * channels;
|
|
169
|
+
const frames = Math.floor(dataSize / frameSize);
|
|
170
|
+
const samples = new Float32Array(frames);
|
|
171
|
+
const readSample = (pos) => {
|
|
172
|
+
if (isFloat && bits === 32)
|
|
173
|
+
return buffer.readFloatLE(pos);
|
|
174
|
+
switch (bits) {
|
|
175
|
+
case 8:
|
|
176
|
+
return (buffer.readUInt8(pos) - 128) / 128;
|
|
177
|
+
case 16:
|
|
178
|
+
return buffer.readInt16LE(pos) / 32768;
|
|
179
|
+
case 24:
|
|
180
|
+
return buffer.readIntLE(pos, 3) / 8388608;
|
|
181
|
+
default:
|
|
182
|
+
return buffer.readInt32LE(pos) / 2147483648;
|
|
131
183
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
184
|
+
};
|
|
185
|
+
for (let i = 0; i < frames; i++) {
|
|
186
|
+
const frameStart = dataOffset + i * frameSize;
|
|
187
|
+
let sum = 0;
|
|
188
|
+
for (let c = 0; c < channels; c++) {
|
|
189
|
+
sum += readSample(frameStart + c * bytesPerSample);
|
|
135
190
|
}
|
|
191
|
+
samples[i] = sum / channels;
|
|
136
192
|
}
|
|
137
193
|
if (sampleRate === SAMPLE_RATE)
|
|
138
194
|
return samples;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whisper-local.js","sourceRoot":"","sources":["../../src/media/whisper-local.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,aAAa,GAAG,qBAAqB,CAAC;AAC5C,MAAM,WAAW,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"whisper-local.js","sourceRoot":"","sources":["../../src/media/whisper-local.ts"],"names":[],"mappings":"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"}
|
package/dist/message-queue.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../src/message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAQrE,qBAAa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ5B,OAAO,CAAC,OAAO,CAAkC;gBAG9B,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC;IAG1F,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAiBjD,OAAO,IAAI,IAAI;IAQf,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../src/message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAQrE,qBAAa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ5B,OAAO,CAAC,OAAO,CAAkC;gBAG9B,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC;IAG1F,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAiBjD,OAAO,IAAI,IAAI;IAQf,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,OAAO;YAOD,eAAe;IAY7B,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,WAAW;YASL,YAAY;IAc1B,OAAO,CAAC,aAAa;CAiBtB"}
|
package/dist/message-queue.js
CHANGED
|
@@ -9,7 +9,7 @@ export class MessageQueue {
|
|
|
9
9
|
push(msg, threadId) {
|
|
10
10
|
switch (this.mode) {
|
|
11
11
|
case 'parallel':
|
|
12
|
-
void this.processor(msg);
|
|
12
|
+
void this.processor(msg).catch(() => { });
|
|
13
13
|
break;
|
|
14
14
|
case 'sequential':
|
|
15
15
|
this.pushSequential(msg, threadId);
|
|
@@ -41,19 +41,26 @@ export class MessageQueue {
|
|
|
41
41
|
const state = this.getThread(threadId);
|
|
42
42
|
state.queue.push(msg);
|
|
43
43
|
if (!state.processing) {
|
|
44
|
-
void this.drainSequential(state);
|
|
44
|
+
void this.drainSequential(threadId, state);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
release(threadId, state) {
|
|
48
|
+
state.processing = false;
|
|
49
|
+
if (state.queue.length === 0 && this.threads.get(threadId) === state) {
|
|
50
|
+
this.threads.delete(threadId);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async drainSequential(threadId, state) {
|
|
48
54
|
state.processing = true;
|
|
49
|
-
|
|
50
|
-
|
|
55
|
+
let next = state.queue.shift();
|
|
56
|
+
while (next) {
|
|
51
57
|
try {
|
|
52
58
|
await this.processor(next);
|
|
53
59
|
}
|
|
54
60
|
catch { }
|
|
61
|
+
next = state.queue.shift();
|
|
55
62
|
}
|
|
56
|
-
|
|
63
|
+
this.release(threadId, state);
|
|
57
64
|
}
|
|
58
65
|
pushInterrupt(msg, threadId) {
|
|
59
66
|
const state = this.getThread(threadId);
|
|
@@ -68,8 +75,8 @@ export class MessageQueue {
|
|
|
68
75
|
.catch(() => { })
|
|
69
76
|
.finally(() => {
|
|
70
77
|
if (state.abortController === ac) {
|
|
71
|
-
state.processing = false;
|
|
72
78
|
state.abortController = undefined;
|
|
79
|
+
this.release(threadId, state);
|
|
73
80
|
}
|
|
74
81
|
});
|
|
75
82
|
}
|
|
@@ -77,10 +84,10 @@ export class MessageQueue {
|
|
|
77
84
|
const state = this.getThread(threadId);
|
|
78
85
|
state.queue.push(msg);
|
|
79
86
|
if (!state.processing) {
|
|
80
|
-
void this.drainCollect(state);
|
|
87
|
+
void this.drainCollect(threadId, state);
|
|
81
88
|
}
|
|
82
89
|
}
|
|
83
|
-
async drainCollect(state) {
|
|
90
|
+
async drainCollect(threadId, state) {
|
|
84
91
|
state.processing = true;
|
|
85
92
|
while (state.queue.length > 0) {
|
|
86
93
|
const batch = state.queue.splice(0, state.queue.length);
|
|
@@ -90,7 +97,7 @@ export class MessageQueue {
|
|
|
90
97
|
}
|
|
91
98
|
catch { }
|
|
92
99
|
}
|
|
93
|
-
|
|
100
|
+
this.release(threadId, state);
|
|
94
101
|
}
|
|
95
102
|
mergeMessages(msgs) {
|
|
96
103
|
if (msgs.length === 1)
|