author | Kim Alvefur <zash@zash.se> |
Fri, 26 Feb 2021 22:05:25 +0100 | |
changeset 4477 | 3b50a9a75fb6 |
parent 4376 | 78de3c7acf58 |
child 4503 | 8e644bf36627 |
permissions | -rw-r--r-- |
3817 | 1 |
local array = require "util.array"; |
2 |
local jid = require "util.jid"; |
|
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
3 |
local json = require "util.json"; |
3817 | 4 |
local st = require "util.stanza"; |
5 |
local xml = require "util.xml"; |
|
6 |
||
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
7 |
local field_mappings; -- in scope for "func" mappings |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
8 |
field_mappings = { |
3890
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
9 |
-- top level stanza attributes |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
10 |
-- needed here to mark them as known fields |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
11 |
kind = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
12 |
type = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
13 |
to = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
14 |
from = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
15 |
id = "attr", |
4039
270cd50852be
mod_rest: Map xml:lang to/from JSON
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
16 |
lang = "attr", |
3890
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
17 |
|
3817 | 18 |
-- basic message |
19 |
body = "text_tag", |
|
20 |
subject = "text_tag", |
|
21 |
thread = "text_tag", |
|
22 |
||
23 |
-- basic presence |
|
24 |
show = "text_tag", |
|
25 |
status = "text_tag", |
|
26 |
priority = "text_tag", |
|
27 |
||
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
28 |
state = { type = "name", xmlns = "http://jabber.org/protocol/chatstates" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
29 |
nick = { type = "text_tag", xmlns = "http://jabber.org/protocol/nick", tagname = "nick" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
30 |
delay = { type = "attr", xmlns = "urn:xmpp:delay", tagname = "delay", attr = "stamp" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
31 |
replace = { type = "attr", xmlns = "urn:xmpp:message-correct:0", tagname = "replace", attr = "id" }, |
3817 | 32 |
|
33 |
-- XEP-0045 MUC |
|
34 |
-- TODO history, password, ??? |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
35 |
join = { type = "bool_tag", xmlns = "http://jabber.org/protocol/muc", tagname = "x" }, |
3817 | 36 |
|
37 |
-- XEP-0071 |
|
38 |
html = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
39 |
type = "func", xmlns = "http://jabber.org/protocol/xhtml-im", tagname = "html", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
40 |
st2json = function (s) --> json string |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
41 |
return (tostring(s:get_child("body", "http://www.w3.org/1999/xhtml")):gsub(" xmlns='[^']*'", "", 1)); |
3817 | 42 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
43 |
json2st = function (s) --> xml |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
44 |
if type(s) == "string" then |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
45 |
return assert(xml.parse("<x:html xmlns:x='http://jabber.org/protocol/xhtml-im' xmlns='http://www.w3.org/1999/xhtml'>" .. s .. "</x:html>")); |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
46 |
end |
3817 | 47 |
end; |
48 |
}; |
|
49 |
||
3859
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3858
diff
changeset
|
50 |
-- XEP-0199: XMPP Ping |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
51 |
ping = { type = "bool_tag", xmlns = "urn:xmpp:ping", tagname = "ping" }, |
3817 | 52 |
|
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
53 |
-- XEP-0092: Software Version |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
54 |
version = { type = "func", xmlns = "jabber:iq:version", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
55 |
st2json = function (s) |
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
56 |
return { |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
57 |
name = s:get_child_text("name"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
58 |
version = s:get_child_text("version"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
59 |
os = s:get_child_text("os"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
60 |
} |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
61 |
end, |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
62 |
json2st = function (s) |
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
63 |
local v = st.stanza("query", { xmlns = "jabber:iq:version" }); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
64 |
if type(s) == "table" then |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
65 |
v:text_tag("name", s.name); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
66 |
v:text_tag("version", s.version); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
67 |
if s.os then |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
68 |
v:text_tag("os", s.os); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
69 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
70 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
71 |
return v; |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
72 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
73 |
}; |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
74 |
|
3817 | 75 |
-- XEP-0030 |
76 |
disco = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
77 |
type = "func", xmlns = "http://jabber.org/protocol/disco#info", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
78 |
st2json = function (s) --> array of features |
4477
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
79 |
if s.tags[1] == nil then |
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
80 |
return s.attr.node or true; |
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
81 |
end |
3957
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
82 |
local identities, features, extensions = array(), array(), {}; |
3817 | 83 |
for tag in s:childtags() do |
84 |
if tag.name == "identity" and tag.attr.category and tag.attr.type then |
|
85 |
identities:push({ category = tag.attr.category, type = tag.attr.type, name = tag.attr.name }); |
|
86 |
elseif tag.name == "feature" and tag.attr.var then |
|
87 |
features:push(tag.attr.var); |
|
88 |
end |
|
89 |
end |
|
3957
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
90 |
for form in s:childtags("x", "jabber:x:data") do |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
91 |
local jform = field_mappings.formdata.st2json(form); |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
92 |
local form_type = jform["FORM_TYPE"]; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
93 |
if jform then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
94 |
jform["FORM_TYPE"] = nil; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
95 |
extensions[form_type] = jform; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
96 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
97 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
98 |
if next(extensions) == nil then extensions = nil; end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
99 |
return { node = s.attr.node, identities = identities, features = features, extensions = extensions }; |
3817 | 100 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
101 |
json2st = function (s) |
3864
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3863
diff
changeset
|
102 |
if type(s) == "table" and s ~= json.null then |
3863
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
103 |
local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s.node }); |
3817 | 104 |
if s.identities then |
3852
1b9834500123
mod_rest: Fix iteration over disco#info identities
Kim Alvefur <zash@zash.se>
parents:
3827
diff
changeset
|
105 |
for _, identity in ipairs(s.identities) do |
3854
8d13b9c9ba75
mod_rest: Fix disco#info identities data mapping
Kim Alvefur <zash@zash.se>
parents:
3853
diff
changeset
|
106 |
disco:tag("identity", { category = identity.category, type = identity.type, name = identity.name }):up(); |
3817 | 107 |
end |
108 |
end |
|
109 |
if s.features then |
|
3853
11c34e97fe1a
mod_rest: Fix iteration over disco#info features
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
110 |
for _, feature in ipairs(s.features) do |
3817 | 111 |
disco:tag("feature", { var = feature }):up(); |
112 |
end |
|
113 |
end |
|
3957
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
114 |
if s.extensions then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
115 |
for form_type, extension in pairs(s.extensions) do |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
116 |
extension["FORM_TYPE"] = form_type; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
117 |
disco:add_child(field_mappings.formdata.json2st(extension)); |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
118 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
119 |
end |
3863
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
120 |
return disco; |
4477
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
121 |
elseif type(s) == "string" then |
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
122 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s }); |
3863
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
123 |
else |
3874 | 124 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", }); |
3817 | 125 |
end |
126 |
end; |
|
127 |
}; |
|
128 |
||
129 |
items = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
130 |
type = "func", xmlns = "http://jabber.org/protocol/disco#items", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
131 |
st2json = function (s) --> array of features | map with node |
4477
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
132 |
if s.tags[1] == nil then |
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
133 |
return s.attr.node or true; |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
134 |
end |
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
135 |
|
3817 | 136 |
local items = array(); |
137 |
for item in s:childtags("item") do |
|
138 |
items:push({ jid = item.attr.jid, node = item.attr.node, name = item.attr.name }); |
|
139 |
end |
|
140 |
return items; |
|
141 |
end; |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
142 |
json2st = function (s) |
3864
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3863
diff
changeset
|
143 |
if type(s) == "table" and s ~= json.null then |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
144 |
local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s.node }); |
3817 | 145 |
for _, item in ipairs(s) do |
3856
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
146 |
if type(item) == "string" then |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
147 |
disco:tag("item", { jid = item }); |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
148 |
elseif type(item) == "table" then |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
149 |
disco:tag("item", { jid = item.jid, node = item.node, name = item.name }); |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
150 |
end |
3817 | 151 |
end |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
152 |
return disco; |
4477
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
153 |
elseif type(s) == "string" then |
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4376
diff
changeset
|
154 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s }); |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
155 |
else |
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
156 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", }); |
3817 | 157 |
end |
158 |
end; |
|
159 |
}; |
|
160 |
||
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
161 |
-- XEP-0050: Ad-Hoc Commands |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
162 |
command = { type = "func", xmlns = "http://jabber.org/protocol/commands", tagname = "command", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
163 |
st2json = function (s) |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
164 |
local cmd = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
165 |
action = s.attr.action, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
166 |
node = s.attr.node, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
167 |
sessionid = s.attr.sessionid, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
168 |
status = s.attr.status, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
169 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
170 |
local actions = s:get_child("actions"); |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
171 |
local note = s:get_child("note"); |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
172 |
local form = s:get_child("x", "jabber:x:data"); |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
173 |
if actions then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
174 |
cmd.actions = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
175 |
execute = actions.attr.execute, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
176 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
177 |
for action in actions:childtags() do |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
178 |
cmd.actions[action.name] = true |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
179 |
end |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
180 |
elseif note then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
181 |
cmd.note = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
182 |
type = note.attr.type; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
183 |
text = note:get_text(); |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
184 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
185 |
end |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
186 |
if form then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
187 |
cmd.form = field_mappings.dataform.st2json(form); |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
188 |
end |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
189 |
return cmd; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
190 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
191 |
json2st = function (s) |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
192 |
if type(s) == "table" and s ~= json.null then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
193 |
local cmd = st.stanza("command", { |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
194 |
xmlns = "http://jabber.org/protocol/commands", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
195 |
action = s.action, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
196 |
node = s.node, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
197 |
sessionid = s.sessionid, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
198 |
status = s.status, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
199 |
}); |
3885
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
200 |
if type(s.actions) == "table" then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
201 |
cmd:tag("actions", { execute = s.actions.execute }); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
202 |
do |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
203 |
if s.actions.next == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
204 |
cmd:tag("next"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
205 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
206 |
if s.actions.prev == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
207 |
cmd:tag("prev"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
208 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
209 |
if s.actions.complete == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
210 |
cmd:tag("complete"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
211 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
212 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
213 |
cmd:up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
214 |
elseif type(s.note) == "table" then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
215 |
cmd:text_tag("note", s.note.text, { type = s.note.type }); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
216 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
217 |
if s.form then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
218 |
cmd:add_child(field_mappings.dataform.json2st(s.form)); |
3892
04ea96a0488d
mod_rest: Allow passing form data in a more compact format
Kim Alvefur <zash@zash.se>
parents:
3890
diff
changeset
|
219 |
elseif s.data then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
220 |
cmd:add_child(field_mappings.formdata.json2st(s.data)); |
3885
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
221 |
end |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
222 |
return cmd; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
223 |
elseif type(s) == "string" then -- assume node |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
224 |
return st.stanza("command", { xmlns = "http://jabber.org/protocol/commands", node = s }); |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
225 |
end |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
226 |
-- else .. missing required attribute |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
227 |
end; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
228 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
229 |
|
3859
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3858
diff
changeset
|
230 |
-- XEP-0066: Out of Band Data |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
231 |
oob_url = { type = "func", xmlns = "jabber:iq:oob", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
232 |
st2json = function (s) |
3817 | 233 |
return s:get_child_text("url"); |
234 |
end; |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
235 |
json2st = function (s) |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
236 |
if type(s) == "string" then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
237 |
return st.stanza("query", { xmlns = "jabber:iq:oob" }):text_tag("url", s); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
238 |
end |
3817 | 239 |
end; |
240 |
}; |
|
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
241 |
|
3911
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
242 |
-- XEP-0432: Simple JSON Messaging |
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
243 |
payload = { type = "func", xmlns = "urn:xmpp:json-msg:0", tagname = "payload", |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
244 |
st2json = function (s) |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
245 |
local rawjson = s:get_child_text("json", "urn:xmpp:json:0"); |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
246 |
if not rawjson then return nil, "missing-json-payload"; end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
247 |
local parsed, err = json.decode(rawjson); |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
248 |
if not parsed then return nil, err; end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
249 |
return { |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
250 |
datatype = s.attr.datatype; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
251 |
data = parsed; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
252 |
}; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
253 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
254 |
json2st = function (s) |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
255 |
if type(s) == "table" then |
3911
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
256 |
return st.stanza("payload", { xmlns = "urn:xmpp:json-msg:0", datatype = s.datatype }) |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
257 |
:tag("json", { xmlns = "urn:xmpp:json:0" }):text(json.encode(s.data)); |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
258 |
end; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
259 |
end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
260 |
}; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
261 |
|
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
262 |
-- XEP-0004: Data Forms |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
263 |
dataform = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
264 |
-- Generic and complete dataforms mapping |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
265 |
type = "func", xmlns = "jabber:x:data", tagname = "x", |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
266 |
st2json = function (s) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
267 |
local fields = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
268 |
local form = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
269 |
type = s.attr.type; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
270 |
title = s:get_child_text("title"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
271 |
instructions = s:get_child_text("instructions"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
272 |
fields = fields; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
273 |
}; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
274 |
for field in s:childtags("field") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
275 |
local i = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
276 |
var = field.attr.var; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
277 |
type = field.attr.type; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
278 |
label = field.attr.label; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
279 |
desc = field:get_child_text("desc"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
280 |
required = field:get_child("required") and true or nil; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
281 |
value = field:get_child_text("value"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
282 |
}; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
283 |
if field.attr.type == "jid-multi" or field.attr.type == "list-multi" or field.attr.type == "text-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
284 |
local value = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
285 |
for v in field:childtags("value") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
286 |
value:push(v:get_text()); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
287 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
288 |
if field.attr.type == "text-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
289 |
i.value = value:concat("\n"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
290 |
else |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
291 |
i.value = value; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
292 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
293 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
294 |
if field.attr.type == "list-single" or field.attr.type == "list-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
295 |
local options = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
296 |
for o in field:childtags("option") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
297 |
options:push({ label = o.attr.label, value = o:get_child_text("value") }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
298 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
299 |
i.options = options; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
300 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
301 |
fields:push(i); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
302 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
303 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
304 |
end; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
305 |
json2st = function (x) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
306 |
if type(x) == "table" and x ~= json.null then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
307 |
local form = st.stanza("x", { xmlns = "jabber:x:data", type = x.type }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
308 |
if x.title then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
309 |
form:text_tag("title", x.title); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
310 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
311 |
if x.instructions then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
312 |
form:text_tag("instructions", x.instructions); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
313 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
314 |
if type(x.fields) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
315 |
for _, f in ipairs(x.fields) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
316 |
if type(f) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
317 |
form:tag("field", { var = f.var, type = f.type, label = f.label }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
318 |
if f.desc then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
319 |
form:text_tag("desc", f.desc); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
320 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
321 |
if f.required == true then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
322 |
form:tag("required"):up(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
323 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
324 |
if type(f.value) == "string" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
325 |
form:text_tag("value", f.value); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
326 |
elseif type(f.value) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
327 |
for _, v in ipairs(f.value) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
328 |
form:text_tag("value", v); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
329 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
330 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
331 |
if type(f.options) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
332 |
for _, o in ipairs(f.value) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
333 |
if type(o) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
334 |
form:tag("option", { label = o.label }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
335 |
form:text_tag("value", o.value); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
336 |
form:up(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
337 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
338 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
339 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
340 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
341 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
342 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
343 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
344 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
345 |
end; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
346 |
}; |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
347 |
|
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
348 |
-- Simpler mapping of dataform from JSON map |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
349 |
formdata = { type = "func", xmlns = "jabber:x:data", tagname = "", |
3957
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
350 |
st2json = function (s) |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
351 |
local r = {}; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
352 |
for field in s:childtags("field") do |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
353 |
if field.attr.var then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
354 |
local values = array(); |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
355 |
for value in field:childtags("value") do |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
356 |
values:push(value:get_text()); |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
357 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
358 |
if field.attr.type == "list-single" or field.attr.type == "list-multi" then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
359 |
r[field.attr.var] = values; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
360 |
elseif field.attr.type == "text-multi" then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
361 |
r[field.attr.var] = values:concat("\n"); |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
362 |
elseif field.attr.type == "boolean" then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
363 |
r[field.attr.var] = values[1] == "1" or values[1] == "true"; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
364 |
elseif field.attr.type then |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
365 |
r[field.attr.var] = values[1] or json.null; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
366 |
else -- type is optional, no way to know if multiple or single value is expected |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
367 |
r[field.attr.var] = values; |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
368 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
369 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
370 |
end |
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3936
diff
changeset
|
371 |
return r; |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
372 |
end, |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
373 |
json2st = function (s, t) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
374 |
local form = st.stanza("x", { xmlns = "jabber:x:data", type = t }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
375 |
for k, v in pairs(s) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
376 |
form:tag("field", { var = k }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
377 |
if type(v) == "string" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
378 |
form:text_tag("value", v); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
379 |
elseif type(v) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
380 |
for _, v_ in ipairs(v) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
381 |
form:text_tag("value", v_); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
382 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
383 |
end |
3936
8b34222216f4
mod_rest: Fix encoding of simple dataforms
Kim Alvefur <zash@zash.se>
parents:
3927
diff
changeset
|
384 |
form:up(); |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
385 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
386 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
387 |
end |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
388 |
}; |
3927
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
389 |
|
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
390 |
-- XEP-0039: Statistics Gathering |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
391 |
stats = { type = "func", xmlns = "http://jabber.org/protocol/stats", tagname = "query", |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
392 |
st2json = function (s) |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
393 |
local o = array(); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
394 |
for stat in s:childtags("stat") do |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
395 |
o:push({ |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
396 |
name = stat.attr.name; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
397 |
unit = stat.attr.unit; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
398 |
value = stat.attr.value; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
399 |
}); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
400 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
401 |
return o; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
402 |
end; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
403 |
json2st = function (j) |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
404 |
local stats = st.stanza("query", { xmlns = "http://jabber.org/protocol/stats" }); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
405 |
if type(j) == "table" then |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
406 |
for _, stat in ipairs(j) do |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
407 |
stats:tag("stat", { name = stat.name, unit = stat.unit, value = stat.value }):up(); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
408 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
409 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
410 |
return stats; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
411 |
end; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
412 |
}; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
413 |
|
3817 | 414 |
}; |
415 |
||
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
416 |
local byxmlname = {}; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
417 |
for k, spec in pairs(field_mappings) do |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
418 |
if type(spec) == "table" then |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
419 |
spec.key = k; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
420 |
if spec.xmlns and spec.tagname then |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
421 |
byxmlname["{" .. spec.xmlns .. "}" .. spec.tagname] = spec; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
422 |
elseif spec.type == "name" then |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
423 |
byxmlname["{" .. spec.xmlns .. "}"] = spec; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
424 |
end |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
425 |
elseif type(spec) == "string" then |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
426 |
byxmlname["{jabber:client}" .. k] = {key = k; type = spec}; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
427 |
end |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
428 |
end |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
429 |
|
3817 | 430 |
local implied_kinds = { |
431 |
disco = "iq", |
|
432 |
items = "iq", |
|
433 |
ping = "iq", |
|
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
434 |
version = "iq", |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
435 |
command = "iq", |
3817 | 436 |
|
437 |
body = "message", |
|
438 |
html = "message", |
|
439 |
replace = "message", |
|
440 |
state = "message", |
|
441 |
subject = "message", |
|
442 |
thread = "message", |
|
443 |
||
444 |
join = "presence", |
|
445 |
priority = "presence", |
|
446 |
show = "presence", |
|
447 |
status = "presence", |
|
448 |
} |
|
449 |
||
4025
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
450 |
local implied_types = { |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
451 |
command = "set", |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
452 |
} |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
453 |
|
3817 | 454 |
local kind_by_type = { |
455 |
get = "iq", set = "iq", result = "iq", |
|
456 |
normal = "message", chat = "message", headline = "message", groupchat = "message", |
|
457 |
available = "presence", unavailable = "presence", |
|
458 |
subscribe = "presence", unsubscribe = "presence", |
|
459 |
subscribed = "presence", unsubscribed = "presence", |
|
460 |
} |
|
461 |
||
462 |
local function st2json(s) |
|
463 |
local t = { |
|
464 |
kind = s.name, |
|
465 |
type = s.attr.type, |
|
466 |
to = s.attr.to, |
|
467 |
from = s.attr.from, |
|
468 |
id = s.attr.id, |
|
4039
270cd50852be
mod_rest: Map xml:lang to/from JSON
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
469 |
lang = s.attr["xml:lang"], |
3817 | 470 |
}; |
471 |
if s.name == "presence" and not s.attr.type then |
|
472 |
t.type = "available"; |
|
473 |
end |
|
474 |
||
475 |
if t.to then |
|
476 |
t.to = jid.prep(t.to); |
|
477 |
if not t.to then return nil, "invalid-jid-to"; end |
|
478 |
end |
|
479 |
if t.from then |
|
480 |
t.from = jid.prep(t.from); |
|
481 |
if not t.from then return nil, "invalid-jid-from"; end |
|
482 |
end |
|
483 |
||
484 |
if t.type == "error" then |
|
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
485 |
local error = s:get_child("error"); |
3817 | 486 |
local err_typ, err_condition, err_text = s:get_error(); |
487 |
t.error = { |
|
488 |
type = err_typ, |
|
489 |
condition = err_condition, |
|
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
490 |
text = err_text, |
4255
d33b480befcb
mod_rest: Fix attempt at indexing nil if an error stanza is missing <error>
Kim Alvefur <zash@zash.se>
parents:
4039
diff
changeset
|
491 |
by = error and error.attr.by or nil, |
3817 | 492 |
}; |
493 |
return t; |
|
494 |
end |
|
495 |
||
4376
78de3c7acf58
mod_rest: Fix json-mapping stanzas with text or whitespace between tags
Kim Alvefur <zash@zash.se>
parents:
4313
diff
changeset
|
496 |
for _, tag in ipairs(s.tags) do |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
497 |
local prefix = "{" .. (tag.attr.xmlns or "jabber:client") .. "}"; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
498 |
local mapping = byxmlname[prefix .. tag.name]; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
499 |
if not mapping then |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
500 |
mapping = byxmlname[prefix]; |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
501 |
end |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
502 |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
503 |
if not mapping then -- luacheck: ignore 542 |
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
504 |
-- pass |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
505 |
elseif mapping.type == "text_tag" then |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
506 |
t[mapping.key] = tag:get_text(); |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
507 |
elseif mapping.type == "name" then |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
508 |
t[mapping.key] = tag.name; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
509 |
elseif mapping.type == "attr" then |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
510 |
t[mapping.key] = tag.attr[mapping.attr]; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
511 |
elseif mapping.type == "bool_tag" then |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
512 |
t[mapping.key] = true; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
513 |
elseif mapping.type == "func" and mapping.st2json then |
4313
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4255
diff
changeset
|
514 |
t[mapping.key] = mapping.st2json(tag); |
3817 | 515 |
end |
516 |
end |
|
517 |
||
518 |
return t; |
|
519 |
end |
|
520 |
||
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
521 |
local function str(s) |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
522 |
if type(s) == "string" then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
523 |
return s; |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
524 |
end |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
525 |
end |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
526 |
|
3817 | 527 |
local function json2st(t) |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
528 |
if type(t) ~= "table" or not str(next(t)) then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
529 |
return nil, "invalid-json"; |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
530 |
end |
4025
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
531 |
local t_type = str(t.type); |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
532 |
if t_type == nil then |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
533 |
for k, implied in pairs(implied_types) do |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
534 |
if t[k] then |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
535 |
t_type = implied; |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
536 |
end |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
537 |
end |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
538 |
end |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
539 |
local kind = str(t.kind) or kind_by_type[t_type]; |
3817 | 540 |
if not kind then |
541 |
for k, implied in pairs(implied_kinds) do |
|
542 |
if t[k] then |
|
543 |
kind = implied; |
|
544 |
break |
|
545 |
end |
|
546 |
end |
|
547 |
end |
|
548 |
||
4025
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
549 |
if t_type == "available" then |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
550 |
t_type = nil; |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
551 |
end |
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
552 |
|
3817 | 553 |
local s = st.stanza(kind or "message", { |
4025
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3957
diff
changeset
|
554 |
type = t_type; |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
555 |
to = str(t.to) and jid.prep(t.to); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
556 |
from = str(t.to) and jid.prep(t.from); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
557 |
id = str(t.id), |
4039
270cd50852be
mod_rest: Map xml:lang to/from JSON
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
558 |
["xml:lang"] = str(t.lang), |
3817 | 559 |
}); |
560 |
||
561 |
if t.to and not s.attr.to then |
|
562 |
return nil, "invalid-jid-to"; |
|
563 |
end |
|
564 |
if t.from and not s.attr.from then |
|
565 |
return nil, "invalid-jid-from"; |
|
566 |
end |
|
3823 | 567 |
if kind == "iq" and not s.attr.type then |
568 |
s.attr.type = "get"; |
|
3822
a607c69d0804
mod_rest: Guess 'get' as default type for 'iq' stanzas in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3821
diff
changeset
|
569 |
end |
3817 | 570 |
|
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
571 |
if type(t.error) == "table" then |
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
572 |
return st.error_reply(st.reply(s), str(t.error.type), str(t.error.condition), str(t.error.text), str(t.error.by)); |
3817 | 573 |
elseif t.type == "error" then |
574 |
s:text_tag("error", t.body, { code = t.error_code and tostring(t.error_code) }); |
|
575 |
return s; |
|
576 |
end |
|
577 |
||
578 |
for k, v in pairs(t) do |
|
3899
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
579 |
local mapping = field_mappings[k]; |
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
580 |
if mapping then |
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
581 |
if mapping == "text_tag" then |
3817 | 582 |
s:text_tag(k, v); |
3899
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
583 |
elseif mapping == "attr" then -- luacheck: ignore 542 |
3890
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
584 |
-- handled already |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
585 |
elseif mapping.type == "text_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
586 |
s:text_tag(mapping.tagname or k, v, mapping.xmlns and { xmlns = mapping.xmlns }); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
587 |
elseif mapping.type == "name" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
588 |
s:tag(v, { xmlns = mapping.xmlns }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
589 |
elseif mapping.type == "attr" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
590 |
s:tag(mapping.tagname or k, { xmlns = mapping.xmlns, [mapping.attr or k] = v }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
591 |
elseif mapping.type == "bool_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
592 |
s:tag(mapping.tagname or k, { xmlns = mapping.xmlns }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
593 |
elseif mapping.type == "func" and mapping.json2st then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
594 |
s:add_child(mapping.json2st(v)):up(); |
3817 | 595 |
end |
3889
1ec45dbc7db5
mod_rest: Return an error for unknown fields in JSON input
Kim Alvefur <zash@zash.se>
parents:
3885
diff
changeset
|
596 |
else |
1ec45dbc7db5
mod_rest: Return an error for unknown fields in JSON input
Kim Alvefur <zash@zash.se>
parents:
3885
diff
changeset
|
597 |
return nil, "unknown-field"; |
3817 | 598 |
end |
599 |
end |
|
600 |
||
601 |
s:reset(); |
|
602 |
||
603 |
return s; |
|
604 |
end |
|
605 |
||
606 |
return { |
|
607 |
st2json = st2json; |
|
608 |
json2st = json2st; |
|
609 |
}; |