Software /
code /
prosody
File
plugins/mod_csi.lua @ 13765:7c57fb2ffbb0 13.0
mod_websocket: Merge session close handling changes from mod_c2s (bug fixes)
This should bring some fixes and general robustness that mod_websocket had
missed out on. The duplicated code here is not at all ideal. To prevent this
happening again, we should figure out how to have the common logic in a single
place, while still being able to do the websocket-specific parts that we need.
The main known bug that this fixes is that it's possible for a session to get
into a non-destroyable state. For example, if we try to session:close() a
hibernating session, then session.conn is nil and the function will simply
return without doing anything. In the mod_c2s code we already handle this, and
just destroy the session. But if a hibernating websocket session is never
resumed or becomes non-resumable, it will become immortal!
By merging the fix from mod_c2s, the session should now be correctly
destroyed.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 11 Mar 2025 18:44:40 +0000 (4 months ago) |
parent | 13522:ccd6199cc6a2 |
line wrap: on
line source
local st = require "prosody.util.stanza"; local xmlns_csi = "urn:xmpp:csi:0"; local csi_feature = st.stanza("csi", { xmlns = xmlns_csi }); local change = module:metric("counter", "changes", "events", "CSI state changes", {"csi_state"}); local count = module:metric("gauge", "state", "sessions", "", { "csi_state" }); module:hook("stream-features", function (event) if event.origin.username then event.features:add_child(csi_feature); end end); function refire_event(name) return function (event) if event.origin.username then event.origin.state = event.stanza.name; change:with_labels(event.stanza.name):add(1); module:fire_event(name, event); return true; end end; end module:hook("stanza/"..xmlns_csi..":active", refire_event("csi-client-active")); module:hook("stanza/"..xmlns_csi..":inactive", refire_event("csi-client-inactive")); module:hook_global("stats-update", function() local sessions = prosody.hosts[module.host].sessions; if not sessions then return end local active, inactive, flushing = 0, 0, 0; for _, user_session in pairs(sessions) do for _, session in pairs(user_session.sessions) do if session.state == "inactive" then inactive = inactive + 1; elseif session.state == "active" then active = active + 1; elseif session.state == "flushing" then flushing = flushing + 1; end end end count:with_labels("active"):set(active); count:with_labels("inactive"):set(inactive); count:with_labels("flushing"):set(flushing); end);