Merge branch 'main' into update-fastify-type-provider-typebox-to-4.1.0

.github/workflows/lockfile.yml

@@ -32,3 +32,4 @@ jobs:
         uses: rvanvelzen/npm-lockfile-changes@6fded38b5a054f5ab49efd6850668e796f780604
         with:
           token: ${{ steps.app-token.outputs.token }}
+          updateComment: true

package.json

@@ -118,7 +118,7 @@
     "@types/json-schema": "^7.0.11",
     "@types/json-stable-stringify": "^1.0.36",
     "@types/nanobench": "^3.0.0",
-    "@types/node": "^18.19.33",
+    "@types/node": "^18.19.54",
     "@types/sinonjs__fake-timers": "^8.1.2",
     "@types/streamx": "^2.9.5",
     "@types/sub-encoder": "^2.1.0",
@@ -157,7 +157,7 @@
     "@fastify/error": "^3.4.1",
     "@fastify/static": "^7.0.3",
     "@fastify/type-provider-typebox": "^4.1.0",
-    "@hyperswarm/secret-stream": "^6.1.2",
+    "@hyperswarm/secret-stream": "^6.6.3",
     "@mapeo/crypto": "1.0.0-alpha.10",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",

src/local-peers.js

@@ -13,6 +13,7 @@ import {
 import pDefer from 'p-defer'
 import { Logger } from './logger.js'
 import pTimeout, { TimeoutError } from 'p-timeout'
+/** @import NoiseStream from '@hyperswarm/secret-stream' */
 /** @import { OpenedNoiseStream } from './lib/noise-secret-stream-helpers.js' */
 
 // Unique identifier for the mapeo rpc protocol
@@ -329,7 +330,7 @@ export class LocalPeers extends TypedEmitter {
   /**
    * Connect to a peer over an existing NoiseSecretStream
    *
-   * @param {import('./types.js').NoiseStream<any>} stream a NoiseSecretStream from @hyperswarm/secret-stream
+   * @param {NoiseStream<any>} stream
    * @returns {import('./types.js').ReplicationStream}
    */
   connect(stream) {

src/types.ts

@@ -133,7 +133,6 @@ export type HypercorePeer = {
   onrange: (options: { drop: boolean; start: number; length: number }) => void
 }
 
-export { NoiseStream }
 type ProtocolStream = Omit<NoiseStream, 'userData'> & {
   userData: Protomux
 }