@dtelecom/agents-js 0.1.15 → 0.1.16

package/dist/providers/index.mjs

@@ -296,8 +296,63 @@ var OpenRouterLLM = class {
     let buffer = "";
     const structured = !!this.responseFormat;
     let jsonBuffer = "";
-    let lastSegmentIndex = 0;
-    const segmentRe = /\{"lang"\s*:\s*"(\w+)"\s*,\s*"text"\s*:\s*"((?:[^"\\]|\\.)*)"\s*\}/g;
+    let segmentsYielded = false;
+    let lastUsage;
+    let inSegmentsArray = false;
+    let objectStart = -1;
+    let braceDepth = 0;
+    let scanIndex = 0;
+    let inString = false;
+    let escaped = false;
+    function extractSegments(buf) {
+      const results = [];
+      for (let i = scanIndex; i < buf.length; i++) {
+        const ch = buf[i];
+        if (escaped) {
+          escaped = false;
+          continue;
+        }
+        if (ch === "\\" && inString) {
+          escaped = true;
+          continue;
+        }
+        if (ch === '"') {
+          inString = !inString;
+          continue;
+        }
+        if (inString) continue;
+        if (!inSegmentsArray) {
+          if (ch === "[") {
+            const before = buf.slice(0, i).trimEnd();
+            if (before.endsWith(":") && buf.slice(0, i).includes('"segments"')) {
+              inSegmentsArray = true;
+            }
+          }
+          continue;
+        }
+        if (ch === "{") {
+          if (braceDepth === 0) objectStart = i;
+          braceDepth++;
+        } else if (ch === "}") {
+          braceDepth--;
+          if (braceDepth === 0 && objectStart >= 0) {
+            const objStr = buf.slice(objectStart, i + 1);
+            try {
+              const seg = JSON.parse(objStr);
+              if (seg.lang && seg.text) {
+                results.push({ lang: seg.lang, text: seg.text });
+              }
+            } catch {
+            }
+            objectStart = -1;
+          }
+        } else if (ch === "]" && braceDepth === 0) {
+          inSegmentsArray = false;
+        }
+      }
+      scanIndex = buf.length;
+      return results;
+    }
     try {
       while (true) {
         if (signal?.aborted) break;
@@ -310,10 +365,7 @@ var OpenRouterLLM = class {
           const trimmed = line.trim();
           if (!trimmed || !trimmed.startsWith("data: ")) continue;
           const data = trimmed.slice(6);
-          if (data === "[DONE]") {
-            yield { type: "done" };
-            return;
-          }
+          if (data === "[DONE]") break;
           try {
             const parsed = JSON.parse(data);
             const choice = parsed.choices?.[0];
@@ -322,31 +374,20 @@ var OpenRouterLLM = class {
             if (delta?.content) {
               if (structured) {
                 jsonBuffer += delta.content;
-                segmentRe.lastIndex = lastSegmentIndex;
-                let match;
-                while ((match = segmentRe.exec(jsonBuffer)) !== null) {
-                  const lang = match[1];
-                  const text = match[2].replace(/\\(.)/g, (_, c) => {
-                    if (c === "n") return "\n";
-                    if (c === "t") return "	";
-                    return c;
-                  });
-                  lastSegmentIndex = segmentRe.lastIndex;
-                  yield { type: "segment", segment: { lang, text } };
+                const segments = extractSegments(jsonBuffer);
+                for (const seg of segments) {
+                  yield { type: "segment", segment: seg };
+                  segmentsYielded = true;
                 }
               } else {
                 yield { type: "token", token: delta.content };
               }
             }
             if (parsed.usage) {
-              yield {
-                type: "done",
-                usage: {
-                  promptTokens: parsed.usage.prompt_tokens,
-                  completionTokens: parsed.usage.completion_tokens
-                }
+              lastUsage = {
+                promptTokens: parsed.usage.prompt_tokens,
+                completionTokens: parsed.usage.completion_tokens
               };
-              return;
             }
           } catch {
           }
@@ -355,10 +396,10 @@ var OpenRouterLLM = class {
     } finally {
       reader.releaseLock();
     }
-    if (structured && lastSegmentIndex === 0 && jsonBuffer.length > 0) {
-      log2.warn(`Structured response yielded no segments. Raw buffer (first 200 chars): "${jsonBuffer.slice(0, 200)}"`);
+    if (structured && !segmentsYielded && jsonBuffer.length > 0) {
+      log2.warn(`LLM returned no segments. Raw JSON: "${jsonBuffer.slice(0, 300)}"`);
     }
-    yield { type: "done" };
+    yield { type: "done", ...lastUsage ? { usage: lastUsage } : {} };
   }
 };
 
@@ -681,13 +722,21 @@ var DeepgramTTS = class {
   }
   async *synthesize(text, signal) {
     if (signal?.aborted) return;
-    const segments = this.multiLanguage ? parseLangSegments(text, this.defaultLang) : [{ lang: this.defaultLang, text }];
+    const rawSegments = this.multiLanguage ? parseLangSegments(text, this.defaultLang) : [{ lang: this.defaultLang, text }];
+    const segments = [];
+    for (const seg of rawSegments) {
+      if (!seg.text.trim()) continue;
+      if (!/\p{L}/u.test(seg.text) && segments.length > 0) {
+        segments[segments.length - 1].text += seg.text;
+      } else {
+        segments.push(seg);
+      }
+    }
     const silenceBytes = Math.round(this.sampleRate * 0.2) * 2;
     const silence = Buffer.alloc(silenceBytes);
     let prevLang = null;
     for (const segment of segments) {
       if (signal?.aborted) break;
-      if (!segment.text.trim()) continue;
       const lang = this.models[segment.lang] ? segment.lang : this.defaultLang;
       if (prevLang !== null && lang !== prevLang) {
         yield silence;
@@ -933,7 +982,8 @@ var DtelecomSTTStream = class extends BaseSTTStream {
       this.handleVadEvent(msg);
     } else if (type === "pong") {
     } else if (type === "error") {
-      const errorMsg = msg.message || msg.error || "Unknown STT error";
+      const errData = msg.error;
+      const errorMsg = msg.message || (typeof errData === "string" ? errData : JSON.stringify(errData)) || "Unknown STT error";
       log5.error(`dTelecom STT error: ${errorMsg}`);
       this.emit("error", new Error(errorMsg));
     }
@@ -995,18 +1045,7 @@ var DtelecomSTTStream = class extends BaseSTTStream {
 
 // src/providers/dtelecom-tts.ts
 import WebSocket5 from "ws";
-import { resample } from "wave-resampler";
 var log6 = createLogger("DtelecomTTS");
-function resample24to48(input) {
-  const samples = new Int16Array(input.buffer, input.byteOffset, input.length / 2);
-  if (samples.length === 0) return Buffer.alloc(0);
-  const resampled = resample(samples, 24e3, 48e3, { method: "sinc", LPF: false });
-  const output = new Int16Array(resampled.length);
-  for (let i = 0; i < resampled.length; i++) {
-    output[i] = Math.round(resampled[i]);
-  }
-  return Buffer.from(output.buffer, output.byteOffset, output.byteLength);
-}
 var DtelecomTTS = class {
   serverUrl;
   voices;
@@ -1058,13 +1097,21 @@ var DtelecomTTS = class {
   }
   async *synthesize(text, signal) {
     if (signal?.aborted) return;
-    const segments = parseLangSegments(text, this.defaultLang);
+    const rawSegments = parseLangSegments(text, this.defaultLang);
+    const segments = [];
+    for (const seg of rawSegments) {
+      if (!seg.text.trim()) continue;
+      if (!/\p{L}/u.test(seg.text) && segments.length > 0) {
+        segments[segments.length - 1].text += seg.text;
+      } else {
+        segments.push(seg);
+      }
+    }
     const silenceBytes = Math.round(48e3 * 0.2) * 2;
     const silence = Buffer.alloc(silenceBytes);
     let prevLang = null;
     for (const segment of segments) {
       if (signal?.aborted) break;
-      if (!segment.text.trim()) continue;
       const lang = this.voices[segment.lang] ? segment.lang : this.defaultLang;
       if (prevLang !== null && lang !== prevLang) {
         yield silence;
@@ -1074,7 +1121,6 @@ var DtelecomTTS = class {
     }
   }
   async *synthesizeSegment(lang, text, signal) {
-    log6.debug(`Synthesizing [${lang}]: "${text.slice(0, 60)}"`);
     await this.ensureConnection();
     const ws = this.ws;
     if (!ws || ws.readyState !== WebSocket5.OPEN) {
@@ -1100,6 +1146,7 @@ var DtelecomTTS = class {
       msg.lang_code = voiceConfig.langCode;
       msg.speed = this.speed;
     }
+    log6.info(`TTS send [${lang}]: voice=${voiceConfig?.voice ?? "default"} lang_code=${voiceConfig?.langCode ?? "default"} "${text.slice(0, 60)}"`);
     ws.send(JSON.stringify(msg));
     try {
       while (true) {
@@ -1153,8 +1200,7 @@ var DtelecomTTS = class {
         if (!state) return;
         if (isBinary) {
           const buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
-          const resampled = resample24to48(buf);
-          state.chunks.push(resampled);
+          state.chunks.push(buf);
           state.wake?.();
         } else {
           try {