Merge pull request #75 from nineaiyu/dev

fix: 修复在线用户异常，改用redis实现

Author: nineaiyu

common/cache/redis.py

@@ -16,6 +16,8 @@
 
 def format_return(data):
     try:
+        if isinstance(data, bytes):
+            data = data.decode(encoding='utf-8')
         return json.loads(data)
     except:
         return data

message/notify.py

@@ -21,7 +21,8 @@
 from common.core.config import UserConfig
 from common.decorators import cached_method
 from common.utils import get_logger
-from message.utils import async_push_message
+from common.utils.timezone import local_now_display
+from message.utils import async_push_message, online_caches
 from system.models import UserInfo
 from system.serializers.userinfo import UserInfoSerializer
 
@@ -79,6 +80,8 @@ async def connect(self):
                 self.disconnected = False
                 # Join room group
                 await self.channel_layer.group_add(self.room_group_name, self.channel_name)
+                online_caches.push(self.room_group_name, {'time': local_now_display(), 'name': self.channel_name})
+
                 await self.accept()
                 # 建立连接，推送用户信息
                 # await self.userinfo(None)
@@ -87,6 +90,10 @@ async def disconnect(self, close_code):
         self.disconnected = True
         if self.room_group_name:
             await self.channel_layer.group_discard(self.room_group_name, self.channel_name)
+
+            if self.channel_layer._get_group_channel_name(self.room_group_name) not in self.channel_layer.groups:
+                online_caches.pop(self.room_group_name)
+
         logger.info(f"{self.user} disconnect")
 
     @classmethod

message/utils.py

@@ -12,11 +12,13 @@
 from django.conf import settings
 from rest_framework.utils import encoders
 
+from common.cache.redis import CacheHash
 
-@async_to_sync
-async def get_online_user_pks():
-    channel_layer = get_channel_layer()
-    return {int(key.split('_')[-1]) for key in channel_layer.groups.keys()}
+online_caches = CacheHash(key='online_users_socket')
+
+
+def get_online_user_pks():
+    return {int(key.split('_')[-1]) for key in online_caches.get_all().keys()}
 
 
 async def async_push_message(user_pk: str | int, message: Dict, message_type='push_message'):