X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fmodulemanager.lua;h=8e62aecb8231ee8e6e50b8f2a071b4197b44b33d;hb=1881612f6e77c771984d73b85704e89818a82977;hp=55cb06d17d89600f17e5574528c6eb93a055b18b;hpb=f25b41f77c93a5d0021f51b0653bcaa9423a1b12;p=prosody.git

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 55cb06d1..8e62aecb 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -10,6 +10,7 @@ local plugin_dir = CFG_PLUGINDIR or "./plugins/";
 
 local logger = require "util.logger";
 local log = logger.init("modulemanager");
+local eventmanager = require "core.eventmanager";
 local config = require "core.configmanager";
 local multitable_new = require "util.multitable".new;
 local st = require "util.stanza";
@@ -17,7 +18,6 @@ local pluginloader = require "util.pluginloader";
 
 local hosts = hosts;
 local prosody = prosody;
-local prosody_events = prosody.events;
 
 local loadfile, pcall, xpcall = loadfile, pcall, xpcall;
 local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
@@ -51,9 +51,15 @@ local api = api; -- Module API container
 
 local modulemap = { ["*"] = {} };
 
+local stanza_handlers = multitable_new();
+local handler_info = {};
+
 local modulehelpers = setmetatable({}, { __index = _G });
 
+local handler_table = multitable_new();
+local hooked = multitable_new();
 local hooks = multitable_new();
+local event_hooks = multitable_new();
 
 local NULL = {};
 
@@ -98,8 +104,8 @@ function load_modules_for_host(host)
 		end
 	end
 end
-prosody_events.add_handler("host-activated", load_modules_for_host);
-prosody_events.add_handler("component-activated", load_modules_for_host);
+eventmanager.add_event_hook("host-activated", load_modules_for_host);
+eventmanager.add_event_hook("component-activated", load_modules_for_host);
 --
 
 function load(host, module_name, config)
@@ -186,6 +192,15 @@ function unload(host, name, ...)
 			log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
 		end
 	end
+	local params = handler_table:get(host, name); -- , {module.host, origin_type, tag, xmlns}
+	for _, param in pairs(params or NULL) do
+		local handlers = stanza_handlers:get(param[1], param[2], param[3], param[4]);
+		if handlers then
+			handler_info[handlers[1]] = nil;
+			stanza_handlers:remove(param[1], param[2], param[3], param[4]);
+		end
+	end
+	event_hooks:remove(host, name);
 	-- unhook event handlers hooked by module:hook
 	for event, handlers in pairs(hooks:get(host, name) or NULL) do
 		for handler in pairs(handlers or NULL) do
@@ -260,14 +275,22 @@ function handle_stanza(host, origin, stanza)
 			return true;
 		end
 	end
-	if stanza.attr.xmlns == nil then
-		log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
-		if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
-			origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+	local handlers = stanza_handlers:get(host, origin_type, name, xmlns);
+	if not handlers then handlers = stanza_handlers:get("*", origin_type, name, xmlns); end
+	if handlers then
+		log("debug", "Passing stanza to mod_%s", handler_info[handlers[1]].name);
+		(handlers[1])(origin, stanza);
+		return true;
+	else
+		if stanza.attr.xmlns == nil then
+			log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
+			if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+			end
+		elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
+			log("warn", "Unhandled %s stream element: %s; xmlns=%s: %s", origin.type, stanza.name, xmlns, tostring(stanza)); -- we didn't handle it
+			origin:close("unsupported-stanza-type");
 		end
-	elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
-		log("warn", "Unhandled %s stream element: %s; xmlns=%s: %s", origin.type, stanza.name, xmlns, tostring(stanza)); -- we didn't handle it
-		origin:close("unsupported-stanza-type");
 	end
 end
 
@@ -309,6 +332,33 @@ function api:set_global()
 	self._log = _log;
 end
 
+local function _add_handler(module, origin_type, tag, xmlns, handler)
+	local handlers = stanza_handlers:get(module.host, origin_type, tag, xmlns);
+	local msg = (tag == "iq") and "namespace" or "payload namespace";
+	if not handlers then
+		stanza_handlers:add(module.host, origin_type, tag, xmlns, handler);
+		handler_info[handler] = module;
+		handler_table:add(module.host, module.name, {module.host, origin_type, tag, xmlns});
+		--module:log("debug", "I now handle tag '%s' [%s] with %s '%s'", tag, origin_type, msg, xmlns);
+	else
+		module:log("warn", "I wanted to handle tag '%s' [%s] with %s '%s' but mod_%s already handles that", tag, origin_type, msg, xmlns, handler_info[handlers[1]].module.name);
+	end
+end
+
+function api:add_handler(origin_type, tag, xmlns, handler)
+	if not (origin_type and tag and xmlns and handler) then return false; end
+	if type(origin_type) == "table" then
+		for _, origin_type in ipairs(origin_type) do
+			_add_handler(self, origin_type, tag, xmlns, handler);
+		end
+	else
+		_add_handler(self, origin_type, tag, xmlns, handler);
+	end
+end
+function api:add_iq_handler(origin_type, xmlns, handler)
+	self:add_handler(origin_type, "iq", xmlns, handler);
+end
+
 function api:add_feature(xmlns)
 	self:add_item("feature", xmlns);
 end
@@ -316,6 +366,20 @@ function api:add_identity(category, type, name)
 	self:add_item("identity", {category = category, type = type, name = name});
 end
 
+local event_hook = function(host, mod_name, event_name, ...)
+	if type((...)) == "table" and (...).host and (...).host ~= host then return; end
+	for handler in pairs(event_hooks:get(host, mod_name, event_name) or NULL) do
+		handler(...);
+	end
+end;
+function api:add_event_hook(name, handler)
+	if not hooked:get(self.host, self.name, name) then
+		eventmanager.add_event_hook(name, function(...) event_hook(self.host, self.name, name, ...); end);
+		hooked:set(self.host, self.name, name, true);
+	end
+	event_hooks:set(self.host, self.name, name, handler, true);
+end
+
 function api:fire_event(...)
 	return (hosts[self.host] or prosody).events.fire_event(...);
 end