util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions()

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index f7744feaebf23bae79c1e8f3151dfca9e164800b..cbdadd9bcbe3dac89a48665956ba69e29f1c34cb 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -14,7 +14,7 @@ local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
 
-local default_log = require "util.logger".init("xmlhandlers");
+local default_log = require "util.logger".init("xmppstream");
 
 local error = error;
 
@@ -31,9 +31,12 @@ local xmlns_streams = "http://etherx.jabber.org/streams";
 local ns_separator = "\1";
 local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
 
+_M.ns_separator = ns_separator;
+_M.ns_pattern = ns_pattern;
+
 function new_sax_handlers(session, stream_callbacks)
-       local chardata = {};
        local xml_handlers = {};
+       
        local log = session.log or default_log;
        
        local cb_streamopened = stream_callbacks.streamopened;
@@ -42,12 +45,16 @@ function new_sax_handlers(session, stream_callbacks)
        local cb_handlestanza = stream_callbacks.handlestanza;
        
        local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
-       local stream_tag = stream_ns..ns_separator..(stream_callbacks.stream_tag or "stream");
+       local stream_tag = stream_callbacks.stream_tag or "stream";
+       if stream_ns ~= "" then
+               stream_tag = stream_ns..ns_separator..stream_tag;
+       end
        local stream_error_tag = stream_ns..ns_separator..(stream_callbacks.error_tag or "error");
        
        local stream_default_ns = stream_callbacks.default_ns;
        
-       local stanza;
+       local chardata, stanza = {};
+       local non_streamns_depth = 0;
        function xml_handlers:StartElement(tagname, attr)
                if stanza and #chardata > 0 then
                        -- We have some character data in the buffer
@@ -59,8 +66,9 @@ function new_sax_handlers(session, stream_callbacks)
                        curr_ns, name = "", curr_ns;
                end
 
-               if curr_ns ~= stream_default_ns then
+               if curr_ns ~= stream_default_ns or non_streamns_depth > 0 then
                        attr.xmlns = curr_ns;
+                       non_streamns_depth = non_streamns_depth + 1;
                end
                
                -- FIXME !!!!!
@@ -69,8 +77,8 @@ function new_sax_handlers(session, stream_callbacks)
                        attr[i] = nil;
                        local ns, nm = k:match(ns_pattern);
                        if nm ~= "" then
-                               ns = ns_prefixes[ns]; 
-                               if ns then 
+                               ns = ns_prefixes[ns];
+                               if ns then
                                        attr[ns..":"..nm] = attr[k];
                                        attr[k] = nil;
                                end
@@ -80,6 +88,7 @@ function new_sax_handlers(session, stream_callbacks)
                if not stanza then --if we are not currently inside a stanza
                        if session.notopen then
                                if tagname == stream_tag then
+                                       non_streamns_depth = 0;
                                        if cb_streamopened then
                                                cb_streamopened(session, attr);
                                        end
@@ -95,10 +104,6 @@ function new_sax_handlers(session, stream_callbacks)
                        
                        stanza = st.stanza(name, attr);
                else -- we are inside a stanza, so add a tag
-                       attr.xmlns = nil;
-                       if curr_ns ~= stream_default_ns then
-                               attr.xmlns = curr_ns;
-                       end
                        stanza:tag(name, attr);
                end
        end
@@ -108,6 +113,9 @@ function new_sax_handlers(session, stream_callbacks)
                end
        end
        function xml_handlers:EndElement(tagname)
+               if non_streamns_depth > 0 then
+                       non_streamns_depth = non_streamns_depth - 1;
+               end
                if stanza then
                        if #chardata > 0 then
                                -- We have some character data in the buffer
@@ -115,7 +123,8 @@ function new_sax_handlers(session, stream_callbacks)
                                chardata = {};
                        end
                        -- Complete stanza
-                       if #stanza.last_add == 0 then
+                       local last_add = stanza.last_add;
+                       if not last_add or #last_add == 0 then
                                if tagname ~= stream_error_tag then
                                        cb_handlestanza(session, stanza);
                                else
@@ -140,11 +149,35 @@ function new_sax_handlers(session, stream_callbacks)
                        stanza, chardata = nil, {};
                end
        end
-       return xml_handlers;
+       
+       local function reset()
+               stanza, chardata = nil, {};
+       end
+       
+       local function set_session(stream, new_session)
+               session = new_session;
+               log = new_session.log or default_log;
+       end
+       
+       return xml_handlers, { reset = reset, set_session = set_session };
 end
 
 function new(session, stream_callbacks)
-       return new_parser(new_sax_handlers(session, stream_callbacks), ns_separator);
+       local handlers, meta = new_sax_handlers(session, stream_callbacks);
+       local parser = new_parser(handlers, ns_separator);
+       local parse = parser.parse;
+
+       return {
+               reset = function ()
+                       parser = new_parser(handlers, ns_separator);
+                       parse = parser.parse;
+                       meta.reset();
+               end,
+               feed = function (self, data)
+                       return parse(parser, data);
+               end,
+               set_session = meta.set_session;
+       };
 end
 
 return _M;