chore: add getRecordSelector to selectors.ts

Author: dozyio

packages/kad-dht/src/content-fetching/index.ts

@@ -4,7 +4,6 @@ import map from 'it-map'
 import parallel from 'it-parallel'
 import { pipe } from 'it-pipe'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import {
   ALPHA
 } from '../constants.js'
@@ -14,10 +13,10 @@ import {
   valueEvent,
   queryErrorEvent
 } from '../query/events.js'
-import { bestRecord } from '../record/selectors.js'
+import { bestRecord, getRecordSelector } from '../record/selectors.js'
 import { verifyRecord } from '../record/validators.js'
 import { createPutRecord, bufferToRecordKey } from '../utils.js'
-import type { KadDHTComponents, Validators, Selectors, ValueEvent, QueryEvent, SelectFn } from '../index.js'
+import type { KadDHTComponents, Validators, Selectors, ValueEvent, QueryEvent } from '../index.js'
 import type { Message } from '../message/dht.js'
 import type { Network, SendMessageOptions } from '../network.js'
 import type { PeerRouting } from '../peer-routing/index.js'
@@ -65,16 +64,6 @@ export class ContentFetching {
     }) ?? this.put
   }
 
-  private getRecordSelector (key: Uint8Array): SelectFn | undefined {
-    const parts = uint8ArrayToString(key).split('/')
-
-    if (parts.length < 3) {
-      return
-    }
-
-    return this.selectors[parts[1].toString()]
-  }
-
   /**
    * Attempt to retrieve the value for the given key from
    * the local datastore
@@ -158,7 +147,7 @@ export class ContentFetching {
 
     // store the record locally
     const dsKey = bufferToRecordKey(this.datastorePrefix, key)
-    const selector = this.getRecordSelector(key)
+    const selector = getRecordSelector(this.selectors, key)
 
     if (selector != null) {
       try {

packages/kad-dht/src/record/selectors.ts

@@ -1,7 +1,17 @@
 import { InvalidParametersError } from '@libp2p/interface'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { MissingSelectorError } from '../errors.js'
-import type { Selectors } from '../index.js'
+import type { SelectFn, Selectors } from '../index.js'
+
+export function getRecordSelector (selectors: Selectors, key: Uint8Array): SelectFn | undefined {
+  const parts = uint8ArrayToString(key).split('/')
+
+  if (parts.length < 3) {
+    return
+  }
+
+  return selectors[parts[1].toString()]
+}
 
 /**
  * Select the best record out of the given records
@@ -11,16 +21,16 @@ export function bestRecord (selectors: Selectors, k: Uint8Array, records: Uint8A
     throw new InvalidParametersError('No records given')
   }
 
-  const kStr = uint8ArrayToString(k)
-  const parts = kStr.split('/')
+  const selector = getRecordSelector(selectors, k)
 
-  if (parts.length < 3) {
-    throw new InvalidParametersError('Record key does not have a selector function')
-  }
+  if (selector == null) {
+    const kStr = uint8ArrayToString(k)
+    const parts = kStr.split('/')
 
-  const selector = selectors[parts[1].toString()]
+    if (parts.length < 3) {
+      throw new InvalidParametersError('Record key does not have a selector function')
+    }
 
-  if (selector == null) {
     throw new MissingSelectorError(`No selector function configured for key type "${parts[1]}"`)
   }
 

packages/kad-dht/src/rpc/handlers/put-value.ts

@@ -1,9 +1,9 @@
 import { InvalidMessageError } from '@libp2p/interface'
 import { Libp2pRecord } from '@libp2p/record'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+import { getRecordSelector } from '../../record/selectors.js'
 import { verifyRecord } from '../../record/validators.js'
 import { bufferToRecordKey } from '../../utils.js'
-import type { Selectors, SelectFn, Validators } from '../../index.js'
+import type { Selectors, Validators } from '../../index.js'
 import type { Message } from '../../message/dht.js'
 import type { DHTMessageHandler } from '../index.js'
 import type { ComponentLogger, Logger, PeerId } from '@libp2p/interface'
@@ -38,16 +38,6 @@ export class PutValueHandler implements DHTMessageHandler {
     this.selectors = selectors
   }
 
-  private getRecordSelector (key: Uint8Array): SelectFn | undefined {
-    const parts = uint8ArrayToString(key).split('/')
-
-    if (parts.length < 3) {
-      return
-    }
-
-    return this.selectors[parts[1].toString()]
-  }
-
   async handle (peerId: PeerId, msg: Message): Promise<Message> {
     const key = msg.key
     this.log('%p asked us to store value for key %b', peerId, key)
@@ -64,7 +54,7 @@ export class PutValueHandler implements DHTMessageHandler {
 
       const recordKey = bufferToRecordKey(this.datastorePrefix, deserializedRecord.key)
 
-      const selector = this.getRecordSelector(deserializedRecord.key)
+      const selector = getRecordSelector(this.selectors, deserializedRecord.key)
 
       if (selector != null) {
         try {