diff --git a/.gitignore b/.gitignore index ab614cb0..41bb583f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ src/server/gen-go src/server/GeoLite2-Country src/server/test/GeoLite2-Country src/server/msg/Gameapi_grpc.pb.go +src/server/unit_test/*.exe* +src/server/unit_test/log* \ No newline at end of file diff --git a/src/server/MergeConst/system.go b/src/server/MergeConst/system.go index db2d7bc8..44c3ebc2 100644 --- a/src/server/MergeConst/system.go +++ b/src/server/MergeConst/system.go @@ -3,6 +3,6 @@ package MergeConst const ( Go_gc_percent = 200 Go_gc_memory_limit = 1024 << 20 - Go_game_version = "1.0.3" // 游戏版本号，格式为 "主版本号.次版本号.修订号"，每次发布新版本时需要更新 + Go_game_version = "1.0.4" // 游戏版本号，格式为 "主版本号.次版本号.修订号"，每次发布新版本时需要更新 Go_log_delete_days = 3 // 日志删除天数，超过这个天数的日志文件将被删除 ) diff --git a/src/server/Order.png b/src/server/Order.png deleted file mode 100644 index 730f6ed7..00000000 Binary files a/src/server/Order.png and /dev/null differ diff --git a/src/server/backend/server.go b/src/server/backend/server.go index 6026db25..51c00a88 100644 --- a/src/server/backend/server.go +++ b/src/server/backend/server.go @@ -6,7 +6,8 @@ import ( "server/conf" "server/game" "server/msg" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" "google.golang.org/grpc" ) @@ -16,12 +17,22 @@ type backendServer struct { } func (s *backendServer) ReloadActivity(ctx context.Context, req *msg.ReqActivityCfgReload) (*msg.ResActivityCfgReload, error) { + defer func() { + if r := recover(); r != nil { + log.Error("ReloadActivity panic: %v", r) + } + }() log.Debug("Received ReloadActivity request: %v", req) game.AcitivityCfgReload() return nil, nil } func (s *backendServer) OrderShipping(ctx context.Context, req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) { + defer func() { + if r := recover(); r != nil { + log.Error("OrderShipping panic: %v", r) + } + }() log.Debug("Received OrderShipping request: %v", req) res, err := game.AdminShipping(req) if err != nil { @@ -31,6 +42,21 @@ func (s *backendServer) OrderShipping(ctx context.Context, req *msg.ReqOrderShip return res, nil } +func (s *backendServer) UserDetail(ctx context.Context, req *msg.UserDetailParam) (*msg.ResUserDetail, error) { + defer func() { + if r := recover(); r != nil { + log.Error("UserDetail panic: %v", r) + } + }() + log.Debug("Received UserDetail request: %v", req) + res, err := game.AdminPlayerDetailInfo(req) + if err != nil { + log.Error("UserDetail error: %v", err) + return nil, err + } + return res, nil +} + func Start() { if conf.Server.RPCAddr == "" { log.Debug("RPC server address not configured, skipping gRPC server startup") diff --git a/src/server/base/skeleton.go b/src/server/base/skeleton.go index 6d0c5e70..f5580d13 100644 --- a/src/server/base/skeleton.go +++ b/src/server/base/skeleton.go @@ -2,8 +2,9 @@ package base import ( "server/conf" - "server/pkg/github.com/name5566/leaf/chanrpc" - "server/pkg/github.com/name5566/leaf/module" + + "gitea.bywaystudios.com/pet_home/leaf/chanrpc" + "gitea.bywaystudios.com/pet_home/leaf/module" ) func NewSkeleton() *module.Skeleton { diff --git a/src/server/benchmark_test.go b/src/server/benchmark_test.go index c7f61d88..dc4a091c 100644 --- a/src/server/benchmark_test.go +++ b/src/server/benchmark_test.go @@ -69,14 +69,14 @@ func BenchmarkChampionshipGroup(b *testing.B) { func BenchmarkPlayerInit(b *testing.B) { for i := 0; i < b.N; i++ { p := new(game.Player) - p.InitPlayer("3625212") + p.InitPlayer("aaa002") p.LoginBackData() } } func BenchmarkPlayerBackup(b *testing.B) { p := new(game.Player) - p.InitPlayer("3625212") + p.InitPlayer("aaa002") for i := 0; i < b.N; i++ { p.BackUp() } @@ -84,7 +84,7 @@ func BenchmarkPlayerBackup(b *testing.B) { func BenchmarkPlayerRecover(b *testing.B) { p := new(game.Player) - p.InitPlayer("3625212") + p.InitPlayer("aaa002") backup := p.BackUp() for i := 0; i < b.N; i++ { p.Recover(backup) @@ -93,7 +93,7 @@ func BenchmarkPlayerRecover(b *testing.B) { func BenchmarkPlayerHandleMsg(b *testing.B) { p := new(game.Player) - p.InitPlayer("3625212") + p.InitPlayer("aaa002") list := make([]*msg.Msg, 0, 1000) for i := 0; i < 1000; i++ { m := &msg.Msg{ diff --git a/src/server/cluster/Cluster.go b/src/server/cluster/Cluster.go index 62911b29..0a0ce372 100644 --- a/src/server/cluster/Cluster.go +++ b/src/server/cluster/Cluster.go @@ -6,9 +6,11 @@ import ( "server/conf" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/network" "sync" + + "gitea.bywaystudios.com/pet_home/leaf/network" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/cluster/cluster_func.go b/src/server/cluster/cluster_func.go index 3aebb14f..df256d5b 100644 --- a/src/server/cluster/cluster_func.go +++ b/src/server/cluster/cluster_func.go @@ -5,9 +5,11 @@ import ( "server/conf" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/network" "time" + + "gitea.bywaystudios.com/pet_home/leaf/network" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) func RevcServerMsg(m *msg.Msg) error { diff --git a/src/server/conf/activity/activity_cfg.go b/src/server/conf/activity/activity_cfg.go index e1b915ab..467be649 100644 --- a/src/server/conf/activity/activity_cfg.go +++ b/src/server/conf/activity/activity_cfg.go @@ -4,8 +4,9 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/avatar/avatar_cfg.go b/src/server/conf/avatar/avatar_cfg.go index 2ed0811e..1806c41f 100644 --- a/src/server/conf/avatar/avatar_cfg.go +++ b/src/server/conf/avatar/avatar_cfg.go @@ -3,8 +3,9 @@ package avatarCfg import ( "math/rand" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/base/base_cfg.go b/src/server/conf/base/base_cfg.go index b259d14d..879613ba 100644 --- a/src/server/conf/base/base_cfg.go +++ b/src/server/conf/base/base_cfg.go @@ -3,8 +3,9 @@ package baseCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/card/card_cfg.go b/src/server/conf/card/card_cfg.go index 661d1ed9..d855e7df 100644 --- a/src/server/conf/card/card_cfg.go +++ b/src/server/conf/card/card_cfg.go @@ -4,9 +4,10 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/catnip/catnip_cfg.go b/src/server/conf/catnip/catnip_cfg.go index 05b02770..0302f66c 100644 --- a/src/server/conf/catnip/catnip_cfg.go +++ b/src/server/conf/catnip/catnip_cfg.go @@ -4,7 +4,8 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/champship/champship_cfg.go b/src/server/conf/champship/champship_cfg.go index ea5683eb..e0d98c13 100644 --- a/src/server/conf/champship/champship_cfg.go +++ b/src/server/conf/champship/champship_cfg.go @@ -4,8 +4,9 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/charge/charge_cfg.go b/src/server/conf/charge/charge_cfg.go index d601ff42..092d5d94 100644 --- a/src/server/conf/charge/charge_cfg.go +++ b/src/server/conf/charge/charge_cfg.go @@ -4,9 +4,10 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "sort" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/collect/collect_cfg.go b/src/server/conf/collect/collect_cfg.go index 7dd75dfe..de6175be 100644 --- a/src/server/conf/collect/collect_cfg.go +++ b/src/server/conf/collect/collect_cfg.go @@ -4,7 +4,8 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/daily_task/daily_task_cfg.go b/src/server/conf/daily_task/daily_task_cfg.go index a3971b03..94cbcba5 100644 --- a/src/server/conf/daily_task/daily_task_cfg.go +++ b/src/server/conf/daily_task/daily_task_cfg.go @@ -3,9 +3,10 @@ package dailyTaskCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/decorate/decorate_cfg.go b/src/server/conf/decorate/decorate_cfg.go index f767ad26..67845c96 100644 --- a/src/server/conf/decorate/decorate_cfg.go +++ b/src/server/conf/decorate/decorate_cfg.go @@ -3,9 +3,10 @@ package decorateCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/emoji/emoji_cfg.go b/src/server/conf/emoji/emoji_cfg.go index 9cf06c73..46e50a0d 100644 --- a/src/server/conf/emoji/emoji_cfg.go +++ b/src/server/conf/emoji/emoji_cfg.go @@ -3,7 +3,8 @@ package emojiCfg import ( GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/endless/endless_cfg.go b/src/server/conf/endless/endless_cfg.go index de77c022..89430bed 100644 --- a/src/server/conf/endless/endless_cfg.go +++ b/src/server/conf/endless/endless_cfg.go @@ -3,7 +3,8 @@ package endlessCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/face/face_cfg.go b/src/server/conf/face/face_cfg.go index 6f4e783b..13fe92c4 100644 --- a/src/server/conf/face/face_cfg.go +++ b/src/server/conf/face/face_cfg.go @@ -3,8 +3,9 @@ package faceCfg import ( "math/rand" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/friend/friend_cfg.go b/src/server/conf/friend/friend_cfg.go index 23309f27..98896708 100644 --- a/src/server/conf/friend/friend_cfg.go +++ b/src/server/conf/friend/friend_cfg.go @@ -2,7 +2,8 @@ package friendCfg import ( "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/guess_color/guess_color_cfg.go b/src/server/conf/guess_color/guess_color_cfg.go index 5c81464f..d0b36c73 100644 --- a/src/server/conf/guess_color/guess_color_cfg.go +++ b/src/server/conf/guess_color/guess_color_cfg.go @@ -4,8 +4,9 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/guide/guide_cfg.go b/src/server/conf/guide/guide_cfg.go index 94295437..869b5f19 100644 --- a/src/server/conf/guide/guide_cfg.go +++ b/src/server/conf/guide/guide_cfg.go @@ -3,7 +3,8 @@ package guidecfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/guide_task/guide_task_cfg.go b/src/server/conf/guide_task/guide_task_cfg.go index f563d911..09212079 100644 --- a/src/server/conf/guide_task/guide_task_cfg.go +++ b/src/server/conf/guide_task/guide_task_cfg.go @@ -4,8 +4,9 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/handbook/handbook_cfg.go b/src/server/conf/handbook/handbook_cfg.go index 76ddc5f6..5d989cc4 100644 --- a/src/server/conf/handbook/handbook_cfg.go +++ b/src/server/conf/handbook/handbook_cfg.go @@ -3,7 +3,8 @@ package handbookCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/invite/invite_cfg.go b/src/server/conf/invite/invite_cfg.go index da10eeb0..5893fbec 100644 --- a/src/server/conf/invite/invite_cfg.go +++ b/src/server/conf/invite/invite_cfg.go @@ -3,7 +3,8 @@ package inviteCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/item/Item_cfg.go b/src/server/conf/item/Item_cfg.go index 11bf1e03..c904b16f 100644 --- a/src/server/conf/item/Item_cfg.go +++ b/src/server/conf/item/Item_cfg.go @@ -4,9 +4,10 @@ import ( languageCfg "server/conf/language" "server/gamedata" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) var CFG_NAME = "Item" diff --git a/src/server/conf/json.go b/src/server/conf/json.go index d958cd74..1a35716f 100644 --- a/src/server/conf/json.go +++ b/src/server/conf/json.go @@ -5,7 +5,7 @@ import ( "io" "os" - "server/pkg/github.com/name5566/leaf/log" + "gitea.bywaystudios.com/pet_home/leaf/log" ) var Server struct { diff --git a/src/server/conf/limited_time_event/limited_time_event_cfg.go b/src/server/conf/limited_time_event/limited_time_event_cfg.go index 640c17fa..69467b78 100644 --- a/src/server/conf/limited_time_event/limited_time_event_cfg.go +++ b/src/server/conf/limited_time_event/limited_time_event_cfg.go @@ -5,9 +5,10 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "sort" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( @@ -311,6 +312,15 @@ func GetUnlockLv() int { return gamedata.GetIntValue(data, "Value") } +func GetCatReturnGiftItems() []*item.Item { + data, err := gamedata.GetDataByKey(CFG_LIMITED_TIME_EVENT_CONST, "Cat_Return_Gift_Items") + if err != nil { + log.Debug("GetCatReturnGiftItems err:%v", err) + return nil + } + return gamedata.GetItemList(data, "Value") +} + func GetCatSaleCD() int64 { data, err := gamedata.GetDataByKey(CFG_LIMITED_TIME_EVENT_CONST, "Event_Cooldown_7days") if err != nil { diff --git a/src/server/conf/merge_data/merge_data_cfg.go b/src/server/conf/merge_data/merge_data_cfg.go index 7b728919..01719040 100644 --- a/src/server/conf/merge_data/merge_data_cfg.go +++ b/src/server/conf/merge_data/merge_data_cfg.go @@ -5,9 +5,10 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/playroom/playroom_cfg.go b/src/server/conf/playroom/playroom_cfg.go index 257a86bb..5de9a309 100644 --- a/src/server/conf/playroom/playroom_cfg.go +++ b/src/server/conf/playroom/playroom_cfg.go @@ -4,8 +4,9 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( @@ -219,6 +220,14 @@ func GetInteractUnlock() int { return gamedata.GetIntValue(data, "Value") } +func GetRoomDailyTaskUnlock() int { + data, err := gamedata.GetDataByKey(CFG_PLAYROOM_CONST, "RoomDailyTaskUnlock") + if err != nil { + return 0 + } + return gamedata.GetIntValue(data, "Value") +} + func GetVisitorItem() int { data, err := gamedata.GetDataByKey(CFG_PLAYROOM_CONST, "VisitorItem") if err != nil { diff --git a/src/server/conf/server.json b/src/server/conf/server.json index 9fca6f51..25ea9004 100644 --- a/src/server/conf/server.json +++ b/src/server/conf/server.json @@ -13,7 +13,7 @@ "DbName": "merge_pet_1", "HttpPort": ":8081", "AppPath": "./app", - "TELOGDIR" : "./teLog/", + "TELOGDIR" : "./log/teLog/", "GameName": "pet_home_local", diff --git a/src/server/conf/seven_login/seven_login_cfg.go b/src/server/conf/seven_login/seven_login_cfg.go index 67331467..73f1dde4 100644 --- a/src/server/conf/seven_login/seven_login_cfg.go +++ b/src/server/conf/seven_login/seven_login_cfg.go @@ -4,8 +4,9 @@ import ( "math" "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" "strconv" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/conf/user/user_cfg.go b/src/server/conf/user/user_cfg.go index 465681a9..c119900d 100644 --- a/src/server/conf/user/user_cfg.go +++ b/src/server/conf/user/user_cfg.go @@ -3,7 +3,8 @@ package userCfg import ( "server/game/mod/item" "server/gamedata" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/cron/LICENSE b/src/server/cron/LICENSE deleted file mode 100644 index 3a0f627f..00000000 --- a/src/server/cron/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (C) 2012 Rob Figueiredo -All Rights Reserved. - -MIT LICENSE - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/server/cron/README.md b/src/server/cron/README.md deleted file mode 100644 index 8db4f550..00000000 --- a/src/server/cron/README.md +++ /dev/null @@ -1,125 +0,0 @@ -[![GoDoc](http://godoc.org/github.com/robfig/cron?status.png)](http://godoc.org/github.com/robfig/cron) -[![Build Status](https://travis-ci.org/robfig/cron.svg?branch=master)](https://travis-ci.org/robfig/cron) - -# cron - -Cron V3 has been released! - -To download the specific tagged release, run: - - go get github.com/robfig/cron/v3@v3.0.0 - -Import it in your program as: - - import "github.com/robfig/cron/v3" - -It requires Go 1.11 or later due to usage of Go Modules. - -Refer to the documentation here: -http://godoc.org/github.com/robfig/cron - -The rest of this document describes the the advances in v3 and a list of -breaking changes for users that wish to upgrade from an earlier version. - -## Upgrading to v3 (June 2019) - -cron v3 is a major upgrade to the library that addresses all outstanding bugs, -feature requests, and rough edges. It is based on a merge of master which -contains various fixes to issues found over the years and the v2 branch which -contains some backwards-incompatible features like the ability to remove cron -jobs. In addition, v3 adds support for Go Modules, cleans up rough edges like -the timezone support, and fixes a number of bugs. - -New features: - -- Support for Go modules. Callers must now import this library as - `github.com/robfig/cron/v3`, instead of `gopkg.in/...` - -- Fixed bugs: - - 0f01e6b parser: fix combining of Dow and Dom (#70) - - dbf3220 adjust times when rolling the clock forward to handle non-existent midnight (#157) - - eeecf15 spec_test.go: ensure an error is returned on 0 increment (#144) - - 70971dc cron.Entries(): update request for snapshot to include a reply channel (#97) - - 1cba5e6 cron: fix: removing a job causes the next scheduled job to run too late (#206) - -- Standard cron spec parsing by default (first field is "minute"), with an easy - way to opt into the seconds field (quartz-compatible). Although, note that the - year field (optional in Quartz) is not supported. - -- Extensible, key/value logging via an interface that complies with - the https://github.com/go-logr/logr project. - -- The new Chain & JobWrapper types allow you to install "interceptors" to add - cross-cutting behavior like the following: - - Recover any panics from jobs - - Delay a job's execution if the previous run hasn't completed yet - - Skip a job's execution if the previous run hasn't completed yet - - Log each job's invocations - - Notification when jobs are completed - -It is backwards incompatible with both v1 and v2. These updates are required: - -- The v1 branch accepted an optional seconds field at the beginning of the cron - spec. This is non-standard and has led to a lot of confusion. The new default - parser conforms to the standard as described by [the Cron wikipedia page]. - - UPDATING: To retain the old behavior, construct your Cron with a custom - parser: - - // Seconds field, required - cron.New(cron.WithSeconds()) - - // Seconds field, optional - cron.New( - cron.WithParser( - cron.SecondOptional | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor)) - -- The Cron type now accepts functional options on construction rather than the - previous ad-hoc behavior modification mechanisms (setting a field, calling a setter). - - UPDATING: Code that sets Cron.ErrorLogger or calls Cron.SetLocation must be - updated to provide those values on construction. - -- CRON_TZ is now the recommended way to specify the timezone of a single - schedule, which is sanctioned by the specification. The legacy "TZ=" prefix - will continue to be supported since it is unambiguous and easy to do so. - - UPDATING: No update is required. - -- By default, cron will no longer recover panics in jobs that it runs. - Recovering can be surprising (see issue #192) and seems to be at odds with - typical behavior of libraries. Relatedly, the `cron.WithPanicLogger` option - has been removed to accommodate the more general JobWrapper type. - - UPDATING: To opt into panic recovery and configure the panic logger: - - cron.New(cron.WithChain( - cron.Recover(logger), // or use cron.DefaultLogger - )) - -- In adding support for https://github.com/go-logr/logr, `cron.WithVerboseLogger` was - removed, since it is duplicative with the leveled logging. - - UPDATING: Callers should use `WithLogger` and specify a logger that does not - discard `Info` logs. For convenience, one is provided that wraps `*log.Logger`: - - cron.New( - cron.WithLogger(cron.VerbosePrintfLogger(logger))) - - -### Background - Cron spec format - -There are two cron spec formats in common usage: - -- The "standard" cron format, described on [the Cron wikipedia page] and used by - the cron Linux system utility. - -- The cron format used by [the Quartz Scheduler], commonly used for scheduled - jobs in Java software - -[the Cron wikipedia page]: https://en.wikipedia.org/wiki/Cron -[the Quartz Scheduler]: http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html - -The original version of this package included an optional "seconds" field, which -made it incompatible with both of these formats. Now, the "standard" format is -the default format accepted, and the Quartz format is opt-in. diff --git a/src/server/cron/chain.go b/src/server/cron/chain.go deleted file mode 100644 index 118e5bbe..00000000 --- a/src/server/cron/chain.go +++ /dev/null @@ -1,92 +0,0 @@ -package cron - -import ( - "fmt" - "runtime" - "sync" - "time" -) - -// JobWrapper decorates the given Job with some behavior. -type JobWrapper func(Job) Job - -// Chain is a sequence of JobWrappers that decorates submitted jobs with -// cross-cutting behaviors like logging or synchronization. -type Chain struct { - wrappers []JobWrapper -} - -// NewChain returns a Chain consisting of the given JobWrappers. -func NewChain(c ...JobWrapper) Chain { - return Chain{c} -} - -// Then decorates the given job with all JobWrappers in the chain. -// -// This: -// NewChain(m1, m2, m3).Then(job) -// is equivalent to: -// m1(m2(m3(job))) -func (c Chain) Then(j Job) Job { - for i := range c.wrappers { - j = c.wrappers[len(c.wrappers)-i-1](j) - } - return j -} - -// Recover panics in wrapped jobs and log them with the provided logger. -func Recover(logger Logger) JobWrapper { - return func(j Job) Job { - return FuncJob(func() { - defer func() { - if r := recover(); r != nil { - const size = 64 << 10 - buf := make([]byte, size) - buf = buf[:runtime.Stack(buf, false)] - err, ok := r.(error) - if !ok { - err = fmt.Errorf("%v", r) - } - logger.Error(err, "panic", "stack", "...\n"+string(buf)) - } - }() - j.Run() - }) - } -} - -// DelayIfStillRunning serializes jobs, delaying subsequent runs until the -// previous one is complete. Jobs running after a delay of more than a minute -// have the delay logged at Info. -func DelayIfStillRunning(logger Logger) JobWrapper { - return func(j Job) Job { - var mu sync.Mutex - return FuncJob(func() { - start := time.Now() - mu.Lock() - defer mu.Unlock() - if dur := time.Since(start); dur > time.Minute { - logger.Info("delay", "duration", dur) - } - j.Run() - }) - } -} - -// SkipIfStillRunning skips an invocation of the Job if a previous invocation is -// still running. It logs skips to the given logger at Info level. -func SkipIfStillRunning(logger Logger) JobWrapper { - var ch = make(chan struct{}, 1) - ch <- struct{}{} - return func(j Job) Job { - return FuncJob(func() { - select { - case v := <-ch: - j.Run() - ch <- v - default: - logger.Info("skip") - } - }) - } -} diff --git a/src/server/cron/chain_test.go b/src/server/cron/chain_test.go deleted file mode 100644 index 2561bd7f..00000000 --- a/src/server/cron/chain_test.go +++ /dev/null @@ -1,221 +0,0 @@ -package cron - -import ( - "io/ioutil" - "log" - "reflect" - "sync" - "testing" - "time" -) - -func appendingJob(slice *[]int, value int) Job { - var m sync.Mutex - return FuncJob(func() { - m.Lock() - *slice = append(*slice, value) - m.Unlock() - }) -} - -func appendingWrapper(slice *[]int, value int) JobWrapper { - return func(j Job) Job { - return FuncJob(func() { - appendingJob(slice, value).Run() - j.Run() - }) - } -} - -func TestChain(t *testing.T) { - var nums []int - var ( - append1 = appendingWrapper(&nums, 1) - append2 = appendingWrapper(&nums, 2) - append3 = appendingWrapper(&nums, 3) - append4 = appendingJob(&nums, 4) - ) - NewChain(append1, append2, append3).Then(append4).Run() - if !reflect.DeepEqual(nums, []int{1, 2, 3, 4}) { - t.Error("unexpected order of calls:", nums) - } -} - -func TestChainRecover(t *testing.T) { - panickingJob := FuncJob(func() { - panic("panickingJob panics") - }) - - t.Run("panic exits job by default", func(t *testing.T) { - defer func() { - if err := recover(); err == nil { - t.Errorf("panic expected, but none received") - } - }() - NewChain().Then(panickingJob). - Run() - }) - - t.Run("Recovering JobWrapper recovers", func(t *testing.T) { - NewChain(Recover(PrintfLogger(log.New(ioutil.Discard, "", 0)))). - Then(panickingJob). - Run() - }) - - t.Run("composed with the *IfStillRunning wrappers", func(t *testing.T) { - NewChain(Recover(PrintfLogger(log.New(ioutil.Discard, "", 0)))). - Then(panickingJob). - Run() - }) -} - -type countJob struct { - m sync.Mutex - started int - done int - delay time.Duration -} - -func (j *countJob) Run() { - j.m.Lock() - j.started++ - j.m.Unlock() - time.Sleep(j.delay) - j.m.Lock() - j.done++ - j.m.Unlock() -} - -func (j *countJob) Started() int { - defer j.m.Unlock() - j.m.Lock() - return j.started -} - -func (j *countJob) Done() int { - defer j.m.Unlock() - j.m.Lock() - return j.done -} - -func TestChainDelayIfStillRunning(t *testing.T) { - - t.Run("runs immediately", func(t *testing.T) { - var j countJob - wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) - go wrappedJob.Run() - time.Sleep(2 * time.Millisecond) // Give the job 2ms to complete. - if c := j.Done(); c != 1 { - t.Errorf("expected job run once, immediately, got %d", c) - } - }) - - t.Run("second run immediate if first done", func(t *testing.T) { - var j countJob - wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) - go func() { - go wrappedJob.Run() - time.Sleep(time.Millisecond) - go wrappedJob.Run() - }() - time.Sleep(3 * time.Millisecond) // Give both jobs 3ms to complete. - if c := j.Done(); c != 2 { - t.Errorf("expected job run twice, immediately, got %d", c) - } - }) - - t.Run("second run delayed if first not done", func(t *testing.T) { - var j countJob - j.delay = 10 * time.Millisecond - wrappedJob := NewChain(DelayIfStillRunning(DiscardLogger)).Then(&j) - go func() { - go wrappedJob.Run() - time.Sleep(time.Millisecond) - go wrappedJob.Run() - }() - - // After 5ms, the first job is still in progress, and the second job was - // run but should be waiting for it to finish. - time.Sleep(5 * time.Millisecond) - started, done := j.Started(), j.Done() - if started != 1 || done != 0 { - t.Error("expected first job started, but not finished, got", started, done) - } - - // Verify that the second job completes. - time.Sleep(25 * time.Millisecond) - started, done = j.Started(), j.Done() - if started != 2 || done != 2 { - t.Error("expected both jobs done, got", started, done) - } - }) - -} - -func TestChainSkipIfStillRunning(t *testing.T) { - - t.Run("runs immediately", func(t *testing.T) { - var j countJob - wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) - go wrappedJob.Run() - time.Sleep(2 * time.Millisecond) // Give the job 2ms to complete. - if c := j.Done(); c != 1 { - t.Errorf("expected job run once, immediately, got %d", c) - } - }) - - t.Run("second run immediate if first done", func(t *testing.T) { - var j countJob - wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) - go func() { - go wrappedJob.Run() - time.Sleep(time.Millisecond) - go wrappedJob.Run() - }() - time.Sleep(3 * time.Millisecond) // Give both jobs 3ms to complete. - if c := j.Done(); c != 2 { - t.Errorf("expected job run twice, immediately, got %d", c) - } - }) - - t.Run("second run skipped if first not done", func(t *testing.T) { - var j countJob - j.delay = 10 * time.Millisecond - wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) - go func() { - go wrappedJob.Run() - time.Sleep(time.Millisecond) - go wrappedJob.Run() - }() - - // After 5ms, the first job is still in progress, and the second job was - // aleady skipped. - time.Sleep(5 * time.Millisecond) - started, done := j.Started(), j.Done() - if started != 1 || done != 0 { - t.Error("expected first job started, but not finished, got", started, done) - } - - // Verify that the first job completes and second does not run. - time.Sleep(25 * time.Millisecond) - started, done = j.Started(), j.Done() - if started != 1 || done != 1 { - t.Error("expected second job skipped, got", started, done) - } - }) - - t.Run("skip 10 jobs on rapid fire", func(t *testing.T) { - var j countJob - j.delay = 10 * time.Millisecond - wrappedJob := NewChain(SkipIfStillRunning(DiscardLogger)).Then(&j) - for i := 0; i < 11; i++ { - go wrappedJob.Run() - } - time.Sleep(200 * time.Millisecond) - done := j.Done() - if done != 1 { - t.Error("expected 1 jobs executed, 10 jobs dropped, got", done) - } - }) - -} diff --git a/src/server/cron/constantdelay.go b/src/server/cron/constantdelay.go deleted file mode 100644 index cd6e7b1b..00000000 --- a/src/server/cron/constantdelay.go +++ /dev/null @@ -1,27 +0,0 @@ -package cron - -import "time" - -// ConstantDelaySchedule represents a simple recurring duty cycle, e.g. "Every 5 minutes". -// It does not support jobs more frequent than once a second. -type ConstantDelaySchedule struct { - Delay time.Duration -} - -// Every returns a crontab Schedule that activates once every duration. -// Delays of less than a second are not supported (will round up to 1 second). -// Any fields less than a Second are truncated. -func Every(duration time.Duration) ConstantDelaySchedule { - if duration < time.Second { - duration = time.Second - } - return ConstantDelaySchedule{ - Delay: duration - time.Duration(duration.Nanoseconds())%time.Second, - } -} - -// Next returns the next time this should be run. -// This rounds so that the next activation time will be on the second. -func (schedule ConstantDelaySchedule) Next(t time.Time) time.Time { - return t.Add(schedule.Delay - time.Duration(t.Nanosecond())*time.Nanosecond) -} diff --git a/src/server/cron/constantdelay_test.go b/src/server/cron/constantdelay_test.go deleted file mode 100644 index f43a58ad..00000000 --- a/src/server/cron/constantdelay_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package cron - -import ( - "testing" - "time" -) - -func TestConstantDelayNext(t *testing.T) { - tests := []struct { - time string - delay time.Duration - expected string - }{ - // Simple cases - {"Mon Jul 9 14:45 2012", 15*time.Minute + 50*time.Nanosecond, "Mon Jul 9 15:00 2012"}, - {"Mon Jul 9 14:59 2012", 15 * time.Minute, "Mon Jul 9 15:14 2012"}, - {"Mon Jul 9 14:59:59 2012", 15 * time.Minute, "Mon Jul 9 15:14:59 2012"}, - - // Wrap around hours - {"Mon Jul 9 15:45 2012", 35 * time.Minute, "Mon Jul 9 16:20 2012"}, - - // Wrap around days - {"Mon Jul 9 23:46 2012", 14 * time.Minute, "Tue Jul 10 00:00 2012"}, - {"Mon Jul 9 23:45 2012", 35 * time.Minute, "Tue Jul 10 00:20 2012"}, - {"Mon Jul 9 23:35:51 2012", 44*time.Minute + 24*time.Second, "Tue Jul 10 00:20:15 2012"}, - {"Mon Jul 9 23:35:51 2012", 25*time.Hour + 44*time.Minute + 24*time.Second, "Thu Jul 11 01:20:15 2012"}, - - // Wrap around months - {"Mon Jul 9 23:35 2012", 91*24*time.Hour + 25*time.Minute, "Thu Oct 9 00:00 2012"}, - - // Wrap around minute, hour, day, month, and year - {"Mon Dec 31 23:59:45 2012", 15 * time.Second, "Tue Jan 1 00:00:00 2013"}, - - // Round to nearest second on the delay - {"Mon Jul 9 14:45 2012", 15*time.Minute + 50*time.Nanosecond, "Mon Jul 9 15:00 2012"}, - - // Round up to 1 second if the duration is less. - {"Mon Jul 9 14:45:00 2012", 15 * time.Millisecond, "Mon Jul 9 14:45:01 2012"}, - - // Round to nearest second when calculating the next time. - {"Mon Jul 9 14:45:00.005 2012", 15 * time.Minute, "Mon Jul 9 15:00 2012"}, - - // Round to nearest second for both. - {"Mon Jul 9 14:45:00.005 2012", 15*time.Minute + 50*time.Nanosecond, "Mon Jul 9 15:00 2012"}, - } - - for _, c := range tests { - actual := Every(c.delay).Next(getTime(c.time)) - expected := getTime(c.expected) - if actual != expected { - t.Errorf("%s, \"%s\": (expected) %v != %v (actual)", c.time, c.delay, expected, actual) - } - } -} diff --git a/src/server/cron/cron.go b/src/server/cron/cron.go deleted file mode 100644 index f6e451db..00000000 --- a/src/server/cron/cron.go +++ /dev/null @@ -1,350 +0,0 @@ -package cron - -import ( - "context" - "sort" - "sync" - "time" -) - -// Cron keeps track of any number of entries, invoking the associated func as -// specified by the schedule. It may be started, stopped, and the entries may -// be inspected while running. -type Cron struct { - entries []*Entry - chain Chain - stop chan struct{} - add chan *Entry - remove chan EntryID - snapshot chan chan []Entry - running bool - logger Logger - runningMu sync.Mutex - location *time.Location - parser Parser - nextID EntryID - jobWaiter sync.WaitGroup -} - -// Job is an interface for submitted cron jobs. -type Job interface { - Run() -} - -// Schedule describes a job's duty cycle. -type Schedule interface { - // Next returns the next activation time, later than the given time. - // Next is invoked initially, and then each time the job is run. - Next(time.Time) time.Time -} - -// EntryID identifies an entry within a Cron instance -type EntryID int - -// Entry consists of a schedule and the func to execute on that schedule. -type Entry struct { - // ID is the cron-assigned ID of this entry, which may be used to look up a - // snapshot or remove it. - ID EntryID - - // Schedule on which this job should be run. - Schedule Schedule - - // Next time the job will run, or the zero time if Cron has not been - // started or this entry's schedule is unsatisfiable - Next time.Time - - // Prev is the last time this job was run, or the zero time if never. - Prev time.Time - - // WrappedJob is the thing to run when the Schedule is activated. - WrappedJob Job - - // Job is the thing that was submitted to cron. - // It is kept around so that user code that needs to get at the job later, - // e.g. via Entries() can do so. - Job Job -} - -// Valid returns true if this is not the zero entry. -func (e Entry) Valid() bool { return e.ID != 0 } - -// byTime is a wrapper for sorting the entry array by time -// (with zero time at the end). -type byTime []*Entry - -func (s byTime) Len() int { return len(s) } -func (s byTime) Swap(i, j int) { s[i], s[j] = s[j], s[i] } -func (s byTime) Less(i, j int) bool { - // Two zero times should return false. - // Otherwise, zero is "greater" than any other time. - // (To sort it at the end of the list.) - if s[i].Next.IsZero() { - return false - } - if s[j].Next.IsZero() { - return true - } - return s[i].Next.Before(s[j].Next) -} - -// New returns a new Cron job runner, modified by the given options. -// -// Available Settings -// -// Time Zone -// Description: The time zone in which schedules are interpreted -// Default: time.Local -// -// Parser -// Description: Parser converts cron spec strings into cron.Schedules. -// Default: Accepts this spec: https://en.wikipedia.org/wiki/Cron -// -// Chain -// Description: Wrap submitted jobs to customize behavior. -// Default: A chain that recovers panics and logs them to stderr. -// -// See "cron.With*" to modify the default behavior. -func New(opts ...Option) *Cron { - c := &Cron{ - entries: nil, - chain: NewChain(), - add: make(chan *Entry), - stop: make(chan struct{}), - snapshot: make(chan chan []Entry), - remove: make(chan EntryID), - running: false, - runningMu: sync.Mutex{}, - logger: DefaultLogger, - location: time.Local, - parser: standardParser, - } - for _, opt := range opts { - opt(c) - } - return c -} - -// FuncJob is a wrapper that turns a func() into a cron.Job -type FuncJob func() - -func (f FuncJob) Run() { f() } - -// AddFunc adds a func to the Cron to be run on the given schedule. -// The spec is parsed using the time zone of this Cron instance as the default. -// An opaque ID is returned that can be used to later remove it. -func (c *Cron) AddFunc(spec string, cmd func()) (EntryID, error) { - return c.AddJob(spec, FuncJob(cmd)) -} - -// AddJob adds a Job to the Cron to be run on the given schedule. -// The spec is parsed using the time zone of this Cron instance as the default. -// An opaque ID is returned that can be used to later remove it. -func (c *Cron) AddJob(spec string, cmd Job) (EntryID, error) { - schedule, err := c.parser.Parse(spec) - if err != nil { - return 0, err - } - return c.Schedule(schedule, cmd), nil -} - -// Schedule adds a Job to the Cron to be run on the given schedule. -// The job is wrapped with the configured Chain. -func (c *Cron) Schedule(schedule Schedule, cmd Job) EntryID { - c.runningMu.Lock() - defer c.runningMu.Unlock() - c.nextID++ - entry := &Entry{ - ID: c.nextID, - Schedule: schedule, - WrappedJob: c.chain.Then(cmd), - Job: cmd, - } - if !c.running { - c.entries = append(c.entries, entry) - } else { - c.add <- entry - } - return entry.ID -} - -// Entries returns a snapshot of the cron entries. -func (c *Cron) Entries() []Entry { - c.runningMu.Lock() - defer c.runningMu.Unlock() - if c.running { - replyChan := make(chan []Entry, 1) - c.snapshot <- replyChan - return <-replyChan - } - return c.entrySnapshot() -} - -// Location gets the time zone location -func (c *Cron) Location() *time.Location { - return c.location -} - -// Entry returns a snapshot of the given entry, or nil if it couldn't be found. -func (c *Cron) Entry(id EntryID) Entry { - for _, entry := range c.Entries() { - if id == entry.ID { - return entry - } - } - return Entry{} -} - -// Remove an entry from being run in the future. -func (c *Cron) Remove(id EntryID) { - c.runningMu.Lock() - defer c.runningMu.Unlock() - if c.running { - c.remove <- id - } else { - c.removeEntry(id) - } -} - -// Start the cron scheduler in its own goroutine, or no-op if already started. -func (c *Cron) Start() { - c.runningMu.Lock() - defer c.runningMu.Unlock() - if c.running { - return - } - c.running = true - go c.run() -} - -// Run the cron scheduler, or no-op if already running. -func (c *Cron) Run() { - c.runningMu.Lock() - if c.running { - c.runningMu.Unlock() - return - } - c.running = true - c.runningMu.Unlock() - c.run() -} - -// run the scheduler.. this is private just due to the need to synchronize -// access to the 'running' state variable. -func (c *Cron) run() { - c.logger.Info("start") - - // Figure out the next activation times for each entry. - now := c.now() - for _, entry := range c.entries { - entry.Next = entry.Schedule.Next(now) - c.logger.Info("schedule", "now", now, "entry", entry.ID, "next", entry.Next) - } - - for { - // Determine the next entry to run. - sort.Sort(byTime(c.entries)) - - var timer *time.Timer - if len(c.entries) == 0 || c.entries[0].Next.IsZero() { - // If there are no entries yet, just sleep - it still handles new entries - // and stop requests. - timer = time.NewTimer(100000 * time.Hour) - } else { - timer = time.NewTimer(c.entries[0].Next.Sub(now)) - } - - for { - select { - case now = <-timer.C: - now = now.In(c.location) - c.logger.Info("wake", "now", now) - - // Run every entry whose next time was less than now - for _, e := range c.entries { - if e.Next.After(now) || e.Next.IsZero() { - break - } - c.startJob(e.WrappedJob) - e.Prev = e.Next - e.Next = e.Schedule.Next(now) - c.logger.Info("run", "now", now, "entry", e.ID, "next", e.Next) - } - - case newEntry := <-c.add: - timer.Stop() - now = c.now() - newEntry.Next = newEntry.Schedule.Next(now) - c.entries = append(c.entries, newEntry) - c.logger.Info("added", "now", now, "entry", newEntry.ID, "next", newEntry.Next) - - case replyChan := <-c.snapshot: - replyChan <- c.entrySnapshot() - continue - - case <-c.stop: - timer.Stop() - c.logger.Info("stop") - return - - case id := <-c.remove: - timer.Stop() - now = c.now() - c.removeEntry(id) - c.logger.Info("removed", "entry", id) - } - - break - } - } -} - -// startJob runs the given job in a new goroutine. -func (c *Cron) startJob(j Job) { - c.jobWaiter.Add(1) - go func() { - defer c.jobWaiter.Done() - j.Run() - }() -} - -// now returns current time in c location -func (c *Cron) now() time.Time { - return time.Now().In(c.location) -} - -// Stop stops the cron scheduler if it is running; otherwise it does nothing. -// A context is returned so the caller can wait for running jobs to complete. -func (c *Cron) Stop() context.Context { - c.runningMu.Lock() - defer c.runningMu.Unlock() - if c.running { - c.stop <- struct{}{} - c.running = false - } - ctx, cancel := context.WithCancel(context.Background()) - go func() { - c.jobWaiter.Wait() - cancel() - }() - return ctx -} - -// entrySnapshot returns a copy of the current cron entry list. -func (c *Cron) entrySnapshot() []Entry { - var entries = make([]Entry, len(c.entries)) - for i, e := range c.entries { - entries[i] = *e - } - return entries -} - -func (c *Cron) removeEntry(id EntryID) { - var entries []*Entry - for _, e := range c.entries { - if e.ID != id { - entries = append(entries, e) - } - } - c.entries = entries -} diff --git a/src/server/cron/cron_test.go b/src/server/cron/cron_test.go deleted file mode 100644 index 36f06bf7..00000000 --- a/src/server/cron/cron_test.go +++ /dev/null @@ -1,702 +0,0 @@ -package cron - -import ( - "bytes" - "fmt" - "log" - "strings" - "sync" - "sync/atomic" - "testing" - "time" -) - -// Many tests schedule a job for every second, and then wait at most a second -// for it to run. This amount is just slightly larger than 1 second to -// compensate for a few milliseconds of runtime. -const OneSecond = 1*time.Second + 50*time.Millisecond - -type syncWriter struct { - wr bytes.Buffer - m sync.Mutex -} - -func (sw *syncWriter) Write(data []byte) (n int, err error) { - sw.m.Lock() - n, err = sw.wr.Write(data) - sw.m.Unlock() - return -} - -func (sw *syncWriter) String() string { - sw.m.Lock() - defer sw.m.Unlock() - return sw.wr.String() -} - -func newBufLogger(sw *syncWriter) Logger { - return PrintfLogger(log.New(sw, "", log.LstdFlags)) -} - -func TestFuncPanicRecovery(t *testing.T) { - var buf syncWriter - cron := New(WithParser(secondParser), - WithChain(Recover(newBufLogger(&buf)))) - cron.Start() - defer cron.Stop() - cron.AddFunc("* * * * * ?", func() { - panic("YOLO") - }) - - select { - case <-time.After(OneSecond): - if !strings.Contains(buf.String(), "YOLO") { - t.Error("expected a panic to be logged, got none") - } - return - } -} - -type DummyJob struct{} - -func (d DummyJob) Run() { - panic("YOLO") -} - -func TestJobPanicRecovery(t *testing.T) { - var job DummyJob - - var buf syncWriter - cron := New(WithParser(secondParser), - WithChain(Recover(newBufLogger(&buf)))) - cron.Start() - defer cron.Stop() - cron.AddJob("* * * * * ?", job) - - select { - case <-time.After(OneSecond): - if !strings.Contains(buf.String(), "YOLO") { - t.Error("expected a panic to be logged, got none") - } - return - } -} - -// Start and stop cron with no entries. -func TestNoEntries(t *testing.T) { - cron := newWithSeconds() - cron.Start() - - select { - case <-time.After(OneSecond): - t.Fatal("expected cron will be stopped immediately") - case <-stop(cron): - } -} - -// Start, stop, then add an entry. Verify entry doesn't run. -func TestStopCausesJobsToNotRun(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.Start() - cron.Stop() - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - - select { - case <-time.After(OneSecond): - // No job ran! - case <-wait(wg): - t.Fatal("expected stopped cron does not run any job") - } -} - -// Add a job, start cron, expect it runs. -func TestAddBeforeRunning(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - cron.Start() - defer cron.Stop() - - // Give cron 2 seconds to run our job (which is always activated). - select { - case <-time.After(OneSecond): - t.Fatal("expected job runs") - case <-wait(wg): - } -} - -// Start cron, add a job, expect it runs. -func TestAddWhileRunning(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.Start() - defer cron.Stop() - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - - select { - case <-time.After(OneSecond): - t.Fatal("expected job runs") - case <-wait(wg): - } -} - -// Test for #34. Adding a job after calling start results in multiple job invocations -func TestAddWhileRunningWithDelay(t *testing.T) { - cron := newWithSeconds() - cron.Start() - defer cron.Stop() - time.Sleep(5 * time.Second) - var calls int64 - cron.AddFunc("* * * * * *", func() { atomic.AddInt64(&calls, 1) }) - - <-time.After(OneSecond) - if atomic.LoadInt64(&calls) != 1 { - t.Errorf("called %d times, expected 1\n", calls) - } -} - -// Add a job, remove a job, start cron, expect nothing runs. -func TestRemoveBeforeRunning(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - id, _ := cron.AddFunc("* * * * * ?", func() { wg.Done() }) - cron.Remove(id) - cron.Start() - defer cron.Stop() - - select { - case <-time.After(OneSecond): - // Success, shouldn't run - case <-wait(wg): - t.FailNow() - } -} - -// Start cron, add a job, remove it, expect it doesn't run. -func TestRemoveWhileRunning(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.Start() - defer cron.Stop() - id, _ := cron.AddFunc("* * * * * ?", func() { wg.Done() }) - cron.Remove(id) - - select { - case <-time.After(OneSecond): - case <-wait(wg): - t.FailNow() - } -} - -// Test timing with Entries. -func TestSnapshotEntries(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := New() - cron.AddFunc("@every 2s", func() { wg.Done() }) - cron.Start() - defer cron.Stop() - - // Cron should fire in 2 seconds. After 1 second, call Entries. - select { - case <-time.After(OneSecond): - cron.Entries() - } - - // Even though Entries was called, the cron should fire at the 2 second mark. - select { - case <-time.After(OneSecond): - t.Error("expected job runs at 2 second mark") - case <-wait(wg): - } -} - -// Test that the entries are correctly sorted. -// Add a bunch of long-in-the-future entries, and an immediate entry, and ensure -// that the immediate entry runs immediately. -// Also: Test that multiple jobs run in the same instant. -func TestMultipleEntries(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(2) - - cron := newWithSeconds() - cron.AddFunc("0 0 0 1 1 ?", func() {}) - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - id1, _ := cron.AddFunc("* * * * * ?", func() { t.Fatal() }) - id2, _ := cron.AddFunc("* * * * * ?", func() { t.Fatal() }) - cron.AddFunc("0 0 0 31 12 ?", func() {}) - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - - cron.Remove(id1) - cron.Start() - cron.Remove(id2) - defer cron.Stop() - - select { - case <-time.After(OneSecond): - t.Error("expected job run in proper order") - case <-wait(wg): - } -} - -// Test running the same job twice. -func TestRunningJobTwice(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(2) - - cron := newWithSeconds() - cron.AddFunc("0 0 0 1 1 ?", func() {}) - cron.AddFunc("0 0 0 31 12 ?", func() {}) - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - - cron.Start() - defer cron.Stop() - - select { - case <-time.After(2 * OneSecond): - t.Error("expected job fires 2 times") - case <-wait(wg): - } -} - -func TestRunningMultipleSchedules(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(2) - - cron := newWithSeconds() - cron.AddFunc("0 0 0 1 1 ?", func() {}) - cron.AddFunc("0 0 0 31 12 ?", func() {}) - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - cron.Schedule(Every(time.Minute), FuncJob(func() {})) - cron.Schedule(Every(time.Second), FuncJob(func() { wg.Done() })) - cron.Schedule(Every(time.Hour), FuncJob(func() {})) - - cron.Start() - defer cron.Stop() - - select { - case <-time.After(2 * OneSecond): - t.Error("expected job fires 2 times") - case <-wait(wg): - } -} - -// Test that the cron is run in the local time zone (as opposed to UTC). -func TestLocalTimezone(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(2) - - now := time.Now() - // FIX: Issue #205 - // This calculation doesn't work in seconds 58 or 59. - // Take the easy way out and sleep. - if now.Second() >= 58 { - time.Sleep(2 * time.Second) - now = time.Now() - } - spec := fmt.Sprintf("%d,%d %d %d %d %d ?", - now.Second()+1, now.Second()+2, now.Minute(), now.Hour(), now.Day(), now.Month()) - - cron := newWithSeconds() - cron.AddFunc(spec, func() { wg.Done() }) - cron.Start() - defer cron.Stop() - - select { - case <-time.After(OneSecond * 2): - t.Error("expected job fires 2 times") - case <-wait(wg): - } -} - -// Test that the cron is run in the given time zone (as opposed to local). -func TestNonLocalTimezone(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(2) - - loc, err := time.LoadLocation("Atlantic/Cape_Verde") - if err != nil { - fmt.Printf("Failed to load time zone Atlantic/Cape_Verde: %+v", err) - t.Fail() - } - - now := time.Now().In(loc) - // FIX: Issue #205 - // This calculation doesn't work in seconds 58 or 59. - // Take the easy way out and sleep. - if now.Second() >= 58 { - time.Sleep(2 * time.Second) - now = time.Now().In(loc) - } - spec := fmt.Sprintf("%d,%d %d %d %d %d ?", - now.Second()+1, now.Second()+2, now.Minute(), now.Hour(), now.Day(), now.Month()) - - cron := New(WithLocation(loc), WithParser(secondParser)) - cron.AddFunc(spec, func() { wg.Done() }) - cron.Start() - defer cron.Stop() - - select { - case <-time.After(OneSecond * 2): - t.Error("expected job fires 2 times") - case <-wait(wg): - } -} - -// Test that calling stop before start silently returns without -// blocking the stop channel. -func TestStopWithoutStart(t *testing.T) { - cron := New() - cron.Stop() -} - -type testJob struct { - wg *sync.WaitGroup - name string -} - -func (t testJob) Run() { - t.wg.Done() -} - -// Test that adding an invalid job spec returns an error -func TestInvalidJobSpec(t *testing.T) { - cron := New() - _, err := cron.AddJob("this will not parse", nil) - if err == nil { - t.Errorf("expected an error with invalid spec, got nil") - } -} - -// Test blocking run method behaves as Start() -func TestBlockingRun(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.AddFunc("* * * * * ?", func() { wg.Done() }) - - var unblockChan = make(chan struct{}) - - go func() { - cron.Run() - close(unblockChan) - }() - defer cron.Stop() - - select { - case <-time.After(OneSecond): - t.Error("expected job fires") - case <-unblockChan: - t.Error("expected that Run() blocks") - case <-wait(wg): - } -} - -// Test that double-running is a no-op -func TestStartNoop(t *testing.T) { - var tickChan = make(chan struct{}, 2) - - cron := newWithSeconds() - cron.AddFunc("* * * * * ?", func() { - tickChan <- struct{}{} - }) - - cron.Start() - defer cron.Stop() - - // Wait for the first firing to ensure the runner is going - <-tickChan - - cron.Start() - - <-tickChan - - // Fail if this job fires again in a short period, indicating a double-run - select { - case <-time.After(time.Millisecond): - case <-tickChan: - t.Error("expected job fires exactly twice") - } -} - -// Simple test using Runnables. -func TestJob(t *testing.T) { - wg := &sync.WaitGroup{} - wg.Add(1) - - cron := newWithSeconds() - cron.AddJob("0 0 0 30 Feb ?", testJob{wg, "job0"}) - cron.AddJob("0 0 0 1 1 ?", testJob{wg, "job1"}) - job2, _ := cron.AddJob("* * * * * ?", testJob{wg, "job2"}) - cron.AddJob("1 0 0 1 1 ?", testJob{wg, "job3"}) - cron.Schedule(Every(5*time.Second+5*time.Nanosecond), testJob{wg, "job4"}) - job5 := cron.Schedule(Every(5*time.Minute), testJob{wg, "job5"}) - - // Test getting an Entry pre-Start. - if actualName := cron.Entry(job2).Job.(testJob).name; actualName != "job2" { - t.Error("wrong job retrieved:", actualName) - } - if actualName := cron.Entry(job5).Job.(testJob).name; actualName != "job5" { - t.Error("wrong job retrieved:", actualName) - } - - cron.Start() - defer cron.Stop() - - select { - case <-time.After(OneSecond): - t.FailNow() - case <-wait(wg): - } - - // Ensure the entries are in the right order. - expecteds := []string{"job2", "job4", "job5", "job1", "job3", "job0"} - - var actuals []string - for _, entry := range cron.Entries() { - actuals = append(actuals, entry.Job.(testJob).name) - } - - for i, expected := range expecteds { - if actuals[i] != expected { - t.Fatalf("Jobs not in the right order. (expected) %s != %s (actual)", expecteds, actuals) - } - } - - // Test getting Entries. - if actualName := cron.Entry(job2).Job.(testJob).name; actualName != "job2" { - t.Error("wrong job retrieved:", actualName) - } - if actualName := cron.Entry(job5).Job.(testJob).name; actualName != "job5" { - t.Error("wrong job retrieved:", actualName) - } -} - -// Issue #206 -// Ensure that the next run of a job after removing an entry is accurate. -func TestScheduleAfterRemoval(t *testing.T) { - var wg1 sync.WaitGroup - var wg2 sync.WaitGroup - wg1.Add(1) - wg2.Add(1) - - // The first time this job is run, set a timer and remove the other job - // 750ms later. Correct behavior would be to still run the job again in - // 250ms, but the bug would cause it to run instead 1s later. - - var calls int - var mu sync.Mutex - - cron := newWithSeconds() - hourJob := cron.Schedule(Every(time.Hour), FuncJob(func() {})) - cron.Schedule(Every(time.Second), FuncJob(func() { - mu.Lock() - defer mu.Unlock() - switch calls { - case 0: - wg1.Done() - calls++ - case 1: - time.Sleep(750 * time.Millisecond) - cron.Remove(hourJob) - calls++ - case 2: - calls++ - wg2.Done() - case 3: - panic("unexpected 3rd call") - } - })) - - cron.Start() - defer cron.Stop() - - // the first run might be any length of time 0 - 1s, since the schedule - // rounds to the second. wait for the first run to true up. - wg1.Wait() - - select { - case <-time.After(2 * OneSecond): - t.Error("expected job fires 2 times") - case <-wait(&wg2): - } -} - -type ZeroSchedule struct{} - -func (*ZeroSchedule) Next(time.Time) time.Time { - return time.Time{} -} - -// Tests that job without time does not run -func TestJobWithZeroTimeDoesNotRun(t *testing.T) { - cron := newWithSeconds() - var calls int64 - cron.AddFunc("* * * * * *", func() { atomic.AddInt64(&calls, 1) }) - cron.Schedule(new(ZeroSchedule), FuncJob(func() { t.Error("expected zero task will not run") })) - cron.Start() - defer cron.Stop() - <-time.After(OneSecond) - if atomic.LoadInt64(&calls) != 1 { - t.Errorf("called %d times, expected 1\n", calls) - } -} - -func TestStopAndWait(t *testing.T) { - t.Run("nothing running, returns immediately", func(t *testing.T) { - cron := newWithSeconds() - cron.Start() - ctx := cron.Stop() - select { - case <-ctx.Done(): - case <-time.After(time.Millisecond): - t.Error("context was not done immediately") - } - }) - - t.Run("repeated calls to Stop", func(t *testing.T) { - cron := newWithSeconds() - cron.Start() - _ = cron.Stop() - time.Sleep(time.Millisecond) - ctx := cron.Stop() - select { - case <-ctx.Done(): - case <-time.After(time.Millisecond): - t.Error("context was not done immediately") - } - }) - - t.Run("a couple fast jobs added, still returns immediately", func(t *testing.T) { - cron := newWithSeconds() - cron.AddFunc("* * * * * *", func() {}) - cron.Start() - cron.AddFunc("* * * * * *", func() {}) - cron.AddFunc("* * * * * *", func() {}) - cron.AddFunc("* * * * * *", func() {}) - time.Sleep(time.Second) - ctx := cron.Stop() - select { - case <-ctx.Done(): - case <-time.After(time.Millisecond): - t.Error("context was not done immediately") - } - }) - - t.Run("a couple fast jobs and a slow job added, waits for slow job", func(t *testing.T) { - cron := newWithSeconds() - cron.AddFunc("* * * * * *", func() {}) - cron.Start() - cron.AddFunc("* * * * * *", func() { time.Sleep(2 * time.Second) }) - cron.AddFunc("* * * * * *", func() {}) - time.Sleep(time.Second) - - ctx := cron.Stop() - - // Verify that it is not done for at least 750ms - select { - case <-ctx.Done(): - t.Error("context was done too quickly immediately") - case <-time.After(750 * time.Millisecond): - // expected, because the job sleeping for 1 second is still running - } - - // Verify that it IS done in the next 500ms (giving 250ms buffer) - select { - case <-ctx.Done(): - // expected - case <-time.After(1500 * time.Millisecond): - t.Error("context not done after job should have completed") - } - }) - - t.Run("repeated calls to stop, waiting for completion and after", func(t *testing.T) { - cron := newWithSeconds() - cron.AddFunc("* * * * * *", func() {}) - cron.AddFunc("* * * * * *", func() { time.Sleep(2 * time.Second) }) - cron.Start() - cron.AddFunc("* * * * * *", func() {}) - time.Sleep(time.Second) - ctx := cron.Stop() - ctx2 := cron.Stop() - - // Verify that it is not done for at least 1500ms - select { - case <-ctx.Done(): - t.Error("context was done too quickly immediately") - case <-ctx2.Done(): - t.Error("context2 was done too quickly immediately") - case <-time.After(1500 * time.Millisecond): - // expected, because the job sleeping for 2 seconds is still running - } - - // Verify that it IS done in the next 1s (giving 500ms buffer) - select { - case <-ctx.Done(): - // expected - case <-time.After(time.Second): - t.Error("context not done after job should have completed") - } - - // Verify that ctx2 is also done. - select { - case <-ctx2.Done(): - // expected - case <-time.After(time.Millisecond): - t.Error("context2 not done even though context1 is") - } - - // Verify that a new context retrieved from stop is immediately done. - ctx3 := cron.Stop() - select { - case <-ctx3.Done(): - // expected - case <-time.After(time.Millisecond): - t.Error("context not done even when cron Stop is completed") - } - - }) -} - -func TestMultiThreadedStartAndStop(t *testing.T) { - cron := New() - go cron.Run() - time.Sleep(2 * time.Millisecond) - cron.Stop() -} - -func wait(wg *sync.WaitGroup) chan bool { - ch := make(chan bool) - go func() { - wg.Wait() - ch <- true - }() - return ch -} - -func stop(cron *Cron) chan bool { - ch := make(chan bool) - go func() { - cron.Stop() - ch <- true - }() - return ch -} - -// newWithSeconds returns a Cron with the seconds field enabled. -func newWithSeconds() *Cron { - return New(WithParser(secondParser), WithChain()) -} diff --git a/src/server/cron/doc.go b/src/server/cron/doc.go deleted file mode 100644 index ac6b4b07..00000000 --- a/src/server/cron/doc.go +++ /dev/null @@ -1,212 +0,0 @@ -/* -Package cron implements a cron spec parser and job runner. - -Usage - -Callers may register Funcs to be invoked on a given schedule. Cron will run -them in their own goroutines. - - c := cron.New() - c.AddFunc("30 * * * *", func() { fmt.Println("Every hour on the half hour") }) - c.AddFunc("30 3-6,20-23 * * *", func() { fmt.Println(".. in the range 3-6am, 8-11pm") }) - c.AddFunc("CRON_TZ=Asia/Tokyo 30 04 * * * *", func() { fmt.Println("Runs at 04:30 Tokyo time every day") }) - c.AddFunc("@hourly", func() { fmt.Println("Every hour, starting an hour from now") }) - c.AddFunc("@every 1h30m", func() { fmt.Println("Every hour thirty, starting an hour thirty from now") }) - c.Start() - .. - // Funcs are invoked in their own goroutine, asynchronously. - ... - // Funcs may also be added to a running Cron - c.AddFunc("@daily", func() { fmt.Println("Every day") }) - .. - // Inspect the cron job entries' next and previous run times. - inspect(c.Entries()) - .. - c.Stop() // Stop the scheduler (does not stop any jobs already running). - -CRON Expression Format - -A cron expression represents a set of times, using 5 space-separated fields. - - Field name | Mandatory? | Allowed values | Allowed special characters - ---------- | ---------- | -------------- | -------------------------- - Minutes | Yes | 0-59 | * / , - - Hours | Yes | 0-23 | * / , - - Day of month | Yes | 1-31 | * / , - ? - Month | Yes | 1-12 or JAN-DEC | * / , - - Day of week | Yes | 0-6 or SUN-SAT | * / , - ? - -Month and Day-of-week field values are case insensitive. "SUN", "Sun", and -"sun" are equally accepted. - -The specific interpretation of the format is based on the Cron Wikipedia page: -https://en.wikipedia.org/wiki/Cron - -Alternative Formats - -Alternative Cron expression formats support other fields like seconds. You can -implement that by creating a custom Parser as follows. - - cron.New( - cron.WithParser( - cron.SecondOptional | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor)) - -The most popular alternative Cron expression format is Quartz: -http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html - -Special Characters - -Asterisk ( * ) - -The asterisk indicates that the cron expression will match for all values of the -field; e.g., using an asterisk in the 5th field (month) would indicate every -month. - -Slash ( / ) - -Slashes are used to describe increments of ranges. For example 3-59/15 in the -1st field (minutes) would indicate the 3rd minute of the hour and every 15 -minutes thereafter. The form "*\/..." is equivalent to the form "first-last/...", -that is, an increment over the largest possible range of the field. The form -"N/..." is accepted as meaning "N-MAX/...", that is, starting at N, use the -increment until the end of that specific range. It does not wrap around. - -Comma ( , ) - -Commas are used to separate items of a list. For example, using "MON,WED,FRI" in -the 5th field (day of week) would mean Mondays, Wednesdays and Fridays. - -Hyphen ( - ) - -Hyphens are used to define ranges. For example, 9-17 would indicate every -hour between 9am and 5pm inclusive. - -Question mark ( ? ) - -Question mark may be used instead of '*' for leaving either day-of-month or -day-of-week blank. - -Predefined schedules - -You may use one of several pre-defined schedules in place of a cron expression. - - Entry | Description | Equivalent To - ----- | ----------- | ------------- - @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 1 1 * - @monthly | Run once a month, midnight, first of month | 0 0 1 * * - @weekly | Run once a week, midnight between Sat/Sun | 0 0 * * 0 - @daily (or @midnight) | Run once a day, midnight | 0 0 * * * - @hourly | Run once an hour, beginning of hour | 0 * * * * - -Intervals - -You may also schedule a job to execute at fixed intervals, starting at the time it's added -or cron is run. This is supported by formatting the cron spec like this: - - @every - -where "duration" is a string accepted by time.ParseDuration -(http://golang.org/pkg/time/#ParseDuration). - -For example, "@every 1h30m10s" would indicate a schedule that activates after -1 hour, 30 minutes, 10 seconds, and then every interval after that. - -Note: The interval does not take the job runtime into account. For example, -if a job takes 3 minutes to run, and it is scheduled to run every 5 minutes, -it will have only 2 minutes of idle time between each run. - -Time zones - -By default, all interpretation and scheduling is done in the machine's local -time zone (time.Local). You can specify a different time zone on construction: - - cron.New( - cron.WithLocation(time.UTC)) - -Individual cron schedules may also override the time zone they are to be -interpreted in by providing an additional space-separated field at the beginning -of the cron spec, of the form "CRON_TZ=Asia/Tokyo". - -For example: - - # Runs at 6am in time.Local - cron.New().AddFunc("0 6 * * ?", ...) - - # Runs at 6am in America/New_York - nyc, _ := time.LoadLocation("America/New_York") - c := cron.New(cron.WithLocation(nyc)) - c.AddFunc("0 6 * * ?", ...) - - # Runs at 6am in Asia/Tokyo - cron.New().AddFunc("CRON_TZ=Asia/Tokyo 0 6 * * ?", ...) - - # Runs at 6am in Asia/Tokyo - c := cron.New(cron.WithLocation(nyc)) - c.SetLocation("America/New_York") - c.AddFunc("CRON_TZ=Asia/Tokyo 0 6 * * ?", ...) - -The prefix "TZ=(TIME ZONE)" is also supported for legacy compatibility. - -Be aware that jobs scheduled during daylight-savings leap-ahead transitions will -not be run! - -Job Wrappers / Chain - -A Cron runner may be configured with a chain of job wrappers to add -cross-cutting functionality to all submitted jobs. For example, they may be used -to achieve the following effects: - - - Recover any panics from jobs (activated by default) - - Delay a job's execution if the previous run hasn't completed yet - - Skip a job's execution if the previous run hasn't completed yet - - Log each job's invocations - -Install wrappers for all jobs added to a cron using the `cron.WithChain` option: - - cron.New(cron.WithChain( - cron.SkipIfStillRunning(logger), - )) - -Install wrappers for individual jobs by explicitly wrapping them: - - job = cron.NewChain( - cron.SkipIfStillRunning(logger), - ).Then(job) - -Thread safety - -Since the Cron service runs concurrently with the calling code, some amount of -care must be taken to ensure proper synchronization. - -All cron methods are designed to be correctly synchronized as long as the caller -ensures that invocations have a clear happens-before ordering between them. - -Logging - -Cron defines a Logger interface that is a subset of the one defined in -github.com/go-logr/logr. It has two logging levels (Info and Error), and -parameters are key/value pairs. This makes it possible for cron logging to plug -into structured logging systems. An adapter, [Verbose]PrintfLogger, is provided -to wrap the standard library *log.Logger. - -For additional insight into Cron operations, verbose logging may be activated -which will record job runs, scheduling decisions, and added or removed jobs. -Activate it with a one-off logger as follows: - - cron.New( - cron.WithLogger( - cron.VerbosePrintfLogger(log.New(os.Stdout, "cron: ", log.LstdFlags)))) - - -Implementation - -Cron entries are stored in an array, sorted by their next activation time. Cron -sleeps until the next job is due to be run. - -Upon waking: - - it runs each entry that is active on that second - - it calculates the next run times for the jobs that were run - - it re-sorts the array of entries by next activation time. - - it goes to sleep until the soonest job. -*/ -package cron diff --git a/src/server/cron/logger.go b/src/server/cron/logger.go deleted file mode 100644 index b4efcc05..00000000 --- a/src/server/cron/logger.go +++ /dev/null @@ -1,86 +0,0 @@ -package cron - -import ( - "io/ioutil" - "log" - "os" - "strings" - "time" -) - -// DefaultLogger is used by Cron if none is specified. -var DefaultLogger Logger = PrintfLogger(log.New(os.Stdout, "cron: ", log.LstdFlags)) - -// DiscardLogger can be used by callers to discard all log messages. -var DiscardLogger Logger = PrintfLogger(log.New(ioutil.Discard, "", 0)) - -// Logger is the interface used in this package for logging, so that any backend -// can be plugged in. It is a subset of the github.com/go-logr/logr interface. -type Logger interface { - // Info logs routine messages about cron's operation. - Info(msg string, keysAndValues ...interface{}) - // Error logs an error condition. - Error(err error, msg string, keysAndValues ...interface{}) -} - -// PrintfLogger wraps a Printf-based logger (such as the standard library "log") -// into an implementation of the Logger interface which logs errors only. -func PrintfLogger(l interface{ Printf(string, ...interface{}) }) Logger { - return printfLogger{l, false} -} - -// VerbosePrintfLogger wraps a Printf-based logger (such as the standard library -// "log") into an implementation of the Logger interface which logs everything. -func VerbosePrintfLogger(l interface{ Printf(string, ...interface{}) }) Logger { - return printfLogger{l, true} -} - -type printfLogger struct { - logger interface{ Printf(string, ...interface{}) } - logInfo bool -} - -func (pl printfLogger) Info(msg string, keysAndValues ...interface{}) { - if pl.logInfo { - keysAndValues = formatTimes(keysAndValues) - pl.logger.Printf( - formatString(len(keysAndValues)), - append([]interface{}{msg}, keysAndValues...)...) - } -} - -func (pl printfLogger) Error(err error, msg string, keysAndValues ...interface{}) { - keysAndValues = formatTimes(keysAndValues) - pl.logger.Printf( - formatString(len(keysAndValues)+2), - append([]interface{}{msg, "error", err}, keysAndValues...)...) -} - -// formatString returns a logfmt-like format string for the number of -// key/values. -func formatString(numKeysAndValues int) string { - var sb strings.Builder - sb.WriteString("%s") - if numKeysAndValues > 0 { - sb.WriteString(", ") - } - for i := 0; i < numKeysAndValues/2; i++ { - if i > 0 { - sb.WriteString(", ") - } - sb.WriteString("%v=%v") - } - return sb.String() -} - -// formatTimes formats any time.Time values as RFC3339. -func formatTimes(keysAndValues []interface{}) []interface{} { - var formattedArgs []interface{} - for _, arg := range keysAndValues { - if t, ok := arg.(time.Time); ok { - arg = t.Format(time.RFC3339) - } - formattedArgs = append(formattedArgs, arg) - } - return formattedArgs -} diff --git a/src/server/cron/option.go b/src/server/cron/option.go deleted file mode 100644 index 07638201..00000000 --- a/src/server/cron/option.go +++ /dev/null @@ -1,45 +0,0 @@ -package cron - -import ( - "time" -) - -// Option represents a modification to the default behavior of a Cron. -type Option func(*Cron) - -// WithLocation overrides the timezone of the cron instance. -func WithLocation(loc *time.Location) Option { - return func(c *Cron) { - c.location = loc - } -} - -// WithSeconds overrides the parser used for interpreting job schedules to -// include a seconds field as the first one. -func WithSeconds() Option { - return WithParser(NewParser( - Second | Minute | Hour | Dom | Month | Dow | Descriptor, - )) -} - -// WithParser overrides the parser used for interpreting job schedules. -func WithParser(p Parser) Option { - return func(c *Cron) { - c.parser = p - } -} - -// WithChain specifies Job wrappers to apply to all jobs added to this cron. -// Refer to the Chain* functions in this package for provided wrappers. -func WithChain(wrappers ...JobWrapper) Option { - return func(c *Cron) { - c.chain = NewChain(wrappers...) - } -} - -// WithLogger uses the provided logger. -func WithLogger(logger Logger) Option { - return func(c *Cron) { - c.logger = logger - } -} diff --git a/src/server/cron/option_test.go b/src/server/cron/option_test.go deleted file mode 100644 index 8aef1682..00000000 --- a/src/server/cron/option_test.go +++ /dev/null @@ -1,42 +0,0 @@ -package cron - -import ( - "log" - "strings" - "testing" - "time" -) - -func TestWithLocation(t *testing.T) { - c := New(WithLocation(time.UTC)) - if c.location != time.UTC { - t.Errorf("expected UTC, got %v", c.location) - } -} - -func TestWithParser(t *testing.T) { - var parser = NewParser(Dow) - c := New(WithParser(parser)) - if c.parser != parser { - t.Error("expected provided parser") - } -} - -func TestWithVerboseLogger(t *testing.T) { - var buf syncWriter - var logger = log.New(&buf, "", log.LstdFlags) - c := New(WithLogger(VerbosePrintfLogger(logger))) - if c.logger.(printfLogger).logger != logger { - t.Error("expected provided logger") - } - - c.AddFunc("@every 1s", func() {}) - c.Start() - time.Sleep(OneSecond) - c.Stop() - out := buf.String() - if !strings.Contains(out, "schedule,") || - !strings.Contains(out, "run,") { - t.Error("expected to see some actions, got:", out) - } -} diff --git a/src/server/cron/parser.go b/src/server/cron/parser.go deleted file mode 100644 index 0d43f7cb..00000000 --- a/src/server/cron/parser.go +++ /dev/null @@ -1,435 +0,0 @@ -package cron - -import ( - "fmt" - "math" - "strconv" - "strings" - "time" -) - -// Configuration options for creating a parser. Most options specify which -// fields should be included, while others enable features. If a field is not -// included the parser will assume a default value. These options do not change -// the order fields are parse in. -type ParseOption int - -const ( - Second ParseOption = 1 << iota // Seconds field, default 0 - SecondOptional // Optional seconds field, default 0 - Minute // Minutes field, default 0 - Hour // Hours field, default 0 - Dom // Day of month field, default * - Month // Month field, default * - Dow // Day of week field, default * - DowOptional // Optional day of week field, default * - Descriptor // Allow descriptors such as @monthly, @weekly, etc. -) - -var places = []ParseOption{ - Second, - Minute, - Hour, - Dom, - Month, - Dow, -} - -var defaults = []string{ - "0", - "0", - "0", - "*", - "*", - "*", -} - -// A custom Parser that can be configured. -type Parser struct { - options ParseOption -} - -// NewParser creates a Parser with custom options. -// -// It panics if more than one Optional is given, since it would be impossible to -// correctly infer which optional is provided or missing in general. -// -// Examples -// -// // Standard parser without descriptors -// specParser := NewParser(Minute | Hour | Dom | Month | Dow) -// sched, err := specParser.Parse("0 0 15 */3 *") -// -// // Same as above, just excludes time fields -// subsParser := NewParser(Dom | Month | Dow) -// sched, err := specParser.Parse("15 */3 *") -// -// // Same as above, just makes Dow optional -// subsParser := NewParser(Dom | Month | DowOptional) -// sched, err := specParser.Parse("15 */3") -func NewParser(options ParseOption) Parser { - optionals := 0 - if options&DowOptional > 0 { - optionals++ - } - if options&SecondOptional > 0 { - optionals++ - } - if optionals > 1 { - panic("multiple optionals may not be configured") - } - return Parser{options} -} - -// Parse returns a new crontab schedule representing the given spec. -// It returns a descriptive error if the spec is not valid. -// It accepts crontab specs and features configured by NewParser. -func (p Parser) Parse(spec string) (Schedule, error) { - if len(spec) == 0 { - return nil, fmt.Errorf("empty spec string") - } - - // Extract timezone if present - var loc = time.Local - if strings.HasPrefix(spec, "TZ=") || strings.HasPrefix(spec, "CRON_TZ=") { - var err error - i := strings.Index(spec, " ") - eq := strings.Index(spec, "=") - if loc, err = time.LoadLocation(spec[eq+1 : i]); err != nil { - return nil, fmt.Errorf("provided bad location %s: %v", spec[eq+1:i], err) - } - spec = strings.TrimSpace(spec[i:]) - } - - // Handle named schedules (descriptors), if configured - if strings.HasPrefix(spec, "@") { - if p.options&Descriptor == 0 { - return nil, fmt.Errorf("parser does not accept descriptors: %v", spec) - } - return parseDescriptor(spec, loc) - } - - // Split on whitespace. - fields := strings.Fields(spec) - - // Validate & fill in any omitted or optional fields - var err error - fields, err = normalizeFields(fields, p.options) - if err != nil { - return nil, err - } - - field := func(field string, r bounds) uint64 { - if err != nil { - return 0 - } - var bits uint64 - bits, err = getField(field, r) - return bits - } - - var ( - second = field(fields[0], seconds) - minute = field(fields[1], minutes) - hour = field(fields[2], hours) - dayofmonth = field(fields[3], dom) - month = field(fields[4], months) - dayofweek = field(fields[5], dow) - ) - if err != nil { - return nil, err - } - - return &SpecSchedule{ - Second: second, - Minute: minute, - Hour: hour, - Dom: dayofmonth, - Month: month, - Dow: dayofweek, - Location: loc, - }, nil -} - -// normalizeFields takes a subset set of the time fields and returns the full set -// with defaults (zeroes) populated for unset fields. -// -// As part of performing this function, it also validates that the provided -// fields are compatible with the configured options. -func normalizeFields(fields []string, options ParseOption) ([]string, error) { - // Validate optionals & add their field to options - optionals := 0 - if options&SecondOptional > 0 { - options |= Second - optionals++ - } - if options&DowOptional > 0 { - options |= Dow - optionals++ - } - if optionals > 1 { - return nil, fmt.Errorf("multiple optionals may not be configured") - } - - // Figure out how many fields we need - max := 0 - for _, place := range places { - if options&place > 0 { - max++ - } - } - min := max - optionals - - // Validate number of fields - if count := len(fields); count < min || count > max { - if min == max { - return nil, fmt.Errorf("expected exactly %d fields, found %d: %s", min, count, fields) - } - return nil, fmt.Errorf("expected %d to %d fields, found %d: %s", min, max, count, fields) - } - - // Populate the optional field if not provided - if min < max && len(fields) == min { - switch { - case options&DowOptional > 0: - fields = append(fields, defaults[5]) - case options&SecondOptional > 0: - fields = append([]string{defaults[0]}, fields...) - default: - return nil, fmt.Errorf("unknown optional field") - } - } - - // Populate all fields not part of options with their defaults - n := 0 - expandedFields := make([]string, len(places)) - copy(expandedFields, defaults) - for i, place := range places { - if options&place > 0 { - expandedFields[i] = fields[n] - n++ - } - } - return expandedFields, nil -} - -var standardParser = NewParser( - Minute | Hour | Dom | Month | Dow | Descriptor, -) - -// ParseStandard returns a new crontab schedule representing the given -// standardSpec (https://en.wikipedia.org/wiki/Cron). It requires 5 entries -// representing: minute, hour, day of month, month and day of week, in that -// order. It returns a descriptive error if the spec is not valid. -// -// It accepts -// - Standard crontab specs, e.g. "* * * * ?" -// - Descriptors, e.g. "@midnight", "@every 1h30m" -func ParseStandard(standardSpec string) (Schedule, error) { - return standardParser.Parse(standardSpec) -} - -// getField returns an Int with the bits set representing all of the times that -// the field represents or error parsing field value. A "field" is a comma-separated -// list of "ranges". -func getField(field string, r bounds) (uint64, error) { - var bits uint64 - ranges := strings.FieldsFunc(field, func(r rune) bool { return r == ',' }) - for _, expr := range ranges { - bit, err := getRange(expr, r) - if err != nil { - return bits, err - } - bits |= bit - } - return bits, nil -} - -// getRange returns the bits indicated by the given expression: -// -// number | number "-" number [ "/" number ] -// -// or error parsing range. -func getRange(expr string, r bounds) (uint64, error) { - var ( - start, end, step uint - rangeAndStep = strings.Split(expr, "/") - lowAndHigh = strings.Split(rangeAndStep[0], "-") - singleDigit = len(lowAndHigh) == 1 - err error - ) - - var extra uint64 - if lowAndHigh[0] == "*" || lowAndHigh[0] == "?" { - start = r.min - end = r.max - extra = starBit - } else { - start, err = parseIntOrName(lowAndHigh[0], r.names) - if err != nil { - return 0, err - } - switch len(lowAndHigh) { - case 1: - end = start - case 2: - end, err = parseIntOrName(lowAndHigh[1], r.names) - if err != nil { - return 0, err - } - default: - return 0, fmt.Errorf("too many hyphens: %s", expr) - } - } - - switch len(rangeAndStep) { - case 1: - step = 1 - case 2: - step, err = mustParseInt(rangeAndStep[1]) - if err != nil { - return 0, err - } - - // Special handling: "N/step" means "N-max/step". - if singleDigit { - end = r.max - } - if step > 1 { - extra = 0 - } - default: - return 0, fmt.Errorf("too many slashes: %s", expr) - } - - if start < r.min { - return 0, fmt.Errorf("beginning of range (%d) below minimum (%d): %s", start, r.min, expr) - } - if end > r.max { - return 0, fmt.Errorf("end of range (%d) above maximum (%d): %s", end, r.max, expr) - } - if start > end { - return 0, fmt.Errorf("beginning of range (%d) beyond end of range (%d): %s", start, end, expr) - } - if step == 0 { - return 0, fmt.Errorf("step of range should be a positive number: %s", expr) - } - - return getBits(start, end, step) | extra, nil -} - -// parseIntOrName returns the (possibly-named) integer contained in expr. -func parseIntOrName(expr string, names map[string]uint) (uint, error) { - if names != nil { - if namedInt, ok := names[strings.ToLower(expr)]; ok { - return namedInt, nil - } - } - return mustParseInt(expr) -} - -// mustParseInt parses the given expression as an int or returns an error. -func mustParseInt(expr string) (uint, error) { - num, err := strconv.Atoi(expr) - if err != nil { - return 0, fmt.Errorf("failed to parse int from %s: %s", expr, err) - } - if num < 0 { - return 0, fmt.Errorf("negative number (%d) not allowed: %s", num, expr) - } - - return uint(num), nil -} - -// getBits sets all bits in the range [min, max], modulo the given step size. -func getBits(min, max, step uint) uint64 { - var bits uint64 - - // If step is 1, use shifts. - if step == 1 { - return ^(math.MaxUint64 << (max + 1)) & (math.MaxUint64 << min) - } - - // Else, use a simple loop. - for i := min; i <= max; i += step { - bits |= 1 << i - } - return bits -} - -// all returns all bits within the given bounds. (plus the star bit) -func all(r bounds) uint64 { - return getBits(r.min, r.max, 1) | starBit -} - -// parseDescriptor returns a predefined schedule for the expression, or error if none matches. -func parseDescriptor(descriptor string, loc *time.Location) (Schedule, error) { - switch descriptor { - case "@yearly", "@annually": - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: 1 << hours.min, - Dom: 1 << dom.min, - Month: 1 << months.min, - Dow: all(dow), - Location: loc, - }, nil - - case "@monthly": - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: 1 << hours.min, - Dom: 1 << dom.min, - Month: all(months), - Dow: all(dow), - Location: loc, - }, nil - - case "@weekly": - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: 1 << hours.min, - Dom: all(dom), - Month: all(months), - Dow: 1 << dow.min, - Location: loc, - }, nil - - case "@daily", "@midnight": - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: 1 << hours.min, - Dom: all(dom), - Month: all(months), - Dow: all(dow), - Location: loc, - }, nil - - case "@hourly": - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: all(hours), - Dom: all(dom), - Month: all(months), - Dow: all(dow), - Location: loc, - }, nil - - } - - const every = "@every " - if strings.HasPrefix(descriptor, every) { - duration, err := time.ParseDuration(descriptor[len(every):]) - if err != nil { - return nil, fmt.Errorf("failed to parse duration %s: %s", descriptor, err) - } - return Every(duration), nil - } - - return nil, fmt.Errorf("unrecognized descriptor: %s", descriptor) -} diff --git a/src/server/cron/parser_test.go b/src/server/cron/parser_test.go deleted file mode 100644 index 41c8c520..00000000 --- a/src/server/cron/parser_test.go +++ /dev/null @@ -1,383 +0,0 @@ -package cron - -import ( - "reflect" - "strings" - "testing" - "time" -) - -var secondParser = NewParser(Second | Minute | Hour | Dom | Month | DowOptional | Descriptor) - -func TestRange(t *testing.T) { - zero := uint64(0) - ranges := []struct { - expr string - min, max uint - expected uint64 - err string - }{ - {"5", 0, 7, 1 << 5, ""}, - {"0", 0, 7, 1 << 0, ""}, - {"7", 0, 7, 1 << 7, ""}, - - {"5-5", 0, 7, 1 << 5, ""}, - {"5-6", 0, 7, 1<<5 | 1<<6, ""}, - {"5-7", 0, 7, 1<<5 | 1<<6 | 1<<7, ""}, - - {"5-6/2", 0, 7, 1 << 5, ""}, - {"5-7/2", 0, 7, 1<<5 | 1<<7, ""}, - {"5-7/1", 0, 7, 1<<5 | 1<<6 | 1<<7, ""}, - - {"*", 1, 3, 1<<1 | 1<<2 | 1<<3 | starBit, ""}, - {"*/2", 1, 3, 1<<1 | 1<<3, ""}, - - {"5--5", 0, 0, zero, "too many hyphens"}, - {"jan-x", 0, 0, zero, "failed to parse int from"}, - {"2-x", 1, 5, zero, "failed to parse int from"}, - {"*/-12", 0, 0, zero, "negative number"}, - {"*//2", 0, 0, zero, "too many slashes"}, - {"1", 3, 5, zero, "below minimum"}, - {"6", 3, 5, zero, "above maximum"}, - {"5-3", 3, 5, zero, "beyond end of range"}, - {"*/0", 0, 0, zero, "should be a positive number"}, - } - - for _, c := range ranges { - actual, err := getRange(c.expr, bounds{c.min, c.max, nil}) - if len(c.err) != 0 && (err == nil || !strings.Contains(err.Error(), c.err)) { - t.Errorf("%s => expected %v, got %v", c.expr, c.err, err) - } - if len(c.err) == 0 && err != nil { - t.Errorf("%s => unexpected error %v", c.expr, err) - } - if actual != c.expected { - t.Errorf("%s => expected %d, got %d", c.expr, c.expected, actual) - } - } -} - -func TestField(t *testing.T) { - fields := []struct { - expr string - min, max uint - expected uint64 - }{ - {"5", 1, 7, 1 << 5}, - {"5,6", 1, 7, 1<<5 | 1<<6}, - {"5,6,7", 1, 7, 1<<5 | 1<<6 | 1<<7}, - {"1,5-7/2,3", 1, 7, 1<<1 | 1<<5 | 1<<7 | 1<<3}, - } - - for _, c := range fields { - actual, _ := getField(c.expr, bounds{c.min, c.max, nil}) - if actual != c.expected { - t.Errorf("%s => expected %d, got %d", c.expr, c.expected, actual) - } - } -} - -func TestAll(t *testing.T) { - allBits := []struct { - r bounds - expected uint64 - }{ - {minutes, 0xfffffffffffffff}, // 0-59: 60 ones - {hours, 0xffffff}, // 0-23: 24 ones - {dom, 0xfffffffe}, // 1-31: 31 ones, 1 zero - {months, 0x1ffe}, // 1-12: 12 ones, 1 zero - {dow, 0x7f}, // 0-6: 7 ones - } - - for _, c := range allBits { - actual := all(c.r) // all() adds the starBit, so compensate for that.. - if c.expected|starBit != actual { - t.Errorf("%d-%d/%d => expected %b, got %b", - c.r.min, c.r.max, 1, c.expected|starBit, actual) - } - } -} - -func TestBits(t *testing.T) { - bits := []struct { - min, max, step uint - expected uint64 - }{ - {0, 0, 1, 0x1}, - {1, 1, 1, 0x2}, - {1, 5, 2, 0x2a}, // 101010 - {1, 4, 2, 0xa}, // 1010 - } - - for _, c := range bits { - actual := getBits(c.min, c.max, c.step) - if c.expected != actual { - t.Errorf("%d-%d/%d => expected %b, got %b", - c.min, c.max, c.step, c.expected, actual) - } - } -} - -func TestParseScheduleErrors(t *testing.T) { - var tests = []struct{ expr, err string }{ - {"* 5 j * * *", "failed to parse int from"}, - {"@every Xm", "failed to parse duration"}, - {"@unrecognized", "unrecognized descriptor"}, - {"* * * *", "expected 5 to 6 fields"}, - {"", "empty spec string"}, - } - for _, c := range tests { - actual, err := secondParser.Parse(c.expr) - if err == nil || !strings.Contains(err.Error(), c.err) { - t.Errorf("%s => expected %v, got %v", c.expr, c.err, err) - } - if actual != nil { - t.Errorf("expected nil schedule on error, got %v", actual) - } - } -} - -func TestParseSchedule(t *testing.T) { - tokyo, _ := time.LoadLocation("Asia/Tokyo") - entries := []struct { - parser Parser - expr string - expected Schedule - }{ - {secondParser, "0 5 * * * *", every5min(time.Local)}, - {standardParser, "5 * * * *", every5min(time.Local)}, - {secondParser, "CRON_TZ=UTC 0 5 * * * *", every5min(time.UTC)}, - {standardParser, "CRON_TZ=UTC 5 * * * *", every5min(time.UTC)}, - {secondParser, "CRON_TZ=Asia/Tokyo 0 5 * * * *", every5min(tokyo)}, - {secondParser, "@every 5m", ConstantDelaySchedule{5 * time.Minute}}, - {secondParser, "@midnight", midnight(time.Local)}, - {secondParser, "TZ=UTC @midnight", midnight(time.UTC)}, - {secondParser, "TZ=Asia/Tokyo @midnight", midnight(tokyo)}, - {secondParser, "@yearly", annual(time.Local)}, - {secondParser, "@annually", annual(time.Local)}, - { - parser: secondParser, - expr: "* 5 * * * *", - expected: &SpecSchedule{ - Second: all(seconds), - Minute: 1 << 5, - Hour: all(hours), - Dom: all(dom), - Month: all(months), - Dow: all(dow), - Location: time.Local, - }, - }, - } - - for _, c := range entries { - actual, err := c.parser.Parse(c.expr) - if err != nil { - t.Errorf("%s => unexpected error %v", c.expr, err) - } - if !reflect.DeepEqual(actual, c.expected) { - t.Errorf("%s => expected %b, got %b", c.expr, c.expected, actual) - } - } -} - -func TestOptionalSecondSchedule(t *testing.T) { - parser := NewParser(SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor) - entries := []struct { - expr string - expected Schedule - }{ - {"0 5 * * * *", every5min(time.Local)}, - {"5 5 * * * *", every5min5s(time.Local)}, - {"5 * * * *", every5min(time.Local)}, - } - - for _, c := range entries { - actual, err := parser.Parse(c.expr) - if err != nil { - t.Errorf("%s => unexpected error %v", c.expr, err) - } - if !reflect.DeepEqual(actual, c.expected) { - t.Errorf("%s => expected %b, got %b", c.expr, c.expected, actual) - } - } -} - -func TestNormalizeFields(t *testing.T) { - tests := []struct { - name string - input []string - options ParseOption - expected []string - }{ - { - "AllFields_NoOptional", - []string{"0", "5", "*", "*", "*", "*"}, - Second | Minute | Hour | Dom | Month | Dow | Descriptor, - []string{"0", "5", "*", "*", "*", "*"}, - }, - { - "AllFields_SecondOptional_Provided", - []string{"0", "5", "*", "*", "*", "*"}, - SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor, - []string{"0", "5", "*", "*", "*", "*"}, - }, - { - "AllFields_SecondOptional_NotProvided", - []string{"5", "*", "*", "*", "*"}, - SecondOptional | Minute | Hour | Dom | Month | Dow | Descriptor, - []string{"0", "5", "*", "*", "*", "*"}, - }, - { - "SubsetFields_NoOptional", - []string{"5", "15", "*"}, - Hour | Dom | Month, - []string{"0", "0", "5", "15", "*", "*"}, - }, - { - "SubsetFields_DowOptional_Provided", - []string{"5", "15", "*", "4"}, - Hour | Dom | Month | DowOptional, - []string{"0", "0", "5", "15", "*", "4"}, - }, - { - "SubsetFields_DowOptional_NotProvided", - []string{"5", "15", "*"}, - Hour | Dom | Month | DowOptional, - []string{"0", "0", "5", "15", "*", "*"}, - }, - { - "SubsetFields_SecondOptional_NotProvided", - []string{"5", "15", "*"}, - SecondOptional | Hour | Dom | Month, - []string{"0", "0", "5", "15", "*", "*"}, - }, - } - - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - actual, err := normalizeFields(test.input, test.options) - if err != nil { - t.Errorf("unexpected error: %v", err) - } - if !reflect.DeepEqual(actual, test.expected) { - t.Errorf("expected %v, got %v", test.expected, actual) - } - }) - } -} - -func TestNormalizeFields_Errors(t *testing.T) { - tests := []struct { - name string - input []string - options ParseOption - err string - }{ - { - "TwoOptionals", - []string{"0", "5", "*", "*", "*", "*"}, - SecondOptional | Minute | Hour | Dom | Month | DowOptional, - "", - }, - { - "TooManyFields", - []string{"0", "5", "*", "*"}, - SecondOptional | Minute | Hour, - "", - }, - { - "NoFields", - []string{}, - SecondOptional | Minute | Hour, - "", - }, - { - "TooFewFields", - []string{"*"}, - SecondOptional | Minute | Hour, - "", - }, - } - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - actual, err := normalizeFields(test.input, test.options) - if err == nil { - t.Errorf("expected an error, got none. results: %v", actual) - } - if !strings.Contains(err.Error(), test.err) { - t.Errorf("expected error %q, got %q", test.err, err.Error()) - } - }) - } -} - -func TestStandardSpecSchedule(t *testing.T) { - entries := []struct { - expr string - expected Schedule - err string - }{ - { - expr: "5 * * * *", - expected: &SpecSchedule{1 << seconds.min, 1 << 5, all(hours), all(dom), all(months), all(dow), time.Local}, - }, - { - expr: "@every 5m", - expected: ConstantDelaySchedule{time.Duration(5) * time.Minute}, - }, - { - expr: "5 j * * *", - err: "failed to parse int from", - }, - { - expr: "* * * *", - err: "expected exactly 5 fields", - }, - } - - for _, c := range entries { - actual, err := ParseStandard(c.expr) - if len(c.err) != 0 && (err == nil || !strings.Contains(err.Error(), c.err)) { - t.Errorf("%s => expected %v, got %v", c.expr, c.err, err) - } - if len(c.err) == 0 && err != nil { - t.Errorf("%s => unexpected error %v", c.expr, err) - } - if !reflect.DeepEqual(actual, c.expected) { - t.Errorf("%s => expected %b, got %b", c.expr, c.expected, actual) - } - } -} - -func TestNoDescriptorParser(t *testing.T) { - parser := NewParser(Minute | Hour) - _, err := parser.Parse("@every 1m") - if err == nil { - t.Error("expected an error, got none") - } -} - -func every5min(loc *time.Location) *SpecSchedule { - return &SpecSchedule{1 << 0, 1 << 5, all(hours), all(dom), all(months), all(dow), loc} -} - -func every5min5s(loc *time.Location) *SpecSchedule { - return &SpecSchedule{1 << 5, 1 << 5, all(hours), all(dom), all(months), all(dow), loc} -} - -func midnight(loc *time.Location) *SpecSchedule { - return &SpecSchedule{1, 1, 1, all(dom), all(months), all(dow), loc} -} - -func annual(loc *time.Location) *SpecSchedule { - return &SpecSchedule{ - Second: 1 << seconds.min, - Minute: 1 << minutes.min, - Hour: 1 << hours.min, - Dom: 1 << dom.min, - Month: 1 << months.min, - Dow: all(dow), - Location: loc, - } -} diff --git a/src/server/cron/spec.go b/src/server/cron/spec.go deleted file mode 100644 index fa1e241e..00000000 --- a/src/server/cron/spec.go +++ /dev/null @@ -1,188 +0,0 @@ -package cron - -import "time" - -// SpecSchedule specifies a duty cycle (to the second granularity), based on a -// traditional crontab specification. It is computed initially and stored as bit sets. -type SpecSchedule struct { - Second, Minute, Hour, Dom, Month, Dow uint64 - - // Override location for this schedule. - Location *time.Location -} - -// bounds provides a range of acceptable values (plus a map of name to value). -type bounds struct { - min, max uint - names map[string]uint -} - -// The bounds for each field. -var ( - seconds = bounds{0, 59, nil} - minutes = bounds{0, 59, nil} - hours = bounds{0, 23, nil} - dom = bounds{1, 31, nil} - months = bounds{1, 12, map[string]uint{ - "jan": 1, - "feb": 2, - "mar": 3, - "apr": 4, - "may": 5, - "jun": 6, - "jul": 7, - "aug": 8, - "sep": 9, - "oct": 10, - "nov": 11, - "dec": 12, - }} - dow = bounds{0, 6, map[string]uint{ - "sun": 0, - "mon": 1, - "tue": 2, - "wed": 3, - "thu": 4, - "fri": 5, - "sat": 6, - }} -) - -const ( - // Set the top bit if a star was included in the expression. - starBit = 1 << 63 -) - -// Next returns the next time this schedule is activated, greater than the given -// time. If no time can be found to satisfy the schedule, return the zero time. -func (s *SpecSchedule) Next(t time.Time) time.Time { - // General approach - // - // For Month, Day, Hour, Minute, Second: - // Check if the time value matches. If yes, continue to the next field. - // If the field doesn't match the schedule, then increment the field until it matches. - // While incrementing the field, a wrap-around brings it back to the beginning - // of the field list (since it is necessary to re-verify previous field - // values) - - // Convert the given time into the schedule's timezone, if one is specified. - // Save the original timezone so we can convert back after we find a time. - // Note that schedules without a time zone specified (time.Local) are treated - // as local to the time provided. - origLocation := t.Location() - loc := s.Location - if loc == time.Local { - loc = t.Location() - } - if s.Location != time.Local { - t = t.In(s.Location) - } - - // Start at the earliest possible time (the upcoming second). - t = t.Add(1*time.Second - time.Duration(t.Nanosecond())*time.Nanosecond) - - // This flag indicates whether a field has been incremented. - added := false - - // If no time is found within five years, return zero. - yearLimit := t.Year() + 5 - -WRAP: - if t.Year() > yearLimit { - return time.Time{} - } - - // Find the first applicable month. - // If it's this month, then do nothing. - for 1< 12 { - t = t.Add(time.Duration(24-t.Hour()) * time.Hour) - } else { - t = t.Add(time.Duration(-t.Hour()) * time.Hour) - } - } - - if t.Day() == 1 { - goto WRAP - } - } - - for 1< 0 - dowMatch bool = 1< 0 - ) - if s.Dom&starBit > 0 || s.Dow&starBit > 0 { - return domMatch && dowMatch - } - return domMatch || dowMatch -} diff --git a/src/server/cron/spec_test.go b/src/server/cron/spec_test.go deleted file mode 100644 index 1b8a503e..00000000 --- a/src/server/cron/spec_test.go +++ /dev/null @@ -1,300 +0,0 @@ -package cron - -import ( - "strings" - "testing" - "time" -) - -func TestActivation(t *testing.T) { - tests := []struct { - time, spec string - expected bool - }{ - // Every fifteen minutes. - {"Mon Jul 9 15:00 2012", "0/15 * * * *", true}, - {"Mon Jul 9 15:45 2012", "0/15 * * * *", true}, - {"Mon Jul 9 15:40 2012", "0/15 * * * *", false}, - - // Every fifteen minutes, starting at 5 minutes. - {"Mon Jul 9 15:05 2012", "5/15 * * * *", true}, - {"Mon Jul 9 15:20 2012", "5/15 * * * *", true}, - {"Mon Jul 9 15:50 2012", "5/15 * * * *", true}, - - // Named months - {"Sun Jul 15 15:00 2012", "0/15 * * Jul *", true}, - {"Sun Jul 15 15:00 2012", "0/15 * * Jun *", false}, - - // Everything set. - {"Sun Jul 15 08:30 2012", "30 08 ? Jul Sun", true}, - {"Sun Jul 15 08:30 2012", "30 08 15 Jul ?", true}, - {"Mon Jul 16 08:30 2012", "30 08 ? Jul Sun", false}, - {"Mon Jul 16 08:30 2012", "30 08 15 Jul ?", false}, - - // Predefined schedules - {"Mon Jul 9 15:00 2012", "@hourly", true}, - {"Mon Jul 9 15:04 2012", "@hourly", false}, - {"Mon Jul 9 15:00 2012", "@daily", false}, - {"Mon Jul 9 00:00 2012", "@daily", true}, - {"Mon Jul 9 00:00 2012", "@weekly", false}, - {"Sun Jul 8 00:00 2012", "@weekly", true}, - {"Sun Jul 8 01:00 2012", "@weekly", false}, - {"Sun Jul 8 00:00 2012", "@monthly", false}, - {"Sun Jul 1 00:00 2012", "@monthly", true}, - - // Test interaction of DOW and DOM. - // If both are restricted, then only one needs to match. - {"Sun Jul 15 00:00 2012", "* * 1,15 * Sun", true}, - {"Fri Jun 15 00:00 2012", "* * 1,15 * Sun", true}, - {"Wed Aug 1 00:00 2012", "* * 1,15 * Sun", true}, - {"Sun Jul 15 00:00 2012", "* * */10 * Sun", true}, // verifies #70 - - // However, if one has a star, then both need to match. - {"Sun Jul 15 00:00 2012", "* * * * Mon", false}, - {"Mon Jul 9 00:00 2012", "* * 1,15 * *", false}, - {"Sun Jul 15 00:00 2012", "* * 1,15 * *", true}, - {"Sun Jul 15 00:00 2012", "* * */2 * Sun", true}, - } - - for _, test := range tests { - sched, err := ParseStandard(test.spec) - if err != nil { - t.Error(err) - continue - } - actual := sched.Next(getTime(test.time).Add(-1 * time.Second)) - expected := getTime(test.time) - if test.expected && expected != actual || !test.expected && expected == actual { - t.Errorf("Fail evaluating %s on %s: (expected) %s != %s (actual)", - test.spec, test.time, expected, actual) - } - } -} - -func TestNext(t *testing.T) { - runs := []struct { - time, spec string - expected string - }{ - // Simple cases - {"Mon Jul 9 14:45 2012", "0 0/15 * * * *", "Mon Jul 9 15:00 2012"}, - {"Mon Jul 9 14:59 2012", "0 0/15 * * * *", "Mon Jul 9 15:00 2012"}, - {"Mon Jul 9 14:59:59 2012", "0 0/15 * * * *", "Mon Jul 9 15:00 2012"}, - - // Wrap around hours - {"Mon Jul 9 15:45 2012", "0 20-35/15 * * * *", "Mon Jul 9 16:20 2012"}, - - // Wrap around days - {"Mon Jul 9 23:46 2012", "0 */15 * * * *", "Tue Jul 10 00:00 2012"}, - {"Mon Jul 9 23:45 2012", "0 20-35/15 * * * *", "Tue Jul 10 00:20 2012"}, - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 * * * *", "Tue Jul 10 00:20:15 2012"}, - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 1/2 * * *", "Tue Jul 10 01:20:15 2012"}, - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 10-12 * * *", "Tue Jul 10 10:20:15 2012"}, - - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 1/2 */2 * *", "Thu Jul 11 01:20:15 2012"}, - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 * 9-20 * *", "Wed Jul 10 00:20:15 2012"}, - {"Mon Jul 9 23:35:51 2012", "15/35 20-35/15 * 9-20 Jul *", "Wed Jul 10 00:20:15 2012"}, - - // Wrap around months - {"Mon Jul 9 23:35 2012", "0 0 0 9 Apr-Oct ?", "Thu Aug 9 00:00 2012"}, - {"Mon Jul 9 23:35 2012", "0 0 0 */5 Apr,Aug,Oct Mon", "Tue Aug 1 00:00 2012"}, - {"Mon Jul 9 23:35 2012", "0 0 0 */5 Oct Mon", "Mon Oct 1 00:00 2012"}, - - // Wrap around years - {"Mon Jul 9 23:35 2012", "0 0 0 * Feb Mon", "Mon Feb 4 00:00 2013"}, - {"Mon Jul 9 23:35 2012", "0 0 0 * Feb Mon/2", "Fri Feb 1 00:00 2013"}, - - // Wrap around minute, hour, day, month, and year - {"Mon Dec 31 23:59:45 2012", "0 * * * * *", "Tue Jan 1 00:00:00 2013"}, - - // Leap year - {"Mon Jul 9 23:35 2012", "0 0 0 29 Feb ?", "Mon Feb 29 00:00 2016"}, - - // Daylight savings time 2am EST (-5) -> 3am EDT (-4) - {"2012-03-11T00:00:00-0500", "TZ=America/New_York 0 30 2 11 Mar ?", "2013-03-11T02:30:00-0400"}, - - // hourly job - {"2012-03-11T00:00:00-0500", "TZ=America/New_York 0 0 * * * ?", "2012-03-11T01:00:00-0500"}, - {"2012-03-11T01:00:00-0500", "TZ=America/New_York 0 0 * * * ?", "2012-03-11T03:00:00-0400"}, - {"2012-03-11T03:00:00-0400", "TZ=America/New_York 0 0 * * * ?", "2012-03-11T04:00:00-0400"}, - {"2012-03-11T04:00:00-0400", "TZ=America/New_York 0 0 * * * ?", "2012-03-11T05:00:00-0400"}, - - // hourly job using CRON_TZ - {"2012-03-11T00:00:00-0500", "CRON_TZ=America/New_York 0 0 * * * ?", "2012-03-11T01:00:00-0500"}, - {"2012-03-11T01:00:00-0500", "CRON_TZ=America/New_York 0 0 * * * ?", "2012-03-11T03:00:00-0400"}, - {"2012-03-11T03:00:00-0400", "CRON_TZ=America/New_York 0 0 * * * ?", "2012-03-11T04:00:00-0400"}, - {"2012-03-11T04:00:00-0400", "CRON_TZ=America/New_York 0 0 * * * ?", "2012-03-11T05:00:00-0400"}, - - // 1am nightly job - {"2012-03-11T00:00:00-0500", "TZ=America/New_York 0 0 1 * * ?", "2012-03-11T01:00:00-0500"}, - {"2012-03-11T01:00:00-0500", "TZ=America/New_York 0 0 1 * * ?", "2012-03-12T01:00:00-0400"}, - - // 2am nightly job (skipped) - {"2012-03-11T00:00:00-0500", "TZ=America/New_York 0 0 2 * * ?", "2012-03-12T02:00:00-0400"}, - - // Daylight savings time 2am EDT (-4) => 1am EST (-5) - {"2012-11-04T00:00:00-0400", "TZ=America/New_York 0 30 2 04 Nov ?", "2012-11-04T02:30:00-0500"}, - {"2012-11-04T01:45:00-0400", "TZ=America/New_York 0 30 1 04 Nov ?", "2012-11-04T01:30:00-0500"}, - - // hourly job - {"2012-11-04T00:00:00-0400", "TZ=America/New_York 0 0 * * * ?", "2012-11-04T01:00:00-0400"}, - {"2012-11-04T01:00:00-0400", "TZ=America/New_York 0 0 * * * ?", "2012-11-04T01:00:00-0500"}, - {"2012-11-04T01:00:00-0500", "TZ=America/New_York 0 0 * * * ?", "2012-11-04T02:00:00-0500"}, - - // 1am nightly job (runs twice) - {"2012-11-04T00:00:00-0400", "TZ=America/New_York 0 0 1 * * ?", "2012-11-04T01:00:00-0400"}, - {"2012-11-04T01:00:00-0400", "TZ=America/New_York 0 0 1 * * ?", "2012-11-04T01:00:00-0500"}, - {"2012-11-04T01:00:00-0500", "TZ=America/New_York 0 0 1 * * ?", "2012-11-05T01:00:00-0500"}, - - // 2am nightly job - {"2012-11-04T00:00:00-0400", "TZ=America/New_York 0 0 2 * * ?", "2012-11-04T02:00:00-0500"}, - {"2012-11-04T02:00:00-0500", "TZ=America/New_York 0 0 2 * * ?", "2012-11-05T02:00:00-0500"}, - - // 3am nightly job - {"2012-11-04T00:00:00-0400", "TZ=America/New_York 0 0 3 * * ?", "2012-11-04T03:00:00-0500"}, - {"2012-11-04T03:00:00-0500", "TZ=America/New_York 0 0 3 * * ?", "2012-11-05T03:00:00-0500"}, - - // hourly job - {"TZ=America/New_York 2012-11-04T00:00:00-0400", "0 0 * * * ?", "2012-11-04T01:00:00-0400"}, - {"TZ=America/New_York 2012-11-04T01:00:00-0400", "0 0 * * * ?", "2012-11-04T01:00:00-0500"}, - {"TZ=America/New_York 2012-11-04T01:00:00-0500", "0 0 * * * ?", "2012-11-04T02:00:00-0500"}, - - // 1am nightly job (runs twice) - {"TZ=America/New_York 2012-11-04T00:00:00-0400", "0 0 1 * * ?", "2012-11-04T01:00:00-0400"}, - {"TZ=America/New_York 2012-11-04T01:00:00-0400", "0 0 1 * * ?", "2012-11-04T01:00:00-0500"}, - {"TZ=America/New_York 2012-11-04T01:00:00-0500", "0 0 1 * * ?", "2012-11-05T01:00:00-0500"}, - - // 2am nightly job - {"TZ=America/New_York 2012-11-04T00:00:00-0400", "0 0 2 * * ?", "2012-11-04T02:00:00-0500"}, - {"TZ=America/New_York 2012-11-04T02:00:00-0500", "0 0 2 * * ?", "2012-11-05T02:00:00-0500"}, - - // 3am nightly job - {"TZ=America/New_York 2012-11-04T00:00:00-0400", "0 0 3 * * ?", "2012-11-04T03:00:00-0500"}, - {"TZ=America/New_York 2012-11-04T03:00:00-0500", "0 0 3 * * ?", "2012-11-05T03:00:00-0500"}, - - // Unsatisfiable - {"Mon Jul 9 23:35 2012", "0 0 0 30 Feb ?", ""}, - {"Mon Jul 9 23:35 2012", "0 0 0 31 Apr ?", ""}, - - // Monthly job - {"TZ=America/New_York 2012-11-04T00:00:00-0400", "0 0 3 3 * ?", "2012-12-03T03:00:00-0500"}, - - // Test the scenario of DST resulting in midnight not being a valid time. - // https://github.com/robfig/cron/issues/157 - {"2018-10-17T05:00:00-0400", "TZ=America/Sao_Paulo 0 0 9 10 * ?", "2018-11-10T06:00:00-0500"}, - {"2018-02-14T05:00:00-0500", "TZ=America/Sao_Paulo 0 0 9 22 * ?", "2018-02-22T07:00:00-0500"}, - } - - for _, c := range runs { - sched, err := secondParser.Parse(c.spec) - if err != nil { - t.Error(err) - continue - } - actual := sched.Next(getTime(c.time)) - expected := getTime(c.expected) - if !actual.Equal(expected) { - t.Errorf("%s, \"%s\": (expected) %v != %v (actual)", c.time, c.spec, expected, actual) - } - } -} - -func TestErrors(t *testing.T) { - invalidSpecs := []string{ - "xyz", - "60 0 * * *", - "0 60 * * *", - "0 0 * * XYZ", - } - for _, spec := range invalidSpecs { - _, err := ParseStandard(spec) - if err == nil { - t.Error("expected an error parsing: ", spec) - } - } -} - -func getTime(value string) time.Time { - if value == "" { - return time.Time{} - } - - var location = time.Local - if strings.HasPrefix(value, "TZ=") { - parts := strings.Fields(value) - loc, err := time.LoadLocation(parts[0][len("TZ="):]) - if err != nil { - panic("could not parse location:" + err.Error()) - } - location = loc - value = parts[1] - } - - var layouts = []string{ - "Mon Jan 2 15:04 2006", - "Mon Jan 2 15:04:05 2006", - } - for _, layout := range layouts { - if t, err := time.ParseInLocation(layout, value, location); err == nil { - return t - } - } - if t, err := time.ParseInLocation("2006-01-02T15:04:05-0700", value, location); err == nil { - return t - } - panic("could not parse time value " + value) -} - -func TestNextWithTz(t *testing.T) { - runs := []struct { - time, spec string - expected string - }{ - // Failing tests - {"2016-01-03T13:09:03+0530", "14 14 * * *", "2016-01-03T14:14:00+0530"}, - {"2016-01-03T04:09:03+0530", "14 14 * * ?", "2016-01-03T14:14:00+0530"}, - - // Passing tests - {"2016-01-03T14:09:03+0530", "14 14 * * *", "2016-01-03T14:14:00+0530"}, - {"2016-01-03T14:00:00+0530", "14 14 * * ?", "2016-01-03T14:14:00+0530"}, - } - for _, c := range runs { - sched, err := ParseStandard(c.spec) - if err != nil { - t.Error(err) - continue - } - actual := sched.Next(getTimeTZ(c.time)) - expected := getTimeTZ(c.expected) - if !actual.Equal(expected) { - t.Errorf("%s, \"%s\": (expected) %v != %v (actual)", c.time, c.spec, expected, actual) - } - } -} - -func getTimeTZ(value string) time.Time { - if value == "" { - return time.Time{} - } - t, err := time.Parse("Mon Jan 2 15:04 2006", value) - if err != nil { - t, err = time.Parse("Mon Jan 2 15:04:05 2006", value) - if err != nil { - t, err = time.Parse("2006-01-02T15:04:05-0700", value) - if err != nil { - panic(err) - } - } - } - - return t -} - -// https://github.com/robfig/cron/issues/144 -func TestSlash0NoHang(t *testing.T) { - schedule := "TZ=America/New_York 15/0 * * * *" - _, err := ParseStandard(schedule) - if err == nil { - t.Error("expected an error on 0 increment") - } -} diff --git a/src/server/db/Mysql.go b/src/server/db/Mysql.go index 81e8a3fb..91249688 100644 --- a/src/server/db/Mysql.go +++ b/src/server/db/Mysql.go @@ -7,11 +7,12 @@ import ( "server/MergeConst" "server/conf" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" "strings" "sync" "time" + "gitea.bywaystudios.com/pet_home/leaf/log" + // "server/game" _ "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" @@ -384,13 +385,15 @@ func InsertServerData(data *SqlServerModStruct) error { } func SavePlayerModData(data *SqlModStruct) error { - sql := "INSERT INTO `t_player_mod` (`mData` , `updateTime` ,`dwUin`) Values (?,?,?) ON DUPLICATE KEY UPDATE `mData` = ? , `updateTime` = ? " + tableName := "t_player_mod_" + fmt.Sprintf("%02d", data.DwUin%100) + sql := "INSERT INTO `" + tableName + "` (`mData` , `updateTime` ,`dwUin`) Values (?,?,?) ON DUPLICATE KEY UPDATE `mData` = ? , `updateTime` = ? " _, err := SqlDb.Exec(sql, data.ModData, data.UpdataTime, data.DwUin, data.ModData, data.UpdataTime) return err } func InsertPlayerModData(data *SqlModStruct) error { - sql := "insert into t_player_mod (`mData` , `updateTime` ,`dwUin`) Values (?,?,?)" + tableName := "t_player_mod_" + fmt.Sprintf("%02d", data.DwUin%100) + sql := "insert into `" + tableName + "` (`mData` , `updateTime` ,`dwUin`) Values (?,?,?)" _, err := SqlDb.Exec(sql, data.ModData, data.UpdataTime, data.DwUin) return err } @@ -414,7 +417,7 @@ func GetServerMailData(data *[]*SqlServerMailStruct) error { } func GetActivityData(data *[]*SqlActivityCfgStruct) error { - sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg_buf`, `extra` from t_activity_mod" + sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg`, `extra`, `interval` from t_activity_mod" err := SqlDb.Select(data, sql) return err } diff --git a/src/server/db/Redis.go b/src/server/db/Redis.go index 31b9eea9..b7d080fb 100644 --- a/src/server/db/Redis.go +++ b/src/server/db/Redis.go @@ -3,10 +3,11 @@ package db import ( "context" "server/conf" - "server/pkg/github.com/name5566/leaf/log" "strings" "time" + "gitea.bywaystudios.com/pet_home/leaf/log" + "github.com/redis/go-redis/v9" ) diff --git a/src/server/db/SqlStruct.go b/src/server/db/SqlStruct.go index c60bd90a..b9e2d473 100644 --- a/src/server/db/SqlStruct.go +++ b/src/server/db/SqlStruct.go @@ -506,7 +506,8 @@ type SqlActivityCfgStruct struct { Level int `db:"level_limit"` Start_time int64 `db:"start_time"` End_time int64 `db:"end_time"` - Cfg []byte `db:"cfg_buf"` + Cfg string `db:"cfg"` + Interval int64 `db:"interval"` Extra string `db:"extra"` } diff --git a/src/server/ga/log.go b/src/server/ga/log.go index bfb46b0b..ad89bf4d 100644 --- a/src/server/ga/log.go +++ b/src/server/ga/log.go @@ -1,7 +1,7 @@ package ga import ( - galog "github.com/tuyou/galog" + galog "gitea.bywaystudios.com/pet_home/galog" ) const ( diff --git a/src/server/thinkdata/te.go b/src/server/ga/te.go similarity index 84% rename from src/server/thinkdata/te.go rename to src/server/ga/te.go index a4c0f84b..1974e2b7 100644 --- a/src/server/thinkdata/te.go +++ b/src/server/ga/te.go @@ -1,8 +1,9 @@ -package telog +package ga import ( "server/conf" - "server/thinkingdata" + + thinkingdata "gitea.bywaystudios.com/pet_home/thinkdata" ) var Te thinkingdata.TDAnalytics @@ -10,7 +11,6 @@ var Te thinkingdata.TDAnalytics func init() { // 初始化 // 创建 LogConfig 配置文件 - config := thinkingdata.TDLogConsumerConfig{ Directory: conf.Server.TELOGDIR, // 事件采集的文件路径 } diff --git a/src/server/galog/.gitignore b/src/server/galog/.gitignore deleted file mode 100644 index e3c5d3e4..00000000 --- a/src/server/galog/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.DS_Store -.vscode/ -.idea/ -*.log -logs/ -ga_log/ -asset_log/ \ No newline at end of file diff --git a/src/server/galog/README.md b/src/server/galog/README.md deleted file mode 100644 index 70e08d0b..00000000 --- a/src/server/galog/README.md +++ /dev/null @@ -1,292 +0,0 @@ -# galog - -galog是一个无三方依赖、支持单CPU最高5wQPS写入的ga-sdk组件，可直接用于GA事实日志和资产日志打点。 - -> 说明：默认是异步写入模式，异步队列长度=100，较大QPS时可自行调整，详见参数： -> - enableAsync -> - defaultAsyncMsgLen - -## Usage - -```golang -// ga日志初始化 -projectID := "20433" -clientID := "Android_5.0_tyGuest,weixinPay,tyAccount.alipay.0-hall20433.tuyoo.sdktest" -glogger, err := galog.NewGALogger("logs", projectID, clientID, galog.LogTypeTrack) -if err != nil { - panic(err) -} - -// ga日志打点调用 -props := map[string]interface{}{ - "ip_address": "127.0.0.1", - "proj_app_id": "10010", - "uuid": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts": tt.UnixNano(), -} -glogger. - GetEntry("sdk_s_login_succ"). - SetDeviceID("device001"). - SetUserID("10086"). - SetProperties(props). - Flush() -``` - -```golang -// asset日志初始化 -projectID := "28" -clientID := "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz" -glogger, err := galog.NewGALogger("logs", projectID, clientID, galog.LogTypeAsset) -if err != nil { - panic(err) -} - -// asset日志打点调用 -asset := galog.AssetProperties{} -asset. - SetAssetID("13101"). - SetAssetName("\u9501\u5b9a"). - SetAssetType("6"). - SetAssetFinal("2"). - SetAssetAssociated("3"). - SetAssetStartTime("0"). - SetAssetTimeLimit("0"). - SetAssetSource(""). - SetKV("uuid", "uuid-v4") - -glogger. - GetEntry("asset_increase"). - SetDeviceID(""). - SetUserID("10086"). - SetProperties(asset). - Flush() -``` - -## suger usage - -```golang -package chat_log - -import ( - "log" - "strconv" - - "tygit.tuyoo.com/gocomponents/galog" -) - -var ( - slogger *galog.Logger - galogger *galog.GALogger - - lerr error -) - -// MustInitLoggerOnce 服务启动后初始化一次 -func MustInitLoggerOnce() { - slogger, lerr = galog.NewServerLogger(&galog.ServerLogOptions{ - LogDir: "run/logs", - EnableAsync: true, - AsyncQueueSize: 1000, - }) - if lerr != nil { - log.Printf("MustInitLoggerOnce err: %s\n", lerr.Error()) - panic("MustInitLoggerOnce err") - } -} - -// MustInitGALoggerOnce 服务启动后初始化一次 -func MustInitGALoggerOnce() { - galogger, lerr = galog.NewServerGALogger(&galog.ServerGALogOptions{ - LogDir: "run/bi", - EnableAsync: true, - AsyncQueueSize: 1000, - ProjectID: ProjectId, - ClientID: ClientId, - LogType: galog.LogTypeTrack, - }) - if lerr != nil { - log.Printf("MustInitGALoggerOnce err: %s\n", lerr.Error()) - panic("MustInitGALoggerOnce err") - } -} - -func LogToGANew(eventName, deviceId string, userId int64, prop map[string]interface{}, version string) { - lib := map[string]string{ - "lib_type": "golang", - "lib_version": version, - } - - galogger. - GetEntry(eventName). - SetDeviceID(deviceId). - SetUserID(strconv.FormatInt(userId, 10)). - SetLib(lib). - SetProperties(prop). - Flush() -} -``` - -## 日志目录结构 - -``` -{logDir}/ga_log/{日志类型}_{hostname}_{年月日}_{小时}.log -{logDir}/asset_log/{日志类型}_{hostname}_{年月日}_{小时}.log -``` - -## Benchmark - -- 测试机：Mac-M1 8c 16G - -- 同步写入模式 -``` -goos: darwin -goarch: arm64 -pkg: tygit.tuyoo.com/gocomponents/galog -BenchmarkGaLog-8 87565 12831 ns/op 7590 B/op 90 allocs/op -BenchmarkAssetLog-8 234127 5832 ns/op 3028 B/op 44 allocs/op -PASS -ok tygit.tuyoo.com/gocomponents/galog 3.190s - -# 100w行日志文件，写入性能未见明显衰减 -BenchmarkGaLog-8 89175 12481 ns/op 7590 B/op 90 allocs/op -BenchmarkAssetLog-8 195075 5933 ns/op 3028 B/op 44 allocs/op -``` - -- 异步写入模式（默认） -``` -goos: darwin -goarch: arm64 -pkg: tygit.tuyoo.com/gocomponents/galog -BenchmarkGaLog-8 95530 11331 ns/op 7599 B/op 90 allocs/op -BenchmarkAssetLog-8 337963 3512 ns/op 3032 B/op 44 allocs/op -PASS -ok tygit.tuyoo.com/gocomponents/galog 3.040s - -# 120w行日志文件，写入性能未见明显衰减 -BenchmarkGaLog-8 116559 10450 ns/op 7598 B/op 90 allocs/op -BenchmarkAssetLog-8 335670 3512 ns/op 3032 B/op 44 allocs/op -``` - -## Load Testing - -CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o galog examples/hey.go - -- 测试机：sa101-ecs-bj4-pt57-test-wxy -- linux服务器配置：2c4G -- 测试时间：2024-02-26 17:45 ~ 18:45 - -``` -./galog -n 1000000 -c 2 -q 100 -``` - -| 压测说明 | CPU平台使用率 | 内存使用率 | IO平均使用率 | 进程打开的文件句柄数 | -|----- | ----- | ----- | ----- | ----- | -| 无任务 | 1% | 52% | 0.08% | 0 | -| 并发=2，qps=200 | 1% | 52% | 0.08% | 7 | -| 并发=5，qps=5000 | 4% | 52% | 1% | 7 | -| 并发=5，qps=50000(队列1000，有阻塞) realqps=5000 | 40% | 52% | 30% | 7 | -| 并发=5，qps=50000(队列10000，有阻塞) realqps=6500 | 6% | 52% | 1% | 7 | -| 并发=20，qps=50000(队列10000，有阻塞) realqps=18000 | 10% | 52% | 3% | 7 | -| 并发=50，qps=50000(队列10000) realqps=50000 | 35% | 52% | 10% | 7 | -| 并发=100，qps=100000(队列10000) realqps=90000 | 75% | 52% | 16% | 7 | - -- 压测结果：写入队列=10000，单核支持最高写入QPS约5w，CPU=75%。 - -- 监控结果如下： -![img2.png](img/WX20240226-183250@2x.png) -![img2.png](img/WX20240226-184752@2x.png) - -## ga日志格式范式 - -```json -{ - "project_id": "20437", - "type": "track", - "event": "sdk_sword_holder_succ", - "event_time": 1708568434744, - "device_id": "", - "user_id": "908825698", - "client_id": "Android_5.1_tyGuest,weixinPay,tyAccount.alipay.0-hall20437.tuyoo.sdkonline", - "properties": { - "sdk_track_id": "3:6060:636978360:1708568434", - "sdk_sub_channel": "fish3d", - "country": "中国", - "proj_game_id": "", - "sdk_error_code": "", - "sdk_error_msg": "", - "city": "宁德市", - "sdk_sword_track_id": "807370ff-ceac-4ee3-b68f-50642ca4953c", - "sub_platform_id": "2", - "sdk_sword_holder_id": "320", - "sdk_sword_version": "v1.1.7", - "uuid": "56fdf0f9-9daa-4bf6-be69-88e15f05c36c", - "province": "福建省", - "sdk_login_channel_type": "", - "app_id": "20437", - "sdk_s_login_channel_type": "", - "sdk_main_channel": "official", - "game_id": "20437", - "sdk_s_route": "/api/sworder-server/rule/v1/getUserRisk", - "sdk_sword_holder_result": "999999", - "proj_cloud_id": "3", - "proj_app_id": "10010", - "ip_address": "59.58.58.18", - "sdk_sword_holder_type": "login", - "sdk_sword_holder_name": "非信任设备禁止登录", - "proj_client_id": "Android_5.505_tyGuest,tyAccount,yidunlogin.weixinPay,alipay,yinlian,jingdong,weixinShare.0-hall28.official.fish3d", - "sdk_sword_holder_process": "{\"330\":[\"[330-0]未命中\"]}", - "sdk_yidun_device_id": "UuCJztYTtxRETUVUAEaFoCQaw8H2qkWE", - "platform_id": "1", - "sub_channel_id": "sdkonline", - "proj_package_name": "", - "channel_id": "tuyoo" - }, - "lib": { - "lib_version": "v1.0.0", - "lib_type": "go" - }, -} -``` - -## asset日志格式范例 - -```json -{ - "project_id": "28", - "type": "asset", - "event": "asset_increase", - "event_time": 1706631881042, - "device_id": "", - "user_id": "928426614", - "client_id": "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz", - "properties": { - "proj_ga_eventId": "STARTUP_QUEST_REWARD_COIN", - "proj_asset_value": "2", - "proj_asset_final": "2", - "proj_chip_type": "6", - "proj_asset_id": "13101", - "proj_asset_name": "\u9501\u5b9a", - "proj_asset_type": "free", - "proj_asset_time_limit": "0", - "proj_asset_start_time": "0", - "proj_asset_source": "", - "proj_tuyoo_order_id": "", - "game_id": "28", - "app_id": "10063", - "proj_project_id": "28", - "proj_client_id": "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz", - "uuid": "77b907688c624076a84ca7b4b29668a5" - }, - "lib": { - "lib_version": "v1.0.0", - "lib_type": "go" - } -} -``` - -## Changelog - -| 版本 | 修订说明 | 提交人 | 发布时间 | -|----- | ----- | ----- | ----- | -| v1.0.0 | galog 0依赖、支持异步写入、小时切割日志、ga和asset日志类型 | 田文 | 2024.02.22 | -| v1.1.0 | add suger | 田文 | 2025.06.30 | \ No newline at end of file diff --git a/src/server/galog/buffer.go b/src/server/galog/buffer.go deleted file mode 100644 index 51b0e15d..00000000 --- a/src/server/galog/buffer.go +++ /dev/null @@ -1,78 +0,0 @@ -package galog - -import ( - "sync" -) - -var ( - defaultBufPool = newBufPool() -) - -const ( - _size = 1024 - _defaultLineEnding = "\n" -) - -type BufPool struct { - p *sync.Pool -} - -func newBufPool() BufPool { - return BufPool{p: &sync.Pool{ - New: func() interface{} { - return &Buffer{bs: make([]byte, 0, _size)} - }, - }} -} - -// Get retrieves a Buffer from the pool, creating one if necessary. -func (p BufPool) Get() *Buffer { - buf := p.p.Get().(*Buffer) - buf.Reset() - buf.pool = p - return buf -} - -func (p BufPool) put(buf *Buffer) { - p.p.Put(buf) -} - -// Buffer is a thin wrapper around a byte slice. It's intended to be pooled, so -// the only way to construct one is via a Pool. -type Buffer struct { - bs []byte - pool BufPool -} - -// AppendByte writes a single byte to the Buffer. -func (b *Buffer) AppendByte(v byte) { - b.bs = append(b.bs, v) -} - -// AppendString writes a string to the Buffer. -func (b *Buffer) AppendString(s string) { - b.bs = append(b.bs, s...) -} - -// Bytes returns a mutable reference to the underlying byte slice. -func (b *Buffer) Bytes() []byte { - return b.bs -} - -// String returns a string copy of the underlying byte slice. -func (b *Buffer) String() string { - return string(b.bs) -} - -// Reset resets the underlying byte slice. Subsequent writes re-use the slice's -// backing array. -func (b *Buffer) Reset() { - b.bs = b.bs[:0] -} - -// Free returns the Buffer to its Pool. -// -// Callers must not retain references to the Buffer after calling Free. -func (b *Buffer) Free() { - b.pool.put(b) -} diff --git a/src/server/galog/entry.go b/src/server/galog/entry.go deleted file mode 100644 index f0a43587..00000000 --- a/src/server/galog/entry.go +++ /dev/null @@ -1,139 +0,0 @@ -package galog - -var ( - defaultLib = map[string]string{"lib_type": "go", "lib_version": "v1.0.0"} -) - -type EntryBean struct { - // ProjectID 独立项目ID - ProjectID string `json:"project_id"` - // LogType 日志类型 默认是track - LogType LogType `json:"type"` - // Event 事件ID - Event string `json:"event"` - // EventTime 毫秒级时间 - EventTime int64 `json:"event_time"` - // DeviceID 设备ID - DeviceID string `json:"device_id"` - // UserID 用户ID - UserID string `json:"user_id"` - // ClientID clientID - ClientID string `json:"client_id"` - // Properties 重要额外字段 - Properties map[string]interface{} `json:"properties"` - // Lib 代码库 - Lib map[string]string `json:"lib"` -} - -type Entry struct { - logger *GALogger - bean *EntryBean -} - -func (e *Entry) SetUserID(uid string) *Entry { - if uid == "" { - uid = "0" - } - e.bean.UserID = uid - return e -} - -func (e *Entry) SetDeviceID(did string) *Entry { - e.bean.DeviceID = did - return e -} - -func (e *Entry) SetLib(lib map[string]string) *Entry { - e.bean.Lib = lib - return e -} - -func (e *Entry) SetClientID(cid string) *Entry { - e.bean.ClientID = cid - return e -} - -func (e *Entry) SetProperties(props map[string]interface{}) *Entry { - e.bean.Properties = props - return e -} - -// Flush 日志写入 -func (e *Entry) Flush() { - defer e.logger.putEntry(e) - e.logger.biz(e.bean) -} - -type AssetProperties map[string]interface{} - -// SetAssetID 资产id -func (ap AssetProperties) SetAssetID(assetID string) AssetProperties { - ap["proj_asset_id"] = assetID - return ap -} - -// SetAssetName 资产名称 -func (ap AssetProperties) SetAssetName(assetName string) AssetProperties { - ap["proj_asset_name"] = assetName - return ap -} - -// SetAssetType 资产付费类型 -func (ap AssetProperties) SetAssetType(assetType string) AssetProperties { - ap["proj_asset_type"] = assetType - return ap -} - -// SetAssetValue 资产变化数量 -func (ap AssetProperties) SetAssetValue(assetValue string) AssetProperties { - ap["proj_asset_value"] = assetValue - return ap -} - -// SetAssetFinal 资产变化后的剩余数量 -func (ap AssetProperties) SetAssetFinal(assetFinal string) AssetProperties { - ap["proj_asset_final"] = assetFinal - return ap -} - -// SetAssetTimeLimit 持续性资产持续时间 -func (ap AssetProperties) SetAssetTimeLimit(assetTimeLimit string) AssetProperties { - ap["proj_asset_time_limit"] = assetTimeLimit - return ap -} - -// SetAssetStartTime 持续性资产生效时间 -func (ap AssetProperties) SetAssetStartTime(assetStartTime string) AssetProperties { - ap["proj_asset_start_time"] = assetStartTime - return ap -} - -// SetAssetSource 变化的原因 -func (ap AssetProperties) SetAssetSource(assetSource string) AssetProperties { - ap["proj_asset_source"] = assetSource - return ap -} - -// SetAssetAssociated 变化关联资产 -func (ap AssetProperties) SetAssetAssociated(assetAssociated string) AssetProperties { - ap["proj_asset_associated"] = assetAssociated - return ap -} - -// SetTuyooOrderID SDK订单号 -func (ap AssetProperties) SetTuyooOrderID(tuyooOrderID string) AssetProperties { - ap["proj_tuyoo_order_id"] = tuyooOrderID - return ap -} - -// SetOrderID 游戏服订单号 -func (ap AssetProperties) SetOrderID(assetOrderID string) AssetProperties { - ap["proj_order_id"] = assetOrderID - return ap -} - -// SetKV 设置自定义字段必须通知到数据组，否则打点失败 -func (ap AssetProperties) SetKV(k, v string) AssetProperties { - ap[k] = v - return ap -} diff --git a/src/server/galog/examples/hey.go b/src/server/galog/examples/hey.go deleted file mode 100644 index 80c7ffe8..00000000 --- a/src/server/galog/examples/hey.go +++ /dev/null @@ -1,83 +0,0 @@ -package main - -import ( - "flag" - "fmt" - "os" - "os/signal" - "runtime" - - "tygit.tuyoo.com/gocomponents/galog/examples/worker" -) - -var ( - output = flag.String("o", "", "") - - c = flag.Int("c", 50, "") - n = flag.Int("n", 200, "") - q = flag.Float64("q", 0, "") - - cpus = flag.Int("cpus", runtime.GOMAXPROCS(-1), "") -) - -var usage = `Usage: hey [options...] - -Options: - -n Number of requests to run. Default is 200. - -c Number of workers to run concurrently. Total number of requests cannot - be smaller than the concurrency level. Default is 50. - -q Rate limit, in queries per second (QPS) per worker. Default is no rate limit. - -o Output type. If none provided, a summary is printed. - "csv" is the only supported alternative. Dumps the response - metrics in comma-separated values format. - - -cpus Number of used cpu cores. - (default for current machine is %d cores) -` - -func MainHey() { - flag.Usage = func() { - fmt.Fprintf(os.Stderr, usage, runtime.NumCPU()) - } - - flag.Parse() - - runtime.GOMAXPROCS(*cpus) - num := *n - conc := *c - q := *q - - if num <= 0 || conc <= 0 { - usageAndExit("-n and -c cannot be smaller than 1.") - } - - if num < conc { - usageAndExit("-n cannot be less than -c.") - } - - w := &worker.Work{ - N: num, - C: conc, - QPS: q, - Output: *output, - } - w.Init() - - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - go func() { - <-c - w.Stop() - }() - w.Run() -} - -func usageAndExit(msg string) { - if msg != "" { - fmt.Fprint(os.Stderr, msg) - fmt.Fprintf(os.Stderr, "\n\n") - } - flag.Usage() - fmt.Fprintf(os.Stderr, "\n") - os.Exit(1) -} diff --git a/src/server/galog/examples/main.go b/src/server/galog/examples/main.go deleted file mode 100644 index c8944256..00000000 --- a/src/server/galog/examples/main.go +++ /dev/null @@ -1,107 +0,0 @@ -package main - -import ( - "log" - "time" - - "tygit.tuyoo.com/gocomponents/galog" -) - -func main() { - log.Println("log ga asset server every 5 seconds.") - go logGA() - go logAsset() - logServer() -} - -func logGA() { - projectID := "20433" - clientID := "Android_5.0_tyGuest,weixinPay,tyAccount.alipay.0-hall20433.tuyoo.sdktest" - logger, err := galog.NewServerGALogger(&galog.ServerGALogOptions{ - ProjectID: projectID, - ClientID: clientID, - LogDir: "ga_log", - LogType: galog.LogTypeTrack, - EnableAsync: true, - AsyncQueueSize: 1000, - }) - if err != nil { - log.Fatal(err) - } - t := time.NewTicker(5 * time.Second) - - for tt := range t.C { - log.Println("logGA") - logger. - GetEntry("sdk_s_login_succ"). - SetDeviceID("device001"). - SetUserID("10086"). - SetProperties(map[string]interface{}{ - "ip_address": "127.0.0.1", - "proj_app_id": "10010", - "uuid": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts": tt.UnixNano(), - }). - Flush() - } -} - -func logAsset() { - projectID := "28" - clientID := "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz" - logger, err := galog.NewGALogger(".", projectID, clientID, galog.LogTypeAsset) - if err != nil { - log.Fatal(err) - } - t := time.NewTicker(5 * time.Second) - - asset := galog.AssetProperties{} - asset.SetAssetID("13101"). - SetAssetName("\u9501\u5b9a"). - SetAssetType("6"). - SetAssetFinal("2"). - SetAssetAssociated("3"). - SetAssetStartTime("0"). - SetAssetTimeLimit("0"). - SetAssetSource(""). - SetKV("uuid", "uuid-v4") - - for tt := range t.C { - log.Println("logAssert") - _ = tt - logger. - GetEntry("asset_increase"). - SetDeviceID(""). - SetUserID("10086"). - SetProperties(asset). - Flush() - } -} - -func logServer() { - slogger, _ := galog.NewServerLogger(&galog.ServerLogOptions{ - LogDir: "logs", - EnableAsync: true, - AsyncQueueSize: 1000, - }) - - t := time.NewTicker(5 * time.Second) - - for tt := range t.C { - log.Println("logServer") - _ = tt - - msgMap := map[string]interface{}{ - "CreateTime": time.Now().UnixNano() / int64(time.Microsecond), - "Host": "host", - "AppId": "10010", - "UserId": "12345", - "Level": "Notice", - "Entry": "Login", - "Func": "HandleLogin", - "TraceMsg": "HandlerWSFriApplyList|HandlerWSFriApplyList", - "Params": "{\"isoCode\":\"CN\",\"P0\":[3,\"Total: 3, End: 0, \"],\"pf\":\"wx\",\"appVer\":\"1.0\",\"sdkVer\":\"1.0\",\"ip\":\"58.247.195.158\",\"clientId\":\"7abd64bf-3fb6-4fef-a25e-e6562b7fb857\",\"timeZone\":\"Asia/Shanghai\",\"loginMark\":\"\",\"st\":1472}", - } - slogger.BizErr(msgMap) - } -} diff --git a/src/server/galog/examples/worker/print.go b/src/server/galog/examples/worker/print.go deleted file mode 100644 index 9e3f0bd7..00000000 --- a/src/server/galog/examples/worker/print.go +++ /dev/null @@ -1,43 +0,0 @@ -package worker - -import ( - "fmt" - "text/template" -) - -func newTemplate(output string) *template.Template { - outputTmpl := output - switch outputTmpl { - case "": - outputTmpl = defaultTmpl - case "csv": - outputTmpl = csvTmpl - } - return template.Must(template.New("tmpl").Funcs(tmplFuncMap).Parse(outputTmpl)) -} - -var tmplFuncMap = template.FuncMap{ - "formatNumber": formatNumber, - "formatNumberInt": formatNumberInt, -} - -func formatNumber(duration float64) string { - return fmt.Sprintf("%4.4f", duration) -} - -func formatNumberInt(duration int) string { - return fmt.Sprintf("%d", duration) -} - -var ( - defaultTmpl = ` -Summary: - Total: {{ formatNumber .Total.Seconds }} secs - Requests/sec: {{ formatNumber .Rps }} - - TotalNumRes: {{ .NumRes }} - AvgTotal: {{ .AvgTotal }} -` - csvTmpl = `{{ $connLats := .ConnLats }}{{ $dnsLats := .DnsLats }}{{ $dnsLats := .DnsLats }}{{ $reqLats := .ReqLats }}{{ $delayLats := .DelayLats }}{{ $resLats := .ResLats }}{{ $statusCodeLats := .StatusCodes }}{{ $offsets := .Offsets}}response-time,DNS+dialup,DNS,Request-write,Response-delay,Response-read,status-code,offset{{ range $i, $v := .Lats }} -{{ formatNumber $v }},{{ formatNumber (index $connLats $i) }},{{ formatNumber (index $dnsLats $i) }},{{ formatNumber (index $reqLats $i) }},{{ formatNumber (index $delayLats $i) }},{{ formatNumber (index $resLats $i) }},{{ formatNumberInt (index $statusCodeLats $i) }},{{ formatNumber (index $offsets $i) }}{{ end }}` -) diff --git a/src/server/galog/examples/worker/report.go b/src/server/galog/examples/worker/report.go deleted file mode 100644 index d644e2a9..00000000 --- a/src/server/galog/examples/worker/report.go +++ /dev/null @@ -1,94 +0,0 @@ -package worker - -import ( - "bytes" - "fmt" - "io" - "log" - "time" -) - -type report struct { - avgTotal float64 - rps float64 - - results chan *result - done chan bool - total time.Duration - - numRes int64 - output string - - w io.Writer -} - -func newReport(w io.Writer, results chan *result, output string, n int) *report { - return &report{ - output: output, - results: results, - done: make(chan bool, 1), - w: w, - } -} - -func runReporter(r *report) { - // Loop will continue until channel is closed - for res := range r.results { - r.numRes++ - r.avgTotal += res.duration.Seconds() - } - // Signal reporter is done. - r.done <- true -} - -func (r *report) finalize(total time.Duration) { - r.total = total - r.rps = float64(r.numRes) / r.total.Seconds() - r.print() -} - -func (r *report) print() { - buf := &bytes.Buffer{} - if err := newTemplate(r.output).Execute(buf, r.snapshot()); err != nil { - log.Println("error:", err.Error()) - return - } - r.printf(buf.String()) - - r.printf("\n") -} - -func (r *report) printf(s string, v ...interface{}) { - fmt.Fprintf(r.w, s, v...) -} - -func (r *report) snapshot() Report { - snapshot := Report{ - AvgTotal: r.avgTotal, - Rps: r.rps, - Total: r.total, - NumRes: r.numRes, - } - - return snapshot -} - -type Report struct { - AvgTotal float64 - Rps float64 - - Total time.Duration - - NumRes int64 -} - -type LatencyDistribution struct { - Percentage int - Latency float64 -} - -type Bucket struct { - Mark float64 - Count int - Frequency float64 -} diff --git a/src/server/galog/examples/worker/worker.go b/src/server/galog/examples/worker/worker.go deleted file mode 100644 index e5e4ef17..00000000 --- a/src/server/galog/examples/worker/worker.go +++ /dev/null @@ -1,176 +0,0 @@ -package worker - -import ( - "fmt" - "io" - "os" - "strconv" - "sync" - "time" - - "tygit.tuyoo.com/gocomponents/galog" -) - -var startTime = time.Now() - -// now returns time.Duration using stdlib time -func now() time.Duration { return time.Since(startTime) } - -// Max size of the buffer of result channel. -const maxResult = 1000000 - -type result struct { - offset time.Duration - duration time.Duration -} - -type Work struct { - // N is the total number of requests to make. - N int - - // C is the concurrency level, the number of concurrent workers to run. - C int - - // Qps is the rate limit in queries per second. - QPS float64 - - // Output represents the output type. If "csv" is provided, the - // output will be dumped as a csv stream. - Output string - - // Writer is where results will be written. If nil, results are written to stdout. - Writer io.Writer - - initOnce sync.Once - results chan *result - stopCh chan struct{} - start time.Duration - - report *report -} - -func (b *Work) writer() io.Writer { - if b.Writer == nil { - return os.Stdout - } - return b.Writer -} - -// Init initializes internal data-structures -func (b *Work) Init() { - b.initOnce.Do(func() { - b.results = make(chan *result, min(b.C*1000, maxResult)) - b.stopCh = make(chan struct{}, b.C) - b.initLogger() - }) -} - -// Run makes all the requests, prints the summary. It blocks until -// all work is done. -func (b *Work) Run() { - b.Init() - b.start = now() - b.report = newReport(b.writer(), b.results, b.Output, b.N) - // Run the reporter first, it polls the result channel until it is closed. - go func() { - runReporter(b.report) - }() - b.runWorkers() - b.Finish() -} - -func (b *Work) Stop() { - // Send stop signal so that workers can stop gracefully. - for i := 0; i < b.C; i++ { - b.stopCh <- struct{}{} - } -} - -func (b *Work) Finish() { - close(b.results) - total := now() - b.start - // Wait until the reporter is done. - <-b.report.done - b.report.finalize(total) -} - -var logger *galog.GALogger - -func (b *Work) initLogger() { - projectID := "28" - clientID := "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz" - logger, _ = galog.NewGALogger("logs", projectID, clientID, galog.LogTypeAsset) -} - -func (b *Work) doSth() { - s := now() - - // doSth here. - asset := galog.AssetProperties{} - asset.SetAssetID("13101"). - SetAssetName("\u9501\u5b9a"). - SetAssetType("6"). - SetAssetFinal("2"). - SetAssetAssociated("3"). - SetAssetStartTime("0"). - SetAssetTimeLimit("0"). - SetAssetSource(""). - SetKV("uuid", strconv.Itoa(int(time.Now().UnixNano()))) - logger. - GetEntry("asset_increase"). - SetDeviceID(""). - SetUserID("10086"). - SetProperties(asset). - Flush() - - t := now() - finish := t - s - b.results <- &result{ - offset: s, - duration: finish, - } -} - -func (b *Work) runWorker(n int) { - var throttle <-chan time.Time - if b.QPS > 0 { - t := time.NewTicker(time.Duration(1e6/(b.QPS)) * time.Microsecond) - throttle = t.C - } - - for i := 0; i < n; i++ { - // Check if application is stopped. Do not send into a closed channel. - select { - case <-b.stopCh: - return - default: - if b.QPS > 0 { - <-throttle - } - b.doSth() - } - } -} - -func (b *Work) runWorkers() { - var wg sync.WaitGroup - wg.Add(b.C) - - fmt.Printf("==RUN worker==> N:%d C:%d QPS:%v b.N / b.C:%v", b.N, b.C, b.QPS, b.N/b.C) - - // Ignore the case where b.N % b.C != 0. - for i := 0; i < b.C; i++ { - go func() { - b.runWorker(b.N / b.C) - wg.Done() - }() - } - wg.Wait() -} - -func min(a, b int) int { - if a < b { - return a - } - return b -} diff --git a/src/server/galog/file.go b/src/server/galog/file.go deleted file mode 100644 index 372b2aff..00000000 --- a/src/server/galog/file.go +++ /dev/null @@ -1,264 +0,0 @@ -package galog - -import ( - "encoding/json" - "errors" - "fmt" - "os" - "path" - "path/filepath" - "strconv" - "strings" - "sync" - "time" -) - -type fileLogWriter struct { - sync.RWMutex - - Rotate bool `json:"rotate"` - Hourly bool `json:"hourly"` - - // The opened file - Filename string `json:"filename"` - fileWriter *os.File - - // Rotate hourly - MaxHours int64 `json:"maxhours"` // 默认不删除日志 - hourlyOpenDate int - hourlyOpenTime time.Time - - // Permissions for log file - Perm string `json:"perm"` - // Permissions for directory if it is specified in FileName - DirPerm string `json:"dirperm"` - - RotatePerm string `json:"rotateperm"` - - fileNameOnly, suffix string // like "project.log", project is fileNameOnly and .log is suffix -} - -func newFileWriter() LogProvider { - w := &fileLogWriter{ - Rotate: true, // 开启日志轮转 - Hourly: true, // 开启日志小时轮转 - RotatePerm: "0440", - Perm: "0660", - DirPerm: "0770", - } - return w -} - -// Init file logger with json config. -// jsonConfig like: -// -// {"filename":"logs/glog.log"} -func (w *fileLogWriter) Init(config string) error { - err := json.Unmarshal([]byte(config), w) - if err != nil { - return err - } - if w.Filename == "" { - return errors.New("jsonconfig must have filename") - } - w.suffix = filepath.Ext(w.Filename) - w.fileNameOnly = strings.TrimSuffix(w.Filename, w.suffix) - if w.suffix == "" { - w.suffix = ".log" - } - - err = w.startLogger() - return err -} - -func (w *fileLogWriter) startLogger() error { - file, err := w.createLogFile() - if err != nil { - return err - } - if w.fileWriter != nil { - w.fileWriter.Close() - } - w.fileWriter = file - return w.initFd() -} - -func (w *fileLogWriter) needRotateHourly(hour int) bool { - return w.Hourly && hour != w.hourlyOpenDate -} - -func (w *fileLogWriter) createLogFile() (*os.File, error) { - perm, err := strconv.ParseInt(w.Perm, 8, 64) - if err != nil { - return nil, err - } - - dirperm, err := strconv.ParseInt(w.DirPerm, 8, 64) - if err != nil { - return nil, err - } - - filepath := path.Dir(w.Filename) - os.MkdirAll(filepath, os.FileMode(dirperm)) - - fd, err := os.OpenFile(w.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.FileMode(perm)) - if err == nil { - os.Chmod(w.Filename, os.FileMode(perm)) - } - return fd, err -} - -func (w *fileLogWriter) initFd() error { - w.hourlyOpenTime = time.Now() - w.hourlyOpenDate = w.hourlyOpenTime.Hour() - if w.Hourly { - go w.hourlyRotate(w.hourlyOpenTime) - } - return nil -} - -func (w *fileLogWriter) hourlyRotate(openTime time.Time) { - y, m, d := openTime.Add(1 * time.Hour).Date() - h := openTime.Add(1 * time.Hour).Hour() - nextHour := time.Date(y, m, d, h, 0, 0, 0, openTime.Location()) - tm := time.NewTimer(time.Duration(nextHour.UnixNano() - openTime.UnixNano() + 100)) - <-tm.C - w.Lock() - if w.needRotateHourly(time.Now().Hour()) { - if err := w.doRotate(); err != nil { - fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) - } - } - w.Unlock() -} - -func (w *fileLogWriter) doRotate() error { - fName := "" - format := "" - var openTime time.Time - rotatePerm, err := strconv.ParseInt(w.RotatePerm, 8, 64) - if err != nil { - return err - } - - _, err = os.Lstat(w.Filename) - if err != nil { - goto RESTART_LOGGER - } - - if w.Hourly { - format = "20060102_15" - openTime = w.hourlyOpenTime - } - - fName = w.fileNameOnly + fmt.Sprintf("_%s%s", openTime.Format(format), w.suffix) - _, err = os.Lstat(fName) - - // return error if the last file checked still existed - if err == nil { - //return fmt.Errorf("rotate: cannot find free log number to rename %s", w.Filename) - } - - w.fileWriter.Close() - - // Rename the file to its new found name - // even if occurs error,we MUST guarantee to restart new logger - err = os.Rename(w.Filename, fName) - if err != nil { - goto RESTART_LOGGER - } - - err = os.Chmod(fName, os.FileMode(rotatePerm)) - -RESTART_LOGGER: - - startLoggerErr := w.startLogger() - if w.MaxHours > 0 { - go w.deleteOldLog() - } - - if startLoggerErr != nil { - return fmt.Errorf("rotate startLogger: %s", startLoggerErr) - } - if err != nil { - return fmt.Errorf("rotate: %s", err) - } - return nil -} - -func (w *fileLogWriter) deleteOldLog() { - dir := filepath.Dir(w.Filename) - absolutePath, err := filepath.EvalSymlinks(w.Filename) - if err == nil { - dir = filepath.Dir(absolutePath) - } - filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) { - defer func() { - if r := recover(); r != nil { - fmt.Fprintf(os.Stderr, "Unable to delete old log '%s', error: %v\n", path, r) - } - }() - - if info == nil { - return - } - if w.Hourly { - if !info.IsDir() && info.ModTime().Add(1*time.Hour*time.Duration(w.MaxHours)).Before(time.Now()) { - if strings.HasPrefix(filepath.Base(path), filepath.Base(w.fileNameOnly)) && - strings.HasSuffix(filepath.Base(path), w.suffix) { - os.Remove(path) - } - } - } - return - }) -} - -// EncodeMsg encode log msg -func (*fileLogWriter) EncodeMsg(lm *LogMsg) []byte { - buf := defaultBufPool.Get() - buf.AppendString(lm.Msg) - buf.AppendString(_defaultLineEnding) - msg := buf.Bytes() - buf.Free() - return msg -} - -// WriteMsg write msg to log and rotate -func (w *fileLogWriter) WriteMsg(lm *LogMsg) error { - h := lm.When.Hour() - - if w.Rotate { - w.RLock() - if w.needRotateHourly(h) { - w.RUnlock() - w.Lock() - if w.needRotateHourly(h) { - if err := w.doRotate(); err != nil { - fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) - } - } - w.Unlock() - } else { - w.RUnlock() - } - } - - msg := w.EncodeMsg(lm) - _, err := w.fileWriter.Write(msg) - return err -} - -// Destroy close the file description, close file writer. -func (w *fileLogWriter) Destroy() { - w.fileWriter.Close() -} - -// Flush flushes file logger. -func (w *fileLogWriter) Flush() { - w.fileWriter.Sync() -} - -func init() { - Register(AdapterFile, newFileWriter) -} diff --git a/src/server/galog/galog.go b/src/server/galog/galog.go deleted file mode 100644 index da1241c0..00000000 --- a/src/server/galog/galog.go +++ /dev/null @@ -1,99 +0,0 @@ -package galog - -import ( - "fmt" - "os" - "strings" - "sync" - "time" -) - -type GALogger struct { - logger *Logger - projectID string - clientID string - logType LogType - entryPool sync.Pool -} - -type LogType string - -const ( - // LogTypeTrack 事实日志 - LogTypeTrack LogType = "track" - // LogTypeAsset 资产日志 - LogTypeAsset LogType = "asset" -) - -const ( - // enableAsync 启用异步写入模式 - enableAsync = true - // defaultAsyncMsgLen 异步写入模式的队列长度，QPS较大时可调整此值 - defaultAsyncMsgLen int64 = 100 -) - -// NewGALogger -// -// logDir: 日志根目录 logs | /home/tywork -// projectID: projectID -// clientID: clientID -// logType: galog.LogTypeTrack | galog.LogTypeAsset -func NewGALogger(logDir, projectID, clientID string, logType LogType) (*GALogger, error) { - l := newLogger() - hostname, _ := os.Hostname() - filepath := fmt.Sprintf("ga_log/ga_%s.log", hostname) - if logType == LogTypeAsset { - filepath = fmt.Sprintf("asset_log/%s_%s.log", logType, hostname) - } - configs := fmt.Sprintf(`{"filename":"%s/%s"}`, strings.TrimRight(logDir, "/"), filepath) - err := l.setLogger(AdapterFile, configs) - if err != nil { - return nil, err - } - if enableAsync { - l.Async() - } - gaLogger := &GALogger{ - logger: l, - projectID: projectID, - clientID: clientID, - logType: logType, - } - - return gaLogger, nil -} - -// GetEntry -func (gl *GALogger) GetEntry(event string) *Entry { - e, ok := gl.entryPool.Get().(*Entry) - if ok { - e.logger = gl - e.bean.ProjectID = gl.projectID - e.bean.LogType = gl.logType - e.bean.ClientID = gl.clientID - e.bean.Event = event - e.bean.EventTime = time.Now().UnixMilli() - e.bean.Lib = defaultLib - return e - } - return &Entry{ - logger: gl, - bean: &EntryBean{ - ProjectID: gl.projectID, - LogType: gl.logType, - ClientID: gl.clientID, - Event: event, - EventTime: time.Now().UnixMilli(), - Lib: defaultLib, - }, - } -} - -func (gl *GALogger) biz(v interface{}) { - gl.logger.BizErr(v) -} - -func (gl *GALogger) putEntry(entry *Entry) { - entry.bean = &EntryBean{} - gl.entryPool.Put(entry) -} diff --git a/src/server/galog/galog_test.go b/src/server/galog/galog_test.go deleted file mode 100644 index 805cc5c4..00000000 --- a/src/server/galog/galog_test.go +++ /dev/null @@ -1,85 +0,0 @@ -package galog - -import ( - "testing" - "time" -) - -var ( - gaLogger *GALogger - assetLogger *GALogger -) - -// go test -bench . -benchmem -func init() { - gaLogger, _ = NewGALogger("logs", "20433", "Android_5.0_tyGuest,weixinPay,tyAccount.alipay.0-hall20433.tuyoo.sdktest", LogTypeTrack) - assetLogger, _ = NewGALogger("logs", "28", "Android_4.827_tyGuest,nearme.nearme.0-hall28.oppo.bydzz", LogTypeAsset) -} - -func BenchmarkGaLog(b *testing.B) { - for i := 0; i < b.N; i++ { - props := map[string]interface{}{ - "ip_address": "127.0.0.1", - "proj_app_id": "10010", - "uuid": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts": time.Now().UnixNano(), - "ip_address1": "127.0.0.1", - "proj_app_id1": "10010", - "uuid1": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts1": time.Now().UnixNano(), - "ip_address2": "127.0.0.1", - "proj_app_id2": "10010", - "uuid2": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts2": time.Now().UnixNano(), - "ip_address3": "127.0.0.1", - "proj_app_id3": "10010", - "uuid3": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts4": time.Now().UnixNano(), - "proj_app_id25": "10010", - "uuid21": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts21": time.Now().UnixNano(), - "ip_address31": "127.0.0.1", - "proj_app_id31": "10010", - "uuid31": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts11": time.Now().UnixNano(), - "uuid3111": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts4111": time.Now().UnixNano(), - "proj_app_id21115": "10010", - "uuid111": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts111": time.Now().UnixNano(), - "ip_a11ddress31": "127.0.0.1", - "proj1_app_id31": "10010", - "uuid131": "4951d472-2c46-4fe5-9c4f-c35b6fb53f67", - "ts1111": time.Now().UnixNano(), - } - gaLogger. - GetEntry("sdk_s_login_succ"). - SetDeviceID("device001"). - SetUserID("10086"). - SetProperties(props). - Flush() - } -} - -func BenchmarkAssetLog(b *testing.B) { - for i := 0; i < b.N; i++ { - asset := make(AssetProperties) - asset. - SetAssetID("13101"). - SetAssetName("\u9501\u5b9a"). - SetAssetType("6"). - SetAssetFinal("2"). - SetAssetAssociated("3"). - SetAssetStartTime("0"). - SetAssetTimeLimit("0"). - SetAssetSource(""). - SetKV("uuid", "uuid-v4") - - assetLogger. - GetEntry("asset_increase"). - SetDeviceID(""). - SetUserID("10086"). - SetProperties(asset). - Flush() - } -} diff --git a/src/server/galog/go.mod b/src/server/galog/go.mod deleted file mode 100644 index f044e2b2..00000000 --- a/src/server/galog/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module tygit.tuyoo.com/gocomponents/galog - -go 1.20 diff --git a/src/server/galog/img/WX20240226-183250@2x.png b/src/server/galog/img/WX20240226-183250@2x.png deleted file mode 100644 index 8bab3f3c..00000000 Binary files a/src/server/galog/img/WX20240226-183250@2x.png and /dev/null differ diff --git a/src/server/galog/img/WX20240226-184752@2x.png b/src/server/galog/img/WX20240226-184752@2x.png deleted file mode 100644 index 318933f6..00000000 Binary files a/src/server/galog/img/WX20240226-184752@2x.png and /dev/null differ diff --git a/src/server/galog/log.go b/src/server/galog/log.go deleted file mode 100644 index 4294bfb7..00000000 --- a/src/server/galog/log.go +++ /dev/null @@ -1,261 +0,0 @@ -package galog - -import ( - "encoding/json" - "fmt" - "os" - "sync" - "time" - "unsafe" -) - -const ( - AdapterFile = "file" -) - -type LogMsg struct { - Msg string - When time.Time -} - -// Logger defines the behavior of a log provider. -type LogProvider interface { - Init(config string) error - WriteMsg(lm *LogMsg) error - Destroy() - Flush() -} - -type newLogProviderFunc func() LogProvider - -var ( - adapters = make(map[string]newLogProviderFunc) -) - -// Register register a new log provider. -func Register(name string, log newLogProviderFunc) { - if log == nil { - panic("logs: Register provide is nil") - } - if _, dup := adapters[name]; dup { - panic("logs: Register called twice for provider " + name) - } - adapters[name] = log -} - -type Logger struct { - lock sync.Mutex - asynchronous bool - wg sync.WaitGroup - msgChanLen int64 - msgChan chan *LogMsg - closeChan chan struct{} - flushChan chan struct{} - outputs []*nameLogger -} - -type nameLogger struct { - LogProvider - name string -} - -var logMsgPool *sync.Pool - -// newLogger return a new Logger. -func newLogger(channelLens ...int64) *Logger { - gl := new(Logger) - gl.msgChanLen = append(channelLens, 0)[0] - if gl.msgChanLen <= 0 { - gl.msgChanLen = defaultAsyncMsgLen - } - gl.flushChan = make(chan struct{}, 1) - gl.closeChan = make(chan struct{}, 1) - return gl -} - -// Async sets the log to asynchronous and start the goroutine -func (gl *Logger) Async(msgLen ...int64) *Logger { - gl.lock.Lock() - defer gl.lock.Unlock() - if gl.asynchronous { - return gl - } - gl.asynchronous = true - if len(msgLen) > 0 && msgLen[0] > 0 { - gl.msgChanLen = msgLen[0] - } - gl.msgChan = make(chan *LogMsg, gl.msgChanLen) - logMsgPool = &sync.Pool{ - New: func() interface{} { - return &LogMsg{} - }, - } - gl.wg.Add(1) - go gl.startLogger() - return gl -} - -// SetLogger provides a given logger adapter into Logger with config string. -// config must in in JSON format like {"interval":360}} -func (gl *Logger) setLogger(adapterName string, configs ...string) error { - config := append(configs, "{}")[0] - - logAdapter, ok := adapters[adapterName] - if !ok { - return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adapterName) - } - - lg := logAdapter() - - err := lg.Init(config) - if err != nil { - return err - } - - gl.outputs = append(gl.outputs, &nameLogger{name: adapterName, LogProvider: lg}) - return nil -} - -func (gl *Logger) writeToLoggers(lm *LogMsg) { - for _, l := range gl.outputs { - err := l.WriteMsg(lm) - if err != nil { - fmt.Fprintf(os.Stderr, "unable to WriteMsg to adapter:%v,error:%v\n", l.name, err) - } - } -} - -// Write implements io.Writer. -func (gl *Logger) Write(p []byte) (n int, err error) { - if len(p) == 0 { - return 0, nil - } - // writeMsg will always add a '\n' character - if p[len(p)-1] == '\n' { - p = p[0 : len(p)-1] - } - lm := &LogMsg{ - Msg: string(p), - When: time.Now(), - } - - // set levelLoggerImpl to ensure all log message will be write out - err = gl.writeMsg(lm) - if err == nil { - return len(p), nil - } - return 0, err -} - -func (gl *Logger) writeMsg(lm *LogMsg) error { - if gl.asynchronous { - logM := logMsgPool.Get().(*LogMsg) - logM.Msg = lm.Msg - logM.When = lm.When - - if gl.outputs != nil { - gl.msgChan <- lm - } else { - logMsgPool.Put(lm) - } - } else { - gl.writeToLoggers(lm) - } - return nil -} - -func (gl *Logger) startLogger() { - gameOver := false - for { - select { - case bm, ok := <-gl.msgChan: - if ok { - gl.writeToLoggers(bm) - logMsgPool.Put(bm) - } - case <-gl.closeChan: - gl.flush() - for _, l := range gl.outputs { - l.Destroy() - } - gl.outputs = nil - gameOver = true - gl.wg.Done() - case <-gl.flushChan: - gl.flush() - gl.wg.Done() - } - if gameOver { - break - } - } -} - -// Info Log INFO level message. -func (gl *Logger) Info(format string) { - lm := &LogMsg{ - Msg: format, - When: time.Now(), - } - - gl.writeMsg(lm) -} - -// BizErr Log a json-interface -func (gl *Logger) BizErr(v interface{}) error { - buf, err := json.Marshal(v) - if err != nil { - return err - } - str := *(*string)(unsafe.Pointer(&buf)) - gl.Info(str) - return nil -} - -// Flush flush all chan data. -func (gl *Logger) Flush() { - if gl.asynchronous { - gl.flushChan <- struct{}{} - gl.wg.Wait() - gl.wg.Add(1) - return - } - gl.flush() -} - -// Close close logger, flush all chan data and destroy all adapters in Logger. -func (gl *Logger) Close() { - if gl.asynchronous { - gl.closeChan <- struct{}{} - gl.wg.Wait() - close(gl.msgChan) - } else { - gl.flush() - for _, l := range gl.outputs { - l.Destroy() - } - gl.outputs = nil - } - close(gl.flushChan) - close(gl.closeChan) -} - -func (gl *Logger) flush() { - if gl.asynchronous { - for { - if len(gl.msgChan) > 0 { - bm, ok := <-gl.msgChan - if !ok { - continue - } - gl.writeToLoggers(bm) - logMsgPool.Put(bm) - continue - } - break - } - } - for _, l := range gl.outputs { - l.Flush() - } -} diff --git a/src/server/galog/suger.go b/src/server/galog/suger.go deleted file mode 100644 index 6d4a0bc7..00000000 --- a/src/server/galog/suger.go +++ /dev/null @@ -1,122 +0,0 @@ -package galog - -import ( - "errors" - "fmt" - "os" - "strings" -) - -type ServerLogOptions struct { - // LogDir 日志目录，默认logs - LogDir string - - // EnableAsync 是否开启异步写日志，默认开启 - EnableAsync bool - - // AsyncQueueSize 异步队列大小，默认1000 - AsyncQueueSize int64 -} - -// NewServerLogger 业务日志实例，support JSON -// -// opts.LogDir 日志目录，推荐logs -// opts.EnableAsync 是否开启异步写日志，默认开启 -// opts.AsyncQueueSize 异步队列大小，默认1000 -// useage: logger.BizErr(map[string]interface{}{"type": "test"}) -func NewServerLogger(opts *ServerLogOptions) (*Logger, error) { - if opts == nil { - opts = &ServerLogOptions{ - LogDir: "logs", - EnableAsync: true, - AsyncQueueSize: 1000, - } - } - if opts.LogDir == "" { - opts.LogDir = "logs" - } - if opts.EnableAsync && opts.AsyncQueueSize == 0 { - opts.AsyncQueueSize = 1000 - } - - l := newLogger() - hostname, _ := os.Hostname() - filename := fmt.Sprintf("server_%s.log", hostname) - configs := fmt.Sprintf(`{"filename":"%s/%s"}`, strings.TrimRight(opts.LogDir, "/"), filename) - err := l.setLogger(AdapterFile, configs) - if err != nil { - return nil, err - } - if opts.EnableAsync && opts.AsyncQueueSize > 0 { - l.Async(opts.AsyncQueueSize) - } - return l, nil -} - -type ServerGALogOptions struct { - // LogDir 日志目录，默认galogs - LogDir string - - // EnableAsync 是否开启异步写日志，默认开启 - EnableAsync bool - - // AsyncQueueSize 异步队列大小，默认1000 - AsyncQueueSize int64 - - // GA侧分配ProjectID - ProjectID string - - // GA侧分配ClientID - ClientID string - - LogType LogType -} - -// NewServerGALogger GA日志实例，support JSON -// -// opts.ProjectID 项目ID，GA侧分配，必填 -// opts.ClientID 客户端ID，GA侧分配，必填 -// opts.LogType 日志类型，默认LogTypeTrack -// opts.LogDir 日志目录，默认galogs -// opts.EnableAsync 是否开启异步写日志，默认开启 -// opts.AsyncQueueSize 异步队列大小，默认1000 -func NewServerGALogger(opts *ServerGALogOptions) (*GALogger, error) { - if opts == nil { - return nil, errors.New("opts must not be empty") - } - if opts.EnableAsync && opts.AsyncQueueSize == 0 { - opts.AsyncQueueSize = 1000 - } - if opts.LogDir == "" { - opts.LogDir = "galogs" - } - if opts.LogType == "" { - opts.LogType = LogTypeTrack - } - if opts.ProjectID == "" || opts.ClientID == "" { - return nil, errors.New("projectID or clientID must not be empty") - } - - l := newLogger() - hostname, _ := os.Hostname() - filename := fmt.Sprintf("ga_%s.log", hostname) - if opts.LogType == LogTypeAsset { - filename = fmt.Sprintf("asset_%s.log", hostname) - } - configs := fmt.Sprintf(`{"filename":"%s/%s"}`, strings.TrimRight(opts.LogDir, "/"), filename) - err := l.setLogger(AdapterFile, configs) - if err != nil { - return nil, err - } - if opts.EnableAsync && opts.AsyncQueueSize > 0 { - l.Async(opts.AsyncQueueSize) - } - gaLogger := &GALogger{ - logger: l, - projectID: opts.ProjectID, - clientID: opts.ClientID, - logType: opts.LogType, - } - - return gaLogger, nil -} diff --git a/src/server/galog/suger_test.go b/src/server/galog/suger_test.go deleted file mode 100644 index 7ee2ebb8..00000000 --- a/src/server/galog/suger_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package galog - -import ( - "testing" - "time" -) - -var slogger *Logger - -// go test -bench . -benchmem -func init() { - slogger, _ = NewServerLogger(&ServerLogOptions{ - LogDir: "logs", - EnableAsync: true, - }) -} - -// BenchmarkServerLog-8 436682 3103 ns/op 1838 B/op 24 allocs/op -func BenchmarkServerLog(b *testing.B) { - for i := 0; i < b.N; i++ { - msgMap := map[string]interface{}{ - "CreateTime": time.Now().UnixNano() / int64(time.Microsecond), - "Host": "host", - "AppId": "10010", - "UserId": "12345", - "Level": "Notice", - "Entry": "Login", - "Func": "HandleLogin", - "TraceMsg": "HandlerWSFriApplyList|HandlerWSFriApplyList", - "Params": "{\"isoCode\":\"CN\",\"P0\":[3,\"Total: 3, End: 0, \"],\"pf\":\"wx\",\"appVer\":\"1.0\",\"sdkVer\":\"1.0\",\"ip\":\"58.247.195.158\",\"clientId\":\"7abd64bf-3fb6-4fef-a25e-e6562b7fb857\",\"timeZone\":\"Asia/Shanghai\",\"loginMark\":\"\",\"st\":1472}", - } - slogger.BizErr(msgMap) - } -} diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go index a5565f3c..e07ef628 100644 --- a/src/server/game/GameLogic.go +++ b/src/server/game/GameLogic.go @@ -6,6 +6,7 @@ import ( "encoding/json" "fmt" "os" + "reflect" "server/MergeConst" "server/conf" userCfg "server/conf/user" @@ -25,9 +26,10 @@ import ( "google.golang.org/protobuf/proto" - "server/pkg/github.com/name5566/leaf/gate" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/timer" + "gitea.bywaystudios.com/pet_home/leaf/gate" + "gitea.bywaystudios.com/pet_home/leaf/timer" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) var ( @@ -36,6 +38,7 @@ var ( var isInitGameLogic = false var RegisterNetWorkFunc = make(map[string]interface{}) +var NewRegisterNetWorkFunc = make(map[string]func(*Player, *proto.Message) error) const ( SERVER_STATUS_OPEN = 1 // 服务器状态 开放 @@ -48,6 +51,82 @@ func RegisterMsgProcessFunc(key string, value1 interface{}) { RegisterNetWorkFunc[key] = value1 } +func RegisterNewMsgProcessFunc(key string, value interface{}) { + handler, err := buildNewMsgHandlerAdapter(value) + if err != nil { + panic(fmt.Sprintf("RegisterNewMsgProcessFunc[%s] invalid handler: %v", key, err)) + } + NewRegisterNetWorkFunc[key] = handler +} + +func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message) error, error) { + if fn, ok := value.(func(*Player, *proto.Message) error); ok { + return fn, nil + } + + if value == nil { + return nil, fmt.Errorf("handler is nil") + } + + rv := reflect.ValueOf(value) + rt := rv.Type() + if rt.Kind() != reflect.Func { + return nil, fmt.Errorf("handler must be function, got %s", rt.Kind()) + } + if rt.NumIn() != 2 || rt.NumOut() != 1 { + return nil, fmt.Errorf("handler signature must be func(*Player, *T) error") + } + if rt.In(0) != reflect.TypeOf(&Player{}) { + return nil, fmt.Errorf("first arg must be *Player") + } + errorType := reflect.TypeOf((*error)(nil)).Elem() + if !rt.Out(0).Implements(errorType) { + return nil, fmt.Errorf("return type must be error") + } + + msgIfaceType := reflect.TypeOf((*proto.Message)(nil)).Elem() + msgArgType := rt.In(1) + if msgArgType == reflect.TypeOf((*proto.Message)(nil)) { + return func(player *Player, msg *proto.Message) error { + results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(msg)}) + if results[0].IsNil() { + return nil + } + return results[0].Interface().(error) + }, nil + } + if msgArgType.Kind() != reflect.Ptr || !msgArgType.Implements(msgIfaceType) { + return nil, fmt.Errorf("second arg must be *proto.Message or pointer type implementing proto.Message") + } + + return func(player *Player, msg *proto.Message) error { + if msg == nil || *msg == nil { + return fmt.Errorf("nil proto message") + } + + raw := *msg + rawType := reflect.TypeOf(raw) + if !rawType.AssignableTo(msgArgType) { + return fmt.Errorf("message type mismatch, expect %s got %s", msgArgType, rawType) + } + + results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(raw)}) + if results[0].IsNil() { + return nil + } + return results[0].Interface().(error) + }, nil +} + +func RunNewNetProcessByKey(key string, player *Player, msg *proto.Message) error { + fun, ok := NewRegisterNetWorkFunc[key] + if ok { + err := fun(player, msg) + return err + } + return fmt.Errorf("cant find network func %s", key) +} + func RunNetProcessByKey(key string, param []interface{}) error { fun, ok := RegisterNetWorkFunc[key] if ok { @@ -208,7 +287,8 @@ func (ad *GameLogic) NewAccountInsertDataToDB() bool { ModData: buf.Bytes(), UpdataTime: int32(time.Now().Unix()), } - db.FormatAllMemInsertDb(playerMod, "t_player_mod") + tableName := "t_player_mod_" + fmt.Sprintf("%02d", insertId%100) + db.FormatAllMemInsertDb(playerMod, tableName) // 创建玩家日志 player := new(Player) BaseMod := player.PlayMod.getBaseMod() @@ -565,6 +645,8 @@ func (ad *GameLogic) ReplaceExistPlayerAndAgent(a gate.Agent, player *Player) er if agent != nil && a != agent { G_getGameLogic().PackResInfo(agent, "ForceKickOut", data) internal.AsignPlayerToAgents(agent, ad.NotInitPlayer) + agent.Close() + log.Debug("player %d 被挤下线", player.M_DwUin) } internal.AsignPlayerToAgents(a, player) player.SetAgent(a) @@ -636,239 +718,244 @@ func (ad *GameLogic) RemoveOldLogs(days int) { func (ad *GameLogic) RegisterNetWorkFunc() { - RegisterMsgProcessFunc("ReqRemoveAd", ReqRemoveAdFunc) - RegisterMsgProcessFunc("ReqPlayerBriefProfileData", ReqPlayerBriefProfileDataFunc) - RegisterMsgProcessFunc("ReqFriendPlayerSimple", ReqFriendPlayerSimple) + RegisterNewMsgProcessFunc("ReqRemoveAd", ReqRemoveAd) + RegisterNewMsgProcessFunc("ReqPlayerBriefProfileData", ReqPlayerBriefProfileData) + RegisterNewMsgProcessFunc("ReqFriendPlayerSimple", ReqFriendPlayerSimple) // RegisterMsgProcessFunc("ReqOfflineReconnect", ReqOfflineReconnectFunc) - RegisterMsgProcessFunc("ReqPlayerAsset", ReqPlayerAsset) - RegisterMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证 + RegisterNewMsgProcessFunc("ReqPlayerAsset", ReqPlayerAsset) + RegisterNewMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证 // 玩家 - RegisterMsgProcessFunc("ReqUserInfo", ReqUserInfo) - RegisterMsgProcessFunc("ReqSetName", ReqSetName) // 设置名字 - RegisterMsgProcessFunc("ReqLang", ReqLang) // 设置语言 - RegisterMsgProcessFunc("ReqSetPetName", ReqSetPetName) // 设置宠物名字 - RegisterMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl) // 设置facebook地址 - RegisterMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfofunction) // 请求玩家基本信息 - RegisterMsgProcessFunc("ReqKv", ReqKv) // 保存客户端数据 - RegisterMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD) // 看广告获取能量 - RegisterMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy) // 购买能量 - RegisterMsgProcessFunc("ReqAdWatch", ReqAdWatch) // 观看广告 + RegisterNewMsgProcessFunc("ReqUserInfo", ReqUserInfo) + RegisterNewMsgProcessFunc("ReqSetName", ReqSetName) // 设置名字 + RegisterNewMsgProcessFunc("ReqLang", ReqLang) // 设置语言 + RegisterNewMsgProcessFunc("ReqSetPetName", ReqSetPetName) // 设置宠物名字 + RegisterNewMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl) // 设置facebook地址 + RegisterNewMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfo) // 请求玩家基本信息 + RegisterNewMsgProcessFunc("ReqKv", ReqKv) // 保存客户端数据 + RegisterNewMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD) // 看广告获取能量 + RegisterNewMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy) // 购买能量 + RegisterNewMsgProcessFunc("ReqAdWatch", ReqAdWatch) // 观看广告 // #region 棋盘 - RegisterMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessDataFunc) - RegisterMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessDataFunc) // 更新棋盘数据 - RegisterMsgProcessFunc("ReqSetEnergyMul", RegSetEneryFunc) //设置能量倍数 - RegisterMsgProcessFunc("ReqChessEx", ReqChessEx) // 转换棋子 - RegisterMsgProcessFunc("ReqGetChessFromBuff", ReqGetChessFromBuff) // 从buff中获取棋子 - RegisterMsgProcessFunc("ReqPutPartInBag", ReqPutPartInBag) // 把零件放入背包 - RegisterMsgProcessFunc("ReqPutChessInBag", ReqPutChessInBag) // 把棋子放入背包 - RegisterMsgProcessFunc("ReqTakeChessOutBag", ReqTakeChessOutBag) // 从背包中取出棋子 - RegisterMsgProcessFunc("ReqTakeChessOutBagToHonor", ReqTakeChessOutBagToHonor) // 从背包中取出棋子 - RegisterMsgProcessFunc("ReqBuyChessBagGrid", ReqBuyChessBagGrid) // 解锁背包格子 - RegisterMsgProcessFunc("ReqSourceChest", ReqSourceChest) // 开宝箱 - RegisterMsgProcessFunc("ReqSeparateChess", ReqSeparateChess) // 分解棋子 - RegisterMsgProcessFunc("ReqUpgradeChess", ReqUpgradeChess) // 升级棋子 - RegisterMsgProcessFunc("ReqSellChessNum", ReqSellChessNum) //购买能量 - RegisterMsgProcessFunc("ReqGetChessRetireReward", ReqGetChessRetireReward) //领取棋子退役奖励 + RegisterNewMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessData) + RegisterNewMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessData) // 更新棋盘数据 + RegisterNewMsgProcessFunc("ReqSetEnergyMul", ReqSetEnergyMul) //设置能量倍数 + RegisterNewMsgProcessFunc("ReqChessEx", ReqChessEx) // 转换棋子 + RegisterNewMsgProcessFunc("ReqGetChessFromBuff", ReqGetChessFromBuff) // 从buff中获取棋子 + RegisterNewMsgProcessFunc("ReqPutPartInBag", ReqPutPartInBag) // 把零件放入背包 + RegisterNewMsgProcessFunc("ReqPutChessInBag", ReqPutChessInBag) // 把棋子放入背包 + RegisterNewMsgProcessFunc("ReqTakeChessOutBag", ReqTakeChessOutBag) // 从背包中取出棋子 + RegisterNewMsgProcessFunc("ReqTakeChessOutBagToHonor", ReqTakeChessOutBagToHonor) // 从背包中取出棋子 + RegisterNewMsgProcessFunc("ReqBuyChessBagGrid", ReqBuyChessBagGrid) // 解锁背包格子 + RegisterNewMsgProcessFunc("ReqSourceChest", ReqSourceChest) // 开宝箱 + RegisterNewMsgProcessFunc("ReqSeparateChess", ReqSeparateChess) // 分解棋子 + RegisterNewMsgProcessFunc("ReqUpgradeChess", ReqUpgradeChess) // 升级棋子 + RegisterNewMsgProcessFunc("ReqSellChessNum", ReqSellChessNum) //购买能量 + RegisterNewMsgProcessFunc("ReqGetChessRetireReward", ReqGetChessRetireReward) //领取棋子退役奖励 //领取图鉴奖励 - RegisterMsgProcessFunc("ReqGetHandbookReward", ReqGetHandbookReward) //领取图鉴奖励 - RegisterMsgProcessFunc("RegHandbookAllReward", RegHandbookAllReward) //领取图鉴收集奖励 + RegisterNewMsgProcessFunc("ReqGetHandbookReward", ReqGetHandbookReward) //领取图鉴奖励 + RegisterNewMsgProcessFunc("RegHandbookAllReward", RegHandbookAllReward) //领取图鉴收集奖励 //领取订单奖励 - RegisterMsgProcessFunc("ReqRewardOrder", ReqRewardOrder) // 领取订单奖励 - RegisterMsgProcessFunc("ReqDelOrder", ReqDelOrder) // 删除订单 - RegisterMsgProcessFunc("ReqCreatePetOrder", ReqCreatePetOrder) // 生成消耗品订单 + RegisterNewMsgProcessFunc("ReqRewardOrder", ReqRewardOrder) // 领取订单奖励 + RegisterNewMsgProcessFunc("ReqDelOrder", ReqDelOrder) // 删除订单 + RegisterNewMsgProcessFunc("ReqCreatePetOrder", ReqCreatePetOrder) // 生成消耗品订单 //装饰 - RegisterMsgProcessFunc("ReqDecorate", ReqDecorate) // 装饰 - RegisterMsgProcessFunc("ReqDecorateAll", ReqDecorateAll) // 装饰全部 - RegisterMsgProcessFunc("ReqAreaReward", ReqAreaReward) // 章节奖励 + RegisterNewMsgProcessFunc("ReqDecorate", ReqDecorate) // 装饰 + RegisterNewMsgProcessFunc("ReqDecorateAll", ReqDecorateAll) // 装饰全部 + RegisterNewMsgProcessFunc("ReqAreaReward", ReqAreaReward) // 章节奖励 //Gm命令 - RegisterMsgProcessFunc("ReqGmCommand", ReqGmCommand) // Gm命令 + RegisterNewMsgProcessFunc("ReqGmCommand", ReqGmCommand) // Gm命令 // #region 卡牌 - RegisterMsgProcessFunc("ReqCardInfo", ReqCardInfo) // 请求卡牌信息 - RegisterMsgProcessFunc("ReqCardSeasonFirstReward", ReqCardSeasonFirstReward) // 领取赛季首次奖励 - RegisterMsgProcessFunc("ReqCardCollectReward", ReqCardCollectReward) //领取卡牌系列收集奖励 - RegisterMsgProcessFunc("ReqExStarReward", ReqExStarReward) // 兑换收集星星奖励 - RegisterMsgProcessFunc("ReqAllCollectReward", ReqAllCollectReward) // 领取全收集奖励 - RegisterMsgProcessFunc("ReqCardGive", ReqCardGive) // 请求赠送卡牌 - RegisterMsgProcessFunc("ReqAgreeCardGive", ReqAgreeCardGive) // 同意赠送卡牌 - RegisterMsgProcessFunc("ReqRefuseCardGive", ReqRefuseCardGive) // 拒绝赠送卡牌 + RegisterNewMsgProcessFunc("ReqCardInfo", ReqCardInfo) // 请求卡牌信息 + RegisterNewMsgProcessFunc("ReqCardSeasonFirstReward", ReqCardSeasonFirstReward) // 领取赛季首次奖励 + RegisterNewMsgProcessFunc("ReqCardCollectReward", ReqCardCollectReward) //领取卡牌系列收集奖励 + RegisterNewMsgProcessFunc("ReqExStarReward", ReqExStarReward) // 兑换收集星星奖励 + RegisterNewMsgProcessFunc("ReqAllCollectReward", ReqAllCollectReward) // 领取全收集奖励 + RegisterNewMsgProcessFunc("ReqCardGive", ReqCardGive) // 请求赠送卡牌 + RegisterNewMsgProcessFunc("ReqAgreeCardGive", ReqAgreeCardGive) // 同意赠送卡牌 + RegisterNewMsgProcessFunc("ReqRefuseCardGive", ReqRefuseCardGive) // 拒绝赠送卡牌 - RegisterMsgProcessFunc("ReqCardExchange", ReqCardExchange) // 请求交换卡牌 - RegisterMsgProcessFunc("ReqSelectCardExchange", ReqSelectCardExchange) // 选择交换的卡牌 - RegisterMsgProcessFunc("ReqAgreeCardExchange", ReqAgreeCardExchange) // 完成交换卡牌 - RegisterMsgProcessFunc("ReqRefuseCardSelect", ReqRefuseCardSelect) // 拒绝选择卡牌进行交换 - RegisterMsgProcessFunc("ReqRefuseCardExchange", ReqRefuseCardExchange) // 拒绝卡牌交换 - RegisterMsgProcessFunc("ReqCardSend", ReqCardSend) // 直接赠送卡牌 - RegisterMsgProcessFunc("ReqGetFriendCard", ReqGetFriendCard) // 领取好友赠送的卡牌 - RegisterMsgProcessFunc("ReqMasterCard", ReqMasterCard) // 万能卡兑换 - RegisterMsgProcessFunc("ReqCardHandbookReward", ReqCardHandbookReward) // 卡牌图鉴 + RegisterNewMsgProcessFunc("ReqCardExchange", ReqCardExchange) // 请求交换卡牌 + RegisterNewMsgProcessFunc("ReqSelectCardExchange", ReqSelectCardExchange) // 选择交换的卡牌 + RegisterNewMsgProcessFunc("ReqAgreeCardExchange", ReqAgreeCardExchange) // 完成交换卡牌 + RegisterNewMsgProcessFunc("ReqRefuseCardSelect", ReqRefuseCardSelect) // 拒绝选择卡牌进行交换 + RegisterNewMsgProcessFunc("ReqRefuseCardExchange", ReqRefuseCardExchange) // 拒绝卡牌交换 + RegisterNewMsgProcessFunc("ReqCardSend", ReqCardSend) // 直接赠送卡牌 + RegisterNewMsgProcessFunc("ReqGetFriendCard", ReqGetFriendCard) // 领取好友赠送的卡牌 + RegisterNewMsgProcessFunc("ReqMasterCard", ReqMasterCard) // 万能卡兑换 + RegisterNewMsgProcessFunc("ReqCardHandbookReward", ReqCardHandbookReward) // 卡牌图鉴 // 日常任务 - RegisterMsgProcessFunc("ReqGetDailyTaskReward", ReqGetDailyTaskReward) // 领取日常任务奖励 - RegisterMsgProcessFunc("ReqGetDailyWeekReward", ReqGetDailyWeekReward) // 领取周活跃奖励 - RegisterMsgProcessFunc("ReqDailyUnlock", ReqDailyUnlock) // 日常任务解锁 + RegisterNewMsgProcessFunc("ReqGetDailyTaskReward", ReqGetDailyTaskReward) // 领取日常任务奖励 + RegisterNewMsgProcessFunc("ReqGetDailyWeekReward", ReqGetDailyWeekReward) // 领取周活跃奖励 + RegisterNewMsgProcessFunc("ReqDailyUnlock", ReqDailyUnlock) // 日常任务解锁 // 新手任务 - RegisterMsgProcessFunc("ReqGetGuideTaskReward", ReqGetGuideTaskReward) // 领取日新手任务奖励 - RegisterMsgProcessFunc("ReqGetGuideActiveReward", ReqGetGuideActiveReward) // 领取活跃奖励 + RegisterNewMsgProcessFunc("ReqGetGuideTaskReward", ReqGetGuideTaskReward) // 领取日新手任务奖励 + RegisterNewMsgProcessFunc("ReqGetGuideActiveReward", ReqGetGuideActiveReward) // 领取活跃奖励 // 引导奖励 - RegisterMsgProcessFunc("ReqGuideReward", ReqGuideReward) // 领取引导奖励 - RegisterMsgProcessFunc("ReqGuidePlayroom", ReqGuidePlayroom) // 领取playroom引导奖励 + RegisterNewMsgProcessFunc("ReqGuideReward", ReqGuideReward) // 领取引导奖励 + RegisterNewMsgProcessFunc("ReqGuidePlayroom", ReqGuidePlayroom) // 领取playroom引导奖励 // 头像 - RegisterMsgProcessFunc("ReqSetFace", ReqSetFace) // 设置头像 + RegisterNewMsgProcessFunc("ReqSetFace", ReqSetFace) // 设置头像 // 头像框 - RegisterMsgProcessFunc("ReqSetAvatar", ReqSetAvatar) // 设置头像框 + RegisterNewMsgProcessFunc("ReqSetAvatar", ReqSetAvatar) // 设置头像框 // 表情 - RegisterMsgProcessFunc("ReqSetEmoji", ReqSetEmoji) // 设置表情 + RegisterNewMsgProcessFunc("ReqSetEmoji", ReqSetEmoji) // 设置表情 // 收藏室 - RegisterMsgProcessFunc("ReqCollectInfo", ReqCollectInfo) // 请求收藏室数据 - RegisterMsgProcessFunc("ReqCollect", ReqCollect) // 领取收藏室奖励 + RegisterNewMsgProcessFunc("ReqCollectInfo", ReqCollectInfo) // 请求收藏室数据 + RegisterNewMsgProcessFunc("ReqCollect", ReqCollect) // 领取收藏室奖励 // 七日签到 - RegisterMsgProcessFunc("ReqGetSevenLoginReward", ReqGetSevenLoginReward) // 领取七日签到奖励 - RegisterMsgProcessFunc("ReqGetMonthLoginReward", ReqGetMonthLoginReward) // 领取月签到奖励 + RegisterNewMsgProcessFunc("ReqGetSevenLoginReward", ReqGetSevenLoginReward) // 领取七日签到奖励 + RegisterNewMsgProcessFunc("ReqGetMonthLoginReward", ReqGetMonthLoginReward) // 领取月签到奖励 // 限时事件 - RegisterMsgProcessFunc("ReqLimitEvent", ReqLimitEvent) // 请求限时事件数据 - RegisterMsgProcessFunc("ReqFastProduceReward", ReqFastProduceReward) // 连击快手奖励 - RegisterMsgProcessFunc("ReqFastProduceInfo", ReqFastProduceInfo) // 请求连击快手数据 - RegisterMsgProcessFunc("ReqLimitSenceReward", ReqLimitSenceReward) // 获取场景转盘奖励 - RegisterMsgProcessFunc("ReqSelectLimitEvent", ReqSelectLimitEvent) //领取Bouns限时事件进度奖励 - RegisterMsgProcessFunc("ReqGetGoldCard", ReqGetGoldCard) //请求金卡交换信息 - RegisterMsgProcessFunc("ReqLimitEventLuckyCat", ReqLimitEventLuckyCat) //幸运猫获取奖励 - RegisterMsgProcessFunc("ReqCatTrickReward", ReqCatTrickReward) //小猫戏法获取奖励 + RegisterNewMsgProcessFunc("ReqLimitEvent", ReqLimitEvent) // 请求限时事件数据 + RegisterNewMsgProcessFunc("ReqFastProduceReward", ReqFastProduceReward) // 连击快手奖励 + RegisterNewMsgProcessFunc("ReqFastProduceInfo", ReqFastProduceInfo) // 请求连击快手数据 + RegisterNewMsgProcessFunc("ReqLimitSenceReward", ReqLimitSenceReward) // 获取场景转盘奖励 + RegisterNewMsgProcessFunc("ReqSelectLimitEvent", ReqSelectLimitEvent) //领取Bouns限时事件进度奖励 + RegisterNewMsgProcessFunc("ReqGetGoldCard", ReqGetGoldCard) //请求金卡交换信息 + RegisterNewMsgProcessFunc("ReqLimitEventLuckyCat", ReqLimitEventLuckyCat) //幸运猫获取奖励 + RegisterNewMsgProcessFunc("ReqCatTrickReward", ReqCatTrickReward) //小猫戏法获取奖励 // #region 好友 - RegisterMsgProcessFunc("ReqFriendList", ReqFriendList) // 请求好友列表 - RegisterMsgProcessFunc("ReqFriendApply", ReqFriendApply) // 请求申请好友列表 - RegisterMsgProcessFunc("ReqFriendCardMsg", ReqFriendCardMsg) // 请求好友卡牌申请列表 - RegisterMsgProcessFunc("ReqWishApplyList", ReqWishApplyList) // 请求好友心愿单申请列表 - RegisterMsgProcessFunc("ReqFriendTimeLine", ReqFriendTimeLine) // 请求好友时间线 - RegisterMsgProcessFunc("ReqFriendRecommend", ReqFriendRecommend) // 获取推荐好友 - RegisterMsgProcessFunc("ReqFriendTLUpvote", ReqFriendTLUpvote) // 请求时间线点赞 - RegisterMsgProcessFunc("ReqFriendTReward", ReqFriendTReward) // 获取时间线奖励 - RegisterMsgProcessFunc("ReqAddNpc", ReqAddNpc) // 增加npc - RegisterMsgProcessFunc("ReqWishApply", ReqWishApply) // 同意好友心愿单请求 - RegisterMsgProcessFunc("ReqFriendByCode", ReqFriendByCode) // 根据邀请码查询好友 - RegisterMsgProcessFunc("ReqFriendReplyHandle", ReqFriendReplyHandle) // 回复好友信息 + RegisterNewMsgProcessFunc("ReqFriendList", ReqFriendList) // 请求好友列表 + RegisterNewMsgProcessFunc("ReqFriendApply", ReqFriendApply) // 请求申请好友列表 + RegisterNewMsgProcessFunc("ReqFriendCardMsg", ReqFriendCardMsg) // 请求好友卡牌申请列表 + RegisterNewMsgProcessFunc("ReqWishApplyList", ReqWishApplyList) // 请求好友心愿单申请列表 + RegisterNewMsgProcessFunc("ReqFriendTimeLine", ReqFriendTimeLine) // 请求好友时间线 + RegisterNewMsgProcessFunc("ReqFriendRecommend", ReqFriendRecommend) // 获取推荐好友 + RegisterNewMsgProcessFunc("ReqFriendTLUpvote", ReqFriendTLUpvote) // 请求时间线点赞 + RegisterNewMsgProcessFunc("ReqFriendTReward", ReqFriendTReward) // 获取时间线奖励 + RegisterNewMsgProcessFunc("ReqAddNpc", ReqAddNpc) // 增加npc + RegisterNewMsgProcessFunc("ReqWishApply", ReqWishApply) // 同意好友心愿单请求 + RegisterNewMsgProcessFunc("ReqFriendByCode", ReqFriendByCode) // 根据邀请码查询好友 + RegisterNewMsgProcessFunc("ReqFriendReplyHandle", ReqFriendReplyHandle) // 回复好友信息 - RegisterMsgProcessFunc("ReqSearchPlayer", ReqSearchPlayer) // 搜索好友 - RegisterMsgProcessFunc("ReqApplyFriend", ReqApplyFriend) // 申请好友 - RegisterMsgProcessFunc("ReqAgreeFriend", ReqAgreeFriend) // 同意申请 - RegisterMsgProcessFunc("ReqRefuseFriend", ReqRefuseFriend) // 拒绝申请 - RegisterMsgProcessFunc("ReqDelFriend", ReqDelFriend) // 删除好友 + RegisterNewMsgProcessFunc("ReqSearchPlayer", ReqSearchPlayer) // 搜索好友 + RegisterNewMsgProcessFunc("ReqApplyFriend", ReqApplyFriend) // 申请好友 + RegisterNewMsgProcessFunc("ReqAgreeFriend", ReqAgreeFriend) // 同意申请 + RegisterNewMsgProcessFunc("ReqRefuseFriend", ReqRefuseFriend) // 拒绝申请 + RegisterNewMsgProcessFunc("ReqDelFriend", ReqDelFriend) // 删除好友 // Facebook邀请好友 - RegisterMsgProcessFunc("ReqInviteFriendData", ReqInviteFriendData) // 请求邀请好友数据 - RegisterMsgProcessFunc("ReqSelfInvited", ReqSelfInvited) // 请求自己邀请的好友 - RegisterMsgProcessFunc("ReqGetInviteReward", ReqGetInviteReward) // 领取邀请奖励 - RegisterMsgProcessFunc("ReqAutoAddInviteFriend", ReqAutoAddInviteFriend) // 自动添加邀请好友 - RegisterMsgProcessFunc("ReqAutoAddInviteFriend2", ReqAutoAddInviteFriend2) // 自动添加邀请好友 - RegisterMsgProcessFunc("ReqBindFacebookAccount", ReqBindFacebookAccount) // 绑定facebook账号 - RegisterMsgProcessFunc("ReqOnlyBindFacebook", ReqOnlyBindFacebook) // 绑定唯一facebook - RegisterMsgProcessFunc("ReqUnBindFacebook", ReqUnBindFacebook) // 解绑facebook - RegisterMsgProcessFunc("ReqSynGameData", ReqSynGameData) // 同步账号数据 + RegisterNewMsgProcessFunc("ReqInviteFriendData", ReqInviteFriendData) // 请求邀请好友数据 + RegisterNewMsgProcessFunc("ReqSelfInvited", ReqSelfInvited) // 请求自己邀请的好友 + RegisterNewMsgProcessFunc("ReqGetInviteReward", ReqGetInviteReward) // 领取邀请奖励 + RegisterNewMsgProcessFunc("ReqAutoAddInviteFriend", ReqAutoAddInviteFriend) // 自动添加邀请好友 + RegisterNewMsgProcessFunc("ReqAutoAddInviteFriend2", ReqAutoAddInviteFriend2) // 自动添加邀请好友 + RegisterNewMsgProcessFunc("ReqBindFacebookAccount", ReqBindFacebookAccount) // 绑定facebook账号 + RegisterNewMsgProcessFunc("ReqOnlyBindFacebook", ReqOnlyBindFacebook) // 绑定唯一facebook + RegisterNewMsgProcessFunc("ReqUnBindFacebook", ReqUnBindFacebook) // 解绑facebook + RegisterNewMsgProcessFunc("ReqSynGameData", ReqSynGameData) // 同步账号数据 // 榜单 - RegisterMsgProcessFunc("ReqRank", ReqRank) // 请求榜单数据 + RegisterNewMsgProcessFunc("ReqRank", ReqRank) // 请求榜单数据 // 邮件 - RegisterMsgProcessFunc("ReqMailList", ReqMailList) // 请求邮件数据 - RegisterMsgProcessFunc("ReqReadMail", ReqReadMail) // 读取邮件 - RegisterMsgProcessFunc("ReqGetMailReward", ReqGetMailReward) // 领取邮件奖励 - RegisterMsgProcessFunc("ReqDeleteMail", ReqDeleteMail) // 删除邮件 + RegisterNewMsgProcessFunc("ReqMailList", ReqMailList) // 请求邮件数据 + RegisterNewMsgProcessFunc("ReqReadMail", ReqReadMail) // 读取邮件 + RegisterNewMsgProcessFunc("ReqGetMailReward", ReqGetMailReward) // 领取邮件奖励 + RegisterNewMsgProcessFunc("ReqDeleteMail", ReqDeleteMail) // 删除邮件 // 商店 - RegisterMsgProcessFunc("ReqFreeShop", ReqFreeShop) // 领取商店免费奖励 - RegisterMsgProcessFunc("ReqBuyChessShop", ReqBuyChessShop) // 购买商店棋子 - RegisterMsgProcessFunc("ReqBuyChessShop2", ReqBuyChessShop2) // 购买商店棋子直接加入棋盘 - RegisterMsgProcessFunc("ReqRefreshChessShop", ReqRefreshChessShop) // 刷新棋子商店 - RegisterMsgProcessFunc("ReqAddWish", ReqAddWish) // 添加心愿单 - RegisterMsgProcessFunc("ReqGetWish", ReqGetWish) // 领取心愿单奖励 - RegisterMsgProcessFunc("ReqSendWishBeg", ReqSendWishBeg) // 发送心愿单请求 + RegisterNewMsgProcessFunc("ReqFreeShop", ReqFreeShop) // 领取商店免费奖励 + RegisterNewMsgProcessFunc("ReqBuyChessShop", ReqBuyChessShop) // 购买商店棋子 + RegisterNewMsgProcessFunc("ReqBuyChessShop2", ReqBuyChessShop2) // 购买商店棋子直接加入棋盘 + RegisterNewMsgProcessFunc("ReqRefreshChessShop", ReqRefreshChessShop) // 刷新棋子商店 + RegisterNewMsgProcessFunc("ReqAddWish", ReqAddWish) // 添加心愿单 + RegisterNewMsgProcessFunc("ReqGetWish", ReqGetWish) // 领取心愿单奖励 + RegisterNewMsgProcessFunc("ReqSendWishBeg", ReqSendWishBeg) // 发送心愿单请求 // 无尽礼包 - RegisterMsgProcessFunc("ReqEndless", ReqEndless) // 请求无尽礼包数据 - RegisterMsgProcessFunc("ReqEndlessReward", ReqEndlessReward) // 领取无尽礼包免费奖励 + RegisterNewMsgProcessFunc("ReqEndless", ReqEndless) // 请求无尽礼包数据 + RegisterNewMsgProcessFunc("ReqEndlessReward", ReqEndlessReward) // 领取无尽礼包免费奖励 // 小猪存钱罐 - RegisterMsgProcessFunc("ReqPiggyBankReward", ReqPiggyBankReward) // 小猪存钱罐领取奖励 + RegisterNewMsgProcessFunc("ReqPiggyBankReward", ReqPiggyBankReward) // 小猪存钱罐领取奖励 // 锦标赛 - RegisterMsgProcessFunc("ReqChampship", ReqChampship) // 请求锦标赛数据 - RegisterMsgProcessFunc("ReqChampshipReward", ReqChampshipReward) // 领取锦标赛奖励 - RegisterMsgProcessFunc("ReqChampshipRankReward", ReqChampshipRankReward) // 领取锦标赛排行榜奖励 - RegisterMsgProcessFunc("ReqChampshipRank", ReqChampshipRank) // 请求锦标赛排行榜 - RegisterMsgProcessFunc("ReqChampshipPreRank", ReqChampshipPreRank) // 请求锦标赛昨日排行榜 + RegisterNewMsgProcessFunc("ReqChampship", ReqChampship) // 请求锦标赛数据 + RegisterNewMsgProcessFunc("ReqChampshipReward", ReqChampshipReward) // 领取锦标赛奖励 + RegisterNewMsgProcessFunc("ReqChampshipRankReward", ReqChampshipRankReward) // 领取锦标赛排行榜奖励 + RegisterNewMsgProcessFunc("ReqChampshipRank", ReqChampshipRank) // 请求锦标赛排行榜 + RegisterNewMsgProcessFunc("ReqChampshipPreRank", ReqChampshipPreRank) // 请求锦标赛昨日排行榜 // #region 活动 - RegisterMsgProcessFunc("ReqActivityReward", ReqActivityReward) // 领取活动奖励 - RegisterMsgProcessFunc("ReqAddGiftReward", ReqAddGiftReward) // 领取加赠活动奖励 + RegisterNewMsgProcessFunc("ReqActivityReward", ReqActivityReward) // 领取活动奖励 + RegisterNewMsgProcessFunc("ReqAddGiftReward", ReqAddGiftReward) // 领取加赠活动奖励 // 挖矿 - RegisterMsgProcessFunc("ReqMining", ReqMining) // 请求挖矿数据 - RegisterMsgProcessFunc("ReqMiningReward", ReqMiningReward) // 领取挖矿奖励 - RegisterMsgProcessFunc("ReqMiningTake", ReqMiningTake) // 挖矿 + RegisterNewMsgProcessFunc("ReqMining", ReqMining) // 请求挖矿数据 + RegisterNewMsgProcessFunc("ReqMiningReward", ReqMiningReward) // 领取挖矿奖励 + RegisterNewMsgProcessFunc("ReqMiningTake", ReqMiningTake) // 挖矿 // 猜颜色 - RegisterMsgProcessFunc("ReqGuessColor", ReqGuessColor) // 请求猜颜色数据 - RegisterMsgProcessFunc("ReqGuessColorReward", ReqGuessColorReward) // 领取猜颜色奖励 - RegisterMsgProcessFunc("ReqGuessColorTake", ReqGuessColorTake) // 猜颜色 + RegisterNewMsgProcessFunc("ReqGuessColor", ReqGuessColor) // 请求猜颜色数据 + RegisterNewMsgProcessFunc("ReqGuessColorReward", ReqGuessColorReward) // 领取猜颜色奖励 + RegisterNewMsgProcessFunc("ReqGuessColorTake", ReqGuessColorTake) // 猜颜色 // 三段竞赛 - RegisterMsgProcessFunc("ReqRace", ReqRace) - RegisterMsgProcessFunc("ReqRaceReward", ReqRaceReward) - RegisterMsgProcessFunc("ReqRaceStart", ReqRaceStart) + RegisterNewMsgProcessFunc("ReqRace", ReqRace) + RegisterNewMsgProcessFunc("ReqRaceReward", ReqRaceReward) + RegisterNewMsgProcessFunc("ReqRaceStart", ReqRaceStart) // 猫草大作战 - RegisterMsgProcessFunc("ReqCatnip", ReqCatnip) // 请求猫草大作战数据 - RegisterMsgProcessFunc("ReqCatnipInvite", ReqCatnipInvite) // 猫草大作战邀请好友 - RegisterMsgProcessFunc("ReqCatnipAgree", ReqCatnipAgree) // 同意邀请 - RegisterMsgProcessFunc("ReqCatnipRefuse", ReqCatnipRefuse) // 拒绝邀请 - RegisterMsgProcessFunc("ReqCatnipMultiply", ReqCatnipMultiply) // 猫草大作战倍数 - RegisterMsgProcessFunc("ReqCatnipPlay", ReqCatnipPlay) // 猫草大作战游戏转盘 - RegisterMsgProcessFunc("ReqCatnipReward", ReqCatnipReward) // 猫草大作战领取奖励 - RegisterMsgProcessFunc("ReqCatnipGrandReward", ReqCatnipGrandReward) // 猫草大作战领取大奖 - RegisterMsgProcessFunc("ReqCatnipEmoji", ReqCatnipEmoji) + RegisterNewMsgProcessFunc("ReqCatnip", ReqCatnip) // 请求猫草大作战数据 + RegisterNewMsgProcessFunc("ReqCatnipInvite", ReqCatnipInvite) // 猫草大作战邀请好友 + RegisterNewMsgProcessFunc("ReqCatnipAgree", ReqCatnipAgree) // 同意邀请 + RegisterNewMsgProcessFunc("ReqCatnipRefuse", ReqCatnipRefuse) // 拒绝邀请 + RegisterNewMsgProcessFunc("ReqCatnipMultiply", ReqCatnipMultiply) // 猫草大作战倍数 + RegisterNewMsgProcessFunc("ReqCatnipPlay", ReqCatnipPlay) // 猫草大作战游戏转盘 + RegisterNewMsgProcessFunc("ReqCatnipReward", ReqCatnipReward) // 猫草大作战领取奖励 + RegisterNewMsgProcessFunc("ReqCatnipGrandReward", ReqCatnipGrandReward) // 猫草大作战领取大奖 + RegisterNewMsgProcessFunc("ReqCatnipEmoji", ReqCatnipEmoji) + // 猫猫回礼 + RegisterNewMsgProcessFunc("ReqCatReturnGift", ReqCatReturnGift) // 请求猫猫回礼数据 + RegisterNewMsgProcessFunc("ReqCatReturnGiftReward", ReqCatReturnGiftReward) // 领取猫猫回礼奖励 + RegisterNewMsgProcessFunc("ReqCatReturnGiftScore", ReqCatReturnGiftScore) // 领取猫猫回礼积分 + RegisterNewMsgProcessFunc("ReqCatReturnGiftRewardGift", ReqCatReturnGiftRewardGift) // 领取猫猫回礼奖励礼物 // 活动通行证 - RegisterMsgProcessFunc("ReqActPass", ReqActPass) // 请求活动通行证数据 - RegisterMsgProcessFunc("ReqActPassReward", ReqActPassReward) // 领取活动通行证奖励 + RegisterNewMsgProcessFunc("ReqActPass", ReqActPass) // 请求活动通行证数据 + RegisterNewMsgProcessFunc("ReqActPassReward", ReqActPassReward) // 领取活动通行证奖励 // #region playroom - RegisterMsgProcessFunc("ReqPlayroom", ReqPlayroom) // 请求playroom数据 - RegisterMsgProcessFunc("ReqPlayroomInfo", ReqPlayroomInfo) // 请求playroom拜访信息 - RegisterMsgProcessFunc("ReqPlayroomDressSet", ReqPlayroomDressSet) // 设置服装 - RegisterMsgProcessFunc("ReqPlayroomPetAirSet", ReqPlayroomPetAirSet) // 获取宠物空气 - RegisterMsgProcessFunc("ReqPlayroomGame", ReqPlayroomGame) // 游戏结果 - RegisterMsgProcessFunc("ReqPlayroomInteract", ReqPlayroomInteract) // 宠物交互 - RegisterMsgProcessFunc("ReqPlayroomSetRoom", ReqPlayroomSetRoom) // playroom装饰 - RegisterMsgProcessFunc("ReqPlayroomSelectReward", ReqPlayroomSelectReward) // playroom选择奖励 - RegisterMsgProcessFunc("ReqPlayroomLose", ReqPlayroomLose) // 处理偷取的棋子 - RegisterMsgProcessFunc("ReqPlayroomWork", ReqPlayroomWork) // 宠物工作 - RegisterMsgProcessFunc("ReqPlayroomRest", ReqPlayroomRest) // 宠物休息 - RegisterMsgProcessFunc("ReqPlayroomDraw", ReqPlayroomDraw) // 转盘 - RegisterMsgProcessFunc("ReqPlayroomFlip", ReqPlayroomFlip) // 翻牌 - RegisterMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward) // 翻牌奖励 - RegisterMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip) // 消除碎片 - RegisterMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline) // 打工离线 - RegisterMsgProcessFunc("ReqPlayroomWrokOutline", ReqPlayroomWrokOutline) // 打工离线完成 - RegisterMsgProcessFunc("ReqPlayroomShop", ReqPlayroomShop) // playroom 商店 - RegisterMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem) // 购买playroom物品 - RegisterMsgProcessFunc("ReqPlayroomUpvote", ReqPlayroomUpvote) // 点赞别人的playroom - RegisterMsgProcessFunc("ReqPlayroomUnlock", ReqPlayroomUnlock) // 解锁房间 - RegisterMsgProcessFunc("ReqPlayroomTask", ReqPlayroomTask) // playroom任务 - RegisterMsgProcessFunc("ReqPlayroomTaskReward", ReqPlayroomTaskReward) // 领取任务奖励 - RegisterMsgProcessFunc("ReqPlayroomGameShowReward", ReqPlayroomGameShowReward) // 展示游戏结果数据 - RegisterMsgProcessFunc("ReqPlayroomGuide", ReqPlayroomGuide) // 展示游戏结果数据 - RegisterMsgProcessFunc("ReqPetFur", ReqPetFur) // 宠物毛皮信息 - RegisterMsgProcessFunc("ReqPetFurBuy", ReqPetFurBuy) // 宠物毛皮商店购买 - RegisterMsgProcessFunc("ReqFurSet", ReqFurSet) // 宠物毛皮设置 + RegisterNewMsgProcessFunc("ReqPlayroom", ReqPlayroom) // 请求playroom数据 + RegisterNewMsgProcessFunc("ReqPlayroomInfo", ReqPlayroomInfo) // 请求playroom拜访信息 + RegisterNewMsgProcessFunc("ReqPlayroomDressSet", ReqPlayroomDressSet) // 设置服装 + RegisterNewMsgProcessFunc("ReqPlayroomPetAirSet", ReqPlayroomPetAirSet) // 获取宠物空气 + RegisterNewMsgProcessFunc("ReqPlayroomGame", ReqPlayroomGame) // 游戏结果 + RegisterNewMsgProcessFunc("ReqPlayroomInteract", ReqPlayroomInteract) // 宠物交互 + RegisterNewMsgProcessFunc("ReqPlayroomSetRoom", ReqPlayroomSetRoom) // playroom装饰 + RegisterNewMsgProcessFunc("ReqPlayroomSelectReward", ReqPlayroomSelectReward) // playroom选择奖励 + RegisterNewMsgProcessFunc("ReqPlayroomLose", ReqPlayroomLose) // 处理偷取的棋子 + RegisterNewMsgProcessFunc("ReqPlayroomWork", ReqPlayroomWork) // 宠物工作 + RegisterNewMsgProcessFunc("ReqPlayroomRest", ReqPlayroomRest) // 宠物休息 + RegisterNewMsgProcessFunc("ReqPlayroomDraw", ReqPlayroomDraw) // 转盘 + RegisterNewMsgProcessFunc("ReqPlayroomFlip", ReqPlayroomFlip) // 翻牌 + RegisterNewMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward) // 翻牌奖励 + RegisterNewMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip) // 消除碎片 + RegisterNewMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline) // 打工离线 + RegisterNewMsgProcessFunc("ReqPlayroomWorkOutline", ReqPlayroomWorkOutline) // 打工离线完成 + RegisterNewMsgProcessFunc("ReqPlayroomShop", ReqPlayroomShop) // playroom 商店 + RegisterNewMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem) // 购买playroom物品 + RegisterNewMsgProcessFunc("ReqPlayroomUpvote", ReqPlayroomUpvote) // 点赞别人的playroom + RegisterNewMsgProcessFunc("ReqPlayroomUnlock", ReqPlayroomUnlock) // 解锁房间 + RegisterNewMsgProcessFunc("ReqPlayroomTask", ReqPlayroomTask) // playroom任务 + RegisterNewMsgProcessFunc("ReqPlayroomTaskReward", ReqPlayroomTaskReward) // 领取任务奖励 + RegisterNewMsgProcessFunc("ReqPlayroomGameShowReward", ReqPlayroomGameShowReward) // 展示游戏结果数据 + RegisterNewMsgProcessFunc("ReqPlayroomGuide", ReqPlayroomGuide) // 展示游戏结果数据 + RegisterNewMsgProcessFunc("ReqPetFur", ReqPetFur) // 宠物毛皮信息 + RegisterNewMsgProcessFunc("ReqPetFurBuy", ReqPetFurBuy) // 宠物毛皮商店购买 + RegisterNewMsgProcessFunc("ReqFurSet", ReqFurSet) // 宠物毛皮设置 // 宠物宝藏 - RegisterMsgProcessFunc("ReqFriendTreasure", ReqFriendTreasure) // 请求好友宝藏数据 - RegisterMsgProcessFunc("ReqFriendTreasureStart", ReqFriendTreasureStart) // 开始游戏 - RegisterMsgProcessFunc("ReqFriendTreasureFilp", ReqFriendTreasureFilp) // 翻牌 - RegisterMsgProcessFunc("ReqFriendTreasureEnd", ReqFriendTreasureEnd) // 结束游戏 + RegisterNewMsgProcessFunc("ReqFriendTreasure", ReqFriendTreasure) // 请求好友宝藏数据 + RegisterNewMsgProcessFunc("ReqFriendTreasureStart", ReqFriendTreasureStart) // 开始游戏 + RegisterNewMsgProcessFunc("ReqFriendTreasureFilp", ReqFriendTreasureFilp) // 翻牌 + RegisterNewMsgProcessFunc("ReqFriendTreasureEnd", ReqFriendTreasureEnd) // 结束游戏 // #region 充值 - RegisterMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号 - RegisterMsgProcessFunc("ReqShippingOrder", ReqShippingOrder) // 获取订单号 - RegisterMsgProcessFunc("ReqChargeReceive", ReqChargeReceive) // 礼包回复邮件 + RegisterNewMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号 + RegisterNewMsgProcessFunc("ReqShippingOrder", ReqShippingOrder) // 获取订单号 + RegisterNewMsgProcessFunc("ReqChargeReceive", ReqChargeReceive) // 礼包回复邮件 } func (ad *GameLogic) InitActivity() { diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go index 51a6fe4f..aba0ff84 100644 --- a/src/server/game/activity_func.go +++ b/src/server/game/activity_func.go @@ -4,7 +4,6 @@ import ( "fmt" activityCfg "server/conf/activity" catnipCfg "server/conf/catnip" - champshipCfg "server/conf/champship" dailyTaskCfg "server/conf/daily_task" guesscolorCfg "server/conf/guess_color" languageCfg "server/conf/language" @@ -17,7 +16,9 @@ import ( "server/game/mod/mail" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" + "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) // 活动模块 登录 @@ -99,6 +100,8 @@ func (p *Player) ActivityLogin() { } } + // 猫猫回礼登录 + p.CatReturnGiftLogin() } // 发送活动邮件 @@ -133,10 +136,35 @@ func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems [ }) } +// 发送活动邮件 +func (p *Player) SendActivityMail2(items []*item.Item, mail_title, mail_content string) { + MailMod := p.PlayMod.getMailMod() + mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title) + mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content) + mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title) + mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content) + mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_title) + mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content) + mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_title) + mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content) + MailMod.SendMail(&mail.MailStruct{ + Title: mt_zh, + Content: mc_zh, + TitleEn: mt_en, + ContentEn: mc_en, + TitlePtBr: mt_pt, + ContentPtBr: mc_pt, + TitleEsLatam: mt_es, + ContentEsLatam: mc_es, + Items: items, + Type: mail.MAIL_TYPE_NORMAL, + }) +} + // 活动模块 零点更新 func (p *Player) ActivityZeroUpdate() { + p.CatReturnGiftZeroUpdate() p.ActivityLogin() - type zeroHandler struct { actType int updateFn func(int) @@ -154,6 +182,43 @@ func (p *Player) ActivityZeroUpdate() { } } } +func (p *Player) CatReturnGiftLogin() { + activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT) + var aid int + var id int + if activityInfo != nil { + id = activityInfo.Id + aid = activityInfo.AId + } + p.GetCatReturnGiftMod().Login(id, aid) +} + +// 猫猫回礼0点更新 +func (p *Player) CatReturnGiftZeroUpdate() { + activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT) + var aid int + var id int + if activityInfo != nil { + id = activityInfo.Id + aid = activityInfo.AId + } + oldId, oldScore, oldReward := p.GetCatReturnGiftMod().ZeroUpdate(id, aid) + if oldId != 0 { + log.Debug("CatReturnGiftZeroUpdate oldId : %d, oldScore : %d, oldReward : %d", oldId, oldScore, oldReward) + cfg := G_GameLogicPtr.ActivityMgr.GetCatReturnGiftCfg(oldId) + items := make([]*item.Item, 0) + if cfg != nil { + for _, v := range cfg.RewardList { + if oldScore >= int(v.Score) && oldReward < int(v.Id) { + items = append(items, item.MsgToItem(v.Reward)...) + } + } + } + if len(items) > 0 { + p.SendActivityMail2(items, "backend_milestone_mail_title", "backend_milestone_mail_content") + } + } +} // 获取活动信息 func (p *Player) GetActivityInfo(actType int) *ActivityInfo { @@ -468,11 +533,14 @@ func (p *Player) GetChampshipActivityId() (int, int) { var yesterdayActivityId int activiyCfgList := G_GameLogicPtr.ActivityMgr.GetActivityList() now := GoUtil.Now() - yesterday := GoUtil.ZeroTimestamp() - 1 level := p.GetBaseMod().GetLevel() - champshipActivityIds := champshipCfg.GetChampshipActivityId() + type sortData struct { + Id int + EndTime int64 + } + var sortList []sortData for _, v := range activiyCfgList { - if !GoUtil.InArray(v.Id, champshipActivityIds) { + if v.Type != activity.ACT_TYPE_CHAMPION { continue } if v.Level > level { @@ -481,13 +549,92 @@ func (p *Player) GetChampshipActivityId() (int, int) { if v.Startime <= now && v.Endtime >= now { todayActivityId = v.Id } - if v.Startime <= yesterday && v.Endtime >= yesterday { - yesterdayActivityId = v.Id + if v.Endtime < now { + sortList = append(sortList, sortData{Id: v.Id, EndTime: v.Endtime}) } } + if len(sortList) > 0 { + sort.Slice(sortList, func(i, j int) bool { + return sortList[i].EndTime > sortList[j].EndTime + }) + yesterdayActivityId = sortList[0].Id + } return todayActivityId, yesterdayActivityId } +func (p *Player) ChampionshipZeroUpdate() { + todayActivityId, _ := p.GetChampshipActivityId() + ChampionshipMod := p.PlayMod.getChampshipMod() + aid := ChampionshipMod.AId + var items []*item.Item + items = p.GetChampshipReward(aid) + if len(items) > 0 { + p.SendActivityMail2(items, "backend_championship_mail_title", "backend_championship_mail_content") + p.PushClientRes(p.GetMailMod().BackData()) + } + p.PlayMod.getChampshipMod().ZeroUpdate(todayActivityId) +} + +func (p *Player) GetChampshipReward(id int) []*item.Item { + ChampionshipMod := p.PlayMod.getChampshipMod() + if id == 0 { // 兼容旧数据，之前没有活动id的只要发放一次奖励 + DecorateMod := p.PlayMod.getDecorateMod() + orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) + return ChampionshipMod.GetReward(0, orderFactor) + } + if ChampionshipMod == nil { + return nil + } + cfg := G_GameLogicPtr.ActivityMgr.GetChampshipCfg(id) + if cfg == nil { + return nil + } + DecorateMod := p.PlayMod.getDecorateMod() + orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) + var maxRewardId int + var items []*item.Item + for _, v := range cfg.GetJackpotList() { + if ChampionshipMod.GetScore() >= int(v.Total) && int(v.Id) > ChampionshipMod.GetRewardId() { + maxRewardId = int(v.Id) + items = item.Merge(items, item.MsgToItem(v.Items)) + if v.StarReward > 0 { + itemNum := GoUtil.FormatStarItemNum(int(v.StarReward), orderFactor) + starItem := item.NewItem(item.ITEM_STAR_ID, itemNum) + items = item.Merge(items, []*item.Item{starItem}) + } + } + } + ChampionshipMod.SetRewardId(maxRewardId) + return items +} + +func (p *Player) GetChampshipRankReward(rank, aid int) ([]*item.Item, error) { + ChampionshipMod := p.PlayMod.getChampshipMod() + if aid == 0 { // 兼容旧数据，之前没有活动id的只要发放一次奖励 + return ChampionshipMod.GetRankReward(rank, aid) + } + if ChampionshipMod == nil { + return nil, fmt.Errorf("championship mod is nil") + } + if ChampionshipMod.HasRankReward() { + return nil, fmt.Errorf("rank reward has been received") + } + cfg := G_GameLogicPtr.ActivityMgr.GetChampshipCfg(aid) + if cfg == nil { + return nil, fmt.Errorf("championship config is nil") + } + ChampionshipMod.SetRankReward() + rankRewardList := cfg.GetRankList() + var items []*item.Item + for _, v := range rankRewardList { + if rank <= int(v.Max) && rank >= int(v.Min) { + items = item.Merge(items, item.MsgToItem(v.Items)) + return items, nil + } + } + return nil, fmt.Errorf("no rank reward found for rank %d", rank) +} + func (p *Player) GetDailyTaskActivityId() int { var activityId int activiyCfgList := G_GameLogicPtr.ActivityMgr.GetActivityList() @@ -508,3 +655,24 @@ func (p *Player) GetDailyTaskActivityId() int { } return activityId } + +// 猫猫回礼返回 +func (p *Player) CatReturnGiftBackData() { + activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT) + if activityInfo == nil { + return + } + cfg := G_GameLogicPtr.ActivityMgr.GetCatReturnGiftCfg(activityInfo.Id) + if cfg == nil { + return + } + CatReturnGiftMod := p.GetCatReturnGiftMod() + res := &msg.ResCatReturnGift{ + StartTime: activityInfo.StartT, + EndTime: activityInfo.EndT, + Cfg: cfg, + Score: int32(CatReturnGiftMod.GetScore()), + Reward: int32(CatReturnGiftMod.GetReward()), + } + p.PushClientRes(res) +} diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go index 31dda126..e21c42ac 100644 --- a/src/server/game/activity_mgr.go +++ b/src/server/game/activity_mgr.go @@ -3,13 +3,16 @@ package game import ( "fmt" "server/db" + "server/game/mod/activity" "server/game/mod/msg" Msg "server/game/mod/msg" + GoUtil "server/game_util" protoMsg "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sync" - "google.golang.org/protobuf/proto" + "gitea.bywaystudios.com/pet_home/leaf/log" + + "google.golang.org/protobuf/encoding/protojson" ) type ActivityMgr struct { @@ -23,6 +26,7 @@ type ActivityData struct { type ActivityCfg struct { Id int + AId int Type int Startime int64 Endtime int64 @@ -31,6 +35,7 @@ type ActivityCfg struct { MailTitle string MailContent string cfg interface{} + Interval int64 Extra map[string]interface{} } @@ -63,7 +68,24 @@ func (r *ActivityMgr) GetActivityList() []ActivityCfg { data.mu.Lock() defer data.mu.Unlock() list := make([]ActivityCfg, 0, len(data.List)) + now := GoUtil.Now() for _, v := range data.List { + //循环活动，重新计算活动时间 + if v.Interval > 0 { + if now > v.Endtime { + //活动已结束，计算下一次活动时间 + interval := (now - v.Startime) / v.Interval + v.Startime += interval * v.Interval + v.Endtime += interval * v.Interval + if now > v.Endtime { + v.Startime += v.Interval + v.Endtime += v.Interval + } + } + v.AId = int(v.Startime) //活动id用开始时间表示，方便客户端排序 + } else { + v.AId = v.Id + } list = append(list, *v) } return list @@ -111,10 +133,17 @@ func (r *ActivityMgr) Reload() error { MailTitle: v.MailTitle, MailContent: v.MailContent, cfg: activityCfg, + Interval: v.Interval, } log.Debug("load activity cfg: %v", cfg) data.List[v.Id] = cfg } + go func() { + actList := r.GetActivityList() + for _, v := range actList { + log.Debug("activity load success: type :%d, id :%d, startTime :%s, endTime :%s", v.Type, v.Id, GoUtil.FormatTime(v.Startime), GoUtil.FormatTime(v.Endtime)) + } + }() G_GameLogicPtr.NotifyAll(&Msg.Msg{Type: Msg.HANDLE_TYPE_ACTIVITY_RELOAD}) return nil } @@ -126,7 +155,21 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) { switch atype { case 1: cfg := &protoMsg.MiningCfg{} - err := proto.Unmarshal(buf, cfg) + err := protojson.Unmarshal(buf, cfg) + if err != nil { + return nil, err + } + return cfg, nil + case 9: + cfg := &protoMsg.ChampionshipCfg{} + err := protojson.Unmarshal(buf, cfg) + if err != nil { + return nil, err + } + return cfg, nil + case 10: + cfg := &protoMsg.CatReturnGiftCfg{} + err := protojson.Unmarshal(buf, cfg) if err != nil { return nil, err } @@ -134,3 +177,32 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) { } return nil, nil } + +func (r *ActivityMgr) GetCatReturnGiftCfg(id int) *protoMsg.CatReturnGiftCfg { + data := r.getData() + data.mu.Lock() + defer data.mu.Unlock() + for _, v := range data.List { + if v.Type == activity.ACT_TYPE_CAT_RETURN_GIFT && v.Id == id { + if cfg, ok := v.cfg.(*protoMsg.CatReturnGiftCfg); ok { + return cfg + } + } + } + return nil +} + +func (r *ActivityMgr) GetChampshipCfg(id int) *protoMsg.ChampionshipCfg { + data := r.getData() + data.mu.Lock() + defer data.mu.Unlock() + for _, v := range data.List { + if v.Type == activity.ACT_TYPE_CHAMPION && v.Id == id { + if cfg, ok := v.cfg.(*protoMsg.ChampionshipCfg); ok { + cfg.Title = v.Title + return cfg + } + } + } + return nil +} diff --git a/src/server/game/admin.go b/src/server/game/admin.go index 21de05c0..5c00ded4 100644 --- a/src/server/game/admin.go +++ b/src/server/game/admin.go @@ -11,10 +11,12 @@ import ( GoUtil "server/game_util" "server/gamedata" "server/msg" - "server/pkg/github.com/name5566/leaf/gate" - "server/pkg/github.com/name5566/leaf/log" "time" + "gitea.bywaystudios.com/pet_home/leaf/gate" + + "gitea.bywaystudios.com/pet_home/leaf/log" + "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/mem" "google.golang.org/protobuf/proto" @@ -348,3 +350,93 @@ func AdminShipping(req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) { } return res, nil } + +func AdminPlayerDetailInfo(req *msg.UserDetailParam) (*msg.ResUserDetail, error) { + player := G_GameLogicPtr.GetPlayer(req.Uid) + online := true + if player == nil { + player = new(Player) + player.M_DwUin = req.Uid + player.InitPlayerOnly() + player.ZeroUpdate(nil) + online = false + } + banTime := db.GetPlayerBan(player.PlayMod.getBaseMod().Account) + actLog := make([]*msg.ActLog, 0, len(player.PlayMod.getFriendMod().ActivityLog)) + for _, v := range player.PlayMod.getFriendMod().ActivityLog { + actLog = append(actLog, &msg.ActLog{ + Type: int32(v.Type), + Time: v.Time, + Param: v.Param, + }) + } + info := &msg.ResUserDetailInfo{ + Name: player.PlayMod.getBaseMod().Account, + Uid: player.M_DwUin, + AreaId: int32(player.PlayMod.getDecorateMod().GetAreaId()), + Face: int32(player.PlayMod.getFaceMod().SetId), + Charge: int32(player.PlayMod.getChargeMod().Charge), + MaxCharge: int32(player.PlayMod.getChargeMod().MaxCharge), + Level: int32(player.GetBaseMod().GetLevel()), + Diamond: int64(player.GetBaseMod().GetDiamond()), + Star: int32(player.GetBaseMod().GetStar()), + Energy: int32(player.GetBaseMod().GetEnergy()), + Mac: player.GetBaseMod().DiviceId, + Login: int64(player.GetBaseMod().LoginTime), + Cumulative: int64(player.PlayMod.getBaseMod().Cumulative), + RegisterTime: player.GetPlayerBaseMod().GetRegisterTime(), + TodayCumulative: int64(player.PlayMod.getBaseMod().TodayCumulative), + Ban: banTime > GoUtil.Now() || banTime == -1, + Bonus: int32(player.PlayMod.getLimitedTimeEventMod().Progress), + Code: player.PlayMod.getBaseMod().AddCode, + ActLog: actLog, + AdWatch: int32(player.PlayMod.getKvMod().GetAdValue()), + ChessMap: player.PlayMod.getChessMod().ChessMap, + } + + if online { + info.Cumulative = int64(player.PlayMod.getBaseMod().Cumulative) + GoUtil.Now() - int64(player.PlayMod.getBaseMod().LoginTime) + info.TodayCumulative = int64(player.PlayMod.getBaseMod().TodayCumulative) + GoUtil.Now() - int64(player.PlayMod.getBaseMod().LoginTime) + } + + friendList := player.PlayMod.getFriendMod().NewFriendList + info.FriendList = make([]*msg.UserDetailFriendInfo, 0, len(friendList)) + for uid := range friendList { + ps := G_GameLogicPtr.GetSimplePlayerByUid(uid) + if ps == nil { + continue + } + info.FriendList = append(info.FriendList, &msg.UserDetailFriendInfo{ + Uid: int64(uid), + NickName: ps.Name, + Avatar: int32(ps.Face), + Level: int32(ps.Level), + LogoutTime: ps.Loginout, + LoginTime: ps.Login, + }) + } + + orderList := player.PlayMod.getOrderMod().OrderList + info.Order = make([]*msg.UserDetailOrderInfo, 0, len(orderList)) + for orderID, order := range orderList { + chessArr := make([]*msg.UserDetailOrderInfoChess, 0, len(order.MergeId)) + for _, chessID := range order.MergeId { + chessArr = append(chessArr, &msg.UserDetailOrderInfoChess{ + Id: int32(chessID), + }) + } + info.Order = append(info.Order, &msg.UserDetailOrderInfo{ + Id: fmt.Sprint(orderID), + Type: int32(order.Type), + Time: order.Timestamp, + Chess: chessArr, + Diff: int32(order.Diff), + }) + } + + return &msg.ResUserDetail{ + Code: 0, + Msg: "ok", + Info: info, + }, nil +} diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go index 209dbfc9..7d8acff2 100644 --- a/src/server/game/champship_mgr.go +++ b/src/server/game/champship_mgr.go @@ -14,10 +14,11 @@ import ( "server/game/mod/msg" GoUtil "server/game_util" proto "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sort" "sync" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( @@ -40,6 +41,7 @@ type ChampshipData struct { Robot map[int]*ChampshipRobot // 机器人 PreRobot map[int]*ChampshipRobot // 机器人 备份 ZeroTime int64 + Version int } type ChampshipRank struct { @@ -47,6 +49,7 @@ type ChampshipRank struct { Score float64 Time int64 Type int + Rank int } type ChampshipRobot struct { @@ -95,6 +98,7 @@ func (c *ChampshipMgr) Init() { } // 注册处理函数 c.init() + c.version() now := GoUtil.Now() zeroTime := GoUtil.ZeroTimestamp() if c.getData().ZeroTime != zeroTime { @@ -116,6 +120,44 @@ func (c *ChampshipMgr) Init() { }) } +func (c *ChampshipMgr) version() { + if c.data.(*ChampshipData).Version == 0 { + c.data.(*ChampshipData).Version = 1 + for _, v := range c.data.(*ChampshipData).Rank { + sortChampionshipRank(v) + for _, info := range v { + if info.Type != RANK_PLAYER_ROBOT { + c.SetRankCache(info.Uid) + } + } + } + for _, v := range c.data.(*ChampshipData).PreRank { + sortChampionshipRank(v) + for _, info := range v { + if info.Type != RANK_PLAYER_ROBOT { + c.SetRankCache(info.Uid) + } + } + } + } +} + +func sortChampionshipRank(rankList []*ChampshipRank) { + rank := 1 + lastRank := 1 + lastScore := 0.0 + for _, v := range rankList { + if v.Score == lastScore { + v.Rank = lastRank + } else { + v.Rank = rank + lastRank = rank + lastScore = v.Score + } + rank++ + } +} + // 每天零点30分通知所有在线玩家领取奖励 func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) { NotifyAllPlayerMsg(&msg.Msg{ @@ -229,6 +271,7 @@ func (c *ChampshipMgr) ai() (interface{}, error) { Robot.Time = now } r.Score += AddScore + r.Score = math.Round(r.Score) } else { notify[r.Uid] = e } @@ -241,6 +284,7 @@ func (c *ChampshipMgr) ai() (interface{}, error) { } return false }) + sortChampionshipRank(v) for e, r := range v { if r.Type == RANK_PLAYER_ROBOT { continue @@ -283,7 +327,7 @@ func (c *ChampshipMgr) GetPreRankMsg(uid int) *proto.ResChampshipPreRank { RL := make(map[int32]*proto.ResPlayerRank, 0) for k, v := range RankList { if v.Uid == uid { - myRank = k + 1 + myRank = v.Rank myScore = v.Score } if v.Type == RANK_PLAYER_ROBOT { @@ -312,6 +356,7 @@ func (c *ChampshipMgr) GetPreRankMsg(uid int) *proto.ResChampshipPreRank { FurSet: int32(robot.FurSet), PetName: robot.PetName, Last: last, + Rank: int32(v.Rank), } } else { simplePlayer := G_GameLogicPtr.GetSimplePlayerByUid(v.Uid) @@ -339,6 +384,7 @@ func (c *ChampshipMgr) GetPreRankMsg(uid int) *proto.ResChampshipPreRank { FurSet: int32(simplePlayer.PetFur), PetName: simplePlayer.PetName, Last: last, + Rank: int32(v.Rank), } } } @@ -368,7 +414,7 @@ func (c *ChampshipMgr) GetRankMsg(uid int) *proto.ResChampshipRank { RL := make(map[int32]*proto.ResPlayerRank, 0) for k, v := range rankList { if v.Uid == uid { - myRank = k + 1 + myRank = v.Rank myScore = v.Score } if v.Type == RANK_PLAYER_ROBOT { @@ -397,6 +443,7 @@ func (c *ChampshipMgr) GetRankMsg(uid int) *proto.ResChampshipRank { FurSet: int32(robot.FurSet), PetName: robot.PetName, Last: last, + Rank: int32(v.Rank), } } else { simplePlayer := G_GameLogicPtr.GetSimplePlayerByUid(v.Uid) @@ -424,6 +471,7 @@ func (c *ChampshipMgr) GetRankMsg(uid int) *proto.ResChampshipRank { FurSet: int32(simplePlayer.PetFur), PetName: simplePlayer.PetName, Last: last, + Rank: int32(v.Rank), } } } @@ -530,7 +578,7 @@ func (c *ChampshipMgr) group(iszero bool) (interface{}, error) { ChampshipData.Robot[ChampshipData.RobotId] = v ChampshipData.Rank[j] = append(ChampshipData.Rank[j], &ChampshipRank{ Uid: ChampshipData.RobotId, - Score: v.Score, + Score: math.Round(v.Score), Time: v.Time, Type: RANK_PLAYER_ROBOT, }) @@ -542,6 +590,7 @@ func (c *ChampshipMgr) group(iszero bool) (interface{}, error) { } return false }) + sortChampionshipRank(ChampshipData.Rank[j]) } } @@ -634,6 +683,8 @@ func (c *ChampshipMgr) inRank(m *msg.Msg) (interface{}, error) { } return false }) + // 重新排序 相同分数排名相同 + sortChampionshipRank(rankList) ChampshipData.Rank[groupId] = rankList // 收集需要通知的玩家 @@ -668,9 +719,9 @@ func (c *ChampshipMgr) getMyRank(uid int) int { if !ok { return 0 } - for k, v := range rankList { + for _, v := range rankList { if v.Uid == uid { - return k + 1 + return v.Rank } } return 0 @@ -686,9 +737,9 @@ func (c *ChampshipMgr) unsafe_getMyRank(uid int) int { if !ok { return 0 } - for k, v := range rankList { + for _, v := range rankList { if v.Uid == uid { - return k + 1 + return v.Rank } } return 0 @@ -706,9 +757,9 @@ func (c *ChampshipMgr) getLastMyRank(uid int) int { if !ok { return 0 } - for k, v := range rankList { + for _, v := range rankList { if v.Uid == uid { - return k + 1 + return v.Rank } } return 0 @@ -723,9 +774,9 @@ func (c *ChampshipMgr) unsafe_getLastMyRank(uid int) int { if !ok { return 0 } - for k, v := range rankList { + for _, v := range rankList { if v.Uid == uid { - return k + 1 + return v.Rank } } return 0 diff --git a/src/server/game/charge_func.go b/src/server/game/charge_func.go index ce6f4ad9..8d945e98 100644 --- a/src/server/game/charge_func.go +++ b/src/server/game/charge_func.go @@ -17,9 +17,10 @@ import ( "server/game/mod/quest" GoUtil "server/game_util" proto "server/msg" - "server/pkg/github.com/name5566/leaf/log" "strings" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) func (p *Player) Charge(chargeId int) { diff --git a/src/server/game/common.go b/src/server/game/common.go index d55c1003..230960be 100644 --- a/src/server/game/common.go +++ b/src/server/game/common.go @@ -3,8 +3,9 @@ package game import ( "reflect" "server/game/internal" - "server/pkg/github.com/name5566/leaf/gate" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/gate" ) const ( @@ -17,6 +18,10 @@ const ( onehour = 3600 oneday = 24 * onehour sevendays = 7 * oneday + month = 30 * oneday + halfyear = 6 * month + oneyear = 365 * oneday + tenyear = 10 * oneyear ) // 解析参数 diff --git a/src/server/game/external.go b/src/server/game/external.go index a599c31a..fb6b2733 100644 --- a/src/server/game/external.go +++ b/src/server/game/external.go @@ -12,9 +12,11 @@ import ( "server/msg" - "server/pkg/github.com/name5566/leaf/gate" - "server/pkg/github.com/name5566/leaf/log" + "gitea.bywaystudios.com/pet_home/leaf/gate" + "gitea.bywaystudios.com/pet_home/leaf/log" + + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "server/db" @@ -110,8 +112,12 @@ func HandleClientReq(args []interface{}) { case "ReqAdminInfo": // 后台接口 AdminProcess(m.GetFunc(), []interface{}{a, buf}) case "ReqLoginCode": - Detail := &msg.ReqLoginCode{} - proto.Unmarshal(buf, Detail) + detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf) + if err != nil { + log.Error("unmarshal %s failed: %v", m.GetFunc(), err) + return + } + Detail := detailMsg.(*msg.ReqLoginCode) Code, err := GeneratedCode(Detail.TelPhone) ResLoginCode := &msg.ResLoginCode{} if err != nil { @@ -125,8 +131,8 @@ func HandleClientReq(args []interface{}) { G_GameLogicPtr.SendServerVersion(a) case "ReqRegisterAccount": detail := &msg.ReqRegisterAccount{} - log.Debug("player %s start register", detail.UserName) proto.Unmarshal(buf, detail) + log.Debug("player %s start register", detail.UserName) gl := G_getGameLogic() defer func() { if r := recover(); r != nil { @@ -226,7 +232,16 @@ func HandleClientReq(args []interface{}) { p.(*Player).args = make(map[string]interface{}) p.(*Player).args["func"] = m p.(*Player).args["agent"] = a - err := RunNetProcessByKey(m.GetFunc(), []interface{}{a, buf}) + detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf) + if err != nil { + log.Error("uid : %d, func : %s, unmarshal error : %s", p.(*Player).M_DwUin, m.GetFunc(), err) + p.(*Player).TeLog("func_unmarshal_error", map[string]interface{}{ + "method_name": m.GetFunc(), + "error_info": err.Error(), + }) + return + } + err = RunNewNetProcessByKey(m.GetFunc(), p.(*Player), &detailMsg) if err != nil { log.Error("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err) p.(*Player).TeLog("func_exec_error", map[string]interface{}{ @@ -236,10 +251,16 @@ func HandleClientReq(args []interface{}) { p.(*Player).Recover(backup) //还原Player的数据 return } + str := "" + if conf.Server.GameName == "pet_home" || conf.Server.GameName == "merge_pet_sdk" { + strbuf, _ := protojson.Marshal(detailMsg) + str = string(strbuf) + } p.(*Player).ProcessTrigger() p.(*Player).TeLog("func_exec_time", map[string]interface{}{ "method_name": m.GetFunc(), "exec_time": fmt.Sprintf("%v", time.Since(start)), + "proto": str, }) } } diff --git a/src/server/game/friend_func.go b/src/server/game/friend_func.go index b9e75557..7e70456c 100644 --- a/src/server/game/friend_func.go +++ b/src/server/game/friend_func.go @@ -5,8 +5,9 @@ import ( "server/db" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) func (p *Player) GetVisitorPlayer() int { @@ -34,6 +35,9 @@ func (p *Player) GetVisitorPlayer() int { if GoUtil.InArray(k, todayVisitedUsers) { continue } + if GoUtil.InArray(k, PlayroomMod.RandVisitor) { + continue + } if v.Time < now-86400 { continue } @@ -65,6 +69,9 @@ func (p *Player) GetVisitorPlayer() int { if GoUtil.InArray(uid, todayVisitedUsers) { continue } + if GoUtil.InArray(uid, PlayroomMod.RandVisitor) { + continue + } ps := G_GameLogicPtr.GetSimplePlayerByUid(uid) if ps == nil { continue @@ -301,6 +308,11 @@ func GetRecommendPlayer(p *Player, num int) []int { endFilterList = notChargeNotWatchAdFilterFunc(chargeFilterList) } } + } else { + endFilterList = make([]int, 0, len(chargeFilterList)) + for _, ps := range chargeFilterList { + endFilterList = append(endFilterList, ps.Uid) + } } recommendList := GoUtil.RandSliceNum(endFilterList, num) diff --git a/src/server/game/friend_mgr.go b/src/server/game/friend_mgr.go index 48564f80..286240c3 100644 --- a/src/server/game/friend_mgr.go +++ b/src/server/game/friend_mgr.go @@ -6,7 +6,8 @@ import ( "server/conf" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type FriendMgr struct { diff --git a/src/server/game/game_type.go b/src/server/game/game_type.go index 228b5de2..7bc14fe9 100644 --- a/src/server/game/game_type.go +++ b/src/server/game/game_type.go @@ -87,6 +87,7 @@ type ActivityInfo struct { StartT int64 EndT int64 Id int + AId int Type int Title string Name string diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 628b4ad7..bda7fa03 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -31,18 +31,15 @@ import ( "server/game/mod/playroom" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "strconv" "strings" "time" - "google.golang.org/protobuf/proto" + "gitea.bywaystudios.com/pet_home/leaf/log" ) -func ReqGmCommand(player *Player, buf []byte) error { - detail := &msg.ReqGmCommand{} - proto.Unmarshal(buf, detail) - return ReqGmCommand_(player, detail.Command) +func ReqGmCommand(player *Player, req *msg.ReqGmCommand) error { + return ReqGmCommand_(player, req.Command) } func ReqGmCommand_(player *Player, Command string) error { // defer func() { @@ -359,7 +356,7 @@ func ReqGmCommand_(player *Player, Command string) error { player.RaceBackData() case "playroomReset": PlayroomMod := playroom.PlayroomMod{} - PlayroomMod.InitData() + PlayroomMod.InitData(player.M_DwUin, player.PlayerBaseMod.GetRegisterTime()) player.PlayMod.mod_list.Playroom = PlayroomMod case "resetCollect": CollectMod := player.PlayMod.getCollectMod() @@ -531,10 +528,8 @@ func ReqGmCommand_(player *Player, Command string) error { BaseMod.Uid = Uid case "copyUser": p1 := new(Player) - err := p1.InitPlayer(arg[1]) - if err != nil { - return err - } + p1.M_DwUin = int64(GoUtil.Int(arg[1])) + p1.InitPlayerOnly() BaseMod := p1.PlayMod.getBaseMod() BaseMod.Uid = player.M_DwUin BaseMod.NickName = player.PlayMod.getBaseMod().NickName @@ -655,6 +650,11 @@ func ReqGmCommand_(player *Player, Command string) error { Id, _ := strconv.Atoi(arg[1]) player.PlayMod.getInviteMod().AddInvite(Id) player.PushClientRes(player.PlayMod.getInviteMod().NotifySuccess()) + case "resetCatReturnGift": + CatReturnGiftMod := player.GetCatReturnGiftMod() + CatReturnGiftMod.AId = 0 + player.CatReturnGiftLogin() + player.CatReturnGiftBackData() case "championshipResult": uid, _ := strconv.Atoi(arg[1]) FriendMgrSend(&MsgMod.Msg{ @@ -664,6 +664,8 @@ func ReqGmCommand_(player *Player, Command string) error { From: uid, Extra: []int{2, 145}, }) + case "resetKv": + player.PlayMod.mod_list.Kv.Data = make(map[int]string) case "debugBeckmarkMsg": for i := 0; i < 1000000; i++ { for j := 0; j < 10; j++ { @@ -675,9 +677,13 @@ func ReqGmCommand_(player *Player, Command string) error { }) } } + case "catScore": + score := GoUtil.Int(arg[1]) + player.GetCatReturnGiftMod().AddScore(score) + player.CatReturnGiftBackData() case "debugLogoutMsg": - ToUid, _ := strconv.Atoi(arg[1]) - uidList, err := db.GetDebugPlayer(ToUid) + toUid, _ := strconv.Atoi(arg[1]) + uidList, err := db.GetDebugPlayer(toUid) if err != nil { log.Error("GetDebugPlayer err:%s", err.Error()) return err @@ -687,13 +693,13 @@ func ReqGmCommand_(player *Player, Command string) error { Type: MsgMod.HANDLE_TYPE_APPLY, SendT: GoUtil.Now(), From: uid, - To: ToUid, + To: toUid, }) FriendMgrSend(&MsgMod.Msg{ Type: MsgMod.HANDLE_TYPE_HANDBOOK_COLLECTION, SendT: GoUtil.Now(), From: uid, - To: ToUid, + To: toUid, }) } default: diff --git a/src/server/game/internal/chanrpc.go b/src/server/game/internal/chanrpc.go index 9f4f7e1f..3386c977 100644 --- a/src/server/game/internal/chanrpc.go +++ b/src/server/game/internal/chanrpc.go @@ -5,7 +5,7 @@ import ( GoUtil "server/game_util" "sync" - "server/pkg/github.com/name5566/leaf/gate" + "gitea.bywaystudios.com/pet_home/leaf/gate" ) var Agents = sync.Map{} diff --git a/src/server/game/internal/module.go b/src/server/game/internal/module.go index d5074b39..4633c765 100644 --- a/src/server/game/internal/module.go +++ b/src/server/game/internal/module.go @@ -4,7 +4,7 @@ import ( "server/base" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/module" + "gitea.bywaystudios.com/pet_home/leaf/module" ) var ( diff --git a/src/server/game/limited_time_trigger.go b/src/server/game/limited_time_trigger.go index 43b7e824..2b9de489 100644 --- a/src/server/game/limited_time_trigger.go +++ b/src/server/game/limited_time_trigger.go @@ -119,16 +119,22 @@ func (p *Player) LimitedTimeCardTrigger() { case card.STATUS_CARD_EX_1: delete(FriendMod.Card, k) FriendMgrSend(&MsgMod.Msg{ - From: v.BUid, - To: v.AUid, - Type: MsgMod.HANDLE_TYPE_EX_CARD_SELECT_TIMEOUT, + From: v.BUid, + To: v.AUid, + Type: MsgMod.HANDLE_TYPE_EX_CARD_SELECT_TIMEOUT, + SendT: GoUtil.Now(), + End: GoUtil.Now() + tenyear, + Extra: *v, }) case card.STATUS_CARD_EX_2: delete(FriendMod.Card, k) FriendMgrSend(&MsgMod.Msg{ - From: v.AUid, - To: v.BUid, - Type: MsgMod.HANDLE_TYPE_EX_CARD_TIMEOUT, + From: v.AUid, + To: v.BUid, + Type: MsgMod.HANDLE_TYPE_EX_CARD_TIMEOUT, + SendT: GoUtil.Now(), + End: GoUtil.Now() + tenyear, + Extra: *v, }) p.AddCard(v.CardId) CardMod.DelExCard(v) diff --git a/src/server/game/mail_mgr.go b/src/server/game/mail_mgr.go index 40ea2957..1b7cd7d7 100644 --- a/src/server/game/mail_mgr.go +++ b/src/server/game/mail_mgr.go @@ -6,8 +6,9 @@ import ( "server/game/mod/item" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" "strings" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index 7ae40c8b..b02d26c8 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -25,8 +25,9 @@ import ( "server/game/mod/playroom" GoUtil "server/game_util" proto "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) // 处理玩家异步请求 @@ -97,7 +98,7 @@ func (p *Player) handle(m *msg.Msg) error { case msg.HANDLE_TYPE_DEL: // 删除好友 FriendMod := p.PlayMod.getFriendMod() FriendMod.DelFriend(m.From) - p.AddLog(m.From, friend.LOG_TYPE_FRIEND_APPLY, "", m.SendT) + //p.AddLog(m.From, friend.LOG_TYPE_FRIEND_DELETE, "", m.SendT) playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendApplyNotify{ Player: playerSimpleData, @@ -155,7 +156,11 @@ func (p *Player) handle(m *msg.Msg) error { p.PlayMod.save() p.PushClientRes(InviteMod.NotifySuccess()) case msg.HANDLE_TYPE_SEND_CARD: // B收到A赠送的卡牌 - cardInfo := m.Extra.(card.CardInfo) + cardInfo, ok := m.Extra.(card.CardInfo) + if !ok { + log.Error("Failed to cast m.Extra to card.CardInfo") + return nil + } FriendMod := p.PlayMod.getFriendMod() FriendMod.SetCardInfo(&cardInfo) FriendMod.Interact(cardInfo.AUid, friend.INTERACT_TYPE_CARD, m.SendT) @@ -166,7 +171,11 @@ func (p *Player) handle(m *msg.Msg) error { ) p.PlayMod.save() case msg.HANDLE_TYPE_EX_CARD_SELECT_TIMEOUT: // A收到B置换卡牌选择超时 - cardInfo := m.Extra.(card.CardInfo) + cardInfo, ok := m.Extra.(card.CardInfo) + if !ok { + log.Error("Failed to cast m.Extra to card.CardInfo") + return nil + } CardMod := p.PlayMod.getCardMod() p.AddCard(cardInfo.CardId) CardMod.DelExCard(&cardInfo) @@ -175,6 +184,7 @@ func (p *Player) handle(m *msg.Msg) error { case msg.HANDLE_TYPE_EX_CARD_TIMEOUT: // B收到A同意置换卡牌超时 cardInfo, ok := m.Extra.(card.CardInfo) if !ok { + log.Error("Failed to cast m.Extra to card.CardInfo") return nil } CardMod := p.PlayMod.getCardMod() @@ -184,6 +194,7 @@ func (p *Player) handle(m *msg.Msg) error { case msg.HANDLE_TYPE_REG_CARD_FINISH, msg.HANDLE_TYPE_AGREE_CARD_FAIL: // B收到A的请求已结束 cardInfo, ok := m.Extra.(card.CardInfo) if !ok { + log.Error("Failed to cast m.Extra to card.CardInfo") return nil } FriendMod := p.PlayMod.getFriendMod() diff --git a/src/server/game/message_mgr.go b/src/server/game/message_mgr.go index ac578544..4e7a6323 100644 --- a/src/server/game/message_mgr.go +++ b/src/server/game/message_mgr.go @@ -8,9 +8,10 @@ import ( "server/conf" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" "sync" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) var id = 1 @@ -89,6 +90,8 @@ func (m *MessageMgr) MessageMgrInit() { // 注册处理函数 m.init() + // 启动时 清空玩家登录信息 + m.data.(*MessageData).PlayerList = make(map[int64]int) m.handler = make(map[int]MessageHandlerFunc) m.middlewares = []MessageMiddleware{} // 初始化 Worker Pool (10个worker, 1000个队列大小) diff --git a/src/server/game/mod/activity/activity.go b/src/server/game/mod/activity/activity.go index a4d7e194..bcec093a 100644 --- a/src/server/game/mod/activity/activity.go +++ b/src/server/game/mod/activity/activity.go @@ -15,14 +15,16 @@ const ( ) const ( - ACT_TYPE_MINING = 1 // 挖矿 - ACT_TYPE_GUESS_COLOR = 2 // 猜颜色 - ACT_TYPE_RACE = 3 // 赛跑 - ACT_TYPE_DISCOUNT_GIFT = 4 // 折扣礼包 - ACT_TYPE_ADD_GIFT = 5 // 买一赠一礼包 - ACT_TYPE_SUPER_GIFT = 6 // 超值加购礼包 - ACT_TYPE_CATNIP = 7 // 猫草大作战 - ACT_TYPE_PASS = 8 // 通行证 + ACT_TYPE_MINING = 1 // 挖矿 + ACT_TYPE_GUESS_COLOR = 2 // 猜颜色 + ACT_TYPE_RACE = 3 // 赛跑 + ACT_TYPE_DISCOUNT_GIFT = 4 // 折扣礼包 + ACT_TYPE_ADD_GIFT = 5 // 买一赠一礼包 + ACT_TYPE_SUPER_GIFT = 6 // 超值加购礼包 + ACT_TYPE_CATNIP = 7 // 猫草大作战 + ACT_TYPE_PASS = 8 // 通行证 + ACT_TYPE_CHAMPION = 9 // 冠军赛 + ACT_TYPE_CAT_RETURN_GIFT = 10 // 喵喵回礼 ) const ( diff --git a/src/server/game/mod/card/Card.go b/src/server/game/mod/card/Card.go index dbbafdeb..cf856d48 100644 --- a/src/server/game/mod/card/Card.go +++ b/src/server/game/mod/card/Card.go @@ -6,7 +6,8 @@ import ( "server/game/mod/item" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type CardMod struct { @@ -45,6 +46,22 @@ const ( HANDBOOK_STATUS_GET = 2 // 已领取 ) +/* +请求卡牌 +AUid: 请求者 +BUid: 被请求者 +cardId: 请求的卡牌id +赠送卡牌 +AUid: 赠送者 +BUid: 接收者 +CardId: 卡牌id +卡牌交换 +AUid: 发起者 +BUid: 接收者 +CardId: 发起者提供的卡牌id +ExId: 接收者提供的卡牌id +*/ + const ( TYPE_CARD_GIVE = 1 // 请求卡牌 TYPE_CARD_SEND = 2 // 赠送卡牌 diff --git a/src/server/game/mod/cat_return_gift/cat_return_gift.go b/src/server/game/mod/cat_return_gift/cat_return_gift.go new file mode 100644 index 00000000..8a7aa6be --- /dev/null +++ b/src/server/game/mod/cat_return_gift/cat_return_gift.go @@ -0,0 +1,48 @@ +package catreturngift + +type CatReturnGiftMod struct { + Id int + AId int + Score int + Reward int +} + +func (c *CatReturnGiftMod) InitData() {} + +func (c *CatReturnGiftMod) ZeroUpdate(id, aid int) (int, int, int) { + return c.Login(id, aid) +} + +func (c *CatReturnGiftMod) Login(id, aid int) (int, int, int) { + oldId := c.Id + if aid == 0 { + c.AId = 0 + return oldId, 0, 0 + } + if c.AId == aid { + return 0, 0, 0 + } + score := c.Score + reward := c.Reward + c.AId = aid + c.Id = id + c.Score = 0 + c.Reward = 0 + return oldId, score, reward +} + +func (c *CatReturnGiftMod) GetReward() int { + return c.Reward +} + +func (c *CatReturnGiftMod) GetScore() int { + return c.Score +} + +func (c *CatReturnGiftMod) AddScore(score int) { + c.Score += score +} + +func (c *CatReturnGiftMod) SetReward(reward int) { + c.Reward = reward +} diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go index 9f2be749..e997b827 100644 --- a/src/server/game/mod/champship/Champship.go +++ b/src/server/game/mod/champship/Champship.go @@ -15,20 +15,19 @@ type ChampshipMod struct { RankReward bool PreMax int // 昨日最高档 Max int // 历史最高档 + AId int // 活动id + LastAId int // 上次活动id } func (c *ChampshipMod) InitData() {} -// isActive 判断当前是否在冠军赛活跃时段（零点后 5 分钟内为结算期，不计分） -func (c *ChampshipMod) isActive() bool { - return GoUtil.Now()-GoUtil.ZeroTimestamp() >= 300 -} - -func (c *ChampshipMod) ZeroUpdate() { +func (c *ChampshipMod) ZeroUpdate(aid int) { c.PreMax = c.Reward c.Score = 0 c.Reward = 0 c.RankReward = false + c.LastAId = c.AId + c.AId = aid } func (c *ChampshipMod) GetScore() int { @@ -39,14 +38,19 @@ func (c *ChampshipMod) GetRankReward(Rank, yesterdayActivityId int) ([]*item.Ite if c.RankReward { return nil, fmt.Errorf("rank reward has been received") } - c.RankReward = true + c.SetRankReward() return champshipCfg.GetRankReward(Rank, yesterdayActivityId), nil } +func (c *ChampshipMod) SetRankReward() { + c.RankReward = true +} + +func (c *ChampshipMod) HasRankReward() bool { + return c.RankReward +} + func (c *ChampshipMod) AddScore(chess []int) { - if !c.isActive() { - return - } score := 0 for _, v := range chess { Lv := mergeDataCfg.GetLvById(v) @@ -63,6 +67,13 @@ func (c *ChampshipMod) GetReward(activityId, orderFactor int) []*item.Item { return items } +func (c *ChampshipMod) GetRewardId() int { + return c.Reward +} + +func (c *ChampshipMod) SetRewardId(rewardId int) { + c.Reward = rewardId +} func (c *ChampshipMod) BackData(myRank, myPreRank, todayActivityId, yesterdayActivityId int) *msg.ResChampship { rankReward := 0 if c.RankReward { @@ -70,18 +81,12 @@ func (c *ChampshipMod) BackData(myRank, myPreRank, todayActivityId, yesterdayAct } else if myPreRank > 0 { rankReward = 1 } - status := 0 - if c.isActive() { - status = 1 - } return &msg.ResChampship{ Score: int32(c.Score), Reward: int32(c.Reward), - EndTime: int32(GoUtil.ZeroTimestamp() + 86400), Period: int32(GoUtil.GetServerOpenDay()), Rank: int32(myRank), RankReward: int32(rankReward), - Status: int32(status), TodayActivityId: int32(todayActivityId), YesterdayActivityId: int32(yesterdayActivityId), } @@ -94,3 +99,7 @@ func (c *ChampshipMod) GetH() int { func (c *ChampshipMod) GetN() int { return c.Max } + +func (c *ChampshipMod) GetAId() int { + return c.AId +} diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 720afc33..6103ace3 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -10,7 +10,8 @@ import ( "server/game/mod/order" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type ChargeMod struct { diff --git a/src/server/game/mod/daily_task/DailyTask.go b/src/server/game/mod/daily_task/DailyTask.go index 84406ce0..8a2ec057 100644 --- a/src/server/game/mod/daily_task/DailyTask.go +++ b/src/server/game/mod/daily_task/DailyTask.go @@ -7,8 +7,9 @@ import ( "server/game/mod/quest" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type DailyTaskMod struct { diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go index b5bfac39..bf0e2de5 100644 --- a/src/server/game/mod/decorate/Decorate.go +++ b/src/server/game/mod/decorate/Decorate.go @@ -98,7 +98,7 @@ func (d *Decorate) GetDecorateCostItem(areaId, decorateId int, decorateOffIsExis id := decorateCfg.GetIdBySenceAndLv(areaId, decorateId) if decorateOffIsExist { offRate := limitedTimeEventCfg.GetDecorateOffDiscount(areaId, decorateId) - itemNum = int(math.Ceil(float64(itemNum) * float64(offRate))) + itemNum = int(math.Round(float64(itemNum) * float64(offRate) / 100)) } items := []*item.Item{item.NewItem(item.ITEM_STAR_ID, itemNum)} partCostInfo := d.PartCost[id] @@ -157,7 +157,7 @@ func (d *Decorate) DecorateAll(star int, decorateOffIsExist bool) ([]*item.Item, needStar := decorateCfg.GetStarCost(d.AreaId, v) if decorateOffIsExist { offRate := limitedTimeEventCfg.GetDecorateOffDiscount(d.AreaId, v) - needStar = int(math.Ceil(float64(needStar) * float64(offRate))) + needStar = int(math.Round(float64(needStar) * float64(offRate) / 100)) } if star < needStar { break diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go index 23955cf1..bcf22fc2 100644 --- a/src/server/game/mod/friend/Friend.go +++ b/src/server/game/mod/friend/Friend.go @@ -61,6 +61,7 @@ type BubbleInfo struct { Time int64 // 气泡时间 Type int ItemList []*item.Item // 奖励物品 + Uid int // 相关玩家uid } type FriendInfo struct { @@ -225,16 +226,6 @@ func (f *FriendMod) InitData(m_DwUin int64) { if f.NewApplyList == nil { f.NewApplyList = make(map[int]*ApplyInfo) } - for k, v := range f.Card { - if v.AUid != 0 && !f.CheckFriend(v.AUid) && v.AUid != int(m_DwUin) { - delete(f.Card, k) - continue - } - if v.BUid != 0 && !f.CheckFriend(v.BUid) && v.BUid != int(m_DwUin) { - delete(f.Card, k) - continue - } - } if len(f.ReplyList) > 0 { validReplyList := make([]*ReplyInfo, 0, len(f.ReplyList)) @@ -273,6 +264,19 @@ func (f *FriendMod) version() { } } } + if f.Version == 1 { + f.Version = 2 + for _, v := range f.Bubble { + if v.Uid == 0 { + for _, log := range f.Log { + if log.Id == v.Id { + v.Uid = log.Uid + break + } + } + } + } + } } // 零点更新 @@ -387,6 +391,12 @@ func (f *FriendMod) DelFriend(id int) { v.Status = 1 } } + // 删除好友后清除卡牌交换 + for k, v := range f.Card { + if v.Type == card.TYPE_CARD_GIVE && id == v.AUid { + delete(f.Card, k) + } + } } // 检查是否好友 @@ -525,11 +535,11 @@ func (f *FriendMod) AddLog(uid, ltype int, param string, send int64) int { }) switch ltype { case LOG_TYPE_HANDBOOK_UPVOTE, LOG_TYPE_PLAYROOM_UPVOTE: - f.AddBubble(f.AutoId, ltype, nil) + f.AddBubble(f.AutoId, uid, ltype, nil) case LOG_TYPE_TREASURE_HELP: itemNum := GoUtil.RandNum(2, 5) items := []*item.Item{item.NewItem(item.ITEM_STAR_ID, itemNum)} - f.AddBubble(f.AutoId, ltype, items) + f.AddBubble(f.AutoId, uid, ltype, items) } if len(f.Log) > 30 { f.Log = f.Log[len(f.Log)-30:] @@ -538,9 +548,10 @@ func (f *FriendMod) AddLog(uid, ltype int, param string, send int64) int { } // 增加气泡 -func (f *FriendMod) AddBubble(id, bType int, items []*item.Item) { +func (f *FriendMod) AddBubble(id, uid, bType int, items []*item.Item) { f.Bubble[id] = &BubbleInfo{ Id: id, + Uid: uid, Time: GoUtil.Now(), Type: bType, ItemList: items, @@ -554,6 +565,7 @@ func (f *FriendMod) GetBubble(id int) *msg.FriendBubbleInfo { Id: int32(v.Id), Type: int32(v.Type), Items: item.ItemToMsg(v.ItemList), + Uid: int64(v.Uid), } } return nil @@ -566,6 +578,7 @@ func (f *FriendMod) BubbleBackData() *msg.ResFriendBubble { Id: int32(v.Id), Type: int32(v.Type), Items: item.ItemToMsg(v.ItemList), + Uid: int64(v.Uid), }) } return &msg.ResFriendBubble{ @@ -760,3 +773,7 @@ func (f *FriendMod) CheckGreeting(uid int) bool { } return false } + +func (f *FriendMod) GetCardList() map[string]*card.CardInfo { + return f.Card +} diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go index 88f32cda..a5b3f892 100644 --- a/src/server/game/mod/item/Item.go +++ b/src/server/game/mod/item/Item.go @@ -183,6 +183,20 @@ func ItemListToMsg(items []*Item) *msg.ItemList { } } +func MsgToItem(items []*msg.ItemInfo) []*Item { + if items == nil { + return nil + } + itemList := make([]*Item, 0, len(items)) + for _, v := range items { + itemList = append(itemList, &Item{ + Id: int(v.Id), + Num: int(v.Num), + }) + } + return itemList +} + // 道具叠加 func Merge(item1, item2 []*Item) []*Item { if item1 == nil { diff --git a/src/server/game/mod/kv/kv.go b/src/server/game/mod/kv/kv.go index 0ed22f0d..6700eac5 100644 --- a/src/server/game/mod/kv/kv.go +++ b/src/server/game/mod/kv/kv.go @@ -22,6 +22,9 @@ func (f *KvMod) SetVar(key int, value string) { if len(f.Data) > 150 { return } + if f.Data == nil { + f.Data = make(map[int]string) + } f.Data[key] = value } diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go index 3211a989..56148e39 100644 --- a/src/server/game/mod/playroom/playroom.go +++ b/src/server/game/mod/playroom/playroom.go @@ -10,6 +10,8 @@ import ( GoUtil "server/game_util" "server/msg" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type PlayroomMod struct { @@ -62,6 +64,8 @@ type PlayroomMod struct { TodayVisitedUsers []int // 今日已拜访过的用户 ADItem map[int]*ItemInfo WeeklyDiscount map[int]int // 每周折扣 + RandVisitor []int // 随机访客 + Version int // 版本 } type DressInfo struct { @@ -160,7 +164,7 @@ type Info struct { Times int } -func (p *PlayroomMod) InitData() { +func (p *PlayroomMod) InitData(uid, registerTime int64) { if p.Collect == nil { p.Collect = make(map[int]int) } @@ -181,24 +185,25 @@ func (p *PlayroomMod) InitData() { for _, v := range initCollect { p.NewCollect[v] = &CollectInfo{ Id: v, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: 1, } } } if len(p.Collect) > 0 { for k, v := range p.Collect { + ok := p.NewCollect[k] + if ok != nil { + continue + } p.NewCollect[k] = &CollectInfo{ Id: k, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: v, } } p.Collect = make(map[int]int) } - for _, v := range initCollect { - p.Collect[v] = 1 - } if p.Room == nil { p.Room = make(map[int]int) p.JackpotNum = playroomCfg.GetJackpotNum() @@ -233,7 +238,7 @@ func (p *PlayroomMod) InitData() { for _, v := range initPetAir { p.NewPetAir[v] = &PetAirInfo{ Id: v, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: 1, } } @@ -243,7 +248,7 @@ func (p *PlayroomMod) InitData() { for _, v := range p.PetAir { p.NewPetAir[v] = &PetAirInfo{ Id: v, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: 1, } } @@ -259,7 +264,7 @@ func (p *PlayroomMod) InitData() { p.NewDress[v] = &DressInfo{ Id: v, Part: part, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: 1, } } @@ -272,7 +277,7 @@ func (p *PlayroomMod) InitData() { p.NewDress[id] = &DressInfo{ Id: id, Part: part, - AddTime: GoUtil.Now(), + AddTime: registerTime, Num: 1, } } @@ -285,6 +290,34 @@ func (p *PlayroomMod) InitData() { if p.WeeklyDiscount == nil { p.WeeklyDiscount = make(map[int]int) } + p.version(uid, registerTime) +} + +func (p *PlayroomMod) version(uid, registerTime int64) { + if p.Version == 0 { + p.Version = 1 + for _, v := range p.NewCollect { + if v.Label == "" { + v.AddTime = registerTime + } + } + for k, v := range p.NewDress { + if v.Label == "" { + v.AddTime = registerTime + } + // 修复错误被初始化的服装 + if v.Label == "" && GoUtil.InArray(v.Id, []int{51, 52, 53, 54, 55}) { + log.Debug("version fix dress id %d for uid %d", v.Id, uid) + delete(p.NewDress, k) + } + } + for k, v := range p.DressSet { + if GoUtil.InArray(v, []int{51, 52, 53, 54, 55}) { + p.DressSet[k] = 0 + } + } + + } } func (p *PlayroomMod) ZeroUpdate() { @@ -327,9 +360,13 @@ func (p *PlayroomMod) InitDailyTask() { } } -func (p *PlayroomMod) QuestTrigger(tr *quest.Trigger) bool { +func (p *PlayroomMod) QuestTrigger(tr *quest.Trigger, areaId int) bool { update := false unlock := true + dailyTaskUnlockLv := playroomCfg.GetRoomDailyTaskUnlock() + if areaId < dailyTaskUnlockLv { + return false + } for k, v := range p.DailyTask { if !v.UnLock { continue @@ -449,6 +486,9 @@ func (p *PlayroomMod) AddChip(uid int, time int64, emoji int) { func (p *PlayroomMod) SetTarget(target int) { p.Target = target p.Status = STATUS_VISIT + if p.HasVisit == nil { + p.HasVisit = make(map[int]int64) + } p.HasVisit[target] = GoUtil.Now() } @@ -597,6 +637,7 @@ func (p *PlayroomMod) ResetGame() { p.GameReward = make(map[int]*item.Item) p.InteractNum = 0 p.RevengeUid = 0 + p.RandVisitor = nil } func (p *PlayroomMod) GetGameId() int { return p.GameId @@ -943,7 +984,7 @@ func (p *PlayroomMod) ShopBuy(id, num int, weeklyDiscount bool) ([]*item.Item, [ if addItemId == 0 { return nil, nil, fmt.Errorf("ShopBuy AddItemId is 0") } - if costItem == nil || len(costItem) == 0 { + if len(costItem) == 0 { return nil, nil, fmt.Errorf("ShopBuy CostItem is nil or length is 0") } newCostItem := costItem[0].Num * num @@ -1097,3 +1138,15 @@ func (p *PlayroomMod) AdWatch(Id int) error { func (p *PlayroomMod) ResetWeeklyDiscount() { p.WeeklyDiscount = make(map[int]int) } + +func (p *PlayroomMod) AddRandVisitor(id int) { + p.RandVisitor = append(p.RandVisitor, id) +} + +func (p *PlayroomMod) GetRandVisitor() []int { + return p.RandVisitor +} + +func (p *PlayroomMod) ResetRandVisitor() { + p.RandVisitor = make([]int, 0) +} diff --git a/src/server/game/mod_factory.go b/src/server/game/mod_factory.go index 3f56ed00..0148a338 100644 --- a/src/server/game/mod_factory.go +++ b/src/server/game/mod_factory.go @@ -4,6 +4,7 @@ import ( "server/game/mod/activity" "server/game/mod/base" "server/game/mod/card" + catreturngift "server/game/mod/cat_return_gift" "server/game/mod/champship" "server/game/mod/charge" "server/game/mod/chess" @@ -115,3 +116,7 @@ func (p *Player) GetCollectMod() *collect.Collect { func (p *Player) GetInviteMod() *invite.InviteMod { return p.PlayMod.getInviteMod() } + +func (p *Player) GetCatReturnGiftMod() *catreturngift.CatReturnGiftMod { + return &p.PlayMod.mod_list.CatReturnGift +} diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go index bcabde79..19e7afd2 100644 --- a/src/server/game/player_back.go +++ b/src/server/game/player_back.go @@ -3,6 +3,7 @@ package game import ( chargeCfg "server/conf/charge" playroomCfg "server/conf/playroom" + "server/game/mod/activity" "server/game/mod/item" limitedTimeEvent "server/game/mod/limited_time_event" GoUtil "server/game_util" @@ -310,7 +311,23 @@ func (p *Player) BackChampship() { ChampshipMod := p.PlayMod.getChampshipMod() rank, preRank := p.GetChampshipRank() todayActivityId, yesterdayActivityId := p.GetChampshipActivityId() - p.PushClientRes(ChampshipMod.BackData(rank, preRank, todayActivityId, yesterdayActivityId)) + activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CHAMPION) + res := ChampshipMod.BackData(rank, preRank, todayActivityId, yesterdayActivityId) + cfg := G_GameLogicPtr.ActivityMgr.GetChampshipCfg(todayActivityId) + res.EndTime = int32(GoUtil.ZeroTimestamp() + 86400) + if cfg != nil && GoUtil.Now()-GoUtil.ZeroTimestamp() >= int64(cfg.ClearTime) { + res.Status = 1 + } else { + cfg = G_GameLogicPtr.ActivityMgr.GetChampshipCfg(yesterdayActivityId) + } + if cfg != nil { + res.Title = cfg.Title + } + if activityInfo != nil { + res.EndTime = int32(activityInfo.EndT) + } + res.Cfg = cfg + p.PushClientRes(res) } // 获取冠军赛排名 redis缓存 diff --git a/src/server/game/player_base_mod.go b/src/server/game/player_base_mod.go index 55c6bcdf..cedc8ad1 100644 --- a/src/server/game/player_base_mod.go +++ b/src/server/game/player_base_mod.go @@ -15,9 +15,10 @@ import ( "server/game/mod/order" "server/game/mod/quest" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "time" + "gitea.bywaystudios.com/pet_home/leaf/log" + "google.golang.org/protobuf/proto" ) @@ -198,11 +199,8 @@ func (p *PlayerBaseData) GetMaxEnergy() int { // 更新游戏道具 -func (p *PlayerBaseData) ReqRemoveAd(player *Player, buf []byte) { - req := &msg.ReqRemoveAd{} +func (p *PlayerBaseData) ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) { res := &msg.ResRemoveAd{} - proto.Unmarshal(buf, req) - p.Data.NoAd = 1 res.ResultCode = 0 @@ -228,14 +226,8 @@ func (p *PlayerBaseData) ResPlayerBaseInfo(player *Player) { }) } -func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { - req := &msg.ReqBindFacebookAccount{} +func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, req *msg.ReqBindFacebookAccount) { res := &msg.ResBindFacebookAccount{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } - sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false @@ -269,13 +261,8 @@ func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, buf []byte) { G_getGameLogic().PackResInfo(agent, "ResBindFacebookAccount", data) } -func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { - req := &msg.ReqUnBindFacebook{} +func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) { res := &msg.ResUnBindFacebook{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } res.ResultCode = 0 res.BindAccountId = req.BindAccountId p.Data.FaceBookId = "" @@ -290,17 +277,12 @@ func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, buf []byte) { "platform_id": req.BindAccountId, }) } -func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { - req := &msg.ReqOnlyBindFacebook{} +func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBindFacebook) { res := &msg.ResOnlyBindFacebook{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false - err = db.SqlDb.Get(&sqlStruck, sqlStr, req.BindAccountId) + err := db.SqlDb.Get(&sqlStruck, sqlStr, req.BindAccountId) if err != nil { isHaveOther = false } else { @@ -355,13 +337,8 @@ func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, buf []byte) { G_getGameLogic().PackResInfo(agent, "ResOnlyBindFacebook", data) } -func (p *PlayerBaseData) ReqSynGameData(player *Player, buf []byte) { - req := &msg.ReqSynGameData{} +func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData) { res := &msg.ResSynGameData{} - err := proto.Unmarshal(buf, req) - if err != nil { - return - } sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?" sqlStruck := db.ResPlayerBaseInfo{} isHaveOther := false diff --git a/src/server/game/player_chess_mod.go b/src/server/game/player_chess_mod.go index 11726229..efe766c1 100644 --- a/src/server/game/player_chess_mod.go +++ b/src/server/game/player_chess_mod.go @@ -12,9 +12,10 @@ import ( "server/game/mod/quest" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sort" + "gitea.bywaystudios.com/pet_home/leaf/log" + "google.golang.org/protobuf/proto" ) @@ -50,9 +51,8 @@ func (p *PlayerChessData) ResChessColorData(player *Player) { } // 同步棋盘数据 -func (p *PlayerChessData) UpdatePlayerChessData(player *Player, buf []byte) error { - update := &msg.UpdatePlayerChessData{} - proto.Unmarshal(buf, update) +func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdatePlayerChessData) error { + update := req lastMap := player.PlayMod.getChessMod().ChessMap addChessList, addNewEmit, err := p.HandleChess(player, update.MChessHandle) if err != nil { @@ -353,6 +353,9 @@ func checkChess(chessId, energyMul int, emit []int) bool { break } } + if emitId == 0 { + return true + } _, max := getChesslvRange(emitId, energyMul, false) adjust := mergeDataCfg.GetAdjust(emitId, chessIdColor, energyMul) return chessIdLv > max-adjust diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go index 3d9f72b0..4dba3fd2 100644 --- a/src/server/game/player_data.go +++ b/src/server/game/player_data.go @@ -29,14 +29,14 @@ import ( "server/game/mod/quest" GoUtil "server/game_util" "server/msg" - telog "server/thinkdata" "strconv" "sync" "time" - "server/pkg/github.com/name5566/leaf/gate" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/timer" + "gitea.bywaystudios.com/pet_home/leaf/gate" + "gitea.bywaystudios.com/pet_home/leaf/timer" + + "gitea.bywaystudios.com/pet_home/leaf/log" "github.com/robfig/cron/v3" @@ -182,6 +182,7 @@ func (p *Player) ProcessTrigger() { MailMod := p.PlayMod.getMailMod() PlayroomMod := p.PlayMod.getPlayroomMod() GuideTaskMod := p.PlayMod.getGuideTaskMod() + DecorateMod := p.PlayMod.getDecorateMod() IsPlayroomBack := false IsMailBack := false IsGuideTask := false @@ -192,7 +193,7 @@ func (p *Player) ProcessTrigger() { if p.MailTrigger(tr) { IsMailBack = true } - if PlayroomMod.QuestTrigger(tr) { + if PlayroomMod.QuestTrigger(tr, DecorateMod.GetAreaId()) { IsPlayroomBack = true } if GuideTaskMod.Trigger(tr) { @@ -414,14 +415,7 @@ func (p *Player) ZeroUpdate(a []interface{}) { PlayroomMod.ResetWeeklyDiscount() } p.PlayroomBackData() - todayActivityId, _ := p.GetChampshipActivityId() - DecorateMod := p.PlayMod.getDecorateMod() - orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) - items := p.PlayMod.getChampshipMod().GetReward(todayActivityId, orderFactor) - if len(items) > 0 { - p.HandleItem(items, msg.ITEM_POP_LABEL_ChampshipReward.String()) - } - p.PlayMod.getChampshipMod().ZeroUpdate() + p.ChampionshipZeroUpdate() p.BackChampship() p.InitActivity() p.ActivityZeroUpdate() @@ -467,6 +461,7 @@ func (p *Player) Login() { // 添加定时器 // 限时事件触发 p.LimitedTimeEventTrigger(0) + p.LimitedTimeCardTrigger() // 猪猪银行触发 p.LimitedTimePiggyBankTrigger() BaseMod := p.PlayMod.getBaseMod() @@ -1225,7 +1220,7 @@ func (p *Player) TeLog(Type string, Param map[string]interface{}) { // 游戏内TE日志 BaseMod := p.PlayMod.getBaseMod() UidStr := GoUtil.String(p.M_DwUin) - go telog.Te.Track(BaseMod.Account, UidStr, Type, Param) + go ga.Te.Track(BaseMod.Account, UidStr, Type, Param) //途游GA go ga.GAlogEvent(Type, BaseMod.Account, "", Param) } @@ -1259,6 +1254,7 @@ func (p *Player) InitActivity() { StartT: v.Startime, EndT: v.Endtime, Id: v.Id, + AId: v.AId, Type: v.Type, Status: Status, Title: v.Title, @@ -1490,3 +1486,7 @@ func (p *Player) FixPlayroomPyhical() { func (p *Player) GetOrderFactor() int { return orderCfg.GetOrderFactor(p.GetDecorateMod().AreaId) } + +func (p *Player) Save() { + p.PlayMod.save() +} diff --git a/src/server/game/player_mod.go b/src/server/game/player_mod.go index 22c0f8b9..966350ef 100644 --- a/src/server/game/player_mod.go +++ b/src/server/game/player_mod.go @@ -10,6 +10,7 @@ import ( "server/game/mod/avatar" "server/game/mod/base" "server/game/mod/card" + catreturngift "server/game/mod/cat_return_gift" "server/game/mod/catnip" "server/game/mod/champship" "server/game/mod/charge" @@ -41,9 +42,10 @@ import ( "server/game/mod/race" sevenLogin "server/game/mod/seven_login" Var "server/game/mod/var" - "server/pkg/github.com/name5566/leaf/log" "sync" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) // buffer 对象池，复用 bytes.Buffer 减少内存分配 @@ -122,18 +124,20 @@ type PlayerModList struct { GuideTask guideTask.GuideTaskMod // 引导任务 Pass pass.PassMod // 通行证 Fur fur.FurMod // 毛皮 + CatReturnGift catreturngift.CatReturnGiftMod // 猫咪回归礼包 } func (p *PlayerModData) LoadDataFromDB(dwUin interface{}) bool { + uid := dwUin.(int64) + mod_table := "t_player_mod_" + fmt.Sprintf("%02d", uid%100) sqlStr := "SELECT * FROM t_player_mod WHERE dwUin = ?" p.Data = db.SqlModStruct{} - if err := db.SqlDb.Get(&p.Data, sqlStr, dwUin.(int64)); err != nil { - - p.IsHaveDataDb = false - } else { - p.IsHaveDataDb = true + if err := db.SqlDb.Get(&p.Data, "select * from "+mod_table+" where dwUin = ?", uid); err == nil { + p.Data.DwUin = uid + return true } - p.Data.DwUin = dwUin.(int64) + db.SqlDb.Get(&p.Data, sqlStr, uid) + p.Data.DwUin = uid return true } @@ -141,17 +145,6 @@ func (p *PlayerModData) ClearData() bool { return true } -func (p *PlayerModData) SaveDataFromDB(Key interface{}) bool { - //序列化数据 - db.FormatAllMemUpdateDb(&p.Data, "t_player_mod", "dwUin") - p.IsHaveDataDb = true - return true -} - -func (p *PlayerModData) ReqModData(buf []byte) { - -} - // 推送基础数据 func (p *PlayerModData) Reconnect(b bool) []byte { return []byte{} @@ -215,7 +208,7 @@ func (p *PlayerModData) InitMod(player *Player) (bool, error) { p.ModList.Mining.InitData() p.ModList.Item.InitData() p.ModList.GuessColor.InitData() - p.ModList.Playroom.InitData() + p.ModList.Playroom.InitData(BaseMod.Uid, int64(PlayerBaseMod.Data.RegisterTime)) p.ModList.Emoji.InitData() p.ModList.Collect.InitData() p.ModList.Activity.InitData() @@ -224,6 +217,7 @@ func (p *PlayerModData) InitMod(player *Player) (bool, error) { p.ModList.GuideTask.InitData() p.ModList.Pass.InitData() p.ModList.Fur.InitData() + p.ModList.CatReturnGift.InitData() return is_update, nil } diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go new file mode 100644 index 00000000..30be0252 --- /dev/null +++ b/src/server/game/proto_factory.go @@ -0,0 +1,63 @@ +package game + +import ( + "fmt" + "sync" + + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/reflect/protoreflect" + "google.golang.org/protobuf/reflect/protoregistry" +) + +var ( + protoMessageTypeCacheOnce sync.Once + protoMessageTypeByName sync.Map +) + +func buildProtoMessageTypeCache() { + protoregistry.GlobalTypes.RangeMessages(func(messageType protoreflect.MessageType) bool { + descriptor := messageType.Descriptor() + protoMessageTypeByName.Store(string(descriptor.FullName()), messageType) + shortName := string(descriptor.Name()) + if _, exists := protoMessageTypeByName.Load(shortName); !exists { + protoMessageTypeByName.Store(shortName, messageType) + } + return true + }) +} + +func FindProtoMessageTypeByName(name string) (protoreflect.MessageType, error) { + messageType, err := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(name)) + if err == nil { + return messageType, nil + } + + protoMessageTypeCacheOnce.Do(buildProtoMessageTypeCache) + if cachedType, ok := protoMessageTypeByName.Load(name); ok { + return cachedType.(protoreflect.MessageType), nil + } + + return nil, fmt.Errorf("protobuf message type not found: %s", name) +} + +func NewProtoMessageByName(name string) (proto.Message, error) { + messageType, err := FindProtoMessageTypeByName(name) + if err != nil { + return nil, err + } + + return messageType.New().Interface(), nil +} + +func UnmarshalProtoMessageByName(name string, data []byte) (proto.Message, error) { + message, err := NewProtoMessageByName(name) + if err != nil { + return nil, err + } + + if err := proto.Unmarshal(data, message); err != nil { + return nil, err + } + + return message, nil +} diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index f85a0ca2..8d272464 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -34,47 +34,36 @@ import ( "strconv" "strings" - "server/pkg/github.com/name5566/leaf/gate" - "server/pkg/github.com/name5566/leaf/log" + "gitea.bywaystudios.com/pet_home/leaf/gate" + + "gitea.bywaystudios.com/pet_home/leaf/log" "google.golang.org/protobuf/proto" ) -func ReqPlayerAsset(player *Player, buf []byte) error { +func ReqPlayerAsset(player *Player, req *msg.ReqPlayerAsset) error { player.PushClientRes(player.PlayerBaseMod.BackAsset()) return nil } // 请求玩家基础信息 -func ReqPlayerBaseInfofunction(player *Player, buf []byte) error { - // 消息的发送者 - detail := &msg.ReqPlayerBaseInfo{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - +func ReqPlayerBaseInfo(player *Player, req *msg.ReqPlayerBaseInfo) error { player.PlayerBaseMod.ResPlayerBaseInfo(player) return nil } -func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { - detail := &msg.ReqPlayerBriefProfileData{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - uid := int(detail.DwUin) +func ReqPlayerBriefProfileData(player *Player, req *msg.ReqPlayerBriefProfileData) error { + uid := int(req.DwUin) playerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(uid) if playerSimpleData == nil { log.Debug("玩家不存在, Uid:%d", uid) player.SendErrClienRes(&msg.ResPlayerBriefProfileData{ - DwUin: detail.DwUin, + DwUin: req.DwUin, }) return errors.New("玩家不存在") } player.PushClientRes(&msg.ResPlayerBriefProfileData{ - DwUin: detail.DwUin, + DwUin: req.DwUin, ImageFrame: int32(playerSimpleData.Avatar), ImageIcon: int32(playerSimpleData.Face), DecorateCnt: int32(playerSimpleData.Decorate), @@ -86,13 +75,8 @@ func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { return nil } -func ReqFriendPlayerSimple(player *Player, buf []byte) error { - detail := &msg.ReqFriendPlayerSimple{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } - uid := int(detail.Uid) +func ReqFriendPlayerSimple(player *Player, req *msg.ReqFriendPlayerSimple) error { + uid := int(req.Uid) playerSimpleData := G_GameLogicPtr.GetResFriendPlayerByUid(uid) if playerSimpleData == nil { log.Debug("玩家不存在, Uid:%d", uid) @@ -106,50 +90,40 @@ func ReqFriendPlayerSimple(player *Player, buf []byte) error { } // 移除广告 -func ReqRemoveAdFunc(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqRemoveAd(player, buf) +func ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) error { + player.PlayerBaseMod.ReqRemoveAd(player, req) player.TeLog("remove_ad", map[string]interface{}{}) return nil } // 请求玩家棋盘信息 -func ReqPlayerChessDataFunc(player *Player, buf []byte) error { - detail := &msg.ReqPlayerChessData{} - err := proto.Unmarshal(buf, detail) - if err != nil { - return err - } +func ReqPlayerChessData(player *Player, req *msg.ReqPlayerChessData) error { playerChessData := &PlayerChessData{} playerChessData.ResPlayerChessData(player) return nil } -func ReqBindFacebookAccount(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqBindFacebookAccount(player, buf) +func ReqBindFacebookAccount(player *Player, req *msg.ReqBindFacebookAccount) error { + player.PlayerBaseMod.ReqBindFacebookAccount(player, req) return nil } -func ReqUnBindFacebook(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqUnBindFacebook(player, buf) +func ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) error { + player.PlayerBaseMod.ReqUnBindFacebook(player, req) return nil } -func ReqOnlyBindFacebook(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqOnlyBindFacebook(player, buf) +func ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBindFacebook) error { + player.PlayerBaseMod.ReqOnlyBindFacebook(player, req) return nil } -func ReqSynGameData(player *Player, buf []byte) error { - player.PlayerBaseMod.ReqSynGameData(player, buf) +func ReqSynGameData(player *Player, req *msg.ReqSynGameData) error { + player.PlayerBaseMod.ReqSynGameData(player, req) return nil } -func RegSetEneryFunc(player *Player, buf []byte) error { - req := &msg.ReqSetEnergyMul{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetEnergyMul(player *Player, req *msg.ReqSetEnergyMul) error { maxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) BaseMod := player.PlayMod.getBaseMod() energyMul := BaseMod.GetEnergyMul() @@ -179,13 +153,8 @@ func RegSetEneryFunc(player *Player, buf []byte) error { } // 领取图鉴奖励 -func ReqGetHandbookReward(player *Player, buf []byte) error { - req := &msg.ReqGetHandbookReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } - err = player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) +func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error { + err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResGetHandbookReward{ Code: msg.RES_CODE_FAIL, @@ -215,12 +184,7 @@ func ReqGetHandbookReward(player *Player, buf []byte) error { return nil } -func RegHandbookAllReward(player *Player, buf []byte) error { - req := &msg.RegHandbookAllReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error { allChess := mergeDataCfg.GetAllChessBySeries(req.Type) items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, allChess) if err != nil { @@ -264,12 +228,7 @@ func RegHandbookAllReward(player *Player, buf []byte) error { } // 领取订单奖励 -func ReqRewardOrder(player *Player, buf []byte) error { - req := &msg.ReqRewardOrder{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error { OrderMod := player.PlayMod.getOrderMod() ChessMod := player.PlayMod.getChessMod() LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -418,19 +377,23 @@ func ReqRewardOrder(player *Player, buf []byte) error { // 锦标赛增加积分 if player.GetPlayerBaseMod().GetLevel() >= 17 { - chessList := make([]int, 0) - for _, v := range mergeList { - color := mergeDataCfg.GetColorById(v) - emit := order.GetEmitByColor(ChessMod.GetStarEmitList(), color) - emitType := mergeDataCfg.GetEmitType(emit) - if emitType == "auto" { - continue + todayActivityId, _ := player.GetChampshipActivityId() + cfg := G_GameLogicPtr.ActivityMgr.GetChampshipCfg(todayActivityId) + if cfg != nil && GoUtil.Now()-GoUtil.ZeroTimestamp() >= int64(cfg.ClearTime) { + chessList := make([]int, 0) + for _, v := range mergeList { + color := mergeDataCfg.GetColorById(v) + emit := order.GetEmitByColor(ChessMod.GetStarEmitList(), color) + emitType := mergeDataCfg.GetEmitType(emit) + if emitType == "auto" { + continue + } + chessList = append(chessList, v) } - chessList = append(chessList, v) + ChampshipMod := player.PlayMod.getChampshipMod() + ChampshipMod.AddScore(chessList) + player.HandleInChampshipRank() } - ChampshipMod := player.PlayMod.getChampshipMod() - ChampshipMod.AddScore(chessList) - player.HandleInChampshipRank() } FriendTreasureMod := player.PlayMod.getFriendTreasureMod() FriendTreasureMod.AddStar(star/20, player.GetOrderFactor()) @@ -450,19 +413,14 @@ func ReqRewardOrder(player *Player, buf []byte) error { return nil } -func ReqCreatePetOrder(player *Player, buf []byte) error { +func ReqCreatePetOrder(player *Player, req *msg.ReqCreatePetOrder) error { player.CreatePetOrder() OrderMod := player.PlayMod.getOrderMod() player.PushClientRes(OrderMod.BackData()) return nil } -func ReqDelOrder(player *Player, buf []byte) error { - req := &msg.ReqDelOrder{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDelOrder(player *Player, req *msg.ReqDelOrder) error { OrderMod := player.PlayMod.getOrderMod() delOrder, err := OrderMod.DelOrder(int(req.OrderId)) if err != nil { @@ -484,19 +442,14 @@ func ReqDelOrder(player *Player, buf []byte) error { } // 场景装饰 -func ReqDecorate(player *Player, buf []byte) error { - req := &msg.ReqDecorate{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDecorate(player *Player, req *msg.ReqDecorate) error { DecorateMod := player.PlayMod.getDecorateMod() decorateId := int(req.DecorateId) areaId := int(req.AreaId) LimitEventMod := player.PlayMod.getLimitedTimeEventMod() decorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) costItem, petExp, partItem := DecorateMod.GetDecorateCostItem(areaId, decorateId, decorateOffIsExist) - err = player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -579,12 +532,7 @@ func ReqDecorate(player *Player, buf []byte) error { } // 场景装饰 -func ReqDecorateAll(player *Player, buf []byte) error { - req := &msg.ReqDecorateAll{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error { DecorateMod := player.PlayMod.getDecorateMod() areaId := DecorateMod.GetAreaId() unLockLv := decorateCfg.GetOneKeyDecorateUnlockLv() @@ -599,7 +547,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { LimitEventMod := player.PlayMod.getLimitedTimeEventMod() decorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) costItem, addItem, decorateNum, DecorateList, Log, PetExp := DecorateMod.DecorateAll(PlayerBaseMod.GetStar(), decorateOffIsExist) - err = player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, @@ -660,12 +608,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { return nil } -func ReqAreaReward(player *Player, buf []byte) error { - req := &msg.ReqAreaReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error { DecorateMod := player.PlayMod.getDecorateMod() rewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId)) if err != nil { @@ -693,9 +636,9 @@ func ReqAreaReward(player *Player, buf []byte) error { // -----------------------ChessApi---------------------- // 更新棋盘信息 -func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { +func UpdatePlayerChessData(player *Player, req *msg.UpdatePlayerChessData) error { data := &PlayerChessData{} - err := data.UpdatePlayerChessData(player, buf) + err := data.UpdatePlayerChessData(player, req) player.AddHighOrder2() player.InitOrderItem() player.PushClientRes(player.PlayMod.getOrderMod().BackData()) @@ -705,18 +648,13 @@ func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { } // 从缓存中获取棋子 -func ReqGetChessFromBuff(player *Player, buf []byte) error { - req := &msg.ReqGetChessFromBuff{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error { ChessMod := player.PlayMod.getChessMod() HandbookMod := player.PlayMod.getHandbookMod() OrderMod := player.PlayMod.getOrderMod() BaseMod := player.PlayMod.getBaseMod() chessId := int(req.ChessId) - err = ChessMod.GetChessFromBuff(chessId) + err := ChessMod.GetChessFromBuff(chessId) update := HandbookMod.SetHandbook(chessId) AddNewEmit := make([]int, 0) if update { @@ -758,14 +696,9 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { } // 放置零件棋子进背包 -func ReqPutPartInBag(player *Player, buf []byte) error { - req := &msg.ReqPutPartInBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error { ChessMod := player.PlayMod.getChessMod() - err = ChessMod.PutPartInBag(int(req.ChessId)) + err := ChessMod.PutPartInBag(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResPutPartInBag{ Code: msg.RES_CODE_FAIL, @@ -795,14 +728,9 @@ func ReqPutPartInBag(player *Player, buf []byte) error { } // 放置棋子进背包 -func ReqPutChessInBag(player *Player, buf []byte) error { - req := &msg.ReqPutChessInBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error { ChessMod := player.PlayMod.getChessMod() - err = ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId)) + err := ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId)) if err != nil { player.SendErrClienRes(&msg.ResPutChessInBag{ Code: msg.RES_CODE_FAIL, @@ -833,12 +761,7 @@ func ReqPutChessInBag(player *Player, buf []byte) error { return nil } -func ReqTakeChessOutBag(player *Player, buf []byte) error { - req := &msg.ReqTakeChessOutBag{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error { ChessMod := player.PlayMod.getChessMod() chessId, err := ChessMod.TakeChessOutBag(int(req.BagId)) if err != nil { @@ -877,12 +800,7 @@ func ReqTakeChessOutBag(player *Player, buf []byte) error { return nil } -func ReqTakeChessOutBagToHonor(player *Player, buf []byte) error { - req := &msg.ReqTakeChessOutBagToHonor{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHonor) error { ChessMod := player.PlayMod.getChessMod() chessId, err := ChessMod.TakeChessOutBagToHonor(int(req.BagId)) if err != nil { @@ -907,15 +825,10 @@ func ReqTakeChessOutBagToHonor(player *Player, buf []byte) error { return nil } -func ReqBuyChessBagGrid(player *Player, buf []byte) error { - req := &msg.ReqBuyChessBagGrid{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error { ChessMod := player.PlayMod.getChessMod() costItem := ChessMod.GetBuyChessBagGridCost() - err = player.HandleItem(costItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) + err := player.HandleItem(costItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessBagGrid{ Code: msg.RES_CODE_FAIL, @@ -946,12 +859,7 @@ func ReqBuyChessBagGrid(player *Player, buf []byte) error { return nil } -func ReqSeparateChess(player *Player, buf []byte) error { - req := &msg.ReqSeparateChess{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error { ChessMod := player.PlayMod.getChessMod() newChess, err := ChessMod.SeparateChess(int(req.ChessId)) if err != nil { @@ -988,12 +896,7 @@ func ReqSeparateChess(player *Player, buf []byte) error { return nil } -func ReqUpgradeChess(player *Player, buf []byte) error { - req := &msg.ReqUpgradeChess{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error { ChessMod := player.PlayMod.getChessMod() newChess, err := ChessMod.UpgradeChess(int(req.ChessId)) if err != nil { @@ -1031,12 +934,7 @@ func ReqUpgradeChess(player *Player, buf []byte) error { } // 棋子转换 -func ReqChessEx(player *Player, buf []byte) error { - req := &msg.ReqChessEx{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChessEx(player *Player, req *msg.ReqChessEx) error { ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -1053,7 +951,7 @@ func ReqChessEx(player *Player, buf []byte) error { player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_BUBBLE, A: []interface{}{}}) } - err = ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) + err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) if err != nil { player.SendErrClienRes(&msg.ResChessEx{ Code: msg.RES_CODE_FAIL, @@ -1119,12 +1017,7 @@ func ReqChessEx(player *Player, buf []byte) error { } // 领取资源宝箱 -func ReqSourceChest(player *Player, buf []byte) error { - req := &msg.ReqSourceChest{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error { ChessMod := player.PlayMod.getChessMod() chestId := int(req.ChestId) items, err := ChessMod.SourceChest(chestId) @@ -1167,18 +1060,13 @@ func ReqSourceChest(player *Player, buf []byte) error { // ---------------------CardApi---------------------- -func ReqCardInfo(player *Player, buf []byte) error { +func ReqCardInfo(player *Player, req *msg.ReqCardInfo) error { CardMod := player.PlayMod.getCardMod() player.PushClientRes(CardMod.BackData()) return nil } -func ReqCardSeasonFirstReward(player *Player, buf []byte) error { - req := &msg.ReqCardSeasonFirstReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward) error { CardMod := player.PlayMod.getCardMod() itemList, err := CardMod.SeasonFirstReward() if err != nil { @@ -1208,12 +1096,7 @@ func ReqCardSeasonFirstReward(player *Player, buf []byte) error { } // 领取卡牌系列收集奖励 -func ReqCardCollectReward(player *Player, buf []byte) error { - req := &msg.ReqCardCollectReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error { CardMod := player.PlayMod.getCardMod() itemList, chess, err := CardMod.GetCollectReward(int(req.Color)) if err != nil { @@ -1253,12 +1136,7 @@ func ReqCardCollectReward(player *Player, buf []byte) error { } // 兑换星星奖励 -func ReqExStarReward(player *Player, buf []byte) error { - req := &msg.ReqExStarReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error { CardMod := player.PlayMod.getCardMod() itemList, costStar, err := CardMod.ExStarReward(int(req.Id)) if err != nil { @@ -1291,7 +1169,7 @@ func ReqExStarReward(player *Player, buf []byte) error { } // 领取全收集奖励 -func ReqAllCollectReward(player *Player, buf []byte) error { +func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error { CardMod := player.PlayMod.getCardMod() itemList, itemList2, err := CardMod.AllCollectReward() if err != nil { @@ -1333,13 +1211,8 @@ func ReqAllCollectReward(player *Player, buf []byte) error { return nil } -// ---------------------GuildApi---------------------- -func ReqGuideReward(player *Player, buf []byte) error { - req := &msg.ReqGuideReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +// ---------------------GuideApi---------------------- +func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error { GuideMod := player.PlayMod.getGuideMod() itemList, err := GuideMod.GetReward(int(req.Id)) if err != nil { @@ -1371,12 +1244,7 @@ func ReqGuideReward(player *Player, buf []byte) error { } // -----------------dailyTaskApi--------------------- -func ReqGetDailyTaskReward(player *Player, buf []byte) error { - req := &msg.ReqGetDailyTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetDailyReward(int(req.Id), player.GetDailyTaskActivityId()) if err != nil { @@ -1409,12 +1277,7 @@ func ReqGetDailyTaskReward(player *Player, buf []byte) error { return nil } -func ReqGetDailyWeekReward(player *Player, buf []byte) error { - req := &msg.ReqGetDailyWeekReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() itemList, err := DailyTaskMod.GetWeekReward(int(req.Id)) if err != nil { @@ -1447,12 +1310,7 @@ func ReqGetDailyWeekReward(player *Player, buf []byte) error { return nil } -func ReqDailyUnlock(player *Player, buf []byte) error { - req := &msg.ReqDailyUnlock{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDailyUnlock(player *Player, req *msg.ReqDailyUnlock) error { DailyTaskMod := player.PlayMod.getDailyTaskMod() DailyTaskMod.Unlock() player.PlayMod.save() @@ -1463,12 +1321,7 @@ func ReqDailyUnlock(player *Player, buf []byte) error { return nil } -func ReqGetGuideTaskReward(player *Player, buf []byte) error { - req := &msg.ReqGetGuideTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error { GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetTaskReward(int(req.Id)) if err != nil { @@ -1502,12 +1355,7 @@ func ReqGetGuideTaskReward(player *Player, buf []byte) error { return nil } -func ReqGetGuideActiveReward(player *Player, buf []byte) error { - req := &msg.ReqGetGuideActiveReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) error { GuideTaskMod := player.PlayMod.getGuideTaskMod() itemList, err := GuideTaskMod.GetActiveReward(int(req.Id)) if err != nil { @@ -1540,14 +1388,9 @@ func ReqGetGuideActiveReward(player *Player, buf []byte) error { } // 头像框 -func ReqSetAvatar(player *Player, buf []byte) error { - req := &msg.ReqSetAvatar{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetAvatar(player *Player, req *msg.ReqSetAvatar) error { avatarMod := player.PlayMod.getAvatarMod() - err = avatarMod.SetAvatar(int(req.Avatar)) + err := avatarMod.SetAvatar(int(req.Avatar)) if err != nil { player.SendErrClienRes(&msg.ResSetAvatar{ Code: msg.RES_CODE_FAIL, @@ -1574,14 +1417,9 @@ func ReqSetAvatar(player *Player, buf []byte) error { } // 头像 -func ReqSetFace(player *Player, buf []byte) error { - req := &msg.ReqSetFace{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetFace(player *Player, req *msg.ReqSetFace) error { FaceMod := player.PlayMod.getFaceMod() - err = FaceMod.SetFace(int(req.Face)) + err := FaceMod.SetFace(int(req.Face)) if err != nil { player.SendErrClienRes(&msg.ResSetFace{ Code: msg.RES_CODE_FAIL, @@ -1608,16 +1446,11 @@ func ReqSetFace(player *Player, buf []byte) error { } // 购买能量 -func ReqBuyEnergy(player *Player, buf []byte) error { - req := &msg.ReqBuyEnergy{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error { BaseMod := player.PlayMod.getBaseMod() ChargeMod := player.PlayMod.getChargeMod() items, energy, diamond := ChargeMod.BuyEnergy(player.IsWeeklyDiscount()) - err = player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyEnergy{ Code: msg.RES_CODE_FAIL, @@ -1638,7 +1471,7 @@ func ReqBuyEnergy(player *Player, buf []byte) error { return nil } -func ReqGetEnergyByAD(player *Player, buf []byte) error { +func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error { BaseMod := player.PlayMod.getBaseMod() items, err := BaseMod.GetEnergyByAD() if err != nil { @@ -1668,12 +1501,7 @@ func ReqGetEnergyByAD(player *Player, buf []byte) error { } // 领取七日签到奖励 -func ReqGetSevenLoginReward(player *Player, buf []byte) error { - req := &msg.ReqGetSevenLoginReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) error { SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetReward(int(req.Id)) if err != nil { @@ -1706,12 +1534,7 @@ func ReqGetSevenLoginReward(player *Player, buf []byte) error { } // 领取月进度奖励 -func ReqGetMonthLoginReward(player *Player, buf []byte) error { - req := &msg.ReqGetMonthLoginReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) error { SevenLoginMod := player.PlayMod.getSevenLoginMod() itemList, err := SevenLoginMod.GetMonthReward(int(req.Id)) if err != nil { @@ -1743,7 +1566,7 @@ func ReqGetMonthLoginReward(player *Player, buf []byte) error { return nil } -func ReqFastProduceInfo(player *Player, buf []byte) error { +func ReqFastProduceInfo(player *Player, req *msg.ReqFastProduceInfo) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() endTime, times := LimitedTimeEventMod.GetFastProduceInfo() player.PushClientRes(&msg.ResFastProduceInfo{ @@ -1754,12 +1577,7 @@ func ReqFastProduceInfo(player *Player, buf []byte) error { } // 连击快手奖励 -func ReqFastProduceReward(player *Player, buf []byte) error { - req := &msg.ReqFastProduceReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() itemList, err := LimitedTimeEventMod.GetFastProduceReward(int(req.Energy)) if err != nil { @@ -1789,7 +1607,7 @@ func ReqFastProduceReward(player *Player, buf []byte) error { return nil } -func ReqLimitSenceReward(player *Player, buf []byte) error { +func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error { limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_SENCE_DASH) { // 场景冲刺奖励 player.SendErrClienRes(&msg.ResLimitSenceReward{ @@ -1827,7 +1645,7 @@ func ReqLimitSenceReward(player *Player, buf []byte) error { return nil } -func ReqGetGoldCard(player *Player, buf []byte) error { +func ReqGetGoldCard(player *Player, req *msg.ReqGetGoldCard) error { gold := player.GetGoldCard() if gold == nil { player.SendErrClienRes(&msg.ResGetGoldCard{ @@ -1844,18 +1662,11 @@ func ReqGetGoldCard(player *Player, buf []byte) error { } // 向好友请求卡牌 -func ReqCardGive(player *Player, buf []byte) error { - req := &msg.ReqCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } - +func ReqCardGive(player *Player, req *msg.ReqCardGive) error { CardMod := player.PlayMod.getCardMod() - endTime := GoUtil.Now() + 86400 + endTime := GoUtil.Now() + oneday FriendMod := player.PlayMod.getFriendMod() - - err = CardMod.RequestCard() + err := CardMod.RequestCard() if err != nil { player.SendErrClienRes(&msg.ResCardGive{ Code: msg.RES_CODE_FAIL, @@ -1932,12 +1743,7 @@ func ReqCardGive(player *Player, buf []byte) error { } // 同意卡牌请求 -func ReqAgreeCardGive(player *Player, buf []byte) error { - req := &msg.ReqAgreeCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -1948,7 +1754,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { return fmt.Errorf("card apply not exist") } CardMod := player.PlayMod.getCardMod() - err = player.SubCard(cardInfo.CardId) + err := player.SubCard(cardInfo.CardId) if err != nil { player.SendErrClienRes(&msg.ResAgreeCardGive{ Code: msg.RES_CODE_FAIL, @@ -1963,6 +1769,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { From: int(player.M_DwUin), To: cardInfo.AUid, SendT: GoUtil.Now(), + End: GoUtil.Now() + tenyear, Extra: *cardInfo, } FriendMgrSend(m) @@ -1982,12 +1789,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { } // 拒绝卡牌请求 -func ReqRefuseCardGive(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardGive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -2012,7 +1814,7 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { From: int(player.M_DwUin), To: cardInfo.AUid, SendT: now, - End: now + 86400, + End: now + oneday, Extra: *cardInfo, } FriendMgrSend(m) @@ -2020,12 +1822,7 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { } // 赠送卡牌 -func ReqCardSend(player *Player, buf []byte) error { - req := &msg.ReqCardSend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardSend(player *Player, req *msg.ReqCardSend) error { CardMod := player.PlayMod.getCardMod() cardId := int(req.CardId) cardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), cardId) @@ -2042,7 +1839,7 @@ func ReqCardSend(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(req.Uid), SendT: GoUtil.Now(), - End: GoUtil.Now() + 86400, + End: GoUtil.Now() + tenyear, Extra: *cardInfo, } player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_SEND, strconv.Itoa(cardId), GoUtil.Now()) @@ -2063,12 +1860,7 @@ func ReqCardSend(player *Player, buf []byte) error { } // 卡牌交换 -func ReqCardExchange(player *Player, buf []byte) error { - req := &msg.ReqCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error { CardMod := player.PlayMod.getCardMod() cardId := int(req.CardId) cardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), cardId) @@ -2085,11 +1877,10 @@ func ReqCardExchange(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(req.Uid), SendT: GoUtil.Now(), - End: GoUtil.Now() + 86400, + End: GoUtil.Now() + oneday, Extra: *cardInfo, } player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_EX_SEND, fmt.Sprintf("%d", cardId), GoUtil.Now()) - player.PushClientRes(&msg.ResCardExchange{ Code: msg.RES_CODE_SUCCESS, }) @@ -2106,12 +1897,7 @@ func ReqCardExchange(player *Player, buf []byte) error { } // 选择卡牌进行交换 -func ReqSelectCardExchange(player *Player, buf []byte) error { - req := &msg.ReqSelectCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error { cardId := int(req.CardId) CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() @@ -2144,7 +1930,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { } FriendMod.DelCardInfo(req.Id) player.AddLog(cardInfo.AUid, friend.LOG_TYPE_CARD_SELECT_SEND, fmt.Sprintf("%d", cardInfo.ExId), GoUtil.Now()) - err = player.SubCard(cardId) + err := player.SubCard(cardId) if err != nil { player.SendErrClienRes(&msg.ResSelectCardExchange{ Code: msg.RES_CODE_FAIL, @@ -2164,6 +1950,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { From: int(player.M_DwUin), To: cardInfo.AUid, SendT: GoUtil.Now(), + End: GoUtil.Now() + oneday, Extra: *cardInfo, } FriendMgrSend(m) @@ -2176,12 +1963,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { } // 同意卡牌交换 -func ReqAgreeCardExchange(player *Player, buf []byte) error { - req := &msg.ReqSelectCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2222,6 +2004,7 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { To: cardInfo.BUid, Extra: *cardInfo, SendT: GoUtil.Now(), + End: GoUtil.Now() + tenyear, } player.PushClientRes(CardMod.NotifyCard()) player.PushClientRes(CardMod.NotifyTimes()) @@ -2232,16 +2015,16 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { "card_id_reply": cardInfo.ExId, "player_id_reply": cardInfo.BUid, }) + player.TeLog("card_exchange_claim", map[string]interface{}{ + "player_id_from": cardInfo.BUid, + "card_id": cardInfo.ExId, + "is_gift": false, + }) return nil } // 拒绝选择卡牌 -func ReqRefuseCardSelect(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardSelect{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error { FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) if cardInfo == nil { @@ -2276,12 +2059,7 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error { } // 拒绝进行交换 -func ReqRefuseCardExchange(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2322,12 +2100,7 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { } // 领取好友卡牌 -func ReqGetFriendCard(player *Player, buf []byte) error { - req := &msg.ReqRefuseCardExchange{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetFriendCard(player *Player, req *msg.ReqGetFriendCard) error { CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() cardInfo := FriendMod.GetCardInfo(req.Id) @@ -2341,8 +2114,10 @@ func ReqGetFriendCard(player *Player, buf []byte) error { FriendMod.DelCardInfo(req.Id) player.AddCard(cardInfo.CardId) uid := cardInfo.AUid + var isGift bool if cardInfo.Type == card.TYPE_CARD_GIVE { uid = cardInfo.BUid + isGift = true } player.AddLog(uid, friend.LOG_TYPE_CARD_SEND_ACCEPT, fmt.Sprintf("%d", cardInfo.CardId), GoUtil.Now()) player.PlayMod.save() @@ -2352,17 +2127,17 @@ func ReqGetFriendCard(player *Player, buf []byte) error { CardId: int32(cardInfo.CardId), Emoji: int32(cardInfo.Emoji), }) + player.TeLog("card_exchange_claim", map[string]interface{}{ + "player_id_from": uid, + "card_id": cardInfo.CardId, + "is_gift": isGift, + }) player.PushClientRes(CardMod.NotifyCard()) return nil } // 请求玩家榜单 -func ReqRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRank(player *Player, req *msg.ReqRank) error { BaseMod := player.PlayMod.getBaseMod() m := &MsqMod.Msg{ From: int(player.M_DwUin), @@ -2389,12 +2164,7 @@ func ReqRank(player *Player, buf []byte) error { } // 请求竞标赛榜单 -func ReqChampshipRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChampshipRank(player *Player, req *msg.ReqChampshipRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_RANK_LIST, @@ -2411,12 +2181,7 @@ func ReqChampshipRank(player *Player, buf []byte) error { return nil } -func ReqChampshipPreRank(player *Player, buf []byte) error { - req := &msg.ReqRank{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChampshipPreRank(player *Player, req *msg.ReqChampshipPreRank) error { res, err := SendMsgToCenterSync(&MsqMod.Msg{ From: int(player.M_DwUin), HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_PRE_RANK, @@ -2428,27 +2193,27 @@ func ReqChampshipPreRank(player *Player, buf []byte) error { player.PushClientRes(&msg.ResChampshipPreRank{}) return nil } - m := res.Extra.(*msg.ResChampshipPreRank) + m, ok := res.Extra.(*msg.ResChampshipPreRank) + if !ok { + player.PushClientRes(&msg.ResChampshipPreRank{}) + log.Error("type assert failed for ResChampshipPreRank") + return nil + } player.PushClientRes(m) return nil } // 请求邮件列表 -func ReqMailList(player *Player, buf []byte) error { +func ReqMailList(player *Player, req *msg.ReqMailList) error { MailMod := player.PlayMod.getMailMod() player.PushClientRes(MailMod.BackData()) return nil } // 读邮件 -func ReqReadMail(player *Player, buf []byte) error { - req := &msg.ReqReadMail{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqReadMail(player *Player, req *msg.ReqReadMail) error { MailMod := player.PlayMod.getMailMod() - err = MailMod.Read(int(req.Id)) + err := MailMod.Read(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResReadMail{ Code: msg.RES_CODE_FAIL, @@ -2466,12 +2231,7 @@ func ReqReadMail(player *Player, buf []byte) error { } // 领取邮件奖励 -func ReqGetMailReward(player *Player, buf []byte) error { - req := &msg.ReqGetMailReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error { MailMod := player.PlayMod.getMailMod() itemList, err := MailMod.Reward(int(req.Id)) if err != nil { @@ -2504,14 +2264,9 @@ func ReqGetMailReward(player *Player, buf []byte) error { } // 删除邮件 -func ReqDeleteMail(player *Player, buf []byte) error { - req := &msg.ReqDeleteMail{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error { MailMod := player.PlayMod.getMailMod() - err = MailMod.Del(int(req.Id)) + err := MailMod.Del(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResDeleteMail{ Code: msg.RES_CODE_FAIL, @@ -2529,7 +2284,7 @@ func ReqDeleteMail(player *Player, buf []byte) error { } // 领取商店免费奖励 -func ReqFreeShop(player *Player, buf []byte) error { +func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.FireFreeShop() if err != nil { @@ -2568,12 +2323,7 @@ func ReqFreeShop(player *Player, buf []byte) error { } // 购买棋子商店物品 -func ReqBuyChessShop(player *Player, buf []byte) error { - req := &msg.ReqBuyChessShop{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error { ChargeMod := player.PlayMod.getChargeMod() lostItems, items, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2623,12 +2373,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { } // 购买棋子商店物品 -func ReqBuyChessShop2(player *Player, buf []byte) error { - req := &msg.ReqBuyChessShop2{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error { ChargeMod := player.PlayMod.getChargeMod() lostItems, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { @@ -2688,7 +2433,7 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { } // 刷新棋子商店 -func ReqRefreshChessShop(player *Player, buf []byte) error { +func ReqRefreshChessShop(player *Player, req *msg.ReqRefreshChessShop) error { ChargeMod := player.PlayMod.getChargeMod() ChessMod := player.PlayMod.getChessMod() ChargeMod.InitChessShop(ChessMod.GetEmitList()) @@ -2710,12 +2455,7 @@ func ReqRefreshChessShop(player *Player, buf []byte) error { } // 领取无尽礼包免费奖励 -func ReqEndlessReward(player *Player, buf []byte) error { - req := &msg.ReqEndlessReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error { EndlessMod := player.PlayMod.getEndlessMod() BaseMod := player.PlayMod.getBaseMod() itemList, err := EndlessMod.GetReward(BaseMod.GetLevel()) @@ -2754,14 +2494,14 @@ func ReqEndlessReward(player *Player, buf []byte) error { } // 请求无尽礼包数据 -func ReqEndless(player *Player, buf []byte) error { +func ReqEndless(player *Player, req *msg.ReqEndless) error { EndlessMod := player.PlayMod.getEndlessMod() player.PushClientRes(EndlessMod.BackData()) return nil } // 请求存钱罐奖励 -func ReqPiggyBankReward(player *Player, buf []byte) error { +func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error { PiggyBankMod := player.PlayMod.getPiggyBankMod() itemList := PiggyBankMod.Fire(0) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String()) @@ -2785,12 +2525,7 @@ func ReqPiggyBankReward(player *Player, buf []byte) error { } // 生成订单号 -func ReqCreateOrderSn(player *Player, buf []byte) error { - req := &msg.ReqCreateOrderSn{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCreateOrderSn(player *Player, req *msg.ReqCreateOrderSn) error { orderSn, err := player.CreateOrderSn(req) if err != nil { return err @@ -2802,22 +2537,19 @@ func ReqCreateOrderSn(player *Player, buf []byte) error { } // 订单发货 -func ReqShippingOrder(player *Player, buf []byte) error { +func ReqShippingOrder(player *Player, req *msg.ReqShippingOrder) error { return nil } // 锦标赛 -func ReqChampship(player *Player, buf []byte) error { +func ReqChampship(player *Player, req *msg.ReqChampship) error { player.BackChampship() return nil } -func ReqChampshipReward(player *Player, buf []byte) error { +func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error { ChampshipMod := player.PlayMod.getChampshipMod() - todayActivityId, _ := player.GetChampshipActivityId() - DecorateMod := player.PlayMod.getDecorateMod() - orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) rewardId := ChampshipMod.Reward - itemList := ChampshipMod.GetReward(todayActivityId, orderFactor) + itemList := player.GetChampshipReward(ChampshipMod.GetAId()) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String()) if err != nil { player.SendErrClienRes(&msg.ResChampshipReward{ @@ -2852,29 +2584,24 @@ func ReqChampshipReward(player *Player, buf []byte) error { return nil } -func ReqLimitEvent(player *Player, buf []byte) error { +func ReqLimitEvent(player *Player, req *msg.ReqLimitEvent) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() player.PushClientRes(LimitedTimeEventMod.BackData()) return nil } -func ReqKv(player *Player, buf []byte) error { - req := &msg.ReqKv{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqKv(player *Player, req *msg.ReqKv) error { KvMod := player.PlayMod.getKvMod() KvMod.SetVar(int(req.Key), req.Value) - log.Debug("player %d set kv key %d value %s", player.M_DwUin, req.Key, req.Value) + //log.Debug("player %d set kv key %d value %s", player.M_DwUin, req.Key, req.Value) return nil } -func ReqChampshipRankReward(player *Player, buf []byte) error { +func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) error { _, myPreRank := player.GetChampshipRank() ChampshipMod := player.PlayMod.getChampshipMod() _, yesterdayActivityId := player.GetChampshipActivityId() - itemList, err := ChampshipMod.GetRankReward(myPreRank, yesterdayActivityId) + itemList, err := player.GetChampshipRankReward(myPreRank, yesterdayActivityId) if err != nil { player.SendErrClienRes(&msg.ResChampshipRankReward{ Code: msg.RES_CODE_FAIL, @@ -2910,12 +2637,7 @@ func ReqChampshipRankReward(player *Player, buf []byte) error { return nil } -func ReqSetName(player *Player, buf []byte) error { - req := &msg.ReqSetName{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetName(player *Player, req *msg.ReqSetName) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetNickName(req.Name) player.PushClientRes(&msg.ResSetName{ @@ -2930,12 +2652,7 @@ func ReqSetName(player *Player, buf []byte) error { return nil } -func ReqSetPetName(player *Player, buf []byte) error { - req := &msg.ReqSetPetName{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetPetName(player *Player, req *msg.ReqSetPetName) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetPetName(req.Name) player.PushClientRes(&msg.ResSetPetName{ @@ -2951,19 +2668,14 @@ func ReqSetPetName(player *Player, buf []byte) error { return nil } -func ReqUserInfo(player *Player, buf []byte) error { +func ReqUserInfo(player *Player, req *msg.ReqUserInfo) error { player.BackUserInfo() return nil } -func ReqMasterCard(player *Player, buf []byte) error { - req := &msg.ReqMasterCard{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqMasterCard(player *Player, req *msg.ReqMasterCard) error { CardMod := player.PlayMod.getCardMod() - err = CardMod.MasterCardEx(int(req.Id), int(req.CardId)) + err := CardMod.MasterCardEx(int(req.Id), int(req.CardId)) if err != nil { player.SendErrClienRes(&msg.ResMasterCard{ Code: msg.RES_CODE_FAIL, @@ -2985,12 +2697,7 @@ func ReqMasterCard(player *Player, buf []byte) error { return nil } -func ReqSetFacebookUrl(player *Player, buf []byte) error { - req := &msg.ReqSetFacebookUrl{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetFacebookUrl(player *Player, req *msg.ReqSetFacebookUrl) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetFacebookUrl(req.Url) player.PlayMod.save() @@ -3000,18 +2707,13 @@ func ReqSetFacebookUrl(player *Player, buf []byte) error { return nil } -func ReqInviteFriendData(player *Player, buf []byte) error { +func ReqInviteFriendData(player *Player, req *msg.ReqInviteFriendData) error { InviteMod := player.PlayMod.getInviteMod() player.PushClientRes(InviteMod.BackData()) return nil } -func ReqSelfInvited(player *Player, buf []byte) error { - req := &msg.ReqSelfInvited{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelfInvited(player *Player, req *msg.ReqSelfInvited) error { now := GoUtil.Now() FriendMgrSend(&MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_INVITE_FRIEND, @@ -3026,12 +2728,7 @@ func ReqSelfInvited(player *Player, buf []byte) error { return nil } -func ReqGetInviteReward(player *Player, buf []byte) error { - req := &msg.ReqGetInviteReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetInviteReward(player *Player, req *msg.ReqGetInviteReward) error { InviteMod := player.PlayMod.getInviteMod() curIndex := InviteMod.GetIndex items, err := InviteMod.GetReward(int(req.GetIndex)) @@ -3067,12 +2764,7 @@ func ReqGetInviteReward(player *Player, buf []byte) error { return nil } -func ReqAutoAddInviteFriend(player *Player, buf []byte) error { - req := &msg.ReqAutoAddInviteFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAutoAddInviteFriend(player *Player, req *msg.ReqAutoAddInviteFriend) error { FriendMod := player.PlayMod.getFriendMod() uid := int(req.Id) if uid == 0 && uid == int(player.M_DwUin) { @@ -3099,12 +2791,7 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error { return nil } -func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { - req := &msg.ReqAutoAddInviteFriend2{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAutoAddInviteFriend2(player *Player, req *msg.ReqAutoAddInviteFriend2) error { FriendMod := player.PlayMod.getFriendMod() uid, err := GetUidByFaceBook(req.Id) if uid == 0 || uid == int(player.M_DwUin) { @@ -3139,12 +2826,7 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { return nil } -func ReqSelectLimitEvent(player *Player, buf []byte) error { - req := &msg.ReqSelectLimitEvent{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() BaseMod := player.PlayMod.getBaseMod() items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) @@ -3178,18 +2860,13 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error { } // 请求挖矿基础数据 -func ReqMining(player *Player, buf []byte) error { +func ReqMining(player *Player, req *msg.ReqMining) error { player.MiningBackData() return nil } // 请求挖矿 -func ReqMiningTake(player *Player, buf []byte) error { - req := &msg.ReqMiningTake{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error { MiningMod := player.PlayMod.getMiningMod() activityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) status := player.GetActivityStatus(activity.ACT_TYPE_MINING) @@ -3201,7 +2878,7 @@ func ReqMiningTake(player *Player, buf []byte) error { return fmt.Errorf("activity not start") } loseItem := miningCfg.GetLoseItem(activityInfo.Id) - err = player.HandleLoseItem(loseItem, "MiningLose") + err := player.HandleLoseItem(loseItem, "MiningLose") if err != nil { player.SendErrClienRes(&msg.ResMiningTake{ Code: msg.RES_CODE_FAIL, @@ -3234,7 +2911,7 @@ func ReqMiningTake(player *Player, buf []byte) error { } // 领取关卡奖励 -func ReqMiningReward(player *Player, buf []byte) error { +func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error { MiningMod := player.PlayMod.getMiningMod() status := player.GetActivityStatus(activity.ACT_TYPE_MINING) if status != ACT_STATUS_START { @@ -3281,15 +2958,10 @@ func ReqMiningReward(player *Player, buf []byte) error { } // 请求猜颜色基础数据 -func ReqGuessColor(player *Player, buf []byte) error { - req := &msg.ReqGuessColor{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColor(player *Player, req *msg.ReqGuessColor) error { GuessColorMod := player.PlayMod.getGuessColorMod() items := GuessColorMod.FirstIn() - err = player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColor.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColor.String()) if err != nil { return err } @@ -3299,12 +2971,7 @@ func ReqGuessColor(player *Player, buf []byte) error { } // 请求猜颜色 -func ReqGuessColorTake(player *Player, buf []byte) error { - req := &msg.ReqGuessColorTake{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error { status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorTake{ @@ -3315,7 +2982,7 @@ func ReqGuessColorTake(player *Player, buf []byte) error { } GuessColorMod := player.PlayMod.getGuessColorMod() loseItems := GuessColorMod.GetLoseItem() - err = player.HandleLoseItem(loseItems, "GuessColorLose") + err := player.HandleLoseItem(loseItems, "GuessColorLose") if err != nil { player.SendErrClienRes(&msg.ResGuessColorTake{ Code: msg.RES_CODE_FAIL, @@ -3339,12 +3006,7 @@ func ReqGuessColorTake(player *Player, buf []byte) error { } // 请求猜颜色奖励 -func ReqGuessColorReward(player *Player, buf []byte) error { - req := &msg.ReqGuessColorReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error { status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorReward{ @@ -3379,20 +3041,15 @@ func ReqGuessColorReward(player *Player, buf []byte) error { } // 请求竞赛基础数据 -func ReqRace(player *Player, buf []byte) error { +func ReqRace(player *Player, req *msg.ReqRace) error { player.RaceBackData() return nil } // 请求竞赛开始 -func ReqRaceStart(player *Player, buf []byte) error { - req := &msg.ReqRaceStart{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRaceStart(player *Player, req *msg.ReqRaceStart) error { RaceMod := player.PlayMod.getRaceMod() - err = RaceMod.StartGame() + err := RaceMod.StartGame() if err != nil { player.SendErrClienRes(&msg.ResRaceStart{ Code: msg.RES_CODE_FAIL, @@ -3408,12 +3065,7 @@ func ReqRaceStart(player *Player, buf []byte) error { } // 领取竞赛奖励 -func ReqRaceReward(player *Player, buf []byte) error { - req := &msg.ResRaceReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error { RaceMod := player.PlayMod.getRaceMod() items, err := RaceMod.GetReward() if err != nil { @@ -3442,18 +3094,13 @@ func ReqRaceReward(player *Player, buf []byte) error { } // 请求playroom基础数据 -func ReqPlayroom(player *Player, buf []byte) error { +func ReqPlayroom(player *Player, req *msg.ReqPlayroom) error { player.PlayroomBackData() return nil } // 请求playroom拜访信息 -func ReqPlayroomInfo(player *Player, buf []byte) error { - req := &msg.ReqPlayroomInfo{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomInfo(player *Player, req *msg.ReqPlayroomInfo) error { PlayroomMod := player.PlayMod.getPlayroomMod() target := int(req.Uid) if req.Uid == 0 { @@ -3461,6 +3108,12 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { } if req.Uid == -1 { target = player.GetVisitorPlayer() + if target == 0 { + PlayroomMod.ResetRandVisitor() + target = player.GetVisitorPlayer() + } else { + PlayroomMod.AddRandVisitor(target) + } } if target == 0 { player.PlayroomVisit(target) @@ -3514,12 +3167,7 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { } // 请求playroom交互 -func ReqPlayroomInteract(player *Player, buf []byte) error { - req := &msg.ReqPlayroomInteract{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, pType, err := PlayroomMod.Interact(int(req.Id), int(req.Type)) if err != nil { @@ -3566,14 +3214,9 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { } // 请求playroom设置房间 -func ReqPlayroomSetRoom(player *Player, buf []byte) error { - req := &msg.ReqPlayroomSetRoom{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error { PlayroomMod := player.PlayMod.getPlayroomMod() - _, err = PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom)) + _, err := PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomSetRoom{ Code: msg.RES_CODE_FAIL, @@ -3591,12 +3234,7 @@ func ReqPlayroomSetRoom(player *Player, buf []byte) error { } // 玩游戏 -func ReqPlayroomGame(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGame{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error { PlayroomMod := player.PlayMod.getPlayroomMod() target := PlayroomMod.GetTarget() if target == 0 { @@ -3607,7 +3245,7 @@ func ReqPlayroomGame(player *Player, buf []byte) error { return fmt.Errorf("no target") } items := player.GetPlayroomGameReward(int(req.Type), 0) - err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomGame{ Code: msg.RES_CODE_FAIL, @@ -3652,15 +3290,10 @@ func ReqPlayroomGame(player *Player, buf []byte) error { } // 选择奖励 -func ReqPlayroomSelectReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomSelectReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) error { PlayroomMod := player.PlayMod.getPlayroomMod() items := player.GetPlayroomGameReward(playroom.GAME_RESULT_HIGH, int(req.Id)) - err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomSelectReward{ Code: msg.RES_CODE_FAIL, @@ -3716,7 +3349,7 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { } // 处理偷取物品 -func ReqPlayroomLose(player *Player, buf []byte) error { +func ReqPlayroomLose(player *Player, req *msg.ReqPlayroomLose) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.ResetLose() player.PushClientRes(PlayroomMod.NotifyLose()) @@ -3724,12 +3357,7 @@ func ReqPlayroomLose(player *Player, buf []byte) error { } // 宠物开始工作 -func ReqPlayroomWork(player *Player, buf []byte) error { - req := &msg.ReqPlayroomWork{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.Work() if err != nil { @@ -3766,7 +3394,7 @@ func ReqPlayroomWork(player *Player, buf []byte) error { } // 宠物休息 -func ReqPlayroomRest(player *Player, buf []byte) error { +func ReqPlayroomRest(player *Player, req *msg.ReqPlayroomRest) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.Rest() player.PlayMod.save() @@ -3777,7 +3405,7 @@ func ReqPlayroomRest(player *Player, buf []byte) error { } // 抽取转盘 -func ReqPlayroomDraw(player *Player, buf []byte) error { +func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error { PlayroomMod := player.PlayMod.getPlayroomMod() id, items, err := PlayroomMod.Draw() if err != nil { @@ -3811,12 +3439,7 @@ func ReqPlayroomDraw(player *Player, buf []byte) error { } // 清理碎片 -func ReqPlayroomChip(player *Player, buf []byte) error { - req := &msg.ReqPlayroomChip{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, chipNum, err := PlayroomMod.RemoveChip(req.Uid) if err != nil { @@ -3849,14 +3472,8 @@ func ReqPlayroomChip(player *Player, buf []byte) error { } // 翻牌游戏 -func ReqPlayroomFlip(player *Player, buf []byte) error { - req := &msg.ReqPlayroomFlip{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error { PlayroomMod := player.PlayMod.getPlayroomMod() - cardId, err := PlayroomMod.FlipCard(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomFlip{ @@ -3879,12 +3496,7 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { return nil } -func ReqPlayroomFlipReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomFlipReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, target, result, err := PlayroomMod.GetFlipReward() if err != nil { @@ -3950,12 +3562,7 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error { return nil } -func ReqPlayroomBuyItem(player *Player, buf []byte) error { - req := &msg.ReqPlayroomBuyItem{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error { PlayroomMod := player.PlayMod.getPlayroomMod() addItems, costItems := PlayroomMod.BuyItem(int(req.Id)) if costItems == nil { @@ -3967,7 +3574,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return err } - err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) + err := player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3993,12 +3600,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return nil } -func ReqPlayroomUpvote(player *Player, buf []byte) error { - req := &msg.ReqPlayroomUpvote{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.GiveUpvote(int(req.Id)) if err != nil { @@ -4043,14 +3645,9 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { return nil } -func ReqPlayroomUnlock(player *Player, buf []byte) error { - req := &msg.ReqPlayroomUnlock{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error { PlayroomMod := player.PlayMod.getPlayroomMod() - err = PlayroomMod.Unlock(int(req.Id)) + err := PlayroomMod.Unlock(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomUnlock{ Code: msg.RES_CODE_FAIL, @@ -4070,12 +3667,7 @@ func ReqPlayroomUnlock(player *Player, buf []byte) error { return nil } -func ReqPlayroomTask(player *Player, buf []byte) error { - req := &msg.ReqPlayroomTask{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error { PlayroomMod := player.PlayMod.getPlayroomMod() items, err := PlayroomMod.GetDailyTaskReward(int(req.Id)) if err != nil { @@ -4107,12 +3699,7 @@ func ReqPlayroomTask(player *Player, buf []byte) error { return nil } -func ReqPlayroomTaskReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomTaskReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error { PlayroomMod := player.PlayMod.getPlayroomMod() id, items, err := PlayroomMod.GetTaskReward(int(req.Type)) if err != nil { @@ -4173,12 +3760,7 @@ func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error { } // playroom 打工离线 -func ReqPlayroomOutline(player *Player, buf []byte) error { - req := &msg.ReqPlayroomOutline{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error { ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item @@ -4194,7 +3776,7 @@ func ReqPlayroomOutline(player *Player, buf []byte) error { } } - err = ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) + err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomOutline{ Code: msg.RES_CODE_FAIL, @@ -4222,23 +3804,18 @@ func ReqPlayroomOutline(player *Player, buf []byte) error { return nil } -func ReqPlayroomWrokOutline(player *Player, buf []byte) error { +func ReqPlayroomWorkOutline(player *Player, req *msg.ReqPlayroomWorkOutline) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.SetWorkOutline(0) player.PlayMod.save() player.PushClientRes(PlayroomMod.NotifyStatus()) - player.PushClientRes(&msg.ResPlayroomWrokOutline{ + player.PushClientRes(&msg.ResPlayroomWorkOutline{ Code: msg.RES_CODE_SUCCESS, }) return nil } -func ReqPlayroomShop(player *Player, buf []byte) error { - req := &msg.ReqPlayroomShop{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error { PlayroomMod := player.PlayMod.getPlayroomMod() addItems, loseItems, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount()) if err != nil { @@ -4290,17 +3867,12 @@ func ReqPlayroomShop(player *Player, buf []byte) error { return nil } -func ReqFriendTreasure(player *Player, buf []byte) error { +func ReqFriendTreasure(player *Player, req *msg.ReqFriendTreasure) error { player.PushClientRes(player.PlayMod.getFriendTreasureMod().BackData()) return nil } -func ReqFriendTreasureStart(player *Player, buf []byte) error { - req := &msg.ReqFriendTreasureStart{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) error { // FriendMod := player.PlayMod.getFriendMod() FriendTreasureMod := player.PlayMod.getFriendTreasureMod() if FriendTreasureMod.Status == 1 { @@ -4328,12 +3900,7 @@ func ReqFriendTreasureStart(player *Player, buf []byte) error { return nil } -func ReqFriendTreasureFilp(player *Player, buf []byte) error { - req := &msg.ReqFriendTreasureFilp{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() items, uid, err := FriendTreasureMod.Flip(int(req.Pos)) if err != nil { @@ -4379,7 +3946,7 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { return nil } -func ReqFriendTreasureEnd(player *Player, buf []byte) error { +func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() items, friendItemNum, err := FriendTreasureMod.EndGame(player.GetOrderFactor()) if err != nil { @@ -4433,12 +4000,7 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { return nil } -func ReqKafkaLog(player *Player, buf []byte) error { - req := &msg.ReqKafkaLog{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqKafkaLog(player *Player, req *msg.ReqKafkaLog) error { player.TeLog(req.Event, map[string]interface{}{ "From": "Client", "data": req.Data, @@ -4446,12 +4008,7 @@ func ReqKafkaLog(player *Player, buf []byte) error { return nil } -func ReqCardHandbookReward(player *Player, buf []byte) error { - req := &msg.ReqCardHandbookReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error { CardMod := player.PlayMod.getCardMod() items, err := CardMod.GetHandbookReward(int(req.CardId)) if err != nil { @@ -4482,14 +4039,9 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { } // 设置表情 -func ReqSetEmoji(player *Player, buf []byte) error { - req := &msg.ReqSetEmoji{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error { EmojiMod := player.PlayMod.getEmojiMod() - err = EmojiMod.SetEmoji(int(req.Id), int(req.Type)) + err := EmojiMod.SetEmoji(int(req.Id), int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResSetEmoji{ Code: msg.RES_CODE_FAIL, @@ -4512,19 +4064,14 @@ func ReqSetEmoji(player *Player, buf []byte) error { } // 请求收藏室内 -func ReqCollectInfo(player *Player, buf []byte) error { +func ReqCollectInfo(player *Player, req *msg.ReqCollectInfo) error { CollectMod := player.PlayMod.getCollectMod() player.PushClientRes(CollectMod.BackData(player.GetOrderFactor())) return nil } // 领取收集奖励 -func ReqCollect(player *Player, buf []byte) error { - req := &msg.ReqCollect{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCollect(player *Player, req *msg.ReqCollect) error { CollectMod := player.PlayMod.getCollectMod() rewardType := collectCfg.GetRewardType(int(req.Id)) var num int @@ -4570,12 +4117,7 @@ func ReqCollect(player *Player, buf []byte) error { } // 获取出售棋子获得的星星数量 -func ReqSellChessNum(player *Player, buf []byte) error { - req := &msg.ReqSellChessNum{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSellChessNum(player *Player, req *msg.ReqSellChessNum) error { data, _ := mergeDataCfg.GetOne(int(req.ChessId)) num := data.SellNum limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -4589,12 +4131,7 @@ func ReqSellChessNum(player *Player, buf []byte) error { } // 设置宠物装扮 -func ReqPlayroomDressSet(player *Player, buf []byte) error { - req := &msg.ReqPlayroomDressSet{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error { PlayroomMod := player.PlayMod.getPlayroomMod() parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet)) if error != nil { @@ -4615,12 +4152,7 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { } // 设置宠物挂件 弃用 -func ReqPlayroomPetAirSet(player *Player, buf []byte) error { - req := &msg.ReqPlayroomPetAirSet{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error { PlayroomMod := player.PlayMod.getPlayroomMod() error := PlayroomMod.PlayroomPetAirSet(int(req.PetAirSet)) if error != nil { @@ -4639,8 +4171,7 @@ func ReqPlayroomPetAirSet(player *Player, buf []byte) error { } // 幸运猫活动领取奖励 -func ReqLimitEventLuckyCat(player *Player, buf []byte) error { - req := &msg.ReqLimitEventLuckyCat{} +func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() err := LimitedTimeEventMod.LuckyCat(int(req.ChessId)) if err != nil { @@ -4683,12 +4214,7 @@ func ReqLimitEventLuckyCat(player *Player, buf []byte) error { } // 领取加赠活动奖励 -func ReqAddGiftReward(player *Player, buf []byte) error { - req := &msg.ReqAddGiftReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error { activityInfo := player.GetActivityInfo(activity.ACT_TYPE_ADD_GIFT) if activityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ @@ -4724,12 +4250,7 @@ func ReqAddGiftReward(player *Player, buf []byte) error { } // 领取活动奖励 -func ReqActivityReward(player *Player, buf []byte) error { - req := &msg.ReqActivityReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error { activityInfo := player.GetActivityInfo(int(req.Id)) if activityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ @@ -4768,12 +4289,7 @@ func ReqActivityReward(player *Player, buf []byte) error { return nil } -func ReqLang(player *Player, buf []byte) error { - req := &msg.ReqLang{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqLang(player *Player, req *msg.ReqLang) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.SetLang(req.Lang) player.PushClientRes(&msg.ResLang{ @@ -4782,12 +4298,7 @@ func ReqLang(player *Player, buf []byte) error { return nil } -func ReqAdWatch(player *Player, buf []byte) error { - req := &msg.ReqAdWatch{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAdWatch(player *Player, req *msg.ReqAdWatch) error { ChargeMod := player.GetChargeMod() ChargeMod.AddAdWatch() player.TeLog("ad_watch", map[string]interface{}{ @@ -4800,12 +4311,8 @@ func ReqAdWatch(player *Player, buf []byte) error { }) return nil } -func ReqCatTrickReward(player *Player, buf []byte) error { - req := &msg.ReqCatTrickReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } + +func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) { player.SendErrClienRes(&msg.ResCatTrickReward{ @@ -4842,12 +4349,7 @@ func ReqCatTrickReward(player *Player, buf []byte) error { return nil } -func ReqChargeReceive(player *Player, buf []byte) error { - req := &msg.ReqChargeReceive{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqChargeReceive(player *Player, req *msg.ReqChargeReceive) error { FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), To: int(req.Uid), @@ -4861,12 +4363,7 @@ func ReqChargeReceive(player *Player, buf []byte) error { return nil } -func ReqAddWish(player *Player, buf []byte) error { - req := &msg.ReqAddWish{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddWish(player *Player, req *msg.ReqAddWish) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.AddWish(int(req.Id), int(req.Type)) if err != nil { @@ -4898,12 +4395,7 @@ func ReqAddWish(player *Player, buf []byte) error { return nil } -func ReqGetWish(player *Player, buf []byte) error { - req := &msg.ReqGetWish{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetWish(player *Player, req *msg.ReqGetWish) error { ChargeMod := player.PlayMod.getChargeMod() items, err := ChargeMod.GetWish() if err != nil { @@ -4933,14 +4425,9 @@ func ReqGetWish(player *Player, buf []byte) error { return nil } -func ReqSendWishBeg(player *Player, buf []byte) error { - req := &msg.ReqSendWishBeg{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error { ChargeMod := player.PlayMod.getChargeMod() - err = ChargeMod.SendWishBeg(req.Uid) + err := ChargeMod.SendWishBeg(req.Uid) if err != nil { player.SendErrClienRes(&msg.ResSendWishBeg{ Code: msg.RES_CODE_FAIL, @@ -4967,12 +4454,7 @@ func ReqSendWishBeg(player *Player, buf []byte) error { } // TODO 心愿单功能 待开发 -func ReqWishApplyList(player *Player, buf []byte) error { - req := &msg.ReqWishApplyList{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqWishApplyList(player *Player, req *msg.ReqWishApplyList) error { FriendMod := player.PlayMod.getFriendMod() list := FriendMod.GetWishApply() rs := make([]*msg.ResFriendApplyInfo, 0) @@ -4994,14 +4476,9 @@ func ReqWishApplyList(player *Player, buf []byte) error { return nil } -func ReqWishApply(player *Player, buf []byte) error { - req := &msg.ReqWishApply{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqWishApply(player *Player, req *msg.ReqWishApply) error { FriendMod := player.PlayMod.getFriendMod() - err = FriendMod.ApplyWish(req.Uid) + err := FriendMod.ApplyWish(req.Uid) if err != nil { player.SendErrClienRes(&msg.ResWishApply{ Code: msg.RES_CODE_FAIL, @@ -5026,12 +4503,7 @@ func ReqWishApply(player *Player, buf []byte) error { return nil } -func ReqGuidePlayroom(player *Player, buf []byte) error { - req := &msg.ReqGuidePlayroom{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error { GuideMod := player.PlayMod.getGuideMod() isReward := GuideMod.GetPlayroomGuide() if isReward { @@ -5042,7 +4514,7 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { return fmt.Errorf("已领取") } items := []*item.Item{item.NewItem(int(req.Id), 1)} - err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResWishApply{ Code: msg.RES_CODE_FAIL, @@ -5058,12 +4530,7 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { return nil } -func ReqId2Verify(player *Player, buf []byte) error { - req := &msg.ReqId2Verify{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error { if req.Id == "" || req.Name == "" { player.SendErrClienRes(&msg.ResId2Verify{ ResultCode: msg.RES_CODE_FAIL, @@ -5071,7 +4538,7 @@ func ReqId2Verify(player *Player, buf []byte) error { }) return fmt.Errorf("id is zero") } - err = GoUtil.IdVerify(req.Name, req.Id) + err := GoUtil.IdVerify(req.Name, req.Id) if err != nil { player.SendErrClienRes(&msg.ResId2Verify{ ResultCode: msg.RES_CODE_FAIL, @@ -5092,12 +4559,7 @@ func ReqId2Verify(player *Player, buf []byte) error { return nil } -func ReqPlayroomGameShowReward(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGameShowReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGameShowReward(player *Player, req *msg.ReqPlayroomGameShowReward) error { items := player.GetPlayroomGameReward(int(req.Type), int(req.SelectId)) player.PushClientRes(&msg.ResPlayroomGameShowReward{ Items: item.ItemToMsg(items), @@ -5105,14 +4567,9 @@ func ReqPlayroomGameShowReward(player *Player, buf []byte) error { return nil } -func ReqPlayroomGuide(player *Player, buf []byte) error { - req := &msg.ReqPlayroomGuide{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error { PlayroomMod := player.PlayMod.getPlayroomMod() - err = PlayroomMod.Guide(int(req.Type)) + err := PlayroomMod.Guide(int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomGuide{ Code: msg.RES_CODE_FAIL, @@ -5131,18 +4588,13 @@ func ReqPlayroomGuide(player *Player, buf []byte) error { return nil } -func ReqCatnip(player *Player, buf []byte) error { +func ReqCatnip(player *Player, req *msg.ReqCatnip) error { player.CatnipBackData() return nil } // TODO : 猫草大作战邀请好友 -func ReqCatnipInvite(player *Player, buf []byte) error { - req := &msg.ReqCatnipInvite{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error { activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipInvite{ @@ -5153,7 +4605,7 @@ func ReqCatnipInvite(player *Player, buf []byte) error { } activityInfo := player.GetActivityInfo(activityId) CatnipMod := player.PlayMod.getCatnipMod() - err = CatnipMod.Invite(int(req.Uid), int(req.Id)) + err := CatnipMod.Invite(int(req.Uid), int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResCatnipInvite{ Code: msg.RES_CODE_FAIL, @@ -5183,12 +4635,7 @@ func ReqCatnipInvite(player *Player, buf []byte) error { return nil } -func ReqCatnipAgree(player *Player, buf []byte) error { - req := &msg.ReqCatnipAgree{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) activityInfo := player.GetActivityInfo(activityId) @@ -5199,7 +4646,7 @@ func ReqCatnipAgree(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - _, err = CatnipMod.Agree(int(req.Id), int(req.Uid)) + _, err := CatnipMod.Agree(int(req.Id), int(req.Uid)) if err != nil { player.SendErrClienRes(&msg.ResCatnipAgree{ Code: msg.RES_CODE_FAIL, @@ -5238,12 +4685,7 @@ func ReqCatnipAgree(player *Player, buf []byte) error { } // TODO : 猫草大作战设置倍数 -func ReqCatnipMultiply(player *Player, buf []byte) error { - req := &msg.ReqCatnipMultiply{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5253,7 +4695,7 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - err = CatnipMod.Multiply(int(req.Multiply)) + err := CatnipMod.Multiply(int(req.Multiply)) if err != nil { player.SendErrClienRes(&msg.ResCatnipMultiply{ Code: msg.RES_CODE_FAIL, @@ -5274,12 +4716,7 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { } // TODO : 猫草大作战开始游戏 -func ReqCatnipPlay(player *Player, buf []byte) error { - req := &msg.ReqCatnipPlay{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5336,12 +4773,7 @@ func ReqCatnipPlay(player *Player, buf []byte) error { } // TODO : 猫草大作战领取奖励 -func ReqCatnipReward(player *Player, buf []byte) error { - req := &msg.ReqCatnipReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5382,12 +4814,7 @@ func ReqCatnipReward(player *Player, buf []byte) error { } // 猫草大作战领取大奖 -func ReqCatnipGrandReward(player *Player, buf []byte) error { - req := &msg.ReqCatnipGrandReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5424,12 +4851,7 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { return nil } -func ReqCatnipRefuse(player *Player, buf []byte) error { - req := &msg.ReqCatnipRefuse{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5439,7 +4861,7 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { }) return fmt.Errorf("activity not active") } - err = CatnipMod.Refuse(int(req.Id), int(req.Uid)) + err := CatnipMod.Refuse(int(req.Id), int(req.Uid)) if err != nil { player.SendErrClienRes(&msg.ResCatnipRefuse{ Code: msg.RES_CODE_FAIL, @@ -5469,12 +4891,12 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { return nil } -func ReqActPass(player *Player, buf []byte) error { +func ReqActPass(player *Player, req *msg.ReqActPass) error { player.ActPassBackData() return nil } -func ReqActPassReward(player *Player, buf []byte) error { +func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error { PassMod := player.PlayMod.getPassMod() items, newLevel := PassMod.GetRewardItems() err := player.HandleItem(items, msg.ITEM_POP_LABEL_ActPassReward.String()) @@ -5497,12 +4919,7 @@ func ReqActPassReward(player *Player, buf []byte) error { return nil } -func ReqGetChessRetireReward(player *Player, buf []byte) error { - req := &msg.ReqGetChessRetireReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) error { ChessMod := player.PlayMod.getChessMod() items, err := ChessMod.GetRetireReward(req.Id) if err != nil { @@ -5533,12 +4950,7 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { return nil } -func ReqCatnipEmoji(player *Player, buf []byte) error { - req := &msg.ReqCatnipEmoji{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error { CatnipMod := player.PlayMod.getCatnipMod() activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) if activityId == 0 { @@ -5572,3 +4984,136 @@ func ReqCatnipEmoji(player *Player, buf []byte) error { player.CatnipBackData() return nil } + +// 猫咪回礼 +func ReqCatReturnGift(player *Player, req *msg.ReqCatReturnGift) error { + player.CatReturnGiftBackData() + return nil +} + +// 猫猫回礼领取奖励 +func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) error { + activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT) + if activityInfo == nil { + player.SendErrClienRes(&msg.ResCatReturnGiftReward{ + Code: msg.RES_CODE_FAIL, + Msg: "activity not exist", + }) + return fmt.Errorf("activity not exist") + } + cfg := G_GameLogicPtr.ActivityMgr.GetCatReturnGiftCfg(activityInfo.Id) + if cfg == nil { + player.SendErrClienRes(&msg.ResCatReturnGiftReward{ + Code: msg.RES_CODE_FAIL, + Msg: "config not exist", + }) + return fmt.Errorf("config not exist") + } + CatReturnGiftMod := player.GetCatReturnGiftMod() + reward := CatReturnGiftMod.GetReward() + score := CatReturnGiftMod.GetScore() + items := make([]*item.Item, 0) + var maxRewardId int + for _, v := range cfg.RewardList { + if score >= int(v.Total) && reward < int(v.Id) { + items = append(items, item.MsgToItem(v.Reward)...) + maxRewardId = max(maxRewardId, int(v.Id)) + if v.StarReward > 0 { + items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor()))) + } + } + } + if len(items) == 0 { + player.SendErrClienRes(&msg.ResCatReturnGiftReward{ + Code: msg.RES_CODE_FAIL, + Msg: "no reward", + }) + return fmt.Errorf("no reward") + } + err := player.HandleItem(items, msg.ITEM_POP_LABEL_CatReturnGiftReward.String()) + if err != nil { + player.SendErrClienRes(&msg.ResCatReturnGiftReward{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + return err + } + CatReturnGiftMod.SetReward(maxRewardId) + season_id := GoUtil.FormatTime(activityInfo.StartT) + for i := reward + 1; i <= maxRewardId; i++ { + player.TeLog("milestone_reward", map[string]interface{}{ + "season_id": season_id, + "championship_step_id": i, + "reward_type": "cat_return_gift", + "item_list": items, + }) + } + player.PlayMod.save() + player.CatReturnGiftBackData() + return nil +} + +func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardGift) error { + items := limitedTimeEventCfg.GetCatReturnGiftItems() + if len(items) == 0 { + player.SendErrClienRes(&msg.ResCatReturnGiftRewardGift{ + Code: msg.RES_CODE_FAIL, + Msg: "cost item null", + }) + return fmt.Errorf("cost item null") + } + err := player.HandleLoseItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String()) + if err != nil { + player.SendErrClienRes(&msg.ResCatReturnGiftRewardGift{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + return err + } + LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() + BaseMod := player.PlayMod.getBaseMod() + items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) + if err != nil { + player.SendErrClienRes(&msg.ResSelectLimitEvent{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + return err + } + err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String()) + if err != nil { + player.SendErrClienRes(&msg.ResSelectLimitEvent{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + return err + } + player.TeLog("time_limited_slot", map[string]interface{}{ + "slot_order_number": orderNum, + "slot_reward_list": rewardList, + "slot_reward": limitedTimeEventCfg.GetEventName(eventType), + }) + player.PlayMod.save() + player.PushClientRes(LimitedTimeEventMod.BackData()) + player.PushClientRes(LimitedTimeEventMod.ProgressBackData()) + player.PushClientRes(&msg.ResSelectLimitEvent{ + Code: msg.RES_CODE_SUCCESS, + }) + return nil +} + +func ReqCatReturnGiftScore(player *Player, req *msg.ReqCatReturnGiftScore) error { + activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT) + if activityInfo == nil { + player.SendErrClienRes(&msg.ResCatReturnGiftScore{ + Code: msg.RES_CODE_FAIL, + Msg: "activity not exist", + }) + return fmt.Errorf("activity not exist") + } + CatReturnGiftMod := player.GetCatReturnGiftMod() + CatReturnGiftMod.AddScore(int(req.Score)) + player.Save() + player.CatReturnGiftBackData() + return nil +} diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go index f0334c05..a68b98d6 100644 --- a/src/server/game/req_func_friend.go +++ b/src/server/game/req_func_friend.go @@ -13,11 +13,9 @@ import ( GoUtil "server/game_util" "server/msg" "strconv" - - "google.golang.org/protobuf/proto" ) -func ReqFriendRecommend(player *Player, buf []byte) error { +func ReqFriendRecommend(player *Player, req *msg.ReqFriendRecommend) error { FriendMod := player.PlayMod.getFriendMod() RecommendList := make([]*msg.ResPlayerSimple, 0) FriendNum := FriendMod.GetFriendNum() @@ -56,12 +54,7 @@ func ReqFriendRecommend(player *Player, buf []byte) error { } // 搜索用户 -func ReqSearchPlayer(player *Player, buf []byte) error { - req := &msg.ReqSearchPlayer{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqSearchPlayer(player *Player, req *msg.ReqSearchPlayer) error { Uid, err := strconv.Atoi(req.Uid) list := make([]*msg.ResPlayerSimple, 0) if err == nil { @@ -102,12 +95,7 @@ func ReqSearchPlayer(player *Player, buf []byte) error { } // 申请好友 -func ReqApplyFriend(player *Player, buf []byte) error { - req := &msg.ReqApplyFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if Uid == int(player.M_DwUin) { @@ -195,12 +183,7 @@ func ReqApplyFriend(player *Player, buf []byte) error { } // 同意申请 -func ReqAgreeFriend(player *Player, buf []byte) error { - req := &msg.ReqAgreeFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() if !FriendMod.CheckApply(Uid) { @@ -247,12 +230,7 @@ func ReqAgreeFriend(player *Player, buf []byte) error { } // 删除好友 -func ReqDelFriend(player *Player, buf []byte) error { - req := &msg.ReqDelFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqDelFriend(player *Player, req *msg.ReqDelFriend) error { Uid := int(req.Uid) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_DEL, @@ -277,12 +255,7 @@ func ReqDelFriend(player *Player, buf []byte) error { } // 拒绝申请 -func ReqRefuseFriend(player *Player, buf []byte) error { - req := &msg.ReqRefuseFriend{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqRefuseFriend(player *Player, req *msg.ReqRefuseFriend) error { Uid := int(req.Uid) FriendMod := player.PlayMod.getFriendMod() FriendMod.RefuseApply(Uid) @@ -304,32 +277,27 @@ func ReqRefuseFriend(player *Player, buf []byte) error { return nil } -func ReqFriendList(player *Player, buf []byte) error { +func ReqFriendList(player *Player, req *msg.ReqFriendList) error { player.FriendListBackData() return nil } -func ReqFriendApply(player *Player, buf []byte) error { +func ReqFriendApply(player *Player, req *msg.ReqFriendApply) error { player.FriendApplyBackData() return nil } -func ReqFriendCardMsg(player *Player, buf []byte) error { +func ReqFriendCardMsg(player *Player, req *msg.ReqFriendCardMsg) error { player.FriendCardBackData() return nil } -func ReqFriendTimeLine(player *Player, buf []byte) error { +func ReqFriendTimeLine(player *Player, req *msg.ReqFriendTimeLine) error { player.FriendLogBackData() return nil } -func ReqFriendTLUpvote(player *Player, buf []byte) error { - req := &msg.ReqFriendTLUpvote{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error { FriendMod := player.PlayMod.getFriendMod() Items, FUid, err := FriendMod.Upvote(int(req.Id)) if err != nil { @@ -370,12 +338,7 @@ func ReqFriendTLUpvote(player *Player, buf []byte) error { return nil } -func ReqFriendTReward(player *Player, buf []byte) error { - req := &msg.ReqFriendTReward{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error { FriendMod := player.PlayMod.getFriendMod() Items, err := FriendMod.GetReward(int(req.Id)) if err != nil { @@ -401,12 +364,7 @@ func ReqFriendTReward(player *Player, buf []byte) error { return nil } -func ReqFriendReplyHandle(player *Player, buf []byte) error { - req := &msg.ReqFriendReplyHandle{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error { FriendMod := player.PlayMod.getFriendMod() ReplyInfo := FriendMod.ReplyFriend(int(req.LogId)) if ReplyInfo == nil { @@ -486,7 +444,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { } } if len(items) > 0 { - err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) + err := player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) if err != nil { player.SendErrClienRes(&msg.ResFriendReplyHandle{ Code: msg.RES_CODE_FAIL, @@ -505,12 +463,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { return nil } -func ReqFriendByCode(player *Player, buf []byte) error { - req := &msg.ReqFriendByCode{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error { if req.Code == "" { player.SendErrClienRes(&msg.ResFriendByCode{ Code: msg.RES_CODE_FAIL, @@ -550,14 +503,9 @@ func ReqFriendByCode(player *Player, buf []byte) error { return nil } -func ReqAddNpc(player *Player, buf []byte) error { - req := &msg.ReqAddNpc{} - err := proto.Unmarshal(buf, req) - if err != nil { - return err - } +func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error { FriendMod := player.PlayMod.getFriendMod() - err = FriendMod.SetNpc(int(req.NpcId)) + err := FriendMod.SetNpc(int(req.NpcId)) if err != nil { player.SendErrClienRes(&msg.ResAddNpc{ Code: msg.RES_CODE_FAIL, diff --git a/src/server/game/req_func_fur.go b/src/server/game/req_func_fur.go index d107a030..a1a0087d 100644 --- a/src/server/game/req_func_fur.go +++ b/src/server/game/req_func_fur.go @@ -2,26 +2,19 @@ package game import ( "server/msg" - - "google.golang.org/protobuf/proto" ) -func ReqPetFur(player *Player, buf []byte) error { +func ReqPetFur(player *Player, req *msg.ReqPetFur) error { FurMod := player.GetFurMod() player.PushClientRes(FurMod.BackData()) return nil } -func ReqPetFurBuy(player *Player, buf []byte) error { - var req msg.ReqPetFurBuy - err := proto.Unmarshal(buf, &req) - if err != nil { - return err - } +func ReqPetFurBuy(player *Player, req *msg.ReqPetFurBuy) error { FurMod := player.GetFurMod() costList, AddItem := FurMod.GetFurBuyCost(int(req.FurId)) // 扣除物品 - err = player.HandleLoseItem(costList, msg.ITEM_POP_LABEL_PetFurShop.String()) + err := player.HandleLoseItem(costList, msg.ITEM_POP_LABEL_PetFurShop.String()) if err != nil { return err } @@ -34,14 +27,9 @@ func ReqPetFurBuy(player *Player, buf []byte) error { return nil } -func ReqFurSet(player *Player, buf []byte) error { - var req msg.ReqFurSet - err := proto.Unmarshal(buf, &req) - if err != nil { - return err - } +func ReqFurSet(player *Player, req *msg.ReqFurSet) error { FurMod := player.GetFurMod() - err = FurMod.SetFur(int(req.FurId)) + err := FurMod.SetFur(int(req.FurId)) if err != nil { return err } diff --git a/src/server/game/server_mod.go b/src/server/game/server_mod.go index 374f03d1..9ad31e63 100644 --- a/src/server/game/server_mod.go +++ b/src/server/game/server_mod.go @@ -7,10 +7,12 @@ import ( "server/db" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/timer" "sync" "time" + + "gitea.bywaystudios.com/pet_home/leaf/timer" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/game/trigger_func.go b/src/server/game/trigger_func.go index 056b68aa..d21cc15c 100644 --- a/src/server/game/trigger_func.go +++ b/src/server/game/trigger_func.go @@ -18,8 +18,9 @@ import ( "server/game/mod/quest" GoUtil "server/game_util" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "sort" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/game/unit_test.go b/src/server/game/unit_test.go index 2e97bac0..4dfaba5d 100644 --- a/src/server/game/unit_test.go +++ b/src/server/game/unit_test.go @@ -12,8 +12,9 @@ import ( "server/game/mod/order" "server/game/mod/quest" "server/msg" - "server/pkg/github.com/name5566/leaf/log" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) func UnitEndlessReward(p *Player) error { diff --git a/src/server/game/var.go b/src/server/game/var.go index 5d166455..bdcc9212 100644 --- a/src/server/game/var.go +++ b/src/server/game/var.go @@ -5,7 +5,8 @@ import ( "server/db" "server/game/mod/msg" GoUtil "server/game_util" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) const ( diff --git a/src/server/game/var_mgr.go b/src/server/game/var_mgr.go index 300ee8a4..330eaa19 100644 --- a/src/server/game/var_mgr.go +++ b/src/server/game/var_mgr.go @@ -9,6 +9,8 @@ import ( "strings" "sync" "time" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) type VarMgr struct { diff --git a/src/server/game_util/AliyunSmsApi.go b/src/server/game_util/AliyunSmsApi.go index cb64ac26..ba0d938d 100644 --- a/src/server/game_util/AliyunSmsApi.go +++ b/src/server/game_util/AliyunSmsApi.go @@ -3,7 +3,8 @@ package GoUtil import ( "fmt" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" dysmsapi20170525 "github.com/alibabacloud-go/dysmsapi-20170525/v5/client" diff --git a/src/server/game_util/GoUtil.go b/src/server/game_util/GoUtil.go index 1f28a10a..845a4008 100644 --- a/src/server/game_util/GoUtil.go +++ b/src/server/game_util/GoUtil.go @@ -18,13 +18,14 @@ import ( "net/http" "reflect" "server/game/mod/item" - "server/pkg/github.com/name5566/leaf/log" "sort" "strconv" "strings" "sync" "time" + "gitea.bywaystudios.com/pet_home/leaf/log" + "github.com/oschwald/geoip2-golang" ) @@ -53,6 +54,295 @@ const ( LETTER = "GhCvgqSNTUMVeRfwakiYmcxWKtJQpZrDIBXnPyLsAFdzjHbulE" ) +var iso3166NumericByCountryName = map[string]string{ + "Afghanistan": "004", + "Aland Islands": "248", + "Åland Islands": "248", + "Albania": "008", + "Algeria": "012", + "American Samoa": "016", + "Andorra": "020", + "Angola": "024", + "Anguilla": "660", + "Antarctica": "010", + "Antigua and Barbuda": "028", + "Argentina": "032", + "Armenia": "051", + "Aruba": "533", + "Australia": "036", + "Austria": "040", + "Azerbaijan": "031", + "Bahamas": "044", + "Bahrain": "048", + "Bangladesh": "050", + "Barbados": "052", + "Belarus": "112", + "Belgium": "056", + "Belize": "084", + "Benin": "204", + "Bermuda": "060", + "Bhutan": "064", + "Bolivia": "068", + "Bolivia, Plurinational State of": "068", + "Bonaire, Sint Eustatius and Saba": "535", + "Bosnia and Herzegovina": "070", + "Botswana": "072", + "Bouvet Island": "074", + "Brazil": "076", + "British Indian Ocean Territory": "086", + "Brunei": "096", + "Brunei Darussalam": "096", + "Bulgaria": "100", + "Burkina Faso": "854", + "Burundi": "108", + "Cabo Verde": "132", + "Cape Verde": "132", + "Cambodia": "116", + "Cameroon": "120", + "Canada": "124", + "Cayman Islands": "136", + "Central African Republic": "140", + "Chad": "148", + "Chile": "152", + "China": "156", + "Christmas Island": "162", + "Cocos (Keeling) Islands": "166", + "Colombia": "170", + "Comoros": "174", + "Congo": "178", + "Congo, The Democratic Republic of the": "180", + "Congo, Democratic Republic of the": "180", + "Cook Islands": "184", + "Costa Rica": "188", + "Cote d'Ivoire": "384", + "Côte d'Ivoire": "384", + "Croatia": "191", + "Cuba": "192", + "Curacao": "531", + "Curaçao": "531", + "Cyprus": "196", + "Czech Republic": "203", + "Czechia": "203", + "Denmark": "208", + "Djibouti": "262", + "Dominica": "212", + "Dominican Republic": "214", + "Ecuador": "218", + "Egypt": "818", + "El Salvador": "222", + "Equatorial Guinea": "226", + "Eritrea": "232", + "Estonia": "233", + "Eswatini": "748", + "Swaziland": "748", + "Ethiopia": "231", + "Falkland Islands": "238", + "Faroe Islands": "234", + "Fiji": "242", + "Finland": "246", + "France": "250", + "French Guiana": "254", + "French Polynesia": "258", + "French Southern Territories": "260", + "Gabon": "266", + "Gambia": "270", + "Georgia": "268", + "Germany": "276", + "Ghana": "288", + "Gibraltar": "292", + "Greece": "300", + "Greenland": "304", + "Grenada": "308", + "Guadeloupe": "312", + "Guam": "316", + "Guatemala": "320", + "Guernsey": "831", + "Guinea": "324", + "Guinea-Bissau": "624", + "Guyana": "328", + "Haiti": "332", + "Heard Island and McDonald Islands": "334", + "Holy See": "336", + "Vatican City": "336", + "Honduras": "340", + "Hong Kong": "344", + "Hungary": "348", + "Iceland": "352", + "India": "356", + "Indonesia": "360", + "Iran": "364", + "Iran, Islamic Republic of": "364", + "Iraq": "368", + "Ireland": "372", + "Isle of Man": "833", + "Israel": "376", + "Italy": "380", + "Jamaica": "388", + "Japan": "392", + "Jersey": "832", + "Jordan": "400", + "Kazakhstan": "398", + "Kenya": "404", + "Kiribati": "296", + "Korea, Democratic People's Republic of": "408", + "North Korea": "408", + "Korea, Republic of": "410", + "South Korea": "410", + "Kosovo": "983", + "Kuwait": "414", + "Kyrgyzstan": "417", + "Lao People's Democratic Republic": "418", + "Laos": "418", + "Latvia": "428", + "Lebanon": "422", + "Lesotho": "426", + "Liberia": "430", + "Libya": "434", + "Liechtenstein": "438", + "Lithuania": "440", + "Luxembourg": "442", + "Macao": "446", + "Macau": "446", + "Madagascar": "450", + "Malawi": "454", + "Malaysia": "458", + "Maldives": "462", + "Mali": "466", + "Malta": "470", + "Marshall Islands": "584", + "Martinique": "474", + "Mauritania": "478", + "Mauritius": "480", + "Mayotte": "175", + "Mexico": "484", + "Micronesia": "583", + "Micronesia, Federated States of": "583", + "Moldova": "498", + "Moldova, Republic of": "498", + "Monaco": "492", + "Mongolia": "496", + "Montenegro": "499", + "Montserrat": "500", + "Morocco": "504", + "Mozambique": "508", + "Myanmar": "104", + "Burma": "104", + "Namibia": "516", + "Nauru": "520", + "Nepal": "524", + "Netherlands": "528", + "New Caledonia": "540", + "New Zealand": "554", + "Nicaragua": "558", + "Niger": "562", + "Nigeria": "566", + "Niue": "570", + "Norfolk Island": "574", + "North Macedonia": "807", + "Macedonia": "807", + "Macedonia, The Former Yugoslav Republic of": "807", + "Northern Mariana Islands": "580", + "Norway": "578", + "Oman": "512", + "Pakistan": "586", + "Palau": "585", + "Palestine": "275", + "Palestine, State of": "275", + "Panama": "591", + "Papua New Guinea": "598", + "Paraguay": "600", + "Peru": "604", + "Philippines": "608", + "Pitcairn": "612", + "Poland": "616", + "Portugal": "620", + "Puerto Rico": "630", + "Qatar": "634", + "Reunion": "638", + "Réunion": "638", + "Romania": "642", + "Russia": "643", + "Russian Federation": "643", + "Rwanda": "646", + "Saint Barthelemy": "652", + "Saint Barthélemy": "652", + "Saint Helena": "654", + "Saint Helena, Ascension and Tristan da Cunha": "654", + "Saint Kitts and Nevis": "659", + "Saint Lucia": "662", + "Saint Martin": "663", + "Saint Martin (French part)": "663", + "Saint Pierre and Miquelon": "666", + "Saint Vincent and the Grenadines": "670", + "Samoa": "882", + "San Marino": "674", + "Sao Tome and Principe": "678", + "Saudi Arabia": "682", + "Senegal": "686", + "Serbia": "688", + "Seychelles": "690", + "Sierra Leone": "694", + "Singapore": "702", + "Sint Maarten": "534", + "Sint Maarten (Dutch part)": "534", + "Slovakia": "703", + "Slovenia": "705", + "Solomon Islands": "090", + "Somalia": "706", + "South Africa": "710", + "South Georgia and the South Sandwich Islands": "239", + "South Sudan": "728", + "Spain": "724", + "Sri Lanka": "144", + "Sudan": "729", + "Suriname": "740", + "Svalbard and Jan Mayen": "744", + "Sweden": "752", + "Switzerland": "756", + "Syrian Arab Republic": "760", + "Syria": "760", + "Taiwan": "158", + "Taiwan, Province of China": "158", + "Tajikistan": "762", + "Tanzania": "834", + "Tanzania, United Republic of": "834", + "Thailand": "764", + "Timor-Leste": "626", + "East Timor": "626", + "Togo": "768", + "Tokelau": "772", + "Tonga": "776", + "Trinidad and Tobago": "780", + "Tunisia": "788", + "Turkey": "792", + "Türkiye": "792", + "Turkmenistan": "795", + "Turks and Caicos Islands": "796", + "Tuvalu": "798", + "Uganda": "800", + "Ukraine": "804", + "United Arab Emirates": "784", + "United Kingdom": "826", + "United States": "840", + "United States Minor Outlying Islands": "581", + "Uruguay": "858", + "Uzbekistan": "860", + "Vanuatu": "548", + "Venezuela": "862", + "Venezuela, Bolivarian Republic of": "862", + "Viet Nam": "704", + "Vietnam": "704", + "Virgin Islands, British": "092", + "British Virgin Islands": "092", + "Virgin Islands, U.S.": "850", + "U.S. Virgin Islands": "850", + "Wallis and Futuna": "876", + "Western Sahara": "732", + "Yemen": "887", + "Zambia": "894", + "Zimbabwe": "716", +} + // 加密字符串 func Encrypt(plainText string) (string, error) { block, err := aes.NewCipher([]byte(SECRET_KEY)) @@ -528,79 +818,17 @@ func GetCountryByIP(ip string) (string, error) { // 根据国家名称获取ISO 3166-1国家码 func GetISOCodeByCountry(country string) (string, error) { - // 简单映射，可以扩展为更完整的映射表 - countryMap := map[string]string{ - "Afghanistan": "004", // 阿富汗 - "Albania": "008", // 阿尔巴尼亚 - "Algeria": "012", // 阿尔及利亚 - "Angola": "024", // 安哥拉 - "Argentina": "032", // 阿根廷 - "Austria": "040", // 奥地利 - "Azerbaijan": "031", // 阿塞拜疆 - "Bahrain": "048", // 巴林 - "Bangladesh": "050", // 孟加拉国 - "Belgium": "056", // 比利时 - "Bolivia": "068", // 玻利维亚 - "Bosnia and Herzegovina": "070", // 波斯尼亚和黑塞哥维那 - "Brazil": "076", // 巴西 - "Bulgaria": "100", // 保加利亚 - "Canada": "124", // 加拿大 - "Chile": "152", // 智利 - "China": "156", // 中国 - "Colombia": "170", // 哥伦比亚 - "Costa Rica": "188", // 哥斯达黎加 - "Croatia": "191", // 克罗地亚 - "Cuba": "192", // 古巴 - "Denmark": "208", // 丹麦 - "Ecuador": "218", // 厄瓜多尔 - "Egypt": "818", // 埃及 - "Ethiopia": "231", // 埃塞俄比亚 - "Finland": "246", // 芬兰 - "France": "250", // 法国 - "Germany": "276", // 德国 - "Ghana": "288", // 加纳 - "Greece": "300", // 希腊 - "Hungary": "348", // 匈牙利 - "India": "356", // 印度 - "Indonesia": "360", // 印度尼西亚 - "Iran": "364", // 伊朗 - "Iraq": "368", // 伊拉克 - "Italy": "380", // 意大利 - "Japan": "392", // 日本 - "Jordan": "400", // 约旦 - "Kenya": "404", // 肯尼亚 - "Kuwait": "414", // 科威特 - "Lebanon": "422", // 黎巴嫩 - "Malaysia": "458", // 马来西亚 - "Mexico": "484", // 墨西哥 - "Morocco": "504", // 摩洛哥 - "Nigeria": "566", // 尼日利亚 - "Norway": "578", // 挪威 - "Pakistan": "586", // 巴基斯坦 - "Peru": "604", // 秘鲁 - "Philippines": "608", // 菲律宾 - "Poland": "616", // 波兰 - "Portugal": "620", // 葡萄牙 - "Qatar": "634", // 卡塔尔 - "Romania": "642", // 罗马尼亚 - "Russia": "643", // 俄罗斯 - "Saudi Arabia": "682", // 沙特阿拉伯 - "South Africa": "710", // 南非 - "South Korea": "410", // 韩国 - "Spain": "724", // 西班牙 - "Sweden": "752", // 瑞典 - "Switzerland": "756", // 瑞士 - "Thailand": "764", // 泰国 - "Turkey": "792", // 土耳其 - "Ukraine": "804", // 乌克兰 - "United Kingdom": "826", // 英国 - "United States": "840", // 美国 - "Vietnam": "704", // 越南 - "Zimbabwe": "716", // 津巴布韦 - } - if code, ok := countryMap[country]; ok { + country = strings.TrimSpace(country) + if code, ok := iso3166NumericByCountryName[country]; ok { return code, nil } + + for name, code := range iso3166NumericByCountryName { + if strings.EqualFold(name, country) { + return code, nil + } + } + return "", fmt.Errorf("country code not found for %s", country) } diff --git a/src/server/game_util/timeUtil.go b/src/server/game_util/timeUtil.go index 083a5c81..54f5404b 100644 --- a/src/server/game_util/timeUtil.go +++ b/src/server/game_util/timeUtil.go @@ -178,3 +178,8 @@ func IsFirstDayOfMonth() bool { func NowMonth() int { return int(time.Now().Month()) } + +func FormatTime(timestamp int64) string { + t := time.Unix(timestamp, 0) + return t.Format("2006-01-02 15:04:05") +} diff --git a/src/server/gamedata/reader.go b/src/server/gamedata/reader.go index 6b8ff484..bf3ff515 100644 --- a/src/server/gamedata/reader.go +++ b/src/server/gamedata/reader.go @@ -11,7 +11,8 @@ import ( "server/conf" "server/game/mod/item" - "server/pkg/github.com/name5566/leaf/log" + + "gitea.bywaystudios.com/pet_home/leaf/log" ) var ( diff --git a/src/server/gate/internal/module.go b/src/server/gate/internal/module.go index f07af1b5..43ef1573 100644 --- a/src/server/gate/internal/module.go +++ b/src/server/gate/internal/module.go @@ -5,7 +5,7 @@ import ( "server/game" "server/msg" - "server/pkg/github.com/name5566/leaf/gate" + "gitea.bywaystudios.com/pet_home/leaf/gate" ) type Module struct { diff --git a/src/server/go.mod b/src/server/go.mod index 3aa595ee..1ee08a40 100644 --- a/src/server/go.mod +++ b/src/server/go.mod @@ -1,8 +1,11 @@ module server -go 1.25.0 +go 1.25.5 require ( + gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74 + gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8 + gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c github.com/alibabacloud-go/cloudauth-20190307/v4 v4.9.2 github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11 github.com/alibabacloud-go/dysmsapi-20170525/v5 v5.1.1 @@ -11,7 +14,6 @@ require ( github.com/alibabacloud-go/tea-utils/v2 v2.0.7 github.com/aliyun/credentials-go v1.4.6 github.com/go-sql-driver/mysql v1.8.1 - github.com/gorilla/websocket v1.5.3 github.com/jmoiron/sqlx v1.4.0 github.com/oschwald/geoip2-golang v1.13.0 github.com/redis/go-redis/v9 v9.6.1 @@ -19,7 +21,6 @@ require ( github.com/shirou/gopsutil v3.21.11+incompatible google.golang.org/grpc v1.79.2 google.golang.org/protobuf v1.36.11 - gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 ) require ( @@ -58,10 +59,6 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/google/uuid v1.6.0 - github.com/tuyou/galog v0.0.0 - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect ) - -replace github.com/tuyou/galog => ./galog diff --git a/src/server/go.sum b/src/server/go.sum index 5373fd05..65640a7e 100644 --- a/src/server/go.sum +++ b/src/server/go.sum @@ -1,6 +1,12 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74 h1:Z2tn7BpurJXYdKBGThg3SndbLX9ARTy6msRy5ihdrm0= +gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74/go.mod h1:Sj45tVreK2AFDH+k03Q0uy8paaF6TINOT6vqWIFG4sg= +gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8 h1:qs0cKcOE/uI8ABumwubKR9TKMFa3u9jUR9hQ4SThq4Q= +gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8/go.mod h1:9rWUv5SNj6indAuM2dAT76uO34a/C2FGptEDKkyg21U= +gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c h1:FjL8acgHxp1CMi+JSMwD1GXWIe7WIo1h8LoFVaLI87A= +gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c/go.mod h1:VNNASaG7YCk+7We0m+SQ6/fMacEjx+TTFvcS/1Rp+6Q= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 h1:eIf+iGJxdU4U9ypaUfbtOWCsZSbTb8AUHvyPrxu6mAA= github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo= @@ -134,10 +140,7 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -342,17 +345,11 @@ google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBN google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/src/server/main.go b/src/server/main.go index 9ea8e540..f8397bdd 100644 --- a/src/server/main.go +++ b/src/server/main.go @@ -4,14 +4,26 @@ import ( "fmt" "net/http" _ "net/http/pprof" + "os" + "os/signal" "runtime" "runtime/debug" "server/MergeConst" + "server/backend" + mergeCluster "server/cluster" "server/conf" "server/game" + GoUtil "server/game_util" + "server/gamedata" "server/gate" - "server/pkg/github.com/name5566/leaf" - lconf "server/pkg/github.com/name5566/leaf/conf" + "syscall" + "time" + + "gitea.bywaystudios.com/pet_home/leaf/cluster" + lconf "gitea.bywaystudios.com/pet_home/leaf/conf" + "gitea.bywaystudios.com/pet_home/leaf/console" + "gitea.bywaystudios.com/pet_home/leaf/log" + "gitea.bywaystudios.com/pet_home/leaf/module" ) func main() { @@ -37,9 +49,65 @@ func main() { _ = http.ListenAndServe(fmt.Sprintf("127.0.0.1:%d", port), nil) }() - leaf.Run( + run( game.Module, gate.Module, ) +} + +func run(mods ...module.Module) { + //logger + if lconf.LogLevel != "" { + if _, err := os.Stat(lconf.LogPath); os.IsNotExist(err) { + os.Mkdir(lconf.LogPath, os.ModePerm) + } + zero := GoUtil.ZeroTimestamp() + now := time.Unix(zero, 0).Local() + err := log.NewDailyLog(now, log.DEBUG_LEVEL, lconf.LogPath, conf.LogFlag) + if err != nil { + panic(err) + } + } + log.Release("服务器版本: %s", MergeConst.Go_game_version) + log.Release("%s 启动, 节点类型: %s, 区服id: %d", conf.Server.GameName, conf.Server.ServerType, conf.Server.ServerID) + go backend.Start() + // module + for i := 0; i < len(mods); i++ { + module.Register(mods[i]) + } + module.Init() + + // cluster + mergeCluster.Init() + + // console + console.Init() + defer func() { + if r := recover(); r != nil { + log.Debug("Leaf console error: %v", r) + log.Debug("Leaf closing down\n") + console.Destroy() + cluster.Destroy() + module.Destroy() + game.Destroy() + os.Exit(1) + } + }() + // close + c := make(chan os.Signal, 1) + signal.Notify(c, syscall.SIGTERM, syscall.SIGINT) + for { + sig := <-c + if sig == syscall.SIGINT { + gamedata.Reload() + continue + } + log.Debug("Leaf closing down (signal: %v)\n", sig.String()) + console.Destroy() + cluster.Destroy() + module.Destroy() + game.Destroy() + os.Exit(1) + } } diff --git a/src/server/msg/msg.go b/src/server/msg/msg.go index 5a23010e..8bbd8a56 100644 --- a/src/server/msg/msg.go +++ b/src/server/msg/msg.go @@ -1,7 +1,7 @@ package msg import ( - "server/pkg/github.com/name5566/leaf/network/protobuf" + "gitea.bywaystudios.com/pet_home/leaf/network/protobuf" ) var Processor = protobuf.NewProcessor() diff --git a/src/server/pkg/github.com/name5566/leaf/LICENSE b/src/server/pkg/github.com/name5566/leaf/LICENSE deleted file mode 100644 index 7fceb6bf..00000000 --- a/src/server/pkg/github.com/name5566/leaf/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2014-2020 Name5566. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/src/server/pkg/github.com/name5566/leaf/README.md b/src/server/pkg/github.com/name5566/leaf/README.md deleted file mode 100644 index fac048af..00000000 --- a/src/server/pkg/github.com/name5566/leaf/README.md +++ /dev/null @@ -1,27 +0,0 @@ -Leaf -==== -A pragmatic game server framework in Go (golang). - -Features ---------- - -* Extremely easy to use -* Reliable -* Multicore support -* Modularity - -Community ---------- - - - -Documentation ---------- - -* [中文文档](https://github.com/name5566/leaf/blob/master/TUTORIAL_ZH.md) -* [English](https://github.com/name5566/leaf/blob/master/TUTORIAL_EN.md) - -Licensing ---------- - -Leaf is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/name5566/leaf/blob/master/LICENSE) for the full license text. diff --git a/src/server/pkg/github.com/name5566/leaf/TUTORIAL_EN.md b/src/server/pkg/github.com/name5566/leaf/TUTORIAL_EN.md deleted file mode 100644 index 69affb00..00000000 --- a/src/server/pkg/github.com/name5566/leaf/TUTORIAL_EN.md +++ /dev/null @@ -1,528 +0,0 @@ -Brief introduction to Leaf -========================== - -Leaf, written in Go, is a open source game server framework aiming to boost the efficiency both in development and runtime. - -Leaf champions below philosophies: - -* Simple APIs. Leaf tends to provide simple and plain interfaces which are always best for use. -* Self-healing. Leaf always tries to salvage the process from runtime errors instead of leaving it to crash. -* Multi-core support. Leaf utilize its modules and [leaf/go](https://github.com/name5566/leaf/tree/master/go) to make use of CPU resouces at maximum while avoiding varieties of side effects may be caused. - -* Module-based. - -Leaf's Modules --------------- - -A game server implemented with Leaf may include many modules (e.g. [LeafServer](https://github.com/name5566/leafserver)) which all share below traits: - -* Each module runs inside a separate goroutine -* Modules communicate with one another via a light weight RPC channel([leaf/chanrpc](https://github.com/name5566/leaf/tree/master/chanrpc)) - -Leaf suggests not to take in too many modules in your game server implementation. - -Modules are registered at the beginning of program as below - -```go -leaf.Run( - game.Module, - gate.Module, - login.Module, -) -``` - -The modules of `game`, `gate` and `login` are registered consecutively. They are required to implement a `Module` interface. - -```go -type Module interface { - OnInit() - OnDestroy() - Run(closeSig chan bool) -} -``` - -Leaf follows below steps to manage modules: - -1. Takes turns (FIFO) to register the given modules by calling `OnInit()`' in a parent goroutine -2. Starts a new goroutine for each module to run `Run()` -3. When the parent goroutine is being closed (like by a SIGINT), the modules will be unregistered by calling `OnDestroy()` in the reverse order when they get registered. - -Leaf source code directories ----------------------------- - -* leaf/chanrpc : RPC channel for inter-modules communication -* leaf/db : Database Utilities with [MongoDB](https://www.mongodb.org/) support -* leaf/gate : Gate module that connects to client -* leaf/go : Factory of goroutine that manageable for Leaf -* leaf/log : Logging -* leaf/network : Networking through TCP or WebSocket with a customized message encoding. There are two built-in encodings, [protobuf](https://developers.google.com/protocol-buffers) and JSON. -* leaf/recordfile : To manage game related data. -* leaf/timer : Timer -* leaf/util : Utilities - -How to use Leaf ---------------- - -[LeafServer](https://github.com/name5566/leafserver) is a game server developped with Leaf. Let's start with it. - -Download the source code of LeafServer： - -``` -git clone https://github.com/name5566/leafserver -``` - -Download and install leafserver to GOPATH: - -``` -go get github.com/name5566/leaf -``` - -Compile LeafServer： - -``` -go install server -``` - -Run `server` you will get below screen output if everything is successful. - -``` -2015/08/26 22:11:27 [release] Leaf 1.1.2 starting up -``` - -Press Ctrl + C to terminate the process, you'll see - -``` -2015/08/26 22:12:30 [release] Leaf closing down (signal: interrupt) -``` - -### Hello Leaf - -Now with the acknowledge of LeafServer, we come to see how server receives and handles messages. - - -Firstly we define a JSON-encoded message(likely the protobuf). Open LeafServer msg/msg.go then you will see below: - -```go -package msg - -import ( - "server/lib/github.com/name5566/leaf/network" -) - -var Processor network.Processor - -func init() { - -} -``` - -Processor is the message handler. Here we use the handler of JSON, the default message encoding, and create a Hello message. - -```go -package msg - -import ( - "server/lib/github.com/name5566/leaf/network/json" -) - -// Create a JSON Processor（or protobuf if you like） -var Processor = json.NewProcessor() - -func init() { - // Register message Hello - Processor.Register(&Hello{}) -} - -// One struct for one message -// Contains a string member -type Hello struct { - Name string -} -``` - -Every message sent from client to server will be flown to `gate` module for routing. Just in brief, `gate` determines which message will be handled by which modules. We want to feed `game` module with `Hello` here, so open LeafServer gate/router.go and write below: - -```go -package gate - -import ( - "server/game" - "server/msg" -) - -func init() { - // Route Hello to game - // All communication are through ChanRPC including the management messages - msg.Processor.SetRouter(&msg.Hello{}, game.ChanRPC) -} -``` - -It is ready to handle `Hello` message in `game` module. Open LeafServer game/internal/handler.go and write: - -```go -package internal - -import ( - "server/pkg/github.com/name5566/leaf/log" - "server/lib/github.com/name5566/leaf/gate" - "reflect" - "server/msg" -) - -func init() { - // Register the handler of `Hello` message to `game` module handleHello - handler(&msg.Hello{}, handleHello) -} - -func handler(m interface{}, h interface{}) { - skeleton.RegisterChanRPC(reflect.TypeOf(m), h) -} - -func handleHello(args []interface{}) { - // Send "Hello" - m := args[0].(*msg.Hello) - // The receiver - a := args[1].(gate.Agent) - - // The content of the message - log.Debug("hello %v", m.Name) - - // Reply with a `Hello` - a.WriteMsg(&msg.Hello{ - Name: "client", - }) -} -``` - -By here we've finished a simplest example for server. Now we will write a client from scratch for testing to understand the message structure better. - -When we choose TCP over the others, the message in transition will be all formated like below: - -``` --------------- -| len | data | --------------- -``` - -To be more specific: - -1. len means the size of data by bytes. len itself takes space(2 bytes by default, configurable). The minimum size of len equals the the minimum size of a single message. -2. data part is encoded with JSON or protobuf (or a customized one) - -Write the client: -```go -package main - -import ( - "encoding/binary" - "net" -) - -func main() { - conn, err := net.Dial("tcp", "127.0.0.1:3563") - if err != nil { - panic(err) - } - - // Hello message (JSON-encoded) - // The structure of the message - data := []byte(`{ - "Hello": { - "Name": "leaf" - } - }`) - - // len + data - m := make([]byte, 2+len(data)) - - // BigEndian encoded - binary.BigEndian.PutUint16(m, uint16(len(data))) - - copy(m[2:], data) - - // Send message - conn.Write(m) -} -``` - -Run the client to send the message, then server will display it as received - -``` -2015/09/25 07:41:03 [debug ] hello leaf -2015/09/25 07:41:03 [debug ] read message: read tcp 127.0.0.1:3563->127.0.0.1:54599: wsarecv: An existing connection was forcibly closed by the remote host. -``` - -Client will exit after send out the message, and then disconnect with server. Thus server displays the event message of disconnection(the second, the event message might be dependant on the version of Go environment). - -Beside TCP, WebSocket is another choice of protocol and ideal for HTML5 web game. Leaf uses TCP or WebSocket separately or jointly. In other words, server can handle TCP messages and WebSocket messages at the same time. They are "transparent" for developers. From now on we will demonstrate how to use a client based on WebSocket: -```html - -``` - -Save above to a HTML file and open it in a browser (with WebSocket support). Before that, we still have to update the configuration for LeafServer in bin/conf/server.json by adding WebSocket listenning address： -```json -{ - "LogLevel": "debug", - "LogPath": "", - "TCPAddr": "127.0.0.1:3563", - "WSAddr": "127.0.0.1:3653", - "MaxConnNum": 20000 -} -``` - -Restart server then we get the first WebSocket message: - -``` -2015/09/25 07:50:03 [debug ] hello leaf -``` - -Please to be noted: Within WebSocket, Leaf always send binary messages rather text messages. - -### Leaf in details - -LeafServer includes three modules, they are: - -* gate module: for management of connection -* login module: for the user authentication -* game module: for the main business - -The structure of a Leaf module is suggested (but not forced) to: - -1. Be located in a separate directory -2. Have its internal implementation located under `./internal` -3. Have a file external.go to expose its interfaces. For instance of external.go: - -```go -package game - -import ( - "server/game/internal" -) - -var ( - // Instantiate game module - Module = new(internal.Module) - // Expose ChanRPC - ChanRPC = internal.ChanRPC -) -``` - -Instantiation of game module must be done before its registration to Leaf framework(detailed in LeafServer main.go). Besides ChanRPC needs to be exposed for inter-module communication. - -Enter into game module's internal（LeafServer game/internal/module.go）： - -```go -package internal - -import ( - "server/pkg/github.com/name5566/leaf/module" - "server/base" -) - -var ( - skeleton = base.NewSkeleton() - ChanRPC = skeleton.ChanRPCServer -) - -type Module struct { - *module.Skeleton -} - -func (m *Module) OnInit() { - m.Skeleton = skeleton -} - -func (m *Module) OnDestroy() { - -} -``` - -skeleton is the key which implements `Run()` and provides: - -* ChanRPC -* goroutine -* Timer - -### Leaf ChanRPC - -Since in Leaf, every module runs in a separate goroutine, a RPC channel is needed to support the communication between modules. The representing object ChanRPC needs to be registered when the game server is being started and actually it is not safe. For example, in LeafServer, game module registers two ChanRPC objects: NewAgent and CloseAgent. - -```go -package internal - -import ( - "server/lib/github.com/name5566/leaf/gate" -) - -func init() { - skeleton.RegisterChanRPC("NewAgent", rpcNewAgent) - skeleton.RegisterChanRPC("CloseAgent", rpcCloseAgent) -} - -func rpcNewAgent(args []interface{}) { - -} - -func rpcCloseAgent(args []interface{}) { - -} -``` - -skeleton is used to register ChanRPC. RegisterChanRPC's first parameter is the string name of ChanRPC and the second is the function that implements ChanRPC. NewAgent and CloseAgent will be called by gate module respectively when connection is set up or broken. The calling of ChanRPC includes 3 modes: - -1. Synchronous mode : called waiting for ChanRPC is yielded -2. Asynchronous mode : called with a callback function where you can handle the returned ChanRPC -3. "Go mode" : return immediately ignoring any return values or errors - -This is how gate module call game module's NewAgent ChanRPC (This snippet is simplified for demonstration): - -```go -game.ChanRPC.Go("NewAgent", a) -``` - -Here NewAgent will be called with a parameter a which can be retrieved from args[0], the rest can be done in the same manner. - -More references are at [leaf/chanrpc](https://github.com/name5566/leaf/blob/master/chanrpc). Please be noted, no matter how delicate the encapsulation is, calling function across goroutines cannot be that straight. Try not to create too many modules and interactions. Modules designed in Leaf are supposed to decouple the businesses from others rather make most use of CPU cores. The correct way to make most use of CPU cores is to use goroutine properly. - -### Leaf Go - -Use goroutine properly can make better use of CPU cores. Leaf implements its own Go() for below reasons: - -* Errors within goroutine can be handled -* Game server needs to wait for all goroutines' execution -* The results of goroutine can be obtained more easily -* goroutine will follow the order to be exercised. It is very important in some occasion - -Here is an example which can be tested in OnInit() in LeafServer's module. - -```go -log.Debug("1") - -// Define res to make the result watchable -var res string - -skeleton.Go(func() { - // Simulate a slow operation - time.Sleep(1 * time.Second) - - // res is modified - res = "3" -}, func() { - log.Debug(res) -}) - -log.Debug("2") -``` - -The result are: - -```go -2015/08/27 20:37:17 [debug ] 1 -2015/08/27 20:37:17 [debug ] 2 -2015/08/27 20:37:18 [debug ] 3 -``` - -skeleton.Go() accepts two function parameters, first one will be exercised in a separate goroutine and afterwards the second be exercised within the same goroutine. And res can only be used by one goroutine at one moment so nothing more need to be done for synchronization. This implementation makes CPU can be fully used while no need to block goroutines. It is quite convenient when shared resources are used. - -More references are at [leaf/go](https://github.com/name5566/leaf/blob/master/go)。 - -### Leaf timer - -Go has a built-in implementation in its standard library: - -```go -func AfterFunc(d Duration, f func()) *Timer -``` - -AfterFunc() will wait for a duration of d then exercises f() in a separate goroutine. Leaf also implement AfterFunc(), and in this version f() will be exercised but within the same goroutine. It will prevent synchronization from happening. - -```go -skeleton.AfterFunc(5 * time.Second, func() { - // ... -}) -``` - -Besides, Leaf timer support [cron expressions](https://en.wikipedia.org/wiki/Cron) to support scheduled jobs like start at 9am daily or Sunday 6pm weekly. - -More references are at [leaf/timer](https://github.com/name5566/leaf/blob/master/timer)。 - -### Leaf log - -Leaf support below log level: - -1. Debug level: Not critical -2. Release level: Critical -3. Error level: Errors -4. Fatal level: Fatal errors - -Debug < Release < Error < Fatal (In priority level) - -For LeafServer, bin/conf/server.json is used to configure log level which will filter out the lower level log information. Fatal level log is sort of different and comes only when the game server exit. Usually it records the information when the game server is failed to start up. - -Set LogFlag (LeafServer conf/conf.go) to output the file name and the line number: - -``` -LogFlag = log.Lshortfile -``` - -LogFlag：[https://golang.org/pkg/log/#pkg-constants](https://golang.org/pkg/log/#pkg-constants) - - -More references are at [leaf/log](https://github.com/name5566/leaf/blob/master/log). - -### Leaf recordfile - -Leaf recordfile is formatted in CSV([Example](https://github.com/name5566/leaf/blob/master/recordfile/test.txt)). recordfile is to manage the configuration for game. The usage of recordfile in LeafServer is quite simple: - -1. Create a CSV file under bin/gamedata -2. Call readRf() to read it in gamedata module - -Samples: - -```go -// Make sure Test.txt is located in bin/gamedata -// The file name must match the name of the struct, and all characters are case sensitive. -// Every instance of defined struct maps to one specific row in recordfile -type Test struct { - // The type of first column is int - // "index" means this column will be indexed(exclusively) - Id int "index" - // The type of second column is an array of int with a length of 4 - Arr [4]int - // The type of third column is string - Str string -} - -// Load recordfile Test.txt into memory -// RfTest is the object that represents Test.txt in memory -var RfTest = readRf(Test{}) - -func init() { - // Search in index - // Fetch the row with id equals 1 in Test.txt - r := RfTest.Index(1) - - if r != nil { - row := r.(*Test) - - // Log this row - log.Debug("%v %v %v", row.Id, row.Arr, row.Str) - } -} -``` - -Refer to [leaf/recordfile](https://github.com/name5566/leaf/blob/master/recordfile) for more details. - -Learn more ----------- - -More references are at Wiki [https://github.com/name5566/leaf/wiki](https://github.com/name5566/leaf/wiki) diff --git a/src/server/pkg/github.com/name5566/leaf/TUTORIAL_ZH.md b/src/server/pkg/github.com/name5566/leaf/TUTORIAL_ZH.md deleted file mode 100644 index 0b2854c8..00000000 --- a/src/server/pkg/github.com/name5566/leaf/TUTORIAL_ZH.md +++ /dev/null @@ -1,523 +0,0 @@ -Leaf 游戏服务器框架简介 -================== - -Leaf 是一个由 Go 语言（golang）编写的开发效率和执行效率并重的开源游戏服务器框架。Leaf 适用于各类游戏服务器的开发，包括 H5（HTML5）游戏服务器。 - -Leaf 的关注点： - -* 良好的使用体验。Leaf 总是尽可能的提供简洁和易用的接口，尽可能的提升开发的效率 -* 稳定性。Leaf 总是尽可能的恢复运行过程中的错误，避免崩溃 -* 多核支持。Leaf 通过模块机制和 [leaf/go](https://github.com/name5566/leaf/tree/master/go) 尽可能的利用多核资源，同时又尽量避免各种副作用 -* 模块机制。 - -Leaf 的模块机制 ---------------- - -一个 Leaf 开发的游戏服务器由多个模块组成（例如 [LeafServer](https://github.com/name5566/leafserver)），模块有以下特点： - -* 每个模块运行在一个单独的 goroutine 中 -* 模块间通过一套轻量的 RPC 机制通讯（[leaf/chanrpc](https://github.com/name5566/leaf/tree/master/chanrpc)） - -Leaf 不建议在游戏服务器中设计过多的模块。 - -游戏服务器在启动时进行模块的注册，例如： - -```go -leaf.Run( - game.Module, - gate.Module, - login.Module, -) -``` - -这里按顺序注册了 game、gate、login 三个模块。每个模块都需要实现接口： - -```go -type Module interface { - OnInit() - OnDestroy() - Run(closeSig chan bool) -} -``` - -Leaf 首先会在同一个 goroutine 中按模块注册顺序执行模块的 OnInit 方法，等到所有模块 OnInit 方法执行完成后则为每一个模块启动一个 goroutine 并执行模块的 Run 方法。最后，游戏服务器关闭时（Ctrl + C 关闭游戏服务器）将按模块注册相反顺序在同一个 goroutine 中执行模块的 OnDestroy 方法。 - -Leaf 源码概览 ---------------- - -* leaf/chanrpc 提供了一套基于 channel 的 RPC 机制，用于游戏服务器模块间通讯 -* leaf/db 数据库相关，目前支持 [MongoDB](https://www.mongodb.org/) -* leaf/gate 网关模块，负责游戏客户端的接入 -* leaf/go 用于创建能够被 Leaf 管理的 goroutine -* leaf/log 日志相关 -* leaf/network 网络相关，使用 TCP 和 WebSocket 协议，可自定义消息格式，默认 Leaf 提供了基于 [protobuf](https://developers.google.com/protocol-buffers) 和 JSON 的消息格式 -* leaf/recordfile 用于管理游戏数据 -* leaf/timer 定时器相关 -* leaf/util 辅助库 - -使用 Leaf 开发游戏服务器 ---------------- - -[LeafServer](https://github.com/name5566/leafserver) 是一个基于 Leaf 开发的游戏服务器，我们以 LeafServer 作为起点。 - -获取 LeafServer： - -``` -git clone https://github.com/name5566/leafserver -``` - -设置 leafserver 目录到 GOPATH 环境变量后获取 Leaf： - -``` -go get github.com/name5566/leaf -``` - -编译 LeafServer： - -``` -go install server -``` - -如果一切顺利，运行 server 你可以获得以下输出： - -``` -2015/08/26 22:11:27 [release] Leaf 1.1.2 starting up -``` - -敲击 Ctrl + C 关闭游戏服务器，服务器正常关闭输出： - -``` -2015/08/26 22:12:30 [release] Leaf closing down (signal: interrupt) -``` - -### Hello Leaf - -现在，在 LeafServer 的基础上，我们来看看游戏服务器如何接收和处理网络消息。 - -首先定义一个 JSON 格式的消息（protobuf 类似）。打开 LeafServer msg/msg.go 文件可以看到如下代码： - -```go -package msg - -import ( - "server/lib/github.com/name5566/leaf/network" -) - -var Processor network.Processor - -func init() { - -} -``` - -Processor 为消息的处理器（可由用户自定义），这里我们使用 Leaf 默认提供的 JSON 消息处理器并尝试添加一个名字为 Hello 的消息： - -```go -package msg - -import ( - "server/lib/github.com/name5566/leaf/network/json" -) - -// 使用默认的 JSON 消息处理器（默认还提供了 protobuf 消息处理器） -var Processor = json.NewProcessor() - -func init() { - // 这里我们注册了一个 JSON 消息 Hello - Processor.Register(&Hello{}) -} - -// 一个结构体定义了一个 JSON 消息的格式 -// 消息名为 Hello -type Hello struct { - Name string -} -``` - -客户端发送到游戏服务器的消息需要通过 gate 模块路由，简而言之，gate 模块决定了某个消息具体交给内部的哪个模块来处理。这里，我们将 Hello 消息路由到 game 模块中。打开 LeafServer gate/router.go，敲入如下代码： - -```go -package gate - -import ( - "server/game" - "server/msg" -) - -func init() { - // 这里指定消息 Hello 路由到 game 模块 - // 模块间使用 ChanRPC 通讯，消息路由也不例外 - msg.Processor.SetRouter(&msg.Hello{}, game.ChanRPC) -} -``` - -一切就绪，我们现在可以在 game 模块中处理 Hello 消息了。打开 LeafServer game/internal/handler.go，敲入如下代码： - -```go -package internal - -import ( - "server/pkg/github.com/name5566/leaf/log" - "server/lib/github.com/name5566/leaf/gate" - "reflect" - "server/msg" -) - -func init() { - // 向当前模块（game 模块）注册 Hello 消息的消息处理函数 handleHello - handler(&msg.Hello{}, handleHello) -} - -func handler(m interface{}, h interface{}) { - skeleton.RegisterChanRPC(reflect.TypeOf(m), h) -} - -func handleHello(args []interface{}) { - // 收到的 Hello 消息 - m := args[0].(*msg.Hello) - // 消息的发送者 - a := args[1].(gate.Agent) - - // 输出收到的消息的内容 - log.Debug("hello %v", m.Name) - - // 给发送者回应一个 Hello 消息 - a.WriteMsg(&msg.Hello{ - Name: "client", - }) -} -``` - -到这里，一个简单的范例就完成了。为了更加清楚的了解消息的格式，我们从 0 编写一个最简单的测试客户端。 - -Leaf 中，当选择使用 TCP 协议时，在网络中传输的消息都会使用以下格式： - -``` --------------- -| len | data | --------------- -``` - -其中： - -1. len 表示了 data 部分的长度（字节数）。len 本身也有长度，默认为 2 字节（可配置），len 本身的长度决定了单个消息的最大大小 -2. data 部分使用 JSON 或者 protobuf 编码（也可自定义其他编码方式） - -测试客户端同样使用 Go 语言编写： -```go -package main - -import ( - "encoding/binary" - "net" -) - -func main() { - conn, err := net.Dial("tcp", "127.0.0.1:3563") - if err != nil { - panic(err) - } - - // Hello 消息（JSON 格式） - // 对应游戏服务器 Hello 消息结构体 - data := []byte(`{ - "Hello": { - "Name": "leaf" - } - }`) - - // len + data - m := make([]byte, 2+len(data)) - - // 默认使用大端序 - binary.BigEndian.PutUint16(m, uint16(len(data))) - - copy(m[2:], data) - - // 发送消息 - conn.Write(m) -} -``` - -执行此测试客户端，游戏服务器输出： - -``` -2015/09/25 07:41:03 [debug ] hello leaf -2015/09/25 07:41:03 [debug ] read message: read tcp 127.0.0.1:3563->127.0.0.1:54599: wsarecv: An existing connection was forcibly closed by the remote host. -``` - -测试客户端发送完消息以后就退出了，此时和游戏服务器的连接断开，相应的，游戏服务器输出连接断开的提示日志（第二条日志，日志的具体内容和 Go 语言版本有关）。 - -除了使用 TCP 协议外，还可以选择使用 WebSocket 协议（例如开发 H5 游戏）。Leaf 可以单独使用 TCP 协议或 WebSocket 协议，也可以同时使用两者，换而言之，服务器可以同时接受 TCP 连接和 WebSocket 连接，对开发者而言消息来自 TCP 还是 WebSocket 是完全透明的。现在，我们来编写一个对应上例的使用 WebSocket 协议的客户端： -```html - -``` - -保存上述代码到某 HTML 文件中并使用（任意支持 WebSocket 协议的）浏览器打开。在打开此 HTML 文件前，首先需要配置一下 LeafServer 的 bin/conf/server.json 文件，增加 WebSocket 监听地址（WSAddr）： -```json -{ - "LogLevel": "debug", - "LogPath": "", - "TCPAddr": "127.0.0.1:3563", - "WSAddr": "127.0.0.1:3653", - "MaxConnNum": 20000 -} -``` - -重启游戏服务器后，方可接受 WebSocket 消息： - -``` -2015/09/25 07:50:03 [debug ] hello leaf -``` - -在 Leaf 中使用 WebSocket 需要注意的一点是：Leaf 总是发送二进制消息而非文本消息。 - -### Leaf 模块详解 - -LeafServer 中包含了 3 个模块，它们分别是： - -* gate 模块，负责游戏客户端的接入 -* login 模块，负责登录流程 -* game 模块，负责游戏主逻辑 - -一般来说（而非强制规定），从代码结构上，一个 Leaf 模块： - -1. 放置于一个目录中（例如 game 模块放置于 game 目录中） -2. 模块的具体实现放置于 internal 包中（例如 game 模块的具体实现放置于 game/internal 包中） - -每个模块下一般有一个 external.go 的文件，顾名思义表示模块对外暴露的接口，这里以 game 模块的 external.go 文件为例： - -```go -package game - -import ( - "server/game/internal" -) - -var ( - // 实例化 game 模块 - Module = new(internal.Module) - // 暴露 ChanRPC - ChanRPC = internal.ChanRPC -) -``` - -首先，模块会被实例化，这样才能注册到 Leaf 框架中（详见 LeafServer main.go），另外，模块暴露的 ChanRPC 被用于模块间通讯。 - -进入 game 模块的内部（LeafServer game/internal/module.go）： - -```go -package internal - -import ( - "server/pkg/github.com/name5566/leaf/module" - "server/base" -) - -var ( - skeleton = base.NewSkeleton() - ChanRPC = skeleton.ChanRPCServer -) - -type Module struct { - *module.Skeleton -} - -func (m *Module) OnInit() { - m.Skeleton = skeleton -} - -func (m *Module) OnDestroy() { - -} -``` - -模块中最关键的就是 skeleton（骨架），skeleton 实现了 Module 接口的 Run 方法并提供了： - -* ChanRPC -* goroutine -* 定时器 - -### Leaf ChanRPC - -由于 Leaf 中，每个模块跑在独立的 goroutine 上，为了模块间方便的相互调用就有了基于 channel 的 RPC 机制。一个 ChanRPC 需要在游戏服务器初始化的时候进行注册（注册过程不是 goroutine 安全的），例如 LeafServer 中 game 模块注册了 NewAgent 和 CloseAgent 两个 ChanRPC： - -```go -package internal - -import ( - "server/lib/github.com/name5566/leaf/gate" -) - -func init() { - skeleton.RegisterChanRPC("NewAgent", rpcNewAgent) - skeleton.RegisterChanRPC("CloseAgent", rpcCloseAgent) -} - -func rpcNewAgent(args []interface{}) { - -} - -func rpcCloseAgent(args []interface{}) { - -} -``` - -使用 skeleton 来注册 ChanRPC。RegisterChanRPC 的第一个参数是 ChanRPC 的名字，第二个参数是 ChanRPC 的实现。这里的 NewAgent 和 CloseAgent 会被 LeafServer 的 gate 模块在连接建立和连接中断时调用。ChanRPC 的调用方有 3 种调用模式： - -1. 同步模式，调用并等待 ChanRPC 返回 -2. 异步模式，调用并提供回调函数，回调函数会在 ChanRPC 返回后被调用 -3. Go 模式，调用并立即返回，忽略任何返回值和错误 - -gate 模块这样调用 game 模块的 NewAgent ChanRPC（这仅仅是一个示例，实际的代码细节复杂的多）： - -```go -game.ChanRPC.Go("NewAgent", a) -``` - -这里调用 NewAgent 并传递参数 a，我们在 rpcNewAgent 的参数 args[0] 中可以取到 a（args[1] 表示第二个参数，以此类推）。 - -更加详细的用法可以参考 [leaf/chanrpc](https://github.com/name5566/leaf/blob/master/chanrpc)。需要注意的是，无论封装多么精巧，跨 goroutine 的调用总不能像直接的函数调用那样简单直接，因此除非必要我们不要构建太多的模块，模块间不要太频繁的交互。模块在 Leaf 中被设计出来最主要是用于划分功能而非利用多核，Leaf 认为在模块内按需使用 goroutine 才是多核利用率问题的解决之道。 - -### Leaf Go - -善用 goroutine 能够充分利用多核资源，Leaf 提供的 Go 机制解决了原生 goroutine 存在的一些问题： - -* 能够恢复 goroutine 运行过程中的错误 -* 游戏服务器会等待所有 goroutine 执行结束后才关闭 -* 非常方便的获取 goroutine 执行的结果数据 -* 在一些特殊场合保证 goroutine 按创建顺序执行 - -我们来看一个例子（可以在 LeafServer 的模块的 OnInit 方法中测试）： - -```go -log.Debug("1") - -// 定义变量 res 接收结果 -var res string - -skeleton.Go(func() { - // 这里使用 Sleep 来模拟一个很慢的操作 - time.Sleep(1 * time.Second) - - // 假定得到结果 - res = "3" -}, func() { - log.Debug(res) -}) - -log.Debug("2") -``` - -上面代码执行结果如下： - -```go -2015/08/27 20:37:17 [debug ] 1 -2015/08/27 20:37:17 [debug ] 2 -2015/08/27 20:37:18 [debug ] 3 -``` - -这里的 Go 方法接收 2 个函数作为参数，第一个函数会被放置在一个新创建的 goroutine 中执行，在其执行完成之后，第二个函数会在当前 goroutine 中被执行。由此，我们可以看到变量 res 同一时刻总是只被一个 goroutine 访问，这就避免了同步机制的使用。Go 的设计使得 CPU 得到充分利用，避免操作阻塞当前 goroutine，同时又无需为共享资源同步而忧心。 - -更加详细的用法可以参考 [leaf/go](https://github.com/name5566/leaf/blob/master/go)。 - -### Leaf timer - -Go 语言标准库提供了定时器的支持： - -```go -func AfterFunc(d Duration, f func()) *Timer -``` - -AfterFunc 会等待 d 时长后调用 f 函数，这里的 f 函数将在另外一个 goroutine 中执行。Leaf 提供了一个相同的 AfterFunc 函数，相比之下，f 函数在 AfterFunc 的调用 goroutine 中执行，这样就避免了同步机制的使用： - -```go -skeleton.AfterFunc(5 * time.Second, func() { - // ... -}) -``` - -另外，Leaf timer 还支持 [cron 表达式](https://en.wikipedia.org/wiki/Cron)，用于实现诸如“每天 9 点执行”、“每周末 6 点执行”的逻辑。 - -更加详细的用法可以参考 [leaf/timer](https://github.com/name5566/leaf/blob/master/timer)。 - -### Leaf log - -Leaf 的 log 系统支持多种日志级别： - -1. Debug 日志，非关键日志 -2. Release 日志，关键日志 -3. Error 日志，错误日志 -4. Fatal 日志，致命错误日志 - -Debug < Release < Error < Fatal（日志级别高低） - -在 LeafServer 中，bin/conf/server.json 可以配置日志级别，低于配置的日志级别的日志将不会输出。Fatal 日志比较特殊，每次输出 Fatal 日志之后游戏服务器进程就会结束，通常来说，只在游戏服务器初始化失败时使用 Fatal 日志。 - -我们还可以通过配置 LeafServer conf/conf.go 的 LogFlag 来在日志中输出文件名和行号： - -``` -LogFlag = log.Lshortfile -``` - -可用的 LogFlag 见：[https://golang.org/pkg/log/#pkg-constants](https://golang.org/pkg/log/#pkg-constants) - - -更加详细的用法可以参考 [leaf/log](https://github.com/name5566/leaf/blob/master/log)。 - -### Leaf recordfile - -Leaf 的 recordfile 是基于 CSV 格式（范例见[这里](https://github.com/name5566/leaf/blob/master/recordfile/test.txt)）。recordfile 用于管理游戏配置数据。在 LeafServer 中使用 recordfile 非常简单： - -1. 将 CSV 文件放置于 bin/gamedata 目录中 -2. 在 gamedata 模块中调用函数 readRf 读取 CSV 文件 - -范例： - -```go -// 确保 bin/gamedata 目录中存在 Test.txt 文件 -// 文件名必须和此结构体名称相同（大小写敏感） -// 结构体的一个实例映射 recordfile 中的一行 -type Test struct { - // 将第一列按 int 类型解析 - // "index" 表明在此列上建立唯一索引 - Id int "index" - // 将第二列解析为长度为 4 的整型数组 - Arr [4]int - // 将第三列解析为字符串 - Str string -} - -// 读取 recordfile Test.txt 到内存中 -// RfTest 即为 Test.txt 的内存镜像 -var RfTest = readRf(Test{}) - -func init() { - // 按索引查找 - // 获取 Test.txt 中 Id 为 1 的那一行 - r := RfTest.Index(1) - - if r != nil { - row := r.(*Test) - - // 输出此行的所有列的数据 - log.Debug("%v %v %v", row.Id, row.Arr, row.Str) - } -} -``` - -更加详细的用法可以参考 [leaf/recordfile](https://github.com/name5566/leaf/blob/master/recordfile)。 - -了解更多 ---------------- - -阅读 Wiki 获取更多的帮助：[https://github.com/name5566/leaf/wiki](https://github.com/name5566/leaf/wiki) diff --git a/src/server/pkg/github.com/name5566/leaf/chanrpc/chanrpc.go b/src/server/pkg/github.com/name5566/leaf/chanrpc/chanrpc.go deleted file mode 100644 index 8f34e812..00000000 --- a/src/server/pkg/github.com/name5566/leaf/chanrpc/chanrpc.go +++ /dev/null @@ -1,393 +0,0 @@ -package chanrpc - -import ( - "errors" - "fmt" - "runtime" - - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" -) - -// one server per goroutine (goroutine not safe) -// one client per goroutine (goroutine not safe) -type Server struct { - // id -> function - // - // function: - // func(args []interface{}) - // func(args []interface{}) interface{} - // func(args []interface{}) []interface{} - functions map[interface{}]interface{} - ChanCall chan *CallInfo -} - -type CallInfo struct { - f interface{} - args []interface{} - chanRet chan *RetInfo - cb interface{} -} - -type RetInfo struct { - // nil - // interface{} - // []interface{} - ret interface{} - err error - // callback: - // func(err error) - // func(ret interface{}, err error) - // func(ret []interface{}, err error) - cb interface{} -} - -type Client struct { - s *Server - chanSyncRet chan *RetInfo - ChanAsynRet chan *RetInfo - pendingAsynCall int -} - -func NewServer(l int) *Server { - s := new(Server) - s.functions = make(map[interface{}]interface{}) - s.ChanCall = make(chan *CallInfo, l) - return s -} - -func assert(i interface{}) []interface{} { - if i == nil { - return nil - } else { - return i.([]interface{}) - } -} - -// you must call the function before calling Open and Go -func (s *Server) Register(id interface{}, f interface{}) { - switch f.(type) { - case func([]interface{}): - case func([]interface{}) interface{}: - case func([]interface{}) []interface{}: - default: - panic(fmt.Sprintf("function id %v: definition of function is invalid", id)) - } - - if _, ok := s.functions[id]; ok { - panic(fmt.Sprintf("function id %v: already registered", id)) - } - - s.functions[id] = f -} - -func (s *Server) ret(ci *CallInfo, ri *RetInfo) (err error) { - if ci.chanRet == nil { - return - } - - defer func() { - if r := recover(); r != nil { - err = r.(error) - } - }() - - ri.cb = ci.cb - ci.chanRet <- ri - return -} - -func (s *Server) exec(ci *CallInfo) (err error) { - defer func() { - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - err = fmt.Errorf("%v: %s", r, buf[:l]) - } else { - err = fmt.Errorf("%v", r) - } - - s.ret(ci, &RetInfo{err: fmt.Errorf("%v", r)}) - } - }() - - // execute - switch ci.f.(type) { - case func([]interface{}): - ci.f.(func([]interface{}))(ci.args) - return s.ret(ci, &RetInfo{}) - case func([]interface{}) interface{}: - ret := ci.f.(func([]interface{}) interface{})(ci.args) - return s.ret(ci, &RetInfo{ret: ret}) - case func([]interface{}) []interface{}: - ret := ci.f.(func([]interface{}) []interface{})(ci.args) - return s.ret(ci, &RetInfo{ret: ret}) - } - - panic("bug") -} - -func (s *Server) Exec(ci *CallInfo) { - err := s.exec(ci) - if err != nil { - log.Error("%v", err) - } -} - -// goroutine safe -func (s *Server) Go(id interface{}, args ...interface{}) { - f := s.functions[id] - if f == nil { - return - } - - defer func() { - recover() - }() - - s.ChanCall <- &CallInfo{ - f: f, - args: args, - } -} - -// goroutine safe -func (s *Server) Call0(id interface{}, args ...interface{}) error { - return s.Open(0).Call0(id, args...) -} - -// goroutine safe -func (s *Server) Call1(id interface{}, args ...interface{}) (interface{}, error) { - return s.Open(0).Call1(id, args...) -} - -// goroutine safe -func (s *Server) CallN(id interface{}, args ...interface{}) ([]interface{}, error) { - return s.Open(0).CallN(id, args...) -} - -func (s *Server) Close() { - close(s.ChanCall) - - for ci := range s.ChanCall { - s.ret(ci, &RetInfo{ - err: errors.New("chanrpc server closed"), - }) - } -} - -// goroutine safe -func (s *Server) Open(l int) *Client { - c := NewClient(l) - c.Attach(s) - return c -} - -func NewClient(l int) *Client { - c := new(Client) - c.chanSyncRet = make(chan *RetInfo, 1) - c.ChanAsynRet = make(chan *RetInfo, l) - return c -} - -func (c *Client) Attach(s *Server) { - c.s = s -} - -func (c *Client) call(ci *CallInfo, block bool) (err error) { - defer func() { - if r := recover(); r != nil { - err = r.(error) - } - }() - - if block { - c.s.ChanCall <- ci - } else { - select { - case c.s.ChanCall <- ci: - default: - err = errors.New("chanrpc channel full") - } - } - return -} - -func (c *Client) f(id interface{}, n int) (f interface{}, err error) { - if c.s == nil { - err = errors.New("server not attached") - return - } - - f = c.s.functions[id] - if f == nil { - err = fmt.Errorf("function id %v: function not registered", id) - return - } - - var ok bool - switch n { - case 0: - _, ok = f.(func([]interface{})) - case 1: - _, ok = f.(func([]interface{}) interface{}) - case 2: - _, ok = f.(func([]interface{}) []interface{}) - default: - panic("bug") - } - - if !ok { - err = fmt.Errorf("function id %v: return type mismatch", id) - } - return -} - -func (c *Client) Call0(id interface{}, args ...interface{}) error { - f, err := c.f(id, 0) - if err != nil { - return err - } - - err = c.call(&CallInfo{ - f: f, - args: args, - chanRet: c.chanSyncRet, - }, true) - if err != nil { - return err - } - - ri := <-c.chanSyncRet - return ri.err -} - -func (c *Client) Call1(id interface{}, args ...interface{}) (interface{}, error) { - f, err := c.f(id, 1) - if err != nil { - return nil, err - } - - err = c.call(&CallInfo{ - f: f, - args: args, - chanRet: c.chanSyncRet, - }, true) - if err != nil { - return nil, err - } - - ri := <-c.chanSyncRet - return ri.ret, ri.err -} - -func (c *Client) CallN(id interface{}, args ...interface{}) ([]interface{}, error) { - f, err := c.f(id, 2) - if err != nil { - return nil, err - } - - err = c.call(&CallInfo{ - f: f, - args: args, - chanRet: c.chanSyncRet, - }, true) - if err != nil { - return nil, err - } - - ri := <-c.chanSyncRet - return assert(ri.ret), ri.err -} - -func (c *Client) asynCall(id interface{}, args []interface{}, cb interface{}, n int) { - f, err := c.f(id, n) - if err != nil { - c.ChanAsynRet <- &RetInfo{err: err, cb: cb} - return - } - - err = c.call(&CallInfo{ - f: f, - args: args, - chanRet: c.ChanAsynRet, - cb: cb, - }, false) - if err != nil { - c.ChanAsynRet <- &RetInfo{err: err, cb: cb} - return - } -} - -func (c *Client) AsynCall(id interface{}, _args ...interface{}) { - if len(_args) < 1 { - panic("callback function not found") - } - - args := _args[:len(_args)-1] - cb := _args[len(_args)-1] - - var n int - switch cb.(type) { - case func(error): - n = 0 - case func(interface{}, error): - n = 1 - case func([]interface{}, error): - n = 2 - default: - panic("definition of callback function is invalid") - } - - // too many calls - if c.pendingAsynCall >= cap(c.ChanAsynRet) { - execCb(&RetInfo{err: errors.New("too many calls"), cb: cb}) - return - } - - c.asynCall(id, args, cb, n) - c.pendingAsynCall++ -} - -func execCb(ri *RetInfo) { - defer func() { - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - // execute - switch ri.cb.(type) { - case func(error): - ri.cb.(func(error))(ri.err) - case func(interface{}, error): - ri.cb.(func(interface{}, error))(ri.ret, ri.err) - case func([]interface{}, error): - ri.cb.(func([]interface{}, error))(assert(ri.ret), ri.err) - default: - panic("bug") - } - return -} - -func (c *Client) Cb(ri *RetInfo) { - c.pendingAsynCall-- - execCb(ri) -} - -func (c *Client) Close() { - for c.pendingAsynCall > 0 { - c.Cb(<-c.ChanAsynRet) - } -} - -func (c *Client) Idle() bool { - return c.pendingAsynCall == 0 -} diff --git a/src/server/pkg/github.com/name5566/leaf/chanrpc/example_test.go b/src/server/pkg/github.com/name5566/leaf/chanrpc/example_test.go deleted file mode 100644 index 619d9c0f..00000000 --- a/src/server/pkg/github.com/name5566/leaf/chanrpc/example_test.go +++ /dev/null @@ -1,127 +0,0 @@ -package chanrpc_test - -import ( - "fmt" - "server/pkg/github.com/name5566/leaf/chanrpc" - "sync" -) - -func Example() { - s := chanrpc.NewServer(10) - - var wg sync.WaitGroup - wg.Add(1) - - // goroutine 1 - go func() { - s.Register("f0", func(args []interface{}) { - - }) - - s.Register("f1", func(args []interface{}) interface{} { - return 1 - }) - - s.Register("fn", func(args []interface{}) []interface{} { - return []interface{}{1, 2, 3} - }) - - s.Register("add", func(args []interface{}) interface{} { - n1 := args[0].(int) - n2 := args[1].(int) - return n1 + n2 - }) - - wg.Done() - - for { - s.Exec(<-s.ChanCall) - } - }() - - wg.Wait() - wg.Add(1) - - // goroutine 2 - go func() { - c := s.Open(10) - - // sync - err := c.Call0("f0") - if err != nil { - fmt.Println(err) - } - - r1, err := c.Call1("f1") - if err != nil { - fmt.Println(err) - } else { - fmt.Println(r1) - } - - rn, err := c.CallN("fn") - if err != nil { - fmt.Println(err) - } else { - fmt.Println(rn[0], rn[1], rn[2]) - } - - ra, err := c.Call1("add", 1, 2) - if err != nil { - fmt.Println(err) - } else { - fmt.Println(ra) - } - - // asyn - c.AsynCall("f0", func(err error) { - if err != nil { - fmt.Println(err) - } - }) - - c.AsynCall("f1", func(ret interface{}, err error) { - if err != nil { - fmt.Println(err) - } else { - fmt.Println(ret) - } - }) - - c.AsynCall("fn", func(ret []interface{}, err error) { - if err != nil { - fmt.Println(err) - } else { - fmt.Println(ret[0], ret[1], ret[2]) - } - }) - - c.AsynCall("add", 1, 2, func(ret interface{}, err error) { - if err != nil { - fmt.Println(err) - } else { - fmt.Println(ret) - } - }) - - c.Cb(<-c.ChanAsynRet) - c.Cb(<-c.ChanAsynRet) - c.Cb(<-c.ChanAsynRet) - c.Cb(<-c.ChanAsynRet) - - // go - s.Go("f0") - - wg.Done() - }() - - wg.Wait() - - // Output: - // 1 - // 1 2 3 - // 3 - // 1 - // 1 2 3 - // 3 -} diff --git a/src/server/pkg/github.com/name5566/leaf/cluster/cluster.go b/src/server/pkg/github.com/name5566/leaf/cluster/cluster.go deleted file mode 100644 index 50a5b3c1..00000000 --- a/src/server/pkg/github.com/name5566/leaf/cluster/cluster.go +++ /dev/null @@ -1,70 +0,0 @@ -package cluster - -import ( - "math" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/network" - "time" -) - -var ( - server *network.TCPServer - clients []*network.TCPClient -) - -func Init() { - if conf.ListenAddr != "" { - server = new(network.TCPServer) - server.Addr = conf.ListenAddr - server.MaxConnNum = int(math.MaxInt32) - server.PendingWriteNum = conf.PendingWriteNum - server.LenMsgLen = 4 - server.MaxMsgLen = math.MaxUint32 - server.NewAgent = newAgent - - server.Start() - } - - for _, addr := range conf.ConnAddrs { - client := new(network.TCPClient) - client.Addr = addr - client.ConnNum = 1 - client.ConnectInterval = 3 * time.Second - client.PendingWriteNum = conf.PendingWriteNum - client.LenMsgLen = 4 - client.MaxMsgLen = math.MaxUint32 - client.NewAgent = newAgent - - client.Start() - clients = append(clients, client) - } -} - -func Destroy() { - if server != nil { - log.Release("closing cluster server") - server.Close() - } - - for _, client := range clients { - client.Close() - } -} - -type Agent struct { - conn *network.TCPConn -} - -func newAgent(conn *network.TCPConn) network.Agent { - a := new(Agent) - a.conn = conn - return a -} - -func (a *Agent) Run() {} - -func (a *Agent) OnClose() {} - -func (a *Agent) WriteMsg(data interface{}) { -} diff --git a/src/server/pkg/github.com/name5566/leaf/conf/conf.go b/src/server/pkg/github.com/name5566/leaf/conf/conf.go deleted file mode 100644 index 5a2c0a39..00000000 --- a/src/server/pkg/github.com/name5566/leaf/conf/conf.go +++ /dev/null @@ -1,21 +0,0 @@ -package conf - -var ( - LenStackBuf = 4096 - - // log - LogLevel string - LogPath string - LogFlag int - - // console - ConsolePort int - ConsolePrompt string = "Leaf# " - ProfilePath string - - // cluster - ListenAddr string - CenterAddr string - ConnAddrs []string - PendingWriteNum int -) diff --git a/src/server/pkg/github.com/name5566/leaf/console/command.go b/src/server/pkg/github.com/name5566/leaf/console/command.go deleted file mode 100644 index ffe5496a..00000000 --- a/src/server/pkg/github.com/name5566/leaf/console/command.go +++ /dev/null @@ -1,215 +0,0 @@ -package console - -import ( - "fmt" - "os" - "path" - "runtime/pprof" - "server/pkg/github.com/name5566/leaf/chanrpc" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" - "time" -) - -var commands = []Command{ - new(CommandHelp), - new(CommandCPUProf), - new(CommandProf), -} - -type Command interface { - // must goroutine safe - name() string - // must goroutine safe - help() string - // must goroutine safe - run(args []string) string -} - -type ExternalCommand struct { - _name string - _help string - server *chanrpc.Server -} - -func (c *ExternalCommand) name() string { - return c._name -} - -func (c *ExternalCommand) help() string { - return c._help -} - -func (c *ExternalCommand) run(_args []string) string { - args := make([]interface{}, len(_args)) - for i, v := range _args { - args[i] = v - } - - ret, err := c.server.Call1(c._name, args...) - if err != nil { - return err.Error() - } - output, ok := ret.(string) - if !ok { - return "invalid output type" - } - - return output -} - -// you must call the function before calling console.Init -// goroutine not safe -func Register(name string, help string, f interface{}, server *chanrpc.Server) { - for _, c := range commands { - if c.name() == name { - log.Fatal("command %v is already registered", name) - } - } - - server.Register(name, f) - - c := new(ExternalCommand) - c._name = name - c._help = help - c.server = server - commands = append(commands, c) -} - -// help -type CommandHelp struct{} - -func (c *CommandHelp) name() string { - return "help" -} - -func (c *CommandHelp) help() string { - return "this help text" -} - -func (c *CommandHelp) run([]string) string { - output := "Commands:\r\n" - for _, c := range commands { - output += c.name() + " - " + c.help() + "\r\n" - } - output += "quit - exit console" - - return output -} - -// cpuprof -type CommandCPUProf struct{} - -func (c *CommandCPUProf) name() string { - return "cpuprof" -} - -func (c *CommandCPUProf) help() string { - return "CPU profiling for the current process" -} - -func (c *CommandCPUProf) usage() string { - return "cpuprof writes runtime profiling data in the format expected by \r\n" + - "the pprof visualization tool\r\n\r\n" + - "Usage: cpuprof start|stop\r\n" + - " start - enables CPU profiling\r\n" + - " stop - stops the current CPU profile" -} - -func (c *CommandCPUProf) run(args []string) string { - if len(args) == 0 { - return c.usage() - } - - switch args[0] { - case "start": - fn := profileName() + ".cpuprof" - f, err := os.Create(fn) - if err != nil { - return err.Error() - } - err = pprof.StartCPUProfile(f) - if err != nil { - f.Close() - return err.Error() - } - return fn - case "stop": - pprof.StopCPUProfile() - return "" - default: - return c.usage() - } -} - -func profileName() string { - now := time.Now() - return path.Join(conf.ProfilePath, - fmt.Sprintf("%d%02d%02d_%02d_%02d_%02d", - now.Year(), - now.Month(), - now.Day(), - now.Hour(), - now.Minute(), - now.Second())) -} - -// prof -type CommandProf struct{} - -func (c *CommandProf) name() string { - return "prof" -} - -func (c *CommandProf) help() string { - return "writes a pprof-formatted snapshot" -} - -func (c *CommandProf) usage() string { - return "prof writes runtime profiling data in the format expected by \r\n" + - "the pprof visualization tool\r\n\r\n" + - "Usage: prof goroutine|heap|thread|block\r\n" + - " goroutine - stack traces of all current goroutines\r\n" + - " heap - a sampling of all heap allocations\r\n" + - " thread - stack traces that led to the creation of new OS threads\r\n" + - " block - stack traces that led to blocking on synchronization primitives" -} - -func (c *CommandProf) run(args []string) string { - if len(args) == 0 { - return c.usage() - } - - var ( - p *pprof.Profile - fn string - ) - switch args[0] { - case "goroutine": - p = pprof.Lookup("goroutine") - fn = profileName() + ".gprof" - case "heap": - p = pprof.Lookup("heap") - fn = profileName() + ".hprof" - case "thread": - p = pprof.Lookup("threadcreate") - fn = profileName() + ".tprof" - case "block": - p = pprof.Lookup("block") - fn = profileName() + ".bprof" - default: - return c.usage() - } - - f, err := os.Create(fn) - if err != nil { - return err.Error() - } - defer f.Close() - err = p.WriteTo(f, 0) - if err != nil { - return err.Error() - } - - return fn -} diff --git a/src/server/pkg/github.com/name5566/leaf/console/console.go b/src/server/pkg/github.com/name5566/leaf/console/console.go deleted file mode 100644 index 374b371c..00000000 --- a/src/server/pkg/github.com/name5566/leaf/console/console.go +++ /dev/null @@ -1,88 +0,0 @@ -package console - -import ( - "bufio" - "math" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/network" - "strconv" - "strings" -) - -var server *network.TCPServer - -func Init() { - if conf.ConsolePort == 0 { - return - } - - server = new(network.TCPServer) - server.Addr = "localhost:" + strconv.Itoa(conf.ConsolePort) - server.MaxConnNum = int(math.MaxInt32) - server.PendingWriteNum = 100 - server.NewAgent = newAgent - - server.Start() -} - -func Destroy() { - if server != nil { - log.Release("closing console server") - server.Close() - } -} - -type Agent struct { - conn *network.TCPConn - reader *bufio.Reader -} - -func newAgent(conn *network.TCPConn) network.Agent { - a := new(Agent) - a.conn = conn - a.reader = bufio.NewReader(conn) - return a -} - -func (a *Agent) Run() { - for { - if conf.ConsolePrompt != "" { - a.conn.Write([]byte(conf.ConsolePrompt)) - } - - line, err := a.reader.ReadString('\n') - if err != nil { - break - } - line = strings.TrimSuffix(line[:len(line)-1], "\r") - - args := strings.Fields(line) - if len(args) == 0 { - continue - } - if args[0] == "quit" { - break - } - var c Command - for _, _c := range commands { - if _c.name() == args[0] { - c = _c - break - } - } - if c == nil { - a.conn.Write([]byte("command not found, try `help` for help\r\n")) - continue - } - output := c.run(args[1:]) - if output != "" { - a.conn.Write([]byte(output + "\r\n")) - } - } -} - -func (a *Agent) OnClose() {} - -func (a *Agent) WriteMsg(b interface{}) { -} diff --git a/src/server/pkg/github.com/name5566/leaf/db/mongodb/example_test.go b/src/server/pkg/github.com/name5566/leaf/db/mongodb/example_test.go deleted file mode 100644 index a5ed2fd2..00000000 --- a/src/server/pkg/github.com/name5566/leaf/db/mongodb/example_test.go +++ /dev/null @@ -1,48 +0,0 @@ -package mongodb_test - -import ( - "fmt" - "gopkg.in/mgo.v2" - "server/pkg/github.com/name5566/leaf/db/mongodb" -) - -func Example() { - c, err := mongodb.Dial("localhost", 10) - if err != nil { - fmt.Println(err) - return - } - defer c.Close() - - // session - s := c.Ref() - defer c.UnRef(s) - err = s.DB("test").C("counters").RemoveId("test") - if err != nil && err != mgo.ErrNotFound { - fmt.Println(err) - return - } - - // auto increment - err = c.EnsureCounter("test", "counters", "test") - if err != nil { - fmt.Println(err) - return - } - for i := 0; i < 3; i++ { - id, err := c.NextSeq("test", "counters", "test") - if err != nil { - fmt.Println(err) - return - } - fmt.Println(id) - } - - // index - c.EnsureUniqueIndex("test", "counters", []string{"key1"}) - - // Output: - // 1 - // 2 - // 3 -} diff --git a/src/server/pkg/github.com/name5566/leaf/db/mongodb/mongodb.go b/src/server/pkg/github.com/name5566/leaf/db/mongodb/mongodb.go deleted file mode 100644 index f42e3f93..00000000 --- a/src/server/pkg/github.com/name5566/leaf/db/mongodb/mongodb.go +++ /dev/null @@ -1,175 +0,0 @@ -package mongodb - -import ( - "container/heap" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" - "server/pkg/github.com/name5566/leaf/log" - "sync" - "time" -) - -// session -type Session struct { - *mgo.Session - ref int - index int -} - -// session heap -type SessionHeap []*Session - -func (h SessionHeap) Len() int { - return len(h) -} - -func (h SessionHeap) Less(i, j int) bool { - return h[i].ref < h[j].ref -} - -func (h SessionHeap) Swap(i, j int) { - h[i], h[j] = h[j], h[i] - h[i].index = i - h[j].index = j -} - -func (h *SessionHeap) Push(s interface{}) { - s.(*Session).index = len(*h) - *h = append(*h, s.(*Session)) -} - -func (h *SessionHeap) Pop() interface{} { - l := len(*h) - s := (*h)[l-1] - s.index = -1 - *h = (*h)[:l-1] - return s -} - -type DialContext struct { - sync.Mutex - sessions SessionHeap -} - -// goroutine safe -func Dial(url string, sessionNum int) (*DialContext, error) { - c, err := DialWithTimeout(url, sessionNum, 10*time.Second, 5*time.Minute) - return c, err -} - -// goroutine safe -func DialWithTimeout(url string, sessionNum int, dialTimeout time.Duration, timeout time.Duration) (*DialContext, error) { - if sessionNum <= 0 { - sessionNum = 100 - log.Release("invalid sessionNum, reset to %v", sessionNum) - } - - s, err := mgo.DialWithTimeout(url, dialTimeout) - if err != nil { - return nil, err - } - s.SetSyncTimeout(timeout) - s.SetSocketTimeout(timeout) - - c := new(DialContext) - - // sessions - c.sessions = make(SessionHeap, sessionNum) - c.sessions[0] = &Session{s, 0, 0} - for i := 1; i < sessionNum; i++ { - c.sessions[i] = &Session{s.New(), 0, i} - } - heap.Init(&c.sessions) - - return c, nil -} - -// goroutine safe -func (c *DialContext) Close() { - c.Lock() - for _, s := range c.sessions { - s.Close() - if s.ref != 0 { - log.Error("session ref = %v", s.ref) - } - } - c.Unlock() -} - -// goroutine safe -func (c *DialContext) Ref() *Session { - c.Lock() - s := c.sessions[0] - if s.ref == 0 { - s.Refresh() - } - s.ref++ - heap.Fix(&c.sessions, 0) - c.Unlock() - - return s -} - -// goroutine safe -func (c *DialContext) UnRef(s *Session) { - c.Lock() - s.ref-- - heap.Fix(&c.sessions, s.index) - c.Unlock() -} - -// goroutine safe -func (c *DialContext) EnsureCounter(db string, collection string, id string) error { - s := c.Ref() - defer c.UnRef(s) - - err := s.DB(db).C(collection).Insert(bson.M{ - "_id": id, - "seq": 0, - }) - if mgo.IsDup(err) { - return nil - } else { - return err - } -} - -// goroutine safe -func (c *DialContext) NextSeq(db string, collection string, id string) (int, error) { - s := c.Ref() - defer c.UnRef(s) - - var res struct { - Seq int - } - _, err := s.DB(db).C(collection).FindId(id).Apply(mgo.Change{ - Update: bson.M{"$inc": bson.M{"seq": 1}}, - ReturnNew: true, - }, &res) - - return res.Seq, err -} - -// goroutine safe -func (c *DialContext) EnsureIndex(db string, collection string, key []string) error { - s := c.Ref() - defer c.UnRef(s) - - return s.DB(db).C(collection).EnsureIndex(mgo.Index{ - Key: key, - Unique: false, - Sparse: true, - }) -} - -// goroutine safe -func (c *DialContext) EnsureUniqueIndex(db string, collection string, key []string) error { - s := c.Ref() - defer c.UnRef(s) - - return s.DB(db).C(collection).EnsureIndex(mgo.Index{ - Key: key, - Unique: true, - Sparse: true, - }) -} diff --git a/src/server/pkg/github.com/name5566/leaf/gate/agent.go b/src/server/pkg/github.com/name5566/leaf/gate/agent.go deleted file mode 100644 index f690861c..00000000 --- a/src/server/pkg/github.com/name5566/leaf/gate/agent.go +++ /dev/null @@ -1,15 +0,0 @@ -package gate - -import ( - "net" -) - -type Agent interface { - WriteMsg(msg interface{}) - LocalAddr() net.Addr - RemoteAddr() net.Addr - Close() - Destroy() - UserData() interface{} - SetUserData(data interface{}) -} diff --git a/src/server/pkg/github.com/name5566/leaf/gate/gate.go b/src/server/pkg/github.com/name5566/leaf/gate/gate.go deleted file mode 100644 index 937ccd9f..00000000 --- a/src/server/pkg/github.com/name5566/leaf/gate/gate.go +++ /dev/null @@ -1,160 +0,0 @@ -package gate - -import ( - "net" - "reflect" - "time" - - "server/pkg/github.com/name5566/leaf/chanrpc" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/network" -) - -type Gate struct { - MaxConnNum int - PendingWriteNum int - MaxMsgLen uint32 - Processor network.Processor - AgentChanRPC *chanrpc.Server - - // websocket - WSAddr string - HTTPTimeout time.Duration - CertFile string - KeyFile string - - // tcp - TCPAddr string - LenMsgLen int - LittleEndian bool -} - -func (gate *Gate) Run(closeSig chan bool) { - var wsServer *network.WSServer - if gate.WSAddr != "" { - wsServer = new(network.WSServer) - wsServer.Addr = gate.WSAddr - wsServer.MaxConnNum = gate.MaxConnNum - wsServer.PendingWriteNum = gate.PendingWriteNum - wsServer.MaxMsgLen = gate.MaxMsgLen - wsServer.HTTPTimeout = gate.HTTPTimeout - wsServer.CertFile = gate.CertFile - wsServer.KeyFile = gate.KeyFile - wsServer.NewAgent = func(conn *network.WSConn) network.Agent { - a := &agent{conn: conn, gate: gate} - if gate.AgentChanRPC != nil { - gate.AgentChanRPC.Go("NewAgent", a) - } - return a - } - } - - var tcpServer *network.TCPServer - if gate.TCPAddr != "" { - tcpServer = new(network.TCPServer) - tcpServer.Addr = gate.TCPAddr - tcpServer.MaxConnNum = gate.MaxConnNum - tcpServer.PendingWriteNum = gate.PendingWriteNum - tcpServer.LenMsgLen = gate.LenMsgLen - tcpServer.MaxMsgLen = gate.MaxMsgLen - tcpServer.LittleEndian = gate.LittleEndian - tcpServer.NewAgent = func(conn *network.TCPConn) network.Agent { - a := &agent{conn: conn, gate: gate} - if gate.AgentChanRPC != nil { - gate.AgentChanRPC.Go("NewAgent", a) - } - return a - } - } - - if wsServer != nil { - wsServer.Start() - } - if tcpServer != nil { - tcpServer.Start() - } - <-closeSig - if wsServer != nil { - wsServer.Close() - } - if tcpServer != nil { - tcpServer.Close() - } -} - -func (gate *Gate) OnDestroy() {} - -type agent struct { - conn network.Conn - gate *Gate - userData interface{} -} - -func (a *agent) Run() { - for { - data, err := a.conn.ReadMsg() - if err != nil { - break - } - - if a.gate.Processor != nil { - msg, err := a.gate.Processor.Unmarshal(data) - if err != nil { - log.Debug("unmarshal message error: %v", err) - break - } - err = a.gate.Processor.Route(msg, a) - if err != nil { - log.Debug("route message error: %v", err) - break - } - } - } -} - -func (a *agent) OnClose() { - if a.gate.AgentChanRPC != nil { - err := a.gate.AgentChanRPC.Call0("CloseAgent", a) - if err != nil { - log.Error("chanrpc error: %v", err) - } - } -} - -func (a *agent) WriteMsg(msg interface{}) { - if a.gate.Processor != nil { - data, err := a.gate.Processor.Marshal(msg) - if err != nil { - log.Error("marshal message %v error: %v", reflect.TypeOf(msg), err) - return - } - err = a.conn.WriteMsg(data...) - if err != nil { - log.Error("write message %v error: %v", reflect.TypeOf(msg), err) - } - } -} - -func (a *agent) LocalAddr() net.Addr { - return a.conn.LocalAddr() -} - -func (a *agent) RemoteAddr() net.Addr { - return a.conn.RemoteAddr() -} - -func (a *agent) Close() { - a.conn.Close() -} - -func (a *agent) Destroy() { - a.conn.Destroy() -} - -func (a *agent) UserData() interface{} { - return a.userData -} - -func (a *agent) SetUserData(data interface{}) { - a.userData = data -} diff --git a/src/server/pkg/github.com/name5566/leaf/go/example_test.go b/src/server/pkg/github.com/name5566/leaf/go/example_test.go deleted file mode 100644 index de305661..00000000 --- a/src/server/pkg/github.com/name5566/leaf/go/example_test.go +++ /dev/null @@ -1,70 +0,0 @@ -package g_test - -import ( - "fmt" - "server/pkg/github.com/name5566/leaf/go" - "time" -) - -func Example() { - d := g.New(10) - - // go 1 - var res int - d.Go(func() { - fmt.Println("1 + 1 = ?") - res = 1 + 1 - }, func() { - fmt.Println(res) - }) - - d.Cb(<-d.ChanCb) - - // go 2 - d.Go(func() { - fmt.Print("My name is ") - }, func() { - fmt.Println("Leaf") - }) - - d.Close() - - // Output: - // 1 + 1 = ? - // 2 - // My name is Leaf -} - -func ExampleLinearContext() { - d := g.New(10) - - // parallel - d.Go(func() { - time.Sleep(time.Second / 2) - fmt.Println("1") - }, nil) - d.Go(func() { - fmt.Println("2") - }, nil) - - d.Cb(<-d.ChanCb) - d.Cb(<-d.ChanCb) - - // linear - c := d.NewLinearContext() - c.Go(func() { - time.Sleep(time.Second / 2) - fmt.Println("1") - }, nil) - c.Go(func() { - fmt.Println("2") - }, nil) - - d.Close() - - // Output: - // 2 - // 1 - // 1 - // 2 -} diff --git a/src/server/pkg/github.com/name5566/leaf/go/go.go b/src/server/pkg/github.com/name5566/leaf/go/go.go deleted file mode 100644 index 8589b3da..00000000 --- a/src/server/pkg/github.com/name5566/leaf/go/go.go +++ /dev/null @@ -1,122 +0,0 @@ -package g - -import ( - "container/list" - "runtime" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" - "sync" -) - -// one Go per goroutine (goroutine not safe) -type Go struct { - ChanCb chan func() - pendingGo int -} - -type LinearGo struct { - f func() - cb func() -} - -type LinearContext struct { - g *Go - linearGo *list.List - mutexLinearGo sync.Mutex - mutexExecution sync.Mutex -} - -func New(l int) *Go { - g := new(Go) - g.ChanCb = make(chan func(), l) - return g -} - -func (g *Go) Go(f func(), cb func()) { - g.pendingGo++ - - go func() { - defer func() { - g.ChanCb <- cb - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - f() - }() -} - -func (g *Go) Cb(cb func()) { - defer func() { - g.pendingGo-- - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - if cb != nil { - cb() - } -} - -func (g *Go) Close() { - for g.pendingGo > 0 { - g.Cb(<-g.ChanCb) - } -} - -func (g *Go) Idle() bool { - return g.pendingGo == 0 -} - -func (g *Go) NewLinearContext() *LinearContext { - c := new(LinearContext) - c.g = g - c.linearGo = list.New() - return c -} - -func (c *LinearContext) Go(f func(), cb func()) { - c.g.pendingGo++ - - c.mutexLinearGo.Lock() - c.linearGo.PushBack(&LinearGo{f: f, cb: cb}) - c.mutexLinearGo.Unlock() - - go func() { - c.mutexExecution.Lock() - defer c.mutexExecution.Unlock() - - c.mutexLinearGo.Lock() - e := c.linearGo.Remove(c.linearGo.Front()).(*LinearGo) - c.mutexLinearGo.Unlock() - - defer func() { - c.g.ChanCb <- e.cb - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - e.f() - }() -} diff --git a/src/server/pkg/github.com/name5566/leaf/leaf.go b/src/server/pkg/github.com/name5566/leaf/leaf.go deleted file mode 100644 index bb4b8583..00000000 --- a/src/server/pkg/github.com/name5566/leaf/leaf.go +++ /dev/null @@ -1,77 +0,0 @@ -package leaf - -import ( - "os" - "os/signal" - "server/MergeConst" - "server/backend" - mergeCluster "server/cluster" - sconf "server/conf" - "server/game" - GoUtil "server/game_util" - "server/gamedata" - "server/pkg/github.com/name5566/leaf/cluster" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/console" - "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/module" - "syscall" - "time" -) - -func Run(mods ...module.Module) { - //logger - if conf.LogLevel != "" { - if _, err := os.Stat(conf.LogPath); os.IsNotExist(err) { - os.Mkdir(conf.LogPath, os.ModePerm) - } - zero := GoUtil.ZeroTimestamp() - now := time.Unix(zero, 0).Local() - err := log.NewDailyLog(now, log.DEBUG_LEVEL, conf.LogPath, conf.LogFlag) - if err != nil { - panic(err) - } - } - log.Release("服务器版本: %s", MergeConst.Go_game_version) - log.Release("%s 启动, 节点类型: %s, 区服id: %d", sconf.Server.GameName, sconf.Server.ServerType, sconf.Server.ServerID) - go backend.Start() - // module - for i := 0; i < len(mods); i++ { - module.Register(mods[i]) - } - module.Init() - - // cluster - mergeCluster.Init() - - // console - console.Init() - defer func() { - if r := recover(); r != nil { - log.Debug("Leaf console error: %v", r) - log.Debug("Leaf closing down\n") - console.Destroy() - cluster.Destroy() - module.Destroy() - game.Destroy() - os.Exit(1) - } - }() - // close - c := make(chan os.Signal, 1) - signal.Notify(c, syscall.SIGTERM, syscall.SIGINT) - for { - sig := <-c - if sig == syscall.SIGINT { - gamedata.Reload() - continue - } - log.Debug("Leaf closing down (signal: %v)\n", sig.String()) - console.Destroy() - cluster.Destroy() - module.Destroy() - game.Destroy() - os.Exit(1) - } - -} diff --git a/src/server/pkg/github.com/name5566/leaf/log/example_test.go b/src/server/pkg/github.com/name5566/leaf/log/example_test.go deleted file mode 100644 index 654c0479..00000000 --- a/src/server/pkg/github.com/name5566/leaf/log/example_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package log_test - -import ( - l "log" - "server/pkg/github.com/name5566/leaf/log" -) - -func Example() { - name := "Leaf" - - log.Debug("My name is %v", name) - log.Release("My name is %v", name) - log.Error("My name is %v", name) - // log.Fatal("My name is %v", name) - - logger, err := log.New("release", "", l.LstdFlags) - if err != nil { - return - } - defer logger.Close() - - logger.Debug("will not print") - logger.Release("My name is %v", name) - - log.Export(logger) - - log.Debug("will not print") - log.Release("My name is %v", name) -} diff --git a/src/server/pkg/github.com/name5566/leaf/log/log.go b/src/server/pkg/github.com/name5566/leaf/log/log.go deleted file mode 100644 index bc1c9774..00000000 --- a/src/server/pkg/github.com/name5566/leaf/log/log.go +++ /dev/null @@ -1,284 +0,0 @@ -package log - -import ( - "errors" - "fmt" - "log" - "os" - "path" - "runtime" - "strings" - "sync" - "time" -) - -// levels -const ( - debugLevel = 0 - releaseLevel = 1 - errorLevel = 2 - fatalLevel = 3 - warnLevel = 4 - DEBUG_LEVEL = 0 -) - -const ( - printDebugLevel = "[debug ] " - printReleaseLevel = "[release] " - printErrorLevel = "[error ] " - printFatalLevel = "[fatal ] " - printWarnLevel = "[warn ] " -) - -type Logger struct { - level int - baseLogger *log.Logger - baseFile *os.File -} - -var gloggerLock sync.Mutex -var gLogger, _ = New("debug", "", log.LstdFlags) - -func New(strLevel string, pathname string, flag int) (*Logger, error) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - // level - var level int - switch strings.ToLower(strLevel) { - case "debug": - level = debugLevel - case "release": - level = releaseLevel - case "error": - level = errorLevel - case "fatal": - level = fatalLevel - case "warn": - level = warnLevel - default: - return nil, errors.New("unknown level: " + strLevel) - } - - // logger - var baseLogger *log.Logger - var baseFile *os.File - if pathname != "" { - now := time.Now() - filename := fmt.Sprintf("%d%02d%02d.log", - now.Year(), - now.Month(), - now.Day(), - ) - - file, err := os.Create(path.Join(pathname, filename)) - if err != nil { - return nil, err - } - baseLogger = log.New(file, "", flag) - baseFile = file - } else { - baseLogger = log.New(os.Stdout, "", flag) - } - - // new - logger := new(Logger) - logger.level = level - logger.baseLogger = baseLogger - logger.baseFile = baseFile - - return logger, nil -} - -func NewDailyLog(now time.Time, Level int, pathname string, flag int) error { - gloggerLock.Lock() - defer gloggerLock.Unlock() - // level - var level int - switch Level { - case debugLevel: - level = debugLevel - case releaseLevel: - level = releaseLevel - case errorLevel: - level = errorLevel - case fatalLevel: - level = fatalLevel - case warnLevel: - level = warnLevel - default: - return fmt.Errorf("unknown level: %d", Level) - } - - // logger - var baseLogger *log.Logger - var baseFile *os.File - if pathname != "" { - filename := fmt.Sprintf("%d%02d%02d.log", - now.Year(), - now.Month(), - now.Day()) - - file, err := os.OpenFile(path.Join(pathname, filename), os.O_RDWR|os.O_APPEND|os.O_CREATE, 0664) - if err != nil { - return err - } - - baseLogger = log.New(file, "", flag) - baseFile = file - } else { - baseLogger = log.New(os.Stdout, "", flag) - } - - // new - gLogger.level = level - gLogger.baseLogger = baseLogger - gLogger.baseFile = baseFile - - return nil -} - -func BindLoggerToFile(strLevel string, pathName string, flag int) (*Logger, error) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - var level int - switch strings.ToLower(strLevel) { - case "debug": - level = debugLevel - case "release": - level = releaseLevel - case "error": - level = errorLevel - case "fatal": - level = fatalLevel - case "warn": - level = warnLevel - default: - return nil, errors.New("unknown level: " + strLevel) - } - - var baseLogger *log.Logger - var baseFile *os.File - - file, err := os.OpenFile(pathName, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0664) - if err != nil { - return nil, err - } - baseLogger = log.New(file, "", flag) - baseFile = file - - gLogger.level = level - gLogger.baseLogger = baseLogger - gLogger.baseFile = baseFile - - return gLogger, nil -} - -// It's dangerous to call the method on logging -func (logger *Logger) Close() { - if logger.baseFile != nil { - logger.baseFile.Close() - } - - logger.baseLogger = nil - logger.baseFile = nil -} - -func (logger *Logger) doPrintf(level int, printLevel string, format string, a ...interface{}) { - if level < logger.level { - return - } - if logger.baseLogger == nil { - return - } - - format = printLevel + format - logger.baseLogger.Output(3, fmt.Sprintf(format, a...)) - - if level == fatalLevel { - os.Exit(1) - } -} - -func (logger *Logger) Debug(format string, a ...interface{}) { - logger.doPrintf(debugLevel, printDebugLevel, format, a...) -} - -func (logger *Logger) Release(format string, a ...interface{}) { - logger.doPrintf(releaseLevel, printReleaseLevel, format, a...) -} - -func (logger *Logger) Error(format string, a ...interface{}) { - logger.doPrintf(errorLevel, printErrorLevel, format, a...) -} - -func (logger *Logger) Fatal(format string, a ...interface{}) { - logger.doPrintf(fatalLevel, printFatalLevel, format, a...) -} -func (logger *Logger) Warn(format string, a ...interface{}) { - logger.doPrintf(warnLevel, printWarnLevel, format, a...) -} - -// It's dangerous to call the method on logging -func Export(logger *Logger) { - if logger != nil { - gloggerLock.Lock() - defer gloggerLock.Unlock() - gLogger = logger - } -} - -func Debug(format string, a ...interface{}) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - if gLogger == nil { - return - } - gLogger.doPrintf(debugLevel, printDebugLevel, format, a...) -} - -func Release(format string, a ...interface{}) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - if gLogger == nil { - return - } - gLogger.doPrintf(releaseLevel, printReleaseLevel, format, a...) -} - -func Warn(format string, a ...interface{}) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - if gLogger == nil { - return - } - gLogger.doPrintf(warnLevel, printWarnLevel, format, a...) -} - -func Error(format string, a ...interface{}) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - if gLogger == nil { - return - } - // Capture the stack trace - stack := make([]byte, 1024) - length := runtime.Stack(stack, false) - format = fmt.Sprintf("%s\nStack trace:\n%s", format, stack[:length]) - - gLogger.doPrintf(errorLevel, printErrorLevel, format, a...) -} - -func Fatal(format string, a ...interface{}) { - gloggerLock.Lock() - defer gloggerLock.Unlock() - if gLogger == nil { - return - } - gLogger.doPrintf(fatalLevel, printFatalLevel, format, a...) -} - -func Close() { - gloggerLock.Lock() - defer gloggerLock.Unlock() - gLogger.Close() -} diff --git a/src/server/pkg/github.com/name5566/leaf/module/module.go b/src/server/pkg/github.com/name5566/leaf/module/module.go deleted file mode 100644 index f89c139f..00000000 --- a/src/server/pkg/github.com/name5566/leaf/module/module.go +++ /dev/null @@ -1,73 +0,0 @@ -package module - -import ( - "runtime" - "server/pkg/github.com/name5566/leaf/conf" - "server/pkg/github.com/name5566/leaf/log" - "sync" -) - -type Module interface { - OnInit() - OnDestroy() - Run(closeSig chan bool) -} - -type module struct { - mi Module - closeSig chan bool - wg sync.WaitGroup -} - -var mods []*module - -func Register(mi Module) { - m := new(module) - m.mi = mi - m.closeSig = make(chan bool, 1) - - mods = append(mods, m) -} - -func Init() { - for i := 0; i < len(mods); i++ { - mods[i].mi.OnInit() - } - - for i := 0; i < len(mods); i++ { - m := mods[i] - m.wg.Add(1) - go run(m) - } -} - -func Destroy() { - log.Release("module destroy") - for i := len(mods) - 1; i >= 0; i-- { - m := mods[i] - m.closeSig <- true - m.wg.Wait() - destroy(m) - } -} - -func run(m *module) { - m.mi.Run(m.closeSig) - m.wg.Done() -} - -func destroy(m *module) { - defer func() { - if r := recover(); r != nil { - if conf.LenStackBuf > 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - m.mi.OnDestroy() -} diff --git a/src/server/pkg/github.com/name5566/leaf/module/skeleton.go b/src/server/pkg/github.com/name5566/leaf/module/skeleton.go deleted file mode 100644 index df993fb0..00000000 --- a/src/server/pkg/github.com/name5566/leaf/module/skeleton.go +++ /dev/null @@ -1,128 +0,0 @@ -package module - -import ( - "server/pkg/github.com/name5566/leaf/chanrpc" - "server/pkg/github.com/name5566/leaf/console" - g "server/pkg/github.com/name5566/leaf/go" - logger "server/pkg/github.com/name5566/leaf/log" - "server/pkg/github.com/name5566/leaf/timer" - "time" -) - -type Skeleton struct { - GoLen int - TimerDispatcherLen int - AsynCallLen int - ChanRPCServer *chanrpc.Server - g *g.Go - dispatcher *timer.Dispatcher - client *chanrpc.Client - server *chanrpc.Server - commandServer *chanrpc.Server -} - -func (s *Skeleton) Init() { - if s.GoLen <= 0 { - s.GoLen = 0 - } - if s.TimerDispatcherLen <= 0 { - s.TimerDispatcherLen = 0 - } - if s.AsynCallLen <= 0 { - s.AsynCallLen = 0 - } - - s.g = g.New(s.GoLen) - s.dispatcher = timer.NewDispatcher(s.TimerDispatcherLen) - s.client = chanrpc.NewClient(s.AsynCallLen) - s.server = s.ChanRPCServer - - if s.server == nil { - s.server = chanrpc.NewServer(0) - } - s.commandServer = chanrpc.NewServer(0) -} - -func (s *Skeleton) Run(closeSig chan bool) { - defer func() { - if err := recover(); err != nil { - logger.Error("skeleton run panic: %v", err) - } - }() - for { - select { - case <-closeSig: - logger.Debug("close signal received") - s.commandServer.Close() - s.server.Close() - for !s.g.Idle() || !s.client.Idle() { - s.g.Close() - s.client.Close() - } - return - case ri := <-s.client.ChanAsynRet: - s.client.Cb(ri) - case ci := <-s.server.ChanCall: - s.server.Exec(ci) - case ci := <-s.commandServer.ChanCall: - s.commandServer.Exec(ci) - case cb := <-s.g.ChanCb: - s.g.Cb(cb) - case t := <-s.dispatcher.ChanTimer: - t.Cb() - } - } -} - -func (s *Skeleton) AfterFunc(d time.Duration, cb func()) *timer.Timer { - if s.TimerDispatcherLen == 0 { - panic("invalid TimerDispatcherLen") - } - - return s.dispatcher.AfterFunc(d, cb) -} - -func (s *Skeleton) CronFunc(cronExpr *timer.CronExpr, cb func()) *timer.Cron { - if s.TimerDispatcherLen == 0 { - panic("invalid TimerDispatcherLen") - } - - return s.dispatcher.CronFunc(cronExpr, cb) -} - -func (s *Skeleton) Go(f func(), cb func()) { - if s.GoLen == 0 { - panic("invalid GoLen") - } - - s.g.Go(f, cb) -} - -func (s *Skeleton) NewLinearContext() *g.LinearContext { - if s.GoLen == 0 { - panic("invalid GoLen") - } - - return s.g.NewLinearContext() -} - -func (s *Skeleton) AsynCall(server *chanrpc.Server, id interface{}, args ...interface{}) { - if s.AsynCallLen == 0 { - panic("invalid AsynCallLen") - } - - s.client.Attach(server) - s.client.AsynCall(id, args...) -} - -func (s *Skeleton) RegisterChanRPC(id interface{}, f interface{}) { - if s.ChanRPCServer == nil { - panic("invalid ChanRPCServer") - } - - s.server.Register(id, f) -} - -func (s *Skeleton) RegisterCommand(name string, help string, f interface{}) { - console.Register(name, help, f, s.commandServer) -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/agent.go b/src/server/pkg/github.com/name5566/leaf/network/agent.go deleted file mode 100644 index 9965af52..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/agent.go +++ /dev/null @@ -1,7 +0,0 @@ -package network - -type Agent interface { - WriteMsg(interface{}) - Run() - OnClose() -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/conn.go b/src/server/pkg/github.com/name5566/leaf/network/conn.go deleted file mode 100644 index 9f7a2c53..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/conn.go +++ /dev/null @@ -1,14 +0,0 @@ -package network - -import ( - "net" -) - -type Conn interface { - ReadMsg() ([]byte, error) - WriteMsg(args ...[]byte) error - LocalAddr() net.Addr - RemoteAddr() net.Addr - Close() - Destroy() -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/processor.go b/src/server/pkg/github.com/name5566/leaf/network/processor.go deleted file mode 100644 index 999da83b..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/processor.go +++ /dev/null @@ -1,10 +0,0 @@ -package network - -type Processor interface { - // must goroutine safe - Route(msg interface{}, userData interface{}) error - // must goroutine safe - Unmarshal(data []byte) (interface{}, error) - // must goroutine safe - Marshal(msg interface{}) ([][]byte, error) -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/protobuf/protobuf.go b/src/server/pkg/github.com/name5566/leaf/network/protobuf/protobuf.go deleted file mode 100644 index 22df0d8d..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/protobuf/protobuf.go +++ /dev/null @@ -1,191 +0,0 @@ -package protobuf - -import ( - "encoding/binary" - "errors" - "fmt" - "math" - "reflect" - "server/pkg/github.com/name5566/leaf/chanrpc" - "server/pkg/github.com/name5566/leaf/log" - - "google.golang.org/protobuf/proto" -) - -// ------------------------- -// | id | protobuf message | -// ------------------------- -type Processor struct { - littleEndian bool - msgInfo []*MsgInfo - msgID map[reflect.Type]uint16 -} - -type MsgInfo struct { - msgType reflect.Type - msgRouter *chanrpc.Server - msgHandler MsgHandler - msgRawHandler MsgHandler -} - -type MsgHandler func([]interface{}) - -type MsgRaw struct { - msgID uint16 - msgRawData []byte -} - -func NewProcessor() *Processor { - p := new(Processor) - p.littleEndian = false - p.msgID = make(map[reflect.Type]uint16) - return p -} - -// It's dangerous to call the method on routing or marshaling (unmarshaling) -func (p *Processor) SetByteOrder(littleEndian bool) { - p.littleEndian = littleEndian -} - -// It's dangerous to call the method on routing or marshaling (unmarshaling) -func (p *Processor) Register(msg proto.Message) uint16 { - msgType := reflect.TypeOf(msg) - if msgType == nil || msgType.Kind() != reflect.Ptr { - log.Fatal("protobuf message pointer required") - } - if _, ok := p.msgID[msgType]; ok { - log.Fatal("message %s is already registered", msgType) - } - if len(p.msgInfo) >= math.MaxUint16 { - log.Fatal("too many protobuf messages (max = %v)", math.MaxUint16) - } - - i := new(MsgInfo) - i.msgType = msgType - p.msgInfo = append(p.msgInfo, i) - id := uint16(len(p.msgInfo) - 1) - p.msgID[msgType] = id - return id -} - -// It's dangerous to call the method on routing or marshaling (unmarshaling) -func (p *Processor) SetRouter(msg proto.Message, msgRouter *chanrpc.Server) { - msgType := reflect.TypeOf(msg) - id, ok := p.msgID[msgType] - if !ok { - log.Fatal("message %s not registered", msgType) - } - - p.msgInfo[id].msgRouter = msgRouter -} - -// It's dangerous to call the method on routing or marshaling (unmarshaling) -func (p *Processor) SetHandler(msg proto.Message, msgHandler MsgHandler) { - msgType := reflect.TypeOf(msg) - id, ok := p.msgID[msgType] - if !ok { - log.Fatal("message %s not registered", msgType) - } - - p.msgInfo[id].msgHandler = msgHandler -} - -// It's dangerous to call the method on routing or marshaling (unmarshaling) -func (p *Processor) SetRawHandler(id uint16, msgRawHandler MsgHandler) { - if id >= uint16(len(p.msgInfo)) { - log.Fatal("message id %v not registered", id) - } - - p.msgInfo[id].msgRawHandler = msgRawHandler -} - -// goroutine safe -func (p *Processor) Route(msg interface{}, userData interface{}) error { - // raw - if msgRaw, ok := msg.(MsgRaw); ok { - if msgRaw.msgID >= uint16(len(p.msgInfo)) { - return fmt.Errorf("message id %v not registered", msgRaw.msgID) - } - i := p.msgInfo[msgRaw.msgID] - if i.msgRawHandler != nil { - i.msgRawHandler([]interface{}{msgRaw.msgID, msgRaw.msgRawData, userData}) - } - return nil - } - - // protobuf - msgType := reflect.TypeOf(msg) - id, ok := p.msgID[msgType] - if !ok { - return fmt.Errorf("message %s not registered", msgType) - } - i := p.msgInfo[id] - if i.msgHandler != nil { - i.msgHandler([]interface{}{msg, userData}) - } - if i.msgRouter != nil { - i.msgRouter.Go(msgType, msg, userData) - } - return nil -} - -// goroutine safe -func (p *Processor) Unmarshal(data []byte) (interface{}, error) { - if len(data) < 2 { - return nil, errors.New("protobuf data too short") - } - - // id - var id uint16 - if p.littleEndian { - id = binary.LittleEndian.Uint16(data) - } else { - id = binary.BigEndian.Uint16(data) - } - if id >= uint16(len(p.msgInfo)) { - return nil, fmt.Errorf("message id %v not registered", id) - } - - // msg - i := p.msgInfo[id] - if i.msgRawHandler != nil { - return MsgRaw{id, data[2:]}, nil - } else { - msg := reflect.New(i.msgType.Elem()).Interface() - return msg, proto.Unmarshal(data[2:], msg.(proto.Message)) - } -} - -// goroutine safe -func (p *Processor) Marshal(msg interface{}) ([][]byte, error) { - msgType := reflect.TypeOf(msg) - - // id - _id, ok := p.msgID[msgType] - if !ok { - err := fmt.Errorf("message %s not registered", msgType) - return nil, err - } - - id := make([]byte, 2) - if p.littleEndian { - binary.LittleEndian.PutUint16(id, _id) - } else { - binary.BigEndian.PutUint16(id, _id) - } - - // data - opts := proto.MarshalOptions{ - Deterministic: true, - } - - data, err := opts.Marshal(msg.(proto.Message)) - return [][]byte{id, data}, err -} - -// goroutine safe -func (p *Processor) Range(f func(id uint16, t reflect.Type)) { - for id, i := range p.msgInfo { - f(uint16(id), i.msgType) - } -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/tcp_client.go b/src/server/pkg/github.com/name5566/leaf/network/tcp_client.go deleted file mode 100644 index bb8b64e2..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/tcp_client.go +++ /dev/null @@ -1,138 +0,0 @@ -package network - -import ( - "net" - "server/pkg/github.com/name5566/leaf/log" - "sync" - "time" -) - -type TCPClient struct { - sync.Mutex - Addr string - ConnNum int - ConnectInterval time.Duration - PendingWriteNum int - AutoReconnect bool - NewAgent func(*TCPConn) Agent - conns ConnSet - Wg sync.WaitGroup - closeFlag bool - Agent Agent - ConnCallback func(*TCPConn) error - ConnType int - ConnLabel string - - // msg parser - LenMsgLen int - MinMsgLen uint32 - MaxMsgLen uint32 - LittleEndian bool - msgParser *MsgParser -} - -func (client *TCPClient) Start() { - client.init() - - for i := 0; i < client.ConnNum; i++ { - client.Wg.Add(1) - go client.connect() - } -} - -func (client *TCPClient) init() { - client.Lock() - defer client.Unlock() - - if client.ConnNum <= 0 { - client.ConnNum = 1 - log.Release("invalid ConnNum, reset to %v", client.ConnNum) - } - if client.ConnectInterval <= 0 { - client.ConnectInterval = 3 * time.Second - log.Release("invalid ConnectInterval, reset to %v", client.ConnectInterval) - } - if client.PendingWriteNum <= 0 { - client.PendingWriteNum = 100 - log.Release("invalid PendingWriteNum, reset to %v", client.PendingWriteNum) - } - if client.NewAgent == nil { - log.Fatal("NewAgent must not be nil") - } - if client.conns != nil { - log.Fatal("client is running") - } - - client.conns = make(ConnSet) - client.closeFlag = false - - // msg parser - msgParser := NewMsgParser() - msgParser.SetMsgLen(client.LenMsgLen, client.MinMsgLen, client.MaxMsgLen) - msgParser.SetByteOrder(client.LittleEndian) - client.msgParser = msgParser -} - -func (client *TCPClient) dial() net.Conn { - for { - conn, err := net.Dial("tcp", client.Addr) - if err == nil || client.closeFlag { - return conn - } - - log.Release("connect to %v error: %v", client.ConnLabel, err) - time.Sleep(client.ConnectInterval) - continue - } -} - -func (client *TCPClient) connect() { - defer client.Wg.Done() - -reconnect: - conn := client.dial() - if conn == nil { - return - } - - client.Lock() - if client.closeFlag { - client.Unlock() - conn.Close() - return - } - client.conns[conn] = struct{}{} - client.Unlock() - - tcpConn := newTCPConn(conn, client.PendingWriteNum, client.msgParser) - agent := client.NewAgent(tcpConn) - client.Agent = agent - if client.ConnCallback != nil { - client.ConnCallback(tcpConn) - } - agent.Run() - - // cleanup - tcpConn.Close() - client.Lock() - delete(client.conns, conn) - client.Unlock() - agent.OnClose() - - if client.AutoReconnect { - time.Sleep(client.ConnectInterval) - goto reconnect - } -} - -func (client *TCPClient) Close() { - client.Lock() - client.closeFlag = true - for conn := range client.conns { - conn.Close() - } - client.conns = nil - client.Unlock() - - client.Wg.Wait() -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/tcp_conn.go b/src/server/pkg/github.com/name5566/leaf/network/tcp_conn.go deleted file mode 100644 index d7ab7eb3..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/tcp_conn.go +++ /dev/null @@ -1,114 +0,0 @@ -package network - -import ( - "net" - "sync" - - "server/pkg/github.com/name5566/leaf/log" -) - -type ConnSet map[net.Conn]struct{} - -type TCPConn struct { - sync.Mutex - conn net.Conn - writeChan chan []byte - closeFlag bool - msgParser *MsgParser -} - -func newTCPConn(conn net.Conn, pendingWriteNum int, msgParser *MsgParser) *TCPConn { - tcpConn := new(TCPConn) - tcpConn.conn = conn - tcpConn.writeChan = make(chan []byte, pendingWriteNum) - tcpConn.msgParser = msgParser - - go func() { - for b := range tcpConn.writeChan { - if b == nil { - break - } - - _, err := conn.Write(b) - if err != nil { - break - } - } - - conn.Close() - tcpConn.Lock() - tcpConn.closeFlag = true - tcpConn.Unlock() - }() - - return tcpConn -} - -func (tcpConn *TCPConn) doDestroy() { - tcpConn.conn.(*net.TCPConn).SetLinger(0) - tcpConn.conn.Close() - - if !tcpConn.closeFlag { - close(tcpConn.writeChan) - tcpConn.closeFlag = true - } -} - -func (tcpConn *TCPConn) Destroy() { - tcpConn.Lock() - defer tcpConn.Unlock() - - tcpConn.doDestroy() -} - -func (tcpConn *TCPConn) Close() { - tcpConn.Lock() - defer tcpConn.Unlock() - if tcpConn.closeFlag { - return - } - - tcpConn.doWrite(nil) - tcpConn.closeFlag = true -} - -func (tcpConn *TCPConn) doWrite(b []byte) { - if len(tcpConn.writeChan) == cap(tcpConn.writeChan) { - log.Debug("close conn: channel full") - tcpConn.doDestroy() - return - } - - tcpConn.writeChan <- b -} - -// b must not be modified by the others goroutines -func (tcpConn *TCPConn) Write(b []byte) { - tcpConn.Lock() - defer tcpConn.Unlock() - if tcpConn.closeFlag || b == nil { - return - } - - tcpConn.doWrite(b) -} - -func (tcpConn *TCPConn) Read(b []byte) (int, error) { - return tcpConn.conn.Read(b) -} - -func (tcpConn *TCPConn) LocalAddr() net.Addr { - return tcpConn.conn.LocalAddr() -} - -func (tcpConn *TCPConn) RemoteAddr() net.Addr { - return tcpConn.conn.RemoteAddr() -} - -func (tcpConn *TCPConn) ReadMsg() ([]byte, error) { - return tcpConn.msgParser.Read(tcpConn) -} - -func (tcpConn *TCPConn) WriteMsg(args ...[]byte) error { - return tcpConn.msgParser.Write(tcpConn, args...) -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/tcp_msg.go b/src/server/pkg/github.com/name5566/leaf/network/tcp_msg.go deleted file mode 100644 index 6b309c44..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/tcp_msg.go +++ /dev/null @@ -1,154 +0,0 @@ -package network - -import ( - "encoding/binary" - "errors" - "io" - "math" -) - -// -------------- -// | len | data | -// -------------- -type MsgParser struct { - lenMsgLen int - minMsgLen uint32 - maxMsgLen uint32 - littleEndian bool -} - -func NewMsgParser() *MsgParser { - p := new(MsgParser) - p.lenMsgLen = 2 - p.minMsgLen = 1 - p.maxMsgLen = 4096 - p.littleEndian = false - - return p -} - -// It's dangerous to call the method on reading or writing -func (p *MsgParser) SetMsgLen(lenMsgLen int, minMsgLen uint32, maxMsgLen uint32) { - if lenMsgLen == 1 || lenMsgLen == 2 || lenMsgLen == 4 { - p.lenMsgLen = lenMsgLen - } - if minMsgLen != 0 { - p.minMsgLen = minMsgLen - } - if maxMsgLen != 0 { - p.maxMsgLen = maxMsgLen - } - - var max uint32 - switch p.lenMsgLen { - case 1: - max = math.MaxUint8 - case 2: - max = math.MaxUint16 - case 4: - max = math.MaxUint32 - } - if p.minMsgLen > max { - p.minMsgLen = max - } - if p.maxMsgLen > max { - p.maxMsgLen = max - } -} - -// It's dangerous to call the method on reading or writing -func (p *MsgParser) SetByteOrder(littleEndian bool) { - p.littleEndian = littleEndian -} - -// goroutine safe -func (p *MsgParser) Read(conn *TCPConn) ([]byte, error) { - var b [4]byte - bufMsgLen := b[:p.lenMsgLen] - - // read len - if _, err := io.ReadFull(conn, bufMsgLen); err != nil { - return nil, err - } - - // parse len - var msgLen uint32 - switch p.lenMsgLen { - case 1: - msgLen = uint32(bufMsgLen[0]) - case 2: - if p.littleEndian { - msgLen = uint32(binary.LittleEndian.Uint16(bufMsgLen)) - } else { - msgLen = uint32(binary.BigEndian.Uint16(bufMsgLen)) - } - case 4: - if p.littleEndian { - msgLen = binary.LittleEndian.Uint32(bufMsgLen) - } else { - msgLen = binary.BigEndian.Uint32(bufMsgLen) - } - } - - // check len - if msgLen > p.maxMsgLen { - return nil, errors.New("message too long") - } else if msgLen < p.minMsgLen { - return nil, errors.New("message too short") - } - - // data - msgData := make([]byte, msgLen) - if _, err := io.ReadFull(conn, msgData); err != nil { - return nil, err - } - - return msgData, nil -} - -// goroutine safe -func (p *MsgParser) Write(conn *TCPConn, args ...[]byte) error { - // get len - var msgLen uint32 - for i := 0; i < len(args); i++ { - msgLen += uint32(len(args[i])) - } - - // check len - if msgLen > p.maxMsgLen { - return errors.New("message too long") - } else if msgLen < p.minMsgLen { - return errors.New("message too short") - } - - msg := make([]byte, uint32(p.lenMsgLen)+msgLen) - - // write len - switch p.lenMsgLen { - case 1: - msg[0] = byte(msgLen) - case 2: - if p.littleEndian { - binary.LittleEndian.PutUint16(msg, uint16(msgLen)) - } else { - binary.BigEndian.PutUint16(msg, uint16(msgLen)) - } - case 4: - if p.littleEndian { - binary.LittleEndian.PutUint32(msg, msgLen) - } else { - binary.BigEndian.PutUint32(msg, msgLen) - } - } - - // write data - l := p.lenMsgLen - for i := 0; i < len(args); i++ { - copy(msg[l:], args[i]) - l += len(args[i]) - } - - conn.Write(msg) - - return nil -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/tcp_server.go b/src/server/pkg/github.com/name5566/leaf/network/tcp_server.go deleted file mode 100644 index ea4d7d93..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/tcp_server.go +++ /dev/null @@ -1,129 +0,0 @@ -package network - -import ( - "net" - "server/pkg/github.com/name5566/leaf/log" - "sync" - "time" -) - -type TCPServer struct { - Addr string - MaxConnNum int - PendingWriteNum int - NewAgent func(*TCPConn) Agent - ln net.Listener - conns ConnSet - mutexConns sync.Mutex - wgLn sync.WaitGroup - wgConns sync.WaitGroup - - // msg parser - LenMsgLen int - MinMsgLen uint32 - MaxMsgLen uint32 - LittleEndian bool - msgParser *MsgParser -} - -func (server *TCPServer) Start() { - server.init() - go server.run() -} - -func (server *TCPServer) init() { - ln, err := net.Listen("tcp", server.Addr) - if err != nil { - log.Fatal("%v", err) - } - - if server.MaxConnNum <= 0 { - server.MaxConnNum = 100 - log.Release("invalid MaxConnNum, reset to %v", server.MaxConnNum) - } - if server.PendingWriteNum <= 0 { - server.PendingWriteNum = 100 - log.Release("invalid PendingWriteNum, reset to %v", server.PendingWriteNum) - } - if server.NewAgent == nil { - log.Fatal("NewAgent must not be nil") - } - - server.ln = ln - server.conns = make(ConnSet) - - // msg parser - msgParser := NewMsgParser() - msgParser.SetMsgLen(server.LenMsgLen, server.MinMsgLen, server.MaxMsgLen) - msgParser.SetByteOrder(server.LittleEndian) - server.msgParser = msgParser -} - -func (server *TCPServer) run() { - server.wgLn.Add(1) - defer server.wgLn.Done() - - var tempDelay time.Duration - for { - conn, err := server.ln.Accept() - if err != nil { - if ne, ok := err.(net.Error); ok && ne.Temporary() { - if tempDelay == 0 { - tempDelay = 5 * time.Millisecond - } else { - tempDelay *= 2 - } - if max := 1 * time.Second; tempDelay > max { - tempDelay = max - } - log.Release("accept error: %v; retrying in %v", err, tempDelay) - time.Sleep(tempDelay) - continue - } - return - } - tempDelay = 0 - // if conf.Server.ServerType == "center" { - // log.Debug("accept connection from %v", conn.RemoteAddr()) - // } - server.mutexConns.Lock() - if len(server.conns) >= server.MaxConnNum { - server.mutexConns.Unlock() - conn.Close() - log.Debug("too many connections") - continue - } - server.conns[conn] = struct{}{} - server.mutexConns.Unlock() - - server.wgConns.Add(1) - - tcpConn := newTCPConn(conn, server.PendingWriteNum, server.msgParser) - agent := server.NewAgent(tcpConn) - go func() { - agent.Run() - - // cleanup - tcpConn.Close() - server.mutexConns.Lock() - delete(server.conns, conn) - server.mutexConns.Unlock() - agent.OnClose() - - server.wgConns.Done() - }() - } -} - -func (server *TCPServer) Close() { - server.ln.Close() - server.wgLn.Wait() - - server.mutexConns.Lock() - for conn := range server.conns { - conn.Close() - } - server.conns = nil - server.mutexConns.Unlock() - server.wgConns.Wait() -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/ws_client.go b/src/server/pkg/github.com/name5566/leaf/network/ws_client.go deleted file mode 100644 index f14d5439..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/ws_client.go +++ /dev/null @@ -1,132 +0,0 @@ -package network - -import ( - "github.com/gorilla/websocket" - "server/pkg/github.com/name5566/leaf/log" - "sync" - "time" -) - -type WSClient struct { - sync.Mutex - Addr string - ConnNum int - ConnectInterval time.Duration - PendingWriteNum int - MaxMsgLen uint32 - HandshakeTimeout time.Duration - AutoReconnect bool - NewAgent func(*WSConn) Agent - dialer websocket.Dialer - conns WebsocketConnSet - wg sync.WaitGroup - closeFlag bool -} - -func (client *WSClient) Start() { - client.init() - - for i := 0; i < client.ConnNum; i++ { - client.wg.Add(1) - go client.connect() - } -} - -func (client *WSClient) init() { - client.Lock() - defer client.Unlock() - - if client.ConnNum <= 0 { - client.ConnNum = 1 - log.Release("invalid ConnNum, reset to %v", client.ConnNum) - } - if client.ConnectInterval <= 0 { - client.ConnectInterval = 3 * time.Second - log.Release("invalid ConnectInterval, reset to %v", client.ConnectInterval) - } - if client.PendingWriteNum <= 0 { - client.PendingWriteNum = 100 - log.Release("invalid PendingWriteNum, reset to %v", client.PendingWriteNum) - } - if client.MaxMsgLen <= 0 { - client.MaxMsgLen = 4096 - log.Release("invalid MaxMsgLen, reset to %v", client.MaxMsgLen) - } - if client.HandshakeTimeout <= 0 { - client.HandshakeTimeout = 10 * time.Second - log.Release("invalid HandshakeTimeout, reset to %v", client.HandshakeTimeout) - } - if client.NewAgent == nil { - log.Fatal("NewAgent must not be nil") - } - if client.conns != nil { - log.Fatal("client is running") - } - - client.conns = make(WebsocketConnSet) - client.closeFlag = false - client.dialer = websocket.Dialer{ - HandshakeTimeout: client.HandshakeTimeout, - } -} - -func (client *WSClient) dial() *websocket.Conn { - for { - conn, _, err := client.dialer.Dial(client.Addr, nil) - if err == nil || client.closeFlag { - return conn - } - - log.Release("connect to %v error: %v", client.Addr, err) - time.Sleep(client.ConnectInterval) - continue - } -} - -func (client *WSClient) connect() { - defer client.wg.Done() - -reconnect: - conn := client.dial() - if conn == nil { - return - } - conn.SetReadLimit(int64(client.MaxMsgLen)) - - client.Lock() - if client.closeFlag { - client.Unlock() - conn.Close() - return - } - client.conns[conn] = struct{}{} - client.Unlock() - - wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen) - agent := client.NewAgent(wsConn) - agent.Run() - - // cleanup - wsConn.Close() - client.Lock() - delete(client.conns, conn) - client.Unlock() - agent.OnClose() - - if client.AutoReconnect { - time.Sleep(client.ConnectInterval) - goto reconnect - } -} - -func (client *WSClient) Close() { - client.Lock() - client.closeFlag = true - for conn := range client.conns { - conn.Close() - } - client.conns = nil - client.Unlock() - - client.wg.Wait() -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/ws_conn.go b/src/server/pkg/github.com/name5566/leaf/network/ws_conn.go deleted file mode 100644 index 740564ff..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/ws_conn.go +++ /dev/null @@ -1,140 +0,0 @@ -package network - -import ( - "errors" - "net" - "sync" - - "server/pkg/github.com/name5566/leaf/log" - - "github.com/gorilla/websocket" -) - -type WebsocketConnSet map[*websocket.Conn]struct{} - -type WSConn struct { - sync.Mutex - conn *websocket.Conn - writeChan chan []byte - maxMsgLen uint32 - closeFlag bool -} - -func newWSConn(conn *websocket.Conn, pendingWriteNum int, maxMsgLen uint32) *WSConn { - wsConn := new(WSConn) - wsConn.conn = conn - wsConn.writeChan = make(chan []byte, pendingWriteNum) - wsConn.maxMsgLen = maxMsgLen - - go func() { - for b := range wsConn.writeChan { - if b == nil { - break - } - - err := conn.WriteMessage(websocket.BinaryMessage, b) - if err != nil { - break - } - } - - conn.Close() - wsConn.Lock() - wsConn.closeFlag = true - wsConn.Unlock() - }() - - return wsConn -} - -func (wsConn *WSConn) doDestroy() { - wsConn.conn.UnderlyingConn().(*net.TCPConn).SetLinger(0) - wsConn.conn.Close() - - if !wsConn.closeFlag { - close(wsConn.writeChan) - wsConn.closeFlag = true - } -} - -func (wsConn *WSConn) Destroy() { - wsConn.Lock() - defer wsConn.Unlock() - - wsConn.doDestroy() -} - -func (wsConn *WSConn) Close() { - wsConn.Lock() - defer wsConn.Unlock() - if wsConn.closeFlag { - return - } - - wsConn.doWrite(nil) - wsConn.closeFlag = true -} - -func (wsConn *WSConn) doWrite(b []byte) { - if len(wsConn.writeChan) == cap(wsConn.writeChan) { - log.Debug("close conn: channel full") - wsConn.doDestroy() - return - } - - wsConn.writeChan <- b -} - -func (wsConn *WSConn) LocalAddr() net.Addr { - return wsConn.conn.LocalAddr() -} - -func (wsConn *WSConn) RemoteAddr() net.Addr { - return wsConn.conn.RemoteAddr() -} - -// goroutine not safe -func (wsConn *WSConn) ReadMsg() ([]byte, error) { - _, b, err := wsConn.conn.ReadMessage() - return b, err -} - -// args must not be modified by the others goroutines -func (wsConn *WSConn) WriteMsg(args ...[]byte) error { - wsConn.Lock() - defer wsConn.Unlock() - if wsConn.closeFlag { - return nil - } - - // get len - var msgLen uint32 - for i := 0; i < len(args); i++ { - msgLen += uint32(len(args[i])) - } - - // check len - if msgLen > wsConn.maxMsgLen { - return errors.New("message too long") - } else if msgLen < 1 { - return errors.New("message too short") - } - - // don't copy - if len(args) == 1 { - wsConn.doWrite(args[0]) - return nil - } - - // merge the args - msg := make([]byte, msgLen) - l := 0 - for i := 0; i < len(args); i++ { - copy(msg[l:], args[i]) - l += len(args[i]) - } - - wsConn.doWrite(msg) - - return nil -} diff --git a/src/server/pkg/github.com/name5566/leaf/network/ws_server.go b/src/server/pkg/github.com/name5566/leaf/network/ws_server.go deleted file mode 100644 index 651a744b..00000000 --- a/src/server/pkg/github.com/name5566/leaf/network/ws_server.go +++ /dev/null @@ -1,155 +0,0 @@ -package network - -import ( - "crypto/tls" - "net" - "net/http" - "server/pkg/github.com/name5566/leaf/log" - "sync" - "time" - - "github.com/gorilla/websocket" -) - -type WSServer struct { - Addr string - MaxConnNum int - PendingWriteNum int - MaxMsgLen uint32 - HTTPTimeout time.Duration - CertFile string - KeyFile string - NewAgent func(*WSConn) Agent - ln net.Listener - handler *WSHandler -} - -type WSHandler struct { - maxConnNum int - pendingWriteNum int - maxMsgLen uint32 - newAgent func(*WSConn) Agent - upgrader websocket.Upgrader - conns WebsocketConnSet - mutexConns sync.Mutex - wg sync.WaitGroup -} - -func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != "GET" { - http.Error(w, "Method not allowed", 405) - return - } - conn, err := handler.upgrader.Upgrade(w, r, nil) - if err != nil { - // log.Debug("upgrade error: %v", err) - return - } - conn.SetReadLimit(int64(handler.maxMsgLen)) - - handler.wg.Add(1) - defer handler.wg.Done() - - handler.mutexConns.Lock() - if handler.conns == nil { - handler.mutexConns.Unlock() - conn.Close() - return - } - if len(handler.conns) >= handler.maxConnNum { - handler.mutexConns.Unlock() - conn.Close() - log.Debug("too many connections") - return - } - handler.conns[conn] = struct{}{} - handler.mutexConns.Unlock() - - wsConn := newWSConn(conn, handler.pendingWriteNum, handler.maxMsgLen) - agent := handler.newAgent(wsConn) - agent.Run() - - // cleanup - wsConn.Close() - handler.mutexConns.Lock() - delete(handler.conns, conn) - handler.mutexConns.Unlock() - agent.OnClose() -} - -func (server *WSServer) Start() { - ln, err := net.Listen("tcp", server.Addr) - if err != nil { - log.Fatal("%v", err) - } - - if server.MaxConnNum <= 0 { - server.MaxConnNum = 100 - log.Release("invalid MaxConnNum, reset to %v", server.MaxConnNum) - } - if server.PendingWriteNum <= 0 { - server.PendingWriteNum = 100 - log.Release("invalid PendingWriteNum, reset to %v", server.PendingWriteNum) - } - if server.MaxMsgLen <= 0 { - server.MaxMsgLen = 4096 - log.Release("invalid MaxMsgLen, reset to %v", server.MaxMsgLen) - } - if server.HTTPTimeout <= 0 { - server.HTTPTimeout = 10 * time.Second - log.Release("invalid HTTPTimeout, reset to %v", server.HTTPTimeout) - } - if server.NewAgent == nil { - log.Fatal("NewAgent must not be nil") - } - - if server.CertFile != "" || server.KeyFile != "" { - config := &tls.Config{} - config.NextProtos = []string{"http/1.1"} - - var err error - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(server.CertFile, server.KeyFile) - if err != nil { - log.Fatal("%v", err) - } - - ln = tls.NewListener(ln, config) - } - - server.ln = ln - server.handler = &WSHandler{ - maxConnNum: server.MaxConnNum, - pendingWriteNum: server.PendingWriteNum, - maxMsgLen: server.MaxMsgLen, - newAgent: server.NewAgent, - conns: make(WebsocketConnSet), - upgrader: websocket.Upgrader{ - HandshakeTimeout: server.HTTPTimeout, - CheckOrigin: func(_ *http.Request) bool { return true }, - }, - } - - httpServer := &http.Server{ - Addr: server.Addr, - Handler: server.handler, - ReadTimeout: server.HTTPTimeout, - WriteTimeout: server.HTTPTimeout, - MaxHeaderBytes: 1024, - } - - go httpServer.Serve(ln) -} - -func (server *WSServer) Close() { - server.ln.Close() - - server.handler.mutexConns.Lock() - for conn := range server.handler.conns { - conn.Close() - } - server.handler.conns = nil - server.handler.mutexConns.Unlock() - - server.handler.wg.Wait() -} diff --git a/src/server/pkg/github.com/name5566/leaf/recordfile/example_test.go b/src/server/pkg/github.com/name5566/leaf/recordfile/example_test.go deleted file mode 100644 index 0227f4e1..00000000 --- a/src/server/pkg/github.com/name5566/leaf/recordfile/example_test.go +++ /dev/null @@ -1,67 +0,0 @@ -package recordfile_test - -import ( - "fmt" - "server/pkg/github.com/name5566/leaf/recordfile" -) - -func Example() { - type Record struct { - // index 0 - IndexInt int "index" - // index 1 - IndexStr string "index" - _Number int32 - Str string - Arr1 [2]int - Arr2 [3][2]int - Arr3 []int - St struct { - Name string "name" - Num int "num" - } - M map[string]int - } - - rf, err := recordfile.New(Record{}) - if err != nil { - return - } - - err = rf.Read("test.txt") - if err != nil { - return - } - - for i := 0; i < rf.NumRecord(); i++ { - r := rf.Record(i).(*Record) - fmt.Println(r.IndexInt) - } - - r := rf.Index(2).(*Record) - fmt.Println(r.Str) - - r = rf.Indexes(0)[2].(*Record) - fmt.Println(r.Str) - - r = rf.Indexes(1)["three"].(*Record) - fmt.Println(r.Str) - fmt.Println(r.Arr1[1]) - fmt.Println(r.Arr2[2][0]) - fmt.Println(r.Arr3[0]) - fmt.Println(r.St.Name) - fmt.Println(r.M["key6"]) - - // Output: - // 1 - // 2 - // 3 - // cat - // cat - // book - // 6 - // 4 - // 6 - // name5566 - // 6 -} diff --git a/src/server/pkg/github.com/name5566/leaf/recordfile/recordfile.go b/src/server/pkg/github.com/name5566/leaf/recordfile/recordfile.go deleted file mode 100644 index 34f156c6..00000000 --- a/src/server/pkg/github.com/name5566/leaf/recordfile/recordfile.go +++ /dev/null @@ -1,228 +0,0 @@ -package recordfile - -import ( - "encoding/csv" - "encoding/json" - "errors" - "fmt" - "os" - "reflect" - "strconv" -) - -var Comma = '\t' -var Comment = '#' - -type Index map[interface{}]interface{} - -type RecordFile struct { - Comma rune - Comment rune - typeRecord reflect.Type - records []interface{} - indexes []Index -} - -func New(st interface{}) (*RecordFile, error) { - typeRecord := reflect.TypeOf(st) - if typeRecord == nil || typeRecord.Kind() != reflect.Struct { - return nil, errors.New("st must be a struct") - } - - for i := 0; i < typeRecord.NumField(); i++ { - f := typeRecord.Field(i) - - kind := f.Type.Kind() - switch kind { - case reflect.Bool: - case reflect.Int: - case reflect.Int8: - case reflect.Int16: - case reflect.Int32: - case reflect.Int64: - case reflect.Uint: - case reflect.Uint8: - case reflect.Uint16: - case reflect.Uint32: - case reflect.Uint64: - case reflect.Float32: - case reflect.Float64: - case reflect.String: - case reflect.Struct: - case reflect.Array: - case reflect.Slice: - case reflect.Map: - default: - return nil, fmt.Errorf("invalid type: %v %s", - f.Name, kind) - } - - tag := f.Tag - if tag == "index" { - switch kind { - case reflect.Struct, reflect.Slice, reflect.Map: - return nil, fmt.Errorf("could not index %s field %v %v", - kind, i, f.Name) - } - } - } - - rf := new(RecordFile) - rf.typeRecord = typeRecord - - return rf, nil -} - -func (rf *RecordFile) Read(name string) error { - file, err := os.Open(name) - if err != nil { - return err - } - defer file.Close() - - if rf.Comma == 0 { - rf.Comma = Comma - } - if rf.Comment == 0 { - rf.Comment = Comment - } - reader := csv.NewReader(file) - reader.Comma = rf.Comma - reader.Comment = rf.Comment - lines, err := reader.ReadAll() - if err != nil { - return err - } - - typeRecord := rf.typeRecord - startLineIndex := 4 - // make records - records := make([]interface{}, len(lines)-startLineIndex) - - // make indexes - indexes := []Index{} - for i := 0; i < typeRecord.NumField(); i++ { - tag := typeRecord.Field(i).Tag - if tag == "index" { - indexes = append(indexes, make(Index)) - } - } - - for n := startLineIndex; n < len(lines); n++ { - value := reflect.New(typeRecord) - records[n-startLineIndex] = value.Interface() - record := value.Elem() - - line := lines[n] - if len(line) != typeRecord.NumField() { - return fmt.Errorf("line %v, field count mismatch: %v (file) %v (st)", - n, len(line), typeRecord.NumField()) - } - - iIndex := 0 - - for i := 0; i < typeRecord.NumField(); i++ { - f := typeRecord.Field(i) - - // records - strField := line[i] - field := record.Field(i) - if !field.CanSet() { - continue - } - - var err error - - kind := f.Type.Kind() - if kind == reflect.Bool { - var v bool - v, err = strconv.ParseBool(strField) - if err == nil { - field.SetBool(v) - } - } else if kind == reflect.Int || - kind == reflect.Int8 || - kind == reflect.Int16 || - kind == reflect.Int32 || - kind == reflect.Int64 { - var v int64 - v, err = strconv.ParseInt(strField, 0, f.Type.Bits()) - if err == nil { - field.SetInt(v) - } - } else if kind == reflect.Uint || - kind == reflect.Uint8 || - kind == reflect.Uint16 || - kind == reflect.Uint32 || - kind == reflect.Uint64 { - var v uint64 - v, err = strconv.ParseUint(strField, 0, f.Type.Bits()) - if err == nil { - field.SetUint(v) - } - } else if kind == reflect.Float32 || - kind == reflect.Float64 { - var v float64 - v, err = strconv.ParseFloat(strField, f.Type.Bits()) - if err == nil { - field.SetFloat(v) - } - } else if kind == reflect.String { - field.SetString(strField) - } else if kind == reflect.Struct || - kind == reflect.Array || - kind == reflect.Slice || - kind == reflect.Map { - err = json.Unmarshal([]byte(strField), field.Addr().Interface()) - } - - if err != nil { - return fmt.Errorf("parse field (row=%v, col=%v) error: %v", - n, i, err) - } - - // indexes - if f.Tag == "index" { - index := indexes[iIndex] - iIndex++ - if _, ok := index[field.Interface()]; ok { - return fmt.Errorf("index error: duplicate at (row=%v, col=%v)", - n, i) - } - index[field.Interface()] = records[n-startLineIndex] - } - } - } - - rf.records = records - rf.indexes = indexes - - return nil -} - -func (rf *RecordFile) Record(i int) interface{} { - return rf.records[i] -} - -func (rf *RecordFile) NumRecord() int { - return len(rf.records) -} - -func (rf *RecordFile) Indexes(i int) Index { - if i >= len(rf.indexes) { - return nil - } - return rf.indexes[i] -} - -func (rf *RecordFile) Index(i interface{}) interface{} { - index := rf.Indexes(0) - if index == nil { - return nil - } - return index[i] -} - -func (rf *RecordFile) SetRecords(records []interface{}) { - rf.records = records -} diff --git a/src/server/pkg/github.com/name5566/leaf/recordfile/test.txt b/src/server/pkg/github.com/name5566/leaf/recordfile/test.txt deleted file mode 100644 index 1882154c..00000000 --- a/src/server/pkg/github.com/name5566/leaf/recordfile/test.txt +++ /dev/null @@ -1,4 +0,0 @@ -数字索引 字符串索引 数字类型 字符串类型 数组类型 嵌套数组 变长数组 结构体类型 map类型 -1 one 0 knife "[1, 2]" "[[0,1], [1,2], [2,3]]" "[1, 2, 3]" "{""name"": ""name5566"", ""num"": 1}" "{""key1"": 1, ""key2"": 2}" -2 two 0 cat "[3, 4]" "[[1,2], [2,3], [3,4]]" "[4, 5]" "{""name"": ""name5566"", ""num"": 2}" "{""key3"": 3, ""key4"": 4}" -3 three 0 book "[5, 6]" "[[2,3], [3,4], [4,5]]" [6] "{""name"": ""name5566"", ""num"": 3}" "{""key5"": 5, ""key6"": 6}" diff --git a/src/server/pkg/github.com/name5566/leaf/timer/cronexpr.go b/src/server/pkg/github.com/name5566/leaf/timer/cronexpr.go deleted file mode 100644 index 694f0b41..00000000 --- a/src/server/pkg/github.com/name5566/leaf/timer/cronexpr.go +++ /dev/null @@ -1,268 +0,0 @@ -package timer - -// reference: https://github.com/robfig/cron -import ( - "fmt" - "math" - "strconv" - "strings" - "time" -) - -// Field name | Mandatory? | Allowed values | Allowed special characters -// ---------- | ---------- | -------------- | -------------------------- -// Seconds | No | 0-59 | * / , - -// Minutes | Yes | 0-59 | * / , - -// Hours | Yes | 0-23 | * / , - -// Day of month | Yes | 1-31 | * / , - -// Month | Yes | 1-12 | * / , - -// Day of week | Yes | 0-6 | * / , - -type CronExpr struct { - sec uint64 - min uint64 - hour uint64 - dom uint64 - month uint64 - dow uint64 -} - -// goroutine safe -func NewCronExpr(expr string) (cronExpr *CronExpr, err error) { - fields := strings.Fields(expr) - if len(fields) != 5 && len(fields) != 6 { - err = fmt.Errorf("invalid expr %v: expected 5 or 6 fields, got %v", expr, len(fields)) - return - } - - if len(fields) == 5 { - fields = append([]string{"0"}, fields...) - } - - cronExpr = new(CronExpr) - // Seconds - cronExpr.sec, err = parseCronField(fields[0], 0, 59) - if err != nil { - goto onError - } - // Minutes - cronExpr.min, err = parseCronField(fields[1], 0, 59) - if err != nil { - goto onError - } - // Hours - cronExpr.hour, err = parseCronField(fields[2], 0, 23) - if err != nil { - goto onError - } - // Day of month - cronExpr.dom, err = parseCronField(fields[3], 1, 31) - if err != nil { - goto onError - } - // Month - cronExpr.month, err = parseCronField(fields[4], 1, 12) - if err != nil { - goto onError - } - // Day of week - cronExpr.dow, err = parseCronField(fields[5], 0, 6) - if err != nil { - goto onError - } - return - -onError: - err = fmt.Errorf("invalid expr %v: %v", expr, err) - return -} - -// 1. * -// 2. num -// 3. num-num -// 4. */num -// 5. num/num (means num-max/num) -// 6. num-num/num -func parseCronField(field string, min int, max int) (cronField uint64, err error) { - fields := strings.Split(field, ",") - for _, field := range fields { - rangeAndIncr := strings.Split(field, "/") - if len(rangeAndIncr) > 2 { - err = fmt.Errorf("too many slashes: %v", field) - return - } - - // range - startAndEnd := strings.Split(rangeAndIncr[0], "-") - if len(startAndEnd) > 2 { - err = fmt.Errorf("too many hyphens: %v", rangeAndIncr[0]) - return - } - - var start, end int - if startAndEnd[0] == "*" { - if len(startAndEnd) != 1 { - err = fmt.Errorf("invalid range: %v", rangeAndIncr[0]) - return - } - start = min - end = max - } else { - // start - start, err = strconv.Atoi(startAndEnd[0]) - if err != nil { - err = fmt.Errorf("invalid range: %v", rangeAndIncr[0]) - return - } - // end - if len(startAndEnd) == 1 { - if len(rangeAndIncr) == 2 { - end = max - } else { - end = start - } - } else { - end, err = strconv.Atoi(startAndEnd[1]) - if err != nil { - err = fmt.Errorf("invalid range: %v", rangeAndIncr[0]) - return - } - } - } - - if start > end { - err = fmt.Errorf("invalid range: %v", rangeAndIncr[0]) - return - } - if start < min { - err = fmt.Errorf("out of range [%v, %v]: %v", min, max, rangeAndIncr[0]) - return - } - if end > max { - err = fmt.Errorf("out of range [%v, %v]: %v", min, max, rangeAndIncr[0]) - return - } - - // increment - var incr int - if len(rangeAndIncr) == 1 { - incr = 1 - } else { - incr, err = strconv.Atoi(rangeAndIncr[1]) - if err != nil { - err = fmt.Errorf("invalid increment: %v", rangeAndIncr[1]) - return - } - if incr <= 0 { - err = fmt.Errorf("invalid increment: %v", rangeAndIncr[1]) - return - } - } - - // cronField - if incr == 1 { - cronField |= ^(math.MaxUint64 << uint(end+1)) & (math.MaxUint64 << uint(start)) - } else { - for i := start; i <= end; i += incr { - cronField |= 1 << uint(i) - } - } - } - - return -} - -func (e *CronExpr) matchDay(t time.Time) bool { - // day-of-month blank - if e.dom == 0xfffffffe { - return 1< year+1 { - return time.Time{} - } - - // Month - for 1< 0 { - buf := make([]byte, conf.LenStackBuf) - l := runtime.Stack(buf, false) - log.Error("%v: %s", r, buf[:l]) - } else { - log.Error("%v", r) - } - } - }() - - if t.cb != nil { - t.cb() - } -} - -func (disp *Dispatcher) AfterFunc(d time.Duration, cb func()) *Timer { - t := new(Timer) - t.cb = cb - t.t = time.AfterFunc(d, func() { - disp.ChanTimer <- t - }) - return t -} - -// Cron -type Cron struct { - t *Timer -} - -func (c *Cron) Stop() { - if c.t != nil { - c.t.Stop() - } -} - -func (disp *Dispatcher) CronFunc(cronExpr *CronExpr, _cb func()) *Cron { - c := new(Cron) - - now := time.Now() - nextTime := cronExpr.Next(now) - if nextTime.IsZero() { - return c - } - - // callback - var cb func() - cb = func() { - defer _cb() - - now := time.Now() - nextTime := cronExpr.Next(now) - if nextTime.IsZero() { - return - } - c.t = disp.AfterFunc(nextTime.Sub(now), cb) - } - - c.t = disp.AfterFunc(nextTime.Sub(now), cb) - return c -} diff --git a/src/server/pkg/github.com/name5566/leaf/util/deepcopy.go b/src/server/pkg/github.com/name5566/leaf/util/deepcopy.go deleted file mode 100644 index 570718a9..00000000 --- a/src/server/pkg/github.com/name5566/leaf/util/deepcopy.go +++ /dev/null @@ -1,76 +0,0 @@ -package util - -// reference: https://github.com/mohae/deepcopy -import ( - "reflect" -) - -func deepCopy(dst, src reflect.Value) { - switch src.Kind() { - case reflect.Interface: - value := src.Elem() - if !value.IsValid() { - return - } - newValue := reflect.New(value.Type()).Elem() - deepCopy(newValue, value) - dst.Set(newValue) - case reflect.Ptr: - value := src.Elem() - if !value.IsValid() { - return - } - dst.Set(reflect.New(value.Type())) - deepCopy(dst.Elem(), value) - case reflect.Map: - dst.Set(reflect.MakeMap(src.Type())) - keys := src.MapKeys() - for _, key := range keys { - value := src.MapIndex(key) - newValue := reflect.New(value.Type()).Elem() - deepCopy(newValue, value) - dst.SetMapIndex(key, newValue) - } - case reflect.Slice: - dst.Set(reflect.MakeSlice(src.Type(), src.Len(), src.Cap())) - for i := 0; i < src.Len(); i++ { - deepCopy(dst.Index(i), src.Index(i)) - } - case reflect.Struct: - typeSrc := src.Type() - for i := 0; i < src.NumField(); i++ { - value := src.Field(i) - tag := typeSrc.Field(i).Tag - if value.CanSet() && tag.Get("deepcopy") != "-" { - deepCopy(dst.Field(i), value) - } - } - default: - dst.Set(src) - } -} - -func DeepCopy(dst, src interface{}) { - typeDst := reflect.TypeOf(dst) - typeSrc := reflect.TypeOf(src) - if typeDst != typeSrc { - panic("DeepCopy: " + typeDst.String() + " != " + typeSrc.String()) - } - if typeSrc.Kind() != reflect.Ptr { - panic("DeepCopy: pass arguments by address") - } - - valueDst := reflect.ValueOf(dst).Elem() - valueSrc := reflect.ValueOf(src).Elem() - if !valueDst.IsValid() || !valueSrc.IsValid() { - panic("DeepCopy: invalid arguments") - } - - deepCopy(valueDst, valueSrc) -} - -func DeepClone(v interface{}) interface{} { - dst := reflect.New(reflect.TypeOf(v)).Elem() - deepCopy(dst, reflect.ValueOf(v)) - return dst.Interface() -} diff --git a/src/server/pkg/github.com/name5566/leaf/util/example_test.go b/src/server/pkg/github.com/name5566/leaf/util/example_test.go deleted file mode 100644 index b6425539..00000000 --- a/src/server/pkg/github.com/name5566/leaf/util/example_test.go +++ /dev/null @@ -1,92 +0,0 @@ -package util_test - -import ( - "fmt" - "server/pkg/github.com/name5566/leaf/util" -) - -func ExampleMap() { - m := new(util.Map) - - fmt.Println(m.Get("key")) - m.Set("key", "value") - fmt.Println(m.Get("key")) - m.Del("key") - fmt.Println(m.Get("key")) - - m.Set(1, "1") - m.Set(2, 2) - m.Set("3", 3) - - fmt.Println(m.Len()) - - // Output: - // - // value - // - // 3 -} - -func ExampleRandGroup() { - i := util.RandGroup(0, 0, 50, 50) - switch i { - case 2, 3: - fmt.Println("ok") - } - - // Output: - // ok -} - -func ExampleRandInterval() { - v := util.RandInterval(-1, 1) - switch v { - case -1, 0, 1: - fmt.Println("ok") - } - - // Output: - // ok -} - -func ExampleRandIntervalN() { - r := util.RandIntervalN(-1, 0, 2) - if r[0] == -1 && r[1] == 0 || - r[0] == 0 && r[1] == -1 { - fmt.Println("ok") - } - - // Output: - // ok -} - -func ExampleDeepCopy() { - src := []int{1, 2, 3} - - var dst []int - util.DeepCopy(&dst, &src) - - for _, v := range dst { - fmt.Println(v) - } - - // Output: - // 1 - // 2 - // 3 -} - -func ExampleDeepClone() { - src := []int{1, 2, 3} - - dst := util.DeepClone(src).([]int) - - for _, v := range dst { - fmt.Println(v) - } - - // Output: - // 1 - // 2 - // 3 -} diff --git a/src/server/pkg/github.com/name5566/leaf/util/map.go b/src/server/pkg/github.com/name5566/leaf/util/map.go deleted file mode 100644 index dfba2400..00000000 --- a/src/server/pkg/github.com/name5566/leaf/util/map.go +++ /dev/null @@ -1,101 +0,0 @@ -package util - -import ( - "sync" -) - -type Map struct { - sync.RWMutex - m map[interface{}]interface{} -} - -func (m *Map) init() { - if m.m == nil { - m.m = make(map[interface{}]interface{}) - } -} - -func (m *Map) UnsafeGet(key interface{}) interface{} { - if m.m == nil { - return nil - } else { - return m.m[key] - } -} - -func (m *Map) Get(key interface{}) interface{} { - m.RLock() - defer m.RUnlock() - return m.UnsafeGet(key) -} - -func (m *Map) UnsafeSet(key interface{}, value interface{}) { - m.init() - m.m[key] = value -} - -func (m *Map) Set(key interface{}, value interface{}) { - m.Lock() - defer m.Unlock() - m.UnsafeSet(key, value) -} - -func (m *Map) TestAndSet(key interface{}, value interface{}) interface{} { - m.Lock() - defer m.Unlock() - - m.init() - - if v, ok := m.m[key]; ok { - return v - } else { - m.m[key] = value - return nil - } -} - -func (m *Map) UnsafeDel(key interface{}) { - m.init() - delete(m.m, key) -} - -func (m *Map) Del(key interface{}) { - m.Lock() - defer m.Unlock() - m.UnsafeDel(key) -} - -func (m *Map) UnsafeLen() int { - if m.m == nil { - return 0 - } else { - return len(m.m) - } -} - -func (m *Map) Len() int { - m.RLock() - defer m.RUnlock() - return m.UnsafeLen() -} - -func (m *Map) UnsafeRange(f func(interface{}, interface{})) { - if m.m == nil { - return - } - for k, v := range m.m { - f(k, v) - } -} - -func (m *Map) RLockRange(f func(interface{}, interface{})) { - m.RLock() - defer m.RUnlock() - m.UnsafeRange(f) -} - -func (m *Map) LockRange(f func(interface{}, interface{})) { - m.Lock() - defer m.Unlock() - m.UnsafeRange(f) -} diff --git a/src/server/pkg/github.com/name5566/leaf/util/rand.go b/src/server/pkg/github.com/name5566/leaf/util/rand.go deleted file mode 100644 index 557c4719..00000000 --- a/src/server/pkg/github.com/name5566/leaf/util/rand.go +++ /dev/null @@ -1,91 +0,0 @@ -package util - -import ( - "math/rand" - "time" -) - -func init() { - rand.Seed(time.Now().UnixNano()) -} - -func RandGroup(p ...uint32) int { - if p == nil { - panic("args not found") - } - - r := make([]uint32, len(p)) - for i := 0; i < len(p); i++ { - if i == 0 { - r[0] = p[0] - } else { - r[i] = r[i-1] + p[i] - } - } - - rl := r[len(r)-1] - if rl == 0 { - return 0 - } - - rn := uint32(rand.Int63n(int64(rl))) - for i := 0; i < len(r); i++ { - if rn < r[i] { - return i - } - } - - panic("bug") -} - -func RandInterval(b1, b2 int32) int32 { - if b1 == b2 { - return b1 - } - - min, max := int64(b1), int64(b2) - if min > max { - min, max = max, min - } - return int32(rand.Int63n(max-min+1) + min) -} - -func RandIntervalN(b1, b2 int32, n uint32) []int32 { - if b1 == b2 { - return []int32{b1} - } - - min, max := int64(b1), int64(b2) - if min > max { - min, max = max, min - } - l := max - min + 1 - if int64(n) > l { - n = uint32(l) - } - - r := make([]int32, n) - m := make(map[int32]int32) - for i := uint32(0); i < n; i++ { - v := int32(rand.Int63n(l) + min) - - if mv, ok := m[v]; ok { - r[i] = mv - } else { - r[i] = v - } - - lv := int32(l - 1 + min) - if v != lv { - if mv, ok := m[lv]; ok { - m[v] = mv - } else { - m[v] = lv - } - } - - l-- - } - - return r -} diff --git a/src/server/pkg/github.com/name5566/leaf/util/semaphore.go b/src/server/pkg/github.com/name5566/leaf/util/semaphore.go deleted file mode 100644 index 16fd136d..00000000 --- a/src/server/pkg/github.com/name5566/leaf/util/semaphore.go +++ /dev/null @@ -1,15 +0,0 @@ -package util - -type Semaphore chan struct{} - -func MakeSemaphore(n int) Semaphore { - return make(Semaphore, n) -} - -func (s Semaphore) Acquire() { - s <- struct{}{} -} - -func (s Semaphore) Release() { - <-s -} diff --git a/src/server/pkg/github.com/name5566/leaf/version.go b/src/server/pkg/github.com/name5566/leaf/version.go deleted file mode 100644 index 9e5e0370..00000000 --- a/src/server/pkg/github.com/name5566/leaf/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package leaf - -const version = "1.1.3" diff --git a/src/server/sql/Merge_Pet.sql b/src/server/sql/Merge_Pet.sql index 62021d38..f89fa039 100644 --- a/src/server/sql/Merge_Pet.sql +++ b/src/server/sql/Merge_Pet.sql @@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `t_player_baseinfo` ( /*==============================================================*/ CREATE TABLE IF NOT EXISTS t_player_mod ( `dwUin` bigint unsigned COMMENT '玩家uid', - `mData` blob DEFAULT NULL COMMENT '数据', + `mData` mediumblob DEFAULT NULL COMMENT '数据', `updateTime` int unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', primary key (`dwUin`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_general_ci COMMENT = '玩家模块表'; diff --git a/src/server/test/README.MD b/src/server/test/README.MD deleted file mode 100644 index 00f2e012..00000000 --- a/src/server/test/README.MD +++ /dev/null @@ -1,33 +0,0 @@ -# 单元调试 - -## 好友模块 - -### 随机好友推荐 - -```golang -test function TestFriendRecommendList 2026-03-04 -ok server/test 1.033s -``` - -### 好友离线消息聚合 - -```golang -3625212 | 100001 -3714321 | 100002 -``` - -### 好友申请 - -```golang -test function TestReqApplyFriend 2026-03-05 -ok server/test 0.479s -``` - -## 充值模块 - -### 观看广告记录 - -```golang -test function TestWatchAd 2026-03-04 -ok server/test 0.410s -``` diff --git a/src/server/test/__debug_bin.exe2315391482 b/src/server/test/__debug_bin.exe2315391482 deleted file mode 100644 index 61462269..00000000 Binary files a/src/server/test/__debug_bin.exe2315391482 and /dev/null differ diff --git a/src/server/test/activity_test.go b/src/server/test/activity_test.go deleted file mode 100644 index 799ed857..00000000 --- a/src/server/test/activity_test.go +++ /dev/null @@ -1,45 +0,0 @@ -package test - -import ( - "server/game" - "server/game/mod/activity" - "testing" - "time" -) - -func TestActivityOpenEnd(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - p.InitActivity() - p.ActivityLogin() -} - -func TestActivityAddGift(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - p.InitActivity() - p.Charge(72) - p.BackDataActivity() - - ActivityMod := p.GetActivityMod() - activityInfo := p.GetActivityInfo(activity.ACT_TYPE_ADD_GIFT) - if activityInfo == nil { - t.Error("activityInfo is nil") - return - } - items, err := ActivityMod.GetAddGiftReward(activityInfo.Id) - if err != nil { - t.Error("GetAddGiftReward error:", err) - return - } - t.Logf("GetAddGiftReward items:%v", items) -} - -func TestActivityAddGiftTick(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - p.InitActivity() - p.Charge(72) - p.BackDataActivity() - time.Sleep(time.Second * 15) -} diff --git a/src/server/test/catnip_test.go b/src/server/test/catnip_test.go deleted file mode 100644 index 32e844fb..00000000 --- a/src/server/test/catnip_test.go +++ /dev/null @@ -1,52 +0,0 @@ -package test - -import ( - "testing" - - "google.golang.org/protobuf/proto" - - "server/game" - "server/msg" -) - -func TestCatnipBackData(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("aaa001") - game.G_GameLogicPtr.SetPlayer(p1) - p1.CatnipBackData() -} - -func TestReqCatnipEmoji(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("aaa001") - game.G_GameLogicPtr.SetPlayer(p1) - - req := &msg.ReqCatnipEmoji{ - Id: 1, - EmojiId: 1, - } - data, err := proto.Marshal(req) - if err != nil { - t.Fatalf("proto.Marshal error: %v", err) - } - - if err := game.ReqCatnipEmoji(p1, data); err != nil { - t.Fatalf("ReqCatnipEmoji returned error: %v", err) - } -} - -func TestReqCatnipReward(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("aaa001") - game.G_GameLogicPtr.SetPlayer(p1) - req := &msg.ReqCatnipReward{ - Id: 2, - } - data, err := proto.Marshal(req) - if err != nil { - t.Fatalf("proto.Marshal error: %v", err) - } - if err := game.ReqCatnipReward(p1, data); err != nil { - t.Fatalf("ReqCatnipReward returned error: %v", err) - } -} diff --git a/src/server/test/champship_test.go b/src/server/test/champship_test.go deleted file mode 100644 index b4b9b852..00000000 --- a/src/server/test/champship_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package test - -import ( - "fmt" - champshipCfg "server/conf/champship" - "server/game" - "testing" -) - -func TestChampshipReward(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChampshipMod := p1.GetChampshipMod() - ChampshipMod.Score = 1000 - game.ReqChampshipReward(p1, nil) -} - -func TestChampshipRankReward(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChampshipMod := p1.GetChampshipMod() - ChampshipMod.RankReward = false - _, yesterdayActivityId := p1.GetChampshipActivityId() - ChampshipMod.GetRankReward(1, yesterdayActivityId) -} - -func TestGetChampshipActivityId(t *testing.T) { - res := champshipCfg.GetChampshipActivityId() - t.Logf("res:%v", res) -} - -func TestReqChampshipReward(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChampshipMod := p1.GetChampshipMod() - ChampshipMod.Score = 1000 - game.ReqChampshipReward(p1, nil) -} - -func TestChampionshipCreateRobot(t *testing.T) { - RobotNum := 30 - i := 5 - j := 1 - RobotList := game.CreateRobotList(i, RobotNum, j) - for i := 0; i < RobotNum; i++ { - game.FormatRobotInfo(RobotList[i], i+1, []int{100001, 100002, 100003}) - } - fmt.Print("success") -} - -func TestChampionshipGroup(t *testing.T) { - game.G_GameLogicPtr.CreateChampshipMgr() - game.G_GameLogicPtr.ChampshipMgr.Debug() -} diff --git a/src/server/test/charge_test.go b/src/server/test/charge_test.go deleted file mode 100644 index 4250dba3..00000000 --- a/src/server/test/charge_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package test - -import ( - "fmt" - "server/game" - "testing" -) - -func TestSpecialCharge(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChargeMod := p1.GetChargeMod() - ChargeMod.ZeroUpdate(nil) -} - -func TestWatchAd(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChargeMod := p1.GetChargeMod() - ChargeMod.AddAdWatch() - count := ChargeMod.GetAdWatch() - fmt.Println("观看广告次数：", count) - ChargeMod.ZeroUpdate(nil) - fmt.Println("观看广告次数重置后：", ChargeMod.GetAdWatch()) - ChargeMod.AddAdWatch() - count = ChargeMod.GetAdWatch() - fmt.Println("观看广告次数：", count) -} - -// 1+1礼包 -func TestActivityGiftAdd(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - p1.Charge(71) -} diff --git a/src/server/test/chess_test.go b/src/server/test/chess_test.go deleted file mode 100644 index 587353d3..00000000 --- a/src/server/test/chess_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package test - -import ( - "fmt" - "server/game" - "server/game/mod/order" - "testing" -) - -func TestGetStarEmitList(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChessMod := p1.GetChessMod() - EM := ChessMod.GetStarEmitList() - OrderMod := p1.GetOrderMod() - OrderMod.OrderList = map[int]order.Order{ - 1: { - MergeId: []int{15, 15}, - }, - } - p1.InitOrderItem() - fmt.Printf("%v\n", EM) -} - -func TestTakeChessOutBagToHonor(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChessMod := p1.GetChessMod() - ChessMod.TakeChessOutBagToHonor(3) - fmt.Printf("%v\n", ChessMod.Honor) -} diff --git a/src/server/test/collect_test.go b/src/server/test/collect_test.go deleted file mode 100644 index 884a6758..00000000 --- a/src/server/test/collect_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package test - -import ( - "server/game" - "testing" -) - -func TestCollectBack(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - CollectMod := p1.GetCollectMod() - res := CollectMod.BackData(p1.GetOrderFactor()) - t.Logf("res:%v", res) -} diff --git a/src/server/test/config_test.go b/src/server/test/config_test.go deleted file mode 100644 index a92b4c8c..00000000 --- a/src/server/test/config_test.go +++ /dev/null @@ -1,68 +0,0 @@ -package test - -import ( - "fmt" - activityCfg "server/conf/activity" - baseCfg "server/conf/base" - friendCfg "server/conf/friend" - languageCfg "server/conf/language" - notification_cfg "server/conf/notification" - playroomCfg "server/conf/playroom" - userCfg "server/conf/user" - GoUtil "server/game_util" - "server/msg" - "testing" -) - -func Test(t *testing.T) { - GoUtil.SendFeishuFatal(0, "Test", "error") - i := userCfg.GetEnergyMulByLv(1) - fmt.Println(i) -} - -func TestGetActivityRecycleMail(t *testing.T) { - title, mailTitle, mailContent := activityCfg.GetActivityRecycleMail(7) - fmt.Println("title:", title) - fmt.Println("mailTitle:", mailTitle) - fmt.Println("mailContent:", mailContent) - en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mailTitle) - fmt.Println("en:", en) -} - -func TestGetFriendSponsorNum(t *testing.T) { - r := friendCfg.GetFriendSponsorNum() - fmt.Println("r:", r) -} - -func TestGetPlayroomTaskDailyNum1(t *testing.T) { - r := playroomCfg.GetPlayroomTaskDailyNum1() - fmt.Println("r:", r) -} - -func TestGetEnergyByADNum(t *testing.T) { - r := baseCfg.GetEnergyByADNum() - fmt.Println("r:", r) -} - -func TestGetFriendApplyNotificationCooldown(t *testing.T) { - Cooldown := notification_cfg.GetFriendApplyNotificationCooldown() - fmt.Println("Cooldown:", Cooldown) -} - -func TestGetPetroomGameNotificationCooldown(t *testing.T) { - Cooldown, dailyLimit := notification_cfg.GetPetroomGameNotificationCooldown() - fmt.Println("Cooldown:", Cooldown) - fmt.Println("dailyLimit:", dailyLimit) -} - -func TestGetPetroomGameNotificationMsg(t *testing.T) { - titlekey, infokey := notification_cfg.GetPetroomGameNotificationMsg() - fmt.Println("titlekey:", titlekey) - fmt.Println("infokey:", infokey) -} - -func TestGetFriendApplyNotificationMsg(t *testing.T) { - titlekey, infokey := notification_cfg.GetFriendApplyNotificationMsg() - fmt.Println("titlekey:", titlekey) - fmt.Println("infokey:", infokey) -} diff --git a/src/server/test/dailytask_test.go b/src/server/test/dailytask_test.go deleted file mode 100644 index 44479631..00000000 --- a/src/server/test/dailytask_test.go +++ /dev/null @@ -1,50 +0,0 @@ -package test - -import ( - "fmt" - dailyTaskCfg "server/conf/daily_task" - "server/game" - "testing" -) - -func TestDailyActiviyId(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - ids := player.GetDailyTaskActivityId() - if ids == 0 { - t.Errorf("GetDailyTaskActivityId failed, ids is empty") - } -} - -func TestDailyZeroUpdate(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - DailyTaskMod := player.GetDailyTaskMod() - BaseMod := player.GetBaseMod() - DecorateMod := player.GetDecorateMod() - DailyTaskMod.ZeroUpdate(BaseMod.Level, DecorateMod.GetAreaId(), player.GetDailyTaskActivityId()) - DailyTaskMod.BackData() -} - -func TestDailyWeekUpdate(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - DailyTaskMod := player.GetDailyTaskMod() - DailyTaskMod.WeekUpdate(200) - for _, v := range DailyTaskMod.WeekReward { - fmt.Printf("week reward id: %d, items: %v\n", v.Id, v.Items) - } - DailyTaskMod.BackData() -} - -func TestDailyTaskRewardScore(t *testing.T) { - score1 := dailyTaskCfg.GetDailyTaskScore(1, 1) - if score1 == 0 { - t.Errorf("GetDailyTaskScore failed, score1 is 0") - } - score2 := dailyTaskCfg.GetDailyTaskScore(1, 0) - if score2 == 0 { - t.Errorf("GetDailyTaskScore failed, score2 is 0") - } - fmt.Printf("score1: %d, score2: %d\n", score1, score2) -} diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go deleted file mode 100644 index 907a2863..00000000 --- a/src/server/test/fix_test.go +++ /dev/null @@ -1,303 +0,0 @@ -package test - -import ( - "fmt" - "server/backend" - avatarCfg "server/conf/avatar" - decorateCfg "server/conf/decorate" - faceCfg "server/conf/face" - languageCfg "server/conf/language" - notification_cfg "server/conf/notification" - "server/db" - "server/game" - "server/game/mod/item" - MsgMod "server/game/mod/msg" - GoUtil "server/game_util" - "server/msg" - "server/pkg/github.com/name5566/leaf/log" - "sort" - "testing" -) - -func TestThriftServer(t *testing.T) { - backend.Start() -} - -func TestFixDecorate(t *testing.T) { - // Initialize player - p := new(game.Player) - p.FixDecorate() - - // - p.InitPlayer("dee8eeb83ea3c54e48427b7ff20066fb") - p.FixDecorate() - - DecorateMod := p.GetDecorateMod() - DecorateMod.AreaId = 3 - DecorateMod.Progress = 22 - p.FixDecorate() -} - -func TestFixUserData(t *testing.T) { - // 确保数据库已初始化 - if db.SqlDb == nil { - db.InitDB() - // 等待初始化完成 - for i := 0; i < 10; i++ { - if db.SqlDb != nil { - break - } - log.Warn("Waiting for database initialization...") - // time.Sleep(100 * time.Millisecond) - } - } - - if db.SqlDb == nil { - t.Fatal("Database initialization failed") - } - - log.Warn("hello world") - type account struct { - Account string `db:"user_name"` - } - var accounts []account - sqlDb := db.GetDB() // 使用线程安全的方式获取连接 - if sqlDb == nil { - t.Fatal("Database connection is nil") - } - err := sqlDb.Select(&accounts, "SELECT `user_name` FROM t_account order by auto_id") - if err != nil { - t.Errorf("Failed to fetch accounts: %v", err) - return - } - i := 0 - for _, acc := range accounts { - i++ - fmt.Printf("Fixing account %d/%d: %s\n", i, len(accounts), acc.Account) - account := acc.Account - p := new(game.Player) - p.InitPlayer(account) - DecorateMod := p.GetDecorateMod() - if DecorateMod.PartCost == nil { - return - } - for k := range DecorateMod.PartCost { - AreaId := decorateCfg.GetAreaIdByIndoorId(k) - if AreaId < DecorateMod.AreaId { - log.Debug("Fixing account: %s, PartId: %d, OldAreaId: %d, NewAreaId: %d\n", account, k, AreaId, DecorateMod.AreaId) - } - } - p.Stop() - p = nil - } - log.Debug("All accounts fixed") -} - -func TestRandInt(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - CollectMod := p1.GetCollectMod() - p1.PushClientRes(CollectMod.BackData(p1.GetOrderFactor())) -} - -func TestII(t *testing.T) { - for i := 0; i < 10; i++ { - fmt.Printf("i: %d\n", i) - } -} - -func TestLevelUp(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - PlayerBaseMod := p1.GetPlayerBaseMod() - PlayerBaseMod.AddExp(p1, 10000, 10000) -} - -func TestEndless(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - p1.ZeroUpdate(nil) - MailMod := p1.GetMailMod() - MailMod.BackData() -} - -func TestAdmin(t *testing.T) { - player := new(game.Player) - player.M_DwUin = 100100001 - player.InitPlayerOnly() - player.ZeroUpdate(nil) -} - -// 10130 10165 -func TestNotify(t *testing.T) { - titlekey, infokey := notification_cfg.GetFriendApplyNotificationMsg() - title := languageCfg.GetLanguage(msg.LANG_TYPE(1), titlekey) - info := languageCfg.GetLanguage(msg.LANG_TYPE(1), infokey) - // titlekey, infokey := notification_cfg.GetPetroomGameNotificationMsg() - // title := languageCfg.GetLanguage(msg.LANG_TYPE(1), titlekey) - // info := languageCfg.GetLanguage(msg.LANG_TYPE(1), infokey) - GoUtil.NotifyPlayer(3625212, 2, title, fmt.Sprintf(info, "猫猫")) - // GoUtil.NotifyPlayer(19246, 1, "Test Notification", "This is a test notification from the server.") -} - -func TestAnalyzeDecorate(t *testing.T) { - uids := []int{111354, 111355, 111358, 111364, 111359, 111357, 111363, 111369, 111371, 111379, 111384, 111383, 111366, 111373, 111377, 111389, 111393, 111395, 111401, 111397, 111396, 111403, 111404, 111399, 111409, 111406, 111415, 111410, 111421, 111419, 111413, 111422, 111423, 111425, 111405, 111429, 111356, 111411, 111431, 111424, 111426, 111441, 111428, 111454, 111455, 111436, 111420, 111453, 111460, 111452, 111459, 111458, 111456, 111464, 111465, 111382, 111468, 111472, 111376, 111480, 111362, 111490, 111497, 111498, 111500, 111434, 111496, 111474, 111482, 111504, 111506, 111514, 111515, 111470, 111512, 111523, 111520, 111478, 111533, 111538, 111534, 111491, 111522, 111537, 111446, 111477, 111544, 111526, 111528, 111546, 111543, 111548, 111535, 111432, 111553, 111467, 111542, 111560, 111457, 111549, 111536, 111516, 111531, 111487, 111557, 111529, 111568, 111540, 111539, 111416, 111561, 111555, 111558, 111581, 111475, 111564, 111524, 111484, 111583, 111587, 111585, 111584, 111525, 111552, 111592, 111595, 111603, 111599, 111604, 111591, 111608, 111607, 111598, 111610, 111615, 111614, 111596, 111562, 111572, 111381, 111625, 111621, 111632, 111550, 111630, 111628, 111602, 111567, 111445, 111633, 111623, 111647, 111653, 111649, 111593, 111646, 111645, 111651, 111643, 111611, 111636, 111519, 111661, 111662, 111667, 111670, 111387, 111664, 111650, 111672, 111378, 111660, 111666, 111675, 111663, 111686, 111685, 111575, 111688, 111659, 111691, 111637, 111695, 111676, 111386, 111699, 111701, 111709, 111444, 111702, 111718, 111704, 111679, 111710, 111706, 111617, 111708, 111722, 111721, 111412, 111728, 111720, 111727, 111733, 111563, 111503, 111738, 111729, 111556, 111744, 111732, 111750, 111748, 111745, 111541, 111740, 111747, 111731, 111755, 111761, 111724, 111756, 111760, 111766, 111696, 111717, 111774, 111780, 111776, 111786, 111787, 111785, 111782, 111795, 111798, 111775, 111790, 111800, 111796, 111788, 111792, 111398, 111803, 111802, 111804, 111799, 111811, 111815, 111716, 111759, 111816, 111824, 111814, 111817, 111829, 111807, 111840, 111839, 111835, 111837, 111821, 111810, 111846, 111758, 111834, 111852, 111850, 111820, 111855, 111849, 111848, 111831, 111866, 111844, 111851, 111868, 111826, 111684, 111874, 111880, 111869, 111883, 111884, 111847, 111888, 111887, 111890, 111892, 111857, 111713, 111842, 111854, 111894, 111903, 111877, 111908, 111858, 111794, 111906, 111904, 111767, 111871, 111891, 111910, 111918, 111899, 111914, 111917, 111907, 111875, 111920, 111863, 111913, 111926, 111703, 111825, 111677, 111928, 111753, 111931, 111365, 111762, 111872, 111768, 111878, 111570, 111938, 111935, 111946, 111624, 111944, 111942, 111940, 111833, 111620, 111763, 111957, 111805, 111511, 111948, 111966, 111882, 111967, 111965, 111970, 111867, 111723, 111969, 111941, 111730, 111973, 111978, 111983, 111987, 111989, 111980, 111991, 111569, 111589, 112003, 111990, 111606, 111984, 111998, 112006, 112007, 111461, 111999, 112010, 112012, 111901, 111781, 111812, 112016, 111736, 111771, 111705, 111509, 111488, 112024, 112030, 111961, 111579, 112036, 111616, 112040, 112043, 111997, 112048, 112035, 112052, 111972, 112057, 111669, 111777, 112056, 112032, 112063, 112062, 111793, 112061, 112050, 112066, 112038, 111518, 111673, 112068, 111655, 112071, 112074, 111986, 111943, 112017, 112011, 112083, 112078, 112087, 112020, 111391, 111836, 112082, 112091, 112053, 112090, 111947, 112096, 112099, 112100, 112085, 112101, 112102, 111739, 111671, 112107, 112109, 111433, 111754, 111439, 111838, 111499, 111665, 111476, 111885, 111502, 111627, 111530, 111959, 111414, 111933, 111668, 112079, 111613, 111749, 112027, 111609, 112054, 111678, 111813, 111994, 111513, 111547, 111622, 111692, 111897, 111784, 111492, 112047, 111951, 112039, 111652, 111687, 112033, 112077, 111801, 111437, 111566, 111648, 111735, 111955, 112110, 112055, 112008, 112023, 111719, 111949, 111510, 112037, 111809, 112075, 112058, 111689, 111789, 111545, 111870, 112070, 111797, 112106, 112015, 112073, 112013, 112081, 111443, 111772, 111712, 111698, 112031, 111988, 111956, 111924, 111830, 111993, 112080, 111950, 111930, 111977, 111642, 111626, 112021, 112111, 112069, 111845, 111485, 111783, 111856, 111981, 111605, 111764, 111697, 111881, 111450, 111822, 111408, 111463, 111921, 112041, 112046, 111861, 112009, 111818, 111481, 111905, 111368, 111495, 111360, 112072, 111392, 111823, 111939, 111974, 111927, 112025, 111418, 111979, 112105, 111656, 111508, 111494, 111629, 111934, 112028, 112000, 112086, 111982, 112094, 111929, 111447, 111427, 111964, 111819, 112089, 111769, 111385, 111911, 111937, 111394, 111586, 111471, 111407, 111674, 111963, 111654, 112049, 111442, 111952, 112029, 111690, 112065, 112076, 111912, 112095, 111741, 111638, 111876, 111527, 111751, 111936, 111808, 111590, 111919, 111832, 111400, 111594, 111958, 111451, 111580, 112005, 111853, 111639, 112014, 111743, 111631, 111734, 111574, 111841, 111843, 111681, 111714, 111737, 112060, 111634, 111693, 111757, 111388, 111577, 111640, 111902, 112098, 111435, 111828, 112019, 112022, 111770, 111707, 111862, 111469, 111576, 111466, 111742, 111380, 111954, 111968, 111752, 111909, 111765, 111953, 111778, 112042, 111962, 112001, 112034, 111960, 111619, 111554, 111893, 111865, 111600, 111746, 111985, 111971, 111505, 112051, 111945, 111483, 111916, 111995, 112004, 111859, 112044} - decorate := make(map[string]int) - for _, uid := range uids { - p1 := new(game.Player) - p1.InitPlayerByUid(uid) - DecorateMod := p1.GetDecorateMod() - doco_id := fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress) - decorate[doco_id]++ - p1 = nil - } - // Sort by AreaId first, then by Progress - type decorateInfo struct { - key string - count int - } - var sorted []decorateInfo - for k, v := range decorate { - sorted = append(sorted, decorateInfo{k, v}) - } - sort.Slice(sorted, func(i, j int) bool { - var areaI, progressI, areaJ, progressJ int - fmt.Sscanf(sorted[i].key, "%d_%d", &areaI, &progressI) - fmt.Sscanf(sorted[j].key, "%d_%d", &areaJ, &progressJ) - if areaI != areaJ { - return areaI < areaJ - } - return progressI < progressJ - }) - keys := make([]string, 0, len(sorted)) - values := make([]int, 0, len(sorted)) - for _, item := range sorted { - keys = append(keys, item.key) - values = append(values, item.count) - } - fmt.Printf("keys: %v\n", keys) - fmt.Printf("values: %v\n", values) -} - -func TestAnalyzeOrder(t *testing.T) { - uids := []int{111354, 111355, 111358, 111364, 111359, 111357, 111363, 111369, 111371, 111379, 111384, 111383, 111366, 111373, 111377, 111389, 111393, 111395, 111401, 111397, 111396, 111403, 111404, 111399, 111409, 111406, 111415, 111410, 111421, 111419, 111413, 111422, 111423, 111425, 111405, 111429, 111356, 111411, 111431, 111424, 111426, 111441, 111428, 111454, 111455, 111436, 111420, 111453, 111460, 111452, 111459, 111458, 111456, 111464, 111465, 111382, 111468, 111472, 111376, 111480, 111362, 111490, 111497, 111498, 111500, 111434, 111496, 111474, 111482, 111504, 111506, 111514, 111515, 111470, 111512, 111523, 111520, 111478, 111533, 111538, 111534, 111491, 111522, 111537, 111446, 111477, 111544, 111526, 111528, 111546, 111543, 111548, 111535, 111432, 111553, 111467, 111542, 111560, 111457, 111549, 111536, 111516, 111531, 111487, 111557, 111529, 111568, 111540, 111539, 111416, 111561, 111555, 111558, 111581, 111475, 111564, 111524, 111484, 111583, 111587, 111585, 111584, 111525, 111552, 111592, 111595, 111603, 111599, 111604, 111591, 111608, 111607, 111598, 111610, 111615, 111614, 111596, 111562, 111572, 111381, 111625, 111621, 111632, 111550, 111630, 111628, 111602, 111567, 111445, 111633, 111623, 111647, 111653, 111649, 111593, 111646, 111645, 111651, 111643, 111611, 111636, 111519, 111661, 111662, 111667, 111670, 111387, 111664, 111650, 111672, 111378, 111660, 111666, 111675, 111663, 111686, 111685, 111575, 111688, 111659, 111691, 111637, 111695, 111676, 111386, 111699, 111701, 111709, 111444, 111702, 111718, 111704, 111679, 111710, 111706, 111617, 111708, 111722, 111721, 111412, 111728, 111720, 111727, 111733, 111563, 111503, 111738, 111729, 111556, 111744, 111732, 111750, 111748, 111745, 111541, 111740, 111747, 111731, 111755, 111761, 111724, 111756, 111760, 111766, 111696, 111717, 111774, 111780, 111776, 111786, 111787, 111785, 111782, 111795, 111798, 111775, 111790, 111800, 111796, 111788, 111792, 111398, 111803, 111802, 111804, 111799, 111811, 111815, 111716, 111759, 111816, 111824, 111814, 111817, 111829, 111807, 111840, 111839, 111835, 111837, 111821, 111810, 111846, 111758, 111834, 111852, 111850, 111820, 111855, 111849, 111848, 111831, 111866, 111844, 111851, 111868, 111826, 111684, 111874, 111880, 111869, 111883, 111884, 111847, 111888, 111887, 111890, 111892, 111857, 111713, 111842, 111854, 111894, 111903, 111877, 111908, 111858, 111794, 111906, 111904, 111767, 111871, 111891, 111910, 111918, 111899, 111914, 111917, 111907, 111875, 111920, 111863, 111913, 111926, 111703, 111825, 111677, 111928, 111753, 111931, 111365, 111762, 111872, 111768, 111878, 111570, 111938, 111935, 111946, 111624, 111944, 111942, 111940, 111833, 111620, 111763, 111957, 111805, 111511, 111948, 111966, 111882, 111967, 111965, 111970, 111867, 111723, 111969, 111941, 111730, 111973, 111978, 111983, 111987, 111989, 111980, 111991, 111569, 111589, 112003, 111990, 111606, 111984, 111998, 112006, 112007, 111461, 111999, 112010, 112012, 111901, 111781, 111812, 112016, 111736, 111771, 111705, 111509, 111488, 112024, 112030, 111961, 111579, 112036, 111616, 112040, 112043, 111997, 112048, 112035, 112052, 111972, 112057, 111669, 111777, 112056, 112032, 112063, 112062, 111793, 112061, 112050, 112066, 112038, 111518, 111673, 112068, 111655, 112071, 112074, 111986, 111943, 112017, 112011, 112083, 112078, 112087, 112020, 111391, 111836, 112082, 112091, 112053, 112090, 111947, 112096, 112099, 112100, 112085, 112101, 112102, 111739, 111671, 112107, 112109, 111433, 111754, 111439, 111838, 111499, 111665, 111476, 111885, 111502, 111627, 111530, 111959, 111414, 111933, 111668, 112079, 111613, 111749, 112027, 111609, 112054, 111678, 111813, 111994, 111513, 111547, 111622, 111692, 111897, 111784, 111492, 112047, 111951, 112039, 111652, 111687, 112033, 112077, 111801, 111437, 111566, 111648, 111735, 111955, 112110, 112055, 112008, 112023, 111719, 111949, 111510, 112037, 111809, 112075, 112058, 111689, 111789, 111545, 111870, 112070, 111797, 112106, 112015, 112073, 112013, 112081, 111443, 111772, 111712, 111698, 112031, 111988, 111956, 111924, 111830, 111993, 112080, 111950, 111930, 111977, 111642, 111626, 112021, 112111, 112069, 111845, 111485, 111783, 111856, 111981, 111605, 111764, 111697, 111881, 111450, 111822, 111408, 111463, 111921, 112041, 112046, 111861, 112009, 111818, 111481, 111905, 111368, 111495, 111360, 112072, 111392, 111823, 111939, 111974, 111927, 112025, 111418, 111979, 112105, 111656, 111508, 111494, 111629, 111934, 112028, 112000, 112086, 111982, 112094, 111929, 111447, 111427, 111964, 111819, 112089, 111769, 111385, 111911, 111937, 111394, 111586, 111471, 111407, 111674, 111963, 111654, 112049, 111442, 111952, 112029, 111690, 112065, 112076, 111912, 112095, 111741, 111638, 111876, 111527, 111751, 111936, 111808, 111590, 111919, 111832, 111400, 111594, 111958, 111451, 111580, 112005, 111853, 111639, 112014, 111743, 111631, 111734, 111574, 111841, 111843, 111681, 111714, 111737, 112060, 111634, 111693, 111757, 111388, 111577, 111640, 111902, 112098, 111435, 111828, 112019, 112022, 111770, 111707, 111862, 111469, 111576, 111466, 111742, 111380, 111954, 111968, 111752, 111909, 111765, 111953, 111778, 112042, 111962, 112001, 112034, 111960, 111619, 111554, 111893, 111865, 111600, 111746, 111985, 111971, 111505, 112051, 111945, 111483, 111916, 111995, 112004, 111859, 112044} - order := make(map[int]int) - for _, uid := range uids { - p1 := new(game.Player) - p1.InitPlayerByUid(uid) - OrderMod := p1.GetOrderMod() - for order_id := range OrderMod.OrderList { - if order_id > 10000 { - //continue - } - order[order_id]++ - } - p1 = nil - } - - type orderInfo struct { - orderId int - count int - } - var sorted []orderInfo - for k, v := range order { - sorted = append(sorted, orderInfo{k, v}) - } - sort.Slice(sorted, func(i, j int) bool { - return sorted[i].orderId < sorted[j].orderId - }) - keys := make([]int, 0, len(sorted)) - values := make([]int, 0, len(sorted)) - for _, item := range sorted { - keys = append(keys, item.orderId) - values = append(values, item.count) - } - fmt.Printf("%s\n", formatIntSlice(keys)) - fmt.Printf("%s\n", formatIntSlice(values)) - - sort.Slice(sorted, func(i, j int) bool { - return sorted[i].count > sorted[j].count - }) - for _, item := range sorted { - fmt.Printf("OrderId: %d, Count: %d\n", item.orderId, item.count) - } -} - -func TestAnalyzeCharge(t *testing.T) { - uids := []int{111354, 111355, 111358, 111364, 111359, 111357, 111363, 111369, 111371, 111379, 111384, 111383, 111366, 111373, 111377, 111389, 111393, 111395, 111401, 111397, 111396, 111403, 111404, 111399, 111409, 111406, 111415, 111410, 111421, 111419, 111413, 111422, 111423, 111425, 111405, 111429, 111356, 111411, 111431, 111424, 111426, 111441, 111428, 111454, 111455, 111436, 111420, 111453, 111460, 111452, 111459, 111458, 111456, 111464, 111465, 111382, 111468, 111472, 111376, 111480, 111362, 111490, 111497, 111498, 111500, 111434, 111496, 111474, 111482, 111504, 111506, 111514, 111515, 111470, 111512, 111523, 111520, 111478, 111533, 111538, 111534, 111491, 111522, 111537, 111446, 111477, 111544, 111526, 111528, 111546, 111543, 111548, 111535, 111432, 111553, 111467, 111542, 111560, 111457, 111549, 111536, 111516, 111531, 111487, 111557, 111529, 111568, 111540, 111539, 111416, 111561, 111555, 111558, 111581, 111475, 111564, 111524, 111484, 111583, 111587, 111585, 111584, 111525, 111552, 111592, 111595, 111603, 111599, 111604, 111591, 111608, 111607, 111598, 111610, 111615, 111614, 111596, 111562, 111572, 111381, 111625, 111621, 111632, 111550, 111630, 111628, 111602, 111567, 111445, 111633, 111623, 111647, 111653, 111649, 111593, 111646, 111645, 111651, 111643, 111611, 111636, 111519, 111661, 111662, 111667, 111670, 111387, 111664, 111650, 111672, 111378, 111660, 111666, 111675, 111663, 111686, 111685, 111575, 111688, 111659, 111691, 111637, 111695, 111676, 111386, 111699, 111701, 111709, 111444, 111702, 111718, 111704, 111679, 111710, 111706, 111617, 111708, 111722, 111721, 111412, 111728, 111720, 111727, 111733, 111563, 111503, 111738, 111729, 111556, 111744, 111732, 111750, 111748, 111745, 111541, 111740, 111747, 111731, 111755, 111761, 111724, 111756, 111760, 111766, 111696, 111717, 111774, 111780, 111776, 111786, 111787, 111785, 111782, 111795, 111798, 111775, 111790, 111800, 111796, 111788, 111792, 111398, 111803, 111802, 111804, 111799, 111811, 111815, 111716, 111759, 111816, 111824, 111814, 111817, 111829, 111807, 111840, 111839, 111835, 111837, 111821, 111810, 111846, 111758, 111834, 111852, 111850, 111820, 111855, 111849, 111848, 111831, 111866, 111844, 111851, 111868, 111826, 111684, 111874, 111880, 111869, 111883, 111884, 111847, 111888, 111887, 111890, 111892, 111857, 111713, 111842, 111854, 111894, 111903, 111877, 111908, 111858, 111794, 111906, 111904, 111767, 111871, 111891, 111910, 111918, 111899, 111914, 111917, 111907, 111875, 111920, 111863, 111913, 111926, 111703, 111825, 111677, 111928, 111753, 111931, 111365, 111762, 111872, 111768, 111878, 111570, 111938, 111935, 111946, 111624, 111944, 111942, 111940, 111833, 111620, 111763, 111957, 111805, 111511, 111948, 111966, 111882, 111967, 111965, 111970, 111867, 111723, 111969, 111941, 111730, 111973, 111978, 111983, 111987, 111989, 111980, 111991, 111569, 111589, 112003, 111990, 111606, 111984, 111998, 112006, 112007, 111461, 111999, 112010, 112012, 111901, 111781, 111812, 112016, 111736, 111771, 111705, 111509, 111488, 112024, 112030, 111961, 111579, 112036, 111616, 112040, 112043, 111997, 112048, 112035, 112052, 111972, 112057, 111669, 111777, 112056, 112032, 112063, 112062, 111793, 112061, 112050, 112066, 112038, 111518, 111673, 112068, 111655, 112071, 112074, 111986, 111943, 112017, 112011, 112083, 112078, 112087, 112020, 111391, 111836, 112082, 112091, 112053, 112090, 111947, 112096, 112099, 112100, 112085, 112101, 112102, 111739, 111671, 112107, 112109, 111433, 111754, 111439, 111838, 111499, 111665, 111476, 111885, 111502, 111627, 111530, 111959, 111414, 111933, 111668, 112079, 111613, 111749, 112027, 111609, 112054, 111678, 111813, 111994, 111513, 111547, 111622, 111692, 111897, 111784, 111492, 112047, 111951, 112039, 111652, 111687, 112033, 112077, 111801, 111437, 111566, 111648, 111735, 111955, 112110, 112055, 112008, 112023, 111719, 111949, 111510, 112037, 111809, 112075, 112058, 111689, 111789, 111545, 111870, 112070, 111797, 112106, 112015, 112073, 112013, 112081, 111443, 111772, 111712, 111698, 112031, 111988, 111956, 111924, 111830, 111993, 112080, 111950, 111930, 111977, 111642, 111626, 112021, 112111, 112069, 111845, 111485, 111783, 111856, 111981, 111605, 111764, 111697, 111881, 111450, 111822, 111408, 111463, 111921, 112041, 112046, 111861, 112009, 111818, 111481, 111905, 111368, 111495, 111360, 112072, 111392, 111823, 111939, 111974, 111927, 112025, 111418, 111979, 112105, 111656, 111508, 111494, 111629, 111934, 112028, 112000, 112086, 111982, 112094, 111929, 111447, 111427, 111964, 111819, 112089, 111769, 111385, 111911, 111937, 111394, 111586, 111471, 111407, 111674, 111963, 111654, 112049, 111442, 111952, 112029, 111690, 112065, 112076, 111912, 112095, 111741, 111638, 111876, 111527, 111751, 111936, 111808, 111590, 111919, 111832, 111400, 111594, 111958, 111451, 111580, 112005, 111853, 111639, 112014, 111743, 111631, 111734, 111574, 111841, 111843, 111681, 111714, 111737, 112060, 111634, 111693, 111757, 111388, 111577, 111640, 111902, 112098, 111435, 111828, 112019, 112022, 111770, 111707, 111862, 111469, 111576, 111466, 111742, 111380, 111954, 111968, 111752, 111909, 111765, 111953, 111778, 112042, 111962, 112001, 112034, 111960, 111619, 111554, 111893, 111865, 111600, 111746, 111985, 111971, 111505, 112051, 111945, 111483, 111916, 111995, 112004, 111859, 112044, 111486, 111367, 111925, 111779, 112112, 111601, 111489, 112088, 111370, 112097, 111860, 111635, 112002, 111864, 112084, 111559, 111507, 111390, 111976, 111922, 111900, 111932, 111402, 111438, 111827, 112067, 111618, 111501, 112064, 111711, 111898, 111573, 112093, 111532, 112104, 111725, 111644, 111473, 111597, 111430, 111896, 111375, 111715, 111879, 111657, 111895, 111700, 112059, 111517, 111582, 111658, 111612, 111479, 111996, 111683, 111448, 112092, 111682, 111923, 111641, 111565, 111361, 111551, 111440, 111417, 111493, 112018, 111886, 111694, 112045, 112108, 111680, 111449, 112103, 111588, 111521, 111571, 111773, 111372, 111975, 111578, 111462, 111791, 111915, 111374, 111889, 112026, 111873, 111726, 111806, 111992} - var charge float64 - var chargeCount int - for _, uid := range uids { - p1 := new(game.Player) - p1.InitPlayerByUid(uid) - ChargeMod := p1.GetChargeMod() - if ChargeMod.Charge > 0 { - charge += ChargeMod.Charge - chargeCount++ - } - p1 = nil - } - fmt.Printf("Total Charge: %.2f, Charge Count: %d\n", charge, chargeCount) -} - -func formatIntSlice(slice []int) string { - result := "[" - for i, num := range slice { - result += fmt.Sprintf("%d", num) - if i < len(slice)-1 { - result += "," - } - } - result += "]" - return result -} - -func TestMsgFormat(t *testing.T) { - m := &MsgMod.Msg{ - From: 10002, - To: 10003, - Type: 1, - SendT: 179865132, - End: 179832654, - Id: 0, - UniKey: "dsfjioefnefe", - H: 1, - HandleType: 20001, - Item: []*item.Item{ - {Id: 1, Num: 10}, - {Id: 2, Num: 20}, - {Id: 3, Num: 30}, - }, - } - fmt.Printf("Msg: %v\n", m) -} - -func TestRandFace(t *testing.T) { - face := faceCfg.GetRandInitId() - avatar := avatarCfg.GetRandInitId() - fmt.Printf("Random Face ID: %d, Random Avatar ID: %d\n", face, avatar) -} - -func TestChampionShipCreateRobot(t *testing.T) { - robot := game.CreateRobot(1.0, 1) - fmt.Printf("Created Robot: %v\n", robot) -} - -func TestRedisZset(t *testing.T) { - db.RedisZAdd("rank_user", "100001", 100) -} - -func TestGeoIp(t *testing.T) { - ip := "117.30.95.111:5557" - ip = GoUtil.GetIPFromAddr(ip) - code, _ := GoUtil.GetCountryByIP(ip) - fmt.Printf("IP: %s, Country Code: %s\n", ip, code) -} - -func TestRandAn(t *testing.T) { - rI := []int{1, 2, 3, 4, 5, 6, 7} - for i := 0; i < 10; i++ { - randNum := GoUtil.RandSliceNumNonAdjacent(rI, 3) - fmt.Printf("Random Number: %v\n", randNum) - } -} diff --git a/src/server/test/friendTreasure_test.go b/src/server/test/friendTreasure_test.go deleted file mode 100644 index 0ea6a007..00000000 --- a/src/server/test/friendTreasure_test.go +++ /dev/null @@ -1,37 +0,0 @@ -package test - -import ( - "server/game" - friendTreasure "server/game/mod/friend_treasure.go" - GoUtil "server/game_util" - "testing" -) - -func TestFriendTreasure(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - FriendTreasureMod := player.GetFriendTreasureMod() - FriendTreasureMod.Status = friendTreasure.GAME_STATUS_START - FriendTreasureMod.Shift = 1 - FriendTreasureMod.Star = 100 - Items, FriendItemNum, err := FriendTreasureMod.EndGame(111) - if err != nil { - t.Errorf("EndGame error: %v", err) - } - if len(Items) != 1 { - t.Errorf("EndGame error: expected 1 item, got %d", len(Items)) - } - if Items[0].Num != 220 { - t.Errorf("EndGame error: expected item num 220, got %d", Items[0].Num) - } - if FriendItemNum != 22 { - t.Errorf("EndGame error: expected friend item num 22, got %d", FriendItemNum) - } -} - -func TestFriendTreasureLimit(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - m := GoUtil.FormatStarItemNum(200, player.GetOrderFactor()) - t.Logf("m:%d", m) -} diff --git a/src/server/test/friend_test.go b/src/server/test/friend_test.go deleted file mode 100644 index de6f65b4..00000000 --- a/src/server/test/friend_test.go +++ /dev/null @@ -1,65 +0,0 @@ -package test - -import ( - "fmt" - friendTreasureCfg "server/conf/friend_treasure" - "server/game" - GoUtil "server/game_util" - "server/msg" - "testing" - - "google.golang.org/protobuf/proto" -) - -func TestFriendInit(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - FriendMod := p1.GetFriendMod() - if FriendMod == nil { - t.Error("FriendMod init failed") - } -} - -func TestFriendApply(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - FriendMod := p1.GetFriendMod() - FriendMod.AddFriendApply(100002, 0, 1698000000) - if !FriendMod.CheckApply(100002) { - t.Error("FriendMod AddFriendApply failed") - } -} - -func TestFriendRecommendList(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - l1 := game.GetRecommendPlayer(p1, 3) - fmt.Printf("Recommend List: %v\n", l1) -} - -func TestReqApplyFriend(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - req := &msg.ReqApplyFriend{ - Uid: 100002, - Type: 0, - } - buf, _ := proto.Marshal(req) - game.ReqApplyFriend(p1, buf) - p1.FriendListBackData() -} - -func TestFriendBackData(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayerByUid(100001) - p1.M_DwUin = 100100129 - p1.FriendLogBackData() - p1.FriendCardBackData() -} - -func TestFriendTreasureInit(t *testing.T) { - probMap := friendTreasureCfg.GetChestProb() - prob := GoUtil.RandMap(probMap) - items := friendTreasureCfg.GetChestItems(prob) - fmt.Printf("Prob: %v, Items: %v\n", prob, items) -} diff --git a/src/server/test/fur_test.go b/src/server/test/fur_test.go deleted file mode 100644 index 2d595828..00000000 --- a/src/server/test/fur_test.go +++ /dev/null @@ -1,92 +0,0 @@ -package test - -import ( - "fmt" - fur_cfg "server/conf/fur" - "server/game" - "server/msg" - "testing" - - "google.golang.org/protobuf/proto" -) - -func TestGetFurShopCost(t *testing.T) { - cost := fur_cfg.GetFurShopCost(1) - fmt.Printf("cost: %v", cost) -} - -func TestGetFurShopFreeTimes(t *testing.T) { - freeTimes := fur_cfg.GetFurShopFreeTimes() - fmt.Printf("freeTimes: %d", freeTimes) -} - -func TestGetFurShopTag(t *testing.T) { - tag := fur_cfg.GetFurShopTag(1) - fmt.Printf("tag: %d", tag) -} - -func TestReqPetFur(t *testing.T) { - player := new(game.Player) - err := game.ReqPetFur(player, nil) - if err != nil { - t.Errorf("ReqPetFur error: %v", err) - } -} - -func TestReqPetFurBuy(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - m := msg.ReqPetFurBuy{ - FurId: 1, - } - buf, err := proto.Marshal(&m) - if err != nil { - t.Errorf("marshal error: %v", err) - } - err = game.ReqPetFurBuy(player, buf) - if err != nil { - t.Errorf("ReqPetFurBuy error: %v", err) - } - - m = msg.ReqPetFurBuy{ - FurId: 2, - } - buf, err = proto.Marshal(&m) - if err != nil { - t.Errorf("marshal error: %v", err) - } - err = game.ReqPetFurBuy(player, buf) - if err != nil { - t.Errorf("ReqPetFurBuy error: %v", err) - } -} - -func TestReqFurSet(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - m := msg.ReqFurSet{ - FurId: 1, - } - buf, err := proto.Marshal(&m) - if err != nil { - t.Errorf("marshal error: %v", err) - } - FurMod := player.GetFurMod() - FurMod.AddFurInfo(1, 0, 0) - err = game.ReqFurSet(player, buf) - if err != nil { - t.Errorf("ReqFurSet error: %v", err) - } - - m = msg.ReqFurSet{ - FurId: 0, - } - buf, err = proto.Marshal(&m) - if err != nil { - t.Errorf("marshal error: %v", err) - } - err = game.ReqFurSet(player, buf) - if err != nil { - t.Errorf("ReqFurSet error: %v", err) - } -} diff --git a/src/server/test/invite_test.go b/src/server/test/invite_test.go deleted file mode 100644 index c568bcab..00000000 --- a/src/server/test/invite_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package test - -import ( - "fmt" - "server/game" - "server/msg" - "testing" - - "google.golang.org/protobuf/proto" -) - -func TestInviteBack(t *testing.T) { - player := new(game.Player) - player.InitPlayer("3625212") - InviteMod := player.GetInviteMod() - InviteMod.BackData() -} - -func TestInviteReward(t *testing.T) { - player := new(game.Player) - player.InitPlayer("3625212") - InviteMod := player.GetInviteMod() - InviteMod.GetIndex = 0 - InviteMod.InviteList = map[int]struct{}{1: {}, 2: {}, 3: {}} - req := &msg.ReqGetInviteReward{ - GetIndex: 2, - } - buf, _ := proto.Marshal(req) - game.ReqGetInviteReward(player, buf) -} - -func TestFix(t *testing.T) { - for i := 0; i < 10; i++ { - fmt.Println(i) - } -} diff --git a/src/server/test/limit_test.go b/src/server/test/limit_test.go deleted file mode 100644 index 96116336..00000000 --- a/src/server/test/limit_test.go +++ /dev/null @@ -1,63 +0,0 @@ -package test - -import ( - "fmt" - limitedTimeEventCfg "server/conf/limited_time_event" - "server/game" - "server/game/mod/item" - limitedTimeEvent "server/game/mod/limited_time_event" - "testing" -) - -func TestFast(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - LimitEventMod := p.GetLimitEventMod() - LimitEventMod.AddEvent(limitedTimeEvent.EVENT_TYPE_FAST_PRODUCE, 60) - items, err := LimitEventMod.GetFastProduceReward(50) - if err != nil { - t.Errorf("GetFastProduceReward error: %v", err) - return - } - t.Logf("Fast produce items: %v", items) -} - -func TestSenceDash(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - LimitEventMod := p.GetLimitEventMod() - LimitEventMod.AddEvent(limitedTimeEvent.EVENT_TYPE_SENCE_DASH, 60) - LimitEventMod.AddSenceDashTimes() // 模拟一次场景冲刺 - Id, items, err := LimitEventMod.GetSceneDashReward() - if err != nil { - t.Errorf("GetSceneDashReward error: %v", err) - return - } - t.Logf("Scene dash reward: Id=%d, items=%v", Id, items) -} - -func TestProgressReward(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - LimitEventMod := p.GetLimitEventMod() - BaseMod := p.GetBaseMod() - for i := 0; i < 100; i++ { - res := LimitEventMod.DebugProgressRewardList(38, BaseMod.Energy) // 输出当前进度奖励列表 - fmt.Printf("Current progress reward list: %v\n", res) - } -} - -func TestCatTrick(t *testing.T) { - p := new(game.Player) - p.InitPlayer("3625212") - items := []*item.Item{ - {Id: 101191, Num: 1}, - } - err := p.HandleItem(items, "") - if err != nil { - t.Fatal(err) - } - energy := limitedTimeEventCfg.GetCatTrickEnergy() - diamond := limitedTimeEventCfg.GetCatTrickDiamond() - t.Log(energy, diamond) -} diff --git a/src/server/test/log/20260305.log b/src/server/test/log/20260305.log deleted file mode 100644 index 85f75562..00000000 --- a/src/server/test/log/20260305.log +++ /dev/null @@ -1,2 +0,0 @@ -2026/03/05 00:00:00 [debug ] CreateDailyLogFile -2026/03/05 00:00:00 [debug ] Server ZeroFlush diff --git a/src/server/test/mining_test.go b/src/server/test/mining_test.go deleted file mode 100644 index 858a6fe1..00000000 --- a/src/server/test/mining_test.go +++ /dev/null @@ -1,26 +0,0 @@ -package test - -import ( - miningCfg "server/conf/mining" - "server/game" - "testing" -) - -func TestGetPassReward(t *testing.T) { - player := new(game.Player) - player.InitPlayerByUid(100001) - MiningMod := player.GetMiningMod() - DecorateMod := player.GetDecorateMod() - needStar := DecorateMod.GetNextNeedStar() - Items := miningCfg.GetPassItem(3, needStar) - if len(Items) == 0 { - t.Errorf("GetPassReward failed, pass: %d, needStar: %d", MiningMod.Pass, needStar) - } - player.MiningBackData() -} - -func TestInitActivityItem(t *testing.T) { - player := new(game.Player) - player.GetBaseMod().Level = 15 - player.Login() -} diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go deleted file mode 100644 index 2d75daea..00000000 --- a/src/server/test/order_test.go +++ /dev/null @@ -1,109 +0,0 @@ -package test - -import ( - "fmt" - orderCfg "server/conf/order" - "server/game" - "server/game/mod/order" - "testing" -) - -func TestOrderStart(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("test") - game.G_GameLogicPtr.SetPlayer(p1) - ChessMod := p1.GetChessMod() - DecorateMod := p1.GetDecorateMod() - merge_id := []int{64, 249} - order_facotry := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) - star := order.GetOrderStar(merge_id, ChessMod.GetStarEmitList()) - star = int(float64(star)*float64(order_facotry)/1000+0.5) * 10 - fmt.Printf("star is %d", star) -} - -func TestOrderFinish(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3659896") - game.G_GameLogicPtr.SetPlayer(p1) - ChessMod := p1.GetChessMod() - err := ChessMod.FinishOrder([]int{1, 2, 3}) - if err != nil { - t.Errorf("finish order failed:%v", err) - } -} - -func TestInitOrderItem(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - OrderMod := p1.GetOrderMod() - OrderMod.OrderList = make(map[int]order.Order) - OrderMod.OrderList[1] = order.Order{ - MergeId: []int{15, 15}, - } - p1.InitOrderItem() - fmt.Printf("order item:%v", OrderMod.OrderList[1].Items) -} - -func TestHighOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - OrderMod := p1.GetOrderMod() - OrderMod.OrderList = make(map[int]order.Order) - OrderMod.OrderList[1] = order.Order{ - MergeId: []int{1346}, - } - p1.AddHighOrder() - p1.AddHighOrder2() - p1.InitOrderItem() - fmt.Printf("order item:%v", OrderMod.OrderList[1].Items) -} - -func TestAddPetOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - ChessMod := p1.GetChessMod() - emitList := ChessMod.GetOrderPartEmit() - fmt.Printf("emit list:%v", emitList) -} - -func TestAddNormalOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - p1.CreateNormalOrder() -} - -func TestAddPartOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("bbb004") - OrderMod := p1.GetOrderMod() - for i := 0; i < 10; i++ { - for k, v := range OrderMod.OrderList { - if v.Type == order.Part_type { - delete(OrderMod.OrderList, k) - } - } - p1.AddOrder() - } -} - -func TestCreatePetOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - OrderMod := p1.GetOrderMod() - BaseMod := p1.GetBaseMod() - ChessMod := p1.GetChessMod() - for i := 0; i < 10; i++ { - OrderMod.CreatePetOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul(), order.Pet_type) - } -} - -func TestCreateSuperOrder(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - OrderMod := p1.GetOrderMod() - BaseMod := p1.GetBaseMod() - ChessMod := p1.GetChessMod() - for i := 0; i < 10; i++ { - OrderMod.CreateSuperOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul()) - } -} diff --git a/src/server/test/playroom_test.go b/src/server/test/playroom_test.go deleted file mode 100644 index 56409d9b..00000000 --- a/src/server/test/playroom_test.go +++ /dev/null @@ -1,16 +0,0 @@ -package test - -import ( - "fmt" - "server/game" - "testing" -) - -func TestPlayroomFlipGame(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayerByUid(100001) - DecorateMod := p1.GetDecorateMod() - needStar := DecorateMod.GetAreaCost() - highReward := int(float64(needStar) * 0.75) - fmt.Printf("needStar: %d, highReward: %d\n", needStar, highReward) -} diff --git a/src/server/test/seven_test.go b/src/server/test/seven_test.go deleted file mode 100644 index a9d7d34f..00000000 --- a/src/server/test/seven_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package test - -import ( - "fmt" - sevenLoginCfg "server/conf/seven_login" - "server/game" - GoUtil "server/game_util" - "testing" -) - -func TestGetSevenLoginMonthReward(t *testing.T) { - month := GoUtil.NowMonth() - res := sevenLoginCfg.GetSevenLoginMonthReward(month) - t.Logf("res:%v", res) -} - -func TestSevenLoginZeroUpdate(t *testing.T) { - p1 := new(game.Player) - p1.InitPlayer("3625212") - p1.GetBaseMod().SetLevel(15) - SevenLoginMod := p1.GetSevenLoginMod() - for i := 0; i < 100; i++ { - SevenLoginMod.WeekResetTime = 0 - SevenLoginMod.MonthResetTime = 0 - SevenLoginMod.ZeroUpdate(0, 0, p1.GetOrderFactor(), p1.GetBaseMod().GetLevel()) - SevenLoginMod.BackData() - fmt.Printf("id :%d ; Reward:%v\n", 7, SevenLoginMod.LoginReward[7]) - } - -} diff --git a/src/server/thinkingdata/consumer_batch.go b/src/server/thinkingdata/consumer_batch.go deleted file mode 100644 index 8d559121..00000000 --- a/src/server/thinkingdata/consumer_batch.go +++ /dev/null @@ -1,352 +0,0 @@ -package thinkingdata - -import ( - "bytes" - "compress/gzip" - "encoding/json" - "errors" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "strconv" - "strings" - "sync" - "time" -) - -// TDBatchConsumer upload data to TE by http -type TDBatchConsumer struct { - serverUrl string // serverUrl - appId string // appId - timeout time.Duration // http timeout (mill second) - compress bool // is need compress - bufferMutex *sync.RWMutex - cacheMutex *sync.RWMutex // cache mutex - - buffer []Data - batchSize int // flush event count each time - cacheBuffer [][]Data // buffer - cacheCapacity int // buffer max count -} - -type TDBatchConfig struct { - ServerUrl string // serverUrl - AppId string // appId - BatchSize int // flush event count each time - Timeout int // http timeout (mill second) - Compress bool // enable compress data - AutoFlush bool // enable auto flush - Interval int // auto flush spacing (second) - CacheCapacity int // cache event count -} - -const ( - DefaultTimeOut = 30000 - DefaultBatchSize = 20 - MaxBatchSize = 200 - DefaultInterval = 30 - DefaultCacheCapacity = 50 -) - -// NewBatchConsumer create TDBatchConsumer -func NewBatchConsumer(serverUrl string, appId string) (TDConsumer, error) { - config := TDBatchConfig{ - ServerUrl: serverUrl, - AppId: appId, - Compress: true, - } - return initBatchConsumer(config) -} - -// NewBatchConsumerWithBatchSize create TDBatchConsumer -// serverUrl -// appId -// batchSize: flush event count each time -func NewBatchConsumerWithBatchSize(serverUrl string, appId string, batchSize int) (TDConsumer, error) { - config := TDBatchConfig{ - ServerUrl: serverUrl, - AppId: appId, - Compress: true, - BatchSize: batchSize, - } - return initBatchConsumer(config) -} - -// NewBatchConsumerWithCompress create TDBatchConsumer -// serverUrl -// appId -// compress: enable data compress -func NewBatchConsumerWithCompress(serverUrl string, appId string, compress bool) (TDConsumer, error) { - config := TDBatchConfig{ - ServerUrl: serverUrl, - AppId: appId, - Compress: compress, - } - return initBatchConsumer(config) -} - -func NewBatchConsumerWithConfig(config TDBatchConfig) (TDConsumer, error) { - return initBatchConsumer(config) -} - -func initBatchConsumer(config TDBatchConfig) (TDConsumer, error) { - if config.ServerUrl == "" { - msg := fmt.Sprint("ServerUrl not be empty") - tdLogInfo(msg) - return nil, errors.New(msg) - } - u, err := url.Parse(config.ServerUrl) - if err != nil { - return nil, err - } - u.Path = "/sync_server" - - var batchSize int - if config.BatchSize > MaxBatchSize { - batchSize = MaxBatchSize - } else if config.BatchSize <= 0 { - batchSize = DefaultBatchSize - } else { - batchSize = config.BatchSize - } - - var cacheCapacity int - if config.CacheCapacity <= 0 { - cacheCapacity = DefaultCacheCapacity - } else { - cacheCapacity = config.CacheCapacity - } - - var timeout int - if config.Timeout == 0 { - timeout = DefaultTimeOut - } else { - timeout = config.Timeout - } - - c := &TDBatchConsumer{ - serverUrl: u.String(), - appId: config.AppId, - timeout: time.Duration(timeout) * time.Millisecond, - compress: config.Compress, - bufferMutex: new(sync.RWMutex), - cacheMutex: new(sync.RWMutex), - batchSize: batchSize, - buffer: make([]Data, 0, batchSize), - cacheCapacity: cacheCapacity, - cacheBuffer: make([][]Data, 0, cacheCapacity), - } - - var interval int - if config.Interval == 0 { - interval = DefaultInterval - } else { - interval = config.Interval - } - if config.AutoFlush { - go func() { - ticker := time.NewTicker(time.Duration(interval) * time.Second) - defer ticker.Stop() - for { - <-ticker.C - _ = c.timerFlush() - } - }() - } - - tdLogInfo("Mode: batch consumer, appId: %s, serverUrl: %s", c.appId, c.serverUrl) - - return c, nil -} - -func (c *TDBatchConsumer) Add(d Data) error { - c.bufferMutex.Lock() - c.buffer = append(c.buffer, d) - c.bufferMutex.Unlock() - - tdLogInfo("Enqueue event data: %v", d) - - if c.getBufferLength() >= c.batchSize || c.getCacheLength() > 0 { - err := c.Flush() - return err - } - - return nil -} - -func (c *TDBatchConsumer) timerFlush() error { - tdLogInfo("timer flush data") - return c.innerFlush() -} - -func (c *TDBatchConsumer) Flush() error { - tdLogInfo("flush data") - return c.innerFlush() -} - -func (c *TDBatchConsumer) innerFlush() error { - - c.cacheMutex.Lock() - defer c.cacheMutex.Unlock() - - c.bufferMutex.Lock() - defer c.bufferMutex.Unlock() - - if len(c.buffer) == 0 && len(c.cacheBuffer) == 0 { - return nil - } - - defer func() { - if len(c.cacheBuffer) > c.cacheCapacity { - c.cacheBuffer = c.cacheBuffer[1:] - } - }() - - if len(c.cacheBuffer) == 0 || len(c.buffer) >= c.batchSize { - c.cacheBuffer = append(c.cacheBuffer, c.buffer) - c.buffer = make([]Data, 0, c.batchSize) - } - - err := c.uploadEvents() - - return err -} - -func (c *TDBatchConsumer) uploadEvents() error { - buffer := c.cacheBuffer[0] - - jsonBytes, err := json.Marshal(buffer) - if err == nil { - params := parseTime(jsonBytes) - for i := 0; i < 3; i++ { - statusCode, code, err := c.send(params, len(buffer)) - if statusCode == 200 { - c.cacheBuffer = c.cacheBuffer[1:] - switch code { - case 0: - tdLogInfo("send success： %v", params) - return nil - case 1, -1: - msg := "invalid data format" - tdLogError(msg) - return fmt.Errorf(msg) - case -2: - msg := "APP ID doesn't exist" - tdLogError(msg) - return fmt.Errorf(msg) - case -3: - msg := "invalid ip transmission" - tdLogError(msg) - return fmt.Errorf(msg) - default: - msg := "unknown error" - tdLogError(msg) - return fmt.Errorf(msg) - } - } - if err != nil { - if i == 2 { - return err - } - } - } - } - return err -} - -func (c *TDBatchConsumer) FlushAll() error { - for c.getCacheLength() > 0 || c.getBufferLength() > 0 { - if err := c.Flush(); err != nil { - if !strings.Contains(err.Error(), "ThinkingDataError") { - return err - } - } - } - return nil -} - -func (c *TDBatchConsumer) Close() error { - tdLogInfo("batch consumer close") - return c.FlushAll() -} - -func (c *TDBatchConsumer) IsStringent() bool { - return false -} - -func (c *TDBatchConsumer) send(data string, size int) (statusCode int, code int, err error) { - var encodedData string - var compressType = "gzip" - if c.compress { - encodedData, err = encodeData(data) - } else { - encodedData = data - compressType = "none" - } - if err != nil { - return 0, 0, err - } - postData := bytes.NewBufferString(encodedData) - - var resp *http.Response - req, _ := http.NewRequest("POST", c.serverUrl, postData) - req.Header["appid"] = []string{c.appId} - req.Header.Set("user-agent", "ta-go-sdk") - req.Header.Set("version", SdkVersion) - req.Header.Set("compress", compressType) - req.Header["TA-Integration-Type"] = []string{LibName} - req.Header["TA-Integration-Version"] = []string{SdkVersion} - req.Header["TA-Integration-Count"] = []string{strconv.Itoa(size)} - client := &http.Client{Timeout: c.timeout} - resp, err = client.Do(req) - - if err != nil { - return 0, 0, err - } - - defer resp.Body.Close() - - if resp.StatusCode == http.StatusOK { - body, _ := ioutil.ReadAll(resp.Body) - var result struct { - Code int - } - - err = json.Unmarshal(body, &result) - if err != nil { - return resp.StatusCode, 1, err - } - - return resp.StatusCode, result.Code, nil - } else { - return resp.StatusCode, -1, nil - } -} - -// Gzip -func encodeData(data string) (string, error) { - var buf bytes.Buffer - gw := gzip.NewWriter(&buf) - - _, err := gw.Write([]byte(data)) - if err != nil { - gw.Close() - return "", err - } - gw.Close() - - return string(buf.Bytes()), nil -} - -func (c *TDBatchConsumer) getBufferLength() int { - c.bufferMutex.RLock() - defer c.bufferMutex.RUnlock() - return len(c.buffer) -} - -func (c *TDBatchConsumer) getCacheLength() int { - c.cacheMutex.RLock() - defer c.cacheMutex.RUnlock() - return len(c.cacheBuffer) -} diff --git a/src/server/thinkingdata/consumer_debug.go b/src/server/thinkingdata/consumer_debug.go deleted file mode 100644 index 2e7726de..00000000 --- a/src/server/thinkingdata/consumer_debug.go +++ /dev/null @@ -1,120 +0,0 @@ -package thinkingdata - -import ( - "encoding/json" - "errors" - "fmt" - "io/ioutil" - "net/http" - "net/url" -) - -// TDDebugConsumer The data is reported one by one, and when an error occurs, the log will be printed on the console. -type TDDebugConsumer struct { - serverUrl string // serverUrl - appId string // appId - writeData bool // is archive to TE - deviceId string // be used to debug in TE -} - -// NewDebugConsumer init TDDebugConsumer -func NewDebugConsumer(serverUrl string, appId string) (TDConsumer, error) { - return NewDebugConsumerWithWriter(serverUrl, appId, true) -} - -func NewDebugConsumerWithWriter(serverUrl string, appId string, writeData bool) (TDConsumer, error) { - return NewDebugConsumerWithDeviceId(serverUrl, appId, writeData, "") -} - -func NewDebugConsumerWithDeviceId(serverUrl string, appId string, writeData bool, deviceId string) (TDConsumer, error) { - // enable console log - SetLogLevel(TDLogLevelDebug) - - if len(serverUrl) <= 0 { - msg := fmt.Sprint("ServerUrl not be empty") - tdLogError(msg) - return nil, errors.New(msg) - } - - u, err := url.Parse(serverUrl) - if err != nil { - return nil, err - } - - u.Path = "/data_debug" - - c := &TDDebugConsumer{serverUrl: u.String(), appId: appId, writeData: writeData, deviceId: deviceId} - - tdLogInfo("Mode: debug consumer, appId: %s, serverUrl: %s", c.appId, c.serverUrl) - - return c, nil -} - -func (c *TDDebugConsumer) Add(d Data) error { - jsonBytes, err := json.Marshal(d) - if err != nil { - return err - } - - var jsonStr string - // if properties has includes complex data, SDK need parse time with regular expression - if d.IsComplex { - jsonStr = parseTime(jsonBytes) - } else { - jsonStr = string(jsonBytes) - } - - tdLogInfo("%v", jsonStr) - - return c.send(jsonStr) -} - -func (c *TDDebugConsumer) Flush() error { - tdLogInfo("flush data") - return nil -} - -func (c *TDDebugConsumer) Close() error { - tdLogInfo("debug consumer close") - return nil -} - -func (c *TDDebugConsumer) IsStringent() bool { - return true -} - -func (c *TDDebugConsumer) send(data string) error { - var dryRun = "0" - if !c.writeData { - dryRun = "1" - } - postData := url.Values{"data": {data}, "appid": {c.appId}, "source": {"server"}, "dryRun": {dryRun}} - if len(c.deviceId) > 0 { - postData.Add("deviceId", c.deviceId) - } - resp, err := http.PostForm(c.serverUrl, postData) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode == http.StatusOK { - body, _ := ioutil.ReadAll(resp.Body) - result := map[string]interface{}{} - err = json.Unmarshal(body, &result) - if err != nil { - return err - } - if uint64(result["errorLevel"].(float64)) != 0 { - msg := fmt.Sprintf("send to receiver failed with return content: %s", string(body)) - tdLogError(msg) - return errors.New(msg) - } else { - tdLogInfo("send success: %v", result) - } - } else { - return errors.New(fmt.Sprintf("Unexpected Status Code: %d", resp.StatusCode)) - } - return nil -} diff --git a/src/server/thinkingdata/consumer_log.go b/src/server/thinkingdata/consumer_log.go deleted file mode 100644 index e39f45b3..00000000 --- a/src/server/thinkingdata/consumer_log.go +++ /dev/null @@ -1,256 +0,0 @@ -package thinkingdata - -import ( - "encoding/json" - "errors" - "fmt" - "os" - "sync" - "time" -) - -type RotateMode int32 - -const ( - DefaultChannelSize = 1000 // channel size - ROTATE_DAILY RotateMode = 0 // by the day - ROTATE_HOURLY RotateMode = 1 // by the hour -) - -// TDLogConsumer write data to file, it works with LogBus -type TDLogConsumer struct { - directory string // directory of log file - dateFormat string // name format of log file - fileSize int64 // max size of single log file (MByte) - fileNamePrefix string // prefix of log file - currentFile *os.File // current file handler - wg sync.WaitGroup - ch chan []byte - mutex *sync.RWMutex - sdkClose bool -} - -type TDLogConsumerConfig struct { - Directory string // directory of log file - RotateMode RotateMode // rotate mode of log file - FileSize int // max size of single log file (MByte) - FileNamePrefix string // prefix of log file - ChannelSize int -} - -func NewLogConsumer(directory string, r RotateMode) (TDConsumer, error) { - return NewLogConsumerWithFileSize(directory, r, 0) -} - -// NewLogConsumerWithFileSize init TDLogConsumer -// directory: directory of log file -// r: rotate mode of log file. (in days / hours) -// size: max size of single log file (MByte) -func NewLogConsumerWithFileSize(directory string, r RotateMode, size int) (TDConsumer, error) { - config := TDLogConsumerConfig{ - Directory: directory, - RotateMode: r, - FileSize: size, - } - return NewLogConsumerWithConfig(config) -} - -func NewLogConsumerWithConfig(config TDLogConsumerConfig) (TDConsumer, error) { - var df string - switch config.RotateMode { - case ROTATE_DAILY: - df = "2006-01-02" - case ROTATE_HOURLY: - df = "2006-01-02-15" - default: - errStr := "unknown rotate mode" - tdLogInfo(errStr) - return nil, errors.New(errStr) - } - - chanSize := DefaultChannelSize - if config.ChannelSize > 0 { - chanSize = config.ChannelSize - } - - c := &TDLogConsumer{ - directory: config.Directory, - dateFormat: df, - fileSize: int64(config.FileSize * 1024 * 1024), - fileNamePrefix: config.FileNamePrefix, - wg: sync.WaitGroup{}, - ch: make(chan []byte, chanSize), - mutex: new(sync.RWMutex), - sdkClose: false, - } - - return c, c.init() -} - -func (c *TDLogConsumer) Add(d Data) error { - var err error = nil - c.mutex.Lock() - defer func() { - c.mutex.Unlock() - }() - if c.sdkClose { - err = errors.New("add event failed, SDK has been closed") - tdLogError(err.Error()) - } else { - jsonBytes, jsonErr := json.Marshal(d) - if jsonErr != nil { - err = jsonErr - } else { - c.ch <- jsonBytes - } - } - return err -} - -func (c *TDLogConsumer) Flush() error { - tdLogInfo("flush data") - var err error = nil - c.mutex.Lock() - if c.currentFile != nil { - err = c.currentFile.Sync() - } - c.mutex.Unlock() - return err -} - -func (c *TDLogConsumer) Close() error { - tdLogInfo("log consumer close") - - var err error = nil - c.mutex.Lock() - if c.sdkClose { - err = errors.New("[ThinkingData][error]: SDK has been closed") - } else { - close(c.ch) - c.wg.Wait() - if c.currentFile != nil { - _ = c.currentFile.Sync() - err = c.currentFile.Close() - c.currentFile = nil - } - } - c.sdkClose = true - c.mutex.Unlock() - return err -} - -func (c *TDLogConsumer) IsStringent() bool { - return false -} - -func (c *TDLogConsumer) constructFileName(timeStr string, i int) string { - fileNamePrefix := "" - if len(c.fileNamePrefix) != 0 { - fileNamePrefix = c.fileNamePrefix + "." - } - // is need paging - if c.fileSize > 0 { - return fmt.Sprintf("%s/%slog.%s_%d", c.directory, fileNamePrefix, timeStr, i) - } else { - return fmt.Sprintf("%s/%slog.%s", c.directory, fileNamePrefix, timeStr) - } -} - -func (c *TDLogConsumer) init() error { - fd, err := c.initLogFile() - if err != nil { - tdLogError("init log file failed: %s", err) - return err - } - c.currentFile = fd - - c.wg.Add(1) - - go func() { - defer func() { - c.wg.Done() - }() - for { - select { - case rec, ok := <-c.ch: - if !ok { - return - } - jsonStr := parseTime(rec) - tdLogInfo("write event data: %s", jsonStr) - c.writeToFile(jsonStr) - } - } - }() - - tdLogInfo("Mode: log consumer, log path: " + c.directory) - - return nil -} - -func (c *TDLogConsumer) initLogFile() (*os.File, error) { - _, err := os.Stat(c.directory) - if err != nil && os.IsNotExist(err) { - e := os.MkdirAll(c.directory, os.ModePerm) - if e != nil { - return nil, e - } - } - timeStr := time.Now().Format(c.dateFormat) - return os.OpenFile(c.constructFileName(timeStr, 0), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0664) -} - -var logFileIndex = 0 - -func (c *TDLogConsumer) writeToFile(str string) { - timeStr := time.Now().Format(c.dateFormat) - // paging by Rotate Mode and current file size - var newName string - fName := c.constructFileName(timeStr, logFileIndex) - - if c.currentFile == nil { - var openFileErr error - c.currentFile, openFileErr = os.OpenFile(fName, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0664) - if openFileErr != nil { - tdLogInfo("open log file failed: %s\n", openFileErr) - return - } - } - - if c.currentFile.Name() != fName { - newName = fName - } else if c.fileSize > 0 { - stat, _ := c.currentFile.Stat() - if stat.Size() > c.fileSize { - logFileIndex++ - newName = c.constructFileName(timeStr, logFileIndex) - } - } - if newName != "" { - err := c.currentFile.Close() - if err != nil { - tdLogInfo("close file failed: %s\n", err) - return - } - c.currentFile, err = os.OpenFile(fName, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0664) - if err != nil { - tdLogInfo("rotate log file failed: %s\n", err) - return - } - } - _, err := fmt.Fprintln(c.currentFile, str) - if err != nil { - tdLogInfo("LoggerWriter(%q): %s\n", c.currentFile.Name(), err) - return - } -} - -// Deprecated: please use TDLogConsumer -type LogConsumer struct { - TDLogConsumer -} - -// Deprecated: please use TDLogConsumerConfig -type LogConfig struct { - TDLogConsumerConfig -} diff --git a/src/server/thinkingdata/td_log.go b/src/server/thinkingdata/td_log.go deleted file mode 100644 index a35ec036..00000000 --- a/src/server/thinkingdata/td_log.go +++ /dev/null @@ -1,125 +0,0 @@ -package thinkingdata - -import ( - "fmt" - "time" -) - -// SDK_LOG_PREFIX const -const SDK_LOG_PREFIX = "[ThinkingData]" - -var logInstance TDLogger - -type TDLogLevel int32 - -const ( - TDLogLevelOff TDLogLevel = 1 - TDLogLevelError TDLogLevel = 2 - TDLogLevelWarning TDLogLevel = 3 - TDLogLevelInfo TDLogLevel = 4 - TDLogLevelDebug TDLogLevel = 5 -) - -// default is TDLogLevelOff -var currentLogLevel = TDLogLevelOff - -// TDLogger User-defined log classes must comply with interface -type TDLogger interface { - Print(message string) -} - -// SetLogLevel Set the log output level -func SetLogLevel(level TDLogLevel) { - if level < TDLogLevelOff || level > TDLogLevelDebug { - fmt.Println(SDK_LOG_PREFIX + "log type error") - return - } else { - currentLogLevel = level - } -} - -// SetCustomLogger Set a custom log input class, usually you don't need to set it up. -func SetCustomLogger(logger TDLogger) { - if logger != nil { - logInstance = logger - } -} - -func tdLog(level TDLogLevel, format string, v ...interface{}) { - if level > currentLogLevel { - return - } - - var modeStr string - switch level { - case TDLogLevelError: - modeStr = "[Error] " - break - case TDLogLevelWarning: - modeStr = "[Warning] " - break - case TDLogLevelInfo: - modeStr = "[Info] " - break - case TDLogLevelDebug: - modeStr = "[Debug] " - break - default: - modeStr = "[Info] " - break - } - - if logInstance != nil { - msg := fmt.Sprintf(SDK_LOG_PREFIX+modeStr+format+"\n", v...) - logInstance.Print(msg) - } else { - logTime := fmt.Sprintf("[%v]", time.Now().Format("2006-01-02 15:04:05.000")) - fmt.Printf(logTime+SDK_LOG_PREFIX+modeStr+format+"\n", v...) - } -} - -func tdLogDebug(format string, v ...interface{}) { - tdLog(TDLogLevelDebug, format, v...) -} - -func tdLogInfo(format string, v ...interface{}) { - tdLog(TDLogLevelInfo, format, v...) -} - -func tdLogError(format string, v ...interface{}) { - tdLog(TDLogLevelError, format, v...) -} - -func tdLogWarning(format string, v ...interface{}) { - tdLog(TDLogLevelWarning, format, v...) -} - -// Deprecated: please use thinkingdata.SetLogLevel(thinkingdata.TDLogLevelOff) -type LogType int32 - -// Deprecated: please use thinkingdata.SetLogLevel(thinkingdata.TDLogLevelOff) -const ( - LoggerTypeOff LogType = 1 << 0 // disable log - LoggerTypePrint LogType = 1 << 1 // print on console - LoggerTypeWriteFile LogType = 1 << 2 // print to file - LoggerTypePrintAndWriteFile = LoggerTypePrint | LoggerTypeWriteFile // print both on console and file -) - -// Deprecated: please use thinkingdata.SetLogLevel(thinkingdata.TDLogLevelOff) -type LoggerConfig struct { - Type LogType - Path string -} - -// Deprecated: please use thinkingdata.SetLogLevel(thinkingdata.TDLogLevelOff) -func SetLoggerConfig(config LoggerConfig) { - if config.Type < LoggerTypeOff || config.Type > LoggerTypePrintAndWriteFile { - fmt.Println(SDK_LOG_PREFIX + "log type error") - return - } - if config.Type&LoggerTypeOff == LoggerTypeOff { - currentLogLevel = TDLogLevelOff - } else { - currentLogLevel = TDLogLevelInfo - } -} diff --git a/src/server/thinkingdata/thinkingdata.go b/src/server/thinkingdata/thinkingdata.go deleted file mode 100644 index aeea763b..00000000 --- a/src/server/thinkingdata/thinkingdata.go +++ /dev/null @@ -1,314 +0,0 @@ -package thinkingdata - -import ( - "encoding/json" - "errors" - "sync" - "time" -) - -const ( - Track = "track" - TrackUpdate = "track_update" - TrackOverwrite = "track_overwrite" - UserSet = "user_set" - UserUnset = "user_unset" - UserSetOnce = "user_setOnce" - UserAdd = "user_add" - UserAppend = "user_append" - UserUniqAppend = "user_uniq_append" - UserDel = "user_del" - - SdkVersion = "2.0.3" - LibName = "Golang" -) - -type Data struct { - IsComplex bool `json:"-"` // properties are nested or not - AccountId string `json:"#account_id,omitempty"` - DistinctId string `json:"#distinct_id,omitempty"` - Type string `json:"#type"` - Time string `json:"#time"` - Timestamp int64 `json:"#timestamp,omitempty"` - EventName string `json:"#event_name,omitempty"` - EventId string `json:"#event_id,omitempty"` - FirstCheckId string `json:"#first_check_id,omitempty"` - Ip string `json:"#ip,omitempty"` - UUID string `json:"#uuid,omitempty"` - AppId string `json:"#app_id,omitempty"` - Properties map[string]interface{} `json:"properties"` - PropertiesSummary string `json:"properties_summary,omitempty"` -} - -// TDConsumer define operation interface -type TDConsumer interface { - Add(d Data) error - Flush() error - Close() error - IsStringent() bool // check data or not. -} - -type TDAnalytics struct { - consumer TDConsumer - superProperties map[string]interface{} - mutex *sync.RWMutex - dynamicSuperProperties func() map[string]interface{} -} - -// New init SDK -func New(c TDConsumer) TDAnalytics { - tdLogInfo("init SDK success") - return TDAnalytics{ - consumer: c, - superProperties: make(map[string]interface{}), - mutex: new(sync.RWMutex), - } -} - -// GetSuperProperties get common properties -func (ta *TDAnalytics) GetSuperProperties() map[string]interface{} { - result := make(map[string]interface{}) - ta.mutex.Lock() - mergeProperties(result, ta.superProperties) - ta.mutex.Unlock() - return result -} - -// SetSuperProperties set common properties -func (ta *TDAnalytics) SetSuperProperties(superProperties map[string]interface{}) { - ta.mutex.Lock() - mergeProperties(ta.superProperties, superProperties) - ta.mutex.Unlock() -} - -// ClearSuperProperties clear common properties -func (ta *TDAnalytics) ClearSuperProperties() { - ta.mutex.Lock() - ta.superProperties = make(map[string]interface{}) - ta.mutex.Unlock() -} - -// SetDynamicSuperProperties set common properties dynamically. -// not recommend to add the operation which with a lot of computation -func (ta *TDAnalytics) SetDynamicSuperProperties(action func() map[string]interface{}) { - ta.mutex.Lock() - ta.dynamicSuperProperties = action - ta.mutex.Unlock() -} - -// GetDynamicSuperProperties dynamic common properties -func (ta *TDAnalytics) GetDynamicSuperProperties() map[string]interface{} { - result := make(map[string]interface{}) - ta.mutex.RLock() - if ta.dynamicSuperProperties != nil { - mergeProperties(result, ta.dynamicSuperProperties()) - } - ta.mutex.RUnlock() - return result -} - -// Track report ordinary event -func (ta *TDAnalytics) Track(accountId, distinctId, eventName string, properties map[string]interface{}) error { - return ta.track(accountId, distinctId, Track, eventName, "", properties) -} - -// TrackFirst report first event -func (ta *TDAnalytics) TrackFirst(accountId, distinctId, eventName, firstCheckId string, properties map[string]interface{}) error { - if len(firstCheckId) == 0 { - msg := "the 'firstCheckId' must be provided" - tdLogInfo(msg) - return errors.New(msg) - } - p := make(map[string]interface{}) - mergeProperties(p, properties) - p["#first_check_id"] = firstCheckId - return ta.track(accountId, distinctId, Track, eventName, "", p) -} - -// TrackUpdate report updatable event -func (ta *TDAnalytics) TrackUpdate(accountId, distinctId, eventName, eventId string, properties map[string]interface{}) error { - return ta.track(accountId, distinctId, TrackUpdate, eventName, eventId, properties) -} - -// TrackOverwrite report overridable event -func (ta *TDAnalytics) TrackOverwrite(accountId, distinctId, eventName, eventId string, properties map[string]interface{}) error { - return ta.track(accountId, distinctId, TrackOverwrite, eventName, eventId, properties) -} - -func (ta *TDAnalytics) track(accountId, distinctId, dataType, eventName, eventId string, properties map[string]interface{}) error { - defer func() { - if r := recover(); r != nil { - tdLogError("%+v\ndata: %+v", r, properties) - } - }() - - if len(eventName) == 0 { - msg := "the event name must be provided" - tdLogError(msg) - return errors.New(msg) - } - - // eventId not be null unless eventType is equal Track. - if len(eventId) == 0 && dataType != Track { - msg := "the event id must be provided" - tdLogError(msg) - return errors.New(msg) - } - - p := ta.GetSuperProperties() - dynamicSuperProperties := ta.GetDynamicSuperProperties() - - mergeProperties(p, dynamicSuperProperties) - // preset properties has the highest priority - p["#lib"] = LibName - p["#lib_version"] = SdkVersion - // custom properties - mergeProperties(p, properties) - - return ta.add(accountId, distinctId, dataType, eventName, eventId, p) -} - -// UserSet set user properties. would overwrite existing names. -func (ta *TDAnalytics) UserSet(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserSet, properties) -} - -// UserUnset clear the user properties of users. -func (ta *TDAnalytics) UserUnset(accountId string, distinctId string, s []string) error { - if len(s) == 0 { - msg := "invalid params for UserUnset: keys is nil" - tdLogInfo(msg) - return errors.New(msg) - } - prop := make(map[string]interface{}) - for _, v := range s { - prop[v] = 0 - } - return ta.user(accountId, distinctId, UserUnset, prop) -} - -func (ta *TDAnalytics) UserUnsetWithProperties(accountId string, distinctId string, properties map[string]interface{}) error { - if len(properties) == 0 { - msg := "invalid params for UserUnset: properties is nil" - tdLogInfo(msg) - return errors.New(msg) - } - return ta.user(accountId, distinctId, UserUnset, properties) -} - -// UserSetOnce set user properties, If such property had been set before, this message would be neglected. -func (ta *TDAnalytics) UserSetOnce(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserSetOnce, properties) -} - -// UserAdd to accumulate operations against the property. -func (ta *TDAnalytics) UserAdd(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserAdd, properties) -} - -// UserAppend to add user properties of array type. -func (ta *TDAnalytics) UserAppend(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserAppend, properties) -} - -// UserUniqAppend append user properties to array type by unique. -func (ta *TDAnalytics) UserUniqAppend(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserUniqAppend, properties) -} - -// UserDelete delete a user, This operation cannot be undone. -func (ta *TDAnalytics) UserDelete(accountId string, distinctId string) error { - return ta.user(accountId, distinctId, UserDel, nil) -} - -// UserDeleteWithProperties delete a user, This operation cannot be undone. -func (ta *TDAnalytics) UserDeleteWithProperties(accountId string, distinctId string, properties map[string]interface{}) error { - return ta.user(accountId, distinctId, UserDel, properties) -} - -func (ta *TDAnalytics) user(accountId, distinctId, dataType string, properties map[string]interface{}) error { - defer func() { - if r := recover(); r != nil { - tdLogError("%+v\ndata: %+v", r, properties) - } - }() - if properties == nil && dataType != UserDel { - msg := "invalid params for " + dataType + ": properties is nil" - tdLogError(msg) - return errors.New(msg) - } - p := make(map[string]interface{}) - mergeProperties(p, properties) - return ta.add(accountId, distinctId, dataType, "", "", p) -} - -// Flush report data immediately. -func (ta *TDAnalytics) Flush() error { - return ta.consumer.Flush() -} - -// Close and exit sdk -func (ta *TDAnalytics) Close() error { - err := ta.consumer.Close() - tdLogInfo("SDK close") - return err -} - -func (ta *TDAnalytics) add(accountId, distinctId, dataType, eventName, eventId string, properties map[string]interface{}) error { - if len(accountId) == 0 && len(distinctId) == 0 { - msg := "invalid parameters: account_id and distinct_id cannot be empty at the same time" - tdLogError(msg) - return errors.New(msg) - } - - // get "#ip" value in properties, empty string will be return when not found. - ip := extractStringProperty(properties, "#ip") - - // get "#app_id" value in properties, empty string will be return when not found. - appId := extractStringProperty(properties, "#app_id") - - // get "#time" value in properties, empty string will be return when not found. - eventTime := extractTime(properties) - - firstCheckId := extractStringProperty(properties, "#first_check_id") - - // get "#uuid" value in properties, empty string will be return when not found. - uuid := extractStringProperty(properties, "#uuid") - if len(uuid) == 0 { - uuid = generateUUID() - } - properties_summary, err := json.Marshal(properties) - if err != nil { - properties_summary = []byte{} - } - data := Data{ - AccountId: accountId, - DistinctId: distinctId, - Type: dataType, - Time: eventTime, - Timestamp: time.Now().Unix(), - EventName: eventName, - EventId: eventId, - FirstCheckId: firstCheckId, - Ip: ip, - UUID: uuid, - Properties: properties, - PropertiesSummary: string(properties_summary), - } - - if len(appId) > 0 { - data.AppId = appId - } - - err = formatProperties(&data, ta) - if err != nil { - return err - } - - return ta.consumer.Add(data) -} - -// Deprecated: please use TDConsumer -type Consumer interface { - TDConsumer -} diff --git a/src/server/thinkingdata/utils.go b/src/server/thinkingdata/utils.go deleted file mode 100644 index 3ac20f07..00000000 --- a/src/server/thinkingdata/utils.go +++ /dev/null @@ -1,143 +0,0 @@ -package thinkingdata - -import ( - "errors" - "fmt" - "github.com/google/uuid" - "os" - "reflect" - "regexp" - "time" -) - -const ( - DATE_FORMAT = "2006-01-02 15:04:05.000" - KEY_PATTERN = "^[a-zA-Z#][A-Za-z0-9_]{0,49}$" -) - -// A string of 50 letters and digits that starts with '#' or a letter -var keyPattern, _ = regexp.Compile(KEY_PATTERN) - -func mergeProperties(target, source map[string]interface{}) { - for k, v := range source { - target[k] = v - } -} - -func extractTime(p map[string]interface{}) string { - if t, ok := p["#time"]; ok { - delete(p, "#time") - switch v := t.(type) { - case string: - return v - case time.Time: - return v.Format(DATE_FORMAT) - default: - return time.Now().Format(DATE_FORMAT) - } - } - - return time.Now().Format(DATE_FORMAT) -} - -func extractStringProperty(p map[string]interface{}, key string) string { - if t, ok := p[key]; ok { - delete(p, key) - v, ok := t.(string) - if !ok { - fmt.Fprintln(os.Stderr, "Invalid data type for "+key) - } - return v - } - return "" -} - -func isNotNumber(v interface{}) bool { - switch v.(type) { - case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64: - case float32, float64: - default: - return true - } - return false -} - -func formatProperties(d *Data, ta *TDAnalytics) error { - - if d.EventName != "" { - matched := checkPattern([]byte(d.EventName)) - if !matched { - msg := "invalid event name: " + d.EventName - tdLogInfo(msg) - return errors.New(msg) - } - } - - if d.Properties != nil { - for k, v := range d.Properties { - if ta.consumer.IsStringent() { - isMatch := checkPattern([]byte(k)) - if !isMatch { - msg := "invalid property key: " + k - tdLogInfo(msg) - return errors.New(msg) - } - } - - if d.Type == UserAdd && isNotNumber(v) { - msg := "invalid property value: only numbers is supported by UserAdd" - tdLogInfo(msg) - return errors.New(msg) - } - - // check value - switch v.(type) { - case int: - case bool: - case float64: - case string: - case time.Time: - d.Properties[k] = v.(time.Time).Format(DATE_FORMAT) - case []string: - d.IsComplex = true - default: - d.IsComplex = true - } - } - } - - return nil -} - -func isNotArrayOrSlice(v interface{}) bool { - typeOf := reflect.TypeOf(v) - switch typeOf.Kind() { - case reflect.Array: - case reflect.Slice: - default: - return true - } - return false -} - -func checkPattern(name []byte) bool { - return keyPattern.Match(name) -} - -func parseTime(input []byte) string { - var re = regexp.MustCompile(`"((\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})(?:\.(\d{3}))\d*)(Z|[\+-]\d{2}:\d{2})"`) - var substitution = "\"$2 $3.$4\"" - - for re.Match(input) { - input = re.ReplaceAll(input, []byte(substitution)) - } - return string(input) -} - -func generateUUID() string { - newUUID, err := uuid.NewUUID() - if err != nil { - return "" - } - return newUUID.String() -} diff --git a/src/server/unit_test/championship_test.go b/src/server/unit_test/championship_test.go new file mode 100644 index 00000000..9b658f90 --- /dev/null +++ b/src/server/unit_test/championship_test.go @@ -0,0 +1,47 @@ +package unit + +import ( + "fmt" + "testing" +) + +func TestChampionshipReward(t *testing.T) { + player := getTestPlayer() + player.GetChampshipMod().AddScore([]int{15, 15, 15}) + todayAid, yestAid := player.GetChampshipActivityId() + items := player.GetChampshipReward(todayAid) + fmt.Printf("today id %d items : %v\n", todayAid, items) + player.GetChampshipMod().ZeroUpdate(todayAid) + player.GetChampshipMod().AddScore([]int{15, 15, 15}) + yestAid = 0 + items = player.GetChampshipReward(yestAid) + fmt.Printf("yesterday id %d items : %v\n", yestAid, items) +} + +func TestChampionshipRankReward(t *testing.T) { + player := getTestPlayer() + player.GetChampshipMod().AddScore([]int{15, 15, 15}) + _, yestAid := player.GetChampshipActivityId() + items, err := player.GetChampshipRankReward(1, yestAid) + if err != nil { + fmt.Printf("get rank reward error : %v\n", err) + } else { + fmt.Printf("yesterday id %d rank reward items : %v\n", yestAid, items) + } + yestAid = 0 + items, err = player.GetChampshipRankReward(2, yestAid) + if err != nil { + fmt.Printf("get rank reward error : %v\n", err) + } else { + fmt.Printf("yesterday id %d rank reward items : %v\n", yestAid, items) + } + player.BackChampship() +} + +func TestChampionshipZeroUpdate(t *testing.T) { + player := getTestPlayer() + player.GetChampshipMod().AddScore([]int{15, 15, 15}) + todayAid, _ := player.GetChampshipActivityId() + fmt.Printf("before zero update today id %d score : %d\n", todayAid, player.GetChampshipMod().GetScore()) + player.ChampionshipZeroUpdate() +} diff --git a/src/server/unit_test/common.go b/src/server/unit_test/common.go new file mode 100644 index 00000000..f98ee04e --- /dev/null +++ b/src/server/unit_test/common.go @@ -0,0 +1,9 @@ +package unit + +import "server/game" + +func getTestPlayer() *game.Player { + p := new(game.Player) + p.InitPlayerByUid(100101183) + return p +} diff --git a/src/server/test/conf/server.json b/src/server/unit_test/conf/server.json similarity index 59% rename from src/server/test/conf/server.json rename to src/server/unit_test/conf/server.json index 6bf6d986..8305ea7f 100644 --- a/src/server/test/conf/server.json +++ b/src/server/unit_test/conf/server.json @@ -2,20 +2,20 @@ "AppID": 0, "LogLevel": "debug", "LogPath": "./log", - "TCPAddr": ":3601", + "TCPAddr": ":3602", + "WSAddr": ":3567", "RPCAddr": ":50051", - "WSAddr": ":3566", - "MySqlAddr": "127.0.0.1", + "MySqlAddr": "112.124.54.243", "MySqlPort": "3306", "MySqlUsr": "root", - "MySqlPwd": "IOagNEq3C84c-20CmHEin5iODVc=", + "MySqlPwd": "-pDvPOK7dp1obN8e6hxSqYl9L4FaTCJDpN60B6I8Vg==", "MaxConnNum": 20000, - "DbName": "merge_pet_1", + "DbName": "pet_home_1", "HttpPort": ":8081", "AppPath": "./app", - "TELOGDIR" : "./teLog/", + "TELOGDIR" : "./log/teLog/", - "GameName": "Merge_Pet_Local", + "GameName": "pet_home_local", "ServerType":"node", @@ -23,19 +23,19 @@ "ServerOpenTime": "2018-01-01 00:00:00", "ServerName": "Merge_Pet", "ServerStatus" : 1, - "ServerCenter" : 1, + "ServerCenter" : 0, "GameConfPath": "D:/Github/pet_home_server/src/server/gamedata/config/", - "ListenAddr":":9001", - "CenterAddr": "127.0.0.1:9000", - "RemoteAddr":":9001", + "ListenAddr":":9002", + "CenterAddr": "127.0.0.1:7000", + "RemoteAddr":"127.0.0.1:9002", - "RedisAddr":"127.0.0.1", + "RedisAddr":"112.124.54.243", "RedisPort" :"6379", "RedisPwd" :"", - "RedisWriteAddr":"127.0.0.1:6379", - "RedisReadAddrs":"127.0.0.1:6379", + "RedisWriteAddr":"112.124.54.243:6379", + "RedisReadAddrs":"112.124.54.243:6379", "RedisMasterName":"mymaster", "RedisConnType":"Direct", diff --git a/src/server/unit_test/playroom_test.go b/src/server/unit_test/playroom_test.go new file mode 100644 index 00000000..73ff4438 --- /dev/null +++ b/src/server/unit_test/playroom_test.go @@ -0,0 +1,13 @@ +package unit + +import ( + "server/game" + "testing" +) + +func TestPlayroomVisit(t *testing.T) { + player := new(game.Player) + player.M_DwUin = 100100041 + player.InitPlayerOnly() + player.GetVisitorPlayer() +}