@waku/core 0.0.30-682cc66.0 → 0.0.30-d8ed83f.0
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/bundle/{base_protocol-CrPXdVvO.js → base_protocol-DCOj0QWD.js} +54 -20
- package/bundle/{browser-DoQRY-an.js → browser-zSUobdfj.js} +10 -0
- package/bundle/{index-NYIjIEV5.js → index-BcSodzY4.js} +1 -1
- package/bundle/index.js +156 -32
- package/bundle/lib/base_protocol.js +3 -3
- package/bundle/lib/message/version_0.js +3 -3
- package/bundle/lib/predefined_bootstrap_nodes.js +1 -1
- package/bundle/{version_0-C6GyvOeg.js → version_0-TEIsGmpJ.js} +1 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/lib/filter/index.d.ts +5 -5
- package/dist/lib/filter/index.js +129 -21
- package/dist/lib/filter/index.js.map +1 -1
- package/dist/lib/light_push/index.d.ts +3 -4
- package/dist/lib/light_push/index.js +3 -3
- package/dist/lib/light_push/index.js.map +1 -1
- package/dist/lib/metadata/index.js +11 -1
- package/dist/lib/metadata/index.js.map +1 -1
- package/dist/lib/store/index.js +8 -1
- package/dist/lib/store/index.js.map +1 -1
- package/dist/lib/stream_manager.d.ts +5 -4
- package/dist/lib/stream_manager.js +52 -18
- package/dist/lib/stream_manager.js.map +1 -1
- package/package.json +1 -1
- package/src/lib/filter/index.ts +164 -52
- package/src/lib/light_push/index.ts +14 -19
- package/src/lib/metadata/index.ts +16 -5
- package/src/lib/store/index.ts +7 -1
- package/src/lib/stream_manager.ts +66 -25
|
@@ -62,12 +62,12 @@ export class LightPushCore extends BaseProtocol {
|
|
|
62
62
|
try {
|
|
63
63
|
stream = await this.getStream(peer);
|
|
64
64
|
}
|
|
65
|
-
catch (
|
|
66
|
-
log.error(
|
|
65
|
+
catch (error) {
|
|
66
|
+
log.error("Failed to get stream", error);
|
|
67
67
|
return {
|
|
68
68
|
success: null,
|
|
69
69
|
failure: {
|
|
70
|
-
error: ProtocolError.
|
|
70
|
+
error: ProtocolError.NO_STREAM_AVAILABLE,
|
|
71
71
|
peerId: peer.id
|
|
72
72
|
}
|
|
73
73
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/light_push/index.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,cAAc,GAAG,iCAAiC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/light_push/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,17 @@ class Metadata extends BaseProtocol {
|
|
|
50
50
|
error: ProtocolError.NO_PEER_AVAILABLE
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
let stream;
|
|
54
|
+
try {
|
|
55
|
+
stream = await this.getStream(peer);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
log.error("Failed to get stream", error);
|
|
59
|
+
return {
|
|
60
|
+
shardInfo: null,
|
|
61
|
+
error: ProtocolError.NO_STREAM_AVAILABLE
|
|
62
|
+
};
|
|
63
|
+
}
|
|
54
64
|
const encodedResponse = await pipe([request], lp.encode, stream, lp.decode, async (source) => await all(source));
|
|
55
65
|
const { error, shardInfo } = this.decodeMetadataResponse(encodedResponse);
|
|
56
66
|
if (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/metadata/index.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/metadata/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/store/index.js
CHANGED
|
@@ -29,7 +29,14 @@ export class StoreCore extends BaseProtocol {
|
|
|
29
29
|
while (true) {
|
|
30
30
|
queryOpts.cursor = currentCursor;
|
|
31
31
|
const historyRpcQuery = HistoryRpc.createQuery(queryOpts);
|
|
32
|
-
|
|
32
|
+
let stream;
|
|
33
|
+
try {
|
|
34
|
+
stream = await this.getStream(peer);
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
log.error("Failed to get stream", e);
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
33
40
|
const res = await pipe([historyRpcQuery.encode()], lp.encode, stream, lp.decode, async (source) => await all(source));
|
|
34
41
|
const bytes = new Uint8ArrayList();
|
|
35
42
|
res.forEach((chunk) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAU,MAAM,kBAAkB,CAAC;AAErE,IAAO,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC;AAEzD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAExD,OAAO,EAAE,aAAa,EAAU,CAAC;AAqCjC;;;;GAIG;AACH,MAAM,OAAO,SAAU,SAAQ,YAAY;IACzC,YAAY,MAAc,EAAE,OAA+B;QACzD,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,OAAQ,CAAC,YAAa,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,CAAC,YAAY,CACjB,SAAiB,EACjB,QAAkC,EAClC,IAAU;QAEV,IACE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;YAClC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,EACtC,CAAC;YACD,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;QACJ,CAAC;QAED,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC;QACrC,OAAO,IAAI,EAAE,CAAC;YACZ,SAAS,CAAC,MAAM,GAAG,aAAa,CAAC;YAEjC,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import type { Stream } from "@libp2p/interface";
|
|
2
|
-
import { Peer } from "@libp2p/interface";
|
|
2
|
+
import type { Peer } from "@libp2p/interface";
|
|
3
3
|
import { Libp2p } from "@waku/interfaces";
|
|
4
4
|
export declare class StreamManager {
|
|
5
5
|
multicodec: string;
|
|
6
6
|
getConnections: Libp2p["getConnections"];
|
|
7
7
|
addEventListener: Libp2p["addEventListener"];
|
|
8
|
-
private streamPool;
|
|
8
|
+
private readonly streamPool;
|
|
9
9
|
private readonly log;
|
|
10
10
|
constructor(multicodec: string, getConnections: Libp2p["getConnections"], addEventListener: Libp2p["addEventListener"]);
|
|
11
11
|
getStream(peer: Peer): Promise<Stream>;
|
|
12
|
-
private
|
|
13
|
-
private
|
|
12
|
+
private createStream;
|
|
13
|
+
private prepareStream;
|
|
14
14
|
private handlePeerUpdateStreamPool;
|
|
15
|
+
private isConnectedTo;
|
|
15
16
|
}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { Logger } from "@waku/utils";
|
|
2
2
|
import { selectConnection } from "@waku/utils/libp2p";
|
|
3
|
+
const CONNECTION_TIMEOUT = 5_000;
|
|
4
|
+
const RETRY_BACKOFF_BASE = 1_000;
|
|
5
|
+
const MAX_RETRIES = 3;
|
|
3
6
|
export class StreamManager {
|
|
4
7
|
multicodec;
|
|
5
8
|
getConnections;
|
|
@@ -11,46 +14,77 @@ export class StreamManager {
|
|
|
11
14
|
this.getConnections = getConnections;
|
|
12
15
|
this.addEventListener = addEventListener;
|
|
13
16
|
this.log = new Logger(`stream-manager:${multicodec}`);
|
|
14
|
-
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool.bind(this));
|
|
15
|
-
this.getStream = this.getStream.bind(this);
|
|
16
17
|
this.streamPool = new Map();
|
|
18
|
+
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
17
19
|
}
|
|
18
20
|
async getStream(peer) {
|
|
19
21
|
const peerIdStr = peer.id.toString();
|
|
20
22
|
const streamPromise = this.streamPool.get(peerIdStr);
|
|
21
23
|
if (!streamPromise) {
|
|
22
|
-
return this.
|
|
24
|
+
return this.createStream(peer);
|
|
23
25
|
}
|
|
24
|
-
// We have the stream, let's remove it from the map
|
|
25
26
|
this.streamPool.delete(peerIdStr);
|
|
26
|
-
this.
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
this.prepareStream(peer);
|
|
28
|
+
try {
|
|
29
|
+
const stream = await streamPromise;
|
|
30
|
+
if (stream && stream.status !== "closed") {
|
|
31
|
+
return stream;
|
|
32
|
+
}
|
|
30
33
|
}
|
|
31
|
-
|
|
34
|
+
catch (error) {
|
|
35
|
+
this.log.warn(`Failed to get stream for ${peerIdStr} -- `, error);
|
|
36
|
+
this.log.warn("Attempting to create a new stream for the peer");
|
|
37
|
+
}
|
|
38
|
+
return this.createStream(peer);
|
|
32
39
|
}
|
|
33
|
-
async
|
|
40
|
+
async createStream(peer, retries = 0) {
|
|
34
41
|
const connections = this.getConnections(peer.id);
|
|
35
42
|
const connection = selectConnection(connections);
|
|
36
43
|
if (!connection) {
|
|
37
44
|
throw new Error("Failed to get a connection to the peer");
|
|
38
45
|
}
|
|
39
|
-
|
|
46
|
+
try {
|
|
47
|
+
return await connection.newStream(this.multicodec);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (retries < MAX_RETRIES) {
|
|
51
|
+
const backoff = RETRY_BACKOFF_BASE * Math.pow(2, retries);
|
|
52
|
+
await new Promise((resolve) => setTimeout(resolve, backoff));
|
|
53
|
+
return this.createStream(peer, retries + 1);
|
|
54
|
+
}
|
|
55
|
+
throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` + error);
|
|
56
|
+
}
|
|
40
57
|
}
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
this.
|
|
58
|
+
prepareStream(peer) {
|
|
59
|
+
const timeoutPromise = new Promise((resolve) => setTimeout(resolve, CONNECTION_TIMEOUT));
|
|
60
|
+
const streamPromise = Promise.race([
|
|
61
|
+
this.createStream(peer),
|
|
62
|
+
timeoutPromise.then(() => {
|
|
63
|
+
throw new Error("Connection timeout");
|
|
64
|
+
})
|
|
65
|
+
]).catch((error) => {
|
|
66
|
+
this.log.error(`Failed to prepare a new stream for ${peer.id.toString()} -- `, error);
|
|
45
67
|
});
|
|
46
68
|
this.streamPool.set(peer.id.toString(), streamPromise);
|
|
47
69
|
}
|
|
48
70
|
handlePeerUpdateStreamPool = (evt) => {
|
|
49
|
-
const peer = evt.detail
|
|
71
|
+
const { peer } = evt.detail;
|
|
50
72
|
if (peer.protocols.includes(this.multicodec)) {
|
|
51
|
-
this.
|
|
52
|
-
|
|
73
|
+
const isConnected = this.isConnectedTo(peer.id);
|
|
74
|
+
if (isConnected) {
|
|
75
|
+
this.log.info(`Preemptively opening a stream to ${peer.id.toString()}`);
|
|
76
|
+
this.prepareStream(peer);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const peerIdStr = peer.id.toString();
|
|
80
|
+
this.streamPool.delete(peerIdStr);
|
|
81
|
+
this.log.info(`Removed pending stream for disconnected peer ${peerIdStr}`);
|
|
82
|
+
}
|
|
53
83
|
}
|
|
54
84
|
};
|
|
85
|
+
isConnectedTo(peerId) {
|
|
86
|
+
const connections = this.getConnections(peerId);
|
|
87
|
+
return connections.some((connection) => connection.status === "open");
|
|
88
|
+
}
|
|
55
89
|
}
|
|
56
90
|
//# sourceMappingURL=stream_manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../src/lib/stream_manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,OAAO,aAAa;IAKf;IACA;IACA;
|
|
1
|
+
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../src/lib/stream_manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@waku/core","version":"0.0.30-
|
|
1
|
+
{"name":"@waku/core","version":"0.0.30-d8ed83f.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/predefined_bootstrap_nodes":{"types":"./dist/lib/predefined_bootstrap_nodes.d.ts","import":"./dist/lib/predefined_bootstrap_nodes.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=18"},"dependencies":{"@libp2p/ping":"^1.0.12","@waku/enr":"0.0.24-d8ed83f.0","@waku/interfaces":"0.0.25-d8ed83f.0","@waku/proto":"0.0.8-d8ed83f.0","@waku/utils":"0.0.18-d8ed83f.0","debug":"^4.3.4","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","p-event":"^6.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","cspell":"^8.6.1","fast-check":"^3.15.1","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"^1.1.2","@waku/enr":"0.0.24-d8ed83f.0","@waku/interfaces":"0.0.25-d8ed83f.0","@waku/proto":"0.0.8-d8ed83f.0","@waku/utils":"0.0.18-d8ed83f.0"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"@waku/interfaces":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
|
package/src/lib/filter/index.ts
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
import type { Peer } from "@libp2p/interface";
|
|
1
|
+
import type { Peer, Stream } from "@libp2p/interface";
|
|
2
2
|
import type { IncomingStreamData } from "@libp2p/interface-internal";
|
|
3
|
-
import
|
|
4
|
-
ContentTopic,
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
import {
|
|
4
|
+
type ContentTopic,
|
|
5
|
+
type CoreProtocolResult,
|
|
6
|
+
type IBaseProtocolCore,
|
|
7
|
+
type Libp2p,
|
|
8
|
+
type ProtocolCreateOptions,
|
|
9
|
+
ProtocolError,
|
|
10
|
+
type PubsubTopic
|
|
9
11
|
} from "@waku/interfaces";
|
|
10
12
|
import { WakuMessage } from "@waku/proto";
|
|
11
13
|
import { Logger } from "@waku/utils";
|
|
12
14
|
import all from "it-all";
|
|
13
15
|
import * as lp from "it-length-prefixed";
|
|
14
16
|
import { pipe } from "it-pipe";
|
|
17
|
+
import { Uint8ArrayList } from "uint8arraylist";
|
|
15
18
|
|
|
16
19
|
import { BaseProtocol } from "../base_protocol.js";
|
|
17
20
|
|
|
@@ -45,9 +48,13 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
45
48
|
options
|
|
46
49
|
);
|
|
47
50
|
|
|
48
|
-
libp2p
|
|
49
|
-
|
|
50
|
-
|
|
51
|
+
libp2p
|
|
52
|
+
.handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
|
|
53
|
+
maxInboundStreams: 100
|
|
54
|
+
})
|
|
55
|
+
.catch((e) => {
|
|
56
|
+
log.error("Failed to register ", FilterCodecs.PUSH, e);
|
|
57
|
+
});
|
|
51
58
|
}
|
|
52
59
|
|
|
53
60
|
private onRequest(streamData: IncomingStreamData): void {
|
|
@@ -90,7 +97,7 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
90
97
|
pubsubTopic: PubsubTopic,
|
|
91
98
|
peer: Peer,
|
|
92
99
|
contentTopics: ContentTopic[]
|
|
93
|
-
): Promise<
|
|
100
|
+
): Promise<CoreProtocolResult> {
|
|
94
101
|
const stream = await this.getStream(peer);
|
|
95
102
|
|
|
96
103
|
const request = FilterSubscribeRpc.createSubscribeRequest(
|
|
@@ -98,45 +105,98 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
98
105
|
contentTopics
|
|
99
106
|
);
|
|
100
107
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
if (!res || !res.length) {
|
|
110
|
-
throw Error(
|
|
111
|
-
`No response received for request ${request.requestId}: ${res}`
|
|
108
|
+
let res: Uint8ArrayList[] | undefined;
|
|
109
|
+
try {
|
|
110
|
+
res = await pipe(
|
|
111
|
+
[request.encode()],
|
|
112
|
+
lp.encode,
|
|
113
|
+
stream,
|
|
114
|
+
lp.decode,
|
|
115
|
+
async (source) => await all(source)
|
|
112
116
|
);
|
|
117
|
+
} catch (error) {
|
|
118
|
+
log.error("Failed to send subscribe request", error);
|
|
119
|
+
return {
|
|
120
|
+
success: null,
|
|
121
|
+
failure: {
|
|
122
|
+
error: ProtocolError.GENERIC_FAIL,
|
|
123
|
+
peerId: peer.id
|
|
124
|
+
}
|
|
125
|
+
};
|
|
113
126
|
}
|
|
114
127
|
|
|
115
128
|
const { statusCode, requestId, statusDesc } =
|
|
116
129
|
FilterSubscribeResponse.decode(res[0].slice());
|
|
117
130
|
|
|
118
131
|
if (statusCode < 200 || statusCode >= 300) {
|
|
119
|
-
|
|
132
|
+
log.error(
|
|
120
133
|
`Filter subscribe request ${requestId} failed with status code ${statusCode}: ${statusDesc}`
|
|
121
134
|
);
|
|
135
|
+
return {
|
|
136
|
+
failure: {
|
|
137
|
+
error: ProtocolError.REMOTE_PEER_REJECTED,
|
|
138
|
+
peerId: peer.id
|
|
139
|
+
},
|
|
140
|
+
success: null
|
|
141
|
+
};
|
|
122
142
|
}
|
|
143
|
+
|
|
144
|
+
return {
|
|
145
|
+
failure: null,
|
|
146
|
+
success: peer.id
|
|
147
|
+
};
|
|
123
148
|
}
|
|
124
149
|
|
|
125
150
|
async unsubscribe(
|
|
126
151
|
pubsubTopic: PubsubTopic,
|
|
127
152
|
peer: Peer,
|
|
128
153
|
contentTopics: ContentTopic[]
|
|
129
|
-
): Promise<
|
|
130
|
-
|
|
154
|
+
): Promise<CoreProtocolResult> {
|
|
155
|
+
let stream: Stream | undefined;
|
|
156
|
+
try {
|
|
157
|
+
stream = await this.getStream(peer);
|
|
158
|
+
} catch (error) {
|
|
159
|
+
log.error(
|
|
160
|
+
`Failed to get a stream for remote peer${peer.id.toString()}`,
|
|
161
|
+
error
|
|
162
|
+
);
|
|
163
|
+
return {
|
|
164
|
+
success: null,
|
|
165
|
+
failure: {
|
|
166
|
+
error: ProtocolError.REMOTE_PEER_FAULT,
|
|
167
|
+
peerId: peer.id
|
|
168
|
+
}
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
|
|
131
172
|
const unsubscribeRequest = FilterSubscribeRpc.createUnsubscribeRequest(
|
|
132
173
|
pubsubTopic,
|
|
133
174
|
contentTopics
|
|
134
175
|
);
|
|
135
176
|
|
|
136
|
-
|
|
177
|
+
try {
|
|
178
|
+
await pipe([unsubscribeRequest.encode()], lp.encode, stream.sink);
|
|
179
|
+
} catch (error) {
|
|
180
|
+
log.error("Failed to send unsubscribe request", error);
|
|
181
|
+
return {
|
|
182
|
+
success: null,
|
|
183
|
+
failure: {
|
|
184
|
+
error: ProtocolError.GENERIC_FAIL,
|
|
185
|
+
peerId: peer.id
|
|
186
|
+
}
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
return {
|
|
191
|
+
success: peer.id,
|
|
192
|
+
failure: null
|
|
193
|
+
};
|
|
137
194
|
}
|
|
138
195
|
|
|
139
|
-
async unsubscribeAll(
|
|
196
|
+
async unsubscribeAll(
|
|
197
|
+
pubsubTopic: PubsubTopic,
|
|
198
|
+
peer: Peer
|
|
199
|
+
): Promise<CoreProtocolResult> {
|
|
140
200
|
const stream = await this.getStream(peer);
|
|
141
201
|
|
|
142
202
|
const request = FilterSubscribeRpc.createUnsubscribeAllRequest(pubsubTopic);
|
|
@@ -150,53 +210,105 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
150
210
|
);
|
|
151
211
|
|
|
152
212
|
if (!res || !res.length) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
213
|
+
return {
|
|
214
|
+
failure: {
|
|
215
|
+
error: ProtocolError.REMOTE_PEER_FAULT,
|
|
216
|
+
peerId: peer.id
|
|
217
|
+
},
|
|
218
|
+
success: null
|
|
219
|
+
};
|
|
156
220
|
}
|
|
157
221
|
|
|
158
222
|
const { statusCode, requestId, statusDesc } =
|
|
159
223
|
FilterSubscribeResponse.decode(res[0].slice());
|
|
160
224
|
|
|
161
225
|
if (statusCode < 200 || statusCode >= 300) {
|
|
162
|
-
|
|
226
|
+
log.error(
|
|
163
227
|
`Filter unsubscribe all request ${requestId} failed with status code ${statusCode}: ${statusDesc}`
|
|
164
228
|
);
|
|
229
|
+
return {
|
|
230
|
+
failure: {
|
|
231
|
+
error: ProtocolError.REMOTE_PEER_REJECTED,
|
|
232
|
+
peerId: peer.id
|
|
233
|
+
},
|
|
234
|
+
success: null
|
|
235
|
+
};
|
|
165
236
|
}
|
|
237
|
+
|
|
238
|
+
return {
|
|
239
|
+
failure: null,
|
|
240
|
+
success: peer.id
|
|
241
|
+
};
|
|
166
242
|
}
|
|
167
243
|
|
|
168
|
-
async ping(peer: Peer): Promise<
|
|
169
|
-
|
|
244
|
+
async ping(peer: Peer): Promise<CoreProtocolResult> {
|
|
245
|
+
let stream: Stream | undefined;
|
|
246
|
+
try {
|
|
247
|
+
stream = await this.getStream(peer);
|
|
248
|
+
} catch (error) {
|
|
249
|
+
log.error(
|
|
250
|
+
`Failed to get a stream for remote peer${peer.id.toString()}`,
|
|
251
|
+
error
|
|
252
|
+
);
|
|
253
|
+
return {
|
|
254
|
+
success: null,
|
|
255
|
+
failure: {
|
|
256
|
+
error: ProtocolError.REMOTE_PEER_FAULT,
|
|
257
|
+
peerId: peer.id
|
|
258
|
+
}
|
|
259
|
+
};
|
|
260
|
+
}
|
|
170
261
|
|
|
171
262
|
const request = FilterSubscribeRpc.createSubscriberPingRequest();
|
|
172
263
|
|
|
264
|
+
let res: Uint8ArrayList[] | undefined;
|
|
173
265
|
try {
|
|
174
|
-
|
|
266
|
+
res = await pipe(
|
|
175
267
|
[request.encode()],
|
|
176
268
|
lp.encode,
|
|
177
269
|
stream,
|
|
178
270
|
lp.decode,
|
|
179
271
|
async (source) => await all(source)
|
|
180
272
|
);
|
|
181
|
-
|
|
182
|
-
if (!res || !res.length) {
|
|
183
|
-
throw Error(
|
|
184
|
-
`No response received for request ${request.requestId}: ${res}`
|
|
185
|
-
);
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
const { statusCode, requestId, statusDesc } =
|
|
189
|
-
FilterSubscribeResponse.decode(res[0].slice());
|
|
190
|
-
|
|
191
|
-
if (statusCode < 200 || statusCode >= 300) {
|
|
192
|
-
throw new Error(
|
|
193
|
-
`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`
|
|
194
|
-
);
|
|
195
|
-
}
|
|
196
|
-
log.info(`Ping successful for peer ${peer.id.toString()}`);
|
|
197
273
|
} catch (error) {
|
|
198
|
-
log.error("
|
|
199
|
-
|
|
274
|
+
log.error("Failed to send ping request", error);
|
|
275
|
+
return {
|
|
276
|
+
success: null,
|
|
277
|
+
failure: {
|
|
278
|
+
error: ProtocolError.GENERIC_FAIL,
|
|
279
|
+
peerId: peer.id
|
|
280
|
+
}
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
if (!res || !res.length) {
|
|
285
|
+
return {
|
|
286
|
+
success: null,
|
|
287
|
+
failure: {
|
|
288
|
+
error: ProtocolError.REMOTE_PEER_FAULT,
|
|
289
|
+
peerId: peer.id
|
|
290
|
+
}
|
|
291
|
+
};
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
const { statusCode, requestId, statusDesc } =
|
|
295
|
+
FilterSubscribeResponse.decode(res[0].slice());
|
|
296
|
+
|
|
297
|
+
if (statusCode < 200 || statusCode >= 300) {
|
|
298
|
+
log.error(
|
|
299
|
+
`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`
|
|
300
|
+
);
|
|
301
|
+
return {
|
|
302
|
+
success: null,
|
|
303
|
+
failure: {
|
|
304
|
+
error: ProtocolError.REMOTE_PEER_REJECTED,
|
|
305
|
+
peerId: peer.id
|
|
306
|
+
}
|
|
307
|
+
};
|
|
200
308
|
}
|
|
309
|
+
return {
|
|
310
|
+
success: peer.id,
|
|
311
|
+
failure: null
|
|
312
|
+
};
|
|
201
313
|
}
|
|
202
314
|
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import type { Peer,
|
|
1
|
+
import type { Peer, Stream } from "@libp2p/interface";
|
|
2
2
|
import {
|
|
3
|
-
|
|
4
|
-
IBaseProtocolCore,
|
|
5
|
-
IEncoder,
|
|
6
|
-
IMessage,
|
|
7
|
-
Libp2p,
|
|
8
|
-
ProtocolCreateOptions,
|
|
3
|
+
type CoreProtocolResult,
|
|
4
|
+
type IBaseProtocolCore,
|
|
5
|
+
type IEncoder,
|
|
6
|
+
type IMessage,
|
|
7
|
+
type Libp2p,
|
|
8
|
+
type ProtocolCreateOptions,
|
|
9
9
|
ProtocolError,
|
|
10
|
-
|
|
10
|
+
type ThisOrThat
|
|
11
11
|
} from "@waku/interfaces";
|
|
12
12
|
import { PushResponse } from "@waku/proto";
|
|
13
13
|
import { isMessageSizeUnderCap } from "@waku/utils";
|
|
@@ -26,9 +26,7 @@ const log = new Logger("light-push");
|
|
|
26
26
|
export const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
|
|
27
27
|
export { PushResponse };
|
|
28
28
|
|
|
29
|
-
type PreparePushMessageResult =
|
|
30
|
-
|
|
31
|
-
type CoreSendResult = ProtocolResult<"success", PeerId, "failure", Failure>;
|
|
29
|
+
type PreparePushMessageResult = ThisOrThat<"query", PushRpc>;
|
|
32
30
|
|
|
33
31
|
/**
|
|
34
32
|
* Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
|
|
@@ -84,7 +82,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
84
82
|
encoder: IEncoder,
|
|
85
83
|
message: IMessage,
|
|
86
84
|
peer: Peer
|
|
87
|
-
): Promise<
|
|
85
|
+
): Promise<CoreProtocolResult> {
|
|
88
86
|
const { query, error: preparationError } = await this.preparePushMessage(
|
|
89
87
|
encoder,
|
|
90
88
|
message
|
|
@@ -100,18 +98,15 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
100
98
|
};
|
|
101
99
|
}
|
|
102
100
|
|
|
103
|
-
let stream: Stream
|
|
101
|
+
let stream: Stream;
|
|
104
102
|
try {
|
|
105
103
|
stream = await this.getStream(peer);
|
|
106
|
-
} catch (
|
|
107
|
-
log.error(
|
|
108
|
-
`Failed to get a stream for remote peer${peer.id.toString()}`,
|
|
109
|
-
err
|
|
110
|
-
);
|
|
104
|
+
} catch (error) {
|
|
105
|
+
log.error("Failed to get stream", error);
|
|
111
106
|
return {
|
|
112
107
|
success: null,
|
|
113
108
|
failure: {
|
|
114
|
-
error: ProtocolError.
|
|
109
|
+
error: ProtocolError.NO_STREAM_AVAILABLE,
|
|
115
110
|
peerId: peer.id
|
|
116
111
|
}
|
|
117
112
|
};
|