moduleapi, modulemanager: Re-structure module.event_handlers so that the same handler...

[prosody.git] / core / moduleapi.lua

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 7a4d1fa6dcacd3930ec8a29bb256855e3e175374..96f1d3ea2a9a9744430ec219b5c147d19d77caf1 100644 (file)
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -12,6 +12,7 @@ local array = require "util.array";
 local set = require "util.set";
 local logger = require "util.logger";
 local pluginloader = require "util.pluginloader";
+local timer = require "util.timer";
 
 local multitable_new = require "util.multitable".new;
 
@@ -22,6 +23,7 @@ local tonumber, tostring = tonumber, tostring;
 
 local prosody = prosody;
 local hosts = prosody.hosts;
+local core_post_stanza = prosody.core_post_stanza;
 
 -- Registry of shared module data
 local shared_data = setmetatable({}, { __mode = "v" });
@@ -41,7 +43,7 @@ function api:get_host()
 end
 
 function api:get_host_type()
-       return hosts[self.host].type;
+       return self.host ~= "*" and hosts[self.host].type or nil;
 end
 
 function api:set_global()
@@ -50,6 +52,7 @@ function api:set_global()
        local _log = logger.init("mod_"..self.name);
        self.log = function (self, ...) return _log(...); end;
        self._log = _log;
+       self.global = true;
 end
 
 function api:add_feature(xmlns)
@@ -67,10 +70,19 @@ function api:fire_event(...)
 end
 
 function api:hook_object_event(object, event, handler, priority)
-       self.event_handlers[handler] = { name = event, priority = priority, object = object };
+       local handlers = self.event_handlers[event];
+       if not handlers then
+               handlers = {};
+               self.event_handlers[event] = handlers;
+       end
+       handlers[event] = { handler = handler, priority = priority, object = object };
        return object.add_handler(event, handler, priority);
 end
 
+function api:unhook_object_event(object, event, handler)
+       return object.remove_handler(event, handler);
+end
+
 function api:hook(event, handler, priority)
        return self:hook_object_event((hosts[self.host] or prosody).events, event, handler, priority);
 end
@@ -79,7 +91,7 @@ function api:hook_global(event, handler, priority)
        return self:hook_object_event(prosody.events, event, handler, priority);
 end
 
-function api:hook_stanza(xmlns, name, handler, priority)
+function api:hook_tag(xmlns, name, handler, priority)
        if not handler and type(name) == "function" then
                -- If only 2 options then they specified no xmlns
                xmlns, name, handler, priority = nil, xmlns, name, handler;
@@ -89,6 +101,7 @@ function api:hook_stanza(xmlns, name, handler, priority)
        end
        return self:hook("stanza/"..(xmlns and (xmlns..":") or "")..name, function (data) return handler(data.origin, data.stanza, data); end, priority);
 end
+api.hook_stanza = api.hook_tag; -- COMPAT w/pre-0.9
 
 function api:require(lib)
        local f, n = pluginloader.load_code(self.name, lib..".lib.lua");
@@ -104,7 +117,7 @@ function api:depends(name)
        if not self.dependencies then
                self.dependencies = {};
                self:hook("module-reloaded", function (event)
-                       if self.dependencies[event.module] then
+                       if self.dependencies[event.module] and not self.reloading then
                                self:log("info", "Auto-reloading due to reload of %s:%s", event.host, event.module);
                                modulemanager.reload(self.host, self.name);
                                return;
@@ -118,6 +131,10 @@ function api:depends(name)
                end);
        end
        local mod = modulemanager.get_module(self.host, name) or modulemanager.get_module("*", name);
+       if mod and mod.module.host == "*" and self.host ~= "*"
+       and modulemanager.module_has_method(mod, "add_host") then
+               mod = nil; -- This is a shared module, so we still want to load it on our host
+       end
        if not mod then
                local err;
                mod, err = modulemanager.load(self.host, name);
@@ -133,6 +150,7 @@ end
 -- Intentionally does not allow the table at a path to be _set_, it
 -- is auto-created if it does not exist.
 function api:shared(...)
+       if not self.shared_data then self.shared_data = {}; end
        local paths = { n = select("#", ...), ... };
        local data_array = {};
        local default_path_components = { self.host, self.name };
@@ -148,6 +166,7 @@ function api:shared(...)
                        shared_data[path] = shared;
                end
                t_insert(data_array, shared);
+               self.shared_data[path] = shared;
        end
        return unpack(data_array);
 end
@@ -242,7 +261,6 @@ function api:get_option_set(name, ...)
        return set.new(value);
 end
 
-local module_items = multitable_new();
 function api:add_item(key, value)
        self.items = self.items or {};
        self.items[key] = self.items[key] or {};
@@ -291,4 +309,39 @@ function api:handle_items(type, added_cb, removed_cb, existing)
        end
 end
 
+function api:provides(name, item)
+       if not item then item = self.environment; end
+       if not item.name then
+               local item_name = self.name;
+               -- Strip a provider prefix to find the item name
+               -- (e.g. "auth_foo" -> "foo" for an auth provider)
+               if item_name:find(name.."_", 1, true) == 1 then
+                       item_name = item_name:sub(#name+2);
+               end
+               item.name = item_name;
+       end
+       self:add_item(name.."-provider", item);
+end
+
+function api:send(stanza)
+       return core_post_stanza(hosts[self.host], stanza);
+end
+
+function api:add_timer(delay, callback)
+       return timer.add_task(delay, function (t)
+               if self.loaded == false then return; end
+               return callback(t);
+       end);
+end
+
+local path_sep = package.config:sub(1,1);
+function api:get_directory()
+       return self.path and (self.path:gsub("%"..path_sep.."[^"..path_sep.."]*$", "")) or nil;
+end
+
+function api:load_resource(path, mode)
+       path = config.resolve_relative_path(self:get_directory(), path);
+       return io.open(path, mode);
+end
+
 return api;