improve connection

Author: kitech

wxagent/qirc.py

@@ -60,13 +60,29 @@ def startup(self):
         return
 
     def iterate(self):
-        self._client.process_once(timeout=0)
+        try:
+            self._client.process_once(timeout=0)
+        except irc.client.ServerNotConnectedError as ex:
+            asyncio.get_event_loop().call_soon(self.reconnect)
         return
 
     def reconnect(self):
         r = self._server.connect(self._host, self._port, self._user)
         return r
 
+    def tryReconnect(self):
+        to = self.checkTimeout()
+        reconn = False
+        if to is True:
+            reconn = True
+        if self._server.is_connected() is False:
+            qDebug('not connected. retry...')
+            reconn = True
+
+        if reconn is True:
+            self.reconnect()
+        return
+
     # use last_ping_time
     def checkTimeout(self):
         now = time.time()
@@ -147,6 +163,7 @@ def groupInvite(self, nick, channel):
         return
 
     def sendMessage(self, msg):
+        self.tryReconnect()
         if self._server.is_connected():
             ret = self._server.privmsg(self._peer_user, msg)
             qDebug(str(ret).encode())
@@ -155,7 +172,7 @@ def sendMessage(self, msg):
         return
 
     def sendGroupMessage(self, msg, channel):
-        to = self.checkTimeout()
+        self.tryReconnect()
         if self._server.is_connected():
             if self.validName(channel):
                 self.groupAdd(channel)
@@ -169,12 +186,7 @@ def sendGroupMessage(self, msg, channel):
                 qDebug('Invalid channel name: {}'.format(channel).encode())
                 return False
         else:
-            qDebug('not connected. retry...')
-            self.reconnect()
-            if self._server.is_connected():
-                return self.sendGroupMessage(msg, channel)
-            else:
-                return False
+            qDebug('wtf')
         return True
 
     def validName(self, name):

wxagent/qtoxkit.py

@@ -571,10 +571,14 @@ def groupchatSendMessage(self, group_number, msg):
         # MAX_GROUP_MESSAGE_DATA_LEN
         mlen = 1371 - 10  # TODO 这应该是bytes，现在是以字符串方式处理，对于宽字符串可能能转为bytes后长度就超过了。
 
-        msg_inbytes = msg.encode()
-        for msgn in self._splitmessage(msg_inbytes, mlen):
-            msgn_instr = msgn.decode()
-            rc = self.tox.group_message_send(group_number, msgn_instr)
+        rc = None
+        try:
+            msg_inbytes = msg.encode()
+            for msgn in self._splitmessage(msg_inbytes, mlen):
+                msgn_instr = msgn.decode()
+                rc = self.tox.group_message_send(group_number, msgn_instr)
+        except Exception as ex:
+            pass
         return rc
 
     def groupchatJoin(self, friend_number, group_type, group_pubkey):
@@ -610,7 +614,11 @@ def groupPeerName(self, group_number, peer_number):
         return rc
 
     def groupPeerPubkey(self, group_number, peer_number):
-        rc = self.tox.group_peer_pubkey(group_number, peer_number)
+        rc = None
+        try:
+            rc = self.tox.group_peer_pubkey(group_number, peer_number)
+        except Exception as ex:
+            qDebug(str(ex).encode())
         return rc
 
     # @param group_pubkey data's hex encoded string

wxagent/roundtable.py

@@ -163,6 +163,10 @@ def processOperatorRoundTable(self, msgo):
             qDebug(str(msgo).encode())
             if msgo['context']['content'] == '':
                 return
+            channel = msgo['context']['channel']
+            if channel in ['#linuxba']:
+                qDebug('filtered show title feature for channel:{}'.format(channel).encode())
+                return
             msgo['src'] = msgo['context']['src']
             if msgo['src'] == 'IRCAgent':
                 self.processOperatorIRC(msgo)

wxagent/toxrelay.py

@@ -78,6 +78,9 @@ def createChatroom(self, room_key, title):
         return str(group_number)
 
     def groupInvite(self, group_number, peer):
+        if group_number is None:
+            qDebug('invalid group_number')
+            return
         group_number = int(group_number)
         rc = self.toxkit.groupchatInviteFriend(group_number, peer)
         return rc
@@ -231,6 +234,7 @@ def groupPeerIsMe(self, group_number, peer_number):
         peer_pubkey = self.toxkit.groupPeerPubkey(group_number, peer_number)
         my_addr = self.toxkit.selfGetAddress()
         qDebug('{}, {}, {}'.format(peer_pubkey, my_addr, peer_pubkey == my_addr))
+        if my_addr is None: return False
         return my_addr.find(peer_pubkey) == 0
 
     def onlyMyself(self, group_number):