libp2p 0.36.0 → 0.36.2-199395d

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

@@ -1,76 +1,57 @@
-export = FetchProtocol;
-/**
- * @typedef {import('../')} Libp2p
- * @typedef {import('multiaddr').Multiaddr} Multiaddr
- * @typedef {import('peer-id')} PeerId
- * @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxedStream} MuxedStream
- * @typedef {(key: string) => Promise<Uint8Array | null>} LookupFunction
- */
+import type { PeerId } from '@libp2p/interfaces/peer-id';
+import type { Startable } from '@libp2p/interfaces';
+import type { Stream } from '@libp2p/interfaces/connection';
+import type { IncomingStreamData } from '@libp2p/interfaces/registrar';
+import type { Components } from '@libp2p/interfaces/components';
+export interface FetchInit {
+    protocolPrefix: string;
+}
+export interface HandleMessageOptions {
+    stream: Stream;
+    protocol: string;
+}
+export interface LookupFunction {
+    (key: string): Promise<Uint8Array | null>;
+}
 /**
  * A simple libp2p protocol for requesting a value corresponding to a key from a peer.
  * Developers can register one or more lookup function for retrieving the value corresponding to
  * a given key.  Each lookup function must act on a distinct part of the overall key space, defined
  * by a fixed prefix that all keys that should be routed to that lookup function will start with.
  */
