class NKDeadServer(NKError):
pass
-def full_read(sock):
- """Lit sur la socket jusqu'à ce que l'output soit déJSON-izable"""
- output = ""
- i = 0
- while True:
- output += sock.read()
- i += 1
- try:
- return json.loads(output)
- except:
- pass
- if i == 10 and output == "":
- raise NKDeadServer
+def full_read(socket):
+ # On récupère d'abord la taille du message
+ length_str = ''
+ char = socket.recv(1)
+ while char != '\n':
+ length_str += char
+ char = socket.recv(1)
+ total = int(length_str)
+ # On utilise une memoryview pour recevoir les données chunk par chunk efficacement
+ view = memoryview(bytearray(total))
+ next_offset = 0
+ while total - next_offset > 0:
+ recv_size = socket.recv_into(view[next_offset:], total - next_offset)
+ next_offset += recv_size
+ try:
+ msg = json.loads(view.tobytes())
+ except (TypeError, ValueError) as e:
+ raise NKNotJson("L'objet reçu n'est pas un JSON")
+ return msg
def connect():
sock = socket.socket()
pseudo = ret["msg"]["pseudo"]
return (True, solde, pseudo)
else:
- serv.privmsg(canal, ret["errmsg"])
+ serv.privmsg(canal, ret["errmsg"].encode("utf-8"))
return (False, None, None)
except Exception as exc:
trace = traceback.format_exc()
retcode = ret["retcode"]
if retcode == 0:
boutons = ret["msg"]
- ibouton = [b["label"].lower() for b in boutons].index(conso.lower())
- bouton = boutons[ibouton]
+ boutons = [b for b in boutons if b["label"].lower() == conso.lower()]
+ if len(boutons) == 0:
+ serv.privmsg(canal, (u"Impossible de trouver la conso %s" % (conso)).encode("utf-8"))
+ return False
+ bouton = boutons[0]
sock.write(json.dumps(["consos", [[bouton["id"], idbde, 1]]]))
ret = full_read(sock)
if ret["retcode"] == 0:
[[retcode, [idbouton, idbde], errmsg]] = ret["msg"]
if retcode != 0:
- serv.privmsg(canal, errmsg)
+ serv.privmsg(canal, errmsg.encode("utf-8"))
else:
success, solde, pseudo = get_solde(sock, idbde, serv, canal)
if success: