npm - @libp2p/fetch - Versions diffs - 3.0.21 → 3.0.22-0f07e3df5 - Mend

@libp2p/fetch 3.0.21 → 3.0.22-0f07e3df5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/src/fetch.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { Fetch as FetchInterface, FetchComponents, FetchInit, LookupFunction } from './index.js';
-import type { AbortOptions, PeerId, Startable, IncomingStreamData } from '@libp2p/interface';
+import type { AbortOptions, Stream, PeerId, Startable } from '@libp2p/interface';
 /**
  * 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
@@ -12,7 +12,6 @@ export declare class Fetch implements Startable, FetchInterface {
     private readonly lookupFunctions;
     private started;
     private readonly init;
-    private readonly log;
     constructor(components: FetchComponents, init?: FetchInit);
     readonly [Symbol.toStringTag] = "@libp2p/fetch";
     start(): Promise<void>;
@@ -27,7 +26,7 @@ export declare class Fetch implements Startable, FetchInterface {
      * responds based on looking up the key in the request via the lookup callback that corresponds
      * to the key's prefix.
      */
-    handleMessage(data: IncomingStreamData): Promise<void>;
+    handleMessage(stream: Stream): Promise<void>;
     /**
      * Given a key, finds the appropriate function for looking up its corresponding value, based on
      * the key's prefix.

package/dist/src/fetch.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,IAAI,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACrG,OAAO,KAAK,EAAE,YAAY,~~EAAkB~~,MAAM,EAAE,~~SAAS~~,EAAE,~~kBAAkB~~,EAAE,MAAM,mBAAmB,CAAA;~~AAI5G~~;;;;;GAKG;AACH,qBAAa,KAAM,YAAW,SAAS,EAAE,cAAc;IACrD,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;~~IAChC~~,~~OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,~~UAAU,EAAE,eAAe,EAAE,IAAI,GAAE,SAAc;IAU9D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAkB;IAEzC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;~~IAgBvB~~,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACG,KAAK,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;~~IAyEjH~~;;;;OAIG;IACG,aAAa,CAAE,~~IAAI~~,EAAE,~~kBAAkB~~,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAoD7D~~;;;OAGG;IACH,kBAAkB,CAAE,GAAG,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,cAAc,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAepF;;;;;;;;;;OAUG;IACH,sBAAsB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI;IAQrE;;;;;;;;;;OAUG;IACH,wBAAwB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI;CAWzE"}
1	+ {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,IAAI,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACrG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAIhF;;;;;GAKG;AACH,qBAAa,KAAM,YAAW,SAAS,EAAE,cAAc;IACrD,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;gBAEnB,UAAU,EAAE,eAAe,EAAE,IAAI,GAAE,SAAc;IAU9D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAkB;IAEzC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAQvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACG,KAAK,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA4DjH;;;;OAIG;IACG,aAAa,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CnD;;;OAGG;IACH,kBAAkB,CAAE,GAAG,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,cAAc,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAepF;;;;;;;;;;OAUG;IACH,sBAAsB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI;IAQrE;;;;;;;;;;OAUG;IACH,wBAAwB,CAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI;CAWzE"}

package/dist/src/fetch.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import { AbortError, InvalidMessageError, InvalidParametersError, ProtocolError } from '@libp2p/interface';
-import { pbStream } from 'it-protobuf-stream';
+import { InvalidMessageError, InvalidParametersError, ProtocolError } from '@libp2p/interface';
+import { pbStream } from '@libp2p/utils';
 import { setMaxListeners } from 'main-event';
 import { fromString as uint8arrayFromString } from 'uint8arrays/from-string';
 import { toString as uint8arrayToString } from 'uint8arrays/to-string';
 import { PROTOCOL_NAME, PROTOCOL_VERSION } from './constants.js';
 import { FetchRequest, FetchResponse } from './pb/proto.js';
-const DEFAULT_TIMEOUT = 10000;
+const DEFAULT_TIMEOUT = 10_000;
 /**
  * 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
@@ -18,27 +18,17 @@ export class Fetch {
     lookupFunctions;
     started;
     init;
-    log;
     constructor(components, init = {}) {
-        this.log = components.logger.forComponent('libp2p:fetch');
         this.started = false;
         this.components = components;
         this.protocol = `/${init.protocolPrefix ?? 'libp2p'}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`;
         this.lookupFunctions = new Map(); // Maps key prefix to value lookup function
-        this.handleMessage = this.handleMessage.bind(this);
         this.init = init;
+        this.handleMessage = this.handleMessage.bind(this);
     }
     [Symbol.toStringTag] = '@libp2p/fetch';
     async start() {
-        await this.components.registrar.handle(this.protocol, (data) => {
-            void this.handleMessage(data)
-                .then(async () => {
-                await data.stream.close();
-            })
-                .catch(err => {
-                this.log.error('error handling message - %e', err);
-            });
-        }, {
+        await this.components.registrar.handle(this.protocol, this.handleMessage, {
             maxInboundStreams: this.init.maxInboundStreams,
             maxOutboundStreams: this.init.maxOutboundStreams
         });
@@ -58,50 +48,44 @@ export class Fetch {
         if (typeof key === 'string') {
             key = uint8arrayFromString(key);
         }
-        this.log.trace('dialing %s to %p', this.protocol, peer);
-        const connection = await this.components.connectionManager.openConnection(peer, options);
-        let signal = options.signal;
-        let stream;
-        let onAbort = () => { };
         // create a timeout if no abort signal passed
-        if (signal == null) {
+        if (options.signal == null) {
             const timeout = this.init.timeout ?? DEFAULT_TIMEOUT;
-            this.log.trace('using default timeout of %d ms', timeout);
-            signal = AbortSignal.timeout(timeout);
+            const signal = AbortSignal.timeout(timeout);
             setMaxListeners(Infinity, signal);
-        }
-        try {
-            stream = await connection.newStream(this.protocol, {
+            options = {
+                ...options,
                 signal
-            });
-            onAbort = () => {
-                stream?.abort(new AbortError());
             };
-            // make stream abortable
-            signal.addEventListener('abort', onAbort, { once: true });
-            this.log.trace('fetch %m', key);
+        }
+        let stream;
+        try {
+            const connection = await this.components.connectionManager.openConnection(peer, options);
+            stream = await connection.newStream(this.protocol, options);
+            const log = stream.log.newScope('fetch');
+            log.trace('fetch %m', key);
             const pb = pbStream(stream);
             await pb.write({
                 identifier: key
             }, FetchRequest, options);
             const response = await pb.read(FetchResponse, options);
-            await pb.unwrap().close(options);
+            await stream.close(options);
             switch (response.status) {
                 case (FetchResponse.StatusCode.OK): {
-                    this.log.trace('received status OK for %m', key);
+                    log.trace('received status OK for %m', key);
                     return response.data;
                 }
                 case (FetchResponse.StatusCode.NOT_FOUND): {
-                    this.log('received status NOT_FOUND for %m', key);
+                    log('received status NOT_FOUND for %m', key);
                     return;
                 }
                 case (FetchResponse.StatusCode.ERROR): {
-                    this.log('received status ERROR for %m', key);
+                    log('received status ERROR for %m', key);
                     const errMsg = uint8arrayToString(response.data);
                     throw new ProtocolError('Error in fetch protocol response: ' + errMsg);
                 }
                 default: {
-                    this.log('received status unknown for %m', key);
+                    log('received status unknown for %m', key);
                     throw new InvalidMessageError('Unknown response status');
                 }
             }
@@ -110,64 +94,52 @@ export class Fetch {
             stream?.abort(err);
             throw err;
         }
-        finally {
-            signal.removeEventListener('abort', onAbort);
-            if (stream != null) {
-                await stream.close();
-            }
-        }
     }
     /**
      * 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;
+    async handleMessage(stream) {
+        const log = stream.log.newScope('fetch');
         const signal = AbortSignal.timeout(this.init.timeout ?? DEFAULT_TIMEOUT);
-        try {
-            const pb = pbStream(stream);
-            const request = await pb.read(FetchRequest, {
-                signal
-            });
-            let response;
-            const key = uint8arrayToString(request.identifier);
-            const lookup = this._getLookupFunction(key);
-            if (lookup == null) {
-                this.log.trace('sending status ERROR for %m', request.identifier);
-                const errMsg = uint8arrayFromString('No lookup function registered for key');
-                response = { status: FetchResponse.StatusCode.ERROR, data: errMsg };
-            }
-            else {
-                this.log.trace('lookup data with identifier %s', lookup.prefix);
-                try {
-                    const data = await lookup.fn(request.identifier);
-                    if (data == null) {
-                        this.log.trace('sending status NOT_FOUND for %m', request.identifier);
-                        response = { status: FetchResponse.StatusCode.NOT_FOUND, data: new Uint8Array(0) };
-                    }
-                    else {
-                        this.log.trace('sending status OK for %m', request.identifier);
-                        response = { status: FetchResponse.StatusCode.OK, data };
-                    }
+        const pb = pbStream(stream);
+        const request = await pb.read(FetchRequest, {
+            signal
+        });
+        let response;
+        const key = uint8arrayToString(request.identifier);
+        const lookup = this._getLookupFunction(key);
+        if (lookup == null) {
+            log.trace('sending status ERROR for %m', request.identifier);
+            const errMsg = uint8arrayFromString('No lookup function registered for key');
+            response = { status: FetchResponse.StatusCode.ERROR, data: errMsg };
+        }
+        else {
+            log.trace('lookup data with identifier %s', lookup.prefix);
+            try {
+                const data = await lookup.fn(request.identifier);
+                if (data == null) {
+                    log.trace('sending status NOT_FOUND for %m', request.identifier);
+                    response = { status: FetchResponse.StatusCode.NOT_FOUND, data: new Uint8Array(0) };
                 }
-                catch (err) {
-                    this.log.error('error during lookup of %m - %e', request.identifier, err);
-                    const errMsg = uint8arrayFromString(err.message);
-                    response = { status: FetchResponse.StatusCode.ERROR, data: errMsg };
+                else {
+                    log.trace('sending status OK for %m', request.identifier);
+                    response = { status: FetchResponse.StatusCode.OK, data };
                 }
             }
-            await pb.write(response, FetchResponse, {
-                signal
-            });
-            await pb.unwrap().close({
-                signal
-            });
-        }
-        catch (err) {
-            this.log.error('error answering fetch request - %e', err);
-            stream.abort(err);
+            catch (err) {
+                log.error('error during lookup of %m - %e', request.identifier, err);
+                const errMsg = uint8arrayFromString(err.message);
+                response = { status: FetchResponse.StatusCode.ERROR, data: errMsg };
+            }
         }
+        await pb.write(response, FetchResponse, {
+            signal
+        });
+        await stream.close({
+            signal
+        });
     }
     /**
      * Given a key, finds the appropriate function for looking up its corresponding value, based on

package/dist/src/fetch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~UAAU,EAAE,~~mBAAmB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;~~AAC1G~~,OAAO,EAAE,QAAQ,EAAE,MAAM,~~oBAAoB~~,CAAA;~~AAC7C~~,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAI3D,MAAM,eAAe,GAAG,~~KAAK~~,CAAA;~~AAE7B~~;;;;;GAKG;AACH,MAAM,OAAO,KAAK;IACA,QAAQ,CAAQ;IACf,UAAU,CAAiB;IAC3B,eAAe,CAA6B;IACrD,OAAO,CAAS;IACP,IAAI,CAAW;~~IACf~~,~~GAAG,CAAQ;IAE5B,~~YAAa,UAA2B,EAAE,OAAkB,EAAE;QAC5D,IAAI,CAAC,~~GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;QACzD,IAAI,CAAC,~~OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAA;QAC1F,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,2CAA2C;QAC5E,IAAI,CAAC,~~aAAa~~,GAAG,IAAI,CAAC,aAAa,~~CAAC~~,IAAI,CAAC,~~IAAI~~,CAAC,~~CAAA;QAClD,~~IAAI,CAAC,IAAI,~~GAAG~~,~~IAAI,~~CAAA;~~IAClB~~,CAAC;IAEQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,eAAe,CAAA;IAE/C,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,~~CAAC,~~IAAI,~~EAAE,EAAE;YAC7D,KAAK,IAAI,~~CAAC,aAAa,~~CAAC,IAAI,CAAC;iBAC1B,IAAI,CAAC,KAAK,IAAI,~~EAAE;~~gBACf~~,~~MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;YACpD,CAAC,CAAC,CAAA;QACN,CAAC,EAAE;YACD,~~iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAC9C,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;SACjD,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAE,IAAY,EAAE,GAAwB,EAAE,UAAwB,EAAE;QAC7E,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAA;QACjC,CAAC;QAED,IAAI,~~CAAC~~,~~GAAG,~~CAAC,~~KAAK~~,~~CAAC~~,~~kBAAkB,EAAE,~~IAAI,~~CAAC,QAAQ,~~EAAE,~~IAAI,~~CAAC~~,CAAA~~;~~QAEvD~~,MAAM,~~UAAU~~,GAAG,~~MAAM,~~IAAI,CAAC,~~UAAU~~,CAAC,~~iBAAiB~~,~~CAAC,cAAc,CAAC,~~IAAI,~~EAAE~~,~~OAAO,CAAC,~~CAAA;~~QACxF~~,~~IAAI~~,MAAM,GAAG,~~OAAO~~,CAAC,~~MAAM~~,~~CAAA;QAC3B~~,~~IAAI~~,~~MAA0B~~,CAAA;~~QAC9B~~,~~IAAI~~,~~OAAO~~,~~GAAG~~,~~GAAS,~~EAAE,~~GAAE~~,CAAC,CAAA;~~QAE5B~~,~~6CAA6C~~;~~QAC7C~~,~~IAAI~~,~~MAAM,IAAI,IAAI,EAAE,CAAC~~;~~YACnB~~,MAAM,~~OAAO~~,~~GAAG,IAAI,~~CAAC,IAAI,~~CAAC~~,~~OAAO,IAAI,eAAe,~~CAAA;~~YACpD~~,IAAI,CAAC,~~GAAG~~,~~CAAC~~,~~KAAK~~,~~CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAA;YACzD,~~MAAM,~~GAAG~~,~~WAAW,~~CAAC,~~OAAO~~,CAAC,~~OAAO~~,CAAC,~~CAAA;YAErC~~,~~eAAe,~~CAAC,~~QAAQ~~,EAAE,~~MAAM~~,CAAC,CAAA;~~QACnC~~,~~CAAC;QAED,IAAI,CAAC;YACH,~~MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE~~;gBACjD~~,~~MAAM;aACP~~,CAAC,CAAA;~~YAEF~~,~~OAAO~~,GAAG,GAAG,~~EAAE;gBACb,~~MAAM,~~EAAE,KAAK,~~CAAC,~~IAAI~~,~~UAAU,EAAE,~~CAAC,~~CAAA;YACjC~~,CAAC,~~CAAA;YAED,wBAAwB;YACxB,MAAM,CAAC,gBAAgB,CAAC,~~OAAO,~~EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,~~CAAC,CAAA;~~YAEzD~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;~~YAE/B~~,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC3B,MAAM,EAAE,CAAC,KAAK,CAAC;gBACb,UAAU,EAAE,GAAG;aAChB,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA;YAEzB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;~~YACtD~~,MAAM,~~EAAE,CAAC,~~MAAM,~~EAAE,~~CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;~~YAEhC~~,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACxB,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;oBACnC,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;~~oBAChD~~,OAAO,QAAQ,CAAC,IAAI,CAAA;gBACtB,CAAC;gBACD,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC1C,~~IAAI,CAAC,~~GAAG,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAA;~~oBACjD~~,OAAM;gBACR,CAAC;gBACD,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACtC,~~IAAI,CAAC,~~GAAG,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAA;~~oBAC7C~~,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBAChD,MAAM,IAAI,aAAa,CAAC,oCAAoC,GAAG,MAAM,CAAC,CAAA;gBACxE,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,~~IAAI,CAAC,~~GAAG,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAA;~~oBAC/C~~,MAAM,IAAI,mBAAmB,CAAC,yBAAyB,CAAC,CAAA;gBAC1D,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,MAAM,GAAG,CAAA;QACX,CAAC;~~gBAAS,CAAC;YACT,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC5C,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;YACtB,CAAC;QACH,CAAC;~~IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAE,~~IAAwB~~;~~QAC3C~~,MAAM,~~EAAE~~,MAAM,~~EAAE~~,GAAG,~~IAAI~~,CAAA;~~QACvB~~,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,eAAe,CAAC,CAAA;QAExE,~~IAAI,CAAC;YACH,~~MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;~~YAC3B~~,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE;~~gBAC1C~~,MAAM;~~aACP~~,CAAC,CAAA;~~YAEF~~,IAAI,QAAuB,CAAA;~~YAC3B~~,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;~~YAElD~~,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;~~YAE3C~~,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;~~gBACnB~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;~~gBACjE~~,MAAM,MAAM,GAAG,oBAAoB,CAAC,uCAAuC,CAAC,CAAA;~~gBAC5E~~,QAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;~~YACrE~~,CAAC;~~iBAAM~~,CAAC;~~gBACN~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;~~gBAE/D~~,IAAI,CAAC;~~oBACH~~,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;~~oBAEhD~~,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;~~wBACjB~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;~~wBACrE~~,QAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;~~oBACpF~~,CAAC;~~yBAAM~~,CAAC;~~wBACN~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;~~wBAC9D~~,QAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,CAAA;~~oBAC1D~~,CAAC;~~gBACH~~,CAAC;~~gBAAC~~,OAAO,GAAQ,EAAE,CAAC;~~oBAClB~~,~~IAAI,CAAC,~~GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;~~oBACzE~~,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;~~oBAChD~~,QAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;~~gBACrE~~,CAAC;~~YACH~~,CAAC;~~YAED~~,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE;~~gBACtC~~,MAAM;~~aACP~~,CAAC,CAAA;~~YAEF~~,MAAM,~~EAAE,CAAC,~~MAAM,~~EAAE,~~CAAC,KAAK,CAAC;~~gBACtB~~,MAAM;~~aACP~~,CAAC,CAAA;~~QACJ~~,CAAC;~~QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAA;YACzD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;~~IAED;;;OAGG;IACH,kBAAkB,CAAE,GAAW;QAC7B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAE3C,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;oBACf,OAAO;wBACL,EAAE;wBACF,MAAM;qBACP,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACH,sBAAsB,CAAE,MAAc,EAAE,MAAsB;QAC5D,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,sBAAsB,CAAC,0CAA0C,MAAM,sBAAsB,CAAC,CAAA;QAC1G,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED;;;;;;;;;;OAUG;IACH,wBAAwB,CAAE,MAAc,EAAE,MAAuB;QAC/D,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAEvD,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC9B,OAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;CACF"}
1	+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts CHANGED Viewed

@@ -41,7 +41,7 @@
  * })
  * ```
  */
