bakaEC/olivebot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

紧急修复ws连接问题

Browse Source
This commit is contained in:
xszyou 2023-08-15 10:23:11 +08:00
parent f4752fbe5b
commit 98f83e242f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/wsa_server.py
View File

@ -35,7 +35,7 @@ class MyServer:
while self.__running: while self.__running:
await asyncio.sleep(0.000001) await asyncio.sleep(0.000001)
message = await self.__producer() message = await self.__producer()
if message and self.isConnect: if message:
await websocket.send(message) await websocket.send(message)
@ -50,6 +50,9 @@ class MyServer:
task.cancel() task.cancel()
self.isConnect = False self.isConnect = False
util.log(1,"websocket连接断开:{}".format(self.__port)) util.log(1,"websocket连接断开:{}".format(self.__port))
if self.__port == 10002:
web_server_instance = get_web_instance()
web_server_instance.add_cmd({"is_connect": False})
async def __consumer(self, message): async def __consumer(self, message):
self.on_revice_handler(message) self.on_revice_handler(message)
@ -57,6 +60,7 @@ class MyServer:
async def __producer(self): async def __producer(self):
if len(self.__listCmd) > 0: if len(self.__listCmd) > 0:
message = self.on_send_handler(self.__listCmd.pop(0)) message = self.on_send_handler(self.__listCmd.pop(0))
print(message)
return message return message
else: else:
return None return None
@ -77,6 +81,7 @@ class MyServer:
def on_send_handler(self, message): def on_send_handler(self, message):
return message return message
# 创建server # 创建server
def __connect(self): def __connect(self):
self.__event_loop = asyncio.new_event_loop() self.__event_loop = asyncio.new_event_loop()
@ -91,7 +96,7 @@ class MyServer:
# 往要发送的命令列表中，添加命令 # 往要发送的命令列表中，添加命令
def add_cmd(self, content): def add_cmd(self, content):
if not self.__running or not self.isConnect: if not self.__running or (not self.isConnect and self.__port == 10002):
return return
jsonObj = json.dumps(content) jsonObj = json.dumps(content)
self.__listCmd.append(jsonObj) self.__listCmd.append(jsonObj)
@ -129,12 +134,16 @@ class HumanServer(MyServer):
pass pass
def on_connect_handler(self): def on_connect_handler(self):
pass web_server_instance = get_web_instance()
web_server_instance.add_cmd({"is_connect": True})
def on_send_handler(self, message): def on_send_handler(self, message):
# util.log(1, '向human发送 {}'.format(message)) util.log(1, '向human发送 {}'.format(message))
return message return message
#ui端server #ui端server
class WebServer(MyServer): class WebServer(MyServer):
def __init__(self, host='0.0.0.0', port=10000): def __init__(self, host='0.0.0.0', port=10000):
@ -164,6 +173,8 @@ class TestServer(MyServer):
return message return message
#单例 #单例
__instance: MyServer = None __instance: MyServer = None