feat: 添加 socks5 代理认证 (Chanzhaoyu#999)

* support socks5 proxy auth * Update build_docker.yml * Update README.md * perf: 增加判断 * fix: lint --------- Co-authored-by: ChenZhaoYu <[email protected]>
Kooklen · Apr 7, 2023 · 05c0163 · 05c0163
1 parent c74427a
commit 05c0163
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/service/.env.example b/service/.env.example
@@ -31,6 +31,12 @@ SOCKS_PROXY_HOST=
 # Socks Proxy Port
 SOCKS_PROXY_PORT=
 
+# Socks Proxy Username
+SOCKS_PROXY_USERNAME=
+
+# Socks Proxy Password
+SOCKS_PROXY_PASSWORD=
+
 # HTTPS PROXY
 HTTPS_PROXY=
 
diff --git a/service/src/chatgpt/index.ts b/service/src/chatgpt/index.ts
@@ -159,17 +159,19 @@ async function chatConfig() {
 }
 
 function setupProxy(options: ChatGPTAPIOptions | ChatGPTUnofficialProxyAPIOptions) {
-  if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) {
+  if (isNotEmptyString(process.env.SOCKS_PROXY_HOST) && isNotEmptyString(process.env.SOCKS_PROXY_PORT)) {
     const agent = new SocksProxyAgent({
       hostname: process.env.SOCKS_PROXY_HOST,
       port: process.env.SOCKS_PROXY_PORT,
+      userId: isNotEmptyString(process.env.SOCKS_PROXY_USERNAME) ? process.env.SOCKS_PROXY_USERNAME : undefined,
+      password: isNotEmptyString(process.env.SOCKS_PROXY_PASSWORD) ? process.env.SOCKS_PROXY_PASSWORD : undefined,
     })
     options.fetch = (url, options) => {
       return fetch(url, { agent, ...options })
     }
   }
   else {
-    if (process.env.HTTPS_PROXY || process.env.ALL_PROXY) {
+    if (isNotEmptyString(process.env.HTTPS_PROXY) || isNotEmptyString(process.env.ALL_PROXY)) {
       const httpsProxy = process.env.HTTPS_PROXY || process.env.ALL_PROXY
       if (httpsProxy) {
         const agent = new HttpsProxyAgent(httpsProxy)