-import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface';
+import type { AbortOptions, PeerId } from '@libp2p/interface';
 import type { ConnectionManager, Registrar } from '@libp2p/interface-internal';
 export interface FetchInit {
     protocolPrefix?: string;
@@ -65,7 +65,6 @@ export interface LookupFunction {
 export interface FetchComponents {
     registrar: Registrar;
     connectionManager: ConnectionManager;
-    logger: ComponentLogger;
 }
 export interface Fetch {
     /**

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

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,~~eAAe,EAAE,~~MAAM,EAAE,MAAM,mBAAmB,CAAA;~~AAC9E~~,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAE9E,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;~~IACpC,MAAM,EAAE,eAAe,CAAA~~;~~CACxB;~~AAED,MAAM,WAAW,KAAK;IACpB;;OAEG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;IAEtG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;IAEpE;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CACxE;AAED,wBAAgB,KAAK,CAAE,IAAI,GAAE,SAAc,GAAG,CAAC,UAAU,EAAE,eAAe,KAAK,KAAK,CAEnF"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAE9E,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;CACrC;AAED,MAAM,WAAW,KAAK;IACpB;;OAEG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;IAEtG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;IAEpE;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CACxE;AAED,wBAAgB,KAAK,CAAE,IAAI,GAAE,SAAc,GAAG,CAAC,UAAU,EAAE,eAAe,KAAK,KAAK,CAEnF"}

package/dist/src/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,YAAY,CAAA;~~AAiEhD~~,MAAM,UAAU,KAAK,CAAE,OAAkB,EAAE;IACzC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACzD,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,YAAY,CAAA;AAgEhD,MAAM,UAAU,KAAK,CAAE,OAAkB,EAAE;IACzC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACzD,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/fetch",
-  "version": "3.0.21",
+  "version": "3.0.22-0f07e3df5",
   "description": "Implementation of the Fetch Protocol",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/protocol-fetch#readme",
@@ -45,22 +45,20 @@
     "doc-check": "aegir doc-check"
   },
   "dependencies": {
-    "@libp2p/interface": "^2.10.5",
-    "@libp2p/interface-internal": "^2.3.18",
-    "it-protobuf-stream": "^2.0.2",
+    "@libp2p/interface": "2.11.0-0f07e3df5",
+    "@libp2p/interface-internal": "2.3.19-0f07e3df5",
+    "@libp2p/utils": "6.7.2-0f07e3df5",
     "main-event": "^1.0.1",
-    "protons-runtime": "^5.5.0",
+    "protons-runtime": "^5.6.0",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/crypto": "^5.1.7",
-    "@libp2p/logger": "^5.1.21",
-    "@libp2p/peer-id": "^5.1.8",
-    "aegir": "^47.0.14",
-    "it-pair": "^2.0.6",
-    "protons": "^7.6.1",
-    "sinon": "^20.0.0",
+    "@libp2p/crypto": "5.1.8-0f07e3df5",
+    "@libp2p/peer-id": "5.1.9-0f07e3df5",
+    "aegir": "^47.0.21",
+    "protons": "^7.7.0",
+    "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0"
   },
   "sideEffects": false

package/src/fetch.ts CHANGED Viewed

@@ -1,14 +1,14 @@
-import { AbortError, InvalidMessageError, InvalidParametersError, ProtocolError } from '@libp2p/interface'
-import { pbStream } from 'it-protobuf-stream'
+import { InvalidMessageError, InvalidParametersError, ProtocolError } from '@libp2p/interface'
+import { pbStream } from '@libp2p/utils'
 import { setMaxListeners } from 'main-event'
 import { fromString as uint8arrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8arrayToString } from 'uint8arrays/to-string'
 import { PROTOCOL_NAME, PROTOCOL_VERSION } from './constants.js'
 import { FetchRequest, FetchResponse } from './pb/proto.js'
 import type { Fetch as FetchInterface, FetchComponents, FetchInit, LookupFunction } from './index.js'
-import type { AbortOptions, Logger, Stream, PeerId, Startable, IncomingStreamData } from '@libp2p/interface'
+import type { AbortOptions, Stream, PeerId, Startable } from '@libp2p/interface'
-const DEFAULT_TIMEOUT = 10000
+const DEFAULT_TIMEOUT = 10_000
 /**
  * A simple libp2p protocol for requesting a value corresponding to a key from a peer.
@@ -22,30 +22,21 @@ export class Fetch implements Startable, FetchInterface {
   private readonly lookupFunctions: Map<string, LookupFunction>
   private started: boolean
   private readonly init: FetchInit
-  private readonly log: Logger
   constructor (components: FetchComponents, init: FetchInit = {}) {
-    this.log = components.logger.forComponent('libp2p:fetch')
     this.started = false
     this.components = components
     this.protocol = `/${init.protocolPrefix ?? 'libp2p'}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`
     this.lookupFunctions = new Map() // Maps key prefix to value lookup function
-    this.handleMessage = this.handleMessage.bind(this)
     this.init = init
+    this.handleMessage = this.handleMessage.bind(this)
   }
   readonly [Symbol.toStringTag] = '@libp2p/fetch'
   async start (): Promise<void> {
-    await this.components.registrar.handle(this.protocol, (data) => {
-      void this.handleMessage(data)
-        .then(async () => {
-          await data.stream.close()
-        })
-        .catch(err => {
-          this.log.error('error handling message - %e', err)
-        })
-    }, {
+    await this.components.registrar.handle(this.protocol, this.handleMessage, {
       maxInboundStreams: this.init.maxInboundStreams,
       maxOutboundStreams: this.init.maxOutboundStreams
     })
@@ -69,35 +60,26 @@ export class Fetch implements Startable, FetchInterface {
       key = uint8arrayFromString(key)
     }
-    this.log.trace('dialing %s to %p', this.protocol, peer)
-    const connection = await this.components.connectionManager.openConnection(peer, options)
-    let signal = options.signal
-    let stream: Stream | undefined
-    let onAbort = (): void => {}
     // create a timeout if no abort signal passed
-    if (signal == null) {
+    if (options.signal == null) {
       const timeout = this.init.timeout ?? DEFAULT_TIMEOUT
-      this.log.trace('using default timeout of %d ms', timeout)
-      signal = AbortSignal.timeout(timeout)
+      const signal = AbortSignal.timeout(timeout)
       setMaxListeners(Infinity, signal)
-    }
-    try {
-      stream = await connection.newStream(this.protocol, {
+      options = {
+        ...options,
         signal
-      })
-      onAbort = () => {
-        stream?.abort(new AbortError())
       }
+    }
+    let stream: Stream | undefined
-      // make stream abortable
-      signal.addEventListener('abort', onAbort, { once: true })
+    try {
+      const connection = await this.components.connectionManager.openConnection(peer, options)
+      stream = await connection.newStream(this.protocol, options)
-      this.log.trace('fetch %m', key)
+      const log = stream.log.newScope('fetch')
+      log.trace('fetch %m', key)
       const pb = pbStream(stream)
       await pb.write({
@@ -105,35 +87,31 @@ export class Fetch implements Startable, FetchInterface {
       }, FetchRequest, options)
       const response = await pb.read(FetchResponse, options)
-      await pb.unwrap().close(options)
+      await stream.close(options)
       switch (response.status) {
         case (FetchResponse.StatusCode.OK): {
-          this.log.trace('received status OK for %m', key)
+          log.trace('received status OK for %m', key)
           return response.data
         }
         case (FetchResponse.StatusCode.NOT_FOUND): {
-          this.log('received status NOT_FOUND for %m', key)
+          log('received status NOT_FOUND for %m', key)
           return
         }
         case (FetchResponse.StatusCode.ERROR): {
-          this.log('received status ERROR for %m', key)
+          log('received status ERROR for %m', key)
           const errMsg = uint8arrayToString(response.data)
           throw new ProtocolError('Error in fetch protocol response: ' + errMsg)
         }
         default: {
-          this.log('received status unknown for %m', key)
+          log('received status unknown for %m', key)
           throw new InvalidMessageError('Unknown response status')
         }
       }
     } catch (err: any) {
       stream?.abort(err)
       throw err
-    } finally {
-      signal.removeEventListener('abort', onAbort)
-      if (stream != null) {
-        await stream.close()
-      }
     }
   }
@@ -142,56 +120,51 @@ export class Fetch implements Startable, FetchInterface {
    * responds based on looking up the key in the request via the lookup callback that corresponds
    * to the key's prefix.
    */
-  async handleMessage (data: IncomingStreamData): Promise<void> {
-    const { stream } = data
+  async handleMessage (stream: Stream): Promise<void> {
+    const log = stream.log.newScope('fetch')
     const signal = AbortSignal.timeout(this.init.timeout ?? DEFAULT_TIMEOUT)
-    try {
-      const pb = pbStream(stream)
-      const request = await pb.read(FetchRequest, {
-        signal
-      })
+    const pb = pbStream(stream)
+    const request = await pb.read(FetchRequest, {
+      signal
+    })
-      let response: FetchResponse
-      const key = uint8arrayToString(request.identifier)
+    let response: FetchResponse
+    const key = uint8arrayToString(request.identifier)
-      const lookup = this._getLookupFunction(key)
+    const lookup = this._getLookupFunction(key)
-      if (lookup == null) {
-        this.log.trace('sending status ERROR for %m', request.identifier)
-        const errMsg = uint8arrayFromString('No lookup function registered for key')
-        response = { status: FetchResponse.StatusCode.ERROR, data: errMsg }
-      } else {
-        this.log.trace('lookup data with identifier %s', lookup.prefix)
-        try {
-          const data = await lookup.fn(request.identifier)
-          if (data == null) {
-            this.log.trace('sending status NOT_FOUND for %m', request.identifier)
-            response = { status: FetchResponse.StatusCode.NOT_FOUND, data: new Uint8Array(0) }
-          } else {
-            this.log.trace('sending status OK for %m', request.identifier)
-            response = { status: FetchResponse.StatusCode.OK, data }
-          }
-        } catch (err: any) {
-          this.log.error('error during lookup of %m - %e', request.identifier, err)
-          const errMsg = uint8arrayFromString(err.message)
-          response = { status: FetchResponse.StatusCode.ERROR, data: errMsg }
+    if (lookup == null) {
+      log.trace('sending status ERROR for %m', request.identifier)
+      const errMsg = uint8arrayFromString('No lookup function registered for key')
+      response = { status: FetchResponse.StatusCode.ERROR, data: errMsg }
+    } else {
+      log.trace('lookup data with identifier %s', lookup.prefix)
+      try {
+        const data = await lookup.fn(request.identifier)
+        if (data == null) {
+          log.trace('sending status NOT_FOUND for %m', request.identifier)
+          response = { status: FetchResponse.StatusCode.NOT_FOUND, data: new Uint8Array(0) }
+        } else {
+          log.trace('sending status OK for %m', request.identifier)
+          response = { status: FetchResponse.StatusCode.OK, data }
         }
+      } catch (err: any) {
+        log.error('error during lookup of %m - %e', request.identifier, err)
+        const errMsg = uint8arrayFromString(err.message)
+        response = { status: FetchResponse.StatusCode.ERROR, data: errMsg }
       }
+    }
-      await pb.write(response, FetchResponse, {
-        signal
-      })
+    await pb.write(response, FetchResponse, {
+      signal
+    })
-      await pb.unwrap().close({
-        signal
-      })
-    } catch (err: any) {
-      this.log.error('error answering fetch request - %e', err)
-      stream.abort(err)
-    }
+    await stream.close({
+      signal
+    })
   }
   /**

package/src/index.ts CHANGED Viewed

@@ -43,7 +43,7 @@
  */
 import { Fetch as FetchClass } from './fetch.js'
-import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface'
+import type { AbortOptions, PeerId } from '@libp2p/interface'
 import type { ConnectionManager, Registrar } from '@libp2p/interface-internal'
 export interface FetchInit {
@@ -71,7 +71,6 @@ export interface LookupFunction {
 export interface FetchComponents {
   registrar: Registrar
   connectionManager: ConnectionManager
-  logger: ComponentLogger
 }
 export interface Fetch {

package/dist/typedoc-urls.json DELETED Viewed

@@ -1,12 +0,0 @@
-{
-  "Fetch": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.Fetch.html",
-  ".:Fetch": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.Fetch.html",
-  "FetchComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.FetchComponents.html",
-  ".:FetchComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.FetchComponents.html",
-  "FetchInit": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.FetchInit.html",
-  ".:FetchInit": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.FetchInit.html",
-  "LookupFunction": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.LookupFunction.html",
-  ".:LookupFunction": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_fetch.LookupFunction.html",
-  "fetch": "https://libp2p.github.io/js-libp2p/functions/_libp2p_fetch.fetch.html",
-  ".:fetch": "https://libp2p.github.io/js-libp2p/functions/_libp2p_fetch.fetch.html"
-}