MT#16059 save MUC participants on redis too

Change-Id: I4c5e22d93f966637abe304a6e7fbc88609017a31

plugins/mod_shard.lua

@@ -6,8 +6,9 @@
 -- COPYING file in the source package for more information.
 --
 module:depends("sipwise_redis_sessions");
+module:depends("sipwise_redis_mucs");
 local redis_sessions = module:shared("/*/sipwise_redis_sessions/redis_sessions");
-local redis_mucs;
+local redis_mucs = module:shared("/*/sipwise_redis_mucs/redis_mucs");
 local jid_split = require "util.jid".split;
 local fire_event = prosody.events.fire_event;
 local st = require "util.stanza";
@@ -70,13 +71,10 @@ local function handle_event (event)
         return nil
     end
 
-    if ut.string.starts(host, 'conference.') then
-        if redis_mucs then
-            module:log("debug", "MUC %s detected", host);
-            return handle_room_event(event);
-        else
-            module:log("debug", "redis_mucs nill");
-        end
+    local muc_hosts = redis_mucs.get_hosts();
+    if muc_hosts:contains(host) then
+        module:log("debug", "to MUC %s detected", host);
+        return handle_room_event(event);
     end
 
     if resource and prosody.full_sessions[to] then
@@ -114,12 +112,6 @@ local function handle_event (event)
     return stop_process_local;
 end
 
-local host = module:get_host();
-if module:get_host_type() == "component" then
-    module:depends("sipwise_redis_mucs");
-    redis_mucs = module:shared("/*/sipwise_redis_mucs/redis_mucs");
-    module:log("debug", "enable MUC for %s", host);
-end
 module:hook("iq/bare", handle_event, 1000);
 module:hook("iq/full", handle_event, 1000);
 module:hook("iq/host", handle_event, 1000);
@@ -129,4 +121,4 @@ module:hook("message/host", handle_event, 1000);
 module:hook("presence/bare", handle_event, 1000);
 module:hook("presence/full", handle_event, 1000);
 module:hook("presence/host", handle_event, 1000);
-module:log("debug", "hooked at %s", host);
+module:log("debug", "hooked at %s", module:get_host());

plugins/mod_sipwise_redis_mucs.lua

@@ -5,6 +5,7 @@
 -- COPYING file in the source package for more information.
 --
 module:set_global();
+local set = require "util.set";
 local ut = require "util.table";
 local jid = require "util.jid";
 local redis = require 'redis';
@@ -13,7 +14,7 @@ local redis_config = {
 	server_id = "0", redis_db = "2"
 };
 local redis_client;
-
+local hosts;
 local redis_mucs = module:shared("redis_mucs");
 
 local function test_connection()
@@ -36,25 +37,103 @@ local function muc_created(event)
 	local node, host, _ = jid.split(room.jid)
 
 	module:log("debug", "muc-room-created %s", room.jid);
-	module:log("debug", "save [%s]=%s", room.jid, redis_config.server_id);
+
 	if not test_connection() then client_connect() end
-	redis_client:set(room.jid, redis_config.server_id);
-	module:log("debug", "append [%s]=>%s:%s", host,
-		redis_config.server_id, node);
-    redis_client:sadd(host, redis_config.server_id..":"..node);
+	-- TODO: check that there is no other "room.jid" value?
+	if redis_client:set(room.jid, redis_config.server_id) then
+		module:log("debug", "save [%s]=%s", room.jid, redis_config.server_id);
+	end
+	if redis_client:sadd(host, redis_config.server_id..":"..node) > 0 then
+		module:log("debug", "append [%s]=>%s:%s", host,
+			redis_config.server_id, node);
+	end
 end
 
 local function muc_destroyed(event)
 	local room = event.room;
 	local node, host, _ = jid.split(room.jid)
+	local muc_host = node.."@"..host;
+	local muc_host_key = muc_host..":online";
 
 	module:log("debug", "muc-room-destroyed %s", room.jid);
