Fri, 17 Dec 2010 01:24:59 +0000
net.httpserver: Default 'ports' = {5280}
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1517
diff
changeset
|
1 | -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2848
diff
changeset
|
2 | -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2848
diff
changeset
|
3 | -- Copyright (C) 2008-2010 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 | |
1984
f2b1f89e1d7c
util.stanza: Don't add xmlns to tags when serializing if same as the parent tag's xmlns. Should hopefully shut up Gajim once and for all :)
Matthew Wild <mwild1@gmail.com>
parents:
1935
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"); |
1932
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
31 | local getstyle, getstring; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
32 | if do_pretty_printing then |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
33 | local ok, termcolours = pcall(require, "util.termcolours"); |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
34 | if ok then |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
35 | getstyle, getstring = termcolours.getstyle, termcolours.getstring; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
36 | else |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
37 | do_pretty_printing = nil; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
38 | end |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
39 | end |
262 | 40 | |
2955
f807dc244a5b
util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
41 | local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas"; |
f807dc244a5b
util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
42 | |
0 | 43 | module "stanza" |
44 | ||
1874
262ea889016f
util.stanza: Add __type to metatable
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
45 | stanza_mt = { __type = "stanza" }; |
0 | 46 | stanza_mt.__index = stanza_mt; |
47 | ||
48 | function stanza(name, attr) | |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
49 | local stanza = { name = name, attr = attr or {}, tags = {} }; |
0 | 50 | return setmetatable(stanza, stanza_mt); |
51 | end | |
52 | ||
53 | function stanza_mt:query(xmlns) | |
54 | return self:tag("query", { xmlns = xmlns }); | |
55 | end | |
373
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
56 | |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
57 | 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
|
58 | 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
|
59 | end |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
60 | |
0 | 61 | function stanza_mt:tag(name, attrs) |
62 | local s = stanza(name, attrs); | |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
63 | local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
64 | if not last_add then last_add = {}; self.last_add = last_add; end |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
65 | (last_add[#last_add] or self):add_direct_child(s); |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
66 | t_insert(last_add, s); |
0 | 67 | return self; |
68 | end | |
69 | ||
70 | function stanza_mt:text(text) | |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
71 | local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
72 | (last_add and last_add[#last_add] or self):add_direct_child(text); |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
73 | return self; |
0 | 74 | end |
75 | ||
76 | function stanza_mt:up() | |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
77 | local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
78 | if last_add then t_remove(last_add); end |
0 | 79 | return self; |
80 | end | |
81 | ||
964
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
82 | function stanza_mt:reset() |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
83 | self.last_add = nil; |
964
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
84 | return self; |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
85 | end |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
86 | |
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
|
87 | function stanza_mt:add_direct_child(child) |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
88 | if type(child) == "table" then |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
89 | t_insert(self.tags, child); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
90 | end |
0 | 91 | t_insert(self, child); |
92 | end | |
93 | ||
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
|
94 | function stanza_mt:add_child(child) |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
95 | local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
96 | (last_add and last_add[#last_add] or self):add_direct_child(child); |
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
|
97 | 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
|
98 | 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
|
99 | |
2264
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
100 | function stanza_mt:get_child(name, xmlns) |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
101 | for _, child in ipairs(self.tags) do |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
102 | if (not name or child.name == name) |
2264
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
103 | and ((not xmlns and self.attr.xmlns == child.attr.xmlns) |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
104 | or child.attr.xmlns == xmlns) then |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
105 | |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
106 | return child; |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
107 | end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
108 | end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
109 | end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
110 | |
0 | 111 | function stanza_mt:child_with_name(name) |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
112 | for _, child in ipairs(self.tags) do |
0 | 113 | if child.name == name then return child; end |
114 | end | |
115 | end | |
116 | ||
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
|
117 | function stanza_mt:child_with_ns(ns) |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
118 | for _, child in ipairs(self.tags) do |
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
|
119 | 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
|
120 | 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
|
121 | 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
|
122 | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
123 | function stanza_mt:children() |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
124 | local i = 0; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
125 | return function (a) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
126 | i = i + 1 |
3475
0307a3ac3885
util.stanza: Optimisation, remove useless if...then in stanza:children() iterator
Matthew Wild <mwild1@gmail.com>
parents:
3474
diff
changeset
|
127 | return a[i]; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
128 | end, self, i; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
129 | end |
3474
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
130 | |
3478
4621c92d2368
util.stanza: stanza:matched_children() -> stanza:matching_tags()
Matthew Wild <mwild1@gmail.com>
parents:
3477
diff
changeset
|
131 | function stanza_mt:matching_tags(name, xmlns) |
3474
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
132 | xmlns = xmlns or self.attr.xmlns; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
133 | local tags = self.tags; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
134 | local start_i, max_i = 1, #tags; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
135 | return function () |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
136 | for i=start_i,max_i do |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
137 | v = tags[i]; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
138 | if (not name or v.name == name) |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
139 | and (not xmlns or xmlns == v.attr.xmlns) then |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
140 | start_i = i+1; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
141 | return v; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
142 | end |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
143 | end |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
144 | end, tags, i; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
145 | end |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
146 | |
2 | 147 | function stanza_mt:childtags() |
148 | local i = 0; | |
149 | return function (a) | |
150 | i = i + 1 | |
151 | local v = self.tags[i] | |
152 | if v then return v; end | |
153 | end, self.tags[1], i; | |
154 | end | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
155 | |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
156 | function stanza_mt:maptags(callback) |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
157 | local tags, curr_tag = self.tags, 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
158 | local n_children, n_tags = #self, #tags; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
159 | |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
160 | local i = 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
161 | while curr_tag <= n_tags do |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
162 | if self[i] == tags[curr_tag] then |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
163 | local ret = callback(self[i]); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
164 | if ret == nil then |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
165 | t_remove(self, i); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
166 | t_remove(tags, curr_tag); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
167 | n_children = n_children - 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
168 | n_tags = n_tags - 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
169 | else |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
170 | self[i] = ret; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
171 | tags[i] = ret; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
172 | end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
173 | i = i + 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
174 | curr_tag = curr_tag + 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
175 | end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
176 | end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
177 | return self; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
178 | end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
179 | |
1931
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
180 | local xml_escape |
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
181 | do |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
182 | local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; |
1931
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
183 | function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end |
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
184 | _M.xml_escape = xml_escape; |
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
185 | end |
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
186 | |
1984
f2b1f89e1d7c
util.stanza: Don't add xmlns to tags when serializing if same as the parent tag's xmlns. Should hopefully shut up Gajim once and for all :)
Matthew Wild <mwild1@gmail.com>
parents:
1935
diff
changeset
|
187 | local function _dostring(t, buf, self, xml_escape, parentns) |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
188 | local nsid = 0; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
189 | local name = t.name |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
190 | 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
|
191 | for k, v in pairs(t.attr) do |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
192 | if s_find(k, "\1", 1, true) then |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
193 | local ns, attrk = s_match(k, "^([^\1]*)\1?(.*)$"); |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
194 | 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
|
195 | t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'"); |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
196 | elseif not(k == "xmlns" and v == parentns) then |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
197 | 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
|
198 | end |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
199 | end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
200 | local len = #t; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
201 | if len == 0 then |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
202 | t_insert(buf, "/>"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
203 | else |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
204 | t_insert(buf, ">"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
205 | 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
|
206 | local child = t[n]; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
207 | if child.name then |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
208 | self(child, buf, self, xml_escape, t.attr.xmlns); |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
209 | else |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
210 | 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
|
211 | end |
4 | 212 | end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
213 | t_insert(buf, "</"..name..">"); |
0 | 214 | end |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
215 | end |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
216 | function stanza_mt.__tostring(t) |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
217 | local buf = {}; |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
218 | _dostring(t, buf, _dostring, xml_escape, nil); |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
219 | return t_concat(buf); |
0 | 220 | end |
221 | ||
242
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
222 | function stanza_mt.top_tag(t) |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
223 | local attr_string = ""; |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
224 | 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
|
225 | 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
|
226 | end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
227 | 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
|
228 | end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
229 | |
1420
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
230 | 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
|
231 | 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
|
232 | 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
|
233 | end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
234 | end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
235 | |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
236 | function stanza_mt.get_error(stanza) |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
237 | local type, condition, text; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
238 | |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
239 | local error_tag = stanza:get_child("error"); |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
240 | if not error_tag then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
241 | return nil, nil, nil; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
242 | end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
243 | type = error_tag.attr.type; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
244 | |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
245 | for child in error_tag:children() do |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
246 | if child.attr.xmlns == xmlns_stanzas then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
247 | if not text and child.name == "text" then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
248 | text = child:get_text(); |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
249 | elseif not condition then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
250 | condition = child.name; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
251 | end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
252 | if condition and text then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
253 | break; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
254 | end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
255 | end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
256 | end |
3848
3933e007f829
util.stanza: Change get_error() to return nil rather than '' for no text
Matthew Wild <mwild1@gmail.com>
parents:
3638
diff
changeset
|
257 | return type, condition or "undefined-condition", text; |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
258 | end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
259 | |
0 | 260 | 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
|
261 | return s1:add_direct_child(s2); |
0 | 262 | end |
263 | ||
264 | ||
265 | do | |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
266 | local id = 0; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
267 | function new_id() |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
268 | id = id + 1; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
269 | return "lx"..id; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
270 | end |
0 | 271 | end |
272 | ||
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
|
273 | 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
|
274 | 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
|
275 | 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
|
276 | 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
|
277 | 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
|
278 | 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
|
279 | 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
|
280 | 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
|
281 | 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
|
282 | 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
|
283 | 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
|
284 | |
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
|
285 | 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
|
286 | -- Set metatable |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
287 | if stanza then |
1415
957a81b72cb2
util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents:
1151
diff
changeset
|
288 | local attr = stanza.attr; |
957a81b72cb2
util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents:
1151
diff
changeset
|
289 | for i=1,#attr do attr[i] = nil; end |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
290 | local attrx = {}; |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
291 | for att in pairs(attr) do |
2956
15a145a67044
util.stanza: Fixed some more nil global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2955
diff
changeset
|
292 | if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then |
15a145a67044
util.stanza: Fixed some more nil global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2955
diff
changeset
|
293 | local ns,na = s_match(att, "^([^|]+)|(.+)$"); |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
294 | attrx[ns.."\1"..na] = attr[att]; |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
295 | attr[att] = nil; |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
296 | end |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
297 | end |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
298 | for a,v in pairs(attrx) do |
2956
15a145a67044
util.stanza: Fixed some more nil global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2955
diff
changeset
|
299 | attr[a] = v; |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
300 | end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
301 | 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
|
302 | 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
|
303 | if type(child) == "table" then |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
304 | 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
|
305 | 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
|
306 | end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
307 | if not stanza.tags then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
308 | -- Rebuild tags |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
309 | local tags = {}; |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
310 | for _, child in ipairs(stanza) do |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
311 | if type(child) == "table" then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
312 | t_insert(tags, child); |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
313 | end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
314 | end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
315 | stanza.tags = tags; |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
316 | 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
|
317 | 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
|
318 | |
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
|
319 | 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
|
320 | 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
|
321 | |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
322 | function clone(stanza) |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
323 | local lookup_table = {}; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
324 | local function _copy(object) |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
325 | if type(object) ~= "table" then |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
326 | return object; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
327 | elseif lookup_table[object] then |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
328 | return lookup_table[object]; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
329 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
330 | local new_table = {}; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
331 | lookup_table[object] = new_table; |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
332 | for index, value in pairs(object) do |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
333 | new_table[_copy(index)] = _copy(value); |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
334 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
335 | return setmetatable(new_table, getmetatable(object)); |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
336 | end |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
337 | |
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
338 | return _copy(stanza) |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
339 | end |
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
340 | |
0 | 341 | function message(attr, body) |
342 | if not body then | |
343 | return stanza("message", attr); | |
344 | else | |
3502
28887137bb1b
util.stanza: Make the current element <message> instead of <body> when body text is passed to st.message().
Waqas Hussain <waqas20@gmail.com>
parents:
3478
diff
changeset
|
345 | return stanza("message", attr):tag("body"):text(body):up(); |
0 | 346 | end |
347 | end | |
348 | function iq(attr) | |
349 | if attr and not attr.id then attr.id = new_id(); end | |
350 | return stanza("iq", attr or { id = new_id() }); | |
351 | end | |
352 | ||
353 | function reply(orig) | |
209
e9de0803676d
Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents:
181
diff
changeset
|
354 | 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 | 355 | end |
356 | ||
2848
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
357 | do |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
358 | local xmpp_stanzas_attr = { xmlns = xmlns_stanzas }; |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
359 | function error_reply(orig, type, condition, message) |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
360 | local t = reply(orig); |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
361 | t.attr.type = "error"; |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
362 | t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
363 | :tag(condition, xmpp_stanzas_attr):up(); |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
364 | if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
365 | return t; -- stanza ready for adding app-specific errors |
b2f367f16eb8
util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
366 | end |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
367 | end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
368 | |
0 | 369 | function presence(attr) |
370 | return stanza("presence", attr); | |
371 | end | |
372 | ||
262 | 373 | if do_pretty_printing then |
374 | local style_attrk = getstyle("yellow"); | |
375 | local style_attrv = getstyle("red"); | |
376 | local style_tagname = getstyle("red"); | |
377 | local style_punc = getstyle("magenta"); | |
378 | ||
379 | local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'"); | |
380 | local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">"); | |
381 | --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, ">"); | |
382 | local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">"); | |
383 | function stanza_mt.pretty_print(t) | |
384 | local children_text = ""; | |
385 | for n, child in ipairs(t) do | |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
386 | if type(child) == "string" then |
262 | 387 | children_text = children_text .. xml_escape(child); |
388 | else | |
389 | children_text = children_text .. child:pretty_print(); | |
390 | end | |
391 | end | |
392 | ||
393 | local attr_string = ""; | |
394 | if t.attr then | |
395 | 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 | |
396 | end | |
397 | return s_format(tag_format, t.name, attr_string, children_text, t.name); | |
398 | end | |
399 | ||
400 | function stanza_mt.pretty_top_tag(t) | |
401 | local attr_string = ""; | |
402 | if t.attr then | |
403 | 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 | |
404 | end | |
405 | return s_format(top_tag_format, t.name, attr_string); | |
406 | end | |
407 | else | |
408 | -- Sorry, fresh out of colours for you guys ;) | |
409 | stanza_mt.pretty_print = stanza_mt.__tostring; | |
410 | stanza_mt.pretty_top_tag = stanza_mt.top_tag; | |
411 | end | |
412 | ||
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
|
413 | return _M; |