Dedup without keeping deleted array
This commit is contained in:
parent
48523a2269
commit
fef46823eb
5 changed files with 10 additions and 12 deletions
|
@ -8,7 +8,7 @@ class Api {
|
|||
for await (let line of fetchLinesIterator(url)) {
|
||||
messages.push(JSON.parse(line));
|
||||
}
|
||||
return messages.sort((a, b) => { return a.time < b.time ? 1 : -1; }); // Newest first
|
||||
return messages;
|
||||
}
|
||||
|
||||
async publish(baseUrl, topic, message) {
|
||||
|
|
|
@ -40,7 +40,7 @@ class Connection {
|
|||
console.log(`[Connection, ${this.shortUrl}] Message irrelevant or invalid. Ignoring.`);
|
||||
return;
|
||||
}
|
||||
this.since = data.time;
|
||||
this.since = data.time + 1; // Sigh. This works because on reconnect, we wait 5+ seconds anyway.
|
||||
this.onNotification(this.subscriptionId, data);
|
||||
} catch (e) {
|
||||
console.log(`[Connection, ${this.shortUrl}] Error handling message: ${e}`);
|
||||
|
|
|
@ -6,14 +6,15 @@ export default class Subscription {
|
|||
this.baseUrl = baseUrl;
|
||||
this.topic = topic;
|
||||
this.notifications = new Map(); // notification ID -> notification object
|
||||
this.deleted = new Set(); // notification IDs
|
||||
this.last = 0;
|
||||
}
|
||||
|
||||
addNotification(notification) {
|
||||
if (this.notifications.has(notification.id) || this.deleted.has(notification.id)) {
|
||||
if (this.notifications.has(notification.id) || notification.time < this.last) {
|
||||
return this;
|
||||
}
|
||||
this.notifications.set(notification.id, notification);
|
||||
this.last = notification.time;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -24,14 +25,11 @@ export default class Subscription {
|
|||
|
||||
deleteNotification(notificationId) {
|
||||
this.notifications.delete(notificationId);
|
||||
this.deleted.add(notificationId);
|
||||
return this;
|
||||
}
|
||||
|
||||
deleteAllNotifications() {
|
||||
console.log(this.notifications);
|
||||
for (const [id] of this.notifications) {
|
||||
console.log(`delete ${id}`);
|
||||
this.deleteNotification(id);
|
||||
}
|
||||
return this;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue