refactor(app): 优化后台任务退出与外部 IMAP 认证

- 统一用 `WaitGroup` 管理后台 worker,关闭时等待任务结束后再释放数据库连接。
- 将外部 IMAP 的 OAuth 认证切换为 `XOAUTH2` 客户端实现,并补充对应格式测试。
- 调整发送队列的故障恢复逻辑,超时中断后恢复为排队状态以便重新投递。
This commit is contained in:
LanQin
2026-06-25 21:36:59 +08:00
parent 081cfad02d
commit efcdc691de
4 changed files with 66 additions and 9 deletions
+18 -2
View File
@@ -24,7 +24,6 @@ import (
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapclient"
"github.com/emersion/go-sasl"
"github.com/go-chi/chi/v5"
"golang.org/x/oauth2"
)
@@ -1498,7 +1497,7 @@ func (a *App) openExternalIMAPClient(ctx context.Context, account externalIMAPAc
c.Close()
return nil, err
}
if err := c.Authenticate(sasl.NewOAuthBearerClient(&sasl.OAuthBearerOptions{Username: account.Username, Token: token, Host: account.Host, Port: account.Port})); err != nil {
if err := c.Authenticate(newExternalIMAPXOAUTH2Client(account.Username, token)); err != nil {
c.Close()
return nil, err
}
@@ -1516,6 +1515,23 @@ func (a *App) openExternalIMAPClient(ctx context.Context, account externalIMAPAc
return &goExternalIMAPClient{client: c}, nil
}
type externalIMAPXOAUTH2Client struct {
username string
token string
}
func newExternalIMAPXOAUTH2Client(username, token string) externalIMAPXOAUTH2Client {
return externalIMAPXOAUTH2Client{username: username, token: token}
}
func (c externalIMAPXOAUTH2Client) Start() (string, []byte, error) {
return "XOAUTH2", []byte("user=" + c.username + "\x01auth=Bearer " + c.token + "\x01\x01"), nil
}
func (c externalIMAPXOAUTH2Client) Next(challenge []byte) ([]byte, error) {
return []byte{}, nil
}
func (a *App) externalIMAPOAuthAccessToken(ctx context.Context, account externalIMAPAccountRecord) (string, error) {
access, err := a.decryptExternalIMAPPassword(account.OAuthAccessTokenCiphertext)
if err != nil {