CringeStudios/IRC_Client
5
0
Fork 0
forked from CringeStudios/gamja
Code Pull Requests Activity

Make Client.fetchBatch more reliable

Browse Source
This commit is contained in:
Simon Ser 2021-06-10 12:43:09 +02:00
parent ba92b3f677
commit 5b0bb43a24
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/client.js
View File

@ -163,7 +163,6 @@ export default class Client extends EventTarget {
if (msg.tags["batch"]) { if (msg.tags["batch"]) {
msgBatch = this.batches.get(msg.tags["batch"]); msgBatch = this.batches.get(msg.tags["batch"]);
if (msgBatch) { if (msgBatch) {
msgBatch.messages.push(msg);
msg.batch = msgBatch; msg.batch = msgBatch;
} }
} }
@ -259,7 +258,6 @@ export default class Client extends EventTarget {
params: msg.params.slice(2), params: msg.params.slice(2),
tags: msg.tags, tags: msg.tags,
parent: msgBatch, parent: msgBatch,
messages: [],
}; };
this.batches.set(name, batch); this.batches.set(name, batch);
} else { } else {
@ -539,17 +537,30 @@ export default class Client extends EventTarget {
} }
fetchBatch(msg, batchType) { fetchBatch(msg, batchType) {
var batchName = null;
var messages = [];
return this.roundtrip(msg, (msg) => { return this.roundtrip(msg, (msg) => {
if (batchName) {
var batch = msg.batch;
while (batch) {
if (batch.name === batchName) {
messages.push(msg);
break;
}
batch = batch.parent;
}
}
switch (msg.command) { switch (msg.command) {
case "BATCH": case "BATCH":
var enter = msg.params[0].startsWith("+"); var enter = msg.params[0].startsWith("+");
var name = msg.params[0].slice(1); var name = msg.params[0].slice(1);
if (enter) { if (enter && msg.params[1] === batchType) {
batchName = name;
break; break;
} }
var batch = this.batches.get(name); if (!enter && name === batchName) {
if (batch.type === batchType) { return { ...this.batches.get(name), messages };
return batch;
} }
break; break;
case "FAIL": case "FAIL":