supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #449 from thelounge/xpaw/irc-fw-upd

Browse Source 
Update irc-framework to 2.3.0
This commit is contained in:
Maxime Poulin 2016-07-02 20:57:39 +00:00 committed by GitHub
commit 01c0ec22f0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -48,7 +48,7 @@
"event-stream": "3.3.2",
"express": "4.13.4",
"fs-extra": "0.30.0",
"irc-framework": "2.0.0",
"irc-framework": "2.3.0",
"lodash": "4.11.2",
"moment": "2.13.0",
"read": "1.0.7",

2
src/client.js
View File

@ -231,6 +231,8 @@ Client.prototype.connect = function(args) {
localAddress: config.bind,
rejectUnauthorized: false,
auto_reconnect: true,
auto_reconnect_wait: 10000 + Math.floor(Math.random() * 1000), // If multiple users are connected to the same network, randomize their reconnections a little
auto_reconnect_max_retries: 360, // At least one hour (plus timeouts) worth of reconnections
webirc: webirc,
});

13
src/plugins/irc-events/connection.js
View File

@ -47,7 +47,7 @@ module.exports = function(irc, network) {
irc.on("close", function() {
network.channels[0].pushMessage(client, new Msg({
text: "Disconnected from the network, and will not reconnect."
text: "Disconnected from the network, and will not reconnect. Use /connect to reconnect again."
}));
});
@ -69,23 +69,26 @@ module.exports = function(irc, network) {
});
}
irc.on("debug", function(message) {
log.debug("[" + client.name + " on " + network.host + ":" + network.port + "]", message);
});
irc.on("socket error", function(err) {
log.debug("IRC socket error", err);
network.channels[0].pushMessage(client, new Msg({
type: Msg.Type.ERROR,
text: "Socket error: " + err
}));
});
irc.on("reconnecting", function() {
irc.on("reconnecting", function(data) {
network.channels[0].pushMessage(client, new Msg({
text: "Disconnected from the network. Reconnecting..."
text: "Disconnected from the network. Reconnecting in " + Math.round(data.wait / 1000) + " seconds… (Attempt " + data.attempt + " of " + data.max_retries + ")"
}));
});
irc.on("ping timeout", function() {
network.channels[0].pushMessage(client, new Msg({
text: "Ping timeout, disconnecting..."
text: "Ping timeout, disconnecting…"
}));
});