matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabling again direct s2s.

Browse Source
This commit is contained in:
John Livingston 2023-05-31 14:51:02 +02:00
parent b3582e6bfa
commit c097f5a596
No known key found for this signature in database
GPG Key ID: B17B5640CE66CDBC
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,7 +17,6 @@ TODO: it seems that in some case A->B can be Websocket, and B->A direct S2S. Che
TODO?: always generate self-signed certificates. Could be used for outgoing s2s? TODO?: always generate self-signed certificates. Could be used for outgoing s2s?
TODO: check in the diagnostic tool that Prosody is >=0.12 TODO: check in the diagnostic tool that Prosody is >=0.12
TODO?: allow directs2s on one side and websocket on the other? (currently disallowed by compatibleRemoteAuthenticatedConnectionEnabled) TODO?: allow directs2s on one side and websocket on the other? (currently disallowed by compatibleRemoteAuthenticatedConnectionEnabled)
TODO: alpha.4 version force Websocket S2S when available, even if s2s is possible. Revert this before releasing.
TODO: for directS2S, needs a SRV records for the main host if port is not standard.. Must document. TODO: for directS2S, needs a SRV records for the main host if port is not standard.. Must document.
### Minor changes and fixes ### Minor changes and fixes

13
prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
View File

@ -10,13 +10,12 @@ function discover_websocket_s2s(event)
local to_host = event.to_host; local to_host = event.to_host;
module:log("debug", "Searching websocket s2s for remote host %s", to_host); module:log("debug", "Searching websocket s2s for remote host %s", to_host);
-- FIXME: this was commented for the 6.4.0-alpha4, to test ws s2s. Revert before releasing. local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r");
-- local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r"); if f_s2s ~= nil then
-- if f_s2s ~= nil then io.close(f_s2s);
-- io.close(f_s2s); module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host);
-- module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host); return;
-- return; end
-- end
local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-s2s'), "r"); local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-s2s'), "r");
if f_ws_proxy == nil then if f_ws_proxy == nil then

5
prosody-modules/mod_websocket_s2s_peertubelivechat/mod_websocket_s2s_peertubelivechat.lua
View File

@ -542,16 +542,17 @@ end
function route_to_new_session(event) function route_to_new_session(event)
local from_host, to_host, stanza = event.from_host, event.to_host, event.stanza; local from_host, to_host, stanza = event.from_host, event.to_host, event.stanza;
log("debug", "Trying to route to %s using Websocket S2S", to_host); log("debug", "Trying to route to %s, searching which method to use", to_host);
local ws_properties = module:fire_event("discover-websocket-s2s", { to_host = to_host }); local ws_properties = module:fire_event("discover-websocket-s2s", { to_host = to_host });
if not ws_properties then if not ws_properties then
log("debug", "No websocket s2s capabilities from remote host %s", to_host); log("debug", "Not using websocket s2s from remote host %s", to_host);
return; return;
end end
local ws_url = ws_properties.url; local ws_url = ws_properties.url;
if (not ws_url) then if (not ws_url) then
log("error", "Missing url in the discover-websocket-s2s result"); log("error", "Missing url in the discover-websocket-s2s result");
return;
end end
log("debug", "Found a Websocket endpoint for s2s communications to remote host %s", to_host); log("debug", "Found a Websocket endpoint for s2s communications to remote host %s", to_host);