verse
e04f10664704
plugins/smacks.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / verse

Annotate

plugins/smacks.lua @ 320:e04f10664704

plugins.smacks: Break less on sending of non-stanzas such as raw strings.
author Kim Alvefur <zash@zash.se>
date Sun, 10 Feb 2013 00:10:19 +0100
parent 250:a5ac643a7fd6
child 321:369d4638d775
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
250
a5ac643a7fd6 added local verse var to all plugins
mva <mva@mva.name>
parents: 203
diff changeset
1 local verse = require "verse";
a5ac643a7fd6 added local verse var to all plugins
mva <mva@mva.name>
parents: 203
diff changeset
2
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 local xmlns_sm = "urn:xmpp:sm:2";
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5 function verse.plugins.smacks(stream)
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 -- State for outgoing stanzas
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7 local outgoing_queue = {};
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 local last_ack = 0;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 -- State for incoming stanzas
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 local handled_stanza_count = 0;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 -- Catch incoming stanzas
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 local function incoming_stanza(stanza)
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 if stanza.attr.xmlns == "jabber:client" or not stanza.attr.xmlns then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 handled_stanza_count = handled_stanza_count + 1;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 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
18 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
21 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
22 stream:debug("smacks: connection lost");
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
23 stream.stream_management_supported = nil;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
24 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
25 stream:debug("smacks: have resumption token, reconnecting in 1s...");
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26 stream.authenticated = nil;
200
4166213cc9bd plugins.smacks: Add 1s delay between reconnect attempts
Matthew Wild <mwild1@gmail.com>
parents: 197
diff changeset
27 verse.add_task(1, function ()
4166213cc9bd plugins.smacks: Add 1s delay between reconnect attempts
Matthew Wild <mwild1@gmail.com>
parents: 197
diff changeset
28 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
29 end);
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
30 return true;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
31 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
32 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
33
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
34 local function handle_sm_command(stanza)
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
35 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
36 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
37 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
38 elseif stanza.name == "a" then -- Ack for stanzas we sent
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
39 local new_ack = tonumber(stanza.attr.h);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
40 if new_ack > last_ack then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
41 local old_unacked = #outgoing_queue;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
42 for i=last_ack+1,new_ack do
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
43 table.remove(outgoing_queue, 1);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
44 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
45 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
46 last_ack = new_ack;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
47 else
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
48 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
49 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
50 elseif stanza.name == "enabled" then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
51 stream.smacks = true;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
52 -- Catch outgoing stanzas
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
53 local old_send = stream.send;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
54 function stream.send(stream, stanza)
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
55 stream:warn("SENDING");
320
e04f10664704 plugins.smacks: Break less on sending of non-stanzas such as raw strings.
Kim Alvefur <zash@zash.se>
parents: 250
diff changeset
56 if stanza.name and not stanza.attr.xmlns then
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
57 outgoing_queue[#outgoing_queue+1] = stanza;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
58 local ret = old_send(stream, stanza);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
59 old_send(stream, verse.stanza("r", { xmlns = xmlns_sm }));
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
60 return ret;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
61 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
62 return old_send(stream, stanza);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
63 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
64 -- Catch incoming stanzas
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
65 stream:hook("stanza", incoming_stanza);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
66
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
67 if stanza.attr.id then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
68 stream.resumption_token = stanza.attr.id;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
69 stream:hook("disconnected", on_disconnect, 100);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
70 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
71 elseif stanza.name == "resumed" 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
72 --TODO: Check h of the resumed element, discard any acked stanzas from
0f34520f4e26 plugins.smacks: Scatter some logging and comments through the code for good measure
Matthew Wild <mwild1@gmail.com>
parents: 202
diff changeset
73 -- our queue (to prevent duplicates), then re-send any lost stanzas.
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
74 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
75 stream:event("resumed");
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
76 else
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
77 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
78 end
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
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
81 local function on_bind_success()
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
82 if not stream.smacks then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
83 --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
84 stream:debug("smacks: sending enable");
197
7e98cf2c1d8d plugins.*: Use verse.stanza() & co instead of require util.stanza
Kim Alvefur <zash@zash.se>
parents: 188
diff changeset
85 stream:send(verse.stanza("enable", { xmlns = xmlns_sm, resume = "true" }));
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
86 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
87 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
88
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
89 local function on_features(features)
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
90 if features:get_child("sm", xmlns_sm) then
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
91 stream.stream_management_supported = true;
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
92 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
93 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
94 stream:send(verse.stanza("resume", { xmlns = xmlns_sm,
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
95 h = 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
96 return true;
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
97 else
202
05d1a4751251 plugins.smacks: Fix event priority and handling to make the code actually... work
Matthew Wild <mwild1@gmail.com>
parents: 201
diff changeset
98 stream:hook("bind-success", on_bind_success, 1);
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
99 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
100 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
101 end
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
102
202
05d1a4751251 plugins.smacks: Fix event priority and handling to make the code actually... work
Matthew Wild <mwild1@gmail.com>
parents: 201
diff changeset
103 stream:hook("stream-features", on_features, 250);
188
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
104 stream:hook("stream/"..xmlns_sm, handle_sm_command);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
105 --stream:hook("ready", on_stream_ready, 500);
4678932455a3 plugins.smacks: XEP-0198 support
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
106 end