fix(channel): 增加HTTP客户端超时时间并改进SOCKS5代理处理

- 将Telegram和微信企业号通道的HTTP客户端超时统一延长至30秒，避免因网络延迟导致请求失败
- 修复SOCKS5代理连接未正确处理上下文取消的问题，现在支持带认证的SOCKS5代理
- 当无法获取默认HTTP传输时，提供完整的传输配置而非空结构

.github/workflows/docker-image-amd64.yml

@@ -19,10 +19,13 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Save version info
         run: |
-          git describe --tags > VERSION 
+          git describe --tags --always > VERSION 
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -42,7 +45,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            justsong/message-pusher
+            zimonianhua/message-pusher
             ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images
@@ -51,4 +54,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-image-arm64.yml

@@ -19,10 +19,13 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Save version info
         run: |
-          git describe --tags > VERSION 
+          git describe --tags --always > VERSION 
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -48,7 +51,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            justsong/message-pusher
+            zimonianhua/message-pusher
             ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images
@@ -58,4 +61,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/linux-release.yml

@@ -16,14 +16,14 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Build Frontend
         env:
           CI: ""
         run: |
           cd web
           npm install
-          REACT_APP_VERSION=$(git describe --tags) npm run build
+          REACT_APP_VERSION=$(git describe --tags --always) npm run build
           cd ..
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -32,12 +32,12 @@ jobs:
       - name: Build Backend (amd64)
         run: |
           go mod download
-          go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags)' -extldflags '-static'" -o message-pusher
+          go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags --always)' -extldflags '-static'" -o message-pusher
       - name: Build Backend (arm64)
         run: |
           sudo apt-get update
           sudo apt-get install gcc-aarch64-linux-gnu
-          CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags)' -extldflags '-static'" -o message-pusher-arm64
+          CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags --always)' -extldflags '-static'" -o message-pusher-arm64
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
@@ -48,4 +48,4 @@ jobs:
           draft: true
           generate_release_notes: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/macos-release.yml

@@ -16,14 +16,14 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Build Frontend
         env:
           CI: ""
         run: |
           cd web
           npm install
-          REACT_APP_VERSION=$(git describe --tags) npm run build
+          REACT_APP_VERSION=$(git describe --tags --always) npm run build
           cd ..
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -32,7 +32,7 @@ jobs:
       - name: Build Backend
         run: |
           go mod download
-          go build -ldflags "-X 'message-pusher/common.Version=$(git describe --tags)'" -o message-pusher-macos
+          go build -ldflags "-X 'message-pusher/common.Version=$(git describe --tags --always)'" -o message-pusher-macos
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/windows-release.yml

@@ -19,14 +19,14 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Build Frontend
         env:
           CI: ""
         run: |
           cd web
           npm install
-          REACT_APP_VERSION=$(git describe --tags) npm run build
+          REACT_APP_VERSION=$(git describe --tags --always) npm run build
           cd ..
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -35,7 +35,7 @@ jobs:
       - name: Build Backend
         run: |
           go mod download
-          go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags)'" -o message-pusher.exe
+          go build -ldflags "-s -w -X 'message-pusher/common.Version=$(git describe --tags --always)'" -o message-pusher.exe
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
@@ -44,4 +44,4 @@ jobs:
           draft: true
           generate_release_notes: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,8 +1,9 @@
-FROM node:16 as builder
+FROM node:18 AS builder
 
 WORKDIR /build
 COPY ./web .
 COPY ./VERSION .
+RUN corepack enable && corepack prepare yarn@1.22.22 --activate
 RUN yarn install
 RUN REACT_APP_VERSION=$(cat VERSION) yarn build
 

channel/http-client.go

@@ -26,7 +26,17 @@ func newHTTPClient(proxyAddress string, timeout time.Duration) (*http.Client, er
 func newHTTPTransport(proxyAddress string) (*http.Transport, error) {
 	base, ok := http.DefaultTransport.(*http.Transport)
 	if !ok {
-		return &http.Transport{}, nil
+		return &http.Transport{
+			DialContext: (&net.Dialer{
+				Timeout:   10 * time.Second,
+				KeepAlive: 30 * time.Second,
+			}).DialContext,
+			ForceAttemptHTTP2:     true,
+			MaxIdleConns:          100,
+			IdleConnTimeout:       90 * time.Second,
+			TLSHandshakeTimeout:   10 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
+		}, nil
 	}
 	transport := base.Clone()
 	proxyAddress = strings.TrimSpace(proxyAddress)
@@ -46,15 +56,40 @@ func newHTTPTransport(proxyAddress string) (*http.Transport, error) {
 		transport.Proxy = http.ProxyURL(u)
 		return transport, nil
 	case "socks5", "socks5h":
-		normalized := *u
+		var auth *proxy.Auth
-		normalized.Scheme = "socks5"
+		if u.User != nil {
-		dialer, err := proxy.FromURL(&normalized, proxy.Direct)
+			auth = &proxy.Auth{
+				User:     u.User.Username(),
+				Password: "",
+			}
+			if password, ok := u.User.Password(); ok {
+				auth.Password = password
+			}
+		}
+		dialer, err := proxy.SOCKS5("tcp", u.Host, auth, &net.Dialer{
+			Timeout:   10 * time.Second,
+			KeepAlive: 30 * time.Second,
+		})
 		if err != nil {
 			return nil, err
 		}
 		transport.Proxy = nil
 		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-			return dialer.Dial(network, addr)
+			type dialResult struct {
+				conn net.Conn
+				err  error
+			}
+			ch := make(chan dialResult, 1)
+			go func() {
+				conn, err := dialer.Dial(network, addr)
+				ch <- dialResult{conn: conn, err: err}
+			}()
+			select {
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			case r := <-ch:
+				return r.conn, r.err
+			}
 		}
 		return transport, nil
 	default:

channel/telegram.go

@@ -25,7 +25,7 @@ type telegramMessageResponse struct {
 
 func SendTelegramMessage(message *model.Message, user *model.User, channel_ *model.Channel) error {
 	// https://core.telegram.org/bots/api#sendmessage
-	client, err := newHTTPClient(channel_.URL, 10*time.Second)
+	client, err := newHTTPClient(channel_.URL, 30*time.Second)
 	if err != nil {
 		return err
 	}

channel/wechat-corp-account.go

@@ -49,7 +49,7 @@ func (i *WeChatCorpAccountTokenStoreItem) Token() string {
 
 func (i *WeChatCorpAccountTokenStoreItem) Refresh() {
 	// https://work.weixin.qq.com/api/doc/90000/90135/91039
-	client, err := newHTTPClient(i.Proxy, 5*time.Second)
+	client, err := newHTTPClient(i.Proxy, 30*time.Second)
 	if err != nil {
 		common.SysError("failed to create http client: " + err.Error())
 		return
@@ -159,7 +159,7 @@ func SendWeChatCorpMessage(message *model.Message, user *model.User, channel_ *m
 		Proxy:       proxyAddress,
 	}
 	accessToken := TokenStoreGetToken(tokenItem.Key())
-	client, err := newHTTPClient(proxyAddress, 10*time.Second)
+	client, err := newHTTPClient(proxyAddress, 30*time.Second)
 	if err != nil {
 		return err
 	}

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   message-pusher:
-    image: justsong/message-pusher
+    image: zimonianhua/message-pusher
     restart: unless-stopped
     ports:
       - 3000:3000