Ilia Denisov
6aeb529f13
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 15s
CI / ui (pull_request) Successful in 53s
CI / gate (pull_request) Successful in 1s
CI / deploy (pull_request) Failing after 2m6s
Move all Telegram egress off the main host. The single connector held the bot token, long-polled Telegram and answered the gateway/backend over the trusted internal network, so the whole component (including login validation) shared fate with its VPN sidecar. Split it into two binaries that share the token: - cmd/validator (home, no VPN): Mini App initData + Login Widget HMAC only, never calls the Bot API. The gateway dials it for Telegram auth, so game login is now independent of Telegram reachability. - cmd/bot (remote): Bot API long-poll + sendMessage, the only component reaching Telegram. It holds no inbound port — it dials the gateway over a new reverse mTLS bot-link (pkg/proto/botlink/v1) and executes the send commands the gateway pushes. The gateway funnels sends to the bot-link: out-of-app push is fire-and-forget (at-most-once, dropped if no bot is connected); the backend admin broadcasts reach a gateway-served relay that forwards them and awaits the bot's ack (SendToUser/SendToGameChannel contract preserved). mTLS (pkg/mtls) is the one inter-service link that leaves the trusted segment; validator<->gateway and the relay stay plaintext internal. The bot is Telegram-rate-limited. One bot now; the gateway bot registry, an owns_updates flag and per-command ids leave seams for N later. Webhook rejected (one URL per token, adds inbound + a static address). The unified test contour runs the split (the bot keeps its VPN sidecar and dials the gateway by its internal name; bot-link certs from deploy/gen-certs.sh, generated in CI). The prod wiring — the bot on a separate host (no VPN), the gateway bot-link port published, PROD_ certs with scheduled rotation, an SSH deploy of both hosts together — is the deferred final stage (PRERELEASE.md TX, Stage 18). Docs: ARCHITECTURE, PRERELEASE (phase TX), platform/telegram + gateway + backend + deploy READMEs, FUNCTIONAL(+ru), CLAUDE.md, .env.example.
59 lines
2.2 KiB
Go
59 lines
2.2 KiB
Go
// Package connector is the backend's gRPC client for operator broadcasts: a direct
|
|
// message to one user, or a post to the game channel. It calls the gateway's
|
|
// bot-link relay (which forwards the send to the remote bot over the reverse mTLS
|
|
// link and reports back whether it was delivered). The relay lives on the trusted
|
|
// internal network, so the connection uses insecure (plaintext) transport
|
|
// credentials (docs/ARCHITECTURE.md §12). It speaks the Telegram service contract,
|
|
// narrowed to the two broadcast methods the admin surface needs.
|
|
package connector
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/credentials/insecure"
|
|
|
|
telegramv1 "scrabble/pkg/proto/telegram/v1"
|
|
)
|
|
|
|
// Client wraps the connector's Telegram gRPC service.
|
|
type Client struct {
|
|
conn *grpc.ClientConn
|
|
c telegramv1.TelegramClient
|
|
}
|
|
|
|
// New dials the connector gRPC endpoint at addr.
|
|
func New(addr string) (*Client, error) {
|
|
conn, err := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("connector: dial %s: %w", addr, err)
|
|
}
|
|
return &Client{conn: conn, c: telegramv1.NewTelegramClient(conn)}, nil
|
|
}
|
|
|
|
// Close releases the gRPC connection.
|
|
func (c *Client) Close() error { return c.conn.Close() }
|
|
|
|
// SendToUser sends an operator text message to one user, addressed by their
|
|
// platform external_id, through the bot. delivered reports whether the connector
|
|
// actually sent it (false when the user has not started the bot).
|
|
func (c *Client) SendToUser(ctx context.Context, externalID, text string) (bool, error) {
|
|
resp, err := c.c.SendToUser(ctx, &telegramv1.SendToUserRequest{ExternalId: externalID, Text: text})
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return resp.GetDelivered(), nil
|
|
}
|
|
|
|
// SendToGameChannel posts an operator text message to the bot's game channel.
|
|
// delivered reports whether the connector sent it (false when the bot has no
|
|
// channel configured).
|
|
func (c *Client) SendToGameChannel(ctx context.Context, text string) (bool, error) {
|
|
resp, err := c.c.SendToGameChannel(ctx, &telegramv1.SendToGameChannelRequest{Text: text})
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return resp.GetDelivered(), nil
|
|
}
|