-	module:log("debug", "remove [%s]=%s", room.jid, redis_config.server_id);
+
+	if not test_connection() then client_connect() end
+	if redis_client:del(room.jid) > 0 then
+		module:log("debug", "remove [%s]=%s", room.jid, redis_config.server_id);
+	end
+	if redis_client:srem(host, redis_config.server_id..":"..node) > 0 then
+		module:log("debug", "remove [%s]=>%s:%s", host,
+			redis_config.server_id, node);
+	end
+	if redis_client:del(muc_host_key) > 0 then
+		module:log("debug", "remove [%s]", muc_host_key);
+	end
+end
+
+local function get_item_jid(stanza)
+	local xmlns = "http://jabber.org/protocol/muc#user";
+	local s = stanza:get_child('x', xmlns);
+	if s then
+		local i = s:get_child('item');
+		if i then
+			return i.attr.jid;
+		end
+	end
+end
+
+local function handle_presence(event)
+	local stanza = event.stanza;
+	local from = stanza.attr.from;
+	local to = stanza.attr.to;
+	local node, host, _ = jid.split(from);
+
+	if not hosts:contains(host) then
+		module:log("debug", "stanza from[%s] not in known MUC hosts[%s]",
+			tostring(host), tostring(hosts));
+		return nil
+	end
+
+	local muc_host = node.."@"..host;
+	local muc_host_key = muc_host..":online";
+
 	if not test_connection() then client_connect() end
-	redis_client:del(room.jid);
-	module:log("debug", "remove [%s]=>%s:%s", host,
-		redis_config.server_id, node);
-    redis_client:srem(host, redis_config.server_id..":"..node);
+	if redis_client:get(muc_host) then
+		module:log("debug", "my stanza:%s", tostring(stanza));
+		if stanza.attr.type == 'unavailable' then
+			local muc_user_jid = get_item_jid(stanza) or to;
+			if muc_user_jid then
+				if redis_client:srem(muc_host_key, muc_user_jid) > 0 then
+					module:log("debug", "removed [%s]=>%s",
+						muc_host_key, muc_user_jid);
+				end
+			end
+		elseif stanza.attr.type == 'error' then
+			module:log("debug", "stanza is type error. Nothing to do here");
+			return nil;
+		else
+			if redis_client:sadd(muc_host_key, to) > 0 then
+				module:log("debug", "append [%s]=>%s", muc_host_key, to);
+			end
+		end
+	end
+end
+
+local function resource_unbind(event)
+	local session = event.session;
+	local muc_user_jid = session.full_jid
+
+	module:log("debug", "resource-unbind %s", muc_user_jid);
+
+	if not test_connection() then client_connect() end
+	for muc_host in hosts do
+		for room in redis_mucs.get_rooms(muc_host) do
+			local muc_host_key = room..'@'..muc_host..":online";
+			if redis_client:srem(muc_host_key, muc_user_jid) > 0 then
+				module:log("debug", "removed [%s]=>%s",
+						muc_host_key, muc_user_jid);
+			end
+		end
+	end
 end
 
 local function split_key(key)
@@ -62,11 +141,16 @@ local function split_key(key)
 	return t[1], t[2];
 end
 
+function redis_mucs.get_online_jids(room_jid)
+	if not test_connection() then client_connect() end
+	return redis_client:smembers(room_jid..":online");
+end
+
 function redis_mucs.get_rooms(host)
 	local res = {};
 	local l, r;
 
-	module:log("debug", "search rooms at %s host", host);
+	module:log("debug", "search rooms at host[%s]", tostring(host));
 	if not test_connection() then client_connect() end
 	l = redis_client:smembers(host);
 
@@ -86,13 +170,24 @@ function redis_mucs.get_room_host(room_jid)
 	return redis_client:get(bare_jid);
 end
 
+function redis_mucs.get_hosts()
+	return hosts;
+end
 
 function module.load()
 	redis_config = module:get_option("redis_sessions_auth", redis_config);
+	hosts = set.new();
 end
 
 function module.add_host(module)
-	module:hook("muc-room-created", muc_created, 200);
-	module:hook("muc-room-destroyed", muc_destroyed, 200);
-	module:log("debug", "hooked at %s", module:get_host());
+	local host = module:get_host();
+	if module:get_host_type() == "component" then
+		module:hook("muc-room-created", muc_created, 200);
+		module:hook("muc-room-destroyed", muc_destroyed, 200);
+		hosts:add(host);
+	end
+	module:hook("presence/full", handle_presence, 200);
+	module:hook("presence/bare", handle_presence, 200);
+	module:hook("resource-unbind", resource_unbind, 200);
+	module:log("debug", "hooked at %s", host);
 end