DNF90 服务端与启动器完整源码(含 GM 工具功能增强)
服务端(Go): - GM 塞背包/带属性装备发放:在线角色推送 op14 增量物品行,背包实时刷新,无需回角色选择界面 - GM 改金币/改等级:去掉在线拒绝,落库后推送 op14 钱包/op37 等级状态,在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel(自带在线刷新) - 无限/锁死疲劳模式 + 燃烧疲劳:每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示(op12 mode 0) - 深渊史诗掉率:GM 全局倍率 + 城镇增益药剂窗口倍率,真实接入掉落结算 启动器(Python/JS): - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具:疲劳与燃烧、深渊史诗掉率、拍卖行上架(单一定价对齐) - 拍卖行上架前端对齐服务端单一价格语义,修复 400 报错
This commit is contained in:
commit
645b64fe21
4388 files changed
+1405457
No files matched your search
@@ -0,0 +1,85 @@
|
||||
package health
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
healthpb "google.golang.org/grpc/health/grpc_health_v1"
|
||||
)
|
||||
|
||||
type GRPCServer struct {
|
||||
healthpb.UnimplementedHealthServer
|
||||
service *Service
|
||||
}
|
||||
|
||||
func NewGRPCServer(service *Service) *GRPCServer {
|
||||
return &GRPCServer{service: service}
|
||||
}
|
||||
|
||||
func RegisterGRPC(server *grpc.Server, service *Service) {
|
||||
if server == nil {
|
||||
return
|
||||
}
|
||||
healthpb.RegisterHealthServer(server, NewGRPCServer(service))
|
||||
}
|
||||
|
||||
func ProbeGRPC(ctx context.Context, client healthpb.HealthClient, service string) (State, error) {
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return StateUnknown, err
|
||||
}
|
||||
if client == nil {
|
||||
return StateUnknown, nil
|
||||
}
|
||||
resp, err := client.Check(ctx, &healthpb.HealthCheckRequest{Service: strings.TrimSpace(service)})
|
||||
if err != nil {
|
||||
return StateUnknown, err
|
||||
}
|
||||
return grpcStateFromStatus(resp.GetStatus()), nil
|
||||
}
|
||||
|
||||
func (s *GRPCServer) Check(ctx context.Context, req *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if s == nil || s.service == nil {
|
||||
return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVICE_UNKNOWN}, nil
|
||||
}
|
||||
if req != nil && strings.TrimSpace(req.Service) != "" && strings.TrimSpace(req.Service) != s.service.service {
|
||||
return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVICE_UNKNOWN}, nil
|
||||
}
|
||||
return &healthpb.HealthCheckResponse{Status: grpcServingStatus(s.service.Snapshot().State)}, nil
|
||||
}
|
||||
|
||||
func (s *GRPCServer) Watch(req *healthpb.HealthCheckRequest, stream healthpb.Health_WatchServer) error {
|
||||
resp, err := s.Check(stream.Context(), req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return stream.Send(resp)
|
||||
}
|
||||
|
||||
func grpcServingStatus(state State) healthpb.HealthCheckResponse_ServingStatus {
|
||||
switch state {
|
||||
case StateReady:
|
||||
return healthpb.HealthCheckResponse_SERVING
|
||||
case StateStarting, StateStopping, StateStopped, StateDegraded:
|
||||
return healthpb.HealthCheckResponse_NOT_SERVING
|
||||
default:
|
||||
return healthpb.HealthCheckResponse_SERVICE_UNKNOWN
|
||||
}
|
||||
}
|
||||
|
||||
func grpcStateFromStatus(status healthpb.HealthCheckResponse_ServingStatus) State {
|
||||
switch status {
|
||||
case healthpb.HealthCheckResponse_SERVING:
|
||||
return StateReady
|
||||
case healthpb.HealthCheckResponse_NOT_SERVING:
|
||||
return StateDegraded
|
||||
default:
|
||||
return StateUnknown
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
package health
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"sort"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"longheng.io/server/internal/platform/httpx"
|
||||
)
|
||||
|
||||
type State string
|
||||
|
||||
const (
|
||||
StateUnknown State = "unknown"
|
||||
StateStarting State = "starting"
|
||||
StateReady State = "ready"
|
||||
StateStopping State = "stopping"
|
||||
StateStopped State = "stopped"
|
||||
StateDegraded State = "degraded"
|
||||
)
|
||||
|
||||
type ComponentStatus struct {
|
||||
Name string `json:"name"`
|
||||
State State `json:"state"`
|
||||
Detail string `json:"detail,omitempty"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
type Snapshot struct {
|
||||
Service string `json:"service"`
|
||||
State State `json:"state"`
|
||||
Detail string `json:"detail,omitempty"`
|
||||
GeneratedAt time.Time `json:"generated_at"`
|
||||
Startup []ComponentStatus `json:"startup,omitempty"`
|
||||
Components []ComponentStatus `json:"components"`
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
service string
|
||||
|
||||
mu sync.RWMutex
|
||||
state State
|
||||
detail string
|
||||
startup map[string]ComponentStatus
|
||||
components map[string]ComponentStatus
|
||||
}
|
||||
|
||||
func New(service string) *Service {
|
||||
return &Service{
|
||||
service: service,
|
||||
state: StateStarting,
|
||||
startup: make(map[string]ComponentStatus),
|
||||
components: make(map[string]ComponentStatus),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) SetServiceState(state State, detail string) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.state = state
|
||||
s.detail = detail
|
||||
}
|
||||
|
||||
func (s *Service) SetComponent(name string, state State, detail string) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.components[name] = ComponentStatus{
|
||||
Name: name,
|
||||
State: state,
|
||||
Detail: detail,
|
||||
UpdatedAt: time.Now().UTC(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) SetStartupStep(name string, state State, detail string) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.startup[name] = ComponentStatus{
|
||||
Name: name,
|
||||
State: state,
|
||||
Detail: detail,
|
||||
UpdatedAt: time.Now().UTC(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) Snapshot() Snapshot {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
|
||||
startup := make([]ComponentStatus, 0, len(s.startup))
|
||||
for _, step := range s.startup {
|
||||
startup = append(startup, step)
|
||||
}
|
||||
sort.Slice(startup, func(i, j int) bool {
|
||||
return startup[i].Name < startup[j].Name
|
||||
})
|
||||
|
||||
components := make([]ComponentStatus, 0, len(s.components))
|
||||
for _, component := range s.components {
|
||||
components = append(components, component)
|
||||
}
|
||||
sort.Slice(components, func(i, j int) bool {
|
||||
return components[i].Name < components[j].Name
|
||||
})
|
||||
|
||||
return Snapshot{
|
||||
Service: s.service,
|
||||
State: s.state,
|
||||
Detail: s.detail,
|
||||
GeneratedAt: time.Now().UTC(),
|
||||
Startup: startup,
|
||||
Components: components,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) LiveHandler(w http.ResponseWriter, _ *http.Request) {
|
||||
httpx.WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"service": s.service,
|
||||
"alive": true,
|
||||
"time": time.Now().UTC(),
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Service) ReadyHandler(w http.ResponseWriter, _ *http.Request) {
|
||||
snapshot := s.Snapshot()
|
||||
if !snapshotReady(snapshot) {
|
||||
httpx.WriteJSON(w, http.StatusServiceUnavailable, snapshot)
|
||||
return
|
||||
}
|
||||
httpx.WriteJSON(w, http.StatusOK, snapshot)
|
||||
}
|
||||
|
||||
func (s *Service) DebugHandler(w http.ResponseWriter, _ *http.Request) {
|
||||
httpx.WriteJSON(w, http.StatusOK, s.Snapshot())
|
||||
}
|
||||
|
||||
func snapshotReady(snapshot Snapshot) bool {
|
||||
if snapshot.State != StateReady {
|
||||
return false
|
||||
}
|
||||
for _, component := range snapshot.Components {
|
||||
if component.State != StateReady {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
@@ -0,0 +1,158 @@
|
||||
package health
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
healthpb "google.golang.org/grpc/health/grpc_health_v1"
|
||||
)
|
||||
|
||||
const (
|
||||
defMonitorEvery = 5 * time.Second
|
||||
defMonitorTimeout = 2 * time.Second
|
||||
)
|
||||
|
||||
type ProbeTarget struct {
|
||||
Name string
|
||||
Service string
|
||||
Client healthpb.HealthClient
|
||||
}
|
||||
|
||||
type ProbeResult struct {
|
||||
Target string `json:"target"`
|
||||
Service string `json:"service,omitempty"`
|
||||
State State `json:"state"`
|
||||
Error string `json:"error,omitempty"`
|
||||
CheckedAt time.Time `json:"checked_at"`
|
||||
}
|
||||
|
||||
type MonitorOptions struct {
|
||||
Interval time.Duration
|
||||
Timeout time.Duration
|
||||
Targets []ProbeTarget
|
||||
Notify func(ProbeResult)
|
||||
Now func() time.Time
|
||||
}
|
||||
|
||||
type Monitor struct {
|
||||
interval time.Duration
|
||||
timeout time.Duration
|
||||
targets []ProbeTarget
|
||||
notify func(ProbeResult)
|
||||
now func() time.Time
|
||||
|
||||
mu sync.Mutex
|
||||
last map[string]State
|
||||
}
|
||||
|
||||
func NewMonitor(options MonitorOptions) *Monitor {
|
||||
interval := options.Interval
|
||||
if interval <= 0 {
|
||||
interval = defMonitorEvery
|
||||
}
|
||||
timeout := options.Timeout
|
||||
if timeout <= 0 {
|
||||
timeout = defMonitorTimeout
|
||||
}
|
||||
now := options.Now
|
||||
if now == nil {
|
||||
now = func() time.Time { return time.Now().UTC() }
|
||||
}
|
||||
targets := make([]ProbeTarget, 0, len(options.Targets))
|
||||
for _, target := range options.Targets {
|
||||
target.Name = strings.TrimSpace(target.Name)
|
||||
target.Service = strings.TrimSpace(target.Service)
|
||||
if target.Name == "" {
|
||||
target.Name = target.Service
|
||||
}
|
||||
if target.Name == "" {
|
||||
continue
|
||||
}
|
||||
targets = append(targets, target)
|
||||
}
|
||||
return &Monitor{
|
||||
interval: interval,
|
||||
timeout: timeout,
|
||||
targets: targets,
|
||||
notify: options.Notify,
|
||||
now: now,
|
||||
last: make(map[string]State),
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Monitor) CheckOnce(ctx context.Context) []ProbeResult {
|
||||
if m == nil {
|
||||
return nil
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
results := make([]ProbeResult, 0, len(m.targets))
|
||||
for _, target := range m.targets {
|
||||
result := m.probe(ctx, target)
|
||||
results = append(results, result)
|
||||
m.notifyIfChanged(result)
|
||||
}
|
||||
return results
|
||||
}
|
||||
|
||||
func (m *Monitor) Run(ctx context.Context) error {
|
||||
if m == nil {
|
||||
return nil
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
m.CheckOnce(ctx)
|
||||
ticker := time.NewTicker(m.interval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
case <-ticker.C:
|
||||
m.CheckOnce(ctx)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Monitor) probe(ctx context.Context, target ProbeTarget) ProbeResult {
|
||||
probeCtx := ctx
|
||||
cancel := func() {}
|
||||
if m.timeout > 0 {
|
||||
probeCtx, cancel = context.WithTimeout(ctx, m.timeout)
|
||||
}
|
||||
defer cancel()
|
||||
state, err := ProbeGRPC(probeCtx, target.Client, target.Service)
|
||||
result := ProbeResult{
|
||||
Target: target.Name,
|
||||
Service: target.Service,
|
||||
State: state,
|
||||
CheckedAt: m.now().UTC(),
|
||||
}
|
||||
if err != nil {
|
||||
result.Error = err.Error()
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (m *Monitor) notifyIfChanged(result ProbeResult) {
|
||||
if m.notify == nil {
|
||||
return
|
||||
}
|
||||
key := result.Target + "\x00" + result.Service
|
||||
m.mu.Lock()
|
||||
last, ok := m.last[key]
|
||||
if ok && last == result.State {
|
||||
m.mu.Unlock()
|
||||
return
|
||||
}
|
||||
m.last[key] = result.State
|
||||
m.mu.Unlock()
|
||||
m.notify(result)
|
||||
}
|
||||
Reference in new issue
Block a user