core.moduleapi: Filter out unrelated direct replies to module:send_iq
authorKim Alvefur <zash@zash.se>
Fri, 24 Sep 2021 20:12:16 +0200
changeset 11825 a9ad287c3388
parent 11824 0375ef78ed64
child 11826 bdabb0425d77
core.moduleapi: Filter out unrelated direct replies to module:send_iq This is primarily something that happens with an internal query to mod_mam, which calls origin.send() several times with results, leading to the first such result being treated as the final response and resolving the promise. Now, these responses pass trough to the underlying origin.send(), where they can be caught. Tricky but not impossible. For remote queries, it's even trickier, you would likely need to bind a resource or similar.
core/moduleapi.lua
--- a/core/moduleapi.lua	Fri Sep 24 18:39:28 2021 +0200
+++ b/core/moduleapi.lua	Fri Sep 24 20:12:16 2021 +0200
@@ -439,7 +439,10 @@
 		local wrapped_origin = setmetatable({
 				-- XXX Needed in some cases for replies to work correctly when sending queries internally.
 				send = function (reply)
-					resolve({ stanza = reply });
+					if reply.name == stanza.name and reply.attr.id == stanza.attr.id then
+						resolve({ stanza = reply });
+					end
+					return (origin or hosts[self.host]).send(reply)
 				end;
 			}, {
 				__index = origin or hosts[self.host];