@lobehub/chat 1.21.11 → 1.21.13

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.21.13](https://github.com/lobehub/lobe-chat/compare/v1.21.12...v1.21.13)
+
+<sup>Released on **2024-10-11**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor agent runtime implement of stream and ZHIPU provider.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor agent runtime implement of stream and ZHIPU provider, closes [#4323](https://github.com/lobehub/lobe-chat/issues/4323) ([59661a1](https://github.com/lobehub/lobe-chat/commit/59661a1))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.21.12](https://github.com/lobehub/lobe-chat/compare/v1.21.11...v1.21.12)
+
+<sup>Released on **2024-10-11**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the jwt code.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the jwt code, closes [#4322](https://github.com/lobehub/lobe-chat/issues/4322) ([b7258b9](https://github.com/lobehub/lobe-chat/commit/b7258b9))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.21.11](https://github.com/lobehub/lobe-chat/compare/v1.21.10...v1.21.11)
 
 <sup>Released on **2024-10-11**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.21.11",
+  "version": "1.21.13",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -101,7 +101,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.4.0",
     "@ant-design/pro-components": "^2.7.10",
-    "@anthropic-ai/sdk": "^0.27.0",
+    "@anthropic-ai/sdk": "^0.29.0",
     "@auth/core": "^0.34.2",
     "@aws-sdk/client-bedrock-runtime": "^3.637.0",
     "@aws-sdk/client-s3": "^3.637.0",

package/src/app/(backend)/api/chat/[provider]/route.test.ts

@@ -2,10 +2,11 @@
 import { getAuth } from '@clerk/nextjs/server';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { checkAuthMethod, getJWTPayload } from '@/app/(backend)/middleware/auth/utils';
+import { checkAuthMethod } from '@/app/(backend)/middleware/auth/utils';
 import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED } from '@/const/auth';
 import { AgentRuntime, LobeRuntimeAI } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
+import { getJWTPayload } from '@/utils/server/jwt';
 
 import { POST } from './route';
 
@@ -14,10 +15,13 @@ vi.mock('@clerk/nextjs/server', () => ({
 }));
 
 vi.mock('@/app/(backend)/middleware/auth/utils', () => ({
-  getJWTPayload: vi.fn(),
   checkAuthMethod: vi.fn(),
 }));
 
+vi.mock('@/utils/server/jwt', () => ({
+  getJWTPayload: vi.fn(),
+}));
+
 // 定义一个变量来存储 enableAuth 的值
 let enableClerk = false;
 

package/src/app/(backend)/middleware/auth/index.test.ts

@@ -1,12 +1,12 @@
-import { getAuth } from '@clerk/nextjs/server';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { AgentRuntimeError } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 import { createErrorResponse } from '@/utils/errorResponse';
+import { getJWTPayload } from '@/utils/server/jwt';
 
 import { RequestHandler, checkAuth } from './index';
-import { checkAuthMethod, getJWTPayload } from './utils';
+import { checkAuthMethod } from './utils';
 
 vi.mock('@clerk/nextjs/server', () => ({
   getAuth: vi.fn(),
@@ -18,6 +18,9 @@ vi.mock('@/utils/errorResponse', () => ({
 
 vi.mock('./utils', () => ({
   checkAuthMethod: vi.fn(),
+}));
+
+vi.mock('@/utils/server/jwt', () => ({
   getJWTPayload: vi.fn(),
 }));
 

package/src/app/(backend)/middleware/auth/index.ts

@@ -6,8 +6,9 @@ import { JWTPayload, LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableClerk } from
 import { AgentRuntime, AgentRuntimeError, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 import { createErrorResponse } from '@/utils/errorResponse';
+import { getJWTPayload } from '@/utils/server/jwt';
 
-import { checkAuthMethod, getJWTPayload } from './utils';
+import { checkAuthMethod } from './utils';
 
 type CreateRuntime = (jwtPayload: JWTPayload) => AgentRuntime;
 type RequestOptions = { createRuntime?: CreateRuntime; params: { provider: string } };

package/src/app/(backend)/middleware/auth/utils.test.ts

@@ -2,9 +2,8 @@ import { type AuthObject } from '@clerk/backend';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getAppConfig } from '@/config/app';
-import { NON_HTTP_PREFIX } from '@/const/auth';
 
-import { checkAuthMethod, getJWTPayload } from './utils';
+import { checkAuthMethod } from './utils';
 
 let enableClerkMock = false;
 let enableNextAuthMock = false;
@@ -27,42 +26,6 @@ vi.mock('@/config/app', () => ({
   getAppConfig: vi.fn(),
 }));
 
-describe('getJWTPayload', () => {
-  it('should parse JWT payload for non-HTTPS token', async () => {
-    const token = `${NON_HTTP_PREFIX}.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ`;
-    const payload = await getJWTPayload(token);
-    expect(payload).toEqual({
-      sub: '1234567890',
-      name: 'John Doe',
-      iat: 1516239022,
-    });
-  });
-
-  it('should verify and parse JWT payload for HTTPS token', async () => {
-    const token =
-      'eyJhbGciOiJIUzI1NiJ9.eyJhY2Nlc3NDb2RlIjoiIiwidXNlcklkIjoiMDAxMzYyYzMtNDhjNS00NjM1LWJkM2ItODM3YmZmZjU4ZmMwIiwiYXBpS2V5IjoiYWJjIiwiZW5kcG9pbnQiOiJhYmMiLCJpYXQiOjE3MTY4MDIyMjUsImV4cCI6MTAwMDAwMDAwMDE3MTY4MDIwMDB9.FF0FxsE8Cajs-_hv5GD0TNUDwvekAkI9l_LL_IOPdGQ';
-    const payload = await getJWTPayload(token);
-    expect(payload).toEqual({
-      accessCode: '',
-      apiKey: 'abc',
-      endpoint: 'abc',
-      exp: 10000000001716802000,
-      iat: 1716802225,
-      userId: '001362c3-48c5-4635-bd3b-837bfff58fc0',
-    });
-  });
-
-  it('should not verify success and parse JWT payload for dated token', async () => {
-    const token =
-      'eyJhbGciOiJIUzI1NiJ9.eyJhY2Nlc3NDb2RlIjoiIiwidXNlcklkIjoiYWY3M2JhODktZjFhMy00YjliLWEwM2QtZGViZmZlMzE4NmQxIiwiYXBpS2V5IjoiYWJjIiwiZW5kcG9pbnQiOiJhYmMiLCJpYXQiOjE3MTY3OTk5ODAsImV4cCI6MTcxNjgwMDA4MH0.8AGFsLcwyrQG82kVUYOGFXHIwihm2n16ctyArKW9100';
-    try {
-      await getJWTPayload(token);
-    } catch (e) {
-      expect(e).toEqual(new TypeError('"exp" claim timestamp check failed'));
-    }
-  });
-});
-
 describe('checkAuthMethod', () => {
   beforeEach(() => {
     vi.mocked(getAppConfig).mockReturnValue({

package/src/app/(backend)/middleware/auth/utils.ts

@@ -1,42 +1,10 @@
 import { type AuthObject } from '@clerk/backend';
-import { importJWK, jwtVerify } from 'jose';
 
 import { getAppConfig } from '@/config/app';
-import {
-  JWTPayload,
-  JWT_SECRET_KEY,
-  NON_HTTP_PREFIX,
-  enableClerk,
-  enableNextAuth,
-} from '@/const/auth';
+import { enableClerk, enableNextAuth } from '@/const/auth';
 import { AgentRuntimeError } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 
-export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
-  //如果是 HTTP 协议发起的请求，直接解析 token
-  // 这是一个非常 hack 的解决方案，未来要找更好的解决方案来处理这个问题
-  // refs: https://github.com/lobehub/lobe-chat/pull/1238
-  if (token.startsWith(NON_HTTP_PREFIX)) {
-    const jwtParts = token.split('.');
-
-    const payload = jwtParts[1];
-
-    return JSON.parse(atob(payload));
-  }
-
-  const encoder = new TextEncoder();
-  const secretKey = await crypto.subtle.digest('SHA-256', encoder.encode(JWT_SECRET_KEY));
-
-  const jwkSecretKey = await importJWK(
-    { k: Buffer.from(secretKey).toString('base64'), kty: 'oct' },
-    'HS256',
-  );
-
-  const { payload } = await jwtVerify(token, jwkSecretKey);
-
-  return payload as JWTPayload;
-};
-
 interface CheckAuthParams {
   accessCode?: string;
   apiKey?: string;

package/src/app/(backend)/webapi/plugin/gateway/route.ts

@@ -1,7 +1,6 @@
 import { PluginRequestPayload } from '@lobehub/chat-plugin-sdk';
 import { createGatewayOnEdgeRuntime } from '@lobehub/chat-plugins-gateway';
 
-import { getJWTPayload } from '@/app/(backend)/middleware/auth/utils';
 import { getAppConfig } from '@/config/app';
 import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableNextAuth } from '@/const/auth';
 import { LOBE_CHAT_TRACE_ID, TraceNameMap } from '@/const/trace';
@@ -9,6 +8,7 @@ import { AgentRuntimeError } from '@/libs/agent-runtime';
 import { TraceClient } from '@/libs/traces';
 import { ChatErrorType, ErrorType } from '@/types/fetch';
 import { createErrorResponse } from '@/utils/errorResponse';
+import { getJWTPayload } from '@/utils/server/jwt';
 import { getTracePayload } from '@/utils/trace';
 
 import { parserPluginSettings } from './settings';

package/src/libs/agent-runtime/AgentRuntime.ts

@@ -174,7 +174,7 @@ class AgentRuntime {
       }
 
       case ModelProvider.ZhiPu: {
-        runtimeModel = await LobeZhipuAI.fromAPIKey(params.zhipu);
+        runtimeModel = new LobeZhipuAI(params.zhipu);
         break;
       }
 

package/src/libs/agent-runtime/google/index.ts

@@ -27,7 +27,7 @@ import { ModelProvider } from '../types/type';
 import { AgentRuntimeError } from '../utils/createError';
 import { debugStream } from '../utils/debugStream';
 import { StreamingResponse } from '../utils/response';
-import { GoogleGenerativeAIStream, googleGenAIResultToStream } from '../utils/streams';
+import { GoogleGenerativeAIStream, convertIterableToStream } from '../utils/streams';
 import { parseDataUri } from '../utils/uriParser';
 
 enum HarmCategory {
@@ -97,7 +97,7 @@ export class LobeGoogleAI implements LobeRuntimeAI {
           tools: this.buildGoogleTools(payload.tools),
         });
 
-      const googleStream = googleGenAIResultToStream(geminiStreamResult);
+      const googleStream = convertIterableToStream(geminiStreamResult.stream);
       const [prod, useForDebug] = googleStream.tee();
 
       if (process.env.DEBUG_GOOGLE_CHAT_COMPLETION === '1') {

package/src/libs/agent-runtime/utils/streams/anthropic.ts

@@ -1,6 +1,5 @@
 import Anthropic from '@anthropic-ai/sdk';
 import type { Stream } from '@anthropic-ai/sdk/streaming';
-import { readableFromAsyncIterable } from 'ai';
 
 import { ChatStreamCallbacks } from '../../types';
 import {
@@ -8,6 +7,7 @@ import {
   StreamProtocolToolCallChunk,
   StreamStack,
   StreamToolCallChunkData,
+  convertIterableToStream,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
 } from './protocol';
@@ -96,12 +96,6 @@ export const transformAnthropicStream = (
   }
 };
 
-const chatStreamable = async function* (stream: AsyncIterable<Anthropic.MessageStreamEvent>) {
-  for await (const response of stream) {
-    yield response;
-  }
-};
-
 export const AnthropicStream = (
   stream: Stream<Anthropic.MessageStreamEvent> | ReadableStream,
   callbacks?: ChatStreamCallbacks,
@@ -109,7 +103,7 @@ export const AnthropicStream = (
   const streamStack: StreamStack = { id: '' };
 
   const readableStream =
-    stream instanceof ReadableStream ? stream : readableFromAsyncIterable(chatStreamable(stream));
+    stream instanceof ReadableStream ? stream : convertIterableToStream(stream);
 
   return readableStream
     .pipeThrough(createSSEProtocolTransformer(transformAnthropicStream, streamStack))

package/src/libs/agent-runtime/utils/streams/azureOpenai.ts

@@ -1,5 +1,4 @@
 import { ChatCompletions, ChatCompletionsFunctionToolCall } from '@azure/openai';
-import { readableFromAsyncIterable } from 'ai';
 import OpenAI from 'openai';
 import type { Stream } from 'openai/streaming';
 
@@ -9,6 +8,7 @@ import {
   StreamProtocolToolCallChunk,
   StreamStack,
   StreamToolCallChunkData,
+  convertIterableToStream,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
 } from './protocol';
@@ -69,19 +69,13 @@ const transformOpenAIStream = (chunk: ChatCompletions, stack: StreamStack): Stre
   };
 };
 
-const chatStreamable = async function* (stream: AsyncIterable<OpenAI.ChatCompletionChunk>) {
-  for await (const response of stream) {
-    yield response;
-  }
-};
-
 export const AzureOpenAIStream = (
   stream: Stream<OpenAI.ChatCompletionChunk> | ReadableStream,
   callbacks?: ChatStreamCallbacks,
 ) => {
   const stack: StreamStack = { id: '' };
   const readableStream =
-    stream instanceof ReadableStream ? stream : readableFromAsyncIterable(chatStreamable(stream));
+    stream instanceof ReadableStream ? stream : convertIterableToStream(stream);
 
   return readableStream
     .pipeThrough(createSSEProtocolTransformer(transformOpenAIStream, stack))

package/src/libs/agent-runtime/utils/streams/google-ai.ts

@@ -1,8 +1,4 @@
-import {
-  EnhancedGenerateContentResponse,
-  GenerateContentStreamResult,
-} from '@google/generative-ai';
-import { readableFromAsyncIterable } from 'ai';
+import { EnhancedGenerateContentResponse } from '@google/generative-ai';
 
 import { nanoid } from '@/utils/uuid';
 
@@ -11,7 +7,6 @@ import {
   StreamProtocolChunk,
   StreamStack,
   StreamToolCallChunkData,
-  chatStreamable,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
   generateToolCallId,
@@ -50,12 +45,6 @@ const transformGoogleGenerativeAIStream = (
   };
 };
 
-// only use for debug
-export const googleGenAIResultToStream = (stream: GenerateContentStreamResult) => {
-  // make the response to the streamable format
-  return readableFromAsyncIterable(chatStreamable(stream.stream));
-};
-
 export const GoogleGenerativeAIStream = (
   rawStream: ReadableStream<EnhancedGenerateContentResponse>,
   callbacks?: ChatStreamCallbacks,

package/src/libs/agent-runtime/utils/streams/ollama.ts

@@ -1,4 +1,3 @@
-import { readableFromAsyncIterable } from 'ai';
 import { ChatResponse } from 'ollama/browser';
 
 import { ChatStreamCallbacks } from '@/libs/agent-runtime';
@@ -7,6 +6,7 @@ import { nanoid } from '@/utils/uuid';
 import {
   StreamProtocolChunk,
   StreamStack,
+  convertIterableToStream,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
 } from './protocol';
@@ -20,19 +20,13 @@ const transformOllamaStream = (chunk: ChatResponse, stack: StreamStack): StreamP
   return { data: chunk.message.content, id: stack.id, type: 'text' };
 };
 
-const chatStreamable = async function* (stream: AsyncIterable<ChatResponse>) {
-  for await (const response of stream) {
-    yield response;
-  }
-};
-
 export const OllamaStream = (
   res: AsyncIterable<ChatResponse>,
   cb?: ChatStreamCallbacks,
 ): ReadableStream<string> => {
   const streamStack: StreamStack = { id: 'chat_' + nanoid() };
 
-  return readableFromAsyncIterable(chatStreamable(res))
+  return convertIterableToStream(res)
     .pipeThrough(createSSEProtocolTransformer(transformOllamaStream, streamStack))
     .pipeThrough(createCallbacksTransformer(cb));
 };

package/src/libs/agent-runtime/utils/streams/openai.ts

@@ -1,4 +1,3 @@
-import { readableFromAsyncIterable } from 'ai';
 import OpenAI from 'openai';
 import type { Stream } from 'openai/streaming';
 
@@ -10,6 +9,7 @@ import {
   StreamProtocolToolCallChunk,
   StreamStack,
   StreamToolCallChunkData,
+  convertIterableToStream,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
   generateToolCallId,
@@ -105,12 +105,6 @@ export const transformOpenAIStream = (
   }
 };
 
-const chatStreamable = async function* (stream: AsyncIterable<OpenAI.ChatCompletionChunk>) {
-  for await (const response of stream) {
-    yield response;
-  }
-};
-
 export const OpenAIStream = (
   stream: Stream<OpenAI.ChatCompletionChunk> | ReadableStream,
   callbacks?: ChatStreamCallbacks,
@@ -118,7 +112,7 @@ export const OpenAIStream = (
   const streamStack: StreamStack = { id: '' };
 
   const readableStream =
-    stream instanceof ReadableStream ? stream : readableFromAsyncIterable(chatStreamable(stream));
+    stream instanceof ReadableStream ? stream : convertIterableToStream(stream);
 
   return readableStream
     .pipeThrough(createSSEProtocolTransformer(transformOpenAIStream, streamStack))

package/src/libs/agent-runtime/utils/streams/protocol.ts

@@ -1,3 +1,5 @@
+import { readableFromAsyncIterable } from 'ai';
+
 import { ChatStreamCallbacks } from '@/libs/agent-runtime';
 
 export interface StreamStack {
@@ -42,6 +44,11 @@ export const chatStreamable = async function* <T>(stream: AsyncIterable<T>) {
   }
 };
 
+// make the response to the streamable format
+export const convertIterableToStream = <T>(stream: AsyncIterable<T>) => {
+  return readableFromAsyncIterable(chatStreamable(stream));
+};
+
 export const createSSEProtocolTransformer = (
   transformer: (chunk: any, stack: StreamStack) => StreamProtocolChunk,
   streamStack?: StreamStack,

package/src/libs/agent-runtime/utils/streams/qwen.ts

@@ -1,4 +1,3 @@
-import { readableFromAsyncIterable } from 'ai';
 import { ChatCompletionContentPartText } from 'ai/prompts';
 import OpenAI from 'openai';
 import { ChatCompletionContentPart } from 'openai/resources/index.mjs';
@@ -9,7 +8,7 @@ import {
   StreamProtocolChunk,
   StreamProtocolToolCallChunk,
   StreamToolCallChunkData,
-  chatStreamable,
+  convertIterableToStream,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
   generateToolCallId,
@@ -86,7 +85,7 @@ export const QwenAIStream = (
   callbacks?: ChatStreamCallbacks,
 ) => {
   const readableStream =
-    stream instanceof ReadableStream ? stream : readableFromAsyncIterable(chatStreamable(stream));
+    stream instanceof ReadableStream ? stream : convertIterableToStream(stream);
 
   return readableStream
     .pipeThrough(createSSEProtocolTransformer(transformQwenStream))

package/src/libs/agent-runtime/utils/streams/wenxin.test.ts

@@ -2,8 +2,9 @@ import { describe, expect, it, vi } from 'vitest';
 
 import * as uuidModule from '@/utils/uuid';
 
+import { convertIterableToStream } from '../../utils/streams/protocol';
 import { ChatResp } from '../../wenxin/type';
-import { WenxinResultToStream, WenxinStream } from './wenxin';
+import { WenxinStream } from './wenxin';
 
 const dataStream = [
   {
@@ -95,7 +96,7 @@ describe('WenxinStream', () => {
       },
     };
 
-    const stream = WenxinResultToStream(mockWenxinStream);
+    const stream = convertIterableToStream(mockWenxinStream);
 
     const onStartMock = vi.fn();
     const onTextMock = vi.fn();
@@ -142,7 +143,10 @@ describe('WenxinStream', () => {
 
     expect(onStartMock).toHaveBeenCalledTimes(1);
     expect(onTextMock).toHaveBeenNthCalledWith(1, '"当然可以，"');
-    expect(onTextMock).toHaveBeenNthCalledWith(2, '"以下是一些建议的自驾游路线，它们涵盖了各种不同的风景和文化体验：\\n\\n1. **西安-敦煌历史文化之旅**：\\n\\n\\n\\t* 路线：西安"');
+    expect(onTextMock).toHaveBeenNthCalledWith(
+      2,
+      '"以下是一些建议的自驾游路线，它们涵盖了各种不同的风景和文化体验：\\n\\n1. **西安-敦煌历史文化之旅**：\\n\\n\\n\\t* 路线：西安"',
+    );
     expect(onTokenMock).toHaveBeenCalledTimes(6);
     expect(onCompletionMock).toHaveBeenCalledTimes(1);
   });

package/src/libs/agent-runtime/utils/streams/wenxin.ts

@@ -1,5 +1,3 @@
-import { readableFromAsyncIterable } from 'ai';
-
 import { ChatStreamCallbacks } from '@/libs/agent-runtime';
 import { nanoid } from '@/utils/uuid';
 
@@ -7,7 +5,6 @@ import { ChatResp } from '../../wenxin/type';
 import {
   StreamProtocolChunk,
   StreamStack,
-  chatStreamable,
   createCallbacksTransformer,
   createSSEProtocolTransformer,
 } from './protocol';
@@ -29,11 +26,6 @@ const transformERNIEBotStream = (chunk: ChatResp): StreamProtocolChunk => {
   };
 };
 
-export const WenxinResultToStream = (stream: AsyncIterable<ChatResp>) => {
-  // make the response to the streamable format
-  return readableFromAsyncIterable(chatStreamable(stream));
-};
-
 export const WenxinStream = (
   rawStream: ReadableStream<ChatResp>,
   callbacks?: ChatStreamCallbacks,

package/src/libs/agent-runtime/wenxin/index.ts

@@ -10,7 +10,8 @@ import { ChatCompetitionOptions, ChatStreamPayload } from '../types';
 import { AgentRuntimeError } from '../utils/createError';
 import { debugStream } from '../utils/debugStream';
 import { StreamingResponse } from '../utils/response';
-import { WenxinResultToStream, WenxinStream } from '../utils/streams/wenxin';
+import { convertIterableToStream } from '../utils/streams';
+import { WenxinStream } from '../utils/streams/wenxin';
 import { ChatResp } from './type';
 
 interface ChatErrorCode {
@@ -46,7 +47,7 @@ export class LobeWenxinAI implements LobeRuntimeAI {
         payload.model,
       );
 
-      const wenxinStream = WenxinResultToStream(result as AsyncIterable<ChatResp>);
+      const wenxinStream = convertIterableToStream(result as AsyncIterable<ChatResp>);
 
       const [prod, useForDebug] = wenxinStream.tee();
 

package/src/libs/agent-runtime/zhipu/index.test.ts

@@ -2,7 +2,7 @@
 import { OpenAI } from 'openai';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { ChatStreamCallbacks, LobeOpenAI } from '@/libs/agent-runtime';
+import { ChatStreamCallbacks, LobeOpenAI, LobeOpenAICompatibleRuntime } from '@/libs/agent-runtime';
 import * as debugStreamModule from '@/libs/agent-runtime/utils/debugStream';
 
 import * as authTokenModule from './authToken';
@@ -24,28 +24,11 @@ describe('LobeZhipuAI', () => {
     vi.restoreAllMocks();
   });
 
-  describe('fromAPIKey', () => {
-    it('should correctly initialize with an API key', async () => {
-      const lobeZhipuAI = await LobeZhipuAI.fromAPIKey({ apiKey: 'test_api_key' });
-      expect(lobeZhipuAI).toBeInstanceOf(LobeZhipuAI);
-      expect(lobeZhipuAI.baseURL).toEqual('https://open.bigmodel.cn/api/paas/v4');
-    });
-
-    it('should throw an error if API key is invalid', async () => {
-      vi.spyOn(authTokenModule, 'generateApiToken').mockRejectedValue(new Error('Invalid API Key'));
-      try {
-        await LobeZhipuAI.fromAPIKey({ apiKey: 'asd' });
-      } catch (e) {
-        expect(e).toEqual({ errorType: invalidErrorType });
-      }
-    });
-  });
-
   describe('chat', () => {
-    let instance: LobeZhipuAI;
+    let instance: LobeOpenAICompatibleRuntime;
 
     beforeEach(async () => {
-      instance = await LobeZhipuAI.fromAPIKey({
+      instance = new LobeZhipuAI({
         apiKey: 'test_api_key',
       });
 
@@ -131,9 +114,9 @@ describe('LobeZhipuAI', () => {
       const calledWithParams = spyOn.mock.calls[0][0];
 
       expect(calledWithParams.messages[1].content).toEqual([{ type: 'text', text: 'Hello again' }]);
-      expect(calledWithParams.temperature).toBeUndefined(); // temperature 0 should be undefined
+      expect(calledWithParams.temperature).toBe(0); // temperature 0 should be undefined
       expect((calledWithParams as any).do_sample).toBeTruthy(); // temperature 0 should be undefined
-      expect(calledWithParams.top_p).toEqual(0.99); // top_p should be transformed correctly
+      expect(calledWithParams.top_p).toEqual(1); // top_p should be transformed correctly
     });
 
     describe('Error', () => {
@@ -175,7 +158,7 @@ describe('LobeZhipuAI', () => {
 
       it('should throw AgentRuntimeError with NoOpenAIAPIKey if no apiKey is provided', async () => {
         try {
-          await LobeZhipuAI.fromAPIKey({ apiKey: '' });
+          new LobeZhipuAI({ apiKey: '' });
         } catch (e) {
           expect(e).toEqual({ errorType: invalidErrorType });
         }
@@ -221,7 +204,7 @@ describe('LobeZhipuAI', () => {
         };
         const apiError = new OpenAI.APIError(400, errorInfo, 'module error', {});
 
-        instance = await LobeZhipuAI.fromAPIKey({
+        instance = new LobeZhipuAI({
           apiKey: 'test',
 
           baseURL: 'https://abc.com/v2',

package/src/libs/agent-runtime/zhipu/index.ts

@@ -1,99 +1,21 @@
-import OpenAI, { ClientOptions } from 'openai';
-
-import { LobeRuntimeAI } from '../BaseAI';
-import { AgentRuntimeErrorType } from '../error';
-import { ChatCompetitionOptions, ChatStreamPayload, ModelProvider } from '../types';
-import { AgentRuntimeError } from '../utils/createError';
-import { debugStream } from '../utils/debugStream';
-import { desensitizeUrl } from '../utils/desensitizeUrl';
-import { handleOpenAIError } from '../utils/handleOpenAIError';
-import { convertOpenAIMessages } from '../utils/openaiHelpers';
-import { StreamingResponse } from '../utils/response';
-import { OpenAIStream } from '../utils/streams';
-import { generateApiToken } from './authToken';
-
-const DEFAULT_BASE_URL = 'https://open.bigmodel.cn/api/paas/v4';
-
-export class LobeZhipuAI implements LobeRuntimeAI {
-  private client: OpenAI;
-
-  baseURL: string;
-
-  constructor(oai: OpenAI) {
-    this.client = oai;
-    this.baseURL = this.client.baseURL;
-  }
-
-  static async fromAPIKey({ apiKey, baseURL = DEFAULT_BASE_URL, ...res }: ClientOptions = {}) {
-    const invalidZhipuAPIKey = AgentRuntimeError.createError(
-      AgentRuntimeErrorType.InvalidProviderAPIKey,
-    );
-
-    if (!apiKey) throw invalidZhipuAPIKey;
-
-    let token: string;
-
-    try {
-      token = await generateApiToken(apiKey);
-    } catch {
-      throw invalidZhipuAPIKey;
-    }
-
-    const header = { Authorization: `Bearer ${token}` };
-    const llm = new OpenAI({ apiKey, baseURL, defaultHeaders: header, ...res });
-
-    return new LobeZhipuAI(llm);
-  }
-
-  async chat(payload: ChatStreamPayload, options?: ChatCompetitionOptions) {
-    try {
-      const params = await this.buildCompletionsParams(payload);
-
-      const response = await this.client.chat.completions.create(
-        params as unknown as OpenAI.ChatCompletionCreateParamsStreaming,
-      );
-
-      const [prod, debug] = response.tee();
-
-      if (process.env.DEBUG_ZHIPU_CHAT_COMPLETION === '1') {
-        debugStream(debug.toReadableStream()).catch(console.error);
-      }
-
-      return StreamingResponse(OpenAIStream(prod, options?.callback), {
-        headers: options?.headers,
-      });
-    } catch (error) {
-      const { errorResult, RuntimeError } = handleOpenAIError(error);
-
-      const errorType = RuntimeError || AgentRuntimeErrorType.ProviderBizError;
-      let desensitizedEndpoint = this.baseURL;
-
-      if (this.baseURL !== DEFAULT_BASE_URL) {
-        desensitizedEndpoint = desensitizeUrl(this.baseURL);
-      }
-      throw AgentRuntimeError.chat({
-        endpoint: desensitizedEndpoint,
-        error: errorResult,
-        errorType,
-        provider: ModelProvider.ZhiPu,
-      });
-    }
-  }
-
-  private async buildCompletionsParams(payload: ChatStreamPayload) {
-    const { messages, temperature, top_p, ...params } = payload;
-
-    return {
-      messages: await convertOpenAIMessages(messages as any),
-      ...params,
-      do_sample: temperature === 0,
-      stream: true,
-      // 当前的模型侧不支持 top_p=1 和 temperature 为 0
-      // refs: https://zhipu-ai.feishu.cn/wiki/TUo0w2LT7iswnckmfSEcqTD0ncd
-      temperature: temperature === 0 ? undefined : temperature,
-      top_p: top_p === 1 ? 0.99 : top_p,
-    };
-  }
-}
-
-export default LobeZhipuAI;
+import OpenAI from 'openai';
+
+import { ChatStreamPayload, ModelProvider } from '../types';
+import { LobeOpenAICompatibleFactory } from '../utils/openaiCompatibleFactory';
+
+export const LobeZhipuAI = LobeOpenAICompatibleFactory({
+  baseURL: 'https://open.bigmodel.cn/api/paas/v4',
+  chatCompletion: {
+    handlePayload: ({ temperature, ...payload }: ChatStreamPayload) =>
+      ({
+        ...payload,
+        do_sample: temperature === 0,
+        stream: true,
+        temperature,
+      }) as OpenAI.ChatCompletionCreateParamsStreaming,
+  },
+  debug: {
+    chatCompletion: () => process.env.DEBUG_ZHIPU_CHAT_COMPLETION === '1',
+  },
+  provider: ModelProvider.ZhiPu,
+});

package/src/libs/trpc/middleware/jwtPayload.test.ts

@@ -2,10 +2,10 @@
 import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import * as utils from '@/app/(backend)/middleware/auth/utils';
 import { createCallerFactory } from '@/libs/trpc';
 import { trpc } from '@/libs/trpc/init';
 import { AuthContext, createContextInner } from '@/server/context';
+import * as utils from '@/utils/server/jwt';
 
 import { jwtPayloadChecker } from './jwtPayload';
 

package/src/libs/trpc/middleware/jwtPayload.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
 
-import { getJWTPayload } from '@/app/(backend)/middleware/auth/utils';
 import { trpc } from '@/libs/trpc/init';
+import { getJWTPayload } from '@/utils/server/jwt';
 
 export const jwtPayloadChecker = trpc.middleware(async (opts) => {
   const { ctx } = opts;

package/src/libs/trpc/middleware/keyVaults.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
 
-import { getJWTPayload } from '@/app/(backend)/middleware/auth/utils';
 import { trpc } from '@/libs/trpc/init';
+import { getJWTPayload } from '@/utils/server/jwt';
 
 export const keyVaults = trpc.middleware(async (opts) => {
   const { ctx } = opts;

package/src/utils/server/jwt.test.ts

@@ -0,0 +1,62 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { NON_HTTP_PREFIX } from '@/const/auth';
+
+import { getJWTPayload } from './jwt';
+
+let enableClerkMock = false;
+let enableNextAuthMock = false;
+
+vi.mock('@/const/auth', async (importOriginal) => {
+  const data = await importOriginal();
+
+  return {
+    ...(data as any),
+    get enableClerk() {
+      return enableClerkMock;
+    },
+    get enableNextAuth() {
+      return enableNextAuthMock;
+    },
+  };
+});
+
+vi.mock('@/config/app', () => ({
+  getAppConfig: vi.fn(),
+}));
+
+describe('getJWTPayload', () => {
+  it('should parse JWT payload for non-HTTPS token', async () => {
+    const token = `${NON_HTTP_PREFIX}.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ`;
+    const payload = await getJWTPayload(token);
+    expect(payload).toEqual({
+      sub: '1234567890',
+      name: 'John Doe',
+      iat: 1516239022,
+    });
+  });
+
+  it('should verify and parse JWT payload for HTTPS token', async () => {
+    const token =
+      'eyJhbGciOiJIUzI1NiJ9.eyJhY2Nlc3NDb2RlIjoiIiwidXNlcklkIjoiMDAxMzYyYzMtNDhjNS00NjM1LWJkM2ItODM3YmZmZjU4ZmMwIiwiYXBpS2V5IjoiYWJjIiwiZW5kcG9pbnQiOiJhYmMiLCJpYXQiOjE3MTY4MDIyMjUsImV4cCI6MTAwMDAwMDAwMDE3MTY4MDIwMDB9.FF0FxsE8Cajs-_hv5GD0TNUDwvekAkI9l_LL_IOPdGQ';
+    const payload = await getJWTPayload(token);
+    expect(payload).toEqual({
+      accessCode: '',
+      apiKey: 'abc',
+      endpoint: 'abc',
+      exp: 10000000001716802000,
+      iat: 1716802225,
+      userId: '001362c3-48c5-4635-bd3b-837bfff58fc0',
+    });
+  });
+
+  it('should not verify success and parse JWT payload for dated token', async () => {
+    const token =
+      'eyJhbGciOiJIUzI1NiJ9.eyJhY2Nlc3NDb2RlIjoiIiwidXNlcklkIjoiYWY3M2JhODktZjFhMy00YjliLWEwM2QtZGViZmZlMzE4NmQxIiwiYXBpS2V5IjoiYWJjIiwiZW5kcG9pbnQiOiJhYmMiLCJpYXQiOjE3MTY3OTk5ODAsImV4cCI6MTcxNjgwMDA4MH0.8AGFsLcwyrQG82kVUYOGFXHIwihm2n16ctyArKW9100';
+    try {
+      await getJWTPayload(token);
+    } catch (e) {
+      expect(e).toEqual(new TypeError('"exp" claim timestamp check failed'));
+    }
+  });
+});

package/src/utils/server/jwt.ts

@@ -0,0 +1,32 @@
+import { importJWK, jwtVerify } from 'jose';
+
+import {
+  JWTPayload,
+  JWT_SECRET_KEY,
+  NON_HTTP_PREFIX,
+} from '@/const/auth';
+
+export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
+  //如果是 HTTP 协议发起的请求，直接解析 token
+  // 这是一个非常 hack 的解决方案，未来要找更好的解决方案来处理这个问题
+  // refs: https://github.com/lobehub/lobe-chat/pull/1238
+  if (token.startsWith(NON_HTTP_PREFIX)) {
+    const jwtParts = token.split('.');
+
+    const payload = jwtParts[1];
+
+    return JSON.parse(atob(payload));
+  }
+
+  const encoder = new TextEncoder();
+  const secretKey = await crypto.subtle.digest('SHA-256', encoder.encode(JWT_SECRET_KEY));
+
+  const jwkSecretKey = await importJWK(
+    { k: Buffer.from(secretKey).toString('base64'), kty: 'oct' },
+    'HS256',
+  );
+
+  const { payload } = await jwtVerify(token, jwkSecretKey);
+
+  return payload as JWTPayload;
+};