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

Move chat history operations into Client

Browse Source
This commit is contained in:
Simon Ser 2021-01-22 18:51:38 +01:00
parent 4e1f06b960
commit 430373dd13
2 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
components/app.js
View File

@ -155,7 +155,6 @@ export default class App extends Component {
error: null, error: null,
}; };
clients = new Map(); clients = new Map();
pendingHistory = Promise.resolve(null);
endOfHistory = new Map(); endOfHistory = new Map();
receipts = new Map(); receipts = new Map();
buffer = createRef(); buffer = createRef();
@ -614,7 +613,7 @@ export default class App extends Component {
if (msg.prefix.name == client.nick && receipt && client.enabledCaps["draft/chathistory"] && client.enabledCaps["server-time"]) { if (msg.prefix.name == client.nick && receipt && client.enabledCaps["draft/chathistory"] && client.enabledCaps["server-time"]) {
var after = receipt; var after = receipt;
var before = { time: msg.tags.time || irc.formatDate(new Date()) }; var before = { time: msg.tags.time || irc.formatDate(new Date()) };
this.fetchHistoryBetween(client, channel, after, before, CHATHISTORY_MAX_SIZE).catch((err) => { client.fetchHistoryBetween(channel, after, before, CHATHISTORY_MAX_SIZE).catch((err) => {
this.setState({ error: "Failed to fetch history: " + err }); this.setState({ error: "Failed to fetch history: " + err });
this.receipts.delete(channel); this.receipts.delete(channel);
this.saveReceipts(); this.saveReceipts();
@ -877,57 +876,6 @@ export default class App extends Component {
return fromList(buf.members.keys(), prefix); return fromList(buf.members.keys(), prefix);
} }
roundtripChatHistory(client, params) {
// Don't send multiple CHATHISTORY commands in parallel, we can't
// properly handle batches and errors.
this.pendingHistory = this.pendingHistory.catch(() => {}).then(() => {
var msg = {
command: "CHATHISTORY",
params,
};
return client.roundtrip(msg, (event) => {
var msg = event.detail.message;
switch (msg.command) {
case "BATCH":
var enter = msg.params[0].startsWith("+");
var name = msg.params[0].slice(1);
if (enter) {
break;
}
var batch = client.batches.get(name);
if (batch.type == "chathistory") {
return batch;
}
break;
case "FAIL":
if (msg.params[0] == "CHATHISTORY") {
throw msg;
}
break;
}
});
});
return this.pendingHistory;
}
/* Fetch history in ascending order */
fetchHistoryBetween(client, target, after, before, limit) {
var max = Math.min(limit, CHATHISTORY_PAGE_SIZE);
var params = ["AFTER", target, "timestamp=" + after.time, max];
return this.roundtripChatHistory(client, params).then((batch) => {
limit -= batch.messages.length;
if (limit <= 0) {
throw new Error("Cannot fetch all chat history: too many messages");
}
if (batch.messages.length == max) {
// There are still more messages to fetch
after.time = batch.messages[batch.messages.length - 1].tags.time;
return this.fetchHistoryBetween(client, target, after, before, limit);
}
});
}
handleBufferScrollTop() { handleBufferScrollTop() {
var buf = this.state.buffers.get(this.state.activeBuffer); var buf = this.state.buffers.get(this.state.activeBuffer);
if (!buf || buf.type == BufferType.SERVER) { if (!buf || buf.type == BufferType.SERVER) {
@ -954,7 +902,7 @@ export default class App extends Component {
this.endOfHistory.set(buf.id, true); this.endOfHistory.set(buf.id, true);
var params = ["BEFORE", buf.name, "timestamp=" + before, CHATHISTORY_PAGE_SIZE]; var params = ["BEFORE", buf.name, "timestamp=" + before, CHATHISTORY_PAGE_SIZE];
this.roundtripChatHistory(client, params).then((batch) => { client.roundtripChatHistory(params).then((batch) => {
this.endOfHistory.set(buf.id, batch.messages.length < CHATHISTORY_PAGE_SIZE); this.endOfHistory.set(buf.id, batch.messages.length < CHATHISTORY_PAGE_SIZE);
}); });
} }

52
lib/client.js
View File

@ -39,6 +39,7 @@ export default class Client extends EventTarget {
batches = new Map(); batches = new Map();
autoReconnect = true; autoReconnect = true;
reconnectTimeoutID = null; reconnectTimeoutID = null;
pendingHistory = Promise.resolve(null);
constructor(params) { constructor(params) {
super(); super();
@ -359,4 +360,55 @@ export default class Client extends EventTarget {
this.send(msg); this.send(msg);
}); });
} }
roundtripChatHistory(params) {
// Don't send multiple CHATHISTORY commands in parallel, we can't
// properly handle batches and errors.
this.pendingHistory = this.pendingHistory.catch(() => {}).then(() => {
var msg = {
command: "CHATHISTORY",
params,
};
return this.roundtrip(msg, (event) => {
var msg = event.detail.message;
switch (msg.command) {
case "BATCH":
var enter = msg.params[0].startsWith("+");
var name = msg.params[0].slice(1);
if (enter) {
break;
}
var batch = this.batches.get(name);
if (batch.type == "chathistory") {
return batch;
}
break;
case "FAIL":
if (msg.params[0] == "CHATHISTORY") {
throw msg;
}
break;
}
});
});
return this.pendingHistory;
}
/* Fetch history in ascending order. */
fetchHistoryBetween(target, after, before, limit) {
var max = Math.min(limit, CHATHISTORY_PAGE_SIZE);
var params = ["AFTER", target, "timestamp=" + after.time, max];
return this.roundtripChatHistory(params).then((batch) => {
limit -= batch.messages.length;
if (limit <= 0) {
throw new Error("Cannot fetch all chat history: too many messages");
}
if (batch.messages.length == max) {
// There are still more messages to fetch
after.time = batch.messages[batch.messages.length - 1].tags.time;
return this.fetchHistoryBetween(target, after, before, limit);
}
});
}
} }