Narcissus/pylibmeshctrl
3
0
Fork 1
mirror of https://github.com/HuFlungDu/pylibmeshctrl.git synced 2026-02-20 13:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed old style run_command failing

Browse Source
This commit is contained in:
Josiah Baldwin
2025-09-26 12:57:30 -07:00
parent 4953d85cdc
commit 891f7bfc12
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/meshctrl/session.py
View File

@@ -184,7 +184,7 @@ class Session(object):
async def _listen_data_task(self, websocket): async def _listen_data_task(self, websocket):
async for message in websocket: async for message in websocket:
await self._eventer.emit("raw", message) await self._eventer.emit("raw", message)
# Meshcentral does pong wrong and breaks our parsing, so fix it here. # Meshcentral does pong wrong and breaks our parsing, so fix it here. This is fixed now, but we want compatibility with old versions.
if message == '{action:"pong"}': if message == '{action:"pong"}':
message = '{"action":"pong"}' message = '{"action":"pong"}'
@@ -1511,6 +1511,7 @@ class Session(object):
raise exceptions.ServerError(data["result"]) raise exceptions.ServerError(data["result"])
elif data.get("type", None) != "runcommands" and data.get("result", "ok").lower() == "ok": elif data.get("type", None) != "runcommands" and data.get("result", "ok").lower() == "ok":
expect_response = False expect_response = False
console_task = tg.create_task(asyncio.wait_for(_console(), timeout=timeout))
if not ignore_output: if not ignore_output:
userid = (await self.user_info())["_id"] userid = (await self.user_info())["_id"]
for n in nodeids: for n in nodeids:
@@ -1527,13 +1528,15 @@ class Session(object):
except AttributeError: except AttributeError:
result[n]["complete"] = True result[n]["complete"] = True
if expect_response: if expect_response:
tasks.append(tg.create_task(asyncio.wait_for(_console(), timeout=timeout))) tasks.append(console_task)
else:
console_task.cancel()
elif data.get("type", None) == "runcommands" and not ignore_output: elif data.get("type", None) == "runcommands" and not ignore_output:
tasks.append(tg.create_task(asyncio.wait_for(_reply(data["responseid"], start_data=data), timeout=timeout))) tasks.append(tg.create_task(asyncio.wait_for(_reply(data["responseid"], start_data=data), timeout=timeout)))
tasks = [] tasks = []
async with asyncio.TaskGroup() as tg: async with asyncio.TaskGroup() as tg:
tasks.append(tg.create_task(__({ "action": 'runcommands', "nodeids": nodeids, "type": (2 if powershell else 0), "cmds": command, "runAsUser": runAsUser, "reply": not ignore_output }, tg, tasks))) tasks.append(tg.create_task(__({ "action": 'runcommands', "nodeids": nodeids, "type": (2 if powershell else 0), "cmds": command, "runAsUser": runAsUser, "reply": not ignore_output}, tg, tasks)))
return {n: v | {"result": "".join(v["result"])} for n,v in result.items()} return {n: v | {"result": "".join(v["result"])} for n,v in result.items()}