Upload 14 files

src/lightweight-client-express.js

@@ -209,9 +209,6 @@ app.post('/v1/chat/completions', authenticate, async (req, res) => {
       });
     }
     
-    // 构建Notion请求
-    const notionRequestBody = buildNotionRequest(requestData);
-    
     // 处理流式响应
     if (requestData.stream) {
       res.setHeader('Content-Type', 'text/event-stream');
@@ -219,7 +216,7 @@ app.post('/v1/chat/completions', authenticate, async (req, res) => {
       res.setHeader('Connection', 'keep-alive');
       
       logger.info(`开始流式响应`);
-      const stream = await streamNotionResponse(notionRequestBody);
+      const stream = await streamNotionResponse(requestData);
       stream.pipe(res);
       
       // 处理客户端断开连接
@@ -231,7 +228,7 @@ app.post('/v1/chat/completions', authenticate, async (req, res) => {
       // 创建一个内部流来收集完整响应
       logger.info(`开始非流式响应`);
       const chunks = [];
-      const stream = await streamNotionResponse(notionRequestBody);
+      const stream = await streamNotionResponse(requestData);
       
       return new Promise((resolve, reject) => {
         stream.on('data', (chunk) => {

src/lightweight-client.js

@@ -311,7 +311,7 @@ async function fetchAndSetNotionIds(cookie) {
 }
 
 // 构建Notion请求
-function buildNotionRequest(requestData) {
+function buildNotionRequest(requestData, userId, spaceId) {
   // 当前时间
   const now = new Date();
   // 格式化为ISO字符串，确保包含毫秒和时区
@@ -346,8 +346,8 @@ function buildNotionRequest(requestData) {
   transcript.push(new NotionTranscriptItem({
     type: "context",
     value: new NotionTranscriptContextValue({
-      userId: FETCHED_NOTION_USER_ID,
-      spaceId: NOTION_SPACE_ID,
+      userId: userId,
+      spaceId: spaceId,
       surface: "home_module",
       timezone: "America/Los_Angeles",
       userName: userName,
@@ -387,7 +387,7 @@ function buildNotionRequest(requestData) {
       transcript.push(new NotionTranscriptItemByuser({
         type: "user",
         value: [[content]],
-        userId: FETCHED_NOTION_USER_ID,
+        userId: userId,
         createdAt: message.createdAt || isoString
       }));
     } else if (message.role === "user") {
@@ -395,7 +395,7 @@ function buildNotionRequest(requestData) {
       transcript.push(new NotionTranscriptItemByuser({
         type: "user",
         value: [[content]],
-        userId: FETCHED_NOTION_USER_ID,
+        userId: userId,
         createdAt: message.createdAt || isoString
       }));
     } else if (message.role === "assistant") {
@@ -411,7 +411,7 @@ function buildNotionRequest(requestData) {
   
   // 创建请求体
   return new NotionRequestBody({
-    spaceId: NOTION_SPACE_ID,
+    spaceId: spaceId,
     transcript: transcript,
     createThread: true,
     traceId: randomUUID(),
@@ -426,24 +426,31 @@ function buildNotionRequest(requestData) {
 }
 
 // 流式处理Notion响应
-async function streamNotionResponse(notionRequestBody) {
+async function streamNotionResponse(requestData) {
   const chunkQueue = new PassThrough();
   let timeoutId = null;
 
   try {
-    // 动态获取cookie
+    // 动态获取cookie并查找其对应的ID
     const currentCookie = getCookie();
     if (!currentCookie) {
-      throw new Error("无法获取 Notion cookie");
+      throw new Error("无法获取 Notion cookie，请检查配置");
     }
-    NOTION_COOKIE = currentCookie; // 更新当前使用的cookie
+    const userId = NOTION_USER_IDS[currentCookie];
+    const spaceId = NOTION_SPACE_IDS[currentCookie];
+
+    if (!userId || !spaceId) {
+      throw new Error(`无法找到 cookie ...${currentCookie.slice(-10)} 对应的ID`);
+    }
+
+    // 使用正确的ID构建请求体
+    const notionRequestBody = buildNotionRequest(requestData, userId, spaceId);
     
-    // 获取对应的 space_id 和 user_id
-    notionRequestBody.spaceId = NOTION_SPACE_IDS[currentCookie];
+    // 设置请求头
     const headers = {
       'Content-Type': 'application/json',
       'Cookie': currentCookie,
-      'x-notion-active-user-header': NOTION_USER_IDS[currentCookie],
+      'x-notion-active-user-header': userId,
       "accept": "application/json",
       "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36"
     };
@@ -872,7 +879,7 @@ async function initialize() {
   for (const cookie of NOTION_COOKIES) {
     try {
       const ids = await fetchAndSetNotionIds(cookie);
-      if (ids) {
+      if (ids && ids.spaceId && ids.userId) {
         NOTION_SPACE_IDS[cookie] = ids.spaceId;
         NOTION_USER_IDS[cookie] = ids.userId;
         logger.success(`成功获取 cookie 的 ID: ...${cookie.slice(-10)}`);