chore(server_push): bind necessary service by default

Author: wyapx

lagrange/__init__.py

@@ -20,7 +20,7 @@ def __init__(
         protocol: Literal["linux", "macos", "windows"] = "linux",
         sign_url: Optional[str] = None,
         device_info_path="./device.json",
-        signinfo_path="./sig.bin"
+        signinfo_path="./sig.bin",
     ):
         self.im = InfoManager(uin, device_info_path, signinfo_path)
         self.uin = uin

lagrange/client/client.py

@@ -2,7 +2,16 @@
 import struct
 import asyncio
 from io import BytesIO
-from typing import BinaryIO, Callable, Coroutine, List, Optional, Union, overload, Literal
+from typing import (
+    BinaryIO,
+    Callable,
+    Coroutine,
+    List,
+    Optional,
+    Union,
+    overload,
+    Literal,
+)
 
 from lagrange.info import AppInfo, DeviceInfo, SigInfo
 from lagrange.pb.message.msg_push import MsgPushBody
@@ -50,7 +59,7 @@
 from .message.encoder import build_message
 from .message.types import Element
 from .models import UserInfo
-from .server_push.binder import PushDeliver
+from .server_push import PushDeliver, bind_services
 from .wtlogin.sso import SSOPacket
 
 
@@ -61,14 +70,17 @@ def __init__(
         app_info: AppInfo,
         device_info: DeviceInfo,
         sig_info: SigInfo,
-        sign_provider: Optional[Callable[[str, int, bytes], Coroutine[None, None, dict]]] = None,
+        sign_provider: Optional[
+            Callable[[str, int, bytes], Coroutine[None, None, dict]]
+        ] = None,
         use_ipv6=True,
     ):
         super().__init__(uin, app_info, device_info, sig_info, sign_provider, use_ipv6)
 
         self._events = Events()
         self._push_deliver = PushDeliver(self)
         self._highway = HighWaySession(self)
+        bind_services(self._push_deliver)
 
     @property
     def events(self) -> Events:
@@ -100,7 +112,9 @@ async def easy_login(self) -> bool:
         else:
             raise AssertionError("siginfo not found, you must login first")
 
-    async def login(self, password: str = "", qrcode_path: Optional[str] = None) -> bool:
+    async def login(
+        self, password: str = "", qrcode_path: Optional[str] = None
+    ) -> bool:
         try:
             if self._sig.temp_pwd:
                 rsp = await self.easy_login()
@@ -235,7 +249,9 @@ async def down_grp_audio(self, audio: Audio, grp_id: int) -> BytesIO:
     async def down_friend_audio(self, audio: Audio) -> BytesIO:
         return await self._highway.download_audio(audio, uid=self.uid)
 
-    async def fetch_image_url(self, bus_type: Literal[10, 20], node: "IndexNode", uid=None, gid=None):
+    async def fetch_image_url(
+        self, bus_type: Literal[10, 20], node: "IndexNode", uid=None, gid=None
+    ):
         if bus_type == 10:
             return await self._get_pri_img_url(uid, node)
         elif bus_type == 20:
@@ -313,7 +329,9 @@ async def get_grp_msg(
         ), "return args not matched"
 
         rsp = list(
-            await asyncio.gather(*[parse_grp_msg(self, MsgPushBody.decode(i)) for i in payload.elems])
+            await asyncio.gather(
+                *[parse_grp_msg(self, MsgPushBody.decode(i)) for i in payload.elems]
+            )
         )
         if filter_deleted_msg:
             return [*filter(lambda msg: msg.rand != -1, rsp)]

lagrange/client/server_push/__init__.py

@@ -0,0 +1,10 @@
+from .binder import PushDeliver
+from .msg import msg_push_handler
+from .service import server_kick_handler
+
+
+def bind_services(pd: PushDeliver):
+    pd.subscribe("trpc.msg.olpush.OlPushService.MsgPush", msg_push_handler)
+    pd.subscribe(
+        "trpc.qq_new_tech.status_svc.StatusService.KickNT", server_kick_handler
+    )

lagrange/client/server_push/msg.py

@@ -11,21 +11,23 @@
     MemberGotTitleBody,
     MemberInviteRequest,
     MemberJoinRequest,
-    MemberRecallMsg, GroupSub20Head,
+    MemberRecallMsg,
+    GroupSub20Head,
 )
 from lagrange.utils.binary.protobuf import proto_decode, ProtoStruct
 from lagrange.utils.binary.reader import Reader
 from lagrange.utils.operator import unpack_dict
 
-from ..events import BaseEvent
 from ..events.group import (
     GroupMemberGotSpecialTitle,
     GroupMemberJoined,
     GroupMemberJoinRequest,
     GroupMemberQuit,
     GroupMuteMember,
     GroupNameChanged,
-    GroupRecall, GroupNudge, GroupReaction,
+    GroupRecall,
+    GroupNudge,
+    GroupReaction,
 )
 from ..wtlogin.sso import SSOPacket
 from .log import logger
@@ -102,7 +104,7 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                     attrs["action_str"],
                     attrs["suffix_str"],
                     attrs,
-                    pb.body.attrs_xml
+                    pb.body.attrs_xml,
                 )
             else:
                 # print(pkg.encode().hex(), 2)
@@ -144,7 +146,7 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                         emoji_type=body.detail.emo_type,
                         emoji_count=body.detail.count,
                         type=body.detail.send_type,
-                        total_operations=body.msg.total_operations
+                        total_operations=body.msg.total_operations,
                     )
                 else:
                     raise ValueError(