mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_admin_shell: Don't pause async thread while waiting for promise result

Browse source 
This allows us to continue sending/receiving on the session, for example if
the promise will be resolved by other data that the client is going to send.

Specifically, this allows the repl-request-input to work without a deadlock.

It does open the door to interleaved commands/results, which may not be a good
thing overall, but can be restricted separately if necessary (e.g. a flag on
the session).
This commit is contained in:
Matthew Wild 2025-01-07 18:15:50 +00:00
parent 91776f57ef
commit 957c69461f
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
plugins/mod_admin_shell.lua
View file

@ -266,25 +266,33 @@ local function handle_line(event)
end
end
local function send_result(taskok, message)
if not message then
if type(taskok) ~= "string" and useglobalenv then
taskok = session.serialize(taskok);
end
result:text("Result: "..tostring(taskok));
elseif (not taskok) and message then
result.attr.type = "error";
result:text("Error: "..tostring(message));
else
result:text("OK: "..tostring(message));
end
event.origin.send(result);
end
local taskok, message = chunk();
if promise.is_promise(taskok) then
taskok, message = async.wait_for(taskok);
end
if not message then
if type(taskok) ~= "string" and useglobalenv then
taskok = session.serialize(taskok);
end
result:text("Result: "..tostring(taskok));
elseif (not taskok) and message then
result.attr.type = "error";
result:text("Error: "..tostring(message));
taskok:next(function (resolved_message)
send_result(true, resolved_message);
end, function (rejected_message)
send_result(nil, rejected_message);
end);
else
result:text("OK: "..tostring(message));
send_result(taskok, message);
end
event.origin.send(result);
end
module:hook("admin/repl-input", function (event)