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

update register cmd

Browse Source
This commit is contained in:
Laila van Reenen 2024-07-01 20:27:24 +02:00
parent 73b71a60f5
commit f17bf03eaf
Signed by: LailaTheElf
GPG Key ID: 1F4E6EE3E6DDF769
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -33,7 +33,7 @@
connection.onopen = function () connection.onopen = function ()
{ {
connection.send(clientId + ';' + Math.floor(new Date().getTime()/1000.0).toString()); connection.send(clientId + ';3440;' + Math.floor(new Date().getTime()/1000.0).toString());
setTimeout(() => { connection.send(clientId + ';boats'); }, 100); setTimeout(() => { connection.send(clientId + ';boats'); }, 100);
}; };

28
recever.py
View File

@ -41,7 +41,7 @@ async def echoBoats(client):
if (boat["state"] == BOAT_STATE_AVAILABLE): if (boat["state"] == BOAT_STATE_AVAILABLE):
data += 'available:' data += 'available:'
elif (boat["state"] == BOAT_STATE_INCTRL): elif (boat["state"] == BOAT_STATE_INCTRL):
data += 'in:' data += 'inctrl:'
await client['ws'].send(data) await client['ws'].send(data)
async def echoLockedBoats(client): async def echoLockedBoats(client):
@ -88,9 +88,8 @@ async def onMessage(message, client):
else: else:
print("something else: '" + data[1] + "'") print("something else: '" + data[1] + "'")
async def newClient(message, ws): async def newClient(clientId, ws):
message = message.split(';') client = { "id": clientId, "boat": None, "ws": ws, "state": "active" }
client = { "id": message[0], "boat": None, "ws": ws, "state": "active" }
print("new client connected: " + client['id']) print("new client connected: " + client['id'])
for clie in clients: for clie in clients:
if (clie['id'] == client['id']): if (clie['id'] == client['id']):
@ -102,12 +101,27 @@ async def newClient(message, ws):
await echoClients(client) await echoClients(client)
return client return client
async def newBoat(boatId, name, ws):
boat = { "id": boatId, "name": name, "ws": ws, "state": "active" }
print("new client connected: " + client['id'])
for bo in boats:
if (bo['id'] == boat['id']):
bo['state'] = 'terminated'
boats.append(boat)
return boat
async def run(ws, path): async def run(ws, path):
client = None client = None
async for message in ws: async for message in ws:
client = await newClient(message, ws) message = message.split(';')
if (client is not None): if (len(message) == 3 and message[1] == "4675"):
break client = await newClient(message[1], ws)
if (client is not None):
break
elif (len(message) == 3 and message[1] == "3440"):
client = await newBoat(message[1], message[2], ws)
if (client is not None):
break
async for message in ws: async for message in ws:
if (client['state'] == 'active'): if (client['state'] == 'active'):