@libp2p/kad-dht 16.2.6 → 16.2.7
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.
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +3 -3
- package/dist/src/rpc/index.d.ts.map +1 -1
- package/dist/src/rpc/index.js +7 -5
- package/dist/src/rpc/index.js.map +1 -1
- package/package.json +6 -6
- package/src/rpc/index.ts +10 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAA;AAOxD,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAwB,OAAO,EAAE,MAAM,EAAe,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/G,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;CACnE;AAED,MAAM,WAAW,OAAO;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,cAAc,CAAA;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,yBAAyB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,6BAA6B;IACnJ,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAIvB;IAED,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAQ;gBAElC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO;IAmBrD;;OAEG;IACG,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAA;AAOxD,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAwB,OAAO,EAAE,MAAM,EAAe,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/G,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;CACnE;AAED,MAAM,WAAW,OAAO;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,cAAc,CAAA;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,yBAAyB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,6BAA6B;IACnJ,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAIvB;IAED,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAQ;gBAElC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO;IAmBrD;;OAEG;IACG,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAuBhF;;OAEG;IACG,gBAAgB,CAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA4D/E"}
|
package/dist/src/rpc/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TimeoutError } from '@libp2p/interface';
|
|
1
|
+
import { InvalidMessageError, TimeoutError } from '@libp2p/interface';
|
|
2
2
|
import { pbStream } from '@libp2p/utils';
|
|
3
3
|
import { Message, MessageType } from '../message/dht.js';
|
|
4
4
|
import { AddProviderHandler } from "./handlers/add-provider.js";
|
|
@@ -36,8 +36,7 @@ export class RPC {
|
|
|
36
36
|
// get handler & execute it
|
|
37
37
|
const handler = this.handlers[msg.type];
|
|
38
38
|
if (handler == null) {
|
|
39
|
-
|
|
40
|
-
return;
|
|
39
|
+
throw new InvalidMessageError(`No handler found for message type: ${msg.type}`);
|
|
41
40
|
}
|
|
42
41
|
try {
|
|
43
42
|
this.metrics.operations?.increment({
|
|
@@ -45,10 +44,11 @@ export class RPC {
|
|
|
45
44
|
});
|
|
46
45
|
return await handler.handle(peerId, msg);
|
|
47
46
|
}
|
|
48
|
-
catch {
|
|
47
|
+
catch (err) {
|
|
49
48
|
this.metrics.errors?.increment({
|
|
50
49
|
[msg.type]: true
|
|
51
50
|
});
|
|
51
|
+
throw err;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
/**
|
|
@@ -89,7 +89,9 @@ export class RPC {
|
|
|
89
89
|
catch (err) {
|
|
90
90
|
errored = true;
|
|
91
91
|
stopErrorTimer?.();
|
|
92
|
-
|
|
92
|
+
this.log.error('error handling incoming message - %e', err);
|
|
93
|
+
stream.abort(err);
|
|
94
|
+
return;
|
|
93
95
|
}
|
|
94
96
|
finally {
|
|
95
97
|
if (!errored) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AA+BzD,MAAM,OAAO,GAAG;IACG,QAAQ,CAAmC;IAC3C,GAAG,CAAQ;IACX,OAAO,CAIvB;IAEgB,sBAAsB,CAAQ;IAE/C,YAAa,UAAyB,EAAE,IAAa;QACnD,IAAI,CAAC,OAAO,GAAG;YACb,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,IAAI,CAAC,aAAa,6BAA6B,CAAC;YACxG,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,IAAI,CAAC,aAAa,2BAA2B,CAAC;YAClG,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,GAAG,IAAI,CAAC,aAAa,2BAA2B,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;SAC3H,CAAA;QAED,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,SAAS,MAAM,CAAC,CAAA;QAClE,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,IAAI,MAAM,CAAA;QACnE,IAAI,CAAC,QAAQ,GAAG;YACd,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC;YACzE,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC;YACzE,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC;YACzE,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC;YAC/E,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC;YACjF,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC;SACjE,CAAA;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAE,MAAc,EAAE,GAAY;QAC/C,2BAA2B;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEvC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QACjF,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC;gBACjC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI;aACjB,CAAC,CAAA;YAEF,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC;gBAC7B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI;aACjB,CAAC,CAAA;YAEF,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAE,MAAc,EAAE,UAAsB;QAC5D,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC,CAAA;QAClC,CAAC,CAAA;QAED,IAAI,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAC7D,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QAE/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;QAE7C,OAAO,IAAI,EAAE,CAAC;YACZ,yCAAyC;YACzC,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBACrC,MAAM,MAAM,CAAC,KAAK,CAAC;oBACjB,MAAM;iBACP,CAAC,CAAA;gBAEF,MAAK;YACP,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC;gBAClC,MAAM;aACP,CAAC,CAAA;YAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC9E,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC5E,IAAI,OAAO,GAAG,KAAK,CAAA;YAEnB,IAAI,CAAC;gBACH,qBAAqB;gBACrB,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;gBACpE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAEpE,0CAA0C;gBAC1C,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;oBAChB,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE;wBACxB,MAAM;qBACP,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,OAAO,GAAG,IAAI,CAAA;gBACd,cAAc,EAAE,EAAE,CAAA;gBAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAA;gBAC3D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAEjB,OAAM;YACR,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,gBAAgB,EAAE,EAAE,CAAA;gBACtB,CAAC;YACH,CAAC;YAED,gEAAgE;YAChE,mCAAmC;YACnC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;YAClD,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YACzD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QACjD,CAAC;IACH,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/kad-dht",
|
|
3
|
-
"version": "16.2.
|
|
3
|
+
"version": "16.2.7",
|
|
4
4
|
"description": "JavaScript implementation of the Kad-DHT for libp2p",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/kad-dht#readme",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@libp2p/crypto": "^5.1.18",
|
|
52
52
|
"@libp2p/interface": "^3.2.2",
|
|
53
|
-
"@libp2p/interface-internal": "^3.1.
|
|
54
|
-
"@libp2p/peer-collections": "^7.0.
|
|
53
|
+
"@libp2p/interface-internal": "^3.1.5",
|
|
54
|
+
"@libp2p/peer-collections": "^7.0.20",
|
|
55
55
|
"@libp2p/peer-id": "^6.0.9",
|
|
56
|
-
"@libp2p/ping": "^3.1.
|
|
56
|
+
"@libp2p/ping": "^3.1.5",
|
|
57
57
|
"@libp2p/record": "^4.0.12",
|
|
58
|
-
"@libp2p/utils": "^7.2.
|
|
58
|
+
"@libp2p/utils": "^7.2.1",
|
|
59
59
|
"@multiformats/multiaddr": "^13.0.1",
|
|
60
60
|
"@multiformats/multiaddr-matcher": "^3.0.1",
|
|
61
61
|
"any-signal": "^4.1.1",
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
},
|
|
83
83
|
"devDependencies": {
|
|
84
84
|
"@libp2p/logger": "^6.2.7",
|
|
85
|
-
"@libp2p/peer-store": "^12.0.
|
|
85
|
+
"@libp2p/peer-store": "^12.0.20",
|
|
86
86
|
"@types/lodash.random": "^3.2.9",
|
|
87
87
|
"@types/lodash.range": "^3.2.9",
|
|
88
88
|
"@types/sinon": "^21.0.1",
|
package/src/rpc/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TimeoutError } from '@libp2p/interface'
|
|
1
|
+
import { InvalidMessageError, TimeoutError } from '@libp2p/interface'
|
|
2
2
|
import { pbStream } from '@libp2p/utils'
|
|
3
3
|
import { Message, MessageType } from '../message/dht.js'
|
|
4
4
|
import { AddProviderHandler } from './handlers/add-provider.ts'
|
|
@@ -75,8 +75,7 @@ export class RPC {
|
|
|
75
75
|
const handler = this.handlers[msg.type]
|
|
76
76
|
|
|
77
77
|
if (handler == null) {
|
|
78
|
-
|
|
79
|
-
return
|
|
78
|
+
throw new InvalidMessageError(`No handler found for message type: ${msg.type}`)
|
|
80
79
|
}
|
|
81
80
|
|
|
82
81
|
try {
|
|
@@ -85,10 +84,12 @@ export class RPC {
|
|
|
85
84
|
})
|
|
86
85
|
|
|
87
86
|
return await handler.handle(peerId, msg)
|
|
88
|
-
} catch {
|
|
87
|
+
} catch (err) {
|
|
89
88
|
this.metrics.errors?.increment({
|
|
90
89
|
[msg.type]: true
|
|
91
90
|
})
|
|
91
|
+
|
|
92
|
+
throw err
|
|
92
93
|
}
|
|
93
94
|
}
|
|
94
95
|
|
|
@@ -134,11 +135,14 @@ export class RPC {
|
|
|
134
135
|
signal
|
|
135
136
|
})
|
|
136
137
|
}
|
|
137
|
-
} catch (err) {
|
|
138
|
+
} catch (err: any) {
|
|
138
139
|
errored = true
|
|
139
140
|
stopErrorTimer?.()
|
|
140
141
|
|
|
141
|
-
|
|
142
|
+
this.log.error('error handling incoming message - %e', err)
|
|
143
|
+
stream.abort(err)
|
|
144
|
+
|
|
145
|
+
return
|
|
142
146
|
} finally {
|
|
143
147
|
if (!errored) {
|
|
144
148
|
stopSuccessTimer?.()
|