[Merge] with dev

coco/app.py

@@ -125,6 +125,10 @@ class Coco:
         else:
             return True
 
+    def heartbeat_async(self):
+        t = threading.Thread(target=self.heartbeat)
+        t.start()
+
     def handle_task(self, tasks):
         for task in tasks:
             self.task_handler.handle(task)
@@ -212,15 +216,10 @@ class Coco:
     def add_session(self, session):
         with self.lock:
             self.sessions.append(session)
-            self.heartbeat()
+            self.heartbeat_async()
 
     def remove_session(self, session):
         with self.lock:
             logger.info("Remove session: {}".format(session))
-            for i in range(10):
-                if self.heartbeat():
             self.sessions.remove(session)
-                    break
-                else:
-                    time.sleep(1)
-
+            self.heartbeat_async()

coco/interactive.py

@@ -134,8 +134,7 @@ class InteractiveServer:
         if q == '':
             result = self.assets
         # 用户输入的是数字，可能想使用id唯一键搜索
-        elif q.isdigit():
-            if len(self.search_result) >= int(q):
+        elif q.isdigit() and self.search_result and len(self.search_result) >= int(q):
             result = [self.search_result[int(q) - 1]]
 
         # 全匹配到则直接返回全匹配的

coco/session.py

@@ -126,8 +126,6 @@ class Session:
                     if len(data) == 0:
                         msg = "Server close the connection"
                         logger.info(msg)
-                        for watcher in [self.client] + self._watchers + self._sharers:
-                            watcher.send(msg.encode('utf-8'))
                         self.close()
                         break
                     for watcher in [self.client] + self._watchers + self._sharers: