mirror of
https://github.com/MengMengCode/VoCat.git
synced 2026-08-13 03:13:43 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
337aa3c0ab | ||
|
|
97ca84bbfc | ||
|
|
cc477571ac |
@@ -203,7 +203,11 @@ func (s *Server) hangupVoWiFiAfter(deviceID, callID string, duration time.Durati
|
||||
|
||||
func (s *Server) callTransport(deviceID string) string {
|
||||
if s.vowifi != nil {
|
||||
if state, err := s.vowifi.State(deviceID); err == nil && state.Enabled {
|
||||
// Enabled is only the desired card policy. Calls can use IMS only after
|
||||
// registration has actually completed; otherwise keep using the modem's
|
||||
// circuit-switched call path instead of routing into an unavailable IMS
|
||||
// session.
|
||||
if state, err := s.vowifi.State(deviceID); err == nil && state.IMSReady {
|
||||
return "vowifi"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"testing"
|
||||
|
||||
"vocat/internal/modem"
|
||||
"vocat/internal/vowifi"
|
||||
)
|
||||
|
||||
func TestParseCLCC(t *testing.T) {
|
||||
@@ -28,3 +29,15 @@ func TestValidDialNumber(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCallTransportRequiresIMSReady(t *testing.T) {
|
||||
controller := &fakeVoWiFiController{state: vowifi.State{Enabled: true}}
|
||||
server := &Server{vowifi: controller}
|
||||
if got := server.callTransport("ec20"); got != "cellular" {
|
||||
t.Fatalf("callTransport before IMS registration = %q, want cellular", got)
|
||||
}
|
||||
controller.state.IMSReady = true
|
||||
if got := server.callTransport("ec20"); got != "vowifi" {
|
||||
t.Fatalf("callTransport with IMS ready = %q, want vowifi", got)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ import (
|
||||
// USSD, and USB-net results are configurable for the feature endpoint tests.
|
||||
type fakeDeviceController struct {
|
||||
entry device.Device
|
||||
atResponse modem.Response
|
||||
atErr error
|
||||
scanResult device.OperatorScanResult
|
||||
scanErr error
|
||||
ussdResult device.USSDResult
|
||||
@@ -43,11 +45,11 @@ func (f fakeDeviceController) Refresh(context.Context, string) (device.Snapshot,
|
||||
return device.Snapshot{}, nil
|
||||
}
|
||||
func (f fakeDeviceController) ExecuteAT(context.Context, string, string) (modem.Response, error) {
|
||||
return modem.Response{}, nil
|
||||
return f.atResponse, f.atErr
|
||||
}
|
||||
func (f fakeDeviceController) Reboot(context.Context, string) error { return nil }
|
||||
func (f fakeDeviceController) USSD(context.Context, string, string) (device.USSDResult, error) {
|
||||
return device.USSDResult{}, nil
|
||||
return f.ussdResult, f.ussdErr
|
||||
}
|
||||
func (f fakeDeviceController) ContinueUSSD(context.Context, string, string) (device.USSDResult, error) {
|
||||
return f.ussdResult, f.ussdErr
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
@@ -30,6 +31,8 @@ const (
|
||||
telegramMaxDialDuration = 10 * time.Minute
|
||||
)
|
||||
|
||||
var telegramTokenInURLPattern = regexp.MustCompile(`bot[0-9]{5,20}:[A-Za-z0-9_-]{20,128}`)
|
||||
|
||||
type telegramRuntimeConfig struct {
|
||||
Token string
|
||||
ChatID string
|
||||
@@ -146,6 +149,9 @@ func (bot *telegramBot) poll(ctx context.Context) {
|
||||
updates, pollErr := bot.getUpdates(pollContext, config, offset, 5)
|
||||
cancel()
|
||||
if pollErr != nil {
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
bot.warn("poll Telegram updates", pollErr)
|
||||
if !waitTelegram(ctx, telegramPollInterval) {
|
||||
return
|
||||
@@ -186,6 +192,10 @@ func (bot *telegramBot) bootstrap(ctx context.Context, config telegramRuntimeCon
|
||||
{"command": "call", "description": "限时拨号并自动挂断(需要确认)"},
|
||||
{"command": "calls", "description": "查看当前通话"},
|
||||
{"command": "hangup", "description": "挂断通话"},
|
||||
{"command": "at", "description": "向指定设备发送安全 AT 指令"},
|
||||
{"command": "ussd", "description": "向指定设备发送 USSD 指令"},
|
||||
{"command": "ussd_reply", "description": "回复交互式 USSD 会话"},
|
||||
{"command": "ussd_cancel", "description": "取消交互式 USSD 会话"},
|
||||
{"command": "help", "description": "查看命令帮助"},
|
||||
}
|
||||
_ = bot.call(requestContext, config, "setMyCommands", map[string]any{"commands": commands}, nil)
|
||||
@@ -274,6 +284,34 @@ func (bot *telegramBot) handleUpdate(ctx context.Context, config telegramRuntime
|
||||
bot.executeSimpleCallAction(ctx, config, message.Chat.ID, message.From.ID, strings.TrimSpace(remainder), "hangup")
|
||||
case "calls":
|
||||
bot.executeSimpleCallAction(ctx, config, message.Chat.ID, message.From.ID, strings.TrimSpace(remainder), "status")
|
||||
case "at":
|
||||
parts := splitTelegramArguments(remainder, 2)
|
||||
if len(parts) != 2 {
|
||||
bot.sendText(ctx, config, message.Chat.ID, "用法:/at <设备ID> <AT指令>\n示例:/at EC20 AT+CSQ", nil)
|
||||
return
|
||||
}
|
||||
bot.handleATCommand(ctx, config, message.Chat.ID, message.From.ID, parts[0], parts[1])
|
||||
case "ussd":
|
||||
parts := strings.Fields(remainder)
|
||||
if len(parts) != 2 {
|
||||
bot.sendText(ctx, config, message.Chat.ID, "用法:/ussd <设备ID> <USSD代码>\n示例:/ussd EC20 *100#", nil)
|
||||
return
|
||||
}
|
||||
bot.handleUSSDCommand(ctx, config, message.Chat.ID, message.From.ID, parts[0], parts[1])
|
||||
case "ussd_reply":
|
||||
parts := splitTelegramArguments(remainder, 2)
|
||||
if len(parts) != 2 {
|
||||
bot.sendText(ctx, config, message.Chat.ID, "用法:/ussd_reply <会话ID> <回复内容>", nil)
|
||||
return
|
||||
}
|
||||
bot.handleUSSDReply(ctx, config, message.Chat.ID, message.From.ID, parts[0], parts[1])
|
||||
case "ussd_cancel":
|
||||
sessionID := strings.TrimSpace(remainder)
|
||||
if sessionID == "" || strings.ContainsAny(sessionID, " \t\r\n") {
|
||||
bot.sendText(ctx, config, message.Chat.ID, "用法:/ussd_cancel <会话ID>", nil)
|
||||
return
|
||||
}
|
||||
bot.handleUSSDCancel(ctx, config, message.Chat.ID, message.From.ID, sessionID)
|
||||
default:
|
||||
bot.sendText(ctx, config, message.Chat.ID, "未知命令。发送 /help 查看可用操作。", nil)
|
||||
}
|
||||
@@ -329,6 +367,10 @@ func (bot *telegramBot) sendHelp(ctx context.Context, config telegramRuntimeConf
|
||||
"/calls <设备ID> — 查看模块当前通话",
|
||||
"/answer <设备ID> — 接听蜂窝来电",
|
||||
"/hangup <设备ID> — 立即挂断",
|
||||
"/at <设备ID> <AT指令> — 执行经过安全校验的单行 AT 指令",
|
||||
"/ussd <设备ID> <代码> — 发送 USSD 指令",
|
||||
"/ussd_reply <会话ID> <内容> — 回复交互式 USSD 菜单",
|
||||
"/ussd_cancel <会话ID> — 取消交互式 USSD 会话",
|
||||
"",
|
||||
"Bot 不提供 eSIM 下载、删除或改名,也不采集或转发通话音频。控制命令只接受设置中的 Admin ID。",
|
||||
}, "\n")
|
||||
@@ -653,6 +695,112 @@ func (bot *telegramBot) executeSimpleCallAction(ctx context.Context, config tele
|
||||
bot.server.recordAudit(ctx, fmt.Sprintf("telegram:%d", adminID), "telegram.call."+action, "device", deviceID, outcome, "telegram")
|
||||
}
|
||||
|
||||
func (bot *telegramBot) handleATCommand(ctx context.Context, config telegramRuntimeConfig, chatID, adminID int64, deviceID, command string) {
|
||||
result, err := bot.executeATCommand(ctx, deviceID, command)
|
||||
outcome := "success"
|
||||
if err != nil {
|
||||
outcome = "failure"
|
||||
bot.sendText(ctx, config, chatID, "AT 指令执行失败:"+err.Error(), nil)
|
||||
} else {
|
||||
bot.sendText(ctx, config, chatID, result, nil)
|
||||
}
|
||||
bot.server.recordAudit(ctx, fmt.Sprintf("telegram:%d", adminID), "telegram.at.execute", "device", deviceID, outcome, "telegram")
|
||||
}
|
||||
|
||||
func (bot *telegramBot) executeATCommand(ctx context.Context, deviceID, command string) (string, error) {
|
||||
command = strings.TrimSpace(command)
|
||||
if err := validateATCommand(command); err != nil {
|
||||
return "", err
|
||||
}
|
||||
_, _, physicalID, err := bot.device(deviceID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
operationContext, cancel := context.WithTimeout(ctx, 60*time.Second)
|
||||
defer cancel()
|
||||
response, err := bot.server.devices.ExecuteAT(operationContext, physicalID, command)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return fmt.Sprintf("设备:%s\n> %s\n\n%s", deviceID, command, formatTelegramAT(response)), nil
|
||||
}
|
||||
|
||||
func (bot *telegramBot) handleUSSDCommand(ctx context.Context, config telegramRuntimeConfig, chatID, adminID int64, deviceID, code string) {
|
||||
result, err := bot.executeUSSDCommand(ctx, deviceID, code)
|
||||
outcome := "success"
|
||||
if err != nil {
|
||||
outcome = "failure"
|
||||
bot.sendText(ctx, config, chatID, "USSD 指令执行失败:"+err.Error(), nil)
|
||||
} else {
|
||||
bot.sendText(ctx, config, chatID, formatTelegramUSSD(deviceID, result), nil)
|
||||
}
|
||||
bot.server.recordAudit(ctx, fmt.Sprintf("telegram:%d", adminID), "telegram.ussd.start", "device", deviceID, outcome, "telegram")
|
||||
}
|
||||
|
||||
func (bot *telegramBot) executeUSSDCommand(ctx context.Context, deviceID, code string) (device.USSDResult, error) {
|
||||
_, _, physicalID, err := bot.device(deviceID)
|
||||
if err != nil {
|
||||
return device.USSDResult{}, err
|
||||
}
|
||||
operationContext, cancel := context.WithTimeout(ctx, 90*time.Second)
|
||||
defer cancel()
|
||||
return bot.server.devices.USSD(operationContext, physicalID, strings.TrimSpace(code))
|
||||
}
|
||||
|
||||
func (bot *telegramBot) handleUSSDReply(ctx context.Context, config telegramRuntimeConfig, chatID, adminID int64, sessionID, input string) {
|
||||
operationContext, cancel := context.WithTimeout(ctx, 90*time.Second)
|
||||
result, err := bot.server.devices.ContinueUSSD(operationContext, strings.TrimSpace(sessionID), strings.TrimSpace(input))
|
||||
cancel()
|
||||
outcome := "success"
|
||||
if err != nil {
|
||||
outcome = "failure"
|
||||
bot.sendText(ctx, config, chatID, "USSD 回复失败:"+err.Error(), nil)
|
||||
} else {
|
||||
bot.sendText(ctx, config, chatID, formatTelegramUSSD("", result), nil)
|
||||
}
|
||||
bot.server.recordAudit(ctx, fmt.Sprintf("telegram:%d", adminID), "telegram.ussd.reply", "ussd_session", "interactive", outcome, "telegram")
|
||||
}
|
||||
|
||||
func (bot *telegramBot) handleUSSDCancel(ctx context.Context, config telegramRuntimeConfig, chatID, adminID int64, sessionID string) {
|
||||
operationContext, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
err := bot.server.devices.CancelUSSD(operationContext, strings.TrimSpace(sessionID))
|
||||
cancel()
|
||||
outcome := "success"
|
||||
if err != nil {
|
||||
outcome = "failure"
|
||||
bot.sendText(ctx, config, chatID, "取消 USSD 会话失败:"+err.Error(), nil)
|
||||
} else {
|
||||
bot.sendText(ctx, config, chatID, "USSD 会话已取消。", nil)
|
||||
}
|
||||
bot.server.recordAudit(ctx, fmt.Sprintf("telegram:%d", adminID), "telegram.ussd.cancel", "ussd_session", "interactive", outcome, "telegram")
|
||||
}
|
||||
|
||||
func formatTelegramUSSD(deviceID string, result device.USSDResult) string {
|
||||
lines := make([]string, 0, 7)
|
||||
if strings.TrimSpace(deviceID) != "" {
|
||||
lines = append(lines, "设备:"+strings.TrimSpace(deviceID))
|
||||
}
|
||||
if strings.TrimSpace(result.Code) != "" {
|
||||
lines = append(lines, "USSD:"+strings.TrimSpace(result.Code))
|
||||
}
|
||||
lines = append(lines, "状态:"+firstNonEmpty(strings.TrimSpace(result.Status), "final"))
|
||||
if strings.TrimSpace(result.Text) != "" {
|
||||
lines = append(lines, "\n"+strings.TrimSpace(result.Text))
|
||||
} else if strings.TrimSpace(result.Raw) != "" {
|
||||
lines = append(lines, "\n"+strings.TrimSpace(result.Raw))
|
||||
} else {
|
||||
lines = append(lines, "\n网络未返回文本内容。")
|
||||
}
|
||||
if result.Continueable && strings.TrimSpace(result.SessionID) != "" {
|
||||
lines = append(lines,
|
||||
"\n网络正在等待输入。",
|
||||
"回复:/ussd_reply "+result.SessionID+" <内容>",
|
||||
"取消:/ussd_cancel "+result.SessionID,
|
||||
)
|
||||
}
|
||||
return strings.Join(lines, "\n")
|
||||
}
|
||||
|
||||
func (bot *telegramBot) handleVoWiFi(ctx context.Context, config telegramRuntimeConfig, chatID, adminID int64, deviceID, operation string) {
|
||||
stored, entry, _, err := bot.device(deviceID)
|
||||
if err != nil {
|
||||
@@ -828,7 +976,7 @@ func (bot *telegramBot) loadConfig(ctx context.Context) (telegramRuntimeConfig,
|
||||
func (bot *telegramBot) call(ctx context.Context, config telegramRuntimeConfig, method string, payload any, result any) error {
|
||||
base, err := validateTelegramAPIURL(ctx, config.BaseURL, config.Token, method)
|
||||
if err != nil {
|
||||
return err
|
||||
return redactTelegramError(err, config.Token)
|
||||
}
|
||||
body, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
@@ -840,13 +988,13 @@ func (bot *telegramBot) call(ctx context.Context, config telegramRuntimeConfig,
|
||||
}
|
||||
request, err := http.NewRequestWithContext(ctx, http.MethodPost, base.String(), bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return err
|
||||
return redactTelegramError(err, config.Token)
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.Header.Set("User-Agent", "vocat-telegram-bot/1")
|
||||
response, err := client.Do(request)
|
||||
if err != nil {
|
||||
return err
|
||||
return redactTelegramError(err, config.Token)
|
||||
}
|
||||
defer response.Body.Close()
|
||||
responseBody, err := io.ReadAll(io.LimitReader(response.Body, 2<<20))
|
||||
@@ -900,7 +1048,7 @@ func (bot *telegramBot) warn(message string, err error) {
|
||||
return
|
||||
}
|
||||
now := time.Now()
|
||||
text := err.Error()
|
||||
text := redactTelegramText(err.Error(), "")
|
||||
bot.logMu.Lock()
|
||||
if text == bot.lastLogText && now.Sub(bot.lastLogTime) < time.Minute {
|
||||
bot.logMu.Unlock()
|
||||
@@ -908,7 +1056,21 @@ func (bot *telegramBot) warn(message string, err error) {
|
||||
}
|
||||
bot.lastLogText, bot.lastLogTime = text, now
|
||||
bot.logMu.Unlock()
|
||||
bot.server.logger.Warn(message, "error", err)
|
||||
bot.server.logger.Warn(message, "error", text)
|
||||
}
|
||||
|
||||
func redactTelegramError(err error, token string) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
return errors.New(redactTelegramText(err.Error(), token))
|
||||
}
|
||||
|
||||
func redactTelegramText(value, token string) string {
|
||||
if strings.TrimSpace(token) != "" {
|
||||
value = strings.ReplaceAll(value, token, "[REDACTED]")
|
||||
}
|
||||
return telegramTokenInURLPattern.ReplaceAllString(value, "bot[REDACTED]")
|
||||
}
|
||||
|
||||
func parseTelegramCommand(text string) (string, string) {
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"vocat/internal/device"
|
||||
"vocat/internal/modem"
|
||||
"vocat/internal/store"
|
||||
)
|
||||
|
||||
func TestTelegramAPIURLSupportsBaseAndTemplate(t *testing.T) {
|
||||
@@ -105,3 +109,75 @@ func TestFormatTelegramATIncludesFinalResult(t *testing.T) {
|
||||
t.Fatalf("formatTelegramAT(lines) = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTelegramExecutesGuardedATForConfiguredDevice(t *testing.T) {
|
||||
database, err := store.Open(context.Background(), ":memory:")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = database.Close() })
|
||||
if err := database.UpsertDevice(context.Background(), store.Device{ID: "EC20", Name: "EC20"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
bot := &telegramBot{server: &Server{
|
||||
store: database,
|
||||
devices: fakeDeviceController{
|
||||
entry: device.Device{ID: "EC20", Discovered: true},
|
||||
atResponse: modem.Response{Lines: []string{"+CSQ: 18,99"}, Final: "OK"},
|
||||
},
|
||||
}}
|
||||
result, err := bot.executeATCommand(context.Background(), "EC20", "AT+CSQ")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, expected := range []string{"设备:EC20", "> AT+CSQ", "+CSQ: 18,99", "OK"} {
|
||||
if !strings.Contains(result, expected) {
|
||||
t.Fatalf("AT result %q does not contain %q", result, expected)
|
||||
}
|
||||
}
|
||||
if _, err := bot.executeATCommand(context.Background(), "EC20", "AT+CFUN=0"); err == nil {
|
||||
t.Fatal("guarded AT command unexpectedly succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTelegramExecutesInteractiveUSSDForConfiguredDevice(t *testing.T) {
|
||||
database, err := store.Open(context.Background(), ":memory:")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = database.Close() })
|
||||
if err := database.UpsertDevice(context.Background(), store.Device{ID: "EC20", Name: "EC20"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
bot := &telegramBot{server: &Server{
|
||||
store: database,
|
||||
devices: fakeDeviceController{
|
||||
entry: device.Device{ID: "EC20", Discovered: true},
|
||||
ussdResult: device.USSDResult{
|
||||
Code: "*100#", Text: "1. Balance\n2. Bundles", Status: "awaiting_input",
|
||||
SessionID: "0123456789abcdef", Continueable: true,
|
||||
},
|
||||
},
|
||||
}}
|
||||
result, err := bot.executeUSSDCommand(context.Background(), "EC20", "*100#")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
formatted := formatTelegramUSSD("EC20", result)
|
||||
for _, expected := range []string{
|
||||
"设备:EC20", "状态:awaiting_input", "1. Balance", "/ussd_reply 0123456789abcdef", "/ussd_cancel 0123456789abcdef",
|
||||
} {
|
||||
if !strings.Contains(formatted, expected) {
|
||||
t.Fatalf("USSD result %q does not contain %q", formatted, expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTelegramErrorsRedactBotTokens(t *testing.T) {
|
||||
token := "1234567890:abcdefghijklmnopqrstuvwxyzABCDE"
|
||||
err := errors.New(`Post "https://api.telegram.org/bot` + token + `/getUpdates": context canceled`)
|
||||
redacted := redactTelegramError(err, token)
|
||||
if strings.Contains(redacted.Error(), token) || !strings.Contains(redacted.Error(), "bot[REDACTED]") {
|
||||
t.Fatalf("redacted error = %q", redacted)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user