From f9c8464ecd6bdd5ceabfa3dba635c36383b5c9a4 Mon Sep 17 00:00:00 2001 From: Beric Bearnson <37596980+bericyb@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:48:12 -0600 Subject: [PATCH] more networking stuff --- internal/netwrk/game_messages.pb.go | 152 +++++++++++++++++++++++++++ internal/netwrk/lobby_messages.pb.go | 72 ++++++------- internal/netwrk/netwrk.go | 38 ++++--- proto/game_messages.proto | 10 ++ proto/lobby_messages.proto | 5 +- 5 files changed, 224 insertions(+), 53 deletions(-) create mode 100644 internal/netwrk/game_messages.pb.go create mode 100644 proto/game_messages.proto diff --git a/internal/netwrk/game_messages.pb.go b/internal/netwrk/game_messages.pb.go new file mode 100644 index 0000000..1142d2b --- /dev/null +++ b/internal/netwrk/game_messages.pb.go @@ -0,0 +1,152 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.34.2 +// protoc v5.27.3 +// source: proto/game_messages.proto + +package netwrk + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type GameMessage struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Action string `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *GameMessage) Reset() { + *x = GameMessage{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_game_messages_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GameMessage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GameMessage) ProtoMessage() {} + +func (x *GameMessage) ProtoReflect() protoreflect.Message { + mi := &file_proto_game_messages_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GameMessage.ProtoReflect.Descriptor instead. +func (*GameMessage) Descriptor() ([]byte, []int) { + return file_proto_game_messages_proto_rawDescGZIP(), []int{0} +} + +func (x *GameMessage) GetAction() string { + if x != nil { + return x.Action + } + return "" +} + +func (x *GameMessage) GetValue() int32 { + if x != nil { + return x.Value + } + return 0 +} + +var File_proto_game_messages_proto protoreflect.FileDescriptor + +var file_proto_game_messages_proto_rawDesc = []byte{ + 0x0a, 0x19, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6e, 0x65, 0x74, + 0x77, 0x72, 0x6b, 0x22, 0x3b, 0x0a, 0x0b, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x72, 0x6b, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_proto_game_messages_proto_rawDescOnce sync.Once + file_proto_game_messages_proto_rawDescData = file_proto_game_messages_proto_rawDesc +) + +func file_proto_game_messages_proto_rawDescGZIP() []byte { + file_proto_game_messages_proto_rawDescOnce.Do(func() { + file_proto_game_messages_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_game_messages_proto_rawDescData) + }) + return file_proto_game_messages_proto_rawDescData +} + +var file_proto_game_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_proto_game_messages_proto_goTypes = []any{ + (*GameMessage)(nil), // 0: netwrk.GameMessage +} +var file_proto_game_messages_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_proto_game_messages_proto_init() } +func file_proto_game_messages_proto_init() { + if File_proto_game_messages_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_proto_game_messages_proto_msgTypes[0].Exporter = func(v any, i int) any { + switch v := v.(*GameMessage); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_proto_game_messages_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_proto_game_messages_proto_goTypes, + DependencyIndexes: file_proto_game_messages_proto_depIdxs, + MessageInfos: file_proto_game_messages_proto_msgTypes, + }.Build() + File_proto_game_messages_proto = out.File + file_proto_game_messages_proto_rawDesc = nil + file_proto_game_messages_proto_goTypes = nil + file_proto_game_messages_proto_depIdxs = nil +} diff --git a/internal/netwrk/lobby_messages.pb.go b/internal/netwrk/lobby_messages.pb.go index 249de01..5ca1a59 100644 --- a/internal/netwrk/lobby_messages.pb.go +++ b/internal/netwrk/lobby_messages.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.34.2 // protoc v5.27.3 -// source: lobby_messages.proto +// source: proto/lobby_messages.proto package netwrk @@ -32,7 +32,7 @@ type LobbyMessage struct { func (x *LobbyMessage) Reset() { *x = LobbyMessage{} if protoimpl.UnsafeEnabled { - mi := &file_lobby_messages_proto_msgTypes[0] + mi := &file_proto_lobby_messages_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *LobbyMessage) String() string { func (*LobbyMessage) ProtoMessage() {} func (x *LobbyMessage) ProtoReflect() protoreflect.Message { - mi := &file_lobby_messages_proto_msgTypes[0] + mi := &file_proto_lobby_messages_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *LobbyMessage) ProtoReflect() protoreflect.Message { // Deprecated: Use LobbyMessage.ProtoReflect.Descriptor instead. func (*LobbyMessage) Descriptor() ([]byte, []int) { - return file_lobby_messages_proto_rawDescGZIP(), []int{0} + return file_proto_lobby_messages_proto_rawDescGZIP(), []int{0} } func (x *LobbyMessage) GetType() string { @@ -75,36 +75,36 @@ func (x *LobbyMessage) GetContent() string { return "" } -var File_lobby_messages_proto protoreflect.FileDescriptor +var File_proto_lobby_messages_proto protoreflect.FileDescriptor -var file_lobby_messages_proto_rawDesc = []byte{ - 0x0a, 0x14, 0x6c, 0x6f, 0x62, 0x62, 0x79, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x3c, 0x0a, 0x0c, - 0x4c, 0x6f, 0x62, 0x62, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, - 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x14, 0x5a, 0x12, 0x2e, 0x2e, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x72, 0x6b, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_proto_lobby_messages_proto_rawDesc = []byte{ + 0x0a, 0x1a, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x6f, 0x62, 0x62, 0x79, 0x5f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x6e, 0x65, + 0x74, 0x77, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x22, 0x3c, 0x0a, 0x0c, 0x4c, 0x6f, 0x62, 0x62, 0x79, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x72, + 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_lobby_messages_proto_rawDescOnce sync.Once - file_lobby_messages_proto_rawDescData = file_lobby_messages_proto_rawDesc + file_proto_lobby_messages_proto_rawDescOnce sync.Once + file_proto_lobby_messages_proto_rawDescData = file_proto_lobby_messages_proto_rawDesc ) -func file_lobby_messages_proto_rawDescGZIP() []byte { - file_lobby_messages_proto_rawDescOnce.Do(func() { - file_lobby_messages_proto_rawDescData = protoimpl.X.CompressGZIP(file_lobby_messages_proto_rawDescData) +func file_proto_lobby_messages_proto_rawDescGZIP() []byte { + file_proto_lobby_messages_proto_rawDescOnce.Do(func() { + file_proto_lobby_messages_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_lobby_messages_proto_rawDescData) }) - return file_lobby_messages_proto_rawDescData + return file_proto_lobby_messages_proto_rawDescData } -var file_lobby_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_lobby_messages_proto_goTypes = []any{ - (*LobbyMessage)(nil), // 0: main.LobbyMessage +var file_proto_lobby_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_proto_lobby_messages_proto_goTypes = []any{ + (*LobbyMessage)(nil), // 0: netwrk.v1.LobbyMessage } -var file_lobby_messages_proto_depIdxs = []int32{ +var file_proto_lobby_messages_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -112,13 +112,13 @@ var file_lobby_messages_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_lobby_messages_proto_init() } -func file_lobby_messages_proto_init() { - if File_lobby_messages_proto != nil { +func init() { file_proto_lobby_messages_proto_init() } +func file_proto_lobby_messages_proto_init() { + if File_proto_lobby_messages_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_lobby_messages_proto_msgTypes[0].Exporter = func(v any, i int) any { + file_proto_lobby_messages_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*LobbyMessage); i { case 0: return &v.state @@ -135,18 +135,18 @@ func file_lobby_messages_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_lobby_messages_proto_rawDesc, + RawDescriptor: file_proto_lobby_messages_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_lobby_messages_proto_goTypes, - DependencyIndexes: file_lobby_messages_proto_depIdxs, - MessageInfos: file_lobby_messages_proto_msgTypes, + GoTypes: file_proto_lobby_messages_proto_goTypes, + DependencyIndexes: file_proto_lobby_messages_proto_depIdxs, + MessageInfos: file_proto_lobby_messages_proto_msgTypes, }.Build() - File_lobby_messages_proto = out.File - file_lobby_messages_proto_rawDesc = nil - file_lobby_messages_proto_goTypes = nil - file_lobby_messages_proto_depIdxs = nil + File_proto_lobby_messages_proto = out.File + file_proto_lobby_messages_proto_rawDesc = nil + file_proto_lobby_messages_proto_goTypes = nil + file_proto_lobby_messages_proto_depIdxs = nil } diff --git a/internal/netwrk/netwrk.go b/internal/netwrk/netwrk.go index 32e5ecd..d685a33 100644 --- a/internal/netwrk/netwrk.go +++ b/internal/netwrk/netwrk.go @@ -21,15 +21,16 @@ type ClientPool struct { } type GameClients struct { - client1 Client - client2 Client + client1 chan GameMessage + client2 chan GameMessage } -type GameConnections struct { +type GameChans struct { games map[string]GameClients } var clientPool *ClientPool +var gameChans *GameChans // Starts listening on port 12345 for TCP connections // Also creates client pool and game connection singletons @@ -56,6 +57,10 @@ func Listen() { } }() + gameChans = &GameChans{ + games: map[string]GameClients{}, + } + go func() { for { conn, err := listener.Accept() @@ -63,9 +68,9 @@ func Listen() { log.Println(err) continue } - go handleGameConnection(conn) + handleGameConnection(conn) } - } + }() } func handleGameConnection(conn net.Conn) { @@ -78,21 +83,26 @@ func handleGameConnection(conn net.Conn) { log.Printf("Error reading game ID on connection", err) } - gameID, err := string(messageBytes[:n]) + gameID := string(messageBytes[:n]) if err != nil { log.Printf("Game id was not a string?", err) } + clientChan := make(chan GameMessage) - for { - n, err := conn.Read(messageBytes) - if err != nil { - log.Printf("Error reading message %v", err) - return - } + n, err := conn.Read(messageBytes) + if err != nil { + log.Printf("Error reading message %v", err) + return + } - if isDone, err := handleGameMessage(gameID, conn, messageBytes[:n]); err != nil { - return + gameID := messageBytes[:n] + + clientChan, ok := gameChans[gameID] + if !ok { + GameClients{ + client1: clientChan, + client2: nil, } } } diff --git a/proto/game_messages.proto b/proto/game_messages.proto new file mode 100644 index 0000000..a3f31ba --- /dev/null +++ b/proto/game_messages.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package netwrk; + +option go_package = "./netwrk"; + +message GameMessage { + string action = 1; + int32 value = 2; +} diff --git a/proto/lobby_messages.proto b/proto/lobby_messages.proto index 695607a..bfd4797 100644 --- a/proto/lobby_messages.proto +++ b/proto/lobby_messages.proto @@ -1,8 +1,7 @@ syntax = "proto3"; -package main; - -option go_package = "../internal/netwrk"; +package netwrk.v1; +option go_package = "./netwrk"; message LobbyMessage { string type = 1;