Mirror/KianaBH3
1
0
Fork 0
mirror of https://github.com/MikuLeaks/KianaBH3.git synced 2025-12-14 22:04:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move cmd_id into net

Browse Source
This commit is contained in:
Naruse
2024-11-08 11:05:39 +08:00
parent 23f4f7bc63
commit bfbf1bb2ab
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
game_server/net/session.py
View File

@@ -1,5 +1,5 @@
from game_server.config.log import Error, Info
from game_server.protocol.cmd_id import CmdID
from utils.logger import Error, Info
from game_server.net.cmd_id import CmdID
from game_server.net.packet import Packet
from lib import proto as protos
import traceback
@@ -11,7 +11,8 @@ from game_server.game.player import Player
class Session:
player : Player
player: Player
def __init__(self) -> None:
self.writer = None
self.pending_notifies = []
@@ -28,12 +29,12 @@ class Session:
except Exception as ex:
Error(f"Error in KeepAliveLoop: {ex}")
break
await asyncio.sleep(3)
async def handle_connection(self, reader, writer):
self.writer = writer
addr = writer.get_extra_info('peername')
addr = writer.get_extra_info("peername")
Info(f"Accepted connection from {addr}")
prefix = bytes([0x01, 0x23, 0x45, 0x67])
@@ -41,7 +42,7 @@ class Session:
try:
while True:
data = await reader.read(1 << 16)
data = await reader.read(1 << 16)
if not data:
break
@@ -59,7 +60,7 @@ class Session:
end = segment.find(suffix, start)
if end == -1:
break
end += len(suffix)
packets.append(segment[start:end])
offset += end
@@ -82,14 +83,14 @@ class Session:
def create_packet(self, proto_message: betterproto.Message) -> Packet:
return Packet.send_packet(proto_message)
def is_valid_packet(self,data: bytes) -> bool:
def is_valid_packet(self, data: bytes) -> bool:
hex_string = data.hex().upper()
return hex_string.startswith("01234567") and hex_string.endswith("89ABCDEF")
def pending_notify(self, proto_message: betterproto.Message):
packet = Packet.send_packet(proto_message)
self.pending_notifies.append(packet)
def send_pending_notifies_in_thread(self):
thread = threading.Thread(target=self._run_send_pending_notifies)
thread.start()
@@ -99,18 +100,19 @@ class Session:
asyncio.set_event_loop(loop)
loop.run_until_complete(self._send_pending_notifies())
loop.close()
async def _send_pending_notifies(self):
for packet in self.pending_notifies:
await self.send(packet)
self.pending_notifies.clear()
async def process_packet(self, packet : Packet):
async def process_packet(self, packet: Packet):
if packet.cmd_id not in CmdID._value2member_map_:
Error(f"CmdId {packet.cmd_id} not recognized!")
return
request_name = CmdID(packet.cmd_id).name
if request_name == "KeepAliveNotify": return #await self.send(packet.send_packet(protos.KeepAliveNotify()))
if request_name == "KeepAliveNotify":
return # await self.send(packet.send_packet(protos.KeepAliveNotify()))
try:
try:
req: betterproto.Message = getattr(protos, request_name)()
@@ -120,7 +122,9 @@ class Session:
try:
Info(f"RECV packet: {request_name} ({packet.cmd_id})")
handle_module = importlib.import_module(f"game_server.packet.handlers.{request_name}")
handle_module = importlib.import_module(
f"game_server.packet.handlers.{request_name}"
)
handle_function = handle_module.handle
handle_result = await handle_function(self, req)
if not handle_result:
@@ -150,4 +154,4 @@ class Session:
Info(f"Sent packet: {packet_name} ({packet.cmd_id})")
except Exception as ex:
Error(f"Failed to send {packet_name}: {ex}")
traceback.print_exc()
traceback.print_exc()