Software /
code /
verse
Annotate
client.lua @ 64:a28540d4117a
verse: Load LuaSec if possible
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 11 May 2010 23:09:37 +0100 |
parent | 62:d4b6f9e33c6e |
child | 70:36d113fb0f3c |
rev | line source |
---|---|
26 | 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; |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 local lxp = require "lxp"; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 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
|
7 |
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 -- 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
|
9 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
|
10 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
|
11 |
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
|
12 local init_xmlhandlers = require "core.xmlhandlers"; |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 |
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
|
14 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
|
15 |
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
|
16 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
|
17 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
|
18 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
|
19 default_ns = "jabber:client" }; |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 function stream_callbacks.streamopened(stream, attr) |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 if not stream:event("opened") then |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 stream.notopen = nil; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
25 return true; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 function stream_callbacks.streamclosed(stream) |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 return stream:event("closed"); |
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 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 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
|
33 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
|
34 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
|
35 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
|
36 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
|
37 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
|
38 |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 return stream:event("stanza", stanza); |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 local function reset_stream(stream) |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
43 -- Reset stream |
21
00da62000b83
verse.client: Fixes for new xmlhandlers namespace seperator
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
44 local parser = lxp.new(init_xmlhandlers(stream, stream_callbacks), "\1"); |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 stream.parser = parser; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
46 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 stream.notopen = true; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 function stream.data(conn, data) |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 local ok, err = parser:parse(data); |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 if ok then return; end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
52 stream:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " ")); |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 stream:close("xml-not-well-formed"); |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
55 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
56 return true; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
57 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
58 |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
59 function stream:connect_client(jid, pass) |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
60 self.jid, self.password = jid, pass; |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
61 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
|
62 |
62
d4b6f9e33c6e
verse.client: Load TLS along with other core plugins
Matthew Wild <mwild1@gmail.com>
parents:
52
diff
changeset
|
63 -- Required XMPP features |
d4b6f9e33c6e
verse.client: Load TLS along with other core plugins
Matthew Wild <mwild1@gmail.com>
parents:
52
diff
changeset
|
64 self:add_plugin("tls"); |
38
c40cc28ac7df
verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents:
37
diff
changeset
|
65 self:add_plugin("sasl"); |
c40cc28ac7df
verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents:
37
diff
changeset
|
66 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
|
67 self:add_plugin("session"); |
38
c40cc28ac7df
verse.client: Automatically load sasl and bind plugins
Matthew Wild <mwild1@gmail.com>
parents:
37
diff
changeset
|
68 |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
69 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
|
70 |
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
|
71 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
|
72 |
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
|
73 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
|
74 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
|
75 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
|
76 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
|
77 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
|
78 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
|
79 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
|
80 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
|
81 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
|
82 |
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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 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
|
88 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
|
89 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
|
90 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
|
91 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
|
92 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
|
93 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
|
94 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
|
95 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
|
96 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
|
97 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
|
98 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
|
99 |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 -- Initialise connection |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
101 self:connect(self.connect_host or self.host, self.connect_port or 5222); |
11
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
102 --reset_stream(self); |
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
103 self:reopen(); |
1
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
104 end |
7c8d0a2fc004
Break client-specific code into verse.client module
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
105 |
11
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
106 function stream:reopen() |
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
107 reset_stream(self); |
49
9c10ff584e87
verse.client: Add missing version to stream header (thanks Bill Clark)
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
108 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
|
109 xmlns = "jabber:client", version = "1.0" }):top_tag()); |
11
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
110 end |
ce349990bd21
verse.client: Add stream:reopen()
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
111 |
12
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
112 function stream:close(reason) |
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
113 if not self.notopen then |
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
114 self:send("</stream:stream>"); |
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
115 end |
46
6a329776fb42
verse.client: Fire disconnected event when the disconnect is initiated by the client too
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
116 local on_disconnect = self.conn.disconnect(); |
12
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
117 self.conn:close(); |
46
6a329776fb42
verse.client: Fire disconnected event when the disconnect is initiated by the client too
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
118 on_disconnect(conn, reason); |
12
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
119 end |
73f466054ead
verse.client: Add stream:close()
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
120 |
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
|
121 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
|
122 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
|
123 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
|
124 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
|
125 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
|
126 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
|
127 |
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
|
128 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
|
129 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
|
130 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
|
131 end |