William
/
Reticulum
mirror of https://github.com/markqvist/Reticulum.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved rnx interactive mode

This commit is contained in:
Mark Qvist 2022-07-02 10:38:35 +02:00
parent 2335a71427
commit 4a725de935
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RNS/Utilities/rnx.py
View File

@ -337,13 +337,15 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
if link == None or link.status == RNS.Link.CLOSED or link.status == RNS.Link.PENDING: if link == None or link.status == RNS.Link.CLOSED or link.status == RNS.Link.PENDING:
link = RNS.Link(listener_destination) link = RNS.Link(listener_destination)
link.did_identify = False
if not spin(until=lambda: link.status == RNS.Link.ACTIVE, msg="Establishing link with "+RNS.prettyhexrep(destination_hash), timeout=timeout): if not spin(until=lambda: link.status == RNS.Link.ACTIVE, msg="Establishing link with "+RNS.prettyhexrep(destination_hash), timeout=timeout):
print("Could not establish link with "+RNS.prettyhexrep(destination_hash)) print("Could not establish link with "+RNS.prettyhexrep(destination_hash))
exit(243) exit(243)
if not noid: if not noid and not link.did_identify:
link.identify(identity) link.identify(identity)
link.did_identify = True
if stdin != None: if stdin != None:
stdin = stdin.encode("utf-8") stdin = stdin.encode("utf-8")
@ -380,7 +382,10 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
if request_receipt.status == RNS.RequestReceipt.FAILED: if request_receipt.status == RNS.RequestReceipt.FAILED:
print("Could not request remote execution") print("Could not request remote execution")
exit(244) if interactive:
return
else:
exit(244)
spin( spin(
until=lambda:request_receipt.status != RNS.RequestReceipt.DELIVERED, until=lambda:request_receipt.status != RNS.RequestReceipt.DELIVERED,
@ -390,7 +395,10 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
if request_receipt.status == RNS.RequestReceipt.FAILED: if request_receipt.status == RNS.RequestReceipt.FAILED:
print("No result was received") print("No result was received")
exit(245) if interactive:
return
else:
exit(245)
spin_stat( spin_stat(
until=lambda:request_receipt.status != RNS.RequestReceipt.RECEIVING, until=lambda:request_receipt.status != RNS.RequestReceipt.RECEIVING,
@ -399,7 +407,10 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
if request_receipt.status == RNS.RequestReceipt.FAILED: if request_receipt.status == RNS.RequestReceipt.FAILED:
print("Receiving result failed") print("Receiving result failed")
exit(246) if interactive:
return
else:
exit(246)
if request_receipt.response != None: if request_receipt.response != None:
try: try:
@ -414,7 +425,10 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
except Exception as e: except Exception as e:
print("Received invalid result") print("Received invalid result")
exit(247) if interactive:
return
else:
exit(247)
if executed: if executed:
if detailed: if detailed:
@ -484,7 +498,10 @@ def execute(configdir, identitypath = None, verbosity = 0, quietness = 0, detail
exit(248) exit(248)
else: else:
print("No response") print("No response")
exit(249) if interactive:
return
else:
exit(249)
try: try:
if not interactive: if not interactive: