LailaTheElf/rcrf-wifi
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gs: improve disconnect handeling

Browse Source
This commit is contained in:
Laila van Reenen 2024-08-15 15:24:13 +02:00
parent 07144c04eb
commit da75d0a2a0
Signed by: LailaTheElf
GPG Key ID: 1F4E6EE3E6DDF769
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ground-station.py
View File

@ -13,20 +13,32 @@ BOAT_STATE_INCTRL = 2
BOAT_STATE_AVAILABLE = 1 BOAT_STATE_AVAILABLE = 1
BOAT_STATE_LOCKED = 0 BOAT_STATE_LOCKED = 0
BOAT_STATE_TERMINATED = -1 BOAT_STATE_TERMINATED = -1
BOAT_STATE_DELETE = -2
Boats = [] Boats = []
Clients = [] Clients = []
async def sendToClient(client, msg): def client_disconnect(client):
if client['state'] != 'terminated':
try:
await client['ws'].send(msg)
except websockets.exceptions.ConnectionClosed:
if client['state'] != 'kicked': if client['state'] != 'kicked':
client['state'] = 'terminated' client['state'] = 'del'
if client['boat'] is not None: if client['boat'] is not None:
client['boat']['state'] = BOAT_STATE_AVAILABLE client['boat']['state'] = BOAT_STATE_AVAILABLE
client['boat'] = None client['boat'] = None
for i, cli in enumerate(Clients):
if cli['state'] == 'del':
del Clients[i]
def boat_disconnect(boat):
boat['state'] = BOAT_STATE_DELETE
for i, cli in enumerate(Boats):
if cli['state'] == BOAT_STATE_DELETE:
del Boats[i]
async def sendToClient(client, msg):
try:
await client['ws'].send(msg)
except websockets.exceptions.ConnectionClosed:
client_disconnect(client)
async def sendToBoat(boat, cmd): async def sendToBoat(boat, cmd):
boat['log'].append({"t": datetime.timestamp(datetime.now()), "type": "tx", "msg": cmd}) boat['log'].append({"t": datetime.timestamp(datetime.now()), "type": "tx", "msg": cmd})
@ -229,8 +241,9 @@ async def run(ws, path):
else: else:
break break
except websockets.exceptions.ConnectionClosed: except websockets.exceptions.ConnectionClosed:
print("INFO: client " + client['id'] + ": execption")
print("INFO: client " + client['id'] + ": disconnected") print("INFO: client " + client['id'] + ": disconnected")
client['state'] = "terminated" client_disconnect(client)
break break
elif (len(message) == 3 and message[1] == "3440"): elif (len(message) == 3 and message[1] == "3440"):
client = await new_boat(message[0], message[2], ws) client = await new_boat(message[0], message[2], ws)
@ -247,11 +260,12 @@ async def run(ws, path):
"msg": message "msg": message
}) })
except websockets.exceptions.ConnectionClosed: except websockets.exceptions.ConnectionClosed:
print("INFO: boat " + client['id'] + ": execption")
print("INFO: boat " + client['id'] + ": disconnected") print("INFO: boat " + client['id'] + ": disconnected")
client['state'] = "terminated" boat_disconnect(client)
break break
except websockets.exceptions.ConnectionClosed: except websockets.exceptions.ConnectionClosed:
print("INFO: connection disconected") print("WARN: connection disconected")
async def main(): async def main():
"""main""" """main"""