system updates indexers when demoted

holepunchto · Sep 19, 2024 · a4bcf38 · a4bcf38
1 parent e4f451f
commit a4bcf38
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/system.js b/lib/system.js
@@ -230,7 +230,7 @@ module.exports = class SystemView extends ReadyResource {
     if (this.pendingIndexers.length > 0) {
       for (let i = 0; i < this.pendingIndexers.length; i++) {
         if (!b4a.equals(this.pendingIndexers[i], h.key)) continue
-        this._updateIndexer(h.key, h.length, false, i)
+        this._updateIndexer(h.key, h.length, true, i)
         return true
       }
     }
@@ -243,10 +243,10 @@ module.exports = class SystemView extends ReadyResource {
     return false
   }
 
-  _updateIndexer (key, length, isRemoved, i) {
+  _updateIndexer (key, length, isIndexer, i) {
     const hex = b4a.toString(key, 'hex')
 
-    if (isRemoved) {
+    if (!isIndexer) {
       const existing = this._indexerMap.get(hex)
       if (existing) {
         this.indexerUpdate = true
@@ -260,7 +260,7 @@ module.exports = class SystemView extends ReadyResource {
       if (b4a.equals(this.pendingIndexers[i], key)) break
     }
 
-    if (!isRemoved && length === 0) {
+    if (isIndexer && length === 0) {
       if (i >= this.pendingIndexers.length) this.pendingIndexers.push(key)
       return
     }
@@ -290,6 +290,7 @@ module.exports = class SystemView extends ReadyResource {
 
   async add (key, { isIndexer = false, length = this._seenLength(key) } = {}) {
     let wasTracked = false
+    let wasIndexer = false
 
     if (length === 0) { // a bit hacky atm due to cas limitations...
       const node = await this._batch.get(key, { valueEncoding: Member, keyEncoding: MEMBERS })
@@ -310,6 +311,7 @@ module.exports = class SystemView extends ReadyResource {
         const n = newer.value
 
         if (!o.isRemoved) wasTracked = true
+        if (o.isIndexer) wasIndexer = true
 
         if (length === 0 && o.length) length = o.length
 
@@ -319,7 +321,7 @@ module.exports = class SystemView extends ReadyResource {
 
     if (!wasTracked) this.members++
 
-    if (isIndexer) this._updateIndexer(key, length, false, 0)
+    if (wasIndexer || isIndexer) this._updateIndexer(key, length, isIndexer, 0)
   }
 
   async remove (key) {
@@ -330,7 +332,7 @@ module.exports = class SystemView extends ReadyResource {
       if (isIndexer) break
     }
 
-    if (isIndexer) this._updateIndexer(key, null, true, 0)
+    if (isIndexer) this._updateIndexer(key, null, false, 0)
 
     let wasTracked = false