Skip to content

Commit 974dfaa

Browse files
committed
feat(server_push): add OtherClientInfo
1 parent 65f2ce5 commit 974dfaa

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

lagrange/client/events/service.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from dataclasses import dataclass
2+
from typing import List
23

34
from . import BaseEvent
45

@@ -17,3 +18,14 @@ class ClientOnline(BaseEvent):
1718
class ServerKick(BaseEvent):
1819
tips: str
1920
title: str
21+
22+
23+
@dataclass
24+
class OtherClientInfo(BaseEvent):
25+
@dataclass
26+
class ClientOnline(BaseEvent):
27+
sub_id: int
28+
os_name: str
29+
device_name: str
30+
31+
clients: List[ClientOnline]

lagrange/client/server_push/service.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from lagrange.pb.status.kick import KickNT
55
from lagrange.pb.login.register import PBSsoInfoSyncPush, PBServerPushParams
66

7-
from ..events.service import ServerKick
7+
from ..events.service import ServerKick, OtherClientInfo
88
from ..wtlogin.sso import SSOPacket
99

1010
DBG_EN = bool(os.environ.get("PUSH_DEBUG", False))
@@ -50,13 +50,11 @@ async def server_info_sync_handler(_, sso: SSOPacket):
5050

5151

5252
async def server_push_param_handler(_, sso: SSOPacket):
53-
if not DBG_EN:
54-
return
55-
print("Server Push Params:")
5653
ev = PBServerPushParams.decode(sso.data)
57-
for dev in ev.online_devices:
58-
print(f"Device:{dev.device_name} on {dev.os_name} Platform, sub_id: {dev.sub_id}")
59-
print("end")
54+
return OtherClientInfo([
55+
OtherClientInfo.ClientOnline(i.sub_id, i.os_name, i.device_name)
56+
for i in ev.online_devices
57+
])
6058

6159

6260
async def server_push_req_handler(_, sso: SSOPacket):

0 commit comments

Comments
 (0)