From 568f00002d9de66b8026f99728158bfca86336b4 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 13 Dec 2011 13:34:21 +0000
Subject: modulemanager: Remove 'config' from module environments (no modules
 use it that I'm aware of)

---
 core/modulemanager.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 2d1eeb77..c4d95695 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -117,7 +117,7 @@ function load(host, module_name, config)
 	end
 
 	local _log = logger.init(host..":"..module_name);
-	local api_instance = setmetatable({ name = module_name, host = host, path = err, config = config,  _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
+	local api_instance = setmetatable({ name = module_name, host = host, path = err, _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
 
 	local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
 	api_instance.environment = pluginenv;
-- 
cgit v1.2.3


From 36542853efea8ca4a4767996408e46b1657ec93e Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 18:41:55 +0000
Subject: modulemanager: Move in-module API functions to core.moduleapi (half
 the file size, yay)

---
 core/modulemanager.lua | 213 +------------------------------------------------
 1 file changed, 1 insertion(+), 212 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index c4d95695..bbe24e32 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -45,8 +45,7 @@ local _G = _G;
 
 module "modulemanager"
 
-api = {};
-local api = api; -- Module API container
+local api = _G.require "core.moduleapi"; -- Module API container
 
 local modulemap = { ["*"] = {} };
 
@@ -253,214 +252,4 @@ function call_module_method(module, method, ...)
 	end
 end
 
------ API functions exposed to modules -----------
--- Must all be in api.*
-
--- Returns the name of the current module
-function api:get_name()
-	return self.name;
-end
-
--- Returns the host that the current module is serving
-function api:get_host()
-	return self.host;
-end
-
-function api:get_host_type()
-	return hosts[self.host].type;
-end
-
-function api:set_global()
-	self.host = "*";
-	-- Update the logger
-	local _log = logger.init("mod_"..self.name);
-	self.log = function (self, ...) return _log(...); end;
-	self._log = _log;
-end
-
-function api:add_feature(xmlns)
-	self:add_item("feature", xmlns);
-end
-function api:add_identity(category, type, name)
-	self:add_item("identity", {category = category, type = type, name = name});
-end
-function api:add_extension(data)
-	self:add_item("extension", data);
-end
-
-function api:fire_event(...)
-	return (hosts[self.host] or prosody).events.fire_event(...);
-end
-
-function api:hook(event, handler, priority)
-	hooks:set(self.host, self.name, event, handler, true);
-	(hosts[self.host] or prosody).events.add_handler(event, handler, priority);
-end
-
-function api:hook_global(event, handler, priority)
-	hooks:set("*", self.name, event, handler, true);
-	prosody.events.add_handler(event, handler, priority);
-end
-
-function api:hook_stanza(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;
-	elseif not (handler and name) then
-		self:log("warn", "Error: Insufficient parameters to module:hook_stanza()");
-		return;
-	end
-	return api.hook(self, "stanza/"..(xmlns and (xmlns..":") or "")..name, function (data) return handler(data.origin, data.stanza, data); end, priority);
-end
-
-function api:require(lib)
-	local f, n = pluginloader.load_code(self.name, lib..".lib.lua");
-	if not f then
-		f, n = pluginloader.load_code(lib, lib..".lib.lua");
-	end
-	if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
-	setfenv(f, self.environment);
-	return f();
-end
-
-function api:get_option(name, default_value)
-	local value = config.get(self.host, self.name, name);
-	if value == nil then
-		value = config.get(self.host, "core", name);
-		if value == nil then
-			value = default_value;
-		end
-	end
-	return value;
-end
-
-function api:get_option_string(name, default_value)
-	local value = self:get_option(name, default_value);
-	if type(value) == "table" then
-		if #value > 1 then
-			self:log("error", "Config option '%s' does not take a list, using just the first item", name);
-		end
-		value = value[1];
-	end
-	if value == nil then
-		return nil;
-	end
-	return tostring(value);
-end
-
-function api:get_option_number(name, ...)
-	local value = self:get_option(name, ...);
-	if type(value) == "table" then
-		if #value > 1 then
-			self:log("error", "Config option '%s' does not take a list, using just the first item", name);
-		end
-		value = value[1];
-	end
-	local ret = tonumber(value);
-	if value ~= nil and ret == nil then
-		self:log("error", "Config option '%s' not understood, expecting a number", name);
-	end
-	return ret;
-end
-
-function api:get_option_boolean(name, ...)
-	local value = self:get_option(name, ...);
-	if type(value) == "table" then
-		if #value > 1 then
-			self:log("error", "Config option '%s' does not take a list, using just the first item", name);
-		end
-		value = value[1];
-	end
-	if value == nil then
-		return nil;
-	end
-	local ret = value == true or value == "true" or value == 1 or nil;
-	if ret == nil then
-		ret = (value == false or value == "false" or value == 0);
-		if ret then
-			ret = false;
-		else
-			ret = nil;
-		end
-	end
-	if ret == nil then
-		self:log("error", "Config option '%s' not understood, expecting true/false", name);
-	end
-	return ret;
-end
-
-function api:get_option_array(name, ...)
-	local value = self:get_option(name, ...);
-
-	if value == nil then
-		return nil;
-	end
-	
-	if type(value) ~= "table" then
-		return array{ value }; -- Assume any non-list is a single-item list
-	end
-	
-	return array():append(value); -- Clone
-end
-
-function api:get_option_set(name, ...)
-	local value = self:get_option_array(name, ...);
-	
-	if value == nil then
-		return nil;
-	end
-	
-	return set.new(value);
-end
-
-local t_remove = _G.table.remove;
-local module_items = multitable_new();
-function api:add_item(key, value)
-	self.items = self.items or {};
-	self.items[key] = self.items[key] or {};
-	t_insert(self.items[key], value);
-	self:fire_event("item-added/"..key, {source = self, item = value});
-end
-function api:remove_item(key, value)
-	local t = self.items and self.items[key] or NULL;
-	for i = #t,1,-1 do
-		if t[i] == value then
-			t_remove(self.items[key], i);
-			self:fire_event("item-removed/"..key, {source = self, item = value});
-			return value;
-		end
-	end
-end
-
-function api:get_host_items(key)
-	local result = {};
-	for mod_name, module in pairs(modulemap[self.host]) do
-		module = module.module;
-		if module.items then
-			for _, item in ipairs(module.items[key] or NULL) do
-				t_insert(result, item);
-			end
-		end
-	end
-	for mod_name, module in pairs(modulemap["*"]) do
-		module = module.module;
-		if module.items then
-			for _, item in ipairs(module.items[key] or NULL) do
-				t_insert(result, item);
-			end
-		end
-	end
-	return result;
-end
-
-function api:handle_items(type, added_cb, removed_cb, existing)
-	self:hook("item-added/"..type, added_cb);
-	self:hook("item-removed/"..type, removed_cb);
-	if existing ~= false then
-		for _, item in ipairs(self:get_host_items(type)) do
-			added_cb({ item = item });
-		end
-	end
-end
-
 return _M;
-- 
cgit v1.2.3


From 184f681d3f1d8eef901e16f8d5bdc0c5a6c11edf Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 18:46:17 +0000
Subject: modulemanager: Some reorganisation. Only external change is (should
 be) that module-unloaded and module-loaded are no longer fired when reloading
 a module, the new event module-reloaded is fired instead.

---
 core/modulemanager.lua | 156 +++++++++++++++++++++++++++++--------------------
 1 file changed, 94 insertions(+), 62 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index bbe24e32..1846e0f0 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -90,7 +90,45 @@ end
 prosody_events.add_handler("host-activated", load_modules_for_host);
 --
 
-function load(host, module_name, config)
+--- Private helpers ---
+
+local function do_unload_module(host, name)
+	local mod = get_module(host, name);
+	if not mod then return nil, "module-not-loaded"; end
+	
+	if module_has_method(mod, "unload") then
+		local ok, err = call_module_method(mod, "unload");
+		if (not ok) and err then
+			log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
+		end
+	end
+	-- 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
+			(hosts[host] or prosody).events.remove_handler(event, handler);
+		end
+	end
+	-- unhook event handlers hooked by module:hook_global
+	for event, handlers in pairs(hooks:get("*", name) or NULL) do
+		for handler in pairs(handlers or NULL) do
+			prosody.events.remove_handler(event, handler);
+		end
+	end
+	hooks:remove(host, name);
+	if mod.module.items then -- remove items
+		for key,t in pairs(mod.module.items) do
+			for i = #t,1,-1 do
+				local value = t[i];
+				t[i] = nil;
+				hosts[host].events.fire_event("item-removed/"..key, {source = mod.module, item = value});
+			end
+		end
+	end
+	modulemap[host][name] = nil;
+	return true;
+end
+
+local function do_load_module(host, module_name)
 	if not (host and module_name) then
 		return nil, "insufficient-parameters";
 	elseif not hosts[host] then
@@ -116,7 +154,9 @@ function load(host, module_name, config)
 	end
 
 	local _log = logger.init(host..":"..module_name);
-	local api_instance = setmetatable({ name = module_name, host = host, path = err, _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
+	local api_instance = setmetatable({ name = module_name, host = host, path = err,
+		_log = _log, log = function (self, ...) return _log(...); end }
+		, { __index = api });
 
 	local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
 	api_instance.environment = pluginenv;
@@ -125,11 +165,12 @@ function load(host, module_name, config)
 	hosts[host].modules = modulemap[host];
 	modulemap[host][module_name] = pluginenv;
 	
-	local success, err = pcall(mod);
-	if success then
+	local ok, err = pcall(mod);
+	if ok then
+		-- Call module's "load"
 		if module_has_method(pluginenv, "load") then
-			success, err = call_module_method(pluginenv, "load");
-			if not success then
+			ok, err = call_module_method(pluginenv, "load");
+			if not ok then
 				log("warn", "Error loading module '%s' on '%s': %s", module_name, host, err or "nil");
 			end
 		end
@@ -142,62 +183,12 @@ function load(host, module_name, config)
 		end
 	else
 		log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
+		do_unload_module(api_instance.host, module_name); -- Ignore error, module may be partially-loaded
 	end
-	if success then
-		(hosts[api_instance.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host });
-		return true;
-	else -- load failed, unloading
-		unload(api_instance.host, module_name);
-		return nil, err;
-	end
-end
-
-function get_module(host, name)
-	return modulemap[host] and modulemap[host][name];
-end
-
-function is_loaded(host, name)
-	return modulemap[host] and modulemap[host][name] and true;
+	return ok and mod, err;
 end
 
-function unload(host, name, ...)
-	local mod = get_module(host, name);
-	if not mod then return nil, "module-not-loaded"; end
-	
-	if module_has_method(mod, "unload") then
-		local ok, err = call_module_method(mod, "unload");
-		if (not ok) and err then
-			log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
-		end
-	end
-	-- 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
-			(hosts[host] or prosody).events.remove_handler(event, handler);
-		end
-	end
-	-- unhook event handlers hooked by module:hook_global
-	for event, handlers in pairs(hooks:get("*", name) or NULL) do
-		for handler in pairs(handlers or NULL) do
-			prosody.events.remove_handler(event, handler);
-		end
-	end
-	hooks:remove(host, name);
-	if mod.module.items then -- remove items
-		for key,t in pairs(mod.module.items) do
-			for i = #t,1,-1 do
-				local value = t[i];
-				t[i] = nil;
-				hosts[host].events.fire_event("item-removed/"..key, {source = mod.module, item = value});
-			end
-		end
-	end
-	modulemap[host][name] = nil;
-	(hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
-	return true;
-end
-
-function reload(host, name, ...)
+local function do_reload_module(host, name)
 	local mod = get_module(host, name);
 	if not mod then return nil, "module-not-loaded"; end
 
@@ -224,8 +215,8 @@ function reload(host, name, ...)
 		end
 	end
 
-	unload(host, name, ...);
-	local ok, err = load(host, name, ...);
+	do_unload_module(host, name);
+	local ok, err = do_load_module(host, name);
 	if ok then
 		mod = get_module(host, name);
 		if module_has_method(mod, "restore") then
@@ -234,11 +225,52 @@ function reload(host, name, ...)
 				log("warn", "Error restoring module '%s' from '%s': %s", name, host, err);
 			end
 		end
-		return true;
+	end
+	return ok and mod, err;
+end
+
+--- Public API ---
+
+-- Load a module and fire module-loaded event
+function load(host, name)
+	local mod, err = do_load_module(host, name);
+	if mod then
+		(hosts[mod.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host });
+	end
+	return mod, err;
+end
+
+-- Unload a module and fire module-unloaded
+function unload(host, name)
+	local ok, err = do_unload_module(host, name);
+	if ok then
+		(hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
+	end
+	return ok, err;
+end
+
+function reload(host, name)
+	local ok, err = do_reload_module(host, name);
+	if ok then
+		(hosts[host] or prosody).events.fire_event("module-reloaded", { module = name, host = host });
+	elseif not is_loaded(host, name) then
+		(hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
 	end
 	return ok, err;
 end
 
+function get_module(host, name)
+	return modulemap[host] and modulemap[host][name];
+end
+
+function get_modules(host)
+	return modulemap[host];
+end
+
+function is_loaded(host, name)
+	return modulemap[host] and modulemap[host][name] and true;
+end
+
 function module_has_method(module, method)
 	return type(module.module[method]) == "function";
 end
-- 
cgit v1.2.3


From 6924d7bfb5c9bcd125a5b872bd9fb7fc6d1b5322 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 18:47:33 +0000
Subject: modulemanager: Drop unnecessary prosody_events local

---
 core/modulemanager.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 1846e0f0..9f90e34e 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -15,7 +15,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;
@@ -87,8 +86,7 @@ function load_modules_for_host(host)
 		load(host, module);
 	end
 end
-prosody_events.add_handler("host-activated", load_modules_for_host);
---
+prosody.events.add_handler("host-activated", load_modules_for_host);
 
 --- Private helpers ---
 
-- 
cgit v1.2.3


From 15a073672027cdf47822ad280e00185970ba0bdd Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 18:49:11 +0000
Subject: modulemanager, moduleapi: Replace hooks multitable with an
 event_handlers map stored in individual modules. Also adds
 module:hook_object_event() to hook events on any util.events compatible
 object.

---
 core/modulemanager.lua | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 9f90e34e..f86298c9 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -48,10 +48,6 @@ local api = _G.require "core.moduleapi"; -- Module API container
 
 local modulemap = { ["*"] = {} };
 
-local modulehelpers = setmetatable({}, { __index = _G });
-
-local hooks = multitable_new();
-
 local NULL = {};
 
 -- Load modules when a host is activated
@@ -100,19 +96,11 @@ local function do_unload_module(host, name)
 			log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
 		end
 	end
-	-- 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
-			(hosts[host] or prosody).events.remove_handler(event, handler);
-		end
-	end
-	-- unhook event handlers hooked by module:hook_global
-	for event, handlers in pairs(hooks:get("*", name) or NULL) do
-		for handler in pairs(handlers or NULL) do
-			prosody.events.remove_handler(event, handler);
-		end
+	
+	for handler, event in pairs(mod.module.event_handlers) do
+		event.object.remove_handler(event.name, handler);
 	end
-	hooks:remove(host, name);
+	
 	if mod.module.items then -- remove items
 		for key,t in pairs(mod.module.items) do
 			for i = #t,1,-1 do
@@ -153,7 +141,7 @@ local function do_load_module(host, module_name)
 
 	local _log = logger.init(host..":"..module_name);
 	local api_instance = setmetatable({ name = module_name, host = host, path = err,
-		_log = _log, log = function (self, ...) return _log(...); end }
+		_log = _log, log = function (self, ...) return _log(...); end, event_handlers = {} }
 		, { __index = api });
 
 	local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
-- 
cgit v1.2.3


From c240995e515d44142f8c2808085198536bdcb15b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 18:49:49 +0000
Subject: modulemanager: Cleanup some unused variables, imports, whitespace and
 add a comment.

---
 core/modulemanager.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f86298c9..a6d1ad35 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -9,8 +9,6 @@
 local logger = require "util.logger";
 local log = logger.init("modulemanager");
 local config = require "core.configmanager";
-local multitable_new = require "util.multitable".new;
-local st = require "util.stanza";
 local pluginloader = require "util.pluginloader";
 
 local hosts = hosts;
@@ -46,6 +44,7 @@ module "modulemanager"
 
 local api = _G.require "core.moduleapi"; -- Module API container
 
+-- [host] = { [module] = module_env }
 local modulemap = { ["*"] = {} };
 
 local NULL = {};
@@ -185,7 +184,6 @@ local function do_reload_module(host, name)
 	end
 
 	local saved;
-
 	if module_has_method(mod, "save") then
 		local ok, ret, err = call_module_method(mod, "save");
 		if ok then
-- 
cgit v1.2.3


From 11bf5edc1d5395822ab2dfe1edc84af85bc6dc57 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 19:27:06 +0000
Subject: modulemanager: load(): Return and use the correct module object

---
 core/modulemanager.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index a6d1ad35..a192e637 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -170,7 +170,7 @@ local function do_load_module(host, module_name)
 		log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
 		do_unload_module(api_instance.host, module_name); -- Ignore error, module may be partially-loaded
 	end
-	return ok and mod, err;
+	return ok and pluginenv, err;
 end
 
 local function do_reload_module(host, name)
@@ -219,7 +219,7 @@ end
 function load(host, name)
 	local mod, err = do_load_module(host, name);
 	if mod then
-		(hosts[mod.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host });
+		(hosts[mod.module.host] or prosody).events.fire_event("module-loaded", { module = name, host = host });
 	end
 	return mod, err;
 end
-- 
cgit v1.2.3


From 4c9c8363bca9bbe87c34f102567cff7a9e539107 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 24 Feb 2012 15:14:07 +0000
Subject: modulemanager: include mod_c2s and mod_s2s into autoloaded modules.

---
 core/modulemanager.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index a192e637..0ca37105 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -34,7 +34,7 @@ end
 
 local array, set = require "util.array", require "util.set";
 
-local autoload_modules = {"presence", "message", "iq", "offline"};
+local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"};
 local component_inheritable_modules = {"tls", "dialback", "iq"};
 
 -- We need this to let modules access the real global namespace
-- 
cgit v1.2.3


From 121a7f3acddc52eb911688b5f23d3efee9178ea5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 14 Mar 2012 17:03:48 +0000
Subject: modulemanager: Use appropriate events object for global modules when
 firing item-removed on unload

---
 core/modulemanager.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 0ca37105..328224ae 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -101,11 +101,12 @@ local function do_unload_module(host, name)
 	end
 	
 	if mod.module.items then -- remove items
+		local events = (host == "*" and prosody.events) or hosts[host].events;
 		for key,t in pairs(mod.module.items) do
 			for i = #t,1,-1 do
 				local value = t[i];
 				t[i] = nil;
-				hosts[host].events.fire_event("item-removed/"..key, {source = mod.module, item = value});
+				events.fire_event("item-removed/"..key, {source = mod.module, item = value});
 			end
 		end
 	end
-- 
cgit v1.2.3


From ce27bd5fe59bc640673abb52daa43110cfcd5c55 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 14 Mar 2012 21:37:00 +0000
Subject: modulemanager: Some refactoring. Deprecate module.host = "*", modules
 should call module:set_global() (which has been around since forever)

---
 core/modulemanager.lua | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 328224ae..f9f3a8b8 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -123,6 +123,7 @@ local function do_load_module(host, module_name)
 	
 	if not modulemap[host] then
 		modulemap[host] = {};
+		hosts[host].modules = modulemap[host];
 	end
 	
 	if modulemap[host][module_name] then
@@ -148,8 +149,6 @@ local function do_load_module(host, module_name)
 	api_instance.environment = pluginenv;
 	
 	setfenv(mod, pluginenv);
-	hosts[host].modules = modulemap[host];
-	modulemap[host][module_name] = pluginenv;
 	
 	local ok, err = pcall(mod);
 	if ok then
@@ -161,15 +160,18 @@ local function do_load_module(host, module_name)
 			end
 		end
 
-		-- Use modified host, if the module set one
-		if api_instance.host == "*" and host ~= "*" then
-			modulemap[host][module_name] = nil;
-			modulemap["*"][module_name] = pluginenv;
-			api_instance:set_global();
+		modulemap[pluginenv.module.host][module_name] = pluginenv;
+		if pluginenv.module.host == "*" then
+			if not pluginenv.module.global then -- COMPAT w/pre-0.9
+				log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
+				api_instance:set_global();
+			end
+		else
+			hosts[host].modules[module_name] = pluginenv;
 		end
-	else
+	end
+	if not ok then
 		log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
-		do_unload_module(api_instance.host, module_name); -- Ignore error, module may be partially-loaded
 	end
 	return ok and pluginenv, err;
 end
-- 
cgit v1.2.3


From 9792c6566b3416e7aef11bd3628f15ca00418132 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:00:30 +0100
Subject: modulemanager: Allow loading a module onto "*" (part-fixes #228)

---
 core/modulemanager.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f9f3a8b8..f00532a0 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -117,13 +117,15 @@ end
 local function do_load_module(host, module_name)
 	if not (host and module_name) then
 		return nil, "insufficient-parameters";
-	elseif not hosts[host] then
+	elseif not hosts[host] and host ~= "*"then
 		return nil, "unknown-host";
 	end
 	
 	if not modulemap[host] then
 		modulemap[host] = {};
-		hosts[host].modules = modulemap[host];
+		if host ~= "*" then
+			hosts[host].modules = modulemap[host];
+		end
 	end
 	
 	if modulemap[host][module_name] then
-- 
cgit v1.2.3


From e0805574e18fddde821ba9ec6ade8f234f368f1b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:01:40 +0100
Subject: modulemanager: Use api_instance rather than pluginenv.module (same
 thing)

---
 core/modulemanager.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f00532a0..f5173f00 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -162,9 +162,9 @@ local function do_load_module(host, module_name)
 			end
 		end
 
-		modulemap[pluginenv.module.host][module_name] = pluginenv;
-		if pluginenv.module.host == "*" then
-			if not pluginenv.module.global then -- COMPAT w/pre-0.9
+		modulemap[api_instance.host][module_name] = pluginenv;
+		if api_instance.host == "*" then
+			if not api_instance.global then -- COMPAT w/pre-0.9
 				log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
 				api_instance:set_global();
 			end
-- 
cgit v1.2.3


From bf4925029fade8287314c858029413aacc5a9a48 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:02:45 +0100
Subject: modulemanager: Use modulemap rather than hosts[host] (fix for when
 host == "*")

---
 core/modulemanager.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f5173f00..f7594cd9 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -169,7 +169,7 @@ local function do_load_module(host, module_name)
 				api_instance:set_global();
 			end
 		else
-			hosts[host].modules[module_name] = pluginenv;
+			modulemap[host][module_name] = pluginenv;
 		end
 	end
 	if not ok then
-- 
cgit v1.2.3


From 3f130834834b04f47b0c00bb5504e67e0744fa16 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:04:07 +0100
Subject: modulemanager: Make module_has_method and module_call_method use
 rawget()

---
 core/modulemanager.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f7594cd9..769041f9 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -261,12 +261,12 @@ function is_loaded(host, name)
 end
 
 function module_has_method(module, method)
-	return type(module.module[method]) == "function";
+	return type(rawget(module.module, method)) == "function";
 end
 
 function call_module_method(module, method, ...)
-	if module_has_method(module, method) then
-		local f = module.module[method];
+	local f = rawget(module.module, method);
+	if type(f) == "function" then
 		return pcall(f, ...);
 	else
 		return false, "no-such-method";
-- 
cgit v1.2.3


From f51d5c0bd00c83ed10eae136e95dc49a0d61b684 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:09:03 +0100
Subject: modulemanager: Support for shared modules - function
 module.add_host(host_module) in a global module

---
 core/modulemanager.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 769041f9..e76f2624 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -132,6 +132,21 @@ local function do_load_module(host, module_name)
 		log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
 		return nil, "module-already-loaded";
 	elseif modulemap["*"][module_name] then
+		local mod = modulemap["*"][module_name];
+		if module_has_method(mod, "add_host") then
+			local _log = logger.init(host..":"..module_name);
+			local host_module_api = setmetatable({
+				host = host, event_handlers = {}, items = {};
+				_log = _log, log = function (self, ...) return _log(...); end;
+			},{
+				__index = modulemap["*"][module_name].module;
+			});
+			local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
+			if not ok or result == false then return nil, ok and module_err or result; end
+			local host_module = setmetatable({ module = host_module_api }, { __index = mod });
+			modulemap[host][module_name] = host_module;
+			return host_module;
+		end
 		return nil, "global-module-already-loaded";
 	end
 	
-- 
cgit v1.2.3


From 1894252bd4d000923088e4db37de91c0270b323a Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 20:37:06 +0100
Subject: modulemanager: When a shared module becomes global, ensure it still
 gets loaded onto the original target host

---
 core/modulemanager.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index e76f2624..f263816b 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -183,8 +183,10 @@ local function do_load_module(host, module_name)
 				log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
 				api_instance:set_global();
 			end
-		else
-			modulemap[host][module_name] = pluginenv;
+			if host ~= api_instance.host and module_has_method(pluginenv, "add_host") then
+				-- Now load the module again onto the host it was originally being loaded on
+				do_load_module(host, module_name);
+			end
 		end
 	end
 	if not ok then
-- 
cgit v1.2.3


From 6202ef36ecb18cfcf2aee207ccbccec24899513e Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 22:53:22 +0100
Subject: modulemanager: For children of shared modules, set module.environment
 to the empty environment for that module (useful to expose data or APIs at
 host.modules[module])

---
 core/modulemanager.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f263816b..aca314c0 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -144,6 +144,7 @@ local function do_load_module(host, module_name)
 			local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
 			if not ok or result == false then return nil, ok and module_err or result; end
 			local host_module = setmetatable({ module = host_module_api }, { __index = mod });
+			host_module.module.environment = host_module;
 			modulemap[host][module_name] = host_module;
 			return host_module;
 		end
-- 
cgit v1.2.3


From c40ee817429487a325e871da5ddc3e43eab19bb5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Apr 2012 14:11:10 +0100
Subject: modulemanager: Report errors that happen when loading a shared module
 onto its original host

---
 core/modulemanager.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index aca314c0..f0648667 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -186,7 +186,7 @@ local function do_load_module(host, module_name)
 			end
 			if host ~= api_instance.host and module_has_method(pluginenv, "add_host") then
 				-- Now load the module again onto the host it was originally being loaded on
-				do_load_module(host, module_name);
+				ok, err = do_load_module(host, module_name);
 			end
 		end
 	end
-- 
cgit v1.2.3


From 91d1035d7d501855d595d80aa985adfac6addfda Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Apr 2012 15:38:36 +0100
Subject: modulemanager: Set module.loaded = false on unload

---
 core/modulemanager.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f0648667..bf1e1924 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -110,6 +110,7 @@ local function do_unload_module(host, name)
 			end
 		end
 	end
+	mod.module.loaded = false;
 	modulemap[host][name] = nil;
 	return true;
 end
-- 
cgit v1.2.3


From 0181e189a3dad8882b80d277476d781912807228 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 27 Apr 2012 21:37:45 +0100
Subject: modulemanager: Set module.environment before calling add_host,
 otherwise the module will get the parent's environment (thanks xnyhps and
 Maranda)

---
 core/modulemanager.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index bf1e1924..5a97e5bf 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -142,10 +142,10 @@ local function do_load_module(host, module_name)
 			},{
 				__index = modulemap["*"][module_name].module;
 			});
+			local host_module = setmetatable({ module = host_module_api }, { __index = mod });
+			host_module_api.environment = host_module;
 			local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
 			if not ok or result == false then return nil, ok and module_err or result; end
-			local host_module = setmetatable({ module = host_module_api }, { __index = mod });
-			host_module.module.environment = host_module;
 			modulemap[host][module_name] = host_module;
 			return host_module;
 		end
-- 
cgit v1.2.3


From 05af8c8bfabc44445cc3ee7020cc1b6ca4fc58ed Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 27 Apr 2012 22:36:35 +0100
Subject: modulemanager: Clear modulemap when a host is deactivated (thanks
 xnyhps)

---
 core/modulemanager.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 5a97e5bf..3829da57 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -82,6 +82,9 @@ function load_modules_for_host(host)
 	end
 end
 prosody.events.add_handler("host-activated", load_modules_for_host);
+prosody.events.add_handler("host-deactivated", function (host)
+	modulemap[host] = nil;
+end);
 
 --- Private helpers ---
 
-- 
cgit v1.2.3


From 0ecb3e3e04d11b115666af849340fdd8de352bd7 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 02:18:17 +0100
Subject: modulemanager: Remove unused NULL declaration

---
 core/modulemanager.lua | 2 --
 1 file changed, 2 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 3829da57..40aa4ba2 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -47,8 +47,6 @@ local api = _G.require "core.moduleapi"; -- Module API container
 -- [host] = { [module] = module_env }
 local modulemap = { ["*"] = {} };
 
-local NULL = {};
-
 -- Load modules when a host is activated
 function load_modules_for_host(host)
 	local component = config.get(host, "core", "component_module");
-- 
cgit v1.2.3


From 45fb895f1992c1cd602e93654b8c99ed25e51912 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 02:22:42 +0100
Subject: modulemanager: Remove unused function imports

---
 core/modulemanager.lua | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 40aa4ba2..8fdd5c1d 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -14,15 +14,9 @@ local pluginloader = require "util.pluginloader";
 local hosts = hosts;
 local prosody = prosody;
 
-local loadfile, pcall, xpcall = loadfile, pcall, xpcall;
-local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
-local pairs, ipairs = pairs, ipairs;
-local t_insert, t_concat = table.insert, table.concat;
-local type = type;
-local next = next;
-local rawget = rawget;
-local error = error;
-local tostring, tonumber = tostring, tonumber;
+local pcall, xpcall = pcall, xpcall;
+local setmetatable, rawget, setfenv = setmetatable, rawget, setfenv;
+local pairs, type, tostring = pairs, type, tostring;
 
 local debug_traceback = debug.traceback;
 local unpack, select = unpack, select;
@@ -32,7 +26,7 @@ pcall = function(f, ...)
 	return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
 end
 
-local array, set = require "util.array", require "util.set";
+local set = require "util.set";
 
 local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"};
 local component_inheritable_modules = {"tls", "dialback", "iq"};
-- 
cgit v1.2.3


From e8d147c96a9cf84cae6a957adc16cb0a9cd11360 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 15:47:43 +0100
Subject: modulemanager: Fixes to handle circular dependencies in
 module:depends()

---
 core/modulemanager.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'core/modulemanager.lua')

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 8fdd5c1d..90116166 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -139,9 +139,12 @@ local function do_load_module(host, module_name)
 			});
 			local host_module = setmetatable({ module = host_module_api }, { __index = mod });
 			host_module_api.environment = host_module;
-			local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
-			if not ok or result == false then return nil, ok and module_err or result; end
 			modulemap[host][module_name] = host_module;
+			local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
+			if not ok or result == false then
+				modulemap[host][module_name] = nil;
+				return nil, ok and module_err or result;
+			end
 			return host_module;
 		end
 		return nil, "global-module-already-loaded";
@@ -164,6 +167,7 @@ local function do_load_module(host, module_name)
 	
 	setfenv(mod, pluginenv);
 	
+	modulemap[host][module_name] = pluginenv;
 	local ok, err = pcall(mod);
 	if ok then
 		-- Call module's "load"
@@ -174,12 +178,13 @@ local function do_load_module(host, module_name)
 			end
 		end
 
-		modulemap[api_instance.host][module_name] = pluginenv;
 		if api_instance.host == "*" then
 			if not api_instance.global then -- COMPAT w/pre-0.9
 				log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
 				api_instance:set_global();
 			end
+			modulemap[host][module_name] = nil;
+			modulemap[api_instance.host][module_name] = pluginenv;
 			if host ~= api_instance.host and module_has_method(pluginenv, "add_host") then
 				-- Now load the module again onto the host it was originally being loaded on
 				ok, err = do_load_module(host, module_name);
@@ -187,6 +192,7 @@ local function do_load_module(host, module_name)
 		end
 	end
 	if not ok then
+		modulemap[api_instance.host][module_name] = nil;
 		log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
 	end
 	return ok and pluginenv, err;
-- 
cgit v1.2.3