Sun, 04 Oct 2009 16:38:33 +0100
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1517
diff
changeset
|
1 | -- Prosody IM |
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 | -- Copyright (C) 2008-2009 Matthew Wild |
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 | -- Copyright (C) 2008-2009 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
373
diff
changeset
|
4 | -- |
758 | 5 | -- This project is MIT/X11 licensed. Please see the |
6 | -- COPYING file in the source package for more information. | |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
373
diff
changeset
|
7 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
373
diff
changeset
|
8 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
373
diff
changeset
|
9 | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
10 | local t_insert = table.insert; |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
11 | local t_concat = table.concat; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
12 | local t_remove = table.remove; |
613
6c09127b50fb
New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
13 | local t_concat = table.concat; |
23 | 14 | local s_format = string.format; |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
15 | local s_match = string.match; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
16 | local tostring = tostring; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
17 | local setmetatable = setmetatable; |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
18 | local getmetatable = getmetatable; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
19 | local pairs = pairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
20 | local ipairs = ipairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
21 | local type = type; |
145 | 22 | local next = next; |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
23 | local print = print; |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
24 | local unpack = unpack; |
4 | 25 | local s_gsub = string.gsub; |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
26 | local s_char = string.char; |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
27 | local s_find = string.find; |
613
6c09127b50fb
New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
28 | local os = os; |
145 | 29 | |
262 | 30 | local do_pretty_printing = not os.getenv("WINDIR"); |
31 | local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; | |
32 | ||
145 | 33 | local log = require "util.logger".init("stanza"); |
34 | ||
0 | 35 | module "stanza" |
36 | ||
1874
262ea889016f
util.stanza: Add __type to metatable
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
37 | stanza_mt = { __type = "stanza" }; |
0 | 38 | stanza_mt.__index = stanza_mt; |
39 | ||
40 | function stanza(name, attr) | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
41 | local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}}; |
0 | 42 | return setmetatable(stanza, stanza_mt); |
43 | end | |
44 | ||
45 | function stanza_mt:query(xmlns) | |
46 | return self:tag("query", { xmlns = xmlns }); | |
47 | end | |
373
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
48 | |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
49 | function stanza_mt:body(text, attr) |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
50 | return self:tag("body", attr):text(text); |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
51 | end |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
52 | |
0 | 53 | function stanza_mt:tag(name, attrs) |
54 | local s = stanza(name, attrs); | |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
55 | (self.last_add[#self.last_add] or self):add_direct_child(s); |
0 | 56 | t_insert(self.last_add, s); |
57 | return self; | |
58 | end | |
59 | ||
60 | function stanza_mt:text(text) | |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
61 | (self.last_add[#self.last_add] or self):add_direct_child(text); |
0 | 62 | return self; |
63 | end | |
64 | ||
65 | function stanza_mt:up() | |
66 | t_remove(self.last_add); | |
67 | return self; | |
68 | end | |
69 | ||
964
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
70 | function stanza_mt:reset() |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
71 | local last_add = self.last_add; |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
72 | for i = 1,#last_add do |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
73 | last_add[i] = nil; |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
74 | end |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
75 | return self; |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
76 | end |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
77 | |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
78 | function stanza_mt:add_direct_child(child) |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
79 | if type(child) == "table" then |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
80 | t_insert(self.tags, child); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
81 | end |
0 | 82 | t_insert(self, child); |
83 | end | |
84 | ||
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
85 | function stanza_mt:add_child(child) |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
86 | (self.last_add[#self.last_add] or self):add_direct_child(child); |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
87 | return self; |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
88 | end |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
89 | |
0 | 90 | function stanza_mt:child_with_name(name) |
689
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
91 | for _, child in ipairs(self.tags) do |
0 | 92 | if child.name == name then return child; end |
93 | end | |
94 | end | |
95 | ||
689
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
96 | function stanza_mt:child_with_ns(ns) |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
97 | for _, child in ipairs(self.tags) do |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
98 | if child.attr.xmlns == ns then return child; end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
99 | end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
100 | end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
101 | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
102 | function stanza_mt:children() |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
103 | local i = 0; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
104 | return function (a) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
105 | i = i + 1 |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
106 | local v = a[i] |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
107 | if v then return v; end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
108 | end, self, i; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
109 | |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
110 | end |
2 | 111 | function stanza_mt:childtags() |
112 | local i = 0; | |
113 | return function (a) | |
114 | i = i + 1 | |
115 | local v = self.tags[i] | |
116 | if v then return v; end | |
117 | end, self.tags[1], i; | |
118 | ||
119 | end | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
120 | |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
121 | local xml_escape = (function() |
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
122 | local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; |
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
123 | return function(str) return (s_gsub(str, "['&<>\"]", escape_table)); end |
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
124 | end)(); |
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
125 | local function _dostring(t, buf, self, xml_escape) |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
126 | local nsid = 0; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
127 | local name = t.name |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
128 | t_insert(buf, "<"..name); |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
129 | for k, v in pairs(t.attr) do |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
130 | if s_find(k, "|", 1, true) then |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
131 | local ns, attrk = s_match(k, "^([^|]+)|(.+)$"); |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
132 | nsid = nsid + 1; |
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
133 | t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'"); |
776
89eb9f59993c
util.stanza: Temporary fix for serializing attributes with namespaces
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
134 | else |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
135 | t_insert(buf, " "..k.."='"..xml_escape(v).."'"); |
776
89eb9f59993c
util.stanza: Temporary fix for serializing attributes with namespaces
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
136 | end |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
137 | end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
138 | local len = #t; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
139 | if len == 0 then |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
140 | t_insert(buf, "/>"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
141 | else |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
142 | t_insert(buf, ">"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
143 | for n=1,len do |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
144 | local child = t[n]; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
145 | if child.name then |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
146 | self(child, buf, self, xml_escape); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
147 | else |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
148 | t_insert(buf, xml_escape(child)); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
149 | end |
4 | 150 | end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
151 | t_insert(buf, "</"..name..">"); |
0 | 152 | end |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
153 | end |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
154 | function stanza_mt.__tostring(t) |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
155 | local buf = {}; |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
156 | _dostring(t, buf, _dostring, xml_escape); |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
157 | return t_concat(buf); |
0 | 158 | end |
159 | ||
242
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
160 | function stanza_mt.top_tag(t) |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
161 | local attr_string = ""; |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
162 | if t.attr then |
338
804f5e62a41f
Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :)
Matthew Wild <mwild1@gmail.com>
parents:
262
diff
changeset
|
163 | for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end |
242
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
164 | end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
165 | return s_format("<%s%s>", t.name, attr_string); |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
166 | end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
167 | |
1420
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
168 | function stanza_mt.get_text(t) |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
169 | if #t.tags == 0 then |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
170 | return t_concat(t); |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
171 | end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
172 | end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
173 | |
0 | 174 | function stanza_mt.__add(s1, s2) |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
175 | return s1:add_direct_child(s2); |
0 | 176 | end |
177 | ||
178 | ||
179 | do | |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
180 | local id = 0; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
181 | function new_id() |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
182 | id = id + 1; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
183 | return "lx"..id; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
184 | end |
0 | 185 | end |
186 | ||
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
187 | function preserialize(stanza) |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
188 | local s = { name = stanza.name, attr = stanza.attr }; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
189 | for _, child in ipairs(stanza) do |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
190 | if type(child) == "table" then |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
191 | t_insert(s, preserialize(child)); |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
192 | else |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
193 | t_insert(s, child); |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
194 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
195 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
196 | return s; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
197 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
198 | |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
199 | function deserialize(stanza) |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
200 | -- Set metatable |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
201 | if stanza then |
1415
957a81b72cb2
util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents:
1151
diff
changeset
|
202 | local attr = stanza.attr; |
957a81b72cb2
util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents:
1151
diff
changeset
|
203 | for i=1,#attr do attr[i] = nil; end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
204 | setmetatable(stanza, stanza_mt); |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
205 | for _, child in ipairs(stanza) do |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
206 | if type(child) == "table" then |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
207 | deserialize(child); |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
208 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
209 | end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
210 | if not stanza.tags then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
211 | -- Rebuild tags |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
212 | local tags = {}; |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
213 | for _, child in ipairs(stanza) do |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
214 | if type(child) == "table" then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
215 | t_insert(tags, child); |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
216 | end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
217 | end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
218 | stanza.tags = tags; |
680
734994b61907
Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering.
Matthew Wild <mwild1@gmail.com>
parents:
628
diff
changeset
|
219 | if not stanza.last_add then |
734994b61907
Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering.
Matthew Wild <mwild1@gmail.com>
parents:
628
diff
changeset
|
220 | stanza.last_add = {}; |
734994b61907
Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering.
Matthew Wild <mwild1@gmail.com>
parents:
628
diff
changeset
|
221 | end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
222 | end |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
223 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
224 | |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
225 | return stanza; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
226 | end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
227 | |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
228 | function clone(stanza) |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
229 | local lookup_table = {}; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
230 | local function _copy(object) |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
231 | if type(object) ~= "table" then |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
232 | return object; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
233 | elseif lookup_table[object] then |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
234 | return lookup_table[object]; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
235 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
236 | local new_table = {}; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
237 | lookup_table[object] = new_table; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
238 | for index, value in pairs(object) do |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
239 | new_table[_copy(index)] = _copy(value); |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
240 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
241 | return setmetatable(new_table, getmetatable(object)); |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
242 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
243 | |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
244 | return _copy(stanza) |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
245 | end |
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
246 | |
0 | 247 | function message(attr, body) |
248 | if not body then | |
249 | return stanza("message", attr); | |
250 | else | |
251 | return stanza("message", attr):tag("body"):text(body); | |
252 | end | |
253 | end | |
254 | function iq(attr) | |
255 | if attr and not attr.id then attr.id = new_id(); end | |
256 | return stanza("iq", attr or { id = new_id() }); | |
257 | end | |
258 | ||
259 | function reply(orig) | |
209
e9de0803676d
Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents:
181
diff
changeset
|
260 | return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) }); |
0 | 261 | end |
262 | ||
1151
8096941b6734
util.stanza: Omit unused clone parameter from error_reply()
Waqas Hussain <waqas20@gmail.com>
parents:
964
diff
changeset
|
263 | function error_reply(orig, type, condition, message) |
70
a6c00467a3f8
Fixed typo in variable name
Waqas Hussain <waqas20@gmail.com>
parents:
62
diff
changeset
|
264 | local t = reply(orig); |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
265 | t.attr.type = "error"; |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
266 | t:tag("error", {type = type}) |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
267 | :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
268 | if (message) then t:tag("text"):text(message):up(); end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
269 | return t; -- stanza ready for adding app-specific errors |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
270 | end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
271 | |
0 | 272 | function presence(attr) |
273 | return stanza("presence", attr); | |
274 | end | |
275 | ||
262 | 276 | if do_pretty_printing then |
277 | local style_attrk = getstyle("yellow"); | |
278 | local style_attrv = getstyle("red"); | |
279 | local style_tagname = getstyle("red"); | |
280 | local style_punc = getstyle("magenta"); | |
281 | ||
282 | local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'"); | |
283 | local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">"); | |
284 | --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">"); | |
285 | local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">"); | |
286 | function stanza_mt.pretty_print(t) | |
287 | local children_text = ""; | |
288 | for n, child in ipairs(t) do | |
289 | if type(child) == "string" then | |
290 | children_text = children_text .. xml_escape(child); | |
291 | else | |
292 | children_text = children_text .. child:pretty_print(); | |
293 | end | |
294 | end | |
295 | ||
296 | local attr_string = ""; | |
297 | if t.attr then | |
298 | for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end | |
299 | end | |
300 | return s_format(tag_format, t.name, attr_string, children_text, t.name); | |
301 | end | |
302 | ||
303 | function stanza_mt.pretty_top_tag(t) | |
304 | local attr_string = ""; | |
305 | if t.attr then | |
306 | for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end | |
307 | end | |
308 | return s_format(top_tag_format, t.name, attr_string); | |
309 | end | |
310 | else | |
311 | -- Sorry, fresh out of colours for you guys ;) | |
312 | stanza_mt.pretty_print = stanza_mt.__tostring; | |
313 | stanza_mt.pretty_top_tag = stanza_mt.top_tag; | |
314 | end | |
315 | ||
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
316 | return _M; |