--- 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 program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
--
-
-\r
-\r
+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";\r
-local jid_split = require "util.jid".split;\r
+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 pairs, type, tostring = pairs, type, tostring;\r
-\r
-local components = {};\r
-\r
-module "componentmanager"\r
+local disco_items = require "util.multitable".new();
+local NULL = {};
+
+prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
+
+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);
-\r
-function handle_stanza(origin, stanza)\r
- local node, host = jid_split(stanza.attr.to);\r
+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\r
- if not component then component = components[host]; end
- if component then\r
- log("debug", "stanza being handled by component: "..host);\r
- component(origin, stanza, hosts[host]);\r
- else\r
- log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to);\r
- end\r
-end\r
-\r
-function register_component(host, component)\r
- if not hosts[host] then\r
- -- TODO check for host well-formedness\r
- components[host] = component;\r
- 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");\r
- log("debug", "component added: "..host);\r
- return hosts[host];\r
- else\r
- log("error", "Attempt to set component for existing host: "..host);\r
- end\r
-end\r
+ 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
-\r
-return _M;\r
+
+function set_component_handler(host, handler)
+ components[host] = handler;
+end
+
+function get_children(host)
+ return disco_items:get(host) or NULL;
+end
+
+return _M;
projects / prosody.git / blobdiff