补全过滤入口与直接兑换,优化兑换分类和 WSS 建连
- GUI 接线 Exchange 绑定:新增「直接兑换」按钮,结果带 category/message 并进入结果面板 - 补 -max-price/-min-left(CLI 与 GUI 设置),Target 的价格与库存过滤不再悬空 - 删除死代码 sendUpdateUserInfo 及其请求结构体(浏览器流程不含该帧) - ClassifyExchange 改为多路判定:合并 msg/actPreCondition/exchangeInfo 文案,status=200 且有 orderId 视为成功,新增 condition 分类(precondition 门禁) - WSS 建连改为锁外 dial、锁内注册,同 uid 并发调用共享一次握手 - 默认传输层统一为 http(CLI/GUI/README),.gitignore 忽略 .DS_Store - 同步 Wails 依赖升级(2.12.0 -> 2.15.0)并重新生成前端绑定
This commit is contained in:
+77
-25
@@ -24,6 +24,9 @@ const (
|
||||
CategorySoldOut = "sold_out"
|
||||
CategoryFailed = "failed"
|
||||
CategoryError = "error"
|
||||
// CategoryCondition 表示服务端返回了 precondition 门禁(条件未达成),
|
||||
// 没有可识别文案,按可重试失败处理但单独分类便于观察。
|
||||
CategoryCondition = "condition"
|
||||
)
|
||||
|
||||
type Account struct {
|
||||
@@ -314,7 +317,7 @@ func (r *Runner) exchangeTarget(ctx context.Context, client huya.ActivityClient,
|
||||
exchange, err := client.ScoreExchangePrize(ctx, account.UID, account.Cookie, sid, pid)
|
||||
result.Exchange = exchange
|
||||
result.Category = ClassifyExchange(exchange, err)
|
||||
result.Message = exchangeMessage(exchange)
|
||||
result.Message = ExchangeMessage(exchange)
|
||||
if err != nil {
|
||||
result.Action = "exchange_error"
|
||||
result.Error = err.Error()
|
||||
@@ -354,11 +357,7 @@ func (r *Runner) applyExchangeDecision(state *runState, account Account, index i
|
||||
retryAt := now.Add(cfg.TooFrequentBackoff)
|
||||
state.setRetryAfter(account.UID, index, retryAt)
|
||||
result.RetryAfter = retryAt.UnixMilli()
|
||||
case CategoryError:
|
||||
retryAt := now.Add(cfg.ErrorBackoff)
|
||||
state.setRetryAfter(account.UID, index, retryAt)
|
||||
result.RetryAfter = retryAt.UnixMilli()
|
||||
case CategoryFailed:
|
||||
case CategoryError, CategoryFailed, CategoryCondition:
|
||||
retryAt := now.Add(cfg.ErrorBackoff)
|
||||
state.setRetryAfter(account.UID, index, retryAt)
|
||||
result.RetryAfter = retryAt.UnixMilli()
|
||||
@@ -609,6 +608,64 @@ func autoPrize(prizes []huya.PrizeInfo, target Target) *huya.PrizeInfo {
|
||||
return fallback
|
||||
}
|
||||
|
||||
// exchangeSignals 汇总一次兑换响应里可用于判定的信号。
|
||||
//
|
||||
// 虎牙把失败原因分散在 msg / actPreCondition(Tip/ButtonDesc/ConditionParams)
|
||||
// 和 exchangeInfo.desc 里,status 除 200 外没有可依据的公开语义,
|
||||
// 所以判定顺序是:文案 -> 成功结构(status=200 且有 orderId)-> 结构门禁 -> 兜底失败。
|
||||
type exchangeSignals struct {
|
||||
text string
|
||||
status int32
|
||||
hasOrderID bool
|
||||
conditionType int32
|
||||
}
|
||||
|
||||
func buildExchangeSignals(resp *huya.ScoreExchangePrizeResp) exchangeSignals {
|
||||
if resp == nil {
|
||||
return exchangeSignals{}
|
||||
}
|
||||
parts := []string{
|
||||
resp.Msg,
|
||||
resp.ActPreCondition.Tip,
|
||||
resp.ActPreCondition.ButtonDesc,
|
||||
resp.ExchangeInfo.Desc,
|
||||
}
|
||||
for _, value := range resp.ActPreCondition.ConditionParams {
|
||||
parts = append(parts, value)
|
||||
}
|
||||
texts := make([]string, 0, len(parts))
|
||||
for _, part := range parts {
|
||||
if item := strings.TrimSpace(part); item != "" {
|
||||
texts = append(texts, item)
|
||||
}
|
||||
}
|
||||
return exchangeSignals{
|
||||
text: strings.Join(texts, " "),
|
||||
status: resp.Status,
|
||||
hasOrderID: strings.TrimSpace(resp.OrderID) != "",
|
||||
conditionType: resp.ActPreCondition.ConditionType,
|
||||
}
|
||||
}
|
||||
|
||||
// classifyExchangeText 只依据文案判定失败原因,命中时返回分类。
|
||||
func classifyExchangeText(text string) (string, bool) {
|
||||
switch {
|
||||
case containsAny(text, "操作频繁", "太频繁", "稍后再试"):
|
||||
return CategoryTooFrequent, true
|
||||
case containsAny(text, "暂未开放", "未开放", "未开始", "活动未开始"):
|
||||
return CategoryNotOpen, true
|
||||
case containsAny(text, "已抢完", "已兑完", "库存不足", "没有库存", "领完了"):
|
||||
return CategorySoldOut, true
|
||||
case containsAny(text, "货币不足", "积分不足", "余额不足", "点券不足", "不足"):
|
||||
return CategoryNotEnough, true
|
||||
case containsAny(text, "已兑换", "重复兑换", "已领取", "超过兑换次数", "达到上限", "限购"):
|
||||
return CategoryAlreadyDone, true
|
||||
case containsAny(text, "奖品已下架", "已下架", "奖品不存在", "活动不存在"):
|
||||
return CategoryOffShelf, true
|
||||
}
|
||||
return "", false
|
||||
}
|
||||
|
||||
func ClassifyExchange(resp *huya.ScoreExchangePrizeResp, err error) string {
|
||||
if err != nil {
|
||||
return CategoryError
|
||||
@@ -619,28 +676,23 @@ func ClassifyExchange(resp *huya.ScoreExchangePrizeResp, err error) string {
|
||||
if resp.Success() {
|
||||
return CategorySuccess
|
||||
}
|
||||
msg := exchangeMessage(resp)
|
||||
switch {
|
||||
case containsAny(msg, "操作频繁", "太频繁", "稍后再试"):
|
||||
return CategoryTooFrequent
|
||||
case containsAny(msg, "暂未开放", "未开放", "未开始", "活动未开始"):
|
||||
return CategoryNotOpen
|
||||
case containsAny(msg, "已抢完", "已兑完", "库存不足", "没有库存", "领完了"):
|
||||
return CategorySoldOut
|
||||
case containsAny(msg, "货币不足", "积分不足", "余额不足", "点券不足", "不足"):
|
||||
return CategoryNotEnough
|
||||
case containsAny(msg, "已兑换", "重复兑换", "已领取", "超过兑换次数", "达到上限", "限购"):
|
||||
return CategoryAlreadyDone
|
||||
case containsAny(msg, "奖品已下架", "已下架", "奖品不存在", "活动不存在"):
|
||||
return CategoryOffShelf
|
||||
case resp.Status != 0:
|
||||
return CategoryFailed
|
||||
default:
|
||||
return CategoryFailed
|
||||
signals := buildExchangeSignals(resp)
|
||||
if category, ok := classifyExchangeText(signals.text); ok {
|
||||
return category
|
||||
}
|
||||
// 成功回包也可能不带中文文案:status=200 且有 orderId 视为成功。
|
||||
if signals.status == 200 && signals.hasOrderID {
|
||||
return CategorySuccess
|
||||
}
|
||||
// 没有文案但服务端回了 precondition 门禁,归为条件未达成,按可重试失败处理。
|
||||
if signals.conditionType != 0 {
|
||||
return CategoryCondition
|
||||
}
|
||||
return CategoryFailed
|
||||
}
|
||||
|
||||
func exchangeMessage(resp *huya.ScoreExchangePrizeResp) string {
|
||||
// ExchangeMessage 返回响应里最有代表性的提示文案,供日志与 GUI 展示。
|
||||
func ExchangeMessage(resp *huya.ScoreExchangePrizeResp) string {
|
||||
if resp == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
@@ -83,6 +83,44 @@ func TestClassifyExchange(t *testing.T) {
|
||||
{name: "off shelf", resp: &huya.ScoreExchangePrizeResp{Status: 500, Msg: "奖品已下架"}, want: CategoryOffShelf},
|
||||
{name: "sold out", resp: &huya.ScoreExchangePrizeResp{Status: 500, Msg: "库存不足"}, want: CategorySoldOut},
|
||||
{name: "error", err: errors.New("timeout"), want: CategoryError},
|
||||
{
|
||||
name: "success with order id",
|
||||
resp: &huya.ScoreExchangePrizeResp{Status: 200, OrderID: "sOrderId_2203_12889_1_1783328404_957"},
|
||||
want: CategorySuccess,
|
||||
},
|
||||
{
|
||||
name: "not enough in precondition tip",
|
||||
resp: &huya.ScoreExchangePrizeResp{
|
||||
Status: 500,
|
||||
Msg: "兑换失败",
|
||||
ActPreCondition: huya.ActPreCondition{Tip: "积分不足,无法兑换"},
|
||||
},
|
||||
want: CategoryNotEnough,
|
||||
},
|
||||
{
|
||||
name: "not enough in condition params",
|
||||
resp: &huya.ScoreExchangePrizeResp{
|
||||
Status: 500,
|
||||
Msg: "兑换失败",
|
||||
ActPreCondition: huya.ActPreCondition{ConditionParams: map[string]string{"tip": "余额不足"}},
|
||||
},
|
||||
want: CategoryNotEnough,
|
||||
},
|
||||
{
|
||||
name: "condition gate without text",
|
||||
resp: &huya.ScoreExchangePrizeResp{
|
||||
Status: 500,
|
||||
ActPreCondition: huya.ActPreCondition{ConditionType: 2},
|
||||
},
|
||||
want: CategoryCondition,
|
||||
},
|
||||
{name: "empty response", resp: &huya.ScoreExchangePrizeResp{Status: 500}, want: CategoryFailed},
|
||||
{name: "nil response", resp: nil, want: CategoryFailed},
|
||||
{
|
||||
name: "text wins over order id",
|
||||
resp: &huya.ScoreExchangePrizeResp{Status: 200, OrderID: "order", Msg: "库存不足"},
|
||||
want: CategorySoldOut,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
@@ -253,3 +291,29 @@ func TestRunTargetsRefreshAfterSuccessEmitsRefreshResults(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunTargetsConditionGateKeepsRetrying(t *testing.T) {
|
||||
client := &fakeActivityClient{
|
||||
exchangeFn: func(uid int64, sid, pid int32) (*huya.ScoreExchangePrizeResp, error) {
|
||||
return &huya.ScoreExchangePrizeResp{
|
||||
Status: 500,
|
||||
ActPreCondition: huya.ActPreCondition{ConditionType: 3},
|
||||
}, nil
|
||||
},
|
||||
}
|
||||
runner := Runner{Client: client}
|
||||
|
||||
err := runner.RunTargets(context.Background(), []Account{{UID: 1, Cookie: "yyuid=1"}}, []Target{{PID: 12889}}, Config{
|
||||
SID: 2203,
|
||||
Loops: 3,
|
||||
Delay: 10 * time.Millisecond,
|
||||
ErrorBackoff: time.Millisecond,
|
||||
}, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, exchangeCount, _ := client.counts()
|
||||
if exchangeCount != 3 {
|
||||
t.Fatalf("exchangeCount=%d, want 3", exchangeCount)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user