-declare class FetchProtocol {
+export declare class FetchService implements Startable {
+    private readonly components;
+    private readonly lookupFunctions;
+    private readonly protocol;
+    private started;
+    constructor(components: Components, init: FetchInit);
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    isStarted(): boolean;
     /**
-     * @param {Libp2p} libp2p
+     * Sends a request to fetch the value associated with the given key from the given peer
      */
-    constructor(libp2p: Libp2p);
-    _lookupFunctions: Map<any, any>;
-    _libp2p: import("../");
+    fetch(peer: PeerId, key: string): Promise<Uint8Array | null>;
     /**
      * Invoked when a fetch request is received.  Reads the request message off the given stream and
      * responds based on looking up the key in the request via the lookup callback that corresponds
      * to the key's prefix.
-     *
-     * @param {object} options
-     * @param {MuxedStream} options.stream
-     * @param {string} options.protocol
      */
-    handleMessage(options: {
-        stream: MuxedStream;
-        protocol: string;
-    }): Promise<void>;
-    /**
-     * Sends a request to fetch the value associated with the given key from the given peer.
-     *
-     * @param {PeerId|Multiaddr} peer
-     * @param {string} key
-     * @returns {Promise<Uint8Array | null>}
-     */
-    fetch(peer: PeerId | Multiaddr, key: string): Promise<Uint8Array | null>;
+    handleMessage(data: IncomingStreamData): Promise<void>;
     /**
      * Given a key, finds the appropriate function for looking up its corresponding value, based on
      * the key's prefix.
-     *
-     * @param {string} key
      */
-    _getLookupFunction(key: string): any;
+    _getLookupFunction(key: string): LookupFunction | undefined;
     /**
      * Registers a new lookup callback that can map keys to values, for a given set of keys that
-     * share the same prefix.
-     *
-     * @param {string} prefix
-     * @param {LookupFunction} lookup
+     * share the same prefix
      */
     registerLookupFunction(prefix: string, lookup: LookupFunction): void;
     /**
      * Registers a new lookup callback that can map keys to values, for a given set of keys that
      * share the same prefix.
-     *
-     * @param {string} prefix
-     * @param {LookupFunction} [lookup]
      */
-    unregisterLookupFunction(prefix: string, lookup?: LookupFunction | undefined): void;
-}
-declare namespace FetchProtocol {
-    export { PROTOCOL, Libp2p, Multiaddr, PeerId, MuxedStream, LookupFunction };
+    unregisterLookupFunction(prefix: string, lookup?: LookupFunction): void;
 }
-type MuxedStream = import('libp2p-interfaces/src/stream-muxer/types').MuxedStream;
-type PeerId = import('peer-id');
-type Multiaddr = import('multiaddr').Multiaddr;
-type LookupFunction = (key: string) => Promise<Uint8Array | null>;
-type Libp2p = import('../');
-import { PROTOCOL } from "./constants";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fetch/index.js"],"names":[],"mappings":";AAcA;;;;;;GAMG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,oBAFW,MAAM,EAMhB;IAHC,gCAAiC;IACjC,uBAAqB;IA0CvB;;;;;;;;OAQG;IACH;QAHgC,MAAM,EAA3B,WAAW;QACK,QAAQ,EAAxB,MAAM;sBAsBhB;IAnED;;;;;;OAMG;IACH,YAJW,MAAM,GAAC,SAAS,OAChB,MAAM,GACJ,QAAQ,UAAU,GAAG,IAAI,CAAC,CA+BtC;IAiCD;;;;;OAKG;IACH,wBAFW,MAAM,OAShB;IAED;;;;;;OAMG;IACH,+BAHW,MAAM,gCAQhB;IAED;;;;;;OAMG;IACH,iCAHW,MAAM,6CAahB;CACF;;;;mBAxIY,OAAO,0CAA0C,EAAE,WAAW;cAD9D,OAAO,SAAS,CAAC;iBADjB,OAAO,WAAW,EAAE,SAAS;4BAGvB,MAAM,KAAK,QAAQ,UAAU,GAAG,IAAI,CAAC;cAJ3C,OAAO,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fetch/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI/D,MAAM,WAAW,SAAS;IACxB,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;CAC1C;AAED;;;;;GAKG;AACH,qBAAa,YAAa,YAAW,SAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAS;gBAEX,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS;IAQ9C,KAAK;IASL,IAAI;IAKV,SAAS;IAIT;;OAEG;IACG,KAAK,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IA+BnE;;;;OAIG;IACG,aAAa,CAAE,IAAI,EAAE,kBAAkB;IAuB7C;;;OAGG;IACH,kBAAkB,CAAE,GAAG,EAAE,MAAM;IAQ/B;;;OAGG;IACH,sBAAsB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc;IAQ9D;;;OAGG;IACH,wBAAwB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;CAWlE"}

package/dist/src/fetch/index.js

@@ -0,0 +1,130 @@
+import { logger } from '@libp2p/logger';
+import errCode from 'err-code';
+import { codes } from '../errors.js';
+import * as lp from 'it-length-prefixed';
+import { FetchRequest, FetchResponse } from './pb/proto.js';
+import { handshake } from 'it-handshake';
+import { PROTOCOL } from './constants.js';
+const log = logger('libp2p:fetch');
+/**
+ * A simple libp2p protocol for requesting a value corresponding to a key from a peer.
+ * Developers can register one or more lookup function for retrieving the value corresponding to
+ * a given key.  Each lookup function must act on a distinct part of the overall key space, defined
+ * by a fixed prefix that all keys that should be routed to that lookup function will start with.
+ */
+export class FetchService {
+    constructor(components, init) {
+        this.started = false;
+        this.components = components;
+        this.protocol = PROTOCOL;
+        this.lookupFunctions = new Map(); // Maps key prefix to value lookup function
+        this.handleMessage = this.handleMessage.bind(this);
+    }
+    async start() {
+        await this.components.getRegistrar().handle(this.protocol, (data) => {
+            void this.handleMessage(data).catch(err => {
+                log.error(err);
+            });
+        });
+        this.started = true;
+    }
+    async stop() {
+        await this.components.getRegistrar().unhandle(this.protocol);
+        this.started = false;
+    }
+    isStarted() {
+        return this.started;
+    }
+    /**
+     * Sends a request to fetch the value associated with the given key from the given peer
+     */
+    async fetch(peer, key) {
+        log('dialing %s to %p', this.protocol, peer);
+        const connection = await this.components.getDialer().dial(peer);
+        const { stream } = await connection.newStream([this.protocol]);
+        const shake = handshake(stream);
+        // send message
+        const request = new FetchRequest({ identifier: key });
+        shake.write(lp.encode.single(FetchRequest.encode(request).finish()).slice());
+        // read response
+        // @ts-expect-error fromReader returns a Source which has no .next method
+        const response = FetchResponse.decode((await lp.decode.fromReader(shake.reader).next()).value.slice());
+        switch (response.status) {
+            case (FetchResponse.StatusCode.OK): {
+                return response.data;
+            }
+            case (FetchResponse.StatusCode.NOT_FOUND): {
+                return null;
+            }
+            case (FetchResponse.StatusCode.ERROR): {
+                const errmsg = (new TextDecoder()).decode(response.data);
+                throw errCode(new Error('Error in fetch protocol response: ' + errmsg), codes.ERR_INVALID_PARAMETERS);
+            }
+            default: {
+                throw errCode(new Error('Unknown response status'), codes.ERR_INVALID_MESSAGE);
+            }
+        }
+    }
+    /**
+     * Invoked when a fetch request is received.  Reads the request message off the given stream and
+     * responds based on looking up the key in the request via the lookup callback that corresponds
+     * to the key's prefix.
+     */
+    async handleMessage(data) {
+        const { stream } = data;
+        const shake = handshake(stream);
+        // @ts-expect-error fromReader returns a Source which has no .next method
+        const request = FetchRequest.decode((await lp.decode.fromReader(shake.reader).next()).value.slice());
+        let response;
+        const lookup = this._getLookupFunction(request.identifier);
+        if (lookup != null) {
+            const data = await lookup(request.identifier);
+            if (data != null) {
+                response = new FetchResponse({ status: FetchResponse.StatusCode.OK, data });
+            }
+            else {
+                response = new FetchResponse({ status: FetchResponse.StatusCode.NOT_FOUND });
+            }
+        }
+        else {
+            const errmsg = (new TextEncoder()).encode('No lookup function registered for key: ' + request.identifier);
+            response = new FetchResponse({ status: FetchResponse.StatusCode.ERROR, data: errmsg });
+        }
+        shake.write(lp.encode.single(FetchResponse.encode(response).finish()).slice());
+    }
+    /**
+     * Given a key, finds the appropriate function for looking up its corresponding value, based on
+     * the key's prefix.
+     */
+    _getLookupFunction(key) {
+        for (const prefix of this.lookupFunctions.keys()) {
+            if (key.startsWith(prefix)) {
+                return this.lookupFunctions.get(prefix);
+            }
+        }
+    }
+    /**
+     * Registers a new lookup callback that can map keys to values, for a given set of keys that
+     * share the same prefix
+     */
+    registerLookupFunction(prefix, lookup) {
+        if (this.lookupFunctions.has(prefix)) {
+            throw errCode(new Error("Fetch protocol handler for key prefix '" + prefix + "' already registered"), codes.ERR_KEY_ALREADY_EXISTS);
+        }
+        this.lookupFunctions.set(prefix, lookup);
+    }
+    /**
+     * Registers a new lookup callback that can map keys to values, for a given set of keys that
+     * share the same prefix.
+     */
+    unregisterLookupFunction(prefix, lookup) {
+        if (lookup != null) {
+            const existingLookup = this.lookupFunctions.get(prefix);
+            if (existingLookup !== lookup) {
+                return;
+            }
+        }
+        this.lookupFunctions.delete(prefix);
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/src/fetch/index.js.map

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

package/{src/fetch → dist/src/fetch/pb}/proto.js

@@ -1,15 +1,13 @@
 /*eslint-disable*/
-"use strict";
-
-var $protobuf = require("protobufjs/minimal");
+import $protobuf from "protobufjs/minimal.js";
 
 // Common aliases
-var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
+const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
 
 // Exported root namespace
-var $root = $protobuf.roots["libp2p-fetch"] || ($protobuf.roots["libp2p-fetch"] = {});
+const $root = $protobuf.roots["libp2p-fetch"] || ($protobuf.roots["libp2p-fetch"] = {});
 
-$root.FetchRequest = (function() {
+export const FetchRequest = $root.FetchRequest = (() => {
 
     /**
      * Properties of a FetchRequest.
@@ -141,7 +139,7 @@ $root.FetchRequest = (function() {
     return FetchRequest;
 })();
 
-$root.FetchResponse = (function() {
+export const FetchResponse = $root.FetchResponse = (() => {
 
     /**
      * Properties of a FetchResponse.
@@ -320,7 +318,7 @@ $root.FetchResponse = (function() {
      * @property {number} ERROR=2 ERROR value
      */
     FetchResponse.StatusCode = (function() {
-        var valuesById = {}, values = Object.create(valuesById);
+        const valuesById = {}, values = Object.create(valuesById);
         values[valuesById[0] = "OK"] = 0;
         values[valuesById[1] = "NOT_FOUND"] = 1;
         values[valuesById[2] = "ERROR"] = 2;
@@ -330,4 +328,4 @@ $root.FetchResponse = (function() {
     return FetchResponse;
 })();
 
-module.exports = $root;
+export { $root as default };

package/dist/src/get-peer.d.ts

@@ -1,15 +1,8 @@
-export = getPeer;
+import { Multiaddr } from '@multiformats/multiaddr';
+import type { PeerId } from '@libp2p/interfaces/peer-id';
+import type { PeerInfo } from '@libp2p/interfaces/peer-info';
 /**
  * Converts the given `peer` to a `Peer` object.
- * If a multiaddr is received, the addressBook is updated.
- *
- * @param {PeerId|Multiaddr|string} peer
- * @returns {{ id: PeerId, multiaddrs: Multiaddr[]|undefined }}
  */
-declare function getPeer(peer: PeerId | Multiaddr | string): {
-    id: PeerId;
-    multiaddrs: Multiaddr[] | undefined;
-};
-import PeerId = require("peer-id");
-import { Multiaddr } from "multiaddr";
+export declare function getPeer(peer: PeerId | Multiaddr | string): PeerInfo;
 //# sourceMappingURL=get-peer.d.ts.map

package/dist/src/get-peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-peer.d.ts","sourceRoot":"","sources":["../../src/get-peer.js"],"names":[],"mappings":";AAQA;;;;;;GAMG;AACH,+BAHW,MAAM,GAAC,SAAS,GAAC,MAAM,GACrB;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,SAAS,EAAE,GAAC,SAAS,CAAA;CAAE,CAiC7D"}
+{"version":3,"file":"get-peer.d.ts","sourceRoot":"","sources":["../../src/get-peer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAInD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAsB5D;;GAEG;AACH,wBAAgB,OAAO,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAyBpE"}

package/dist/src/get-peer.js

@@ -0,0 +1,43 @@
+import { peerIdFromString } from '@libp2p/peer-id';
+import { Multiaddr } from '@multiformats/multiaddr';
+import errCode from 'err-code';
+import { codes } from './errors.js';
+import { isPeerId } from '@libp2p/interfaces/peer-id';
+function peerIdFromMultiaddr(ma) {
+    const idStr = ma.getPeerId();
+    if (idStr == null) {
+        throw errCode(new Error(`${ma.toString()} does not have a valid peer type`), codes.ERR_INVALID_MULTIADDR);
+    }
+    try {
+        return peerIdFromString(idStr);
+    }
+    catch (err) {
+        throw errCode(new Error(`${ma.toString()} is not a valid peer type`), codes.ERR_INVALID_MULTIADDR);
+    }
+}
+/**
+ * Converts the given `peer` to a `Peer` object.
+ */
+export function getPeer(peer) {
+    if (isPeerId(peer)) {
+        return {
+            id: peer,
+            multiaddrs: [],
+            protocols: []
+        };
+    }
+    if (typeof peer === 'string') {
+        peer = new Multiaddr(peer);
+    }
+    let addr;
+    if (Multiaddr.isMultiaddr(peer)) {
+        addr = peer;
+        peer = peerIdFromMultiaddr(peer);
+    }
+    return {
+        id: peer,
+        multiaddrs: addr != null ? [addr] : [],
+        protocols: []
+    };
+}
+//# sourceMappingURL=get-peer.js.map

package/dist/src/get-peer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-peer.js","sourceRoot":"","sources":["../../src/get-peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAIrD,SAAS,mBAAmB,CAAE,EAAa;IACzC,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAE5B,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,MAAM,OAAO,CACX,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,kCAAkC,CAAC,EAC7D,KAAK,CAAC,qBAAqB,CAC5B,CAAA;KACF;IAED,IAAI;QACF,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAA;KAC/B;IAAC,OAAO,GAAQ,EAAE;QACjB,MAAM,OAAO,CACX,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,2BAA2B,CAAC,EACtD,KAAK,CAAC,qBAAqB,CAC5B,CAAA;KACF;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,OAAO,CAAE,IAAiC;IACxD,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO;YACL,EAAE,EAAE,IAAI;YACR,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,EAAE;SACd,CAAA;KACF;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,IAAI,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAA;KAC3B;IAED,IAAI,IAAI,CAAA;IAER,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAA;QACX,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;KACjC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;QACtC,SAAS,EAAE,EAAE;KACd,CAAA;AACH,CAAC"}

package/dist/src/identify/consts.d.ts

@@ -1,10 +1,10 @@
-export var PROTOCOL_VERSION: string;
-export var AGENT_VERSION: string;
-export var MULTICODEC_IDENTIFY: string;
-export var MULTICODEC_IDENTIFY_PUSH: string;
-export var IDENTIFY_PROTOCOL_VERSION: string;
-export var MULTICODEC_IDENTIFY_PROTOCOL_NAME: string;
-export var MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME: string;
-export var MULTICODEC_IDENTIFY_PROTOCOL_VERSION: string;
-export var MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION: string;
+export declare const PROTOCOL_VERSION = "ipfs/0.1.0";
+export declare const AGENT_VERSION: string;
+export declare const MULTICODEC_IDENTIFY = "/ipfs/id/1.0.0";
+export declare const MULTICODEC_IDENTIFY_PUSH = "/ipfs/id/push/1.0.0";
+export declare const IDENTIFY_PROTOCOL_VERSION = "0.1.0";
+export declare const MULTICODEC_IDENTIFY_PROTOCOL_NAME = "id";
+export declare const MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME = "id/push";
+export declare const MULTICODEC_IDENTIFY_PROTOCOL_VERSION = "1.0.0";
+export declare const MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION = "1.0.0";
 //# sourceMappingURL=consts.d.ts.map

package/dist/src/identify/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/identify/consts.js"],"names":[],"mappings":""}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/identify/consts.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,aAAa,QAAyB,CAAA;AACnD,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AACnD,eAAO,MAAM,wBAAwB,wBAAwB,CAAA;AAE7D,eAAO,MAAM,yBAAyB,UAAU,CAAA;AAChD,eAAO,MAAM,iCAAiC,OAAO,CAAA;AACrD,eAAO,MAAM,sCAAsC,YAAY,CAAA;AAC/D,eAAO,MAAM,oCAAoC,UAAU,CAAA;AAC3D,eAAO,MAAM,yCAAyC,UAAU,CAAA"}

package/dist/src/identify/consts.js

@@ -0,0 +1,11 @@
+import { version } from '../version.js';
+export const PROTOCOL_VERSION = 'ipfs/0.1.0'; // deprecated
+export const AGENT_VERSION = `js-libp2p/${version}`;
+export const MULTICODEC_IDENTIFY = '/ipfs/id/1.0.0'; // deprecated
+export const MULTICODEC_IDENTIFY_PUSH = '/ipfs/id/push/1.0.0'; // deprecated
+export const IDENTIFY_PROTOCOL_VERSION = '0.1.0';
+export const MULTICODEC_IDENTIFY_PROTOCOL_NAME = 'id';
+export const MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME = 'id/push';
+export const MULTICODEC_IDENTIFY_PROTOCOL_VERSION = '1.0.0';
+export const MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION = '1.0.0';
+//# sourceMappingURL=consts.js.map

package/dist/src/identify/consts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../../src/identify/consts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAA,CAAC,aAAa;AAC1D,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,OAAO,EAAE,CAAA;AACnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAA,CAAC,aAAa;AACjE,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAA,CAAC,aAAa;AAE3E,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAAA;AAChD,MAAM,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAA;AACrD,MAAM,CAAC,MAAM,sCAAsC,GAAG,SAAS,CAAA;AAC/D,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAA;AAC3D,MAAM,CAAC,MAAM,yCAAyC,GAAG,OAAO,CAAA"}

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

@@ -1,120 +1,64 @@
-export = IdentifyService;
-/**
- * @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
- * @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxedStream} MuxedStream
- */
-/**
- * @typedef {Object} HostProperties
- * @property {string} agentVersion
- */
-declare class IdentifyService {
-    /**
-     * @param {import('../')} libp2p
-     */
-    static getProtocolStr(libp2p: import('../')): {
-        identifyProtocolStr: string;
-        identifyPushProtocolStr: string;
-    };
-    /**
-     * Takes the `addr` and converts it to a Multiaddr if possible
-     *
-     * @param {Uint8Array | string} addr
-     * @returns {Multiaddr|null}
-     */
-    static getCleanMultiaddr(addr: Uint8Array | string): Multiaddr | null;
-    /**
-     * @class
-     * @param {Object} options
-     * @param {import('../')} options.libp2p
-     */
-    constructor({ libp2p }: {
-        libp2p: import('../');
-    });
-    _libp2p: import("../");
-    peerStore: import("../peer-store/types").PeerStore;
-    addressManager: import("../address-manager");
-    connectionManager: import("../connection-manager");
-    peerId: PeerId;
-    /**
-     * A handler to register with Libp2p to process identify messages.
-     *
-     * @param {Object} options
-     * @param {Connection} options.connection
-     * @param {MuxedStream} options.stream
-     * @param {string} options.protocol
-     * @returns {Promise<void>|undefined}
-     */
-    handleMessage({ connection, stream, protocol }: {
-        connection: Connection;
-        stream: MuxedStream;
-        protocol: string;
-    }): Promise<void> | undefined;
-    identifyProtocolStr: string;
-    identifyPushProtocolStr: string;
-    _host: {
-        agentVersion: string;
-        protocolVersion: string;
-    };
+import { Multiaddr } from '@multiformats/multiaddr';
+import Message from './pb/message.js';
+import type { IncomingStreamData } from '@libp2p/interfaces/registrar';
+import type { Connection } from '@libp2p/interfaces/connection';
+import type { Startable } from '@libp2p/interfaces';
+import type { Components } from '@libp2p/interfaces/components';
+export interface HostProperties {
+    agentVersion: string;
+}
+export interface IdentifyServiceInit {
+    protocolPrefix: string;
+    host: HostProperties;
+}
+export declare class IdentifyService implements Startable {
+    private readonly components;
+    private readonly identifyProtocolStr;
+    private readonly identifyPushProtocolStr;
+    private readonly host;
+    private started;
+    constructor(components: Components, init: IdentifyServiceInit);
+    isStarted(): boolean;
     start(): Promise<void>;
     stop(): Promise<void>;
     /**
      * Send an Identify Push update to the list of connections
-     *
-     * @param {Connection[]} connections
-     * @returns {Promise<void[]>}
      */
-    push(connections: Connection[]): Promise<void[]>;
+    push(connections: Connection[]): Promise<void>;
     /**
-     * Calls `push` for all peers in the `peerStore` that are connected
+     * Calls `push` on all peer connections
      */
     pushToPeerStore(): Promise<void>;
     /**
      * Requests the `Identify` message from peer associated with the given `connection`.
      * If the identified peer does not match the `PeerId` associated with the connection,
      * an error will be thrown.
-     *
-     * @async
-     * @param {Connection} connection
-     * @returns {Promise<void>}
      */
     identify(connection: Connection): Promise<void>;
+    /**
+     * A handler to register with Libp2p to process identify messages
+     */
+    handleMessage(data: IncomingStreamData): Promise<void> | undefined;
     /**
      * Sends the `Identify` response with the Signed Peer Record
      * to the requesting peer over the given `connection`
-     *
-     * @private
-     * @param {Object} options
-     * @param {MuxedStream} options.stream
-     * @param {Connection} options.connection
-     * @returns {Promise<void>}
      */
-    private _handleIdentify;
+    _handleIdentify(data: IncomingStreamData): Promise<void>;
     /**
      * Reads the Identify Push message from the given `connection`
-     *
-     * @private
-     * @param {object} options
-     * @param {MuxedStream} options.stream
-     * @param {Connection} options.connection
-     * @returns {Promise<void>}
      */
-    private _handlePush;
-}
-declare namespace IdentifyService {
-    export { multicodecs, Message as Messsage, Connection, MuxedStream, HostProperties };
-}
-import PeerId = require("peer-id");
-type Connection = import("libp2p-interfaces/src/connection/connection");
-import { Multiaddr } from "multiaddr";
-declare namespace multicodecs {
-    export { MULTICODEC_IDENTIFY as IDENTIFY };
-    export { MULTICODEC_IDENTIFY_PUSH as IDENTIFY_PUSH };
+    _handlePush(data: IncomingStreamData): Promise<void>;
+    /**
+     * Takes the `addr` and converts it to a Multiaddr if possible
+     */
+    static getCleanMultiaddr(addr: Uint8Array | string | null | undefined): Multiaddr | undefined;
 }
-import Message = require("./message");
-type MuxedStream = import('libp2p-interfaces/src/stream-muxer/types').MuxedStream;
-type HostProperties = {
-    agentVersion: string;
+/**
+ * The protocols the IdentifyService supports
+ */
+export declare const multicodecs: {
+    IDENTIFY: string;
+    IDENTIFY_PUSH: string;
 };
-import { MULTICODEC_IDENTIFY } from "./consts";
-import { MULTICODEC_IDENTIFY_PUSH } from "./consts";
+export { Message };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/identify/index.js"],"names":[],"mappings":";AAkCA;;;GAGG;AAEH;;;GAGG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,KAAK,CAAC;;;MAOvB;IA2SD;;;;;OAKG;IACH,+BAHW,UAAU,GAAG,MAAM,GACjB,SAAS,GAAC,IAAI,CAW1B;IAxTD;;;;OAIG;IACH;QAFkC,MAAM,EAA7B,OAAO,KAAK,CAAC;OAuCvB;IApCC,uBAAqB;IACrB,mDAAiC;IACjC,6CAA2C;IAC3C,mDAAiD;IACjD,eAA2B;IA6K7B;;;;;;;;OAQG;IACH;oBALW,UAAU;gBACV,WAAW;kBACX,MAAM;QACJ,QAAQ,IAAI,CAAC,GAAC,SAAS,CAWnC;IA1LC,4BAA0D;IAC1D,gCAAkE;IAGlE;sBAjCU,MAAM;;MAoCf;IAsBH,uBAGC;IAED,sBAEC;IAED;;;;;OAKG;IACH,kBAHW,UAAU,EAAE,GACV,QAAQ,IAAI,EAAE,CAAC,CA4B3B;IAED;;OAEG;IACH,iCAeC;IAED;;;;;;;;OAQG;IACH,qBAHW,UAAU,GACR,QAAQ,IAAI,CAAC,CAmEzB;IAsBD;;;;;;;;;OASG;IACH,wBA6BC;IAED;;;;;;;;OAQG;IACH,oBA0CC;CAkBF;;;;;;;;;;;;mBA5UY,OAAO,0CAA0C,EAAE,WAAW;;kBAK7D,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/identify/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAa,MAAM,yBAAyB,CAAA;AAC9D,OAAO,OAAO,MAAM,iBAAiB,CAAA;AAYrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAI/D,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,qBAAa,eAAgB,YAAW,SAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;IAC5C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAQ;IAChD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAGpB;IAED,OAAO,CAAC,OAAO,CAAS;gBAEX,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,mBAAmB;IAwC9D,SAAS;IAIH,KAAK;IAoBL,IAAI;IAOV;;OAEG;IACG,IAAI,CAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BrD;;OAEG;IACG,eAAe;IAsBrB;;;;OAIG;IACG,QAAQ,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA0GtD;;OAEG;IACH,aAAa,CAAE,IAAI,EAAE,kBAAkB;IAavC;;;OAGG;IACG,eAAe,CAAE,IAAI,EAAE,kBAAkB;IAwC/C;;OAEG;IACG,WAAW,CAAE,IAAI,EAAE,kBAAkB;IAuE3C;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAE,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;CASvE;AAED;;GAEG;AACH,eAAO,MAAM,WAAW;;;CAGvB,CAAA;AAED,OAAO,EAAE,OAAO,EAAE,CAAA"}