@lvce-editor/chat-view 3.6.0 → 3.7.0

package/dist/chatViewWorkerMain.js

@@ -1075,6 +1075,7 @@ const create$2 = rpcId => {
 };
 
 const {
+  invoke: invoke$2,
   set: set$3
 } = create$2(6002);
 
@@ -1525,6 +1526,7 @@ const createDefaultState = () => {
     tokensUsed: 0,
     uid: 0,
     usageOverviewEnabled: false,
+    useChatNetworkWorkerForRequests: false,
     useMockApi: false,
     viewMode: 'list',
     warningCount: 0,
@@ -3177,6 +3179,13 @@ const getMockOpenRouterAssistantText = async (messages, modelId, openRouterApiBa
   }
 };
 
+const makeApiRequest = async options => {
+  return invoke$2('ChatNetwork.makeApiRequest', options);
+};
+const makeStreamingApiRequest = async options => {
+  return invoke$2('ChatNetwork.makeStreamingApiRequest', options);
+};
+
 const executeGetWorkspaceUriTool = async (_args, _options) => {
   try {
     const workspaceUri = await getWorkspacePath();
@@ -3521,6 +3530,8 @@ const getTextContent = content => {
   return textParts.join('\n');
 };
 
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+
 const getOpenAiTools = tools => {
   return tools.map(tool => {
     if (!tool || typeof tool !== 'object') {
@@ -4062,6 +4073,52 @@ const getOpenApiErrorDetails = async response => {
     } : {})
   };
 };
+const getOpenApiErrorDetailsFromResponseText = responseText => {
+  let parsed;
+  try {
+    parsed = JSON.parse(responseText);
+  } catch {
+    return {};
+  }
+  if (!parsed || typeof parsed !== 'object') {
+    return {};
+  }
+  const error = Reflect.get(parsed, 'error');
+  if (!error || typeof error !== 'object') {
+    return {};
+  }
+  const errorCode = Reflect.get(error, 'code');
+  const errorMessage = Reflect.get(error, 'message');
+  const errorType = Reflect.get(error, 'type');
+  return {
+    ...(typeof errorCode === 'string' ? {
+      errorCode
+    } : {}),
+    ...(typeof errorMessage === 'string' ? {
+      errorMessage
+    } : {}),
+    ...(typeof errorType === 'string' ? {
+      errorType
+    } : {})
+  };
+};
+const getResponseFromSseEvents = events => {
+  const chunks = events.map(event => {
+    const data = typeof event === 'string' ? event : JSON.stringify(event);
+    return `data: ${data}\n\n`;
+  });
+  const stream = new ReadableStream({
+    start(controller) {
+      for (const chunk of chunks) {
+        controller.enqueue(new TextEncoder().encode(chunk));
+      }
+      controller.close();
+    }
+  });
+  return {
+    body: stream
+  };
+};
 const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApiApiBaseUrl, assetDir, platform, options) => {
   const {
     includeObfuscation = false,
@@ -4070,6 +4127,7 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
     onTextChunk,
     onToolCallsChunk,
     stream,
+    useChatNetworkWorkerForRequests = false,
     webSearchEnabled = false
   } = options ?? {
     stream: false
@@ -4082,46 +4140,89 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
   const maxToolIterations = 4;
   let previousResponseId;
   for (let i = 0; i <= maxToolIterations; i++) {
-    let response;
-    try {
-      response = await fetch(getOpenApiApiEndpoint(openApiApiBaseUrl), {
-        body: JSON.stringify(getOpenAiParams(openAiInput, modelId, stream, includeObfuscation, tools, webSearchEnabled, previousResponseId)),
-        headers: {
-          Authorization: `Bearer ${openApiApiKey}`,
-          'Content-Type': 'application/json',
-          ...getClientRequestIdHeader()
-        },
-        method: 'POST'
-      });
-    } catch {
-      return {
-        details: 'request-failed',
-        type: 'error'
-      };
-    }
-    if (!response.ok) {
-      const {
-        errorCode,
-        errorMessage,
-        errorType
-      } = await getOpenApiErrorDetails(response);
-      return {
-        details: 'http-error',
-        ...(errorCode ? {
-          errorCode
-        } : {}),
-        ...(errorMessage ? {
-          errorMessage
-        } : {}),
-        ...(errorType ? {
-          errorType
-        } : {}),
-        statusCode: response.status,
-        type: 'error'
-      };
-    }
+    const postBody = getOpenAiParams(openAiInput, modelId, stream, includeObfuscation, tools, webSearchEnabled, previousResponseId);
     if (stream) {
-      const streamResult = await parseOpenApiStream(response, onTextChunk, onToolCallsChunk, onDataEvent);
+      const streamResult = useChatNetworkWorkerForRequests ? await (async () => {
+        const requestResult = await makeStreamingApiRequest({
+          headers: {
+            Authorization: `Bearer ${openApiApiKey}`,
+            'Content-Type': 'application/json',
+            ...getClientRequestIdHeader()
+          },
+          method: 'POST',
+          postBody,
+          url: getOpenApiApiEndpoint(openApiApiBaseUrl)
+        });
+        if (requestResult.type === 'error') {
+          if (requestResult.statusCode === 0) {
+            return {
+              details: 'request-failed',
+              type: 'error'
+            };
+          }
+          const {
+            errorCode,
+            errorMessage,
+            errorType
+          } = getOpenApiErrorDetailsFromResponseText(requestResult.response);
+          return {
+            details: 'http-error',
+            ...(errorCode ? {
+              errorCode
+            } : {}),
+            ...(errorMessage ? {
+              errorMessage
+            } : {}),
+            ...(errorType ? {
+              errorType
+            } : {}),
+            statusCode: requestResult.statusCode,
+            type: 'error'
+          };
+        }
+        const response = getResponseFromSseEvents(requestResult.body);
+        return parseOpenApiStream(response, onTextChunk, onToolCallsChunk, onDataEvent);
+      })() : await (async () => {
+        let response;
+        try {
+          response = await fetch(getOpenApiApiEndpoint(openApiApiBaseUrl), {
+            body: JSON.stringify(postBody),
+            headers: {
+              Authorization: `Bearer ${openApiApiKey}`,
+              'Content-Type': 'application/json',
+              ...getClientRequestIdHeader()
+            },
+            method: 'POST'
+          });
+        } catch {
+          return {
+            details: 'request-failed',
+            type: 'error'
+          };
+        }
+        if (!response.ok) {
+          const {
+            errorCode,
+            errorMessage,
+            errorType
+          } = await getOpenApiErrorDetails(response);
+          return {
+            details: 'http-error',
+            ...(errorCode ? {
+              errorCode
+            } : {}),
+            ...(errorMessage ? {
+              errorMessage
+            } : {}),
+            ...(errorType ? {
+              errorType
+            } : {}),
+            statusCode: response.status,
+            type: 'error'
+          };
+        }
+        return parseOpenApiStream(response, onTextChunk, onToolCallsChunk, onDataEvent);
+      })();
       if (streamResult.type !== 'success') {
         return streamResult;
       }
@@ -4168,13 +4269,92 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
       };
     }
     let parsed;
-    try {
-      parsed = await response.json();
-    } catch {
-      return {
-        details: 'request-failed',
-        type: 'error'
-      };
+    if (useChatNetworkWorkerForRequests) {
+      const requestResult = await makeApiRequest({
+        headers: {
+          Authorization: `Bearer ${openApiApiKey}`,
+          'Content-Type': 'application/json',
+          ...getClientRequestIdHeader()
+        },
+        method: 'POST',
+        postBody,
+        url: getOpenApiApiEndpoint(openApiApiBaseUrl)
+      });
+      if (requestResult.type === 'error') {
+        if (requestResult.statusCode === 0) {
+          return {
+            details: 'request-failed',
+            type: 'error'
+          };
+        }
+        const {
+          errorCode,
+          errorMessage,
+          errorType
+        } = getOpenApiErrorDetailsFromResponseText(requestResult.response);
+        return {
+          details: 'http-error',
+          ...(errorCode ? {
+            errorCode
+          } : {}),
+          ...(errorMessage ? {
+            errorMessage
+          } : {}),
+          ...(errorType ? {
+            errorType
+          } : {}),
+          statusCode: requestResult.statusCode,
+          type: 'error'
+        };
+      }
+      parsed = requestResult.body;
+    } else {
+      let response;
+      try {
+        response = await fetch(getOpenApiApiEndpoint(openApiApiBaseUrl), {
+          body: JSON.stringify(postBody),
+          headers: {
+            Authorization: `Bearer ${openApiApiKey}`,
+            'Content-Type': 'application/json',
+            ...getClientRequestIdHeader()
+          },
+          method: 'POST'
+        });
+      } catch {
+        return {
+          details: 'request-failed',
+          type: 'error'
+        };
+      }
+      if (!response.ok) {
+        const {
+          errorCode,
+          errorMessage,
+          errorType
+        } = await getOpenApiErrorDetails(response);
+        return {
+          details: 'http-error',
+          ...(errorCode ? {
+            errorCode
+          } : {}),
+          ...(errorMessage ? {
+            errorMessage
+          } : {}),
+          ...(errorType ? {
+            errorType
+          } : {}),
+          statusCode: response.status,
+          type: 'error'
+        };
+      }
+      try {
+        parsed = await response.json();
+      } catch {
+        return {
+          details: 'request-failed',
+          type: 'error'
+        };
+      }
     }
     if (!parsed || typeof parsed !== 'object') {
       return {
@@ -4409,28 +4589,67 @@ const getOpenRouterRaw429Message = async response => {
   }
   return raw;
 };
-const getOpenRouterLimitInfo = async (openRouterApiKey, openRouterApiBaseUrl) => {
-  let response;
+const getOpenRouterRaw429MessageFromText = responseText => {
+  let parsed;
   try {
-    response = await fetch(getOpenRouterKeyEndpoint(openRouterApiBaseUrl), {
-      headers: {
-        Authorization: `Bearer ${openRouterApiKey}`,
-        ...getClientRequestIdHeader()
-      },
-      method: 'GET'
-    });
+    parsed = JSON.parse(responseText);
   } catch {
     return undefined;
   }
-  if (!response.ok) {
+  if (!parsed || typeof parsed !== 'object') {
     return undefined;
   }
-  let parsed;
-  try {
-    parsed = await response.json();
-  } catch {
+  const error = Reflect.get(parsed, 'error');
+  if (!error || typeof error !== 'object') {
+    return undefined;
+  }
+  const metadata = Reflect.get(error, 'metadata');
+  if (!metadata || typeof metadata !== 'object') {
     return undefined;
   }
+  const raw = Reflect.get(metadata, 'raw');
+  if (typeof raw !== 'string' || !raw) {
+    return undefined;
+  }
+  return raw;
+};
+const getOpenRouterLimitInfo = async (openRouterApiKey, openRouterApiBaseUrl, useChatNetworkWorkerForRequests) => {
+  let parsed;
+  if (useChatNetworkWorkerForRequests) {
+    const result = await makeApiRequest({
+      headers: {
+        Authorization: `Bearer ${openRouterApiKey}`,
+        ...getClientRequestIdHeader()
+      },
+      method: 'GET',
+      url: getOpenRouterKeyEndpoint(openRouterApiBaseUrl)
+    });
+    if (result.type === 'error') {
+      return undefined;
+    }
+    parsed = result.body;
+  } else {
+    let response;
+    try {
+      response = await fetch(getOpenRouterKeyEndpoint(openRouterApiBaseUrl), {
+        headers: {
+          Authorization: `Bearer ${openRouterApiKey}`,
+          ...getClientRequestIdHeader()
+        },
+        method: 'GET'
+      });
+    } catch {
+      return undefined;
+    }
+    if (!response.ok) {
+      return undefined;
+    }
+    try {
+      parsed = await response.json();
+    } catch {
+      return undefined;
+    }
+  }
   if (!parsed || typeof parsed !== 'object') {
     return undefined;
   }
@@ -4462,7 +4681,7 @@ const getOpenRouterLimitInfo = async (openRouterApiKey, openRouterApiBaseUrl) =>
   }
   return normalizedLimitInfo;
 };
-const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform) => {
+const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests = false) => {
   const completionMessages = messages.map(message => ({
     content: message.text,
     role: message.role
@@ -4470,64 +4689,111 @@ const getOpenRouterAssistantText = async (messages, modelId, openRouterApiKey, o
   const tools = getBasicChatTools();
   const maxToolIterations = 4;
   for (let i = 0; i <= maxToolIterations; i++) {
-    let response;
-    try {
-      response = await fetch(getOpenRouterApiEndpoint(openRouterApiBaseUrl), {
-        body: JSON.stringify({
-          messages: completionMessages,
-          model: modelId,
-          tool_choice: 'auto',
-          tools
-        }),
+    let parsed;
+    if (useChatNetworkWorkerForRequests) {
+      const requestResult = await makeApiRequest({
         headers: {
           Authorization: `Bearer ${openRouterApiKey}`,
           'Content-Type': 'application/json',
           ...getClientRequestIdHeader()
         },
-        method: 'POST'
+        method: 'POST',
+        postBody: {
+          messages: completionMessages,
+          model: modelId,
+          tool_choice: 'auto',
+          tools
+        },
+        url: getOpenRouterApiEndpoint(openRouterApiBaseUrl)
       });
-    } catch {
-      return {
-        details: 'request-failed',
-        type: 'error'
-      };
-    }
-    if (!response.ok) {
-      if (response.status === 429) {
-        const retryAfter = response.headers?.get?.('retry-after') ?? null;
-        const rawMessage = await getOpenRouterRaw429Message(response);
-        const limitInfo = await getOpenRouterLimitInfo(openRouterApiKey, openRouterApiBaseUrl);
+      if (requestResult.type === 'error') {
+        if (requestResult.statusCode === 429) {
+          const retryAfter = requestResult.headers?.['retry-after'] ?? null;
+          const rawMessage = getOpenRouterRaw429MessageFromText(requestResult.response);
+          const limitInfo = await getOpenRouterLimitInfo(openRouterApiKey, openRouterApiBaseUrl, useChatNetworkWorkerForRequests);
+          return {
+            details: 'too-many-requests',
+            ...(limitInfo || retryAfter ? {
+              limitInfo: {
+                ...limitInfo,
+                ...(retryAfter ? {
+                  retryAfter
+                } : {})
+              }
+            } : {}),
+            ...(rawMessage ? {
+              rawMessage
+            } : {}),
+            statusCode: 429,
+            type: 'error'
+          };
+        }
         return {
-          details: 'too-many-requests',
-          ...(limitInfo || retryAfter ? {
-            limitInfo: {
-              ...limitInfo,
-              ...(retryAfter ? {
-                retryAfter
-              } : {})
-            }
-          } : {}),
-          ...(rawMessage ? {
-            rawMessage
-          } : {}),
-          statusCode: 429,
+          details: 'http-error',
+          statusCode: requestResult.statusCode,
+          type: 'error'
+        };
+      }
+      parsed = requestResult.body;
+    } else {
+      let response;
+      try {
+        response = await fetch(getOpenRouterApiEndpoint(openRouterApiBaseUrl), {
+          body: JSON.stringify({
+            messages: completionMessages,
+            model: modelId,
+            tool_choice: 'auto',
+            tools
+          }),
+          headers: {
+            Authorization: `Bearer ${openRouterApiKey}`,
+            'Content-Type': 'application/json',
+            ...getClientRequestIdHeader()
+          },
+          method: 'POST'
+        });
+      } catch {
+        return {
+          details: 'request-failed',
+          type: 'error'
+        };
+      }
+      if (!response.ok) {
+        if (response.status === 429) {
+          const retryAfter = response.headers?.get?.('retry-after') ?? null;
+          const rawMessage = await getOpenRouterRaw429Message(response);
+          const limitInfo = await getOpenRouterLimitInfo(openRouterApiKey, openRouterApiBaseUrl, useChatNetworkWorkerForRequests);
+          return {
+            details: 'too-many-requests',
+            ...(limitInfo || retryAfter ? {
+              limitInfo: {
+                ...limitInfo,
+                ...(retryAfter ? {
+                  retryAfter
+                } : {})
+              }
+            } : {}),
+            ...(rawMessage ? {
+              rawMessage
+            } : {}),
+            statusCode: 429,
+            type: 'error'
+          };
+        }
+        return {
+          details: 'http-error',
+          statusCode: response.status,
+          type: 'error'
+        };
+      }
+      try {
+        parsed = await response.json();
+      } catch {
+        return {
+          details: 'request-failed',
           type: 'error'
         };
       }
-      return {
-        details: 'http-error',
-        statusCode: response.status,
-        type: 'error'
-      };
-    }
-    let parsed;
-    try {
-      parsed = await response.json();
-    } catch {
-      return {
-        details: 'request-failed',
-        type: 'error'
-      };
     }
     if (!parsed || typeof parsed !== 'object') {
       return {
@@ -4686,6 +4952,7 @@ const getAiResponse = async ({
   platform,
   selectedModelId,
   streamingEnabled = true,
+  useChatNetworkWorkerForRequests = false,
   useMockApi,
   userText,
   webSearchEnabled = false
@@ -4720,6 +4987,7 @@ const getAiResponse = async ({
           onToolCallsChunk
         } : {}),
         stream: streamingEnabled,
+        useChatNetworkWorkerForRequests,
         webSearchEnabled
       });
       if (result.type === 'success') {
@@ -4746,7 +5014,7 @@ const getAiResponse = async ({
         text = getOpenRouterErrorMessage(result);
       }
     } else if (openRouterApiKey) {
-      const result = await getOpenRouterAssistantText(messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform);
+      const result = await getOpenRouterAssistantText(messages, modelId, openRouterApiKey, openRouterApiBaseUrl, assetDir, platform, useChatNetworkWorkerForRequests);
       if (result.type === 'success') {
         const {
           text: assistantText
@@ -4830,6 +5098,7 @@ const handleClickSaveOpenApiApiKey = async state => {
     platform: updatedState.platform,
     selectedModelId: updatedState.selectedModelId,
     streamingEnabled: updatedState.streamingEnabled,
+    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
     useMockApi: updatedState.useMockApi,
     userText: previousUserMessage.text
   });
@@ -4910,6 +5179,7 @@ const handleClickSaveOpenRouterApiKey = async state => {
     openRouterApiKey,
     platform: updatedState.platform,
     selectedModelId: updatedState.selectedModelId,
+    useChatNetworkWorkerForRequests: updatedState.useChatNetworkWorkerForRequests,
     useMockApi: updatedState.useMockApi,
     userText: previousUserMessage.text
   });
@@ -5286,6 +5556,7 @@ Assistant: ${assistantText}`;
     platform: state.platform,
     selectedModelId,
     streamingEnabled: false,
+    useChatNetworkWorkerForRequests: state.useChatNetworkWorkerForRequests,
     useMockApi,
     userText: titlePrompt,
     webSearchEnabled: false
@@ -5313,6 +5584,7 @@ const handleSubmit = async state => {
     selectedSessionId,
     sessions,
     streamingEnabled,
+    useChatNetworkWorkerForRequests,
     useMockApi,
     viewMode,
     webSearchEnabled
@@ -5465,6 +5737,7 @@ const handleSubmit = async state => {
     platform,
     selectedModelId,
     streamingEnabled,
+    useChatNetworkWorkerForRequests,
     useMockApi,
     userText,
     webSearchEnabled
@@ -6105,8 +6378,17 @@ const loadStreamingEnabled = async () => {
   }
 };
 
+const loadUseChatNetworkWorkerForRequests = async () => {
+  try {
+    const savedUseChatNetworkWorkerForRequests = await get('chatView.useChatNetworkWorkerForRequests');
+    return typeof savedUseChatNetworkWorkerForRequests === 'boolean' ? savedUseChatNetworkWorkerForRequests : false;
+  } catch {
+    return false;
+  }
+};
+
 const loadPreferences = async () => {
-  const [aiSessionTitleGenerationEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, streamingEnabled, passIncludeObfuscation] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadStreamingEnabled(), loadPassIncludeObfuscation()]);
+  const [aiSessionTitleGenerationEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, streamingEnabled, passIncludeObfuscation, useChatNetworkWorkerForRequests] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadStreamingEnabled(), loadPassIncludeObfuscation(), loadUseChatNetworkWorkerForRequests()]);
   return {
     aiSessionTitleGenerationEnabled,
     composerDropEnabled,
@@ -6114,7 +6396,8 @@ const loadPreferences = async () => {
     openApiApiKey,
     openRouterApiKey,
     passIncludeObfuscation,
-    streamingEnabled
+    streamingEnabled,
+    useChatNetworkWorkerForRequests
   };
 };
 
@@ -6151,7 +6434,8 @@ const loadContent = async (state, savedState) => {
     openApiApiKey,
     openRouterApiKey,
     passIncludeObfuscation,
-    streamingEnabled
+    streamingEnabled,
+    useChatNetworkWorkerForRequests
   } = await loadPreferences();
   const legacySavedSessions = getSavedSessions(savedState);
   const storedSessions = await listChatSessions();
@@ -6195,6 +6479,7 @@ const loadContent = async (state, savedState) => {
     selectedSessionId,
     sessions,
     streamingEnabled,
+    useChatNetworkWorkerForRequests,
     viewMode
   };
 };
@@ -7936,6 +8221,18 @@ const setStreamingEnabled = (state, streamingEnabled) => {
   };
 };
 
+const setUseChatNetworkWorkerForRequests = async (state, useChatNetworkWorkerForRequests, persist = true) => {
+  if (persist) {
+    await update({
+      'chatView.useChatNetworkWorkerForRequests': useChatNetworkWorkerForRequests
+    });
+  }
+  return {
+    ...state,
+    useChatNetworkWorkerForRequests
+  };
+};
+
 const defaultMockApiCommandId = 'ChatE2e.mockApi';
 const useMockApi = (state, value, mockApiCommandId = defaultMockApiCommandId) => {
   if (!value) {
@@ -8001,6 +8298,7 @@ const commandMap = {
   'Chat.setEmitStreamingFunctionCallEvents': wrapCommand(setEmitStreamingFunctionCallEvents),
   'Chat.setOpenRouterApiKey': wrapCommand(setOpenRouterApiKey),
   'Chat.setStreamingEnabled': wrapCommand(setStreamingEnabled),
+  'Chat.setUseChatNetworkWorkerForRequests': wrapCommand(setUseChatNetworkWorkerForRequests),
   'Chat.terminate': terminate,
   'Chat.useMockApi': wrapCommand(useMockApi)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/chat-view",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Chat View Worker",
   "repository": {
     "type": "git",