aicodeswitch 2.0.8 → 2.0.10

package/dist/server/transformers/chunk-collector.js

@@ -8,20 +8,45 @@ const stream_1 = require("stream");
  */
 class ChunkCollectorTransform extends stream_1.Transform {
     constructor() {
-        super();
+        super({ writableObjectMode: true, readableObjectMode: true });
         Object.defineProperty(this, "chunks", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        this.on('error', (err) => {
+            console.error('[ChunkCollectorTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     _transform(chunk, _encoding, callback) {
-        // 收集chunk数据
-        this.chunks.push(chunk.toString('utf8'));
-        // 将chunk传递给下一个stream
-        this.push(chunk);
-        callback();
+        if (this.errorEmitted) {
+            callback();
+            return;
+        }
+        try {
+            // 收集chunk数据 - 支持对象和Buffer/string
+            if (typeof chunk === 'object' && chunk !== null && !Buffer.isBuffer(chunk)) {
+                this.chunks.push(JSON.stringify(chunk));
+            }
+            else {
+                this.chunks.push(chunk.toString('utf8'));
+            }
+            // 将chunk传递给下一个stream
+            this.push(chunk);
+            callback();
+        }
+        catch (error) {
+            console.error('[ChunkCollectorTransform] Error in _transform:', error);
+            callback();
+        }
     }
     /**
      * 获取收集的所有chunks
@@ -44,7 +69,7 @@ exports.ChunkCollectorTransform = ChunkCollectorTransform;
  */
 class SSEEventCollectorTransform extends stream_1.Transform {
     constructor() {
-        super();
+        super({ writableObjectMode: true, readableObjectMode: true });
         Object.defineProperty(this, "buffer", {
             enumerable: true,
             configurable: true,
@@ -66,22 +91,82 @@ class SSEEventCollectorTransform extends stream_1.Transform {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        this.on('error', (err) => {
+            console.error('[SSEEventCollectorTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     _transform(chunk, _encoding, callback) {
-        this.buffer += chunk.toString('utf8');
-        this.processBuffer();
-        // 将chunk传递给下一个stream
-        this.push(chunk);
-        callback();
+        if (this.errorEmitted) {
+            callback();
+            return;
+        }
+        try {
+            // 如果是对象（来自 SSEParserTransform），先转换为字符串格式进行处理
+            if (typeof chunk === 'object' && chunk !== null) {
+                const sseEvent = chunk;
+                const lines = [];
+                if (sseEvent.event)
+                    lines.push(`event: ${sseEvent.event}`);
+                if (sseEvent.id)
+                    lines.push(`id: ${sseEvent.id}`);
+                if (sseEvent.data !== undefined) {
+                    if (typeof sseEvent.data === 'string') {
+                        lines.push(`data: ${sseEvent.data}`);
+                    }
+                    else {
+                        lines.push(`data: ${JSON.stringify(sseEvent.data)}`);
+                    }
+                }
+                if (lines.length > 0) {
+                    this.currentEvent.rawLines.push(...lines);
+                    if (sseEvent.event)
+                        this.currentEvent.event = sseEvent.event;
+                    if (sseEvent.id)
+                        this.currentEvent.id = sseEvent.id;
+                    if (sseEvent.data !== undefined) {
+                        const dataStr = typeof sseEvent.data === 'string' ? sseEvent.data : JSON.stringify(sseEvent.data);
+                        this.currentEvent.dataLines.push(dataStr);
+                    }
+                    this.flushEvent();
+                }
+                // 将原始对象传递给下一个stream
+                this.push(chunk);
+            }
+            else {
+                // Buffer/string 模式
+                this.buffer += chunk.toString('utf8');
+                this.processBuffer();
+                // 将chunk传递给下一个stream
+                this.push(chunk);
+            }
+            callback();
+        }
+        catch (error) {
+            console.error('[SSEEventCollectorTransform] Error in _transform:', error);
+            callback();
+        }
     }
     _flush(callback) {
-        // 处理剩余的buffer
-        if (this.buffer.trim()) {
-            this.processBuffer();
+        try {
+            // 处理剩余的buffer
+            if (this.buffer.trim()) {
+                this.processBuffer();
+            }
+            // 刷新最后一个事件
+            this.flushEvent();
+            callback();
+        }
+        catch (error) {
+            console.error('[SSEEventCollectorTransform] Error in _flush:', error);
+            callback();
         }
-        // 刷新最后一个事件
-        this.flushEvent();
-        callback();
     }
     processBuffer() {
         const lines = this.buffer.split('\n');

package/dist/server/transformers/claude-openai.js

@@ -143,7 +143,9 @@ const transformClaudeRequestToOpenAIChat = (body, targetModel) => {
             // 映射 system 角色到 developer (如果需要)
             const mappedRole = (message.role === 'system' && useDeveloperRole) ? 'developer' : message.role;
             if (typeof message.content === 'string' || message.content === null) {
-                messages.push({ role: mappedRole, content: message.content });
+                // 处理 content 为 null 的情况，使用空字符串替代
+                const content = message.content === null ? '' : message.content;
+                messages.push({ role: mappedRole, content });
                 continue;
             }
             if (Array.isArray(message.content)) {
@@ -179,7 +181,8 @@ const transformClaudeRequestToOpenAIChat = (body, targetModel) => {
                         }
                     }
                 }
-                const content = textParts.length > 0 ? textParts.join('') : null;
+                // 避免 content 为 null，使用空字符串替代
+                const content = textParts.length > 0 ? textParts.join('') : '';
                 const openaiMessage = {
                     role: mappedRole,
                     content,

package/dist/server/transformers/streaming.js

@@ -28,22 +28,50 @@ class SSEParserTransform extends stream_1.Transform {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        // 捕获流中的未处理错误，防止进程崩溃
+        this.on('error', (err) => {
+            console.error('[SSEParserTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     _transform(chunk, _encoding, callback) {
-        this.buffer += chunk.toString('utf8');
-        const lines = this.buffer.split('\n');
-        this.buffer = lines.pop() || '';
-        for (const line of lines) {
-            this.processLine(line);
+        if (this.errorEmitted) {
+            callback();
+            return;
+        }
+        try {
+            this.buffer += chunk.toString('utf8');
+            const lines = this.buffer.split('\n');
+            this.buffer = lines.pop() || '';
+            for (const line of lines) {
+                this.processLine(line);
+            }
+            callback();
+        }
+        catch (error) {
+            console.error('[SSEParserTransform] Error in _transform:', error);
+            // 不传递错误，避免中断流，而是记录并继续
+            callback();
         }
-        callback();
     }
     _flush(callback) {
-        if (this.buffer.trim()) {
-            this.processLine(this.buffer.trim());
-            this.flushEvent();
+        try {
+            if (this.buffer.trim()) {
+                this.processLine(this.buffer.trim());
+                this.flushEvent();
+            }
+            callback();
+        }
+        catch (error) {
+            console.error('[SSEParserTransform] Error in _flush:', error);
+            callback();
         }
-        callback();
     }
     processLine(line) {
         if (!line.trim()) {
@@ -92,30 +120,50 @@ class SSESerializerTransform extends stream_1.Transform {
             writableObjectMode: true, // 接收对象
             readableObjectMode: false, // 输出字符串/Buffer
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        this.on('error', (err) => {
+            console.error('[SSESerializerTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     _transform(event, _encoding, callback) {
         var _a;
-        let output = '';
-        if (event.event) {
-            output += `event: ${event.event}\n`;
-        }
-        if (event.id) {
-            output += `id: ${event.id}\n`;
+        if (this.errorEmitted) {
+            callback();
+            return;
         }
-        if (event.data !== undefined) {
-            if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.type) === 'done') {
-                output += 'data: [DONE]\n';
+        try {
+            let output = '';
+            if (event.event) {
+                output += `event: ${event.event}\n`;
             }
-            else if (typeof event.data === 'string') {
-                output += `data: ${event.data}\n`;
+            if (event.id) {
+                output += `id: ${event.id}\n`;
             }
-            else {
-                output += `data: ${JSON.stringify(event.data)}\n`;
+            if (event.data !== undefined) {
+                if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.type) === 'done') {
+                    output += 'data: [DONE]\n';
+                }
+                else if (typeof event.data === 'string') {
+                    output += `data: ${event.data}\n`;
+                }
+                else {
+                    output += `data: ${JSON.stringify(event.data)}\n`;
+                }
             }
+            output += '\n';
+            this.push(output);
+            callback();
+        }
+        catch (error) {
+            console.error('[SSESerializerTransform] Error in _transform:', error);
+            callback();
         }
-        output += '\n';
-        this.push(output);
-        callback();
     }
 }
 exports.SSESerializerTransform = SSESerializerTransform;
@@ -206,7 +254,17 @@ class OpenAIToClaudeEventTransform extends stream_1.Transform {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.model = (_a = options === null || options === void 0 ? void 0 : options.model) !== null && _a !== void 0 ? _a : null;
+        this.on('error', (err) => {
+            console.error('[OpenAIToClaudeEventTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     getUsage() {
         if (!this.usage)
@@ -215,39 +273,62 @@ class OpenAIToClaudeEventTransform extends stream_1.Transform {
     }
     _transform(event, _encoding, callback) {
         var _a;
-        if (this.finalized) {
+        if (this.errorEmitted) {
             callback();
             return;
         }
-        if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.type) === 'done') {
-            this.finalize();
-            callback();
-            return;
-        }
-        const chunk = event.data;
-        if (!chunk) {
+        try {
+            if (this.finalized) {
+                callback();
+                return;
+            }
+            if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.type) === 'done') {
+                this.finalize();
+                callback();
+                return;
+            }
+            const chunk = event.data;
+            if (!chunk) {
+                callback();
+                return;
+            }
+            if (chunk.id && !this.messageId) {
+                this.messageId = chunk.id;
+            }
+            if (chunk.model && !this.model) {
+                this.model = chunk.model;
+            }
+            if (chunk.usage) {
+                this.usage = (0, claude_openai_1.convertOpenAIUsageToClaude)(chunk.usage);
+            }
+            if (Array.isArray(chunk.choices)) {
+                for (const choice of chunk.choices) {
+                    this.handleChoice(choice);
+                }
+            }
             callback();
-            return;
-        }
-        if (chunk.id && !this.messageId) {
-            this.messageId = chunk.id;
         }
-        if (chunk.model && !this.model) {
-            this.model = chunk.model;
-        }
-        if (chunk.usage) {
-            this.usage = (0, claude_openai_1.convertOpenAIUsageToClaude)(chunk.usage);
-        }
-        if (Array.isArray(chunk.choices)) {
-            for (const choice of chunk.choices) {
-                this.handleChoice(choice);
+        catch (error) {
+            console.error('[OpenAIToClaudeEventTransform] Error in _transform:', error);
+            // 发送错误事件后继续
+            try {
+                this.pushEvent('error', { type: 'error', error: { type: 'api_error', message: 'Stream transformation error' } });
+            }
+            catch (e) {
+                // 忽略推送错误的错误
             }
+            callback();
         }
-        callback();
     }
     _flush(callback) {
-        this.finalize();
-        callback();
+        try {
+            this.finalize();
+            callback();
+        }
+        catch (error) {
+            console.error('[OpenAIToClaudeEventTransform] Error in _flush:', error);
+            callback();
+        }
     }
     assignContentBlockIndex() {
         const index = this.contentIndex;
@@ -455,92 +536,118 @@ class ClaudeToOpenAIChatEventTransform extends stream_1.Transform {
             writable: true,
             value: null
         });
+        Object.defineProperty(this, "errorEmitted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.model = (_a = options === null || options === void 0 ? void 0 : options.model) !== null && _a !== void 0 ? _a : null;
+        this.on('error', (err) => {
+            console.error('[ClaudeToOpenAIChatEventTransform] Stream error:', err);
+            this.errorEmitted = true;
+        });
     }
     getUsage() {
         return this.usage;
     }
     _transform(event, _encoding, callback) {
-        if (this.finished) {
-            callback();
-            return;
-        }
-        const type = event.event;
-        const data = event.data;
-        if (type === 'message_start' && (data === null || data === void 0 ? void 0 : data.message)) {
-            this.model = data.message.model || this.model;
-            this.push({ event: null, data: { id: data.message.id, model: this.model, choices: [{ index: 0, delta: { role: 'assistant' }, finish_reason: null }] } });
+        if (this.errorEmitted) {
             callback();
             return;
         }
-        if (type === 'content_block_start' && (data === null || data === void 0 ? void 0 : data.content_block)) {
-            if (data.content_block.type === 'text') {
-                // 文本块开始
+        try {
+            if (this.finished) {
+                callback();
+                return;
             }
-            else if (data.content_block.type === 'tool_use') {
-                this.pendingToolCallId = data.content_block.id;
-                this.pendingToolName = data.content_block.name;
-                this.pendingToolArgs = '';
+            const type = event.event;
+            const data = event.data;
+            if (type === 'message_start' && (data === null || data === void 0 ? void 0 : data.message)) {
+                this.model = data.message.model || this.model;
+                this.push({ event: null, data: { id: data.message.id, model: this.model, choices: [{ index: 0, delta: { role: 'assistant' }, finish_reason: null }] } });
+                callback();
+                return;
             }
-            callback();
-            return;
-        }
-        if (type === 'content_block_delta' && (data === null || data === void 0 ? void 0 : data.delta)) {
-            if (data.delta.type === 'text_delta') {
-                const text = data.delta.text || '';
-                if (text) {
-                    this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: { content: text } }] } });
+            if (type === 'content_block_start' && (data === null || data === void 0 ? void 0 : data.content_block)) {
+                if (data.content_block.type === 'text') {
+                    // 文本块开始
                 }
+                else if (data.content_block.type === 'tool_use') {
+                    this.pendingToolCallId = data.content_block.id;
+                    this.pendingToolName = data.content_block.name;
+                    this.pendingToolArgs = '';
+                }
+                callback();
+                return;
             }
-            else if (data.delta.type === 'input_json_delta') {
-                this.pendingToolArgs += data.delta.partial_json || '';
+            if (type === 'content_block_delta' && (data === null || data === void 0 ? void 0 : data.delta)) {
+                if (data.delta.type === 'text_delta') {
+                    const text = data.delta.text || '';
+                    if (text) {
+                        this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: { content: text } }] } });
+                    }
+                }
+                else if (data.delta.type === 'input_json_delta') {
+                    this.pendingToolArgs += data.delta.partial_json || '';
+                }
+                callback();
+                return;
             }
-            callback();
-            return;
-        }
-        if (type === 'content_block_stop') {
-            if (this.pendingToolCallId && this.pendingToolName !== null) {
-                const toolCall = {
-                    index: this.toolCallIndex,
-                    id: this.pendingToolCallId,
-                    type: 'function',
-                    function: {
-                        name: this.pendingToolName,
-                        arguments: this.pendingToolArgs,
-                    },
+            if (type === 'content_block_stop') {
+                if (this.pendingToolCallId && this.pendingToolName !== null) {
+                    const toolCall = {
+                        index: this.toolCallIndex,
+                        id: this.pendingToolCallId,
+                        type: 'function',
+                        function: {
+                            name: this.pendingToolName,
+                            arguments: this.pendingToolArgs,
+                        },
+                    };
+                    this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: { tool_calls: [toolCall] } }] } });
+                    this.toolCallIndex++;
+                    this.pendingToolCallId = null;
+                    this.pendingToolName = null;
+                    this.pendingToolArgs = '';
+                }
+                callback();
+                return;
+            }
+            if (type === 'message_stop' || (data === null || data === void 0 ? void 0 : data.type) === 'message_stop') {
+                this.finished = true;
+                this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] } });
+                this.push({ event: 'done', data: { type: 'done' } });
+                callback();
+                return;
+            }
+            if (data === null || data === void 0 ? void 0 : data.usage) {
+                this.usage = {
+                    prompt_tokens: data.usage.input_tokens || 0,
+                    completion_tokens: data.usage.output_tokens || 0,
+                    total_tokens: (data.usage.input_tokens || 0) + (data.usage.output_tokens || 0),
                 };
-                this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: { tool_calls: [toolCall] } }] } });
-                this.toolCallIndex++;
-                this.pendingToolCallId = null;
-                this.pendingToolName = null;
-                this.pendingToolArgs = '';
             }
             callback();
-            return;
         }
-        if (type === 'message_stop' || (data === null || data === void 0 ? void 0 : data.type) === 'message_stop') {
-            this.finished = true;
-            this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] } });
-            this.push({ event: 'done', data: { type: 'done' } });
+        catch (error) {
+            console.error('[ClaudeToOpenAIChatEventTransform] Error in _transform:', error);
             callback();
-            return;
-        }
-        if (data === null || data === void 0 ? void 0 : data.usage) {
-            this.usage = {
-                prompt_tokens: data.usage.input_tokens || 0,
-                completion_tokens: data.usage.output_tokens || 0,
-                total_tokens: (data.usage.input_tokens || 0) + (data.usage.output_tokens || 0),
-            };
         }
-        callback();
     }
     _flush(callback) {
-        if (!this.finished) {
-            this.finished = true;
-            this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] } });
-            this.push({ event: 'done', data: { type: 'done' } });
+        try {
+            if (!this.finished) {
+                this.finished = true;
+                this.push({ event: null, data: { id: '', model: this.model, choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] } });
+                this.push({ event: 'done', data: { type: 'done' } });
+            }
+            callback();
+        }
+        catch (error) {
+            console.error('[ClaudeToOpenAIChatEventTransform] Error in _flush:', error);
+            callback();
         }
-        callback();
     }
 }
 exports.ClaudeToOpenAIChatEventTransform = ClaudeToOpenAIChatEventTransform;