Software /
code /
verse
Annotate
plugins/smacks.lua @ 496:c4ae7aa2958a
util.sasl.oauthbearer: Fix message syntax
Each key-value pair has a \001 trailer, and then the whole thing has a
\001 trailer as well, so it should always end with two \001.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 23 Jun 2023 10:11:25 +0200 |
parent | 450:e72deac76e0e |
rev | line source |
---|---|
250 | 1 local verse = require "verse"; |
394
c2e959b60c13
plugins.smacks: explicitly import luasocket which stops setting globals in new versions
Kim Alvefur <zash@zash.se>
parents:
380
diff
changeset
|
2 local now = require"socket".gettime; |
250 | 3 |
408
635cbd979d7b
plugins.smacks: Update to sm:3 namespace
Kim Alvefur <zash@zash.se>
parents:
395
diff
changeset
|
4 local xmlns_sm = "urn:xmpp:sm:3"; |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 function verse.plugins.smacks(stream) |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 -- State for outgoing stanzas |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
8 local outgoing_queue = nil; |
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
9 local last_ack = nil; |
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
10 local last_stanza_time = nil; |
350
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
11 local timer_active; |
380 | 12 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 -- State for incoming stanzas |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
14 local handled_stanza_count = nil; |
380 | 15 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 -- Catch incoming stanzas |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
17 local function incoming_stanza(stanza) |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
18 if handled_stanza_count and (stanza.attr.xmlns == "jabber:client" or not stanza.attr.xmlns) then |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
19 handled_stanza_count = handled_stanza_count + 1; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 stream:debug("Increasing handled stanzas to %d for %s", handled_stanza_count, stanza:top_tag()); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 end |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
23 |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
24 -- Catch outgoing stanzas |
395 | 25 local function outgoing_stanza(stanza) |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
26 -- NOTE: This will not behave nice if stanzas are serialized before this point |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
27 if outgoing_queue and (stanza.name and not stanza.attr.xmlns) then |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
28 -- serialize stanzas in order to bypass this on resumption |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
29 outgoing_queue[#outgoing_queue+1] = tostring(stanza); |
350
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
30 last_stanza_time = now(); |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
31 if not timer_active then |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
32 timer_active = true; |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
33 stream:debug("Waiting to send ack request..."); |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
34 verse.add_task(1, function() |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
35 if #outgoing_queue == 0 then |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
36 timer_active = false; |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
37 return; |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
38 end |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
39 local time_since_last_stanza = now() - last_stanza_time; |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
40 if time_since_last_stanza < 1 and #outgoing_queue < 10 then |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
41 return 1 - time_since_last_stanza; |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
42 end |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
43 stream:debug("Time up, sending <r>..."); |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
44 timer_active = false; |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
45 stream:send(verse.stanza("r", { xmlns = xmlns_sm })); |
350
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
46 end); |
04049524fcd1
plugins.smacks: Improve logic for sending <r/>
Matthew Wild <mwild1@gmail.com>
parents:
326
diff
changeset
|
47 end |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
48 end |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
49 end |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
50 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 local function on_disconnect() |
203
0f34520f4e26
plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents:
202
diff
changeset
|
52 stream:debug("smacks: connection lost"); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 stream.stream_management_supported = nil; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 if stream.resumption_token then |
203
0f34520f4e26
plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents:
202
diff
changeset
|
55 stream:debug("smacks: have resumption token, reconnecting in 1s..."); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
56 stream.authenticated = nil; |
200
4166213cc9bd
plugins.smacks: Add 1s delay between reconnect attempts
Matthew Wild <mwild1@gmail.com>
parents:
197
diff
changeset
|
57 verse.add_task(1, function () |
4166213cc9bd
plugins.smacks: Add 1s delay between reconnect attempts
Matthew Wild <mwild1@gmail.com>
parents:
197
diff
changeset
|
58 stream:connect(stream.connect_host or stream.host, stream.connect_port or 5222); |
4166213cc9bd
plugins.smacks: Add 1s delay between reconnect attempts
Matthew Wild <mwild1@gmail.com>
parents:
197
diff
changeset
|
59 end); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
60 return true; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
61 end |
380 | 62 end |
324
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
63 |
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
64 -- Graceful shutdown |
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
65 local function on_close() |
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
66 stream.resumption_token = nil; |
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
67 end |
380 | 68 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
69 local function handle_sm_command(stanza) |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
70 if stanza.name == "r" then -- Request for acks for stanzas we received |
203
0f34520f4e26
plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents:
202
diff
changeset
|
71 stream:debug("Ack requested... acking %d handled stanzas", handled_stanza_count); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
72 stream:send(verse.stanza("a", { xmlns = xmlns_sm, h = tostring(handled_stanza_count) })); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
73 elseif stanza.name == "a" then -- Ack for stanzas we sent |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
74 local new_ack = tonumber(stanza.attr.h); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
75 if new_ack > last_ack then |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
76 local old_unacked = #outgoing_queue; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
77 for i=last_ack+1,new_ack do |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
78 table.remove(outgoing_queue, 1); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
79 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
80 stream:debug("Received ack: New ack: "..new_ack.." Last ack: "..last_ack.." Unacked stanzas now: "..#outgoing_queue.." (was "..old_unacked..")"); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
81 last_ack = new_ack; |
445
b119dc4d8bc2
plugins.smacks: Don't warn about zero stanzas acked
Kim Alvefur <zash@zash.se>
parents:
408
diff
changeset
|
82 elseif new_ack < last_ack then |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
83 stream:warn("Received bad ack for "..new_ack.." when last ack was "..last_ack); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
84 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
85 elseif stanza.name == "enabled" then |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
86 handled_stanza_count = 0; |
448
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
87 stream.pre_smacks_features = nil; |
324
dbb3362c1ff3
plugins.smacks: Don't try to reconnect on gracefull stream closure
Kim Alvefur <zash@zash.se>
parents:
321
diff
changeset
|
88 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 if stanza.attr.id then |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
90 stream.resumption_token = stanza.attr.id; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 elseif stanza.name == "resumed" then |
448
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
93 stream.pre_smacks_features = nil; |
321
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
94 local new_ack = tonumber(stanza.attr.h); |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
95 if new_ack > last_ack then |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
96 local old_unacked = #outgoing_queue; |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
97 for i=last_ack+1,new_ack do |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
98 table.remove(outgoing_queue, 1); |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
99 end |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
100 stream:debug("Received ack: New ack: "..new_ack.." Last ack: "..last_ack.." Unacked stanzas now: "..#outgoing_queue.." (was "..old_unacked..")"); |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
101 last_ack = new_ack; |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
102 end |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
103 for i=1,#outgoing_queue do |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
104 stream:send(outgoing_queue[i]); |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
105 end |
369d4638d775
plugins.smacks: Re-send unacked outgoing stanzas on resumption
Kim Alvefur <zash@zash.se>
parents:
320
diff
changeset
|
106 outgoing_queue = {}; |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
107 stream:debug("Resumed successfully"); |
201
1fce24cb2c41
plugins.smacks: Remove some debugging code from resumption success handling, and fire a "resumed" event instead
Matthew Wild <mwild1@gmail.com>
parents:
200
diff
changeset
|
108 stream:event("resumed"); |
448
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
109 elseif stanza.name == "failed" then |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
110 stream.bound = nil |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
111 stream.smacks = nil |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
112 last_ack = nil |
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
113 handled_stanza_count = nil |
448
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
114 |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
115 -- TODO ack using final h value from <failed/> if present |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
116 outgoing_queue = {}; -- TODO fire some delivery failures |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
117 |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
118 local features = stream.pre_smacks_features; |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
119 stream.pre_smacks_features = nil; |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
120 |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
121 -- should trigger a bind and then a new smacks session |
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
122 stream:event("stream-features", features); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
123 else |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
124 stream:warn("Don't know how to handle "..xmlns_sm.."/"..stanza.name); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
125 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
126 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
127 |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
128 local function on_bind_success() |
449
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
129 if stream.stream_management_supported and not stream.smacks then |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
130 --stream:unhook("bind-success", on_bind_success); |
203
0f34520f4e26
plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents:
202
diff
changeset
|
131 stream:debug("smacks: sending enable"); |
450
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
132 outgoing_queue = {}; |
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
133 last_ack = 0; |
e72deac76e0e
plugins.smacks: Change to track enabled state per direction
Kim Alvefur <zash@zash.se>
parents:
449
diff
changeset
|
134 last_stanza_time = now(); |
197
7e98cf2c1d8d
plugins.*: Use verse.stanza() & co instead of require util.stanza
Kim Alvefur <zash@zash.se>
parents:
188
diff
changeset
|
135 stream:send(verse.stanza("enable", { xmlns = xmlns_sm, resume = "true" })); |
326
f657ed8f464e
plugins.smacks: Start counting when sending <enable/>
Kim Alvefur <zash@zash.se>
parents:
324
diff
changeset
|
136 stream.smacks = true; |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
137 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
138 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
139 |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
140 local function on_features(features) |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
141 if features:get_child("sm", xmlns_sm) then |
448
6d97b42bb1b4
plugins.smacks: Handle failed resumption by trying to bind instead
Kim Alvefur <zash@zash.se>
parents:
446
diff
changeset
|
142 stream.pre_smacks_features = features; |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
143 stream.stream_management_supported = true; |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
144 if stream.smacks and stream.bound then -- Already enabled in a previous session - resume |
203
0f34520f4e26
plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents:
202
diff
changeset
|
145 stream:debug("Resuming stream with %d handled stanzas", handled_stanza_count); |
197
7e98cf2c1d8d
plugins.*: Use verse.stanza() & co instead of require util.stanza
Kim Alvefur <zash@zash.se>
parents:
188
diff
changeset
|
146 stream:send(verse.stanza("resume", { xmlns = xmlns_sm, |
446
62fb547bd31a
plugins.smacks: Convert counter to string in resumption
Kim Alvefur <zash@zash.se>
parents:
445
diff
changeset
|
147 h = tostring(handled_stanza_count), previd = stream.resumption_token })); |
202
05d1a4751251
plugins.smacks: Fix event priority and handling to make the code actually... work
Matthew Wild <mwild1@gmail.com>
parents:
201
diff
changeset
|
148 return true; |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
149 else |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
150 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
151 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
152 end |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
153 |
202
05d1a4751251
plugins.smacks: Fix event priority and handling to make the code actually... work
Matthew Wild <mwild1@gmail.com>
parents:
201
diff
changeset
|
154 stream:hook("stream-features", on_features, 250); |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
155 stream:hook("stream/"..xmlns_sm, handle_sm_command); |
449
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
156 stream:hook("bind-success", on_bind_success, 1); |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
157 |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
158 -- Catch stanzas |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
159 stream:hook("stanza", incoming_stanza); |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
160 stream:hook("outgoing", outgoing_stanza); |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
161 |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
162 stream:hook("closed", on_close, 100); |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
163 stream:hook("disconnected", on_disconnect, 100); |
c720f331327c
plugins.smacks: Restructure events to avoid double hooks after (failed) resumption
Kim Alvefur <zash@zash.se>
parents:
448
diff
changeset
|
164 |
188
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
165 --stream:hook("ready", on_stream_ready, 500); |
4678932455a3
plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
166 end |