cleanup

Signed-off-by: Miroslav Bajtoš <oss@bajtos.net>

Author: bajtos

indexer/bin/piece-indexer.js

@@ -1,6 +1,6 @@
 import assert from 'assert'
 import { Redis } from 'ioredis'
-import { walkProviderChain } from '../lib/advertisement-walker.js'
+import { walkChain } from '../lib/advertisement-walker.js'
 import { runIpniSync } from '../lib/ipni-watcher.js'
 import { RedisRepository } from '../lib/redis-repository.js'
 
@@ -25,8 +25,8 @@ const redis = new Redis({
 await redis.connect()
 const repository = new RedisRepository(redis)
 
-/** @type {Map<string, boolean>} */
-const providerWalkers = new Map()
+/** @type {Set<string>} */
+const providerIdsActivelyWalked = new Set()
 
 /** @type {ProviderToInfoMap} */
 const recentProvidersInfo = new Map()
@@ -43,16 +43,16 @@ const getProviderInfo = async (providerId) => {
 for await (const providerInfos of runIpniSync({ minSyncIntervalInMs: 60_000 })) {
   for (const [providerId, providerInfo] of providerInfos.entries()) {
     recentProvidersInfo.set(providerId, providerInfo)
-    if (providerWalkers.get(providerId)) continue
+    if (providerIdsActivelyWalked.has(providerId)) continue
 
-    providerWalkers.set(providerId, true)
-    walkProviderChain({
+    providerIdsActivelyWalked.add(providerId)
+    walkChain({
       repository,
       providerId,
       getProviderInfo,
       minStepIntervalInMs: 100
     }).finally(
-      () => providerWalkers.set(providerId, false)
+      () => providerIdsActivelyWalked.delete(providerId)
     )
   }
 }

indexer/lib/advertisement-walker.js

@@ -10,7 +10,7 @@ import { assertOkResponse } from './http-assertions.js'
 /** @import { ProviderInfo, WalkerState } from './typings.js' */
 /** @import { RedisRepository as Repository } from './redis-repository.js' */
 
-const debug = createDebug('spark-piece-indexer:observer')
+const debug = createDebug('spark-piece-indexer:advertisement-walker')
 
 /**
  * @param {object} args
@@ -20,7 +20,7 @@ const debug = createDebug('spark-piece-indexer:observer')
  * @param {number} args.minStepIntervalInMs
  * @param {AbortSignal} [args.signal]
  */
-export async function walkProviderChain ({
+export async function walkChain ({
   repository,
   providerId,
   getProviderInfo,
@@ -179,7 +179,7 @@ export async function processNextAdvertisement ({
       }
     }
 
-    console.error(
+    debug(
       'Cannot process provider %s (%s) advertisement %s: %s',
       providerId,
       providerInfo.providerAddress,

indexer/lib/ipni-watcher.js

@@ -3,7 +3,7 @@ import timers from 'node:timers/promises'
 import { assertOkResponse } from './http-assertions.js'
 import { multiaddrToHttpUrl } from './vendored/multiaddr.js'
 
-const debug = createDebug('spark-piece-indexer:observer')
+const debug = createDebug('spark-piece-indexer:ipni-watcher')
 
 /** @import { ProviderToInfoMap, ProviderInfo } from './typings.js' */