@libp2p/ping 2.0.36 → 2.0.37-6059227cb

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,IAAI;IACnB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACtF;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,CAAA;AAE9B,MAAM,WAAW,QAAQ;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAA;AAEtC,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,wBAAgB,IAAI,CAAE,IAAI,GAAE,QAAa,GAAG,CAAC,UAAU,EAAE,cAAc,KAAK,IAAI,CAE/E;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,IAAI;IACnB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACtF;AAED,MAAM,WAAW,QAAQ;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;CACrC;AAED,wBAAgB,IAAI,CAAE,IAAI,GAAE,QAAa,GAAG,CAAC,UAAU,EAAE,cAAc,KAAK,IAAI,CAE/E;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,WAAW,CAAA;AAqC7C,MAAM,UAAU,IAAI,CAAE,OAAiB,EAAE;IACvC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACxD,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,WAAW,CAAA;AA0B7C,MAAM,UAAU,IAAI,CAAE,OAAiB,EAAE;IACvC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACxD,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/src/ping.d.ts

@@ -1,6 +1,6 @@
 import { serviceCapabilities } from '@libp2p/interface';
 import type { PingComponents, PingInit, Ping as PingInterface } from './index.js';
-import type { AbortOptions, PeerId, Startable, IncomingStreamData } from '@libp2p/interface';
+import type { AbortOptions, Stream, PeerId, Startable, Connection } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';
 export declare class Ping implements Startable, PingInterface {
     readonly protocol: string;
@@ -10,7 +10,6 @@ export declare class Ping implements Startable, PingInterface {
     private readonly maxInboundStreams;
     private readonly maxOutboundStreams;
     private readonly runOnLimitedConnection;
-    private readonly log;
     constructor(components: PingComponents, init?: PingInit);
     readonly [Symbol.toStringTag] = "@libp2p/ping";
     readonly [serviceCapabilities]: string[];
@@ -20,7 +19,7 @@ export declare class Ping implements Startable, PingInterface {
     /**
      * A handler to register with Libp2p to process ping messages
      */
-    handleMessage(data: IncomingStreamData): void;
+    handlePing(stream: Stream, connection: Connection): Promise<void>;
     /**
      * Ping a given peer and wait for its response, getting the operation latency.
      */

package/dist/src/ping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ping.d.ts","sourceRoot":"","sources":["../../src/ping.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAKpF,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AACjF,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC5G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,qBAAa,IAAK,YAAW,SAAS,EAAE,aAAa;IACnD,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;IAChD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,cAAc,EAAE,IAAI,GAAE,QAAa;IAa5D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAiB;IAE9C,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAEK,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IASvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACH,aAAa,CAAE,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAsD9C;;OAEG;IACG,IAAI,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;CAsDjG"}
+{"version":3,"file":"ping.d.ts","sourceRoot":"","sources":["../../src/ping.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,mBAAmB,EAAiC,MAAM,mBAAmB,CAAA;AAMrG,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAA;AAChH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,qBAAa,IAAK,YAAW,SAAS,EAAE,aAAa;IACnD,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;gBAEnC,UAAU,EAAE,cAAc,EAAE,IAAI,GAAE,QAAa;IAY5D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAiB;IAE9C,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAEK,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IASvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACG,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCxE;;OAEG;IACG,IAAI,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;CAqDjG"}

package/dist/src/ping.js

@@ -1,7 +1,8 @@
 import { randomBytes } from '@libp2p/crypto';
-import { ProtocolError, TimeoutError, serviceCapabilities } from '@libp2p/interface';
-import { byteStream } from 'it-byte-stream';
-import { setMaxListeners } from 'main-event';
+import { ProtocolError, serviceCapabilities, setMaxListeners, TimeoutError } from '@libp2p/interface';
+import { pEvent } from 'p-event';
+import { raceSignal } from 'race-signal';
+import { Uint8ArrayList } from 'uint8arraylist';
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
 import { PROTOCOL_PREFIX, PROTOCOL_NAME, PING_LENGTH, PROTOCOL_VERSION, TIMEOUT, MAX_INBOUND_STREAMS, MAX_OUTBOUND_STREAMS } from './constants.js';
 export class Ping {
@@ -12,24 +13,22 @@ export class Ping {
     maxInboundStreams;
     maxOutboundStreams;
     runOnLimitedConnection;
-    log;
     constructor(components, init = {}) {
         this.components = components;
-        this.log = components.logger.forComponent('libp2p:ping');
         this.started = false;
         this.protocol = `/${init.protocolPrefix ?? PROTOCOL_PREFIX}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`;
         this.timeout = init.timeout ?? TIMEOUT;
         this.maxInboundStreams = init.maxInboundStreams ?? MAX_INBOUND_STREAMS;
         this.maxOutboundStreams = init.maxOutboundStreams ?? MAX_OUTBOUND_STREAMS;
         this.runOnLimitedConnection = init.runOnLimitedConnection ?? true;
-        this.handleMessage = this.handleMessage.bind(this);
+        this.handlePing = this.handlePing.bind(this);
     }
     [Symbol.toStringTag] = '@libp2p/ping';
     [serviceCapabilities] = [
         '@libp2p/ping'
     ];
     async start() {
-        await this.components.registrar.handle(this.protocol, this.handleMessage, {
+        await this.components.registrar.handle(this.protocol, this.handlePing, {
             maxInboundStreams: this.maxInboundStreams,
             maxOutboundStreams: this.maxOutboundStreams,
             runOnLimitedConnection: this.runOnLimitedConnection
@@ -46,97 +45,84 @@ export class Ping {
     /**
      * A handler to register with Libp2p to process ping messages
      */
-    handleMessage(data) {
-        this.log('incoming ping from %p', data.connection.remotePeer);
-        const { stream } = data;
+    async handlePing(stream, connection) {
+        const log = stream.log.newScope('ping');
+        log.trace('ping from %p', connection.remotePeer);
+        const signal = AbortSignal.timeout(this.timeout);
+        setMaxListeners(Infinity, signal);
+        signal.addEventListener('abort', () => {
+            stream.abort(new TimeoutError('Ping timed out'));
+        });
         const start = Date.now();
-        const bytes = byteStream(stream);
-        let pinged = false;
-        Promise.resolve().then(async () => {
-            while (true) {
-                const signal = AbortSignal.timeout(this.timeout);
-                setMaxListeners(Infinity, signal);
-                signal.addEventListener('abort', () => {
-                    stream?.abort(new TimeoutError('ping timeout'));
-                });
-                const buf = await bytes.read({
-                    bytes: PING_LENGTH,
-                    signal
-                });
-                await bytes.write(buf, {
+        for await (const buf of stream) {
+            if (stream.status !== 'open') {
+                log('stream status changed to %s', stream.status);
+                break;
+            }
+            if (!stream.send(buf)) {
+                log('waiting for stream to drain');
+                await pEvent(stream, 'drain', {
+                    rejectionEvents: [
+                        'close'
+                    ],
                     signal
                 });
-                pinged = true;
-            }
-        })
-            .catch(err => {
-            // ignore the error if we've processed at least one ping, the remote
-            // closed the stream and we handled or are handling the close cleanly
-            if (pinged && err.name === 'UnexpectedEOFError' && stream.readStatus !== 'ready') {
-                return;
+                log('stream drained');
             }
-            this.log.error('incoming ping from %p failed with error - %e', data.connection.remotePeer, err);
-            stream?.abort(err);
-        })
-            .finally(() => {
-            const ms = Date.now() - start;
-            this.log('incoming ping from %p complete in %dms', data.connection.remotePeer, ms);
-            const signal = AbortSignal.timeout(this.timeout);
-            setMaxListeners(Infinity, signal);
-            stream.close({
-                signal
-            })
-                .catch(err => {
-                this.log.error('error closing ping stream from %p - %e', data.connection.remotePeer, err);
-                stream?.abort(err);
-            });
+        }
+        log('ping from %p complete in %dms', connection.remotePeer, Date.now() - start);
+        await stream.close({
+            signal
         });
     }
     /**
      * Ping a given peer and wait for its response, getting the operation latency.
      */
     async ping(peer, options = {}) {
-        this.log('pinging %p', peer);
-        const start = Date.now();
         const data = randomBytes(PING_LENGTH);
-        const connection = await this.components.connectionManager.openConnection(peer, options);
-        let stream;
-        if (options.signal == null) {
-            const signal = AbortSignal.timeout(this.timeout);
-            options = {
-                ...options,
-                signal
-            };
-        }
+        const stream = await this.components.connectionManager.openStream(peer, this.protocol, {
+            runOnLimitedConnection: this.runOnLimitedConnection,
+            ...options
+        });
+        const log = stream.log.newScope('ping');
         try {
-            stream = await connection.newStream(this.protocol, {
-                ...options,
-                runOnLimitedConnection: this.runOnLimitedConnection
-            });
-            const bytes = byteStream(stream);
-            const [, result] = await Promise.all([
-                bytes.write(data, options),
-                bytes.read({
-                    ...options,
-                    bytes: PING_LENGTH
-                })
-            ]);
-            const ms = Date.now() - start;
-            if (!uint8ArrayEquals(data, result.subarray())) {
-                throw new ProtocolError(`Received wrong ping ack after ${ms}ms`);
-            }
-            this.log('ping %p complete in %dms', connection.remotePeer, ms);
-            return ms;
+            const start = Date.now();
+            const finished = Promise.withResolvers();
+            const received = new Uint8ArrayList();
+            const onPong = (evt) => {
+                received.append(evt.data);
+                if (received.byteLength === PING_LENGTH) {
+                    stream.removeEventListener('message', onPong);
+                    const rtt = Date.now() - start;
+                    Promise.all([
+                        stream.closeRead(options)
+                    ])
+                        .then(() => {
+                        if (!uint8ArrayEquals(data, received.subarray())) {
+                            throw new ProtocolError(`Received wrong ping ack after ${rtt}ms`);
+                        }
+                        else {
+                            finished.resolve(rtt);
+                        }
+                    })
+                        .catch(err => {
+                        stream.abort(err);
+                        finished.reject(err);
+                    });
+                }
+            };
+            stream.addEventListener('message', onPong);
+            stream.send(data);
+            await stream.close(options);
+            return await raceSignal(finished.promise, options.signal);
         }
         catch (err) {
-            this.log.error('error while pinging %p', connection.remotePeer, err);
+            log.error('error while pinging %o - %e', peer, err);
             stream?.abort(err);
             throw err;
         }
         finally {
-            if (stream != null) {
-                await stream.close(options);
-            }
+            stream?.close();
         }
     }
 }

package/dist/src/ping.js.map

@@ -1 +1 @@
-{"version":3,"file":"ping.js","sourceRoot":"","sources":["../../src/ping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ping.js","sourceRoot":"","sources":["../../src/ping.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/ping",
-  "version": "2.0.36",
+  "version": "2.0.37-6059227cb",
   "description": "Implementation of Ping Protocol",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/protocol-ping#readme",
@@ -43,20 +43,21 @@
     "doc-check": "aegir doc-check"
   },
   "dependencies": {
-    "@libp2p/crypto": "^5.1.7",
-    "@libp2p/interface": "^2.10.5",
-    "@libp2p/interface-internal": "^2.3.18",
-    "@multiformats/multiaddr": "^12.4.4",
-    "it-byte-stream": "^2.0.2",
-    "main-event": "^1.0.1",
+    "@libp2p/crypto": "5.1.8-6059227cb",
+    "@libp2p/interface": "2.11.0-6059227cb",
+    "@libp2p/interface-internal": "2.3.19-6059227cb",
+    "@multiformats/multiaddr": "^13.0.1",
+    "p-event": "^6.0.1",
+    "race-signal": "^2.0.0",
+    "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/logger": "^5.1.21",
-    "@libp2p/peer-id": "^5.1.8",
-    "aegir": "^47.0.14",
-    "it-pair": "^2.0.6",
-    "p-defer": "^4.0.1",
+    "@libp2p/peer-id": "5.1.9-6059227cb",
+    "@libp2p/utils": "6.7.2-6059227cb",
+    "aegir": "^47.0.22",
+    "delay": "^6.0.0",
+    "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0"
   },
   "sideEffects": false

package/src/index.ts

@@ -23,7 +23,7 @@
  */
 
 import { Ping as PingClass } from './ping.js'
-import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface'
+import type { AbortOptions, PeerId } from '@libp2p/interface'
 import type { ConnectionManager, Registrar } from '@libp2p/interface-internal'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
@@ -31,11 +31,6 @@ export interface Ping {
   ping(peer: PeerId | Multiaddr | Multiaddr[], options?: AbortOptions): Promise<number>
 }
 
-/**
- * @deprecated Use the `Ping` export instead
- */
-export type PingService = Ping
-
 export interface PingInit {
   protocolPrefix?: string
   maxInboundStreams?: number
@@ -48,15 +43,9 @@ export interface PingInit {
   timeout?: number
 }
 
-/**
- * @deprecated Use the `PingInit` export instead
- */
-export type PingServiceInit = PingInit
-
 export interface PingComponents {
   registrar: Registrar
   connectionManager: ConnectionManager
-  logger: ComponentLogger
 }
 
 export function ping (init: PingInit = {}): (components: PingComponents) => Ping {

package/src/ping.ts

@@ -1,11 +1,12 @@
 import { randomBytes } from '@libp2p/crypto'
-import { ProtocolError, TimeoutError, serviceCapabilities } from '@libp2p/interface'
-import { byteStream } from 'it-byte-stream'
-import { setMaxListeners } from 'main-event'
+import { ProtocolError, serviceCapabilities, setMaxListeners, TimeoutError } from '@libp2p/interface'
+import { pEvent } from 'p-event'
+import { raceSignal } from 'race-signal'
+import { Uint8ArrayList } from 'uint8arraylist'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { PROTOCOL_PREFIX, PROTOCOL_NAME, PING_LENGTH, PROTOCOL_VERSION, TIMEOUT, MAX_INBOUND_STREAMS, MAX_OUTBOUND_STREAMS } from './constants.js'
 import type { PingComponents, PingInit, Ping as PingInterface } from './index.js'
-import type { AbortOptions, Logger, Stream, PeerId, Startable, IncomingStreamData } from '@libp2p/interface'
+import type { AbortOptions, Stream, PeerId, Startable, Connection, StreamMessageEvent } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
 export class Ping implements Startable, PingInterface {
@@ -16,11 +17,9 @@ export class Ping implements Startable, PingInterface {
   private readonly maxInboundStreams: number
   private readonly maxOutboundStreams: number
   private readonly runOnLimitedConnection: boolean
-  private readonly log: Logger
 
   constructor (components: PingComponents, init: PingInit = {}) {
     this.components = components
-    this.log = components.logger.forComponent('libp2p:ping')
     this.started = false
     this.protocol = `/${init.protocolPrefix ?? PROTOCOL_PREFIX}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`
     this.timeout = init.timeout ?? TIMEOUT
@@ -28,7 +27,7 @@ export class Ping implements Startable, PingInterface {
     this.maxOutboundStreams = init.maxOutboundStreams ?? MAX_OUTBOUND_STREAMS
     this.runOnLimitedConnection = init.runOnLimitedConnection ?? true
 
-    this.handleMessage = this.handleMessage.bind(this)
+    this.handlePing = this.handlePing.bind(this)
   }
 
   readonly [Symbol.toStringTag] = '@libp2p/ping'
@@ -38,7 +37,7 @@ export class Ping implements Startable, PingInterface {
   ]
 
   async start (): Promise<void> {
-    await this.components.registrar.handle(this.protocol, this.handleMessage, {
+    await this.components.registrar.handle(this.protocol, this.handlePing, {
       maxInboundStreams: this.maxInboundStreams,
       maxOutboundStreams: this.maxOutboundStreams,
       runOnLimitedConnection: this.runOnLimitedConnection
@@ -58,115 +57,95 @@ export class Ping implements Startable, PingInterface {
   /**
    * A handler to register with Libp2p to process ping messages
    */
-  handleMessage (data: IncomingStreamData): void {
-    this.log('incoming ping from %p', data.connection.remotePeer)
-
-    const { stream } = data
+  async handlePing (stream: Stream, connection: Connection): Promise<void> {
+    const log = stream.log.newScope('ping')
+    log.trace('ping from %p', connection.remotePeer)
+    const signal = AbortSignal.timeout(this.timeout)
+    setMaxListeners(Infinity, signal)
+    signal.addEventListener('abort', () => {
+      stream.abort(new TimeoutError('Ping timed out'))
+    })
     const start = Date.now()
-    const bytes = byteStream(stream)
-    let pinged = false
-
-    Promise.resolve().then(async () => {
-      while (true) {
-        const signal = AbortSignal.timeout(this.timeout)
-        setMaxListeners(Infinity, signal)
-        signal.addEventListener('abort', () => {
-          stream?.abort(new TimeoutError('ping timeout'))
-        })
 
-        const buf = await bytes.read({
-          bytes: PING_LENGTH,
-          signal
-        })
-        await bytes.write(buf, {
+    for await (const buf of stream) {
+      if (stream.status !== 'open') {
+        log('stream status changed to %s', stream.status)
+        break
+      }
+
+      if (!stream.send(buf)) {
+        log('waiting for stream to drain')
+        await pEvent(stream, 'drain', {
+          rejectionEvents: [
+            'close'
+          ],
           signal
         })
-
-        pinged = true
+        log('stream drained')
       }
-    })
-      .catch(err => {
-        // ignore the error if we've processed at least one ping, the remote
-        // closed the stream and we handled or are handling the close cleanly
-        if (pinged && err.name === 'UnexpectedEOFError' && stream.readStatus !== 'ready') {
-          return
-        }
-
-        this.log.error('incoming ping from %p failed with error - %e', data.connection.remotePeer, err)
-        stream?.abort(err)
-      })
-      .finally(() => {
-        const ms = Date.now() - start
-        this.log('incoming ping from %p complete in %dms', data.connection.remotePeer, ms)
+    }
 
-        const signal = AbortSignal.timeout(this.timeout)
-        setMaxListeners(Infinity, signal)
+    log('ping from %p complete in %dms', connection.remotePeer, Date.now() - start)
 
-        stream.close({
-          signal
-        })
-          .catch(err => {
-            this.log.error('error closing ping stream from %p - %e', data.connection.remotePeer, err)
-            stream?.abort(err)
-          })
-      })
+    await stream.close({
+      signal
+    })
   }
 
   /**
    * Ping a given peer and wait for its response, getting the operation latency.
    */
   async ping (peer: PeerId | Multiaddr | Multiaddr[], options: AbortOptions = {}): Promise<number> {
-    this.log('pinging %p', peer)
-
-    const start = Date.now()
     const data = randomBytes(PING_LENGTH)
-    const connection = await this.components.connectionManager.openConnection(peer, options)
-    let stream: Stream | undefined
-
-    if (options.signal == null) {
-      const signal = AbortSignal.timeout(this.timeout)
-
-      options = {
-        ...options,
-        signal
-      }
-    }
+    const stream = await this.components.connectionManager.openStream(peer, this.protocol, {
+      runOnLimitedConnection: this.runOnLimitedConnection,
+      ...options
+    })
+    const log = stream.log.newScope('ping')
 
     try {
-      stream = await connection.newStream(this.protocol, {
-        ...options,
-        runOnLimitedConnection: this.runOnLimitedConnection
-      })
-
-      const bytes = byteStream(stream)
-
-      const [, result] = await Promise.all([
-        bytes.write(data, options),
-        bytes.read({
-          ...options,
-          bytes: PING_LENGTH
-        })
-      ])
-
-      const ms = Date.now() - start
-
-      if (!uint8ArrayEquals(data, result.subarray())) {
-        throw new ProtocolError(`Received wrong ping ack after ${ms}ms`)
+      const start = Date.now()
+      const finished = Promise.withResolvers<number>()
+      const received = new Uint8ArrayList()
+
+      const onPong = (evt: StreamMessageEvent): void => {
+        received.append(evt.data)
+
+        if (received.byteLength === PING_LENGTH) {
+          stream.removeEventListener('message', onPong)
+
+          const rtt = Date.now() - start
+
+          Promise.all([
+            stream.closeRead(options)
+          ])
+            .then(() => {
+              if (!uint8ArrayEquals(data, received.subarray())) {
+                throw new ProtocolError(`Received wrong ping ack after ${rtt}ms`)
+              } else {
+                finished.resolve(rtt)
+              }
+            })
+            .catch(err => {
+              stream.abort(err)
+              finished.reject(err)
+            })
+        }
       }
 
-      this.log('ping %p complete in %dms', connection.remotePeer, ms)
+      stream.addEventListener('message', onPong)
+      stream.send(data)
+      await stream.close(options)
 
-      return ms
+      return await raceSignal(finished.promise, options.signal)
     } catch (err: any) {
-      this.log.error('error while pinging %p', connection.remotePeer, err)
+      log.error('error while pinging %o - %e', peer, err)
 
       stream?.abort(err)
 
       throw err
     } finally {
-      if (stream != null) {
-        await stream.close(options)
-      }
+      stream?.close()
     }
   }
 }

package/dist/typedoc-urls.json

@@ -1,15 +0,0 @@
-{
-  "Ping": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.Ping.html",
-  ".:Ping": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.Ping.html",
-  "PingComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.PingComponents.html",
-  ".:PingComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.PingComponents.html",
-  "PingInit": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.PingInit.html",
-  ".:PingInit": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_ping.PingInit.html",
-  "PingService": "https://libp2p.github.io/js-libp2p/types/_libp2p_ping.PingService.html",
-  ".:PingService": "https://libp2p.github.io/js-libp2p/types/_libp2p_ping.PingService.html",
-  "PingServiceInit": "https://libp2p.github.io/js-libp2p/types/_libp2p_ping.PingServiceInit.html",
-  ".:PingServiceInit": "https://libp2p.github.io/js-libp2p/types/_libp2p_ping.PingServiceInit.html",
-  "PING_PROTOCOL": "https://libp2p.github.io/js-libp2p/variables/_libp2p_ping.PING_PROTOCOL.html",
-  "ping": "https://libp2p.github.io/js-libp2p/functions/_libp2p_ping.ping.html",
-  ".:ping": "https://libp2p.github.io/js-libp2p/functions/_libp2p_ping.ping.html"
-}