@xsai-ext/telemetry 0.5.0-beta.1 → 0.5.0-beta.2

package/dist/index.js

@@ -1,9 +1,9 @@
-import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolveStepOptions, chat, responseJSON, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, determineStepType, RemoteAPIError, JSONParseError, DelayedPromise, objCamelToSnake } from 'xsai';
+import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolveStepOptions, chat, responseJSON, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, determineStepType, DelayedPromise, objCamelToSnake } from 'xsai';
 export * from 'xsai';
 import { trace, SpanStatusCode } from '@opentelemetry/api';
-import { EventSourceParserStream } from 'eventsource-parser/stream';
+import { createControlledStream, errorControllers, closeControllers, EventSourceParserStream, JsonMessageTransformStream } from '@xsai/shared-stream';
 
-var version = "0.5.0-beta.1";
+var version = "0.5.0-beta.2";
 var pkg = {
 	version: version};
 
@@ -244,31 +244,6 @@ const generateText = async (options) => {
   }));
 };
 
-const parseChunk = (data) => {
-  if (data.startsWith("{") && data.includes('"error":')) {
-    throw new RemoteAPIError(`Error from server: ${data}`, {
-      responseBody: data
-    });
-  }
-  try {
-    return JSON.parse(data);
-  } catch (cause) {
-    throw new JSONParseError(`Failed to parse stream chunk JSON: ${data}`, {
-      cause,
-      text: data
-    });
-  }
-};
-const transformChunk = () => {
-  return new TransformStream({
-    transform: async (chunk, controller) => {
-      if (!chunk.data || chunk.data === "[DONE]")
-        return;
-      controller.enqueue(parseChunk(chunk.data));
-    }
-  });
-};
-
 const streamText = (options) => {
   const tracer = getTracer();
   const steps = [];
@@ -281,14 +256,11 @@ const streamText = (options) => {
   const resultMessages = new DelayedPromise();
   const resultUsage = new DelayedPromise();
   const resultTotalUsage = new DelayedPromise();
-  let eventCtrl;
-  let textCtrl;
-  let reasoningTextCtrl;
-  const eventStream = new ReadableStream({ start: (controller) => eventCtrl = controller });
-  const textStream = new ReadableStream({ start: (controller) => textCtrl = controller });
-  const reasoningTextStream = new ReadableStream({ start: (controller) => reasoningTextCtrl = controller });
+  const [eventStream, eventCtrl] = createControlledStream();
+  const [textStream, textCtrl] = createControlledStream();
+  const [reasoningTextStream, reasoningTextCtrl] = createControlledStream();
   const pushEvent = (stepEvent) => {
-    eventCtrl?.enqueue(stepEvent);
+    eventCtrl.current?.enqueue(stepEvent);
     void options.onEvent?.(stepEvent);
   };
   const pushStep = (step) => {
@@ -333,23 +305,22 @@ const streamText = (options) => {
       let text = "";
       let reasoningText;
       const pushText = (content) => {
-        textCtrl?.enqueue(content);
+        textCtrl.current?.enqueue(content);
         text += content;
       };
       const pushReasoningText = (reasoningContent) => {
         if (reasoningText == null)
           reasoningText = "";
-        reasoningTextCtrl?.enqueue(reasoningContent);
+        reasoningTextCtrl.current?.enqueue(reasoningContent);
         reasoningText += reasoningContent;
       };
       const tool_calls = [];
       const toolCalls = [];
       const toolResults = [];
       let finishReason = "other";
-      await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(transformChunk()).pipeTo(new WritableStream({
+      await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(new JsonMessageTransformStream()).pipeTo(new WritableStream({
         abort: (reason) => {
-          eventCtrl?.error(reason);
-          textCtrl?.error(reason);
+          errorControllers(reason, eventCtrl, textCtrl, reasoningTextCtrl);
         },
         close: () => {
         },
@@ -490,18 +461,14 @@ const streamText = (options) => {
       finalError ??= err;
     }
     if (finalError != null) {
-      eventCtrl?.error(finalError);
-      textCtrl?.error(finalError);
-      reasoningTextCtrl?.error(finalError);
+      errorControllers(finalError, eventCtrl, textCtrl, reasoningTextCtrl);
       resultSteps.reject(finalError);
       resultMessages.reject(finalError);
       resultUsage.reject(finalError);
       resultTotalUsage.reject(finalError);
       return;
     }
-    eventCtrl?.close();
-    textCtrl?.close();
-    reasoningTextCtrl?.close();
+    closeControllers(eventCtrl, textCtrl, reasoningTextCtrl);
     resultSteps.resolve(steps);
     resultMessages.resolve(messages);
     resultUsage.resolve(usage);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai-ext/telemetry",
   "type": "module",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0-beta.2",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -30,8 +30,8 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "eventsource-parser": "^3.0.6",
-    "xsai": "~0.5.0-beta.1"
+    "@xsai/shared-stream": "~0.5.0-beta.2",
+    "xsai": "~0.5.0-beta.2"
   },
   "devDependencies": {
     "@langfuse/otel": "^4.5.1",