sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/library/rabbitmq/rabbitmq.go

@@ -27,7 +27,8 @@ type JSONHandler[T any] func(ctx context.Context, message T) error
 var (
 	conn     *amqp.Connection
 	connMu   sync.Mutex
-	closers  []func() error
+	closers  = make(map[uint64]func() error)
+	closerID uint64
 	closerMu sync.Mutex
 )
 
@@ -217,7 +218,7 @@ func Close() error {
 	for _, closer := range closers {
 		_ = closer()
 	}
-	closers = nil
+	closers = make(map[uint64]func() error)
 	closerMu.Unlock()
 
 	connMu.Lock()
@@ -252,8 +253,107 @@ func declareDelayQueue(ch *amqp.Channel, delayQueue, targetQueue string) error {
 }
 
 // registerCloser 记录消费者 channel，服务退出时统一关闭。
-func registerCloser(closer func() error) {
+func registerCloser(closer func() error) func() {
 	closerMu.Lock()
 	defer closerMu.Unlock()
-	closers = append(closers, closer)
+	closerID++
+	id := closerID
+	closers[id] = closer
+	return func() {
+		closerMu.Lock()
+		defer closerMu.Unlock()
+		delete(closers, id)
+	}
+}
+
+func ConsumeJSONRequeue[T any](ctx context.Context, queue, consumer string, handler JSONHandler[T]) error {
+	ctx, cancel := context.WithCancel(ctx)
+	open := func() (*amqp.Channel, <-chan amqp.Delivery, error) {
+		channel, err := Channel(ctx)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = declareQueue(channel, queue); err == nil {
+			err = channel.Qos(1, 0, false)
+		}
+		if err != nil {
+			_ = channel.Close()
+			return nil, nil, err
+		}
+		deliveries, err := channel.Consume(queue, consumer, false, false, false, false, nil)
+		if err != nil {
+			_ = channel.Close()
+			return nil, nil, err
+		}
+		return channel, deliveries, nil
+	}
+	channel, deliveries, err := open()
+	if err != nil {
+		cancel()
+		return err
+	}
+	var channelMu sync.Mutex
+	unregister := registerCloser(func() error {
+		cancel()
+		channelMu.Lock()
+		defer channelMu.Unlock()
+		return channel.Close()
+	})
+	go func() {
+		defer func() {
+			cancel()
+			unregister()
+			_ = channel.Close()
+		}()
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case delivery, ok := <-deliveries:
+				if !ok {
+					_ = channel.Close()
+					for {
+						select {
+						case <-ctx.Done():
+							return
+						case <-time.After(3 * time.Second):
+						}
+						next, stream, reconnectErr := open()
+						if reconnectErr != nil {
+							g.Log().Errorf(ctx, "role sync consumer reconnect failed, queue:%s, err:%v", queue, reconnectErr)
+							continue
+						}
+						channelMu.Lock()
+						if ctx.Err() != nil {
+							channelMu.Unlock()
+							_ = next.Close()
+							return
+						}
+						channel, deliveries = next, stream
+						channelMu.Unlock()
+						break
+					}
+					continue
+				}
+				var message T
+				if decodeErr := json.Unmarshal(delivery.Body, &message); decodeErr != nil {
+					g.Log().Errorf(ctx, "rabbitmq invalid role sync message, queue:%s, err:%v", queue, decodeErr)
+					_ = delivery.Ack(false)
+					continue
+				}
+				if handleErr := handler(ctx, message); handleErr != nil {
+					g.Log().Errorf(ctx, "role sync message retained, queue:%s, err:%v", queue, handleErr)
+					select {
+					case <-ctx.Done():
+						return
+					case <-time.After(time.Second):
+					}
+					_ = delivery.Nack(false, true)
+					continue
+				}
+				_ = delivery.Ack(false)
+			}
+		}
+	}()
+	return nil
 }