Tue, 04 Nov 2008 22:50:32 +0000
Re-applying my changes to componentmanager. Sigh.
30 | 1 | |
2 | local log = require "util.logger".init("modulemanager") | |
3 | ||
4 | local loadfile, pcall = loadfile, pcall; | |
5 | local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv; | |
6 | local pairs, ipairs = pairs, ipairs; | |
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
7 | local t_insert = table.insert; |
30 | 8 | local type = type; |
9 | ||
10 | local tostring, print = tostring, print; | |
11 | ||
12 | local _G = _G; | |
13 | ||
14 | module "modulemanager" | |
15 | ||
16 | local handler_info = {}; | |
17 | local handlers = {}; | |
18 | ||
19 | local modulehelpers = setmetatable({}, { __index = _G }); | |
20 | ||
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
21 | local function _add_iq_handler(module, origin_type, xmlns, handler) |
30 | 22 | handlers[origin_type] = handlers[origin_type] or {}; |
23 | handlers[origin_type].iq = handlers[origin_type].iq or {}; | |
24 | if not handlers[origin_type].iq[xmlns] then | |
25 | handlers[origin_type].iq[xmlns]= handler; | |
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
26 | handler_info[handler] = module; |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
27 | log("debug", "mod_%s now handles tag 'iq' with query namespace '%s'", module.name, xmlns); |
30 | 28 | else |
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
29 | log("warning", "mod_%s wants to handle tag 'iq' with query namespace '%s' but mod_%s already handles that", module.name, xmlns, handler_info[handlers[origin_type].iq[xmlns]].module.name); |
30 | 30 | end |
31 | end | |
32 | ||
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
33 | function modulehelpers.add_iq_handler(origin_type, xmlns, handler) |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
34 | if not (origin_type and handler and xmlns) then return false; end |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
35 | if type(origin_type) == "table" then |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
36 | for _, origin_type in ipairs(origin_type) do |
198
e4755408d40b
Fix for previous commit (again)
Matthew Wild <mwild1@gmail.com>
parents:
197
diff
changeset
|
37 | _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); |
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
38 | end |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
39 | return; |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
40 | end |
197 | 41 | _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); |
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
42 | end |
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
43 | |
191 | 44 | local function _add_handler(module, origin_type, tag, xmlns, handler) |
38 | 45 | handlers[origin_type] = handlers[origin_type] or {}; |
46 | if not handlers[origin_type][tag] then | |
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
47 | handlers[origin_type][tag] = handlers[origin_type][tag] or {}; |
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
48 | handlers[origin_type][tag][xmlns]= handler; |
191 | 49 | handler_info[handler] = module; |
50 | log("debug", "mod_%s now handles tag '%s'", module.name, tag); | |
38 | 51 | elseif handler_info[handlers[origin_type][tag]] then |
191 | 52 | log("warning", "mod_%s wants to handle tag '%s' but mod_%s already handles that", module.name, tag, handler_info[handlers[origin_type][tag]].module.name); |
38 | 53 | end |
30 | 54 | end |
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
55 | |
191 | 56 | function modulehelpers.add_handler(origin_type, tag, xmlns, handler) |
57 | if not (origin_type and tag and xmlns and handler) then return false; end | |
58 | if type(origin_type) == "table" then | |
59 | for _, origin_type in ipairs(origin_type) do | |
60 | _add_handler(getfenv(2).module, origin_type, tag, xmlns, handler); | |
61 | end | |
62 | return; | |
63 | end | |
64 | _add_handler(getfenv(2).module, origin_type, tag, xmlns, handler); | |
65 | end | |
66 | ||
30 | 67 | function loadall() |
38 | 68 | load("saslauth"); |
30 | 69 | load("legacyauth"); |
70 | load("roster"); | |
63
4c27740fdeff
mod_InBandRegistration -> mod_register
Matthew Wild <mwild1@gmail.com>
parents:
60
diff
changeset
|
71 | load("register"); |
65
9c471840acb9
TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents:
63
diff
changeset
|
72 | load("tls"); |
86
a2085854c72c
Added: vCard plugin: mod_vcard
Waqas Hussain <waqas20@gmail.com>
parents:
65
diff
changeset
|
73 | load("vcard"); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
86
diff
changeset
|
74 | load("private"); |
188 | 75 | load("version"); |
191 | 76 | load("dialback"); |
30 | 77 | end |
78 | ||
79 | function load(name) | |
80 | local mod, err = loadfile("plugins/mod_"..name..".lua"); | |
81 | if not mod then | |
82 | log("error", "Unable to load module '%s': %s", name or "nil", err or "nil"); | |
83 | return; | |
84 | end | |
85 | ||
86 | local pluginenv = setmetatable({ module = { name = name } }, { __index = modulehelpers }); | |
87 | ||
88 | setfenv(mod, pluginenv); | |
89 | local success, ret = pcall(mod); | |
90 | if not success then | |
91 | log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil"); | |
92 | return; | |
93 | end | |
94 | end | |
95 | ||
96 | function handle_stanza(origin, stanza) | |
38 | 97 | local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type; |
30 | 98 | |
38 | 99 | if name == "iq" and xmlns == "jabber:client" and handlers[origin_type] then |
30 | 100 | log("debug", "Stanza is an <iq/>"); |
101 | local child = stanza.tags[1]; | |
102 | if child then | |
103 | local xmlns = child.attr.xmlns; | |
104 | log("debug", "Stanza has xmlns: %s", xmlns); | |
105 | local handler = handlers[origin_type][name][xmlns]; | |
106 | if handler then | |
107 | log("debug", "Passing stanza to mod_%s", handler_info[handler].name); | |
108 | return handler(origin, stanza) or true; | |
109 | end | |
110 | ||
111 | end | |
38 | 112 | elseif handlers[origin_type] then |
113 | local handler = handlers[origin_type][name]; | |
114 | if handler then | |
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
115 | handler = handler[xmlns]; |
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
116 | if handler then |
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
117 | log("debug", "Passing stanza to mod_%s", handler_info[handler].name); |
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
118 | return handler(origin, stanza) or true; |
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
119 | end |
38 | 120 | end |
30 | 121 | end |
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
122 | log("debug", "Stanza unhandled by any modules, xmlns: %s", stanza.attr.xmlns); |
30 | 123 | return false; -- we didn't handle it |
124 | end | |
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
125 | |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
126 | do |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
127 | local event_handlers = {}; |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
128 | |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
129 | function modulehelpers.add_event_hook(name, handler) |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
130 | if not event_handlers[name] then |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
131 | event_handlers[name] = {}; |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
132 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
133 | t_insert(event_handlers[name] , handler); |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
134 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
135 | |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
136 | function fire_event(name, ...) |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
137 | local event_handlers = event_handlers[name]; |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
138 | if event_handlers then |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
139 | for name, handler in ipairs(event_handlers) do |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
140 | handler(...); |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
141 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
142 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
143 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
144 | end |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
145 | |
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
146 | return _M; |