添加日志、完善一些功能

chat.py

@@ -1,13 +1,17 @@
 # -*- coding: utf-8 -*-
 
+import asyncio
 import enum
 import json
+import logging
 from typing import *
 
 import tornado.websocket
 
 import blivedm.blivedm as blivedm
 
+logger = logging.getLogger(__name__)
+
 
 class Command(enum.IntEnum):
     JOIN_ROOM = 0
@@ -17,6 +21,8 @@ class Command(enum.IntEnum):
 
 
 class Room(blivedm.BLiveClient):
+    _COMMAND_HANDLERS = blivedm.BLiveClient._COMMAND_HANDLERS.copy()
+
     def __init__(self, room_id):
         super().__init__(room_id)
         self.future = None
@@ -28,20 +34,26 @@ class Room(blivedm.BLiveClient):
     def stop(self):
         if self.future is not None:
             self.future.cancel()
+        asyncio.ensure_future(self.close())
 
     def send_message(self, cmd, data):
         body = json.dumps({'cmd': cmd, 'data': data})
         for client in self.clients:
             client.write_message(body)
 
-    async def _on_get_danmaku(self, content, user_name):
-        # TODO
+    async def __my_on_get_danmaku(self, command):
+        user_id = command['info'][2][0]
+        # TODO 获取头像
         data = {
-            'content': content,
-            'authorName': user_name
+            'avatarUrl': 'https://i0.hdslb.com/bfs/face/29b6be8aa611e70a3d3ac219cdaf5e72b604f2de.jpg@24w_24h.webp',
+            'timestamp': command['info'][0][4],
+            'content': command['info'][1],
+            'authorName': command['info'][2][1]
         }
         self.send_message(Command.ADD_TEXT, data)
 
+    _COMMAND_HANDLERS['SEND_GIFT'] = __my_on_get_danmaku
+
 
 class RoomManager:
     def __init__(self):
@@ -51,6 +63,7 @@ class RoomManager:
         if room_id in self._rooms:
             room = self._rooms[room_id]
         else:
+            logger.info('创建房间%d', room_id)
             room = Room(room_id)
             self._rooms[room_id] = room
             room.start()
@@ -62,6 +75,7 @@ class RoomManager:
         room = self._rooms[room_id]
         room.clients.remove(client)
         if not room.clients:
+            logger.info('移除房间%d', room_id)
             room.stop()
             del self._rooms[room_id]
 
@@ -75,15 +89,22 @@ class ChatHandler(tornado.websocket.WebSocketHandler):
         super().__init__(*args, **kwargs)
         self.room_id = None
 
+    def open(self):
+        logger.info('Websocket连接 %s', self.request.remote_ip)
+
     def on_message(self, message):
         if self.room_id is not None:
             return
         body = json.loads(message)
         if body['cmd'] == Command.JOIN_ROOM:
-            room_id = body['data']['roomId']
-            room_manager.add_client(room_id, self)
+            self.room_id = int(body['data']['roomId'])
+            logger.info('客户端%s加入房间%d', self.request.remote_ip, self.room_id)
+            room_manager.add_client(self.room_id, self)
+        else:
+            logger.warning('未知的命令: %s data: %s', body['cmd'], body['data'])
 
     def on_close(self):
+        logger.info('Websocket断开 %s room: %s', self.request.remote_ip, self.room_id)
         if self.room_id is not None:
             room_manager.del_client(self.room_id, self)
 

frontend/src/components/Room.vue

@@ -15,9 +15,11 @@
       </yt-live-chat-ticker-paid-message-item-renderer>
     </yt-live-chat-ticker-renderer> -->
     <yt-live-chat-item-list-renderer>
-      <text-message v-for="message in messages" :key="message.id"
-        :avatarUrl="message.avatarUrl" :time="message.time" :authorName="message.authorName" :content="message.content"
-      ></text-message>
+      <template v-for="message in messages">
+        <text-message :key="message.id"
+          :avatarUrl="message.avatarUrl" :time="message.time" :authorName="message.authorName" :content="message.content"
+        ></text-message>
+      </template>
     </yt-live-chat-item-list-renderer>
   </yt-live-chat-renderer>
 </template>
@@ -42,25 +44,29 @@ export default {
     // 测试用
     this.websocket = new WebSocket('ws://localhost/chat')
     this.websocket.onopen = () => this.websocket.send(JSON.stringify({
-      cmd: 0,
+      cmd: 0, // JOIN_ROOM
       data: {
         roomId: parseInt(this.$route.params.roomId)
       }
     }))
     this.websocket.onmessage = (event) => {
       let body = JSON.parse(event.data)
+      let time = new Date(body.data.timestamp * 1000)
+      let message = {
+        id: this.nextId++,
+        time: `${time.getHours()}:${time.getMinutes()}`,
+        ...body.data
+      }
       switch(body.cmd) {
         case 1: // ADD_TEXT
-          this.messages.push({
-            id: this.nextId++,
-            avatarUrl: '',
-            time: '12:00',
-            authorName: body.data.authorName,
-            content: body.data.content
-          })
-          window.scrollTo(0, document.body.scrollHeight)
+          this.messages.push(message)
+          break;
+        case 2: // ADD_GIFT
+          break;
+        case 3: // ADD_VIP
           break;
       }
+      window.scrollTo(0, document.body.scrollHeight)
     }
   },
   beforeDestroy() {

frontend/src/components/TextMessage.vue

@@ -1,8 +1,6 @@
 <template>
   <yt-live-chat-text-message-renderer>
-    <div id="author-photo">
-      <img id="img" height="24" width="24" :src="avatarUrl" />
-    </div>
+    <div id="author-photo" :style="`background-image: url(${avatarUrl})`"></div>
     <div id="content">
       <span id="timestamp">{{time}}</span>
       <span id="author-name">{{authorName}}</span>

main.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import logging
 import os
 
 import tornado.ioloop
@@ -7,6 +8,8 @@ import tornado.web
 
 import chat
 
+logger = logging.getLogger(__name__)
+
 WEB_ROOT = os.path.join(os.path.dirname(__file__), 'frontend', 'dist')
 
 
@@ -18,6 +21,13 @@ class MainHandler(tornado.web.StaticFileHandler):
 
 
 def main():
+    logging.basicConfig(
+        format='{asctime} {levelname} [{name}]: {message}',
+        datefmt='%Y-%m-%d %H:%M:%S',
+        style='{',
+        level=logging.INFO
+    )
+
     app = tornado.web.Application([
         (r'/chat', chat.ChatHandler),
         (r'/((css|img|js)/.*)', tornado.web.StaticFileHandler, {'path': WEB_ROOT}),
@@ -25,6 +35,7 @@ def main():
         (r'/.*', MainHandler, {'path': WEB_ROOT})
     ], websocket_ping_interval=30)
     app.listen(80, '127.0.0.1')
+    logger.info('服务器启动：127.0.0.1:80')
     tornado.ioloop.IOLoop.current().start()