verse
46e933d81024
client.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / verse

Annotate

client.lua @ 144:46e933d81024

docs/example_jingle.lua: Update to use content.type instead of content.name for checking the kind of content we're receiving
author Matthew Wild <mwild1@gmail.com>
date Fri, 17 Sep 2010 16:42:50 +0100
parent 137:e4b9d3c5332c
child 161:b177bcea2006
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26
6c5fab6c11cf Rename verse2 -> verse
Matthew Wild <mwild1@gmail.com>
parents: 25
diff changeset
1 local verse = require "verse";
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 local stream = verse.stream_mt;
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3
30
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 28
diff changeset
4 local jid_split = require "util.jid".split;
137
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
5 local adns = require "net.adns";
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 local lxp = require "lxp";
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7 local st = require "util.stanza";
22
e6fad7c411fe verse.client: Extend verse object with message/iq/presence/stanza methods from util.stanza
Matthew Wild <mwild1@gmail.com>
parents: 21
diff changeset
8
e6fad7c411fe verse.client: Extend verse object with message/iq/presence/stanza methods from util.stanza
Matthew Wild <mwild1@gmail.com>
parents: 21
diff changeset
9 -- Shortcuts to save having to load util.stanza
52
8416508bfeb4 verse.client: Add verse.error_reply() helper
Matthew Wild <mwild1@gmail.com>
parents: 50
diff changeset
10 verse.message, verse.presence, verse.iq, verse.stanza, verse.reply, verse.error_reply =
8416508bfeb4 verse.client: Add verse.error_reply() helper
Matthew Wild <mwild1@gmail.com>
parents: 50
diff changeset
11 st.message, st.presence, st.iq, st.stanza, st.reply, st.error_reply;
22
e6fad7c411fe verse.client: Extend verse object with message/iq/presence/stanza methods from util.stanza
Matthew Wild <mwild1@gmail.com>
parents: 21
diff changeset
12
47
3ebffb4fc48c verse.client, squishy: Rename "xmlhandlers" to "core.xmlhandlers" in line with Prosody's structure
Matthew Wild <mwild1@gmail.com>
parents: 46
diff changeset
13 local init_xmlhandlers = require "core.xmlhandlers";
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14
10
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
15 local xmlns_stream = "http://etherx.jabber.org/streams";
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16
137
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
17 local function compare_srv_priorities(a,b)
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
18 return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
19 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
20
48
abccad4b8559 verse.client: Update stream_callbacks format for new xmlhandlers API (thanks to Bill Clark for the patch)
Matthew Wild <mwild1@gmail.com>
parents: 47
diff changeset
21 local stream_callbacks = {
abccad4b8559 verse.client: Update stream_callbacks format for new xmlhandlers API (thanks to Bill Clark for the patch)
Matthew Wild <mwild1@gmail.com>
parents: 47
diff changeset
22 stream_ns = xmlns_stream,
abccad4b8559 verse.client: Update stream_callbacks format for new xmlhandlers API (thanks to Bill Clark for the patch)
Matthew Wild <mwild1@gmail.com>
parents: 47
diff changeset
23 stream_tag = "stream",
abccad4b8559 verse.client: Update stream_callbacks format for new xmlhandlers API (thanks to Bill Clark for the patch)
Matthew Wild <mwild1@gmail.com>
parents: 47
diff changeset
24 default_ns = "jabber:client" };
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
25
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26 function stream_callbacks.streamopened(stream, attr)
83
8221f3c25fd4 verse.client: Add stream_id property
Matthew Wild <mwild1@gmail.com>
parents: 81
diff changeset
27 stream.stream_id = attr.id;
8221f3c25fd4 verse.client: Add stream_id property
Matthew Wild <mwild1@gmail.com>
parents: 81
diff changeset
28 if not stream:event("opened", attr) then
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
29 stream.notopen = nil;
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
30 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
31 return true;
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
32 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
33
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
34 function stream_callbacks.streamclosed(stream)
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
35 return stream:event("closed");
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
36 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
37
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
38 function stream_callbacks.handlestanza(stream, stanza)
10
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
39 if stanza.attr.xmlns == xmlns_stream then
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
40 return stream:event("stream-"..stanza.name, stanza);
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
41 elseif stanza.attr.xmlns then
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
42 return stream:event("stream/"..stanza.attr.xmlns, stanza);
3a422606a040 verse.client: Fire events on stream features, errors, etc. and on non-stream tags such as SASL and TLS
Matthew Wild <mwild1@gmail.com>
parents: 1
diff changeset
43 end
28
afe9e6d6c87a verse.client: New stanza dispatcher to fire events based on the name (and in the case of iq, xmlns) of the stanza
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
44
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
45 return stream:event("stanza", stanza);
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
46 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
47
70
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
48 function stream:reset()
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
49 -- Reset stream
70
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
50 local parser = lxp.new(init_xmlhandlers(self, stream_callbacks), "\1");
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
51 self.parser = parser;
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
52
70
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
53 self.notopen = true;
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
54
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
55 return true;
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
56 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
57
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
58 function stream:connect_client(jid, pass)
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
59 self.jid, self.password = jid, pass;
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
60 self.username, self.host, self.resource = jid_split(jid);
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
61
62
d4b6f9e33c6e verse.client: Load TLS along with other core plugins
Matthew Wild <mwild1@gmail.com>
parents: 52
diff changeset
62 -- Required XMPP features
d4b6f9e33c6e verse.client: Load TLS along with other core plugins
Matthew Wild <mwild1@gmail.com>
parents: 52
diff changeset
63 self:add_plugin("tls");
38
c40cc28ac7df verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
64 self:add_plugin("sasl");
c40cc28ac7df verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
65 self:add_plugin("bind");
50
432ac110544f Add support for 3921 session negotiation (makes ejabberd happy), thanks Chris!
Matthew Wild <mwild1@gmail.com>
parents: 49
diff changeset
66 self:add_plugin("session");
38
c40cc28ac7df verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
67
70
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
68 function self.data(conn, data)
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
69 local ok, err = self.parser:parse(data);
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
70 if ok then return; end
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
71 stream:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
72 stream:close("xml-not-well-formed");
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
73 end
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
74
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
75 self:hook("incoming-raw", function (data) return self.data(self.conn, data); end);
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
76
13
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
77 self.curr_id = 0;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
78
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
79 self.tracked_iqs = {};
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
80 self:hook("stanza", function (stanza)
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
81 local id, type = stanza.attr.id, stanza.attr.type;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
82 if id and stanza.name == "iq" and (type == "result" or type == "error") and self.tracked_iqs[id] then
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
83 self.tracked_iqs[id](stanza);
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
84 self.tracked_iqs[id] = nil;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
85 return true;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
86 end
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
87 end);
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
88
37
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
89 self:hook("stanza", function (stanza)
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
90 if stanza.attr.xmlns == nil or stanza.attr.xmlns == "jabber:client" then
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
91 if stanza.name == "iq" and (stanza.attr.type == "get" or stanza.attr.type == "set") then
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
92 local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
93 if xmlns then
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
94 ret = self:event("iq/"..xmlns, stanza);
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
95 if not ret then
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
96 ret = self:event("iq", stanza);
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
97 end
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
98 end
81
0924a3d05e40 Bounce service-unavailable on unhandled iq stanzas (thanks Kev, Florob and anyone else who poked me)
Matthew Wild <mwild1@gmail.com>
parents: 78
diff changeset
99 if ret == nil then
0924a3d05e40 Bounce service-unavailable on unhandled iq stanzas (thanks Kev, Florob and anyone else who poked me)
Matthew Wild <mwild1@gmail.com>
parents: 78
diff changeset
100 self:send(verse.error_reply(stanza, "cancel", "service-unavailable"));
0924a3d05e40 Bounce service-unavailable on unhandled iq stanzas (thanks Kev, Florob and anyone else who poked me)
Matthew Wild <mwild1@gmail.com>
parents: 78
diff changeset
101 return true;
0924a3d05e40 Bounce service-unavailable on unhandled iq stanzas (thanks Kev, Florob and anyone else who poked me)
Matthew Wild <mwild1@gmail.com>
parents: 78
diff changeset
102 end
37
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
103 else
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
104 ret = self:event(stanza.name, stanza);
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
105 end
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
106 end
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
107 return ret;
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
108 end, -1);
0ccd523e110a verse.client: Don't hook the stanza event every time a stanza comes in :)
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
109
76
927167321283 verse.client: Fire 'ready' event on stream when resource binding or session negotiation is complete, hook this instead of binding-success
Matthew Wild <mwild1@gmail.com>
parents: 70
diff changeset
110 local function stream_ready()
927167321283 verse.client: Fire 'ready' event on stream when resource binding or session negotiation is complete, hook this instead of binding-success
Matthew Wild <mwild1@gmail.com>
parents: 70
diff changeset
111 self:event("ready");
927167321283 verse.client: Fire 'ready' event on stream when resource binding or session negotiation is complete, hook this instead of binding-success
Matthew Wild <mwild1@gmail.com>
parents: 70
diff changeset
112 end
927167321283 verse.client: Fire 'ready' event on stream when resource binding or session negotiation is complete, hook this instead of binding-success
Matthew Wild <mwild1@gmail.com>
parents: 70
diff changeset
113 self:hook("session-success", stream_ready, -1)
78
f4188eff53a7 verse.client, verse.plugins.bind, verse.plugins.session: Rename binding-success and binding-failure to bind-success and bind-failure for consistency
Matthew Wild <mwild1@gmail.com>
parents: 76
diff changeset
114 self:hook("bind-success", stream_ready, -1);
76
927167321283 verse.client: Fire 'ready' event on stream when resource binding or session negotiation is complete, hook this instead of binding-success
Matthew Wild <mwild1@gmail.com>
parents: 70
diff changeset
115
97
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
116 local _base_close = self.close;
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
117 function self:close(reason)
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
118 if not self.notopen then
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
119 self:send("</stream:stream>");
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
120 end
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
121 return _base_close(self);
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
122 end
ad6006779416 verse.client: Update stream:close() to use base stream:close(), and not add an XMPP-specific :close() to the base stream
Matthew Wild <mwild1@gmail.com>
parents: 83
diff changeset
123
137
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
124 local function start_connect()
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
125 -- Initialise connection
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
126 self:connect(self.connect_host or self.host, self.connect_port or 5222);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
127 self:reopen();
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
128 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
129
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
130 if not (self.connect_host or self.connect_port) then
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
131 -- Look up SRV records
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
132 adns.lookup(function (answer)
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
133 if answer then
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
134 local srv_hosts = {};
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
135 self.srv_hosts = srv_hosts;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
136 for _, record in ipairs(answer) do
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
137 table.insert(srv_hosts, record.srv);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
138 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
139 table.sort(srv_hosts, compare_srv_priorities);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
140
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
141 local srv_choice = srv_hosts[1];
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
142 self.srv_choice = 1;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
143 if srv_choice then
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
144 self.connect_host, self.connect_port = srv_choice.target, srv_choice.port;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
145 self:debug("Best record found, will connect to %s:%d", self.connect_host or self.host, self.connect_port or 5222);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
146 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
147
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
148 self:hook("disconnected", function ()
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
149 if self.srv_hosts and self.srv_choice < #self.srv_hosts then
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
150 self.srv_choice = self.srv_choice + 1;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
151 local srv_choice = srv_hosts[self.srv_choice];
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
152 self.connect_host, self.connect_port = srv_choice.target, srv_choice.port;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
153 start_connect();
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
154 return true;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
155 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
156 end, 1000);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
157
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
158 self:hook("connected", function ()
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
159 self.srv_hosts = nil;
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
160 end, 1000);
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
161 end
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
162 start_connect();
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
163 end, "_xmpp-client._tcp."..(self.host)..".", "SRV");
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
164 else
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
165 start_connect();
e4b9d3c5332c verse.client: Support for SRV record lookups
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
166 end
1
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
167 end
7c8d0a2fc004 Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
168
11
ce349990bd21 verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents: 10
diff changeset
169 function stream:reopen()
70
36d113fb0f3c verse.client: Add stream:reset(), keep self.data static between resets
Matthew Wild <mwild1@gmail.com>
parents: 62
diff changeset
170 self:reset();
49
9c10ff584e87 verse.client: Add missing version to stream header (thanks Bill Clark)
Matthew Wild <mwild1@gmail.com>
parents: 48
diff changeset
171 self:send(st.stanza("stream:stream", { to = self.host, ["xmlns:stream"]='http://etherx.jabber.org/streams',
9c10ff584e87 verse.client: Add missing version to stream header (thanks Bill Clark)
Matthew Wild <mwild1@gmail.com>
parents: 48
diff changeset
172 xmlns = "jabber:client", version = "1.0" }):top_tag());
11
ce349990bd21 verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents: 10
diff changeset
173 end
ce349990bd21 verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents: 10
diff changeset
174
13
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
175 function stream:send_iq(iq, callback)
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
176 local id = self:new_id();
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
177 self.tracked_iqs[id] = callback;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
178 iq.attr.id = id;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
179 self:send(iq);
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
180 end
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
181
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
182 function stream:new_id()
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
183 self.curr_id = self.curr_id + 1;
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
184 return tostring(self.curr_id);
c3d83b98fb4f verse.client: Add stream:send_iq() and stream:new_id() for sending iqs with response handlers, and for generating stream-unique ids respectively
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
185 end