-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47 from emortalmc/feat/experience
feat: implement experience
- Loading branch information
Showing
15 changed files
with
280 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package player | ||
|
|
||
| import ( | ||
| "context" | ||
| "github.com/google/uuid" | ||
| kafkaWriter "mc-player-service/internal/kafka/writer" | ||
| ) | ||
|
|
||
| var ( | ||
| _ KafkaWriter = &kafkaWriter.Notifier{} | ||
| ) | ||
|
|
||
| type KafkaWriter interface { | ||
| PlayerExperienceChange(ctx context.Context, playerID uuid.UUID, reason string, oldXP int, newXP int, oldLevel int, newLevel int) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
internal/kafka/consumer.go → internal/kafka/consumer/consumer.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package kafka | ||
| package kafkaConsumer | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package kafkaWriter | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "github.com/emortalmc/proto-specs/gen/go/model/mcplayer" | ||
| "github.com/google/uuid" | ||
| "github.com/segmentio/kafka-go" | ||
| "go.uber.org/zap" | ||
| "google.golang.org/protobuf/proto" | ||
| "mc-player-service/internal/config" | ||
| "sync" | ||
| "time" | ||
| ) | ||
|
|
||
| const experienceWriterTopic = "player-experience" | ||
|
|
||
| type Notifier struct { | ||
| logger *zap.SugaredLogger | ||
| w *kafka.Writer | ||
| } | ||
|
|
||
| func NewKafkaNotifier(ctx context.Context, wg *sync.WaitGroup, cfg config.KafkaConfig, logger *zap.SugaredLogger) *Notifier { | ||
| w := &kafka.Writer{ | ||
| Addr: kafka.TCP(cfg.Host), | ||
| Topic: experienceWriterTopic, | ||
| Balancer: &kafka.LeastBytes{}, | ||
| Async: true, | ||
| BatchTimeout: 500 * time.Millisecond, | ||
| ErrorLogger: kafka.LoggerFunc(logger.Errorw), | ||
| } | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| <-ctx.Done() | ||
| if err := w.Close(); err != nil { | ||
| logger.Errorw("failed to close kafka writer", "err", err) | ||
| } | ||
| }() | ||
|
|
||
| return &Notifier{ | ||
| logger: logger, | ||
| w: w, | ||
| } | ||
| } | ||
|
|
||
| func (n *Notifier) PlayerExperienceChange(ctx context.Context, playerID uuid.UUID, reason string, oldXP int, newXP int, oldLevel int, newLevel int) { | ||
| msg := &mcplayer.PlayerExperienceChangeMessage{ | ||
| PlayerId: playerID.String(), | ||
| Reason: reason, | ||
| PreviousExperience: int64(oldXP), | ||
| NewExperience: int64(newXP), | ||
| PreviousLevel: int32(oldLevel), | ||
| NewLevel: int32(newLevel), | ||
| } | ||
|
|
||
| if err := n.writeMessage(ctx, msg); err != nil { | ||
| n.logger.Errorw("failed to write message", "err", err) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| func (n *Notifier) writeMessage(ctx context.Context, msg proto.Message) error { | ||
| bytes, err := proto.Marshal(msg) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to marshal proto to bytes: %s", err) | ||
| } | ||
|
|
||
| return n.w.WriteMessages(ctx, kafka.Message{ | ||
| Topic: experienceWriterTopic, | ||
| Headers: []kafka.Header{{Key: "X-Proto-Type", Value: []byte(msg.ProtoReflect().Descriptor().FullName())}}, | ||
| Value: bytes, | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.