X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fcomponentmanager.lua;h=08868236e76a8c7f1ef36f1c6897947bed020c85;hb=6e79e1d5057bdf86672b624f3c548b53808da69c;hp=c55a76cbd0cc1299ab631aa6c15cf7cdd8af3730;hpb=489e8504301004d44240e4b9cb7194340d869a0a;p=prosody.git diff --git a/core/componentmanager.lua b/core/componentmanager.lua index c55a76cb..08868236 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -1,91 +1,141 @@ --- Prosody IM v0.2 --- Copyright (C) 2008 Matthew Wild --- Copyright (C) 2008 Waqas Hussain +-- Prosody IM +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- - - + +local prosody = prosody; local log = require "util.logger".init("componentmanager"); local configmanager = require "core.configmanager"; -local eventmanager = require "core.eventmanager"; -local modulemanager = require "core.modulemanager"; -local jid_split = require "util.jid".split; +local modulemanager = require "core.modulemanager"; +local core_route_stanza = core_route_stanza; +local jid_split = require "util.jid".split; +local events_new = require "util.events".new; +local st = require "util.stanza"; local hosts = hosts; +local serialize = require "util.serialization".serialize + +local pairs, type, tostring = pairs, type, tostring; + +local components = {}; + +local disco_items = require "util.multitable".new(); +local NULL = {}; +require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node) + if #node == 0 and hosts[to] then + for jid in pairs(disco_items:get(to) or NULL) do + reply:tag("item", {jid = jid}):up(); + end + return true; + end +end); + +prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end); + +module "componentmanager" -local pairs, type, tostring = pairs, type, tostring; - -local components = {}; - -module "componentmanager" +local function default_component_handler(origin, stanza) + log("warn", "Stanza being handled by default component, bouncing error"); + if stanza.attr.type ~= "error" then + core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable")); + end +end +local components_loaded_once; function load_enabled_components(config) local defined_hosts = config or configmanager.getconfig(); for host, host_config in pairs(defined_hosts) do if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then - hosts[host] = { type = "component", host = host, connected = true, s2sout = {} }; - modulemanager.load(host, "dialback"); + hosts[host] = { type = "component", host = host, connected = false, s2sout = {}, events = events_new() }; + components[host] = default_component_handler; local ok, err = modulemanager.load(host, host_config.core.component_module); if not ok then log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(err)); else - log("info", "Activated %s component: %s", host_config.core.component_module, host); - end - - local ok, component_handler = modulemanager.call_module_method(modulemanager.get_module(host, host_config.core.component_module), "load_component"); - if not ok then - log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(component_handler)); - else - components[host] = component_handler; + log("debug", "Activated %s component: %s", host_config.core.component_module, host); end end end end -eventmanager.add_event_hook("server-starting", load_enabled_components); - -function handle_stanza(origin, stanza) - local node, host = jid_split(stanza.attr.to); +prosody.events.add_handler("server-starting", load_enabled_components); + +function handle_stanza(origin, stanza) + local node, host = jid_split(stanza.attr.to); local component = nil; - if not component then component = components[stanza.attr.to]; end -- hack to allow hooking node@server/resource and server/resource - if not component then component = components[node.."@"..host]; end -- hack to allow hooking node@server - if not component then component = components[host]; end - if component then - log("debug", "stanza being handled by component: "..host); - component(origin, stanza, hosts[host]); - else - log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to); - end -end - -function register_component(host, component) - if not hosts[host] then - -- TODO check for host well-formedness - components[host] = component; - hosts[host] = { type = "component", host = host, connected = true, s2sout = {} }; + if host then + if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server + if not component then component = components[host]; end + end + if component then + log("debug", "%s stanza being handled by component: %s", stanza.name, host); + component(origin, stanza, hosts[host]); + else + log("error", "Component manager recieved a stanza for a non-existing component: " .. (stanza.attr.to or serialize(stanza))); + end +end + +function create_component(host, component) + -- TODO check for host well-formedness + return { type = "component", host = host, connected = true, s2sout = {}, events = events_new() }; +end + +function register_component(host, component, session) + if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then + local old_events = hosts[host] and hosts[host].events; + + components[host] = component; + hosts[host] = session or create_component(host, component); + + -- Add events object if not already one + if not hosts[host].events then + hosts[host].events = old_events or events_new(); + end + + -- add to disco_items + if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then + disco_items:set(host:sub(host:find(".", 1, true)+1), host, true); + end -- FIXME only load for a.b.c if b.c has dialback, and/or check in config - modulemanager.load(host, "dialback"); - log("debug", "component added: "..host); - return hosts[host]; - else - log("error", "Attempt to set component for existing host: "..host); - end -end + modulemanager.load(host, "dialback"); + log("debug", "component added: "..host); + return session or hosts[host]; + else + log("error", "Attempt to set component for existing host: "..host); + end +end function deregister_component(host) if components[host] then modulemanager.unload(host, "dialback"); - components[host] = nil; - hosts[host] = nil; + hosts[host].connected = nil; + local host_config = configmanager.getconfig()[host]; + if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then + -- Set default handler + components[host] = default_component_handler; + else + -- Component not in config, or disabled, remove + hosts[host] = nil; + components[host] = nil; + end + -- remove from disco_items + if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then + disco_items:remove(host:sub(host:find(".", 1, true)+1), host); + end log("debug", "component removed: "..host); return true; else log("error", "Attempt to remove component for non-existing host: "..host); end end - -return _M; + +function set_component_handler(host, handler) + components[host] = handler; +end + +return _M;