paquetes/gamja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

s/var/let/

Browse Source
This commit is contained in:
Simon Ser
2021-06-10 18:11:11 +02:00
parent 4db845a4b1
commit 8972130252
20 changed files with 481 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/client.js
+54 -53
View File
@@ -21,7 +21,7 @@ const permanentCaps = [
const RECONNECT_DELAY_SEC = 10;
var lastLabel = 0;
let lastLabel = 0;
export default class Client extends EventTarget {
static Status = {
@@ -65,7 +65,7 @@ export default class Client extends EventTarget {
}
reconnect() {
var autoReconnect = this.autoReconnect;
let autoReconnect = this.autoReconnect;
this.disconnect();
this.autoReconnect = autoReconnect;
@@ -150,7 +150,7 @@ export default class Client extends EventTarget {
}
handleMessage(event) {
var msg = irc.parseMessage(event.data);
let msg = irc.parseMessage(event.data);
console.debug("Received:", msg);
// If the prefix is missing, assume it's coming from the server on the
@@ -159,7 +159,7 @@ export default class Client extends EventTarget {
msg.prefix = this.serverPrefix;
}
var msgBatch = null;
let msgBatch = null;
if (msg.tags["batch"]) {
msgBatch = this.batches.get(msg.tags["batch"]);
if (msgBatch) {
@@ -167,7 +167,7 @@ export default class Client extends EventTarget {
}
}
var deleteBatch = null;
let deleteBatch = null;
switch (msg.command) {
case irc.RPL_WELCOME:
if (this.params.saslPlain && this.availableCaps["sasl"] === undefined) {
@@ -184,8 +184,8 @@ export default class Client extends EventTarget {
this.setStatus(Client.Status.REGISTERED);
break;
case irc.RPL_ISUPPORT:
var tokens = msg.params.slice(1, -1);
var changed = irc.parseISUPPORT(tokens, this.isupport);
let tokens = msg.params.slice(1, -1);
let changed = irc.parseISUPPORT(tokens, this.isupport);
if (changed.indexOf("CASEMAPPING") >= 0) {
this.setCaseMapping(this.isupport.get("CASEMAPPING"));
}
@@ -225,7 +225,7 @@ export default class Client extends EventTarget {
case irc.RPL_WHOISIDLE:
case irc.RPL_WHOISCHANNELS:
case irc.RPL_ENDOFWHOIS:
var nick = msg.params[1];
let nick = msg.params[1];
if (!this.whoisDB.has(nick)) {
this.whoisDB.set(nick, {});
}
@@ -243,16 +243,16 @@ export default class Client extends EventTarget {
this.send({ command: "PONG", params: [msg.params[0]] });
break;
case "NICK":
var newNick = msg.params[0];
let newNick = msg.params[0];
if (msg.prefix.name == this.nick) {
this.nick = newNick;
}
break;
case "BATCH":
var enter = msg.params[0].startsWith("+");
var name = msg.params[0].slice(1);
let enter = msg.params[0].startsWith("+");
let name = msg.params[0].slice(1);
if (enter) {
var batch = {
let batch = {
name,
type: msg.params[1],
params: msg.params.slice(2),
@@ -302,8 +302,8 @@ export default class Client extends EventTarget {
}
who(mask) {
var msg = { command: "WHO", params: [mask] };
var l = [];
let msg = { command: "WHO", params: [mask] };
let l = [];
return this.roundtrip(msg, (msg) => {
switch (msg.command) {
case irc.RPL_WHOREPLY:
@@ -320,18 +320,19 @@ export default class Client extends EventTarget {
}
whois(target) {
var targetCM = this.cm(target);
var msg = { command: "WHOIS", params: [target] };
let targetCM = this.cm(target);
let msg = { command: "WHOIS", params: [target] };
return this.roundtrip(msg, (msg) => {
let nick;
switch (msg.command) {
case irc.RPL_ENDOFWHOIS:
var nick = msg.params[1];
nick = msg.params[1];
if (this.cm(nick) === targetCM) {
return this.whoisDB.get(nick);
}
break;
case irc.ERR_NOSUCHNICK:
var nick = msg.params[1];
nick = msg.params[1];
if (this.cm(nick) === targetCM) {
throw msg;
}
@@ -341,11 +342,11 @@ export default class Client extends EventTarget {
}
addAvailableCaps(s) {
var l = s.split(" ");
let l = s.split(" ");
l.forEach((s) => {
var parts = s.split("=");
var k = parts[0].toLowerCase();
var v = "";
let parts = s.split("=");
let k = parts[0].toLowerCase();
let v = "";
if (parts.length > 1) {
v = parts[1];
}
@@ -354,7 +355,7 @@ export default class Client extends EventTarget {
}
supportsSASL(mech) {
var saslCap = this.availableCaps["sasl"];
let saslCap = this.availableCaps["sasl"];
if (saslCap === undefined) {
return false;
}
@@ -362,7 +363,7 @@ export default class Client extends EventTarget {
}
requestCaps(extra) {
var reqCaps = extra || [];
let reqCaps = extra || [];
permanentCaps.forEach((cap) => {
if (this.availableCaps[cap] !== undefined && !this.enabledCaps[cap]) {
@@ -376,16 +377,16 @@ export default class Client extends EventTarget {
}
handleCap(msg) {
var subCmd = msg.params[1];
var args = msg.params.slice(2);
let subCmd = msg.params[1];
let args = msg.params.slice(2);
switch (subCmd) {
case "LS":
this.addAvailableCaps(args[args.length - 1]);
if (args[0] != "*") {
console.log("Available server caps:", this.availableCaps);
var reqCaps = [];
var capEnd = true;
let reqCaps = [];
let capEnd = true;
if (this.params.saslPlain && this.supportsSASL("PLAIN")) {
// CAP END is deferred after authentication finishes
reqCaps.push("sasl");
@@ -438,7 +439,7 @@ export default class Client extends EventTarget {
}
handleAuthenticate(msg) {
var challengeStr = msg.params[0];
let challengeStr = msg.params[0];
// For now only PLAIN is supported
if (challengeStr != "+") {
@@ -447,7 +448,7 @@ export default class Client extends EventTarget {
return;
}
var respStr = btoa("\0" + this.params.saslPlain.username + "\0" + this.params.saslPlain.password);
let respStr = btoa("\0" + this.params.saslPlain.username + "\0" + this.params.saslPlain.password);
this.send({ command: "AUTHENTICATE", params: [respStr] });
}
@@ -478,7 +479,7 @@ export default class Client extends EventTarget {
}
isChannel(name) {
var chanTypes = this.isupport.get("CHANTYPES") || irc.STD_CHANTYPES;
let chanTypes = this.isupport.get("CHANTYPES") || irc.STD_CHANTYPES;
return chanTypes.indexOf(name[0]) >= 0;
}
@@ -500,7 +501,7 @@ export default class Client extends EventTarget {
/* Execute a command that expects a response. `done` is called with message
* events until it returns a truthy value. */
roundtrip(msg, done) {
var label;
let label;
if (this.enabledCaps["labeled-response"]) {
lastLabel++;
label = String(lastLabel);
@@ -508,15 +509,15 @@ export default class Client extends EventTarget {
}
return new Promise((resolve, reject) => {
var handleMessage = (event) => {
var msg = event.detail.message;
let handleMessage = (event) => {
let msg = event.detail.message;
var msgLabel = irc.getMessageLabel(msg);
let msgLabel = irc.getMessageLabel(msg);
if (msgLabel && msgLabel != label) {
return;
}
var result;
let result;
try {
result = done(msg);
} catch (err) {
@@ -537,11 +538,11 @@ export default class Client extends EventTarget {
}
fetchBatch(msg, batchType) {
var batchName = null;
var messages = [];
let batchName = null;
let messages = [];
return this.roundtrip(msg, (msg) => {
if (batchName) {
var batch = msg.batch;
let batch = msg.batch;
while (batch) {
if (batch.name === batchName) {
messages.push(msg);
@@ -553,8 +554,8 @@ export default class Client extends EventTarget {
switch (msg.command) {
case "BATCH":
var enter = msg.params[0].startsWith("+");
var name = msg.params[0].slice(1);
let enter = msg.params[0].startsWith("+");
let name = msg.params[0].slice(1);
if (enter && msg.params[1] === batchType) {
batchName = name;
break;
@@ -576,7 +577,7 @@ export default class Client extends EventTarget {
// Don't send multiple CHATHISTORY commands in parallel, we can't
// properly handle batches and errors.
this.pendingHistory = this.pendingHistory.catch(() => {}).then(() => {
var msg = {
let msg = {
command: "CHATHISTORY",
params,
};
@@ -587,7 +588,7 @@ export default class Client extends EventTarget {
chatHistoryPageSize() {
if (this.isupport.has("CHATHISTORY")) {
var pageSize = parseInt(this.isupport.get("CHATHISTORY"), 10);
let pageSize = parseInt(this.isupport.get("CHATHISTORY"), 10);
if (pageSize > 0) {
return pageSize;
}
@@ -597,8 +598,8 @@ export default class Client extends EventTarget {
/* Fetch one page of history before the given date. */
fetchHistoryBefore(target, before, limit) {
var max = Math.min(limit, this.chatHistoryPageSize());
var params = ["BEFORE", target, "timestamp=" + before, max];
let max = Math.min(limit, this.chatHistoryPageSize());
let params = ["BEFORE", target, "timestamp=" + before, max];
return this.roundtripChatHistory(params).then((messages) => {
return { more: messages.length >= max };
});
@@ -606,8 +607,8 @@ export default class Client extends EventTarget {
/* Fetch history in ascending order. */
fetchHistoryBetween(target, after, before, limit) {
var max = Math.min(limit, this.chatHistoryPageSize());
var params = ["AFTER", target, "timestamp=" + after.time, max];
let max = Math.min(limit, this.chatHistoryPageSize());
let params = ["AFTER", target, "timestamp=" + after.time, max];
return this.roundtripChatHistory(params).then((messages) => {
limit -= messages.length;
if (limit <= 0) {
@@ -623,7 +624,7 @@ export default class Client extends EventTarget {
}
fetchHistoryTargets(t1, t2) {
var msg = {
let msg = {
command: "CHATHISTORY",
params: ["TARGETS", "timestamp=" + t1, "timestamp=" + t2, 1000],
};
@@ -645,13 +646,13 @@ export default class Client extends EventTarget {
return Promise.reject(new Error("Server doesn't support the BOUNCER extension"));
}
var req = { command: "BOUNCER", params: ["LISTNETWORKS"] };
let req = { command: "BOUNCER", params: ["LISTNETWORKS"] };
return this.fetchBatch(req, "soju.im/bouncer-networks").then((batch) => {
var networks = new Map();
for (var msg of batch.messages) {
let networks = new Map();
for (let msg of batch.messages) {
console.assert(msg.command === "BOUNCER" && msg.params[0] === "NETWORK");
var id = msg.params[1];
var params = irc.parseTags(msg.params[2]);
let id = msg.params[1];
let params = irc.parseTags(msg.params[2]);
networks.set(id, params);
}
return networks;