lib/entities-store: support a TTL of Infinity

see also #1
derhuerst · Oct 7, 2021 · 82f5cd6 · 82f5cd6
1 parent ce7addb
commit 82f5cd6
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/entities-store.js b/lib/entities-store.js
@@ -37,6 +37,8 @@ const entityTimestamp = (entity) => {
 }
 
 const createEntitiesStore = (ttl, now) => {
+	const useTtl = ttl !== Infinity
+
 	let timers = new Map()
 	let datas = new Map()
 	let fields = new Map()
@@ -45,8 +47,8 @@ const createEntitiesStore = (ttl, now) => {
 	let cache = null // cached final `FeedMessage` buffer
 
 	const del = (id) => {
-		if (!timers.has(id)) return;
-		clearTimeout(timers.get(id))
+		if (!datas.has(id)) return;
+		if (useTtl) clearTimeout(timers.get(id))
 		timers.delete(id)
 		datas.delete(id)
 		fields.delete(id)
@@ -62,9 +64,11 @@ const createEntitiesStore = (ttl, now) => {
 		del(id)
 		cache = null
 
-		// todo: use sth more memory-efficient than closures?
-		// todo: set expiry relative to entity's timestamp?
-		timers.set(id, setTimeout(del, ttl, id))
+		if (useTtl) {
+			// todo: use sth more memory-efficient than closures?
+			// todo: set expiry relative to entity's timestamp?
+			timers.set(id, setTimeout(del, ttl, id))
+		}
 
 		FeedEntity.verify(entity)
 		const data = FeedEntity.encode(entity).finish()
@@ -93,7 +97,7 @@ const createEntitiesStore = (ttl, now) => {
 		cache = null
 	}
 
-	const nrOfEntities = () => timers.size
+	const nrOfEntities = () => datas.size
 
 	const getTimestamp = () => {
 		return timestamps.length > 0
@@ -104,7 +108,7 @@ const createEntitiesStore = (ttl, now) => {
 	const asFeedMessage = () => {
 		if (cache !== null) return cache
 
-		const ids = Array.from(timers.keys())
+		const ids = Array.from(datas.keys())
 		const chunks = new Array(2 + ids.length * 2)
 
 		const rawHeader = {