feat: sync bot keyboards and callbacks
Sync telesrv b96f2dd (feat(bot): complete keyboards callbacks and durable delivery). Skipped private docs and preserved public README files per sync rules; normalized the appearance seed log label for public naming.
This commit is contained in:
A
parent
0c99ae0a9d
commit
bf965f610c
80 changed files with 7212 additions and 349 deletions
|
|
@ -1,22 +1,29 @@
|
|||
package rpc
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"hash/fnv"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"go.uber.org/zap"
|
||||
|
||||
"telesrv/internal/domain"
|
||||
"telesrv/internal/store"
|
||||
)
|
||||
|
||||
// callbackRegistry 是 bot callback query 的进程内挂起表：messages.getBotCallbackAnswer
|
||||
// 注册一个 (query_id → chan)，把 updateBotCallbackQuery 推给 bot 后阻塞等待；bot 经
|
||||
// messages.setBotCallbackAnswer 用同一 query_id 解挂。单实例可行；多实例需共享通道
|
||||
// （getBotCallbackAnswer 与 setBotCallbackAnswer 落不同实例则等不到 → 超时），记架构 todo。
|
||||
// callbackRegistry keeps local waiter channels and mirrors ownership/answers to
|
||||
// a short-lived shared store. The shared CAS is the source of truth when wired:
|
||||
// it lets getBotCallbackAnswer and answerCallbackQuery land on different nodes
|
||||
// without accepting two answers or trusting a process-local owner map.
|
||||
type callbackRegistry struct {
|
||||
mu sync.Mutex
|
||||
pending map[int64]*pendingCallback
|
||||
shared store.BotCallbackRegistryStore
|
||||
}
|
||||
|
||||
type pendingCallback struct {
|
||||
|
|
@ -26,35 +33,77 @@ type pendingCallback struct {
|
|||
userID int64
|
||||
}
|
||||
|
||||
func newCallbackRegistry() *callbackRegistry {
|
||||
return &callbackRegistry{pending: make(map[int64]*pendingCallback)}
|
||||
func newCallbackRegistry(shared ...store.BotCallbackRegistryStore) *callbackRegistry {
|
||||
var sharedStore store.BotCallbackRegistryStore
|
||||
if len(shared) > 0 {
|
||||
sharedStore = shared[0]
|
||||
}
|
||||
return &callbackRegistry{pending: make(map[int64]*pendingCallback), shared: sharedStore}
|
||||
}
|
||||
|
||||
// register 登记一次挂起的 callback，返回全局唯一 query_id 与接收通道。调用方必须
|
||||
// defer deregister(queryID)，无论是否收到答案（超时三件套之一，防 goroutine/表泄漏）。
|
||||
func (c *callbackRegistry) register(botUserID, userID int64) (int64, *pendingCallback) {
|
||||
p := &pendingCallback{
|
||||
ch: make(chan domain.BotCallbackAnswer, 1),
|
||||
done: make(chan struct{}),
|
||||
botUserID: botUserID,
|
||||
userID: userID,
|
||||
}
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
var queryID int64
|
||||
for {
|
||||
queryID = randomNonZeroInt64()
|
||||
if _, exists := c.pending[queryID]; !exists {
|
||||
break
|
||||
queryID, pending, _ := c.registerContext(context.Background(), time.Now(), botUserID, userID, botCallbackTimeout)
|
||||
return queryID, pending
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) registerContext(ctx context.Context, now time.Time, botUserID, userID int64, ttl time.Duration) (int64, *pendingCallback, error) {
|
||||
for attempts := 0; attempts < 32; attempts++ {
|
||||
p := &pendingCallback{
|
||||
ch: make(chan domain.BotCallbackAnswer, 1),
|
||||
done: make(chan struct{}),
|
||||
botUserID: botUserID,
|
||||
userID: userID,
|
||||
}
|
||||
c.mu.Lock()
|
||||
queryID := randomNonZeroInt64()
|
||||
if _, exists := c.pending[queryID]; exists {
|
||||
c.mu.Unlock()
|
||||
continue
|
||||
}
|
||||
c.pending[queryID] = p
|
||||
c.mu.Unlock()
|
||||
if c.shared == nil {
|
||||
return queryID, p, nil
|
||||
}
|
||||
created, err := c.shared.PutBotCallbackPending(ctx, store.BotCallbackPending{
|
||||
QueryID: queryID, BotUserID: botUserID, UserID: userID, CreatedAt: now,
|
||||
}, ttl)
|
||||
if err != nil {
|
||||
c.removeLocal(queryID)
|
||||
return 0, nil, err
|
||||
}
|
||||
if created {
|
||||
return queryID, p, nil
|
||||
}
|
||||
c.removeLocal(queryID)
|
||||
}
|
||||
c.pending[queryID] = p
|
||||
return queryID, p
|
||||
return 0, nil, fmt.Errorf("allocate bot callback query id")
|
||||
}
|
||||
|
||||
// deregister 移除挂起条目并关闭 done（超时/解挂后必调，幂等）。关闭 done 让仍在
|
||||
// select 的等待者立即醒来，避免 resolve 把答案投递到一个等待者已离开的 ch（TOCTOU）。
|
||||
func (c *callbackRegistry) deregister(queryID int64) {
|
||||
c.deregisterContext(context.Background(), 0, queryID)
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) deregisterContext(ctx context.Context, botUserID, queryID int64) {
|
||||
c.mu.Lock()
|
||||
if p, ok := c.pending[queryID]; ok {
|
||||
if botUserID == 0 {
|
||||
botUserID = p.botUserID
|
||||
}
|
||||
delete(c.pending, queryID)
|
||||
close(p.done)
|
||||
}
|
||||
c.mu.Unlock()
|
||||
if c.shared != nil && botUserID > 0 {
|
||||
_ = c.shared.DeleteBotCallbackPending(ctx, botUserID, queryID)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) removeLocal(queryID int64) {
|
||||
c.mu.Lock()
|
||||
if p, ok := c.pending[queryID]; ok {
|
||||
delete(c.pending, queryID)
|
||||
|
|
@ -73,6 +122,23 @@ func (c *callbackRegistry) size() int {
|
|||
// resolve 把 bot 的答案投递给等待者。鉴权：仅该 query 的属主 bot 可解挂（callerBotID
|
||||
// 必须等于注册时的 botUserID，I6）。返回是否成功投递（query 未注册/已超时/非属主 → false）。
|
||||
func (c *callbackRegistry) resolve(callerBotID, queryID int64, ans domain.BotCallbackAnswer) bool {
|
||||
resolved, _ := c.resolveContext(context.Background(), callerBotID, queryID, ans)
|
||||
return resolved
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) resolveContext(ctx context.Context, callerBotID, queryID int64, ans domain.BotCallbackAnswer) (bool, error) {
|
||||
if c.shared != nil {
|
||||
resolved, err := c.shared.ResolveBotCallback(ctx, callerBotID, queryID, ans)
|
||||
if err != nil || !resolved {
|
||||
return resolved, err
|
||||
}
|
||||
c.deliver(callerBotID, queryID, ans)
|
||||
return true, nil
|
||||
}
|
||||
return c.deliver(callerBotID, queryID, ans), nil
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) deliver(callerBotID, queryID int64, ans domain.BotCallbackAnswer) bool {
|
||||
c.mu.Lock()
|
||||
p, ok := c.pending[queryID]
|
||||
if !ok || p.botUserID != callerBotID {
|
||||
|
|
@ -89,6 +155,37 @@ func (c *callbackRegistry) resolve(callerBotID, queryID int64, ans domain.BotCal
|
|||
return true
|
||||
}
|
||||
|
||||
func (c *callbackRegistry) sharedAnswer(ctx context.Context, botUserID, queryID int64) (domain.BotCallbackAnswer, bool, error) {
|
||||
if c.shared == nil {
|
||||
return domain.BotCallbackAnswer{}, false, nil
|
||||
}
|
||||
return c.shared.GetBotCallbackAnswer(ctx, botUserID, queryID)
|
||||
}
|
||||
|
||||
func (r *Router) RunBotCallbackAnswerSubscriber(ctx context.Context) {
|
||||
if r == nil || r.callbacks == nil || r.callbacks.shared == nil {
|
||||
return
|
||||
}
|
||||
for ctx.Err() == nil {
|
||||
err := r.callbacks.shared.SubscribeBotCallbackAnswers(ctx, func(_ context.Context, push store.BotCallbackAnswerPush) {
|
||||
r.callbacks.deliver(push.BotUserID, push.QueryID, push.Answer)
|
||||
})
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
if err != nil && r.log != nil {
|
||||
r.log.Warn("bot callback answer subscriber disconnected", zap.Error(err))
|
||||
}
|
||||
timer := time.NewTimer(time.Second)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
timer.Stop()
|
||||
return
|
||||
case <-timer.C:
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// randomNonZeroInt64 取密码学随机非零 int64。register 在持锁下调用，故此处禁止
|
||||
// 无限重试——熵源异常时退化为单调序列兜底（query_id 只需进程内唯一，register 的
|
||||
// 撞键复核会再保证唯一性），绝不卡住整个 registry。
|
||||
|
|
@ -125,3 +222,24 @@ func chatInstanceFor(botUserID, userID int64) int64 {
|
|||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// chatInstanceForPeer extends the stable hash to non-private chats without allowing a
|
||||
// channel id to collide with a numerically equal private user id.
|
||||
func chatInstanceForPeer(botUserID int64, peer domain.Peer) int64 {
|
||||
h := fnv.New64a()
|
||||
var buf [17]byte
|
||||
binary.LittleEndian.PutUint64(buf[0:8], uint64(botUserID))
|
||||
binary.LittleEndian.PutUint64(buf[8:16], uint64(peer.ID))
|
||||
switch peer.Type {
|
||||
case domain.PeerTypeChannel:
|
||||
buf[16] = 2
|
||||
default:
|
||||
buf[16] = 1
|
||||
}
|
||||
_, _ = h.Write(buf[:])
|
||||
v := int64(h.Sum64())
|
||||
if v == 0 {
|
||||
return 1
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue