mirror of
https://github.com/meshcore-dev/meshcore-cli.git
synced 2026-04-20 22:13:48 +00:00
introduce path to node in commands
This commit is contained in:
Florent
parent
a5559787f7
commit
478d4c4d03
1 changed files with 155 additions and 114 deletions
|
|
@ -681,7 +681,22 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# raw meshcli command as on command line
|
# raw meshcli command as on command line
|
||||||
elif line.startswith("$") or line.startswith("/") :
|
elif line.startswith("/") :
|
||||||
|
path = line.split(" ", 1)[0]
|
||||||
|
if path.count("/") == 1:
|
||||||
|
args = shlex.split(line[1:])
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
else:
|
||||||
|
cmdline = line[1:].split("/",1)[1]
|
||||||
|
contact_name = path[1:].split("/",1)[0]
|
||||||
|
tct = mc.get_contact_by_name(contact_name)
|
||||||
|
if tct is None:
|
||||||
|
print(f"{contact_name} is not a contact")
|
||||||
|
else:
|
||||||
|
if not await process_contact_chat_line(mc, tct, cmdline):
|
||||||
|
print(f"{cmdline} not found for {contact_name}")
|
||||||
|
|
||||||
|
elif line.startswith("$") :
|
||||||
args = shlex.split(line[1:])
|
args = shlex.split(line[1:])
|
||||||
await process_cmds(mc, args)
|
await process_cmds(mc, args)
|
||||||
|
|
||||||
|
|
@ -752,104 +767,8 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
|
||||||
args = shlex.split(line)
|
args = shlex.split(line)
|
||||||
await process_cmds(mc, args)
|
await process_cmds(mc, args)
|
||||||
|
|
||||||
# commands that take contact as second arg will be sent to recipient
|
elif await process_contact_chat_line(mc, contact, line):
|
||||||
elif contact["type"] > 0 and (line == "sc" or line == "share_contact" or\
|
pass
|
||||||
line == "ec" or line == "export_contact" or\
|
|
||||||
line == "uc" or line == "upload_contact" or\
|
|
||||||
line == "rp" or line == "reset_path" or\
|
|
||||||
line == "dp" or line == "disc_path" or\
|
|
||||||
line == "contact_info" or line == "ci" or\
|
|
||||||
line == "req_status" or line == "rs" or\
|
|
||||||
line == "req_bstatus" or line == "rbs" or\
|
|
||||||
line == "req_telemetry" or line == "rt" or\
|
|
||||||
line == "req_acl" or\
|
|
||||||
line == "path" or\
|
|
||||||
line == "logout" ) :
|
|
||||||
args = [line, contact['adv_name']]
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
elif contact["type"] > 0 and line.startswith("set timeout "):
|
|
||||||
cmds=line.split(" ")
|
|
||||||
contact["timeout"] = float(cmds[2])
|
|
||||||
|
|
||||||
elif contact["type"] > 0 and line == "get timeout":
|
|
||||||
print(f"timeout: {0 if not 'timeout' in contact else contact['timeout']}")
|
|
||||||
|
|
||||||
elif contact["type"] == 4 and\
|
|
||||||
(line.startswith("get mma ")) or\
|
|
||||||
contact["type"] > 1 and\
|
|
||||||
(line.startswith("get telemetry") or line.startswith("get status") or line.startswith("get acl")):
|
|
||||||
cmds = line.split(" ")
|
|
||||||
args = [f"req_{cmds[1]}", contact['adv_name']]
|
|
||||||
if len(cmds) > 2 :
|
|
||||||
args = args + cmds[2:]
|
|
||||||
if line.startswith("get mma ") and len(args) < 4:
|
|
||||||
args.append("0")
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
# special treatment for setperm to support contact name as param
|
|
||||||
elif contact["type"] > 1 and\
|
|
||||||
(line.startswith("setperm ") or line.startswith("set perm ")):
|
|
||||||
try:
|
|
||||||
cmds = shlex.split(line)
|
|
||||||
off = 1 if line.startswith("set perm") else 0
|
|
||||||
name = cmds[1 + off]
|
|
||||||
perm_string = cmds[2 + off]
|
|
||||||
if (perm_string.startswith("0x")):
|
|
||||||
perm = int(perm_string,0)
|
|
||||||
elif (perm_string.startswith("#")):
|
|
||||||
perm = int(perm_string[1:])
|
|
||||||
else:
|
|
||||||
perm = int(perm_string,16)
|
|
||||||
ct=mc.get_contact_by_name(name)
|
|
||||||
if ct is None:
|
|
||||||
ct=mc.get_contact_by_key_prefix(name)
|
|
||||||
if ct is None:
|
|
||||||
if name == "self" or mc.self_info["public_key"].startswith(name):
|
|
||||||
key = mc.self_info["public_key"]
|
|
||||||
else:
|
|
||||||
key = name
|
|
||||||
else:
|
|
||||||
key=ct["public_key"]
|
|
||||||
newline=f"setperm {key} {perm}"
|
|
||||||
await process_cmds(mc, ["cmd", contact["adv_name"], newline])
|
|
||||||
except IndexError:
|
|
||||||
print("Wrong number of parameters")
|
|
||||||
|
|
||||||
# trace called on a contact
|
|
||||||
elif contact["type"] > 0 and (
|
|
||||||
line == "trace" or line == "tr") :
|
|
||||||
await print_trace_to(mc, contact)
|
|
||||||
|
|
||||||
elif contact["type"] > 0 and (
|
|
||||||
line == "dtrace" or line == "dt") :
|
|
||||||
await print_disc_trace_to(mc, contact)
|
|
||||||
|
|
||||||
# same but for commands with a parameter
|
|
||||||
elif contact["type"] > 0 and (line.startswith("cmd ") or\
|
|
||||||
line.startswith("cp ") or line.startswith("change_path ") or\
|
|
||||||
line.startswith("cf ") or line.startswith("change_flags ") or\
|
|
||||||
line.startswith("req_binary ") or\
|
|
||||||
line.startswith("login ")) :
|
|
||||||
cmds = line.split(" ", 1)
|
|
||||||
args = [cmds[0], contact['adv_name'], cmds[1]]
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
elif contact["type"] == 4 and \
|
|
||||||
(line.startswith("req_mma ") or line.startswith('rm ')) :
|
|
||||||
cmds = line.split(" ")
|
|
||||||
if len(cmds) < 3 :
|
|
||||||
cmds.append("0")
|
|
||||||
args = [cmds[0], contact['adv_name'], cmds[1], cmds[2]]
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
elif line.startswith(":") : # : will send a command to current recipient
|
|
||||||
args=["cmd", contact['adv_name'], line[1:]]
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
elif line == "reset path" : # reset path for compat with terminal chat
|
|
||||||
args = ["reset_path", contact['adv_name']]
|
|
||||||
await process_cmds(mc, args)
|
|
||||||
|
|
||||||
elif line == "list" : # list command from chat displays contacts on a line
|
elif line == "list" : # list command from chat displays contacts on a line
|
||||||
it = iter(mc.contacts.items())
|
it = iter(mc.contacts.items())
|
||||||
|
|
@ -887,6 +806,121 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
|
||||||
interactive_loop.classic = False
|
interactive_loop.classic = False
|
||||||
interactive_loop.print_name = True
|
interactive_loop.print_name = True
|
||||||
|
|
||||||
|
async def process_contact_chat_line(mc, contact, line):
|
||||||
|
if contact["type"] == 0:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if line.startswith(":") : # : will send a command to current recipient
|
||||||
|
args=["cmd", contact['adv_name'], line[1:]]
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
if line == "reset path" : # reset path for compat with terminal chat
|
||||||
|
args = ["reset_path", contact['adv_name']]
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
# commands that take contact as second arg will be sent to recipient
|
||||||
|
if line == "sc" or line == "share_contact" or\
|
||||||
|
line == "ec" or line == "export_contact" or\
|
||||||
|
line == "uc" or line == "upload_contact" or\
|
||||||
|
line == "rp" or line == "reset_path" or\
|
||||||
|
line == "dp" or line == "disc_path" or\
|
||||||
|
line == "contact_info" or line == "ci" or\
|
||||||
|
line == "req_status" or line == "rs" or\
|
||||||
|
line == "req_bstatus" or line == "rbs" or\
|
||||||
|
line == "req_telemetry" or line == "rt" or\
|
||||||
|
line == "req_acl" or\
|
||||||
|
line == "path" or\
|
||||||
|
line == "logout" :
|
||||||
|
args = [line, contact['adv_name']]
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
if line.startswith("set timeout "):
|
||||||
|
cmds=line.split(" ")
|
||||||
|
contact["timeout"] = float(cmds[2])
|
||||||
|
return True
|
||||||
|
|
||||||
|
if line == "get timeout":
|
||||||
|
print(f"timeout: {0 if not 'timeout' in contact else contact['timeout']}")
|
||||||
|
return True
|
||||||
|
|
||||||
|
if contact["type"] == 4 and\
|
||||||
|
(line.startswith("get mma ")) or\
|
||||||
|
contact["type"] > 1 and\
|
||||||
|
(line.startswith("get telemetry") or line.startswith("get status") or line.startswith("get acl")):
|
||||||
|
cmds = line.split(" ")
|
||||||
|
args = [f"req_{cmds[1]}", contact['adv_name']]
|
||||||
|
if len(cmds) > 2 :
|
||||||
|
args = args + cmds[2:]
|
||||||
|
if line.startswith("get mma ") and len(args) < 4:
|
||||||
|
args.append("0")
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
# special treatment for setperm to support contact name as param
|
||||||
|
if contact["type"] > 1 and\
|
||||||
|
(line.startswith("setperm ") or line.startswith("set perm ")):
|
||||||
|
try:
|
||||||
|
cmds = shlex.split(line)
|
||||||
|
off = 1 if line.startswith("set perm") else 0
|
||||||
|
name = cmds[1 + off]
|
||||||
|
perm_string = cmds[2 + off]
|
||||||
|
if (perm_string.startswith("0x")):
|
||||||
|
perm = int(perm_string,0)
|
||||||
|
elif (perm_string.startswith("#")):
|
||||||
|
perm = int(perm_string[1:])
|
||||||
|
else:
|
||||||
|
perm = int(perm_string,16)
|
||||||
|
ct=mc.get_contact_by_name(name)
|
||||||
|
if ct is None:
|
||||||
|
ct=mc.get_contact_by_key_prefix(name)
|
||||||
|
if ct is None:
|
||||||
|
if name == "self" or mc.self_info["public_key"].startswith(name):
|
||||||
|
key = mc.self_info["public_key"]
|
||||||
|
else:
|
||||||
|
key = name
|
||||||
|
else:
|
||||||
|
key=ct["public_key"]
|
||||||
|
newline=f"setperm {key} {perm}"
|
||||||
|
await process_cmds(mc, ["cmd", contact["adv_name"], newline])
|
||||||
|
except IndexError:
|
||||||
|
print("Wrong number of parameters")
|
||||||
|
return True
|
||||||
|
|
||||||
|
# trace called on a contact
|
||||||
|
if line == "trace" or line == "tr" :
|
||||||
|
await print_trace_to(mc, contact)
|
||||||
|
return True
|
||||||
|
|
||||||
|
if line == "dtrace" or line == "dt" :
|
||||||
|
await print_disc_trace_to(mc, contact)
|
||||||
|
return True
|
||||||
|
|
||||||
|
# same but for commands with a parameter
|
||||||
|
if line.startswith("cmd ") or\
|
||||||
|
line.startswith("cp ") or line.startswith("change_path ") or\
|
||||||
|
line.startswith("cf ") or line.startswith("change_flags ") or\
|
||||||
|
line.startswith("req_binary ") or\
|
||||||
|
line.startswith("login ") :
|
||||||
|
cmds = line.split(" ", 1)
|
||||||
|
args = [cmds[0], contact['adv_name'], cmds[1]]
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
if contact["type"] == 4 and \
|
||||||
|
(line.startswith("req_mma ") or line.startswith('rm ')) :
|
||||||
|
cmds = line.split(" ")
|
||||||
|
if len(cmds) < 3 :
|
||||||
|
cmds.append("0")
|
||||||
|
args = [cmds[0], contact['adv_name'], cmds[1], cmds[2]]
|
||||||
|
await process_cmds(mc, args)
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
async def send_cmd (mc, contact, cmd) :
|
async def send_cmd (mc, contact, cmd) :
|
||||||
res = await mc.commands.send_cmd(contact, cmd)
|
res = await mc.commands.send_cmd(contact, cmd)
|
||||||
if not res is None and not res.type == EventType.ERROR:
|
if not res is None and not res.type == EventType.ERROR:
|
||||||
|
|
@ -1801,7 +1835,14 @@ async def next_cmd(mc, cmds, json_output=False):
|
||||||
|
|
||||||
case "trace" | "tr":
|
case "trace" | "tr":
|
||||||
argnum = 1
|
argnum = 1
|
||||||
res = await mc.commands.send_trace(path=cmds[1])
|
path = cmds[1]
|
||||||
|
plen = int(len(path)/2)
|
||||||
|
if plen > 1 and path.count(",") == 0:
|
||||||
|
path = cmds[1][0:2]
|
||||||
|
for i in range(1, plen):
|
||||||
|
path = path + "," + cmds[1][2*i:2*i+2]
|
||||||
|
|
||||||
|
res = await mc.commands.send_trace(path=path)
|
||||||
if res and res.type != EventType.ERROR:
|
if res and res.type != EventType.ERROR:
|
||||||
tag= int.from_bytes(res.payload['expected_ack'], byteorder="little")
|
tag= int.from_bytes(res.payload['expected_ack'], byteorder="little")
|
||||||
timeout = res.payload["suggested_timeout"] / 1000 * 1.2
|
timeout = res.payload["suggested_timeout"] / 1000 * 1.2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue