@libp2p/mdns 11.0.47 → 12.0.0-55b7e5fea
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 +7 -8
- package/dist/index.min.js.map +4 -4
- package/dist/src/query.js +5 -5
- package/dist/src/query.js.map +1 -1
- package/package.json +12 -11
- package/src/query.ts +5 -5
- package/dist/typedoc-urls.json +0 -6
package/dist/src/query.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { peerIdFromString } from '@libp2p/peer-id';
|
|
2
|
-
import { isPrivate } from '@libp2p/utils
|
|
3
|
-
import {
|
|
2
|
+
import { isPrivate } from '@libp2p/utils';
|
|
3
|
+
import { CODE_P2P, multiaddr } from '@multiformats/multiaddr';
|
|
4
4
|
export function queryLAN(mdns, serviceTag, interval, options) {
|
|
5
5
|
const query = () => {
|
|
6
6
|
options?.log.trace('query', serviceTag);
|
|
@@ -56,14 +56,14 @@ export function gotResponse(rsp, localPeerName, serviceTag, options) {
|
|
|
56
56
|
.map((answerData) => {
|
|
57
57
|
return multiaddr(answerData.toString().substring('dnsaddr='.length));
|
|
58
58
|
});
|
|
59
|
-
const peerId = multiaddrs[0].
|
|
59
|
+
const peerId = multiaddrs[0].getComponents().findLast(c => c.code === CODE_P2P)?.value;
|
|
60
60
|
if (peerId == null) {
|
|
61
61
|
throw new Error("Multiaddr doesn't contain PeerId");
|
|
62
62
|
}
|
|
63
63
|
options?.log('peer found %p', peerId);
|
|
64
64
|
return {
|
|
65
65
|
id: peerIdFromString(peerId),
|
|
66
|
-
multiaddrs: multiaddrs.map(addr => addr.decapsulateCode(
|
|
66
|
+
multiaddrs: multiaddrs.map(addr => addr.decapsulateCode(CODE_P2P))
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
catch (e) {
|
|
@@ -100,7 +100,7 @@ export function gotQuery(qry, mdns, peerName, multiaddrs, serviceTag, broadcast,
|
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
// spec mandates multiaddr contains peer id
|
|
103
|
-
if (addr.
|
|
103
|
+
if (addr.getComponents().findLast(c => c.code === CODE_P2P)?.value == null) {
|
|
104
104
|
options?.log('multiaddr %a did not have a peer ID so cannot be used in mDNS query response', addr);
|
|
105
105
|
return;
|
|
106
106
|
}
|
package/dist/src/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/mdns",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0-55b7e5fea",
|
|
4
4
|
"description": "Node.js libp2p mDNS discovery implementation for peer discovery",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/peer-discovery-mdns#readme",
|
|
@@ -43,22 +43,23 @@
|
|
|
43
43
|
"test:electron-main": "aegir test -t electron-main"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@libp2p/interface": "
|
|
47
|
-
"@libp2p/interface-internal": "
|
|
48
|
-
"@libp2p/peer-id": "
|
|
49
|
-
"@libp2p/utils": "
|
|
50
|
-
"@multiformats/multiaddr": "^
|
|
46
|
+
"@libp2p/interface": "3.0.0-55b7e5fea",
|
|
47
|
+
"@libp2p/interface-internal": "3.0.0-55b7e5fea",
|
|
48
|
+
"@libp2p/peer-id": "6.0.0-55b7e5fea",
|
|
49
|
+
"@libp2p/utils": "7.0.0-55b7e5fea",
|
|
50
|
+
"@multiformats/multiaddr": "^13.0.1",
|
|
51
51
|
"@types/multicast-dns": "^7.2.4",
|
|
52
52
|
"dns-packet": "^5.6.1",
|
|
53
53
|
"main-event": "^1.0.1",
|
|
54
54
|
"multicast-dns": "^7.2.5"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@libp2p/crypto": "
|
|
58
|
-
"@libp2p/interface-compliance-tests": "
|
|
59
|
-
"@libp2p/logger": "
|
|
60
|
-
"aegir": "^47.0.
|
|
61
|
-
"p-
|
|
57
|
+
"@libp2p/crypto": "5.1.9-55b7e5fea",
|
|
58
|
+
"@libp2p/interface-compliance-tests": "7.0.0-55b7e5fea",
|
|
59
|
+
"@libp2p/logger": "6.0.0-55b7e5fea",
|
|
60
|
+
"aegir": "^47.0.22",
|
|
61
|
+
"p-event": "^7.0.0",
|
|
62
|
+
"p-wait-for": "^6.0.0",
|
|
62
63
|
"sinon-ts": "^2.0.0"
|
|
63
64
|
},
|
|
64
65
|
"sideEffects": false
|
package/src/query.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { peerIdFromString } from '@libp2p/peer-id'
|
|
2
|
-
import { isPrivate } from '@libp2p/utils
|
|
3
|
-
import {
|
|
2
|
+
import { isPrivate } from '@libp2p/utils'
|
|
3
|
+
import { CODE_P2P, multiaddr } from '@multiformats/multiaddr'
|
|
4
4
|
import type { LoggerOptions, PeerInfo } from '@libp2p/interface'
|
|
5
5
|
import type { Multiaddr } from '@multiformats/multiaddr'
|
|
6
6
|
import type { Answer, StringAnswer, TxtAnswer } from 'dns-packet'
|
|
@@ -64,7 +64,7 @@ export function gotResponse (rsp: ResponsePacket, localPeerName: string, service
|
|
|
64
64
|
return multiaddr(answerData.toString().substring('dnsaddr='.length))
|
|
65
65
|
})
|
|
66
66
|
|
|
67
|
-
const peerId = multiaddrs[0].
|
|
67
|
+
const peerId = multiaddrs[0].getComponents().findLast(c => c.code === CODE_P2P)?.value
|
|
68
68
|
if (peerId == null) {
|
|
69
69
|
throw new Error("Multiaddr doesn't contain PeerId")
|
|
70
70
|
}
|
|
@@ -72,7 +72,7 @@ export function gotResponse (rsp: ResponsePacket, localPeerName: string, service
|
|
|
72
72
|
|
|
73
73
|
return {
|
|
74
74
|
id: peerIdFromString(peerId),
|
|
75
|
-
multiaddrs: multiaddrs.map(addr => addr.decapsulateCode(
|
|
75
|
+
multiaddrs: multiaddrs.map(addr => addr.decapsulateCode(CODE_P2P))
|
|
76
76
|
}
|
|
77
77
|
} catch (e) {
|
|
78
78
|
options?.log.error('failed to parse mdns response', e)
|
|
@@ -115,7 +115,7 @@ export function gotQuery (qry: QueryPacket, mdns: MulticastDNS, peerName: string
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
// spec mandates multiaddr contains peer id
|
|
118
|
-
if (addr.
|
|
118
|
+
if (addr.getComponents().findLast(c => c.code === CODE_P2P)?.value == null) {
|
|
119
119
|
options?.log('multiaddr %a did not have a peer ID so cannot be used in mDNS query response', addr)
|
|
120
120
|
return
|
|
121
121
|
}
|
package/dist/typedoc-urls.json
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"MulticastDNSComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_mdns.MulticastDNSComponents.html",
|
|
3
|
-
"MulticastDNSInit": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_mdns.MulticastDNSInit.html",
|
|
4
|
-
"mdns": "https://libp2p.github.io/js-libp2p/functions/_libp2p_mdns.mdns.html",
|
|
5
|
-
".:mdns": "https://libp2p.github.io/js-libp2p/functions/_libp2p_mdns.mdns.html"
|
|
6
|
-
}
|