@libp2p/perf 1.0.0-a31b420f → 1.1.0-87165551
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/src/main.d.ts.map +1 -1
- package/dist/src/main.js +7 -14
- package/dist/src/main.js.map +1 -1
- package/package.json +9 -10
- package/src/main.ts +7 -19
package/dist/src/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAgDA,wBAAsB,IAAI,CAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDrJ"}
|
package/dist/src/main.js
CHANGED
|
@@ -5,7 +5,6 @@ import { tcp } from '@libp2p/tcp';
|
|
|
5
5
|
import { multiaddr } from '@multiformats/multiaddr';
|
|
6
6
|
import { createLibp2p } from 'libp2p';
|
|
7
7
|
import { plaintext } from 'libp2p/insecure';
|
|
8
|
-
import pWaitFor from 'p-wait-for';
|
|
9
8
|
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
|
|
10
9
|
import yargs from 'yargs';
|
|
11
10
|
import { hideBin } from 'yargs/helpers';
|
|
@@ -77,20 +76,14 @@ export async function main(runServer, serverIpAddress, transport, uploadBytes, d
|
|
|
77
76
|
const node = await createLibp2p(config);
|
|
78
77
|
await node.start();
|
|
79
78
|
const startTime = Date.now();
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
node.
|
|
83
|
-
|
|
84
|
-
|
|
79
|
+
if (!runServer) {
|
|
80
|
+
const connection = await node.dial(multiaddr(tcpMultiaddrAddress));
|
|
81
|
+
const duration = await node.services.perf.measurePerformance(startTime, connection, BigInt(uploadBytes), BigInt(downloadBytes));
|
|
82
|
+
// Output latency to stdout in seconds
|
|
83
|
+
// eslint-disable-next-line no-console
|
|
84
|
+
console.log(JSON.stringify({ latency: duration / 1000 }));
|
|
85
|
+
await node.stop();
|
|
85
86
|
}
|
|
86
|
-
else {
|
|
87
|
-
connection = await node.dial(multiaddr(tcpMultiaddrAddress));
|
|
88
|
-
}
|
|
89
|
-
await pWaitFor(() => connection != null);
|
|
90
|
-
const duration = await node.services.perf.measurePerformance(startTime, connection, BigInt(uploadBytes), BigInt(downloadBytes));
|
|
91
|
-
await node.stop();
|
|
92
|
-
// eslint-disable-next-line no-console
|
|
93
|
-
console.log('latency: ' + JSON.stringify({ latency: duration }));
|
|
94
87
|
}
|
|
95
88
|
function splitHostPort(address) {
|
|
96
89
|
try {
|
package/dist/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/perf",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.0-87165551",
|
|
4
4
|
"description": "Implementation of Perf Protocol",
|
|
5
5
|
"author": "@maschad / @marcopolo",
|
|
6
6
|
"license": "Apache-2.0 OR MIT",
|
|
@@ -48,17 +48,16 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@chainsafe/libp2p-yamux": "^5.0.0",
|
|
51
|
-
"@libp2p/crypto": "2.0.
|
|
52
|
-
"@libp2p/interface": "0.1.
|
|
53
|
-
"@libp2p/interface-compliance-tests": "4.0.
|
|
54
|
-
"@libp2p/interface-internal": "0.1.
|
|
51
|
+
"@libp2p/crypto": "2.0.3-87165551",
|
|
52
|
+
"@libp2p/interface": "0.1.2-87165551",
|
|
53
|
+
"@libp2p/interface-compliance-tests": "4.0.3-87165551",
|
|
54
|
+
"@libp2p/interface-internal": "0.1.3-87165551",
|
|
55
55
|
"@libp2p/interfaces": "3.3.2",
|
|
56
|
-
"@libp2p/logger": "3.0.
|
|
57
|
-
"@libp2p/peer-id-factory": "3.0.
|
|
58
|
-
"@libp2p/tcp": "8.0.
|
|
56
|
+
"@libp2p/logger": "3.0.2-87165551",
|
|
57
|
+
"@libp2p/peer-id-factory": "3.0.3-87165551",
|
|
58
|
+
"@libp2p/tcp": "8.0.3-87165551",
|
|
59
59
|
"@multiformats/multiaddr": "^12.1.5",
|
|
60
|
-
"libp2p": "0.46.
|
|
61
|
-
"p-wait-for": "^5.0.2",
|
|
60
|
+
"libp2p": "0.46.4-87165551",
|
|
62
61
|
"uint8arrays": "^4.0.6",
|
|
63
62
|
"yargs": "^17.7.2"
|
|
64
63
|
},
|
package/src/main.ts
CHANGED
|
@@ -5,12 +5,10 @@ import { tcp } from '@libp2p/tcp'
|
|
|
5
5
|
import { multiaddr } from '@multiformats/multiaddr'
|
|
6
6
|
import { createLibp2p } from 'libp2p'
|
|
7
7
|
import { plaintext } from 'libp2p/insecure'
|
|
8
|
-
import pWaitFor from 'p-wait-for'
|
|
9
8
|
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
|
|
10
9
|
import yargs from 'yargs'
|
|
11
10
|
import { hideBin } from 'yargs/helpers'
|
|
12
11
|
import { defaultInit, perfService } from '../src/index.js'
|
|
13
|
-
import type { Connection } from '@libp2p/interface/connection'
|
|
14
12
|
|
|
15
13
|
const argv = yargs(hideBin(process.argv))
|
|
16
14
|
.options({
|
|
@@ -89,24 +87,14 @@ export async function main (runServer: boolean, serverIpAddress: string, transpo
|
|
|
89
87
|
|
|
90
88
|
const startTime = Date.now()
|
|
91
89
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
})
|
|
98
|
-
|
|
99
|
-
connection = await node.dial(multiaddr(tcpMultiaddrAddress))
|
|
90
|
+
if (!runServer) {
|
|
91
|
+
const connection = await node.dial(multiaddr(tcpMultiaddrAddress))
|
|
92
|
+
const duration = await node.services.perf.measurePerformance(startTime, connection, BigInt(uploadBytes), BigInt(downloadBytes))
|
|
93
|
+
// Output latency to stdout in seconds
|
|
94
|
+
// eslint-disable-next-line no-console
|
|
95
|
+
console.log(JSON.stringify({ latency: duration / 1000 }))
|
|
96
|
+
await node.stop()
|
|
100
97
|
}
|
|
101
|
-
|
|
102
|
-
await pWaitFor(() => connection != null)
|
|
103
|
-
|
|
104
|
-
const duration = await node.services.perf.measurePerformance(startTime, connection as Connection, BigInt(uploadBytes), BigInt(downloadBytes))
|
|
105
|
-
|
|
106
|
-
await node.stop()
|
|
107
|
-
|
|
108
|
-
// eslint-disable-next-line no-console
|
|
109
|
-
console.log('latency: ' + JSON.stringify({ latency: duration }))
|
|
110
98
|
}
|
|
111
99
|
|
|
112
100
|
function splitHostPort (address: string): { host: string, port?: string } {
|