Merge branch 'Clansty:rainbowcat' into rainbowcat

Nofated095 · Nov 30, 2023 · 574771d · 574771d
2 parents b534fe6 + e53df68
commit 574771d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -65,3 +65,6 @@ services:
       # 如果需要通过代理联网，那么设置下面两个变量
       #- PROXY_IP=
       #- PROXY_PORT=
+      # 代理联网认证，有需要请修改下面两个变量
+      #- PROXY_USERNAME=
+      #- PROXY_PASSWORD=
diff --git a/src/client/Telegram.ts b/src/client/Telegram.ts
@@ -53,6 +53,8 @@ export default class Telegram {
           socksType: 5,
           ip: process.env.PROXY_IP,
           port: parseInt(process.env.PROXY_PORT),
+          ...(process.env.PROXY_USERNAME && { username: process.env.PROXY_USERNAME }),
+          ...(process.env.PROXY_PASSWORD && { password: process.env.PROXY_PASSWORD }),
         } : undefined,
         autoReconnect: true,
         networkSocket: process.env.TG_CONNECTION === 'websocket' ? PromisedWebSockets : PromisedNetSockets,