Upload 15 files

.env

@@ -0,0 +1,22 @@
+# Notion的cookie，请把浏览器Cookie部分完整复制下来,多个cookie用|分割
+NOTION_COOKIE="notion_browser_id=fdf38010-21d4-433e-a2fd-65cab87f49f6; device_id=202d872b-594c-81d6-9a95-003bb32158fc; NEXT_LOCALE=zh-CN; _gcl_au=1.1.132916819.1748542408; _ga=GA1.1.1824875636.1748542409; _fbp=fb.1.1748542411909.266391455622580792; notion_user_id=200d872b-594c-81d3-bb1b-00024f30311d; p_sync_session=%7B%22tokenId%22%3A%22v02%3Async_session%3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlax4r-9CwW1tAnM4hm7SsLu9h-MytbYGKknbSPCj2F07ufgzyShCKc0MIvr1LYGI2ihhhjiqn8aHlsgy2otKQnuChsnq0LwuaQVt%22%2C%22userIds%22%3A%5B%22200d872b-594c-81d3-bb1b-00024f30311d%22%5D%7D; _cioid=200d872b594c81d3bb1b00024f30311d; notion_cookie_sync_completed=%7B%22completed%22%3Atrue%2C%22version%22%3A4%2C%22attempts%22%3A1%7D; notion_users=[%22200d872b-594c-81d3-bb1b-00024f30311d%22]; _hjSessionUser_3664679=eyJpZCI6IjgwYjAzZGViLWUxZmMtNTA3MC1iNDA2LWMyNzhlODdiZDdlNyIsImNyZWF0ZWQiOjE3NDg1NDI0MTE4ODEsImV4aXN0aW5nIjp0cnVlfQ==; notion_check_cookie_consent=false; _cfuvid=Pd_QxMVa8SMbHI8r0zNaAYlgczHrP_plvfapRgoHamE-1749308468696-0.0.1.1-604800000; _rdt_uuid=1748542408747.963fa76b-30e7-4e18-ab01-aba3f7a1457e; _hjSession_3664679=eyJpZCI6IjJmOTk2OTQzLTNjMzktNDE3ZS05YmFjLWVkZGJiNDlmNzBlNSIsImMiOjE3NDkzMDg0Nzc5MzcsInMiOjAsInIiOjAsInNiIjowLCJzciI6MCwic2UiOjAsImZzIjowLCJzcCI6MX0=; __cf_bm=9qEQ2V9hIxBqYj.ajFLUvkgaSFQRRvQbSweUzjulXLQ-1749308501-1.0.1.1-LsQtYoKBUqSSz23TcFlKQ_HKBokINZNca_y_5K4DflDfjU8LrpAylSqnX4tAn97QJ51zBJ9uMZneTnU_tPoBCokRsFffnV2Kt69cp_U5KcvakaUpeNtVModlsviSJKmQ; notion_locale=zh-CN/autodetect; token_v2=v03%3AeyJhbGciOiJkaXIiLCJraWQiOiJwcm9kdWN0aW9uOnRva2VuLXYzOjIwMjQtMTEtMDciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..udCqaHPmeajJluGEoRCwMQ.KwYcnDQeUSch7kuEiW2rD7T7Pwwg6CaU9UM2b-xfydsnnFdHNnxLFSGBeyVNbFaMfy6sWw0P9rSujhF9iov_tAvnhZ2IFEG4ND9Jwu8VNQwsOLQUAj3WfHGaHnTAGEbgNN2vRXtsb_CHYi4PJtd5bweDEEBtMhZIDBcwUTCIJpXIk9pS8aPfY5N6_weYJSJ6a959TerGpfRMZDasH_C0MDxLgiJZft6qGmarx0XOhU_QkUONs6pFfe1no029nLwy1clKJLAshicHTKx7mqmXIjfMWLaHXbKKTC08Pekxhxwx35kwadnS1JgYI85-I0SQZ9VanCs82_CAfDUBIbw5VWn6xQEmCOTpo1mf68vSX_k.lCEqDypSmYd-LZkB3MvzOpu8YXw6E2Slhy0F1Kh9xPk; _ga_9ZJ8CB186L=GS2.1.s1749308471$o3$g1$t1749308568$j60$l0$h0|notion_browser_id=a8182934-adff-461b-8c79-1506999adea4; device_id=200d872b-594c-812e-b369-003bcda8cdcd; _gcl_au=1.1.1170453355.1748542388; _ga=GA1.1.701605925.1748542389; _hjSessionUser_3664679=eyJpZCI6ImVlMmY4ZDIxLTMxY2QtNWMzNS1hZmQ1LThmYThjMjBiMTdhMCIsImNyZWF0ZWQiOjE3NDg1NDIzOTExMzcsImV4aXN0aW5nIjp0cnVlfQ==; notion_check_cookie_consent=false; _fbp=fb.1.1749309115969.575678538958199822; _hjSession_3664679=eyJpZCI6ImYyMGQ5MThkLTE5MWMtNDJlZi04ZTJlLTQwZTk3ZmQ4MzM2YiIsImMiOjE3NDkzMDkxMTcxODYsInMiOjAsInIiOjAsInNiIjowLCJzciI6MCwic2UiOjAsImZzIjowLCJzcCI6MH0=; NEXT_LOCALE=en-US; _cfuvid=AxS6qsfXNaj6l97fAzOZU19l.Tq0B7u1SDbVVm._.J4-1749309401915-0.0.1.1-604800000; notion_locale=en-US/user_choice; _rdt_uuid=1748542388717.64a3c6ac-6961-4401-9aec-9dfbb27dd932; csrf=3c4feb4b-6326-40c0-9475-4e1884f6cbbd; notion_user_id=20bd872b-594c-81a1-b249-0002d1feacbe; notion_users=%5B%2220bd872b-594c-81a1-b249-0002d1feacbe%22%5D; p_sync_session=%7B%22tokenId%22%3A%22v02%3Async_session%3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGn5K6DxWWr51s8yjzd8Tv7u9h-MytbYGKknbSPCj2F07ufgzySUZeMoMevz1LdHU0yNhhj-uycaHls1l2thMEH6B0pW81u17PwVt%22%2C%22userIds%22%3A%5B%2220bd872b-594c-81a1-b249-0002d1feacbe%22%5D%7D; _cioid=20bd872b594c81a1b2490002d1feacbe; token_v2=v03%3AeyJhbGciOiJkaXIiLCJraWQiOiJwcm9kdWN0aW9uOnRva2VuLXYzOjIwMjQtMTEtMDciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..g6nQTmUif39kpQiFt5x-1g.lwqScXxX6fzfW4oAw6_bJh1CrPh5N0vjBFNyo0_g3uv424aZFa_1a3pgTfDbJzydbbLnYDaNnLBZcYjfeZkcgz8dMpuZ2WtlHscPQoEPaXVjzD3PidXmUPmRyA2sNVMZJtaLd39_zJra8j8pKLYsCVEdfrgj_QYdedTAvAVjbA1twjdEv0Bl3ur8o63kQUOkzIWro5hDgqAr4AMkkCzmNR2X2AtjvOZFdt9YlnYtLn-tdCYEtOZGV-zhNL34QjXZVWmdnnaQg8p0lBm9ZP-y3hztbjwLTVYPNBDKnhZeu-Qra96KZZitMZDsZt944GbKUTOPL0PF8vULVBrYyoHPQw.y4DOnuNzKTwrPk0WVKUv1RERNMqSt1MuBM9MGuM5uMM; _ga_9ZJ8CB186L=GS2.1.s1749309117$o3$g1$t1749311301$j60$l0$h0; __cf_bm=a09Uutq_rs.5z8Bf6fJvEply_vQblokHM1U6Yd9y4Yo-1749311305-1.0.1.1-H3RXZorJC7x1BR8jgC2fSwewxFUMy2P06KP2_FHT99tHLoZ5EKDfj_Olhohp2qTDbAJXDEM_ofP2_Qywfs4bA7jJgSCAGX_PKpHCoBTOQ_KqFb8DZ40X9cA7KDo3CSSW"
+# 反代密码，没有的话默认密码是 default_token
+PROXY_AUTH_TOKEN="sk-123456"
+# （可选）代理地址，如果填了所有请求将经过代理，针对notion限制ip对策，可使用http或socks5代理（notion支持ipv6哦，有ipv6池子的可以拿出来了）
+PROXY_URL=""
+# 新版本正常用户不需要，如果不是有特殊需求请一定留空（只有使用notion teams白嫖别人space的用户需填写）
+NOTION_SPACE_ID=""
+# 新版本正常用户不需要，如果不是有特殊需求请一定留空（只有使用notion teams白嫖别人space的用户需填写）
+NOTION_ACTIVE_USER_HEADER=""
+# 是否使用原生代理池，如果为true，则使用原生代理池，如果为false，则使用代理池
+USE_NATIVE_PROXY_POOL=true
+
+# 代理服务器配置
+# 平台选择：auto(自动检测), windows, linux, android
+PROXY_SERVER_PLATFORM="auto"
+# ���理服务器端口
+PROXY_SERVER_PORT=10655
+# 代理服务器日志文件路径
+PROXY_SERVER_LOG_PATH="./proxy_server.log"
+# 是否启用代理服务器
+ENABLE_PROXY_SERVER=true

Dockerfile

@@ -1,32 +1,23 @@
-# Use an official Node.js runtime as a parent image
-FROM node:18-slim
-
-# Set the working directory in the container
-WORKDIR /app
-
-# Copy package.json and package-lock.json to the working directory
-COPY package*.json ./
-
-# Install app dependencies
-# Using --production flag to install only production dependencies
-# Playwright needs special handling to download browsers
-# We need to install dependencies first to make sure Playwright downloads its browsers.
-RUN npm install --production
-
-# Copy the rest of the application source code to the working directory
-COPY . .
-
-# Grant execute permission to the proxy server binary
-RUN chmod +x /app/src/proxy/chrome_proxy_server_linux_amd64
-
-# Change ownership of the app directory to the node user
-RUN chown -R node:node /app
-
-# Switch to a non-root user
-USER node
-
-# Make port 7860 available to the world outside this container
-EXPOSE 7860
-
-# Define the command to run the app
+# Use an official Node.js runtime as a parent image
+FROM node:18-slim
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install app dependencies
+# Using --production flag to install only production dependencies
+# Playwright needs special handling to download browsers
+# We need to install dependencies first to make sure Playwright downloads its browsers.
+RUN npm install --production
+
+# Copy the rest of the application source code to the working directory
+COPY . .
+
+# Make port 7860 available to the world outside this container
+EXPOSE 7860
+
+# Define the command to run the app
 CMD ["npm", "start"] 

package-lock.json

@@ -16,7 +16,8 @@
         "https-proxy-agent": "^7.0.2",
         "jsdom": "^22.1.0",
         "node-fetch": "^3.3.2",
-        "playwright": "^1.40.1"
+        "playwright": "^1.40.1",
+        "socks-proxy-agent": "^8.0.5"
       },
       "devDependencies": {
         "nodemon": "^3.0.2"
@@ -995,6 +996,18 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -1056,6 +1069,11 @@
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "license": "MIT"
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
     "node_modules/jsdom": {
       "version": "22.1.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
@@ -1772,6 +1790,67 @@
         "node": ">=10"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
+      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",

package.json

@@ -1,33 +1,34 @@
-{
-  "name": "notion2api-nodejs",
-  "version": "1.0.0",
-  "description": "Notion API client with lightweight browser-free option",
-  "main": "src/lightweight-client-express.js",
-  "type": "module",
-  "scripts": {
-    "start": "node src/lightweight-client-express.js",
-    "dev": "nodemon src/lightweight-client-express.js",
-    "original": "node src/index.js"
-  },
-  "keywords": [
-    "notion",
-    "openai",
-    "api",
-    "bridge"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^1.9.0",
-    "chalk": "^4.1.2",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
-    "https-proxy-agent": "^7.0.2",
-    "jsdom": "^22.1.0",
-    "node-fetch": "^3.3.2",
-    "playwright": "^1.40.1"
-  },
-  "devDependencies": {
-    "nodemon": "^3.0.2"
-  }
-}
+{
+  "name": "notion2api-nodejs",
+  "version": "1.0.0",
+  "description": "Notion API client with lightweight browser-free option",
+  "main": "src/lightweight-client-express.js",
+  "type": "module",
+  "scripts": {
+    "start": "node src/lightweight-client-express.js",
+    "dev": "nodemon src/lightweight-client-express.js",
+    "original": "node src/index.js"
+  },
+  "keywords": [
+    "notion",
+    "openai",
+    "api",
+    "bridge"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "axios": "^1.9.0",
+    "chalk": "^4.1.2",
+    "dotenv": "^16.3.1",
+    "express": "^4.18.2",
+    "https-proxy-agent": "^7.0.2",
+    "jsdom": "^22.1.0",
+    "node-fetch": "^3.3.2",
+    "playwright": "^1.40.1",
+    "socks-proxy-agent": "^8.0.5"
+  },
+  "devDependencies": {
+    "nodemon": "^3.0.2"
+  }
+}

proxy_server.log

@@ -102,3 +102,33 @@
 2025/06/07 23:50:04.640668 chrome_tls_proxy.go:710: 已禁用并发限制：允许同一IP发起多个并发请求
 2025/06/07 23:50:04.640668 chrome_tls_proxy.go:711: 已强制使用IPv4连接，并使用8.8.8.8作为DNS服务器
 2025/06/07 23:50:04.640668 chrome_tls_proxy.go:712: 使用Chrome浏览器的TLS指纹进行连接
+2025/06/08 00:44:51.400537 chrome_tls_proxy.go:706: Chrome TLS指纹代理服务器运行在 http://localhost:10655/proxy
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:707: 使用方法：向/proxy发送POST请求，请求体包含目标URL、方法、请求头和请求体
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:708: 支持流式响应，需要在请求体中添加 'stream': true
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:709: 已禁用速率限制：允许无限制请求
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:710: 已禁用并发限制：允许同一IP发起多个并发请求
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:711: 已强制使用IPv4连接，并使用8.8.8.8作为DNS服务器
+2025/06/08 00:44:51.408056 chrome_tls_proxy.go:712: 使用Chrome浏览器的TLS指纹进行连接
+2025/06/08 00:45:24.831086 chrome_tls_proxy.go:706: Chrome TLS指纹代理服务器运行在 http://localhost:10655/proxy
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:707: 使用方法：向/proxy发送POST请求，请求体包含目标URL、方法、请求头和请求体
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:708: 支持流式响应，需要在请求体中添加 'stream': true
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:709: 已禁用速率限制：允许无限制请求
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:710: 已禁用并发限制：允许同一IP发起多个并发请求
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:711: 已强制使用IPv4连接，并使用8.8.8.8作为DNS服务器
+2025/06/08 00:45:24.838018 chrome_tls_proxy.go:712: 使用Chrome浏览器的TLS指纹进行连接
+2025/06/08 00:47:10.787309 chrome_tls_proxy.go:706: Chrome TLS指纹代理服务器运行在 http://localhost:10655/proxy
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:707: 使用方法：向/proxy发送POST请求，请求体包含目标URL、方法、请求头和请求体
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:708: 支持流式响应，需要在请求体中添加 'stream': true
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:709: 已禁用速率限制：允许无限制请求
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:710: 已禁用并发限制：允许同一IP发起多个并发请求
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:711: 已强制使用IPv4连接，并使用8.8.8.8作为DNS服务器
+2025/06/08 00:47:10.791530 chrome_tls_proxy.go:712: 使用Chrome浏览器的TLS指纹进行连接
+2025/06/08 00:47:10.792061 chrome_tls_proxy.go:716: 服务器启动失败: listen tcp :10655: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted.
+2025/06/08 00:54:49.318617 chrome_tls_proxy.go:706: Chrome TLS指纹代理服务器运行在 http://localhost:10655/proxy
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:707: 使用方法：向/proxy发送POST请求，请求体包含目标URL、方法、请求头和请求体
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:708: 支持流式响应，需要在请求体中添加 'stream': true
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:709: 已禁用速率限制：允许无限制请求
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:710: 已禁用并发限制：允许同一IP发起多个并发请求
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:711: 已强制使用IPv4连接，并使用8.8.8.8作为DNS服务器
+2025/06/08 00:54:49.325299 chrome_tls_proxy.go:712: 使用Chrome浏览器的TLS指纹进行连接
+2025/06/08 00:54:49.325813 chrome_tls_proxy.go:716: 服务器启动失败: listen tcp :10655: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted.

src/lightweight-client-express.js

@@ -10,7 +10,6 @@ import {
 import {
   initialize,
   streamNotionResponse,
-  buildNotionRequest,
   FETCHED_IDS_SUCCESSFULLY
 } from './lightweight-client.js';
 import { proxyPool } from './ProxyPool.js';
@@ -131,9 +130,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');
@@ -141,7 +137,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);
       
       // 处理客户端断开连接
@@ -153,7 +149,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

@@ -18,7 +18,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 // 加载环境变量
-dotenv.config({ path: join(dirname(__dirname), '.env') });
+dotenv.config({ path: join(dirname(dirname(__filename)), '.env') });
 
 // 日志配置
 const logger = {
@@ -30,15 +30,10 @@ const logger = {
 
 // 配置
 const NOTION_API_URL = "https://www.notion.so/api/v3/runInferenceTranscript";
-let NOTION_COOKIE = '';
-let NOTION_SPACE_ID = process.env.NOTION_SPACE_ID;
-let FETCHED_NOTION_USER_ID = process.env.NOTION_ACTIVE_USER_HEADER;
+let ACCOUNTS = [];
 const USE_NATIVE_PROXY_POOL = process.env.USE_NATIVE_PROXY_POOL === 'true';
 const ENABLE_PROXY_SERVER = process.env.ENABLE_PROXY_SERVER === 'true';
-let proxy = null;
-let isMoreThanOne = false;
-let index = 0;
-
+let currentAccountIndex = 0;
 
 // 代理配置
 const PROXY_URL = process.env.PROXY_URL || "";
@@ -72,21 +67,14 @@ process.on('exit', () => {
   });
 });
 
-function getCookie() {
-  const cookies = process.env.NOTION_COOKIE;
-  if (cookies) {
-      let cookiePairs = cookies.split('|');
-      if (cookiePairs.length > 1){
-        isMoreThanOne=true;
-      }
-      let currentIndex = index;
-      index++;
-      if (index >= cookiePairs.length) {
-        index = 0;
-      }
-      return cookiePairs[currentIndex];
+function getNextAccount() {
+  if (ACCOUNTS.length === 0) {
+    return null;
   }
-  return '';
+  const account = ACCOUNTS[currentAccountIndex];
+  const index = currentAccountIndex;
+  currentAccountIndex = (currentAccountIndex + 1) % ACCOUNTS.length;
+  return { ...account, index };
 }
 
 // 添加一个通用的cookie解析函数
@@ -136,184 +124,78 @@ function parseCookiesFromString(cookieString, logPrefix = "") {
 }
 
 // 获取Notion空间ID和用户ID
-async function fetchAndSetNotionIds() {
-  if (!NOTION_COOKIE) {
-    logger.error(`无法获取Notion ID: 未设置NOTION_COOKIE`);
-    FETCHED_IDS_SUCCESSFULLY = false;
-    return;
-  }
-
+async function fetchAccountDetails(notionCookie) {
+  let userId, spaceId, email;
+  
+  // Part 1: Get User and Space ID from getSpaces
   try {
-    logger.info(`正在设置JSDOM环境...`);
-    
-    // 创建JSDOM实例模拟浏览器环境
-    const dom = new JSDOM("", {
-      url: "https://www.notion.so",
-      referrer: "https://www.notion.so/",
-      contentType: "text/html",
-      includeNodeLocations: true,
-      storageQuota: 10000000,
-      pretendToBeVisual: true,
-      userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36"
-    });
-    
-    // 设置全局对象
-    const { window } = dom;
-    
-    // 使用更安全的方式设置全局对象
-    try {
-      if (!global.window) {
-        global.window = window;
-      }
-      
-      if (!global.document) {
-        global.document = window.document;
-      }
-      
-      // 安全地设置navigator
-      if (!global.navigator) {
-        try {
-          Object.defineProperty(global, 'navigator', {
-            value: window.navigator,
-            writable: true,
-            configurable: true
-          });
-        } catch (navError) {
-          logger.warning(`无法设置navigator: ${navError.message}，继续执行`);
-          // 继续执行，不会中断流程
-        }
-      }
-    } catch (globalError) {
-      logger.warning(`设置全局对象时出错: ${globalError.message}`);
-    }
-    
-    // 设置cookie
-    document.cookie = NOTION_COOKIE;
+    const dom = new JSDOM("", { url: "https://www.notion.so" });
+    global.window = dom.window;
+    global.document = dom.window.document;
+    global.navigator = dom.window.navigator;
+    document.cookie = notionCookie;
     
-    // 创建fetch选项
-    const fetchOptions = {
+    const getSpacesOptions = {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
         'accept': '*/*',
-        'accept-language': 'en-US,en;q=0.9',
-        'notion-audit-log-platform': 'web',
-        'notion-client-version': '23.13.0.3686',
-        'origin': 'https://www.notion.so',
-        'referer': 'https://www.notion.so/',
-        'user-agent': window.navigator.userAgent,
-        'Cookie': NOTION_COOKIE
+        'user-agent': global.navigator.userAgent,
+        'Cookie': notionCookie
       },
       body: JSON.stringify({}),
     };
+
+    const spacesResponse = await fetch("https://www.notion.so/api/v3/getSpaces", getSpacesOptions);
+    if (!spacesResponse.ok) throw new Error(`getSpaces failed with status ${spacesResponse.status}`);
+    const data = await spacesResponse.json();
     
-    // 添加代理配置（如果有）
-    if (PROXY_URL) {
-      const { HttpsProxyAgent } = await import('https-proxy-agent');
-      fetchOptions.agent = new HttpsProxyAgent(PROXY_URL);
-      logger.info(`使用代理: ${PROXY_URL}`);
-    }
-    logger.info(`正在获取Notion用户/空间ID...`);
-    
-    // 发送请求
-    const response = await fetch("https://www.notion.so/api/v3/getSpaces", fetchOptions);
-    
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    
-    const data = await response.json();
-    
-    // 提取用户ID
     const userIdKey = Object.keys(data)[0];
-    if (!userIdKey) {
-      logger.error(`无法从响应中提取用户ID`);
-      FETCHED_IDS_SUCCESSFULLY = false;
-      return;
-    }
-    
-    FETCHED_NOTION_USER_ID = userIdKey;
-    logger.success(`已获取Notion用户ID`);
-    
-    // 提取空间ID
+    if (!userIdKey) throw new Error("Could not extract user ID from getSpaces response.");
+    userId = userIdKey;
+
     const userRoot = data[userIdKey]?.user_root?.[userIdKey];
     const spaceViewPointers = userRoot?.value?.value?.space_view_pointers;
-    
-    if (spaceViewPointers && Array.isArray(spaceViewPointers) && spaceViewPointers.length > 0) {
-      NOTION_SPACE_ID = spaceViewPointers[0].spaceId;
-      
-      if (NOTION_SPACE_ID) {
-        logger.success(`已获取Notion空间ID`);
-        FETCHED_IDS_SUCCESSFULLY = true;
-      } else {
-        logger.error(`无法从space_view_pointers中提取spaceId`);
-        FETCHED_IDS_SUCCESSFULLY = false;
-      }
-    } else {
-      logger.error(`在响应中找不到space_view_pointers或spaceId`);
-      FETCHED_IDS_SUCCESSFULLY = false;
-    }
-    
-    // 清理全局对象
-    try {
-      if (global.window) delete global.window;
-      if (global.document) delete global.document;
-      
-      // 安全地删除navigator
-      if (global.navigator) {
-        try {
-          delete global.navigator;
-        } catch (navError) {
-          // 如果无法删除，尝试将其设置为undefined
-          try {
-            Object.defineProperty(global, 'navigator', {
-              value: undefined,
-              writable: true,
-              configurable: true
-            });
-          } catch (defineError) {
-            logger.warning(`无法清理navigator: ${defineError.message}`);
-          }
-        }
-      }
-    } catch (cleanupError) {
-      logger.warning(`清理全局对象时出错: ${cleanupError.message}`);
+    if (spaceViewPointers && spaceViewPointers.length > 0) {
+      spaceId = spaceViewPointers[0].spaceId;
     }
-    
+    if (!spaceId) throw new Error("Could not extract space ID from getSpaces response.");
+
   } catch (error) {
-    logger.error(`获取Notion ID时出错: ${error}`);
-    FETCHED_IDS_SUCCESSFULLY = false;
-    
-    // 确保清理全局对象
-    try {
-      if (global.window) delete global.window;
-      if (global.document) delete global.document;
-      
-      // 安全地删除navigator
-      if (global.navigator) {
-        try {
-          delete global.navigator;
-        } catch (navError) {
-          // 如果无法删除，尝试将其设置为undefined
-          try {
-            Object.defineProperty(global, 'navigator', {
-              value: undefined,
-              writable: true,
-              configurable: true
-            });
-          } catch (defineError) {
-            logger.warning(`无法清理navigator: ${defineError.message}`);
-          }
-        }
-      }
-    } catch (cleanupError) {
-      logger.warning(`清理全局对象时出错: ${cleanupError.message}`);
-    }
+    logger.error(`获取用户/空间ID失败: ${error.message}`);
+    return null;
+  } finally {
+    if (global.window) delete global.window;
+    if (global.document) delete global.document;
+    if (global.navigator) delete global.navigator;
   }
+
+  // Part 2: Get User Email from getUserAnalyticsSettings
+  try {
+    const analyticsOptions = {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'accept': '*/*',
+        'Cookie': notionCookie,
+        'x-notion-active-user-header': userId,
+      },
+      body: JSON.stringify({}),
+    };
+    const analyticsResponse = await fetch("https://www.notion.so/api/v3/getUserAnalyticsSettings", analyticsOptions);
+    if (!analyticsResponse.ok) throw new Error(`getUserAnalyticsSettings failed with status ${analyticsResponse.status}`);
+    const analyticsData = await analyticsResponse.json();
+    email = analyticsData?.user_email || '邮箱获取失败';
+  } catch (error) {
+    logger.warning(`获取用户邮箱失败: ${error.message}. 将继续操作。`);
+    email = '邮箱获取失败';
+  }
+
+  return { cookie: notionCookie, userId, spaceId, email };
 }
 
 // 构建Notion请求
-function buildNotionRequest(requestData) {
+function buildNotionRequest(requestData, account) {
   // 当前时间
   const now = new Date();
   // 格式化为ISO字符串，确保包含毫秒和时区
@@ -348,8 +230,8 @@ function buildNotionRequest(requestData) {
   transcript.push(new NotionTranscriptItem({
     type: "context",
     value: new NotionTranscriptContextValue({
-      userId: FETCHED_NOTION_USER_ID,
-      spaceId: NOTION_SPACE_ID,
+      userId: account.userId,
+      spaceId: account.spaceId,
       surface: "home_module",
       timezone: "America/Los_Angeles",
       userName: userName,
@@ -389,7 +271,7 @@ function buildNotionRequest(requestData) {
       transcript.push(new NotionTranscriptItemByuser({
         type: "user",
         value: [[content]],
-        userId: FETCHED_NOTION_USER_ID,
+        userId: account.userId,
         createdAt: message.createdAt || isoString
       }));
     } else if (message.role === "user") {
@@ -397,7 +279,7 @@ function buildNotionRequest(requestData) {
       transcript.push(new NotionTranscriptItemByuser({
         type: "user",
         value: [[content]],
-        userId: FETCHED_NOTION_USER_ID,
+        userId: account.userId,
         createdAt: message.createdAt || isoString
       }));
     } else if (message.role === "assistant") {
@@ -413,7 +295,7 @@ function buildNotionRequest(requestData) {
   
   // 创建请求体
   return new NotionRequestBody({
-    spaceId: NOTION_SPACE_ID,
+    spaceId: account.spaceId,
     transcript: transcript,
     createThread: true,
     traceId: randomUUID(),
@@ -428,13 +310,25 @@ function buildNotionRequest(requestData) {
 }
 
 // 流式处理Notion响应
-async function streamNotionResponse(notionRequestBody) {
-  // 创建流
+async function streamNotionResponse(requestData) {
   const stream = new PassThrough();
+  const account = getNextAccount();
+  
+  if (!account) {
+    const errorMessage = "无法处理请求: 未配置或加载任何有效的Notion账号。";
+    logger.error(errorMessage);
+    stream.emit('error', new Error(errorMessage));
+    stream.end();
+    return stream;
+  }
   
-  // 添加初始数据，确保连接建立
-  stream.write(':\n\n');  // 发送一个空注释行，保持连接活跃
+  const notionRequestBody = buildNotionRequest(requestData, account);
   
+  logger.info(`正在使用账号 #${account.index + 1} (${account.email}) 进行本次请求...`);
+
+  // 从代理池获取代理
+  const proxyToUse = await proxyPool.getProxy();
+
   // 设置HTTP头模板
   const headers = {
     'Content-Type': 'application/json',
@@ -443,10 +337,10 @@ async function streamNotionResponse(notionRequestBody) {
     'notion-audit-log-platform': 'web',
     'notion-client-version': '23.13.0.3686',
     'origin': 'https://www.notion.so',
-    'referer': 'https://www.notion.so/chat',
+    'referer': 'https://www.notion.so/',
     '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',
-    'x-notion-active-user-header': FETCHED_NOTION_USER_ID,
-    'x-notion-space-id': NOTION_SPACE_ID
+    'x-notion-active-user-header': account.userId,
+    'x-notion-space-id': account.spaceId
   };
   
   // 设置超时处理，确保流不会无限等待
@@ -477,7 +371,7 @@ async function streamNotionResponse(notionRequestBody) {
     notionRequestBody,
     headers,
     NOTION_API_URL,
-    NOTION_COOKIE,
+    account.cookie,
     timeoutId
   ).catch((error) => {
     logger.error(`流处理出错: ${error}`);
@@ -677,11 +571,6 @@ async function fetchNotionResponse(chunkQueue, notionRequestBody, headers, notio
     reader.on('end', () => {
       try {
         logger.info(`响应完成`);
-        if (isMoreThanOne){
-          NOTION_COOKIE = getCookie(); // 获取下一个cookie
-          logger.info('开始切换cookie和ID');
-          fetchAndSetNotionIds(); // 切换到下一个ID
-        }
         
         // 如果没有收到任何响应，发送一个提示消息
         if (!responseReceived) {
@@ -884,48 +773,43 @@ async function fetchNotionResponse(chunkQueue, notionRequestBody, headers, notio
 async function initialize() {
   logger.info(`初始化Notion配置...`);
   
+  const cookieString = process.env.NOTION_COOKIE || '';
+  if (!cookieString) {
+    logger.error("关键错误: 环境变量 'NOTION_COOKIE' 未设置。请在.env文件中提供至少一个有效的Notion Cookie。");
+    FETCHED_IDS_SUCCESSFULLY = false;
+    return;
+  }
+  
+  const cookies = cookieString.split('|').filter(c => c.trim() !== '');
+  logger.info(`发现 ${cookies.length} 个Cookie，正在逐一获取账号信息...`);
+
+  for (const cookie of cookies) {
+    const accountDetails = await fetchAccountDetails(cookie.trim());
+    if (accountDetails) {
+      ACCOUNTS.push(accountDetails);
+      logger.success(`成功加载账号: ${accountDetails.email}`);
+    } else {
+      logger.warning(`加载其中一个Cookie失败，已跳过。`);
+    }
+  }
+
+  if (ACCOUNTS.length === 0) {
+    logger.error("未能成功加载任何Notion账号。请检查您的COOKIE是否有效或已过期。");
+    FETCHED_IDS_SUCCESSFULLY = false;
+  } else {
+    logger.success(`共成功加载 ${ACCOUNTS.length} 个账号。服务已准备就绪。`);
+    FETCHED_IDS_SUCCESSFULLY = true;
+  }
+  
   // 启动代理服务器
   try {
-    await proxyServer.start();
+    if (ENABLE_PROXY_SERVER) {
+      await proxyServer.start();
+    }
   } catch (error) {
     logger.error(`启动代理服务器失败: ${error.message}`);
   }
   
-  // 检查是否已从环境变量中获取ID
-  if (NOTION_SPACE_ID && FETCHED_NOTION_USER_ID) {
-    logger.info(`使用环境变量��的Notion ID配置
-      - NOTION_SPACE_ID: ${NOTION_SPACE_ID}
-      - NOTION_ACTIVE_USER_HEADER: ${FETCHED_NOTION_USER_ID}`);
-    // logger.info(`- NOTION_SPACE_ID: ${NOTION_SPACE_ID}`);
-    // logger.info(`- NOTION_ACTIVE_USER_HEADER: ${FETCHED_NOTION_USER_ID}`);
-    FETCHED_IDS_SUCCESSFULLY = true;
-  } else {
-    // 尝试从Notion API获取ID
-    NOTION_COOKIE = getCookie(); // 获取第一个cookie
-    if (!NOTION_COOKIE) {
-      logger.error(`错误: 未设置NOTION_COOKIE环境变量，应用无法正常工作`);
-      logger.error(`请在.env文件中设置有效的NOTION_COOKIE值`);
-      return;
-    }
-    
-    logger.info(`未检测到ID配置，正在通过API自动获取Notion ID...`);
-    await fetchAndSetNotionIds();
-    
-    if (!FETCHED_IDS_SUCCESSFULLY) {
-      logger.error(`获取Notion ID失败，应用无法正常工作`);
-      logger.error(`请检查以下可能的问题:`);
-      logger.error(`1. NOTION_COOKIE是否有效`);
-      logger.error(`2. 网络连接是否正常`);
-      logger.error(`3. Notion服务是否可访问`);
-      logger.error(`或者手动在.env文件中设置NOTION_SPACE_ID和NOTION_ACTIVE_USER_HEADER`);
-    } else {
-      logger.info(`成功通过API获取Notion ID
-        - 用户ID: ${FETCHED_NOTION_USER_ID}
-        - 空间ID: ${NOTION_SPACE_ID}`);
-      // logger.info(`- 用户ID: ${FETCHED_NOTION_USER_ID}`);
-      // logger.info(`- 空间ID: ${NOTION_SPACE_ID}`);
-    }
-  }
   if (process.env.USE_NATIVE_PROXY_POOL === 'true') {
     logger.info(`正在初始化本地代理池...`);
     await proxyPool.initialize();