Mercurial > prosody-modules
annotate mod_presence_cache/mod_presence_cache.lua @ 6299:5cf5ee23b361
mod_voipms: New Module to send and receive SMS/MMS via VoIP.ms APIs.
diff --git a/mod_voipms/README.md b/mod_voipms/README.md
new file mode 100644
--- /dev/null
+++ b/mod_voipms/README.md
@@ -0,0 +1,51 @@
+---
+labels:
+- 'Stage-Alpha'
+- 'Type-Web'
+summary: Send and receive SMS/MMS via VoIP.ms APIs.
+rockspec:
+ build:
+ modules:
+ mod_voipms: mod_voipms.lua
+...
+
+Introduction
+============
+
+This is a Prosody module to map JIDs to DIDs on VoIP.ms and support sending/receiving SMS/MMS.
+
+Configuration
+=============
+
+| option | type | default |
+|-----------------------|--------|---------|
+| voipms\_api\_username | string | nil |
+| voipms\_api\_password | string | nil |
+| voipms\_query\_key | string | nil |
+| voipms\_jid\_map | table | nil |
+```
+VirtualHost "sms.example.com"
+modules_enabled = {
+ "voipms";
+}
+voipms_api_username = john@example.com -- E-mail registered with VoIP.ms
+voipms_api_password = abcd1234 -- API password configured in VoIP.ms
+voipms_query_key = some_query_key -- query param 'key' part of your URL callback
+voipms_jid_map = {
+ ["your_jid@your_domain.com"] = "+1234567890"
+}
+```
+
+HTTP
+====
+
+The module is served on Prosody's default HTTP ports at the path /voipms. More details on configuring HTTP modules in Prosody can be found in the HTTP documentation.
+
+VoIP.ms Webhook URL
+===================
+
+This module receives the VoIP.ms Webhook URL (POST) at the /voipms endpoint. It uses the sendSMS/sendMMS GET methods against the VoIP.ms APIs. This is an example webhook to use in VoIP.ms:
+
+```
+https://sms.example.com/voipms?key=some_query_key
+```
diff --git a/mod_voipms/mod_voipms.lua b/mod_voipms/mod_voipms.lua
new file mode 100644
--- /dev/null
+++ b/mod_voipms/mod_voipms.lua
@@ -0,0 +1,166 @@
+local http = require "net.http"
+local json = require "util.json"
+local st = require "util.stanza"
+
+local api_username = module:get_option_string("voipms_api_username")
+local api_password = module:get_option_string("voipms_api_password")
+local query_key = module:get_option("voipms_query_key")
+local jid_map = module:get_option("voipms_jid_map") or {}
+local rest_endpoint = "https://voip.ms/api/v1/rest.php"
+
+if not api_username or not api_password or not query_key then
+ module:log("error", "Missing required config values (voipms_api_username, voipms_api_password, voipms_query_key)")
+ return
+end
+
+module:depends("http")
+
+local function normalize_number(num)
+ if not num then return nil end
+ if num:sub(1, 1) ~= "+" then
+ return "+1" .. num
+ end
+ return num
+end
+
+local function extract_query_key(event)
+ return (event.request.url.query or ""):match("key=([^&]+)")
+end
+
+module:provides("http", {
+ route = {
+ ["POST"] = function(event)
+ local req = event.request
+ local body = req.body or ""
+
+ if extract_query_key(event) ~= query_key then
+ module:log("warn", "Unauthorized webhook: missing or invalid key")
+ return { status_code = 403 }
+ end
+
+ local json_payload, err = json.decode(body)
+ if not json_payload then
+ module:log("warn", "Invalid JSON: %s", err or "unknown error")
+ return { status_code = 400 }
+ end
+
+ local payload = json_payload.data and json_payload.data.payload
+ if not payload then
+ module:log("warn", "Missing payload in JSON")
+ return { status_code = 400 }
+ end
+
+ local from = payload.from and payload.from.phone_number
+ local to_list = payload.to or {}
+ local to = #to_list > 0 and to_list[1].phone_number or nil
+
+ if not from or not to then
+ module:log("warn", "Missing phone numbers (from: %s, to: %s)", tostring(from), tostring(to))
+ return { status_code = 400 }
+ end
+
+ local normalized_to = normalize_number(to)
+ local target_jid = nil
+
+ for jid, did in pairs(jid_map) do
+ if normalize_number(did) == normalized_to then
+ target_jid = jid
+ break
+ end
+ end
+
+ if not target_jid then
+ module:log("warn", "No JID mapping for DID %s", normalized_to)
+ return { status_code = 404 }
+ end
+
+ local normalized_from = normalize_number(from)
+ local message_text = payload.text or ""
+
+ local message = st.message({
+ from = normalized_from .. "@" .. module.host,
+ to = target_jid,
+ type = "chat"
+ }):tag("body"):text(message_text):up()
+
+ if payload.media and #payload.media > 0 then
+ for _, media_item in ipairs(payload.media) do
+ if media_item.url then
+ message_text = message_text .. "\n" .. media_item.url
+ message:tag("x", { xmlns = "jabber:x:oob" })
+ :tag("url"):text(media_item.url):up():up()
+ end
+ end
+ end
+
+ module:send(message)
+ module:log("info", "Delivered SMS from %s to %s", normalized_from, target_jid)
+
+ return { status_code = 204 }
+ end
+ }
+})
+
+module:hook("message/bare", function(event)
+ local stanza = event.stanza
+ if stanza.attr.type ~= "chat" then return end
+
+ local from_jid = stanza.attr.from
+ local to_jid = stanza.attr.to
+ local body = stanza:get_child_text("body")
+ if not body or body == "" then return end
+
+ local from_number = jid_map[from_jid]
+ if not from_number then
+ module:log("warn", "No DID mapping for JID %s", from_jid)
+ return
+ end
+
+ local to_number = to_jid:match("^([^@]+)")
+ if not to_number then
+ module:log("warn", "Malformed JID in message.to: %s", to_jid)
+ return
+ end
+
+ to_number = normalize_number(to_number)
+
+ local media_urls = {}
+ for line in body:gmatch("[^\r\n]+") do
+ if line:match("^https?://") then
+ table.insert(media_urls, line)
+ end
+ end
+
+ local method = (#media_urls > 0) and "sendMMS" or "sendSMS"
+ local query = {
+ api_username = api_username,
+ api_password = api_password,
+ method = method,
+ did = from_number,
+ dst = to_number,
+ message = body
+ }
+
+ if method == "sendMMS" then
+ for i, url in ipairs(media_urls) do
+ query["media_url[" .. (i - 1) .. "]"] = url
+ end
+ end
+
+ local query_str = http.formencode(query)
+
+ http.request(rest_endpoint .. "?" .. query_str, {
+ method = "GET";
+ }, function(response_body, code)
+ if code == 200 then
+ local resp, err = json.decode(response_body)
+ if not resp or resp.status ~= "success" then
+ module:log("error", "Failed to send %s: %s", method, err or (resp and resp.status) or "unknown")
+ else
+ module:log("info", "Sent %s from %s to %s", method, from_number, to_number)
+ end
+ else
+ module:log("error", "HTTP error sending %s: code %s", method, tostring(code))
+ end
+ end)
+end)
| author | Chaz <menel@snikket.de> |
|---|---|
| date | Mon, 21 Jul 2025 23:57:37 +0200 |
| parents | 830a01443a2f |
| children |
| rev | line source |
|---|---|
|
2176
b76b062e77db
mod_presence_cache: Add copyright header
Kim Alvefur <zash@zash.se>
parents:
2175
diff
changeset
|
1 -- XEP-0280: Message Carbons implementation for Prosody |
|
b76b062e77db
mod_presence_cache: Add copyright header
Kim Alvefur <zash@zash.se>
parents:
2175
diff
changeset
|
2 -- Copyright (C) 2015-2016 Kim Alvefur |
|
b76b062e77db
mod_presence_cache: Add copyright header
Kim Alvefur <zash@zash.se>
parents:
2175
diff
changeset
|
3 -- |
|
b76b062e77db
mod_presence_cache: Add copyright header
Kim Alvefur <zash@zash.se>
parents:
2175
diff
changeset
|
4 -- This file is MIT/X11 licensed. |
|
b76b062e77db
mod_presence_cache: Add copyright header
Kim Alvefur <zash@zash.se>
parents:
2175
diff
changeset
|
5 |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 local is_contact_subscribed = require"core.rostermanager".is_contact_subscribed; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 local jid_split = require"util.jid".split; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 local jid_bare = require"util.jid".bare; |
|
3183
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
9 local jid_host = require"util.jid".host; |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 local st = require"util.stanza"; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 local datetime = require"util.datetime"; |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
12 local cache = require "util.cache"; |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
14 local cache_size = module:get_option_number("presence_cache_size", 100); |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
15 |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
16 local bare_cache = {}; -- [username NUL bare_jid] = { [full_jid] = { timestamp, ... } } |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
17 |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
18 local function on_evict(cache_key) |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
19 local bare_cache_key = cache_key:match("^%Z+%z[^/]+"); |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
20 local full_jid = cache_key:match("%z(.*)$"); |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
21 local jids = bare_cache[bare_cache_key]; |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
22 |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
23 if jids then |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
24 jids[full_jid] = nil; |
|
2153
aa24d49c47ef
mod_presence_cache: Only check set set is empty if it exists
Kim Alvefur <zash@zash.se>
parents:
2152
diff
changeset
|
25 if next(jids) == nil then |
|
aa24d49c47ef
mod_presence_cache: Only check set set is empty if it exists
Kim Alvefur <zash@zash.se>
parents:
2152
diff
changeset
|
26 bare_cache[bare_cache_key] = nil; |
|
aa24d49c47ef
mod_presence_cache: Only check set set is empty if it exists
Kim Alvefur <zash@zash.se>
parents:
2152
diff
changeset
|
27 end |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
28 end |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
29 end |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
30 |
|
2152
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
31 -- used indirectly for the on_evict callback |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
32 local presence_cache = cache.new(cache_size, on_evict); |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 local function cache_hook(event) |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 local origin, stanza = event.origin, event.stanza; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 local typ = stanza.attr.type; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 module:log("debug", "Cache hook, got %s from a %s", stanza:top_tag(), origin.type); |
|
2145
f965f86a5cad
mod_presence_cache: Check stanzas only from s2sin (not needed, even with mod_bidi)
Kim Alvefur <zash@zash.se>
parents:
2123
diff
changeset
|
38 if origin.type == "s2sin" and ( typ == nil or typ == "unavailable" ) then |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
40 local contact_full = stanza.attr.from; |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
41 local contact_bare = jid_bare(contact_full); |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
42 local username, host = jid_split(stanza.attr.to); |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
43 |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
44 if not is_contact_subscribed(username, host, contact_bare) then |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
45 module:log("debug", "Presence from jid not in roster"); |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
46 return; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
47 end |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
48 |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
49 local cache_key = username .. "\0" .. contact_full; |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
50 local bare_cache_key = username .. "\0" .. contact_bare; |
|
2152
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
51 |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
52 local jids = bare_cache[bare_cache_key]; |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
53 |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
54 if typ == "unavailable" then -- remove from cache |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
55 presence_cache:set(cache_key, nil); |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
56 on_evict(cache_key); |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
57 return; |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
58 end |
|
bb4a2e4b7ba7
mod_presence_cache: Forget about cached presence when receiving unavailable
Kim Alvefur <zash@zash.se>
parents:
2147
diff
changeset
|
59 |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
60 local presence_bits = { |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
61 stamp = datetime.datetime(); |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
62 show = stanza:get_child_text("show"); |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
63 }; |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
64 if jids then |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
65 jids[contact_full] = presence_bits; |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
66 else |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
67 jids = { [contact_full] = presence_bits }; |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
68 bare_cache[bare_cache_key] = jids; |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
69 end |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
70 presence_cache:set(cache_key, true); |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
71 end |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
72 end |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
73 |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
74 module:hook("presence/bare", cache_hook, 10); |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
75 -- module:hook("presence/full", cache_hook, 10); |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
76 |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
77 local function answer_probe_from_cache(event) |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
78 local origin, stanza = event.origin, event.stanza; |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
79 if stanza.attr.type ~= "probe" then return; end |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
80 |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
81 local username = origin.username; |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
82 local contact_bare = stanza.attr.to; |
|
2292
54f44365a378
mod_presence_cache: Ignore stanzas to self (fixes traceback on probe to self)
Kim Alvefur <zash@zash.se>
parents:
2176
diff
changeset
|
83 if not contact_bare then return; end -- probe to self |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
84 |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
85 local bare_cache_key = username .. "\0" .. contact_bare; |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
86 |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
87 local cached = bare_cache[bare_cache_key]; |
|
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
88 if not cached then return end |
|
3373
322e8e7ba7d4
mod_presence_cache: Set delay source to bare JID instead of host
Kim Alvefur <zash@zash.se>
parents:
3183
diff
changeset
|
89 local user_bare = jid_bare(origin.full_jid); |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
90 for jid, presence_bits in pairs(cached) do |
|
2147
ed2bb50d4f91
mod_presence_cache: Switch to using util.cache for limiting size of cache
Kim Alvefur <zash@zash.se>
parents:
2146
diff
changeset
|
91 local presence = st.presence({ to = origin.full_jid, from = jid }) |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
92 if presence_bits.show then |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
93 presence:tag("show"):text(presence_bits.show):up(); |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
94 end |
|
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
95 if presence_bits.stamp then |
|
3373
322e8e7ba7d4
mod_presence_cache: Set delay source to bare JID instead of host
Kim Alvefur <zash@zash.se>
parents:
3183
diff
changeset
|
96 presence:tag("delay", { xmlns = "urn:xmpp:delay", from = user_bare, stamp = presence_bits.stamp }):up(); |
|
2175
cc0cf6748885
mod_presence_cache: Also cache the 'show' value
Kim Alvefur <zash@zash.se>
parents:
2153
diff
changeset
|
97 end |
|
1952
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
98 origin.send(presence); |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
99 end |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
100 end |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
101 |
|
9d0c33ebbcc5
mod_presence_cache: Cache incoming presence broadcasts in order to get clients up to speed with who is online faster
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
102 module:hook("pre-presence/bare", answer_probe_from_cache, 10); |
|
3183
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
103 |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
104 local function clear_cache_from_s2s(remote, reason) |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
105 if not remote then return end |
|
3760
830a01443a2f
mod_presence_cache: Fix traceback due to changes in trunk
Kim Alvefur <zash@zash.se>
parents:
3373
diff
changeset
|
106 -- FIXME Ignore if connection closed for being idle |
|
3183
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
107 |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
108 module:log("debug", "Dropping cached presence from host %s", remote); |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
109 |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
110 for bare, cached in pairs(bare_cache) do |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
111 if jid_host(bare) == remote then |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
112 for jid in pairs(cached) do |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
113 presence_cache:set(jid, nil); |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
114 end |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
115 bare_cache[bare] = nil; |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
116 end |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
117 end |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
118 end |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
119 |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
120 module:hook("s2sin-destroyed", function (event) |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
121 return clear_cache_from_s2s(event.session.from_host, event.reason); |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
122 end); |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
123 |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
124 module:hook("s2sout-destroyed", function (event) |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
125 return clear_cache_from_s2s(event.session.to_host, event.reason); |
|
b718092e442f
mod_presence_cache: Forget cached presence on s2s close
Kim Alvefur <zash@zash.se>
parents:
2292
diff
changeset
|
126 end); |
