@xsai/stream-text 0.0.28 → 0.0.30

package/dist/index.d.ts

@@ -1,5 +1,21 @@
-import { ChatOptions, FinishReason, Usage } from '@xsai/shared-chat';
+import { FinishReason, Usage, ChatOptions } from '@xsai/shared-chat';
 
+interface ChunkResult {
+    choices: {
+        delta: {
+            content: string;
+            role: 'assistant';
+        };
+        finish_reason?: FinishReason;
+        index: number;
+    }[];
+    created: number;
+    id: string;
+    model: string;
+    object: 'chat.completion.chunk';
+    system_fingerprint: string;
+    usage?: Usage;
+}
 interface StreamTextOptions extends ChatOptions {
     onChunk?: (chunk: ChunkResult) => Promise<void> | void;
     /** if you want to disable stream, use `@xsai/generate-{text,object}` */
@@ -19,22 +35,6 @@ interface StreamTextResult {
     textStream: ReadableStream<string>;
     usage?: Usage;
 }
-interface ChunkResult {
-    choices: {
-        delta: {
-            content: string;
-            role: 'assistant';
-        };
-        finish_reason?: FinishReason;
-        index: number;
-    }[];
-    created: number;
-    id: string;
-    model: string;
-    object: 'chat.completion.chunk';
-    system_fingerprint: string;
-    usage?: Usage;
-}
 /**
  * @experimental WIP, does not support function calling (tools).
  */

package/dist/index.js

@@ -1,43 +1,47 @@
 import { chat } from '@xsai/shared-chat';
 
-const chunkHeaderPrefix = "data: ";
-const chunkErrorPrefix = `{"error":`;
-const streamText = async (options) => await chat({
+const chunkHeaderPrefix = "data:";
+const streamText = async (options) => chat({
   ...options,
   stream: true
 }).then(async (res) => {
   const decoder = new TextDecoder();
   let finishReason;
   let usage;
+  const processLine = async (line, controller) => {
+    if (!line || !line.startsWith(chunkHeaderPrefix))
+      return;
+    const content = line.slice(chunkHeaderPrefix.length);
+    const data = content.startsWith(" ") ? content.slice(1) : content;
+    if (data === "[DONE]") {
+      controller.terminate();
+      return true;
+    }
+    if (data.startsWith("{") && data.includes('"error":')) {
+      controller.error(new Error(`Error from server: ${data}`));
+      return true;
+    }
+    const chunk = JSON.parse(data);
+    controller.enqueue(chunk);
+    if (options.onChunk)
+      await options.onChunk(chunk);
+    if (chunk.choices[0].finish_reason !== undefined) {
+      finishReason = chunk.choices[0].finish_reason;
+    }
+    if (chunk.usage !== undefined) {
+      usage = chunk.usage;
+    }
+  };
   let buffer = "";
   const rawChunkStream = res.body.pipeThrough(new TransformStream({
     transform: async (chunk, controller) => {
-      buffer += decoder.decode(chunk);
-      const lines = buffer.split("\n\n");
-      buffer = lines.pop() || "";
+      const text = decoder.decode(chunk, { stream: true });
+      buffer += text;
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
       for (const line of lines) {
-        if (!line || !line.startsWith(chunkHeaderPrefix)) {
-          continue;
-        }
-        if (line.startsWith(chunkErrorPrefix)) {
-          controller.error(new Error(`Error from server: ${line}`));
-          break;
-        }
-        const lineWithoutPrefix = line.slice(chunkHeaderPrefix.length);
-        if (lineWithoutPrefix === "[DONE]") {
-          controller.terminate();
+        if (await processLine(line, controller))
           break;
-        }
-        const chunk2 = JSON.parse(lineWithoutPrefix);
-        controller.enqueue(chunk2);
-        if (options.onChunk)
-          await options.onChunk(chunk2);
-        if (chunk2.choices[0].finish_reason) {
-          finishReason = chunk2.choices[0].finish_reason;
-        }
-        if (chunk2.usage) {
-          usage = chunk2.usage;
-        }
       }
     }
   }));

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@xsai/stream-text",
-  "version": "0.0.28",
   "type": "module",
+  "version": "0.0.30",
+  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",
   "homepage": "https://xsai.js.org",
-  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
-  "keywords": [
-    "xsai",
-    "openai",
-    "ai"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/moeru-ai/xsai.git",
     "directory": "packages/stream-text"
   },
   "bugs": "https://github.com/moeru-ai/xsai/issues",
+  "keywords": [
+    "xsai",
+    "openai",
+    "ai"
+  ],
   "sideEffects": false,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     }
   },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],