DNF90 服务端与启动器完整源码（含 GM 工具功能增强）
服务端（Go）： - GM 塞背包/带属性装备发放：在线角色推送 op14 增量物品行，背包实时刷新，无需回角色选择界面 - GM 改金币/改等级：去掉在线拒绝，落库后推送 op14 钱包/op37 等级状态，在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel（自带在线刷新） - 无限/锁死疲劳模式 + 燃烧疲劳：每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示（op12 mode 0） - 深渊史诗掉率：GM 全局倍率 + 城镇增益药剂窗口倍率，真实接入掉落结算 启动器（Python/JS）： - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具：疲劳与燃烧、深渊史诗掉率、拍卖行上架（单一定价对齐） - 拍卖行上架前端对齐服务端单一价格语义，修复 400 报错
This commit is contained in:
hanfuit committed
commit
645b64fe21
4388 files changed
+1405457
No files matched your search
@@ -0,0 +1,184 @@
|
||||
package disjoint
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrOwnerUnavailable = errors.New("disjoint owner is unavailable")
|
||||
ErrAccountRequired = errors.New("disjoint account id is required")
|
||||
ErrCharacterRequired = errors.New("disjoint character id is required")
|
||||
ErrCharacterNotFound = errors.New("disjoint character is not found")
|
||||
ErrAccountMismatch = errors.New("disjoint character account mismatch")
|
||||
ErrInventoryNotFound = errors.New("disjoint inventory is not found")
|
||||
ErrProjectorRequired = errors.New("disjoint mutation projector is required")
|
||||
)
|
||||
|
||||
type Assets struct {
|
||||
AccountInventory *dnfrepo.AccountInventoryRecord
|
||||
Inventory *dnfrepo.InventoryRecord
|
||||
// Mailbox is the recipient's mailbox inside the same transaction, so a
|
||||
// projector can post rewards the bag cannot take without risking the
|
||||
// source item being consumed by a commit whose mail never lands. It is
|
||||
// nil when the repository group exposes no mailbox unit of work.
|
||||
Mailbox dnfrepo.MailboxRepository
|
||||
}
|
||||
|
||||
type Changes struct {
|
||||
AccountInventory bool
|
||||
Inventory bool
|
||||
}
|
||||
|
||||
type Projector func(*Assets) (Changes, error)
|
||||
|
||||
type Command struct {
|
||||
AccountID string
|
||||
CharacterID string
|
||||
UpdatedAt time.Time
|
||||
Project Projector
|
||||
}
|
||||
|
||||
// Owner owns character/account authorization plus the atomic account
|
||||
// warehouse and character inventory write used by all three gameplays.
|
||||
type Owner struct {
|
||||
assets dnfrepo.AccountCharacterAssetUnitOfWork
|
||||
// mailboxAssets is preferred when present: WithinMailboxAssets scopes the
|
||||
// account inventory, character and inventory by the same character while
|
||||
// also handing over the mailbox, which is a strict superset of what this
|
||||
// owner needs (it never touches the equipment page). That lets a
|
||||
// full-inventory reward be posted as mail inside the very transaction
|
||||
// that consumes the source, instead of after it.
|
||||
mailboxAssets dnfrepo.MailboxAssetUnitOfWork
|
||||
}
|
||||
|
||||
func NewOwner(repositories dnfrepo.Group) (*Owner, error) {
|
||||
if repositories.AccountAssets == nil {
|
||||
return nil, ErrOwnerUnavailable
|
||||
}
|
||||
return &Owner{assets: repositories.AccountAssets, mailboxAssets: repositories.MailboxAssets}, nil
|
||||
}
|
||||
|
||||
func (o *Owner) DisjointEquipment(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "equipment-disjoint", command)
|
||||
}
|
||||
|
||||
func (o *Owner) DisjointAvatar(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "avatar-disjoint", command)
|
||||
}
|
||||
|
||||
func (o *Owner) CompoundEmblems(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "emblem-compound", command)
|
||||
}
|
||||
|
||||
func (o *Owner) mutate(ctx context.Context, operation string, command Command) error {
|
||||
if o == nil || o.assets == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
accountID := strings.TrimSpace(command.AccountID)
|
||||
characterID := strings.TrimSpace(command.CharacterID)
|
||||
if accountID == "" {
|
||||
return ErrAccountRequired
|
||||
}
|
||||
if characterID == "" {
|
||||
return ErrCharacterRequired
|
||||
}
|
||||
if command.Project == nil {
|
||||
return ErrProjectorRequired
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
now := command.UpdatedAt.UTC()
|
||||
if now.IsZero() {
|
||||
now = time.Now().UTC()
|
||||
}
|
||||
|
||||
apply := func(
|
||||
accounts dnfrepo.AccountInventoryRepository,
|
||||
characters dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
mailboxes dnfrepo.MailboxRepository,
|
||||
) error {
|
||||
if accounts == nil || characters == nil || inventories == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
character, found, err := characters.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !found || strings.TrimSpace(character.CharacterID) != characterID {
|
||||
return fmt.Errorf("%w: character=%s operation=%s", ErrCharacterNotFound, characterID, operation)
|
||||
}
|
||||
if strings.TrimSpace(character.AccountID) != accountID {
|
||||
return fmt.Errorf("%w: account=%s character=%s operation=%s", ErrAccountMismatch, accountID, characterID, operation)
|
||||
}
|
||||
inventory, found, err := inventories.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !found || strings.TrimSpace(inventory.CharacterID) != characterID || inventory.Slots == nil {
|
||||
return fmt.Errorf("%w: character=%s operation=%s", ErrInventoryNotFound, characterID, operation)
|
||||
}
|
||||
accountInventory, _, err := accounts.Load(ctx, accountID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
accountInventory = dnfrepo.CloneAccountInventory(accountInventory)
|
||||
accountInventory.AccountID = accountID
|
||||
if accountInventory.Slots == nil {
|
||||
accountInventory.Slots = make(map[string]dnfrepo.ItemStack)
|
||||
}
|
||||
inventory = dnfrepo.CloneInventory(inventory)
|
||||
|
||||
changes, err := command.Project(&Assets{
|
||||
AccountInventory: &accountInventory,
|
||||
Inventory: &inventory,
|
||||
Mailbox: mailboxes,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if changes.Inventory {
|
||||
inventory.UpdatedAt = now
|
||||
if err := dnfrepo.SaveInventoryFields(ctx, inventories, inventory, dnfrepo.InventoryFieldSlots); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if changes.AccountInventory {
|
||||
accountInventory.UpdatedAt = now
|
||||
if err := accounts.Save(ctx, accountInventory); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
if o.mailboxAssets != nil {
|
||||
return o.mailboxAssets.WithinMailboxAssets(ctx, characterID, characterID, func(
|
||||
_ dnfrepo.AccountRepository,
|
||||
accounts dnfrepo.AccountInventoryRepository,
|
||||
characters dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
mailboxes dnfrepo.MailboxRepository,
|
||||
) error {
|
||||
return apply(accounts, characters, inventories, mailboxes)
|
||||
})
|
||||
}
|
||||
return o.assets.WithinAccountCharacterAssets(ctx, accountID, characterID, func(
|
||||
accounts dnfrepo.AccountInventoryRepository,
|
||||
characters dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
_ dnfrepo.EquipmentRepository,
|
||||
) error {
|
||||
return apply(accounts, characters, inventories, nil)
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
package disjoint
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
dnfrepomemory "longheng.io/server/internal/modules/dnf/repository/memory"
|
||||
)
|
||||
|
||||
func TestOwnerCommitsAccountAndCharacterInventoryTogether(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := newOwnerTestRepositories(t, "dnf:1")
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = owner.DisjointEquipment(ctx, Command{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "0:5")
|
||||
assets.AccountInventory.Slots[dnfrepo.AccountSharedInventorySlotKey(358)] = dnfrepo.ItemStack{ItemID: 3037, Count: 10}
|
||||
return Changes{AccountInventory: true, Inventory: true}, nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
inventory, found, err := repositories.Inventory.Load(ctx, "77")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load inventory found=%v err=%v", found, err)
|
||||
}
|
||||
if _, found := inventory.Slots["0:5"]; found {
|
||||
t.Fatalf("source item was not removed: %+v", inventory.Slots)
|
||||
}
|
||||
account, found, err := repositories.AccountInventory.Load(ctx, "dnf:1")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load account inventory found=%v err=%v", found, err)
|
||||
}
|
||||
if account.Slots[dnfrepo.AccountSharedInventorySlotKey(358)].Count != 10 {
|
||||
t.Fatalf("account reward missing: %+v", account.Slots)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerRollsBackProjectorFailure(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := newOwnerTestRepositories(t, "dnf:1")
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
wantErr := errors.New("projection failed")
|
||||
err = owner.CompoundEmblems(ctx, Command{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "0:5")
|
||||
return Changes{Inventory: true}, wantErr
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, wantErr) {
|
||||
t.Fatalf("CompoundEmblems() error=%v want=%v", err, wantErr)
|
||||
}
|
||||
inventory, found, err := repositories.Inventory.Load(ctx, "77")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load inventory found=%v err=%v", found, err)
|
||||
}
|
||||
if inventory.Slots["0:5"].Count != 1 {
|
||||
t.Fatalf("failed projection leaked mutation: %+v", inventory.Slots)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerRejectsCrossAccountCharacter(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := newOwnerTestRepositories(t, "dnf:2")
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = owner.DisjointAvatar(ctx, Command{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Project: func(*Assets) (Changes, error) {
|
||||
return Changes{}, nil
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, ErrAccountMismatch) {
|
||||
t.Fatalf("DisjointAvatar() error=%v want=%v", err, ErrAccountMismatch)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerExposesThreeGameplayBoundaries(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := newOwnerTestRepositories(t, "dnf:1")
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
command := Command{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Project: func(*Assets) (Changes, error) {
|
||||
return Changes{}, nil
|
||||
},
|
||||
}
|
||||
for name, apply := range map[string]func(context.Context, Command) error{
|
||||
"equipment disjoint": owner.DisjointEquipment,
|
||||
"avatar disjoint": owner.DisjointAvatar,
|
||||
"emblem compound": owner.CompoundEmblems,
|
||||
} {
|
||||
if err := apply(ctx, command); err != nil {
|
||||
t.Fatalf("%s: %v", name, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func newOwnerTestRepositories(t *testing.T, characterAccountID string) dnfrepo.Group {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
if err := repositories.Character.Save(ctx, dnfrepo.CharacterRecord{CharacterID: "77", AccountID: characterAccountID}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{
|
||||
"0:5": {ItemID: 9001, Count: 1},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return repositories
|
||||
}
|
||||
Reference in new issue
Block a user