@waku/core 0.0.31-1887f4f.0 → 0.0.31-39f8920.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-WTp5jKZK.js → base_protocol-Dge5_tvU.js} +3 -7
- package/bundle/{index-COT0phC8.js → index-Gts2Ddu_.js} +38 -52
- package/bundle/index.js +214 -193
- package/bundle/lib/base_protocol.js +2 -2
- package/bundle/lib/message/version_0.js +2 -2
- package/bundle/{version_0-SMRUXDNR.js → version_0-CNRKFufI.js} +154 -308
- package/dist/.tsbuildinfo +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/base_protocol.d.ts +2 -3
- package/dist/lib/base_protocol.js +3 -7
- package/dist/lib/base_protocol.js.map +1 -1
- package/dist/lib/connection_manager.d.ts +1 -1
- package/dist/lib/connection_manager.js.map +1 -1
- package/dist/lib/filter/index.d.ts +3 -2
- package/dist/lib/filter/index.js +4 -2
- package/dist/lib/filter/index.js.map +1 -1
- package/dist/lib/health_manager.d.ts +14 -0
- package/dist/lib/health_manager.js +70 -0
- package/dist/lib/health_manager.js.map +1 -0
- package/dist/lib/light_push/index.d.ts +3 -2
- package/dist/lib/light_push/index.js +4 -2
- package/dist/lib/light_push/index.js.map +1 -1
- package/dist/lib/metadata/index.d.ts +2 -2
- package/dist/lib/metadata/index.js +9 -9
- package/dist/lib/metadata/index.js.map +1 -1
- package/dist/lib/store/index.d.ts +5 -44
- package/dist/lib/store/index.js +39 -45
- package/dist/lib/store/index.js.map +1 -1
- package/dist/lib/store/rpc.d.ts +22 -0
- package/dist/lib/store/rpc.js +74 -0
- package/dist/lib/store/rpc.js.map +1 -0
- package/package.json +1 -1
- package/src/index.ts +2 -2
- package/src/lib/base_protocol.ts +3 -7
- package/src/lib/connection_manager.ts +1 -1
- package/src/lib/filter/index.ts +3 -10
- package/src/lib/health_manager.ts +90 -0
- package/src/lib/light_push/index.ts +6 -9
- package/src/lib/metadata/index.ts +11 -12
- package/src/lib/store/index.ts +53 -93
- package/src/lib/store/rpc.ts +92 -0
- package/dist/lib/store/history_rpc.d.ts +0 -27
- package/dist/lib/store/history_rpc.js +0 -72
- package/dist/lib/store/history_rpc.js.map +0 -1
- package/src/lib/store/history_rpc.ts +0 -93
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/filter/index.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/filter/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { HealthStatus, type IHealthManager, type ProtocolHealth, Protocols } from "@waku/interfaces";
|
|
2
|
+
declare class HealthManager implements IHealthManager {
|
|
3
|
+
static instance: HealthManager;
|
|
4
|
+
private readonly health;
|
|
5
|
+
private constructor();
|
|
6
|
+
static getInstance(): HealthManager;
|
|
7
|
+
getHealthStatus(): HealthStatus;
|
|
8
|
+
getProtocolStatus(protocol: Protocols): ProtocolHealth | undefined;
|
|
9
|
+
updateProtocolHealth(multicodec: string, connectedPeers: number): void;
|
|
10
|
+
private getNameFromMulticodec;
|
|
11
|
+
private updateOverallHealth;
|
|
12
|
+
}
|
|
13
|
+
export declare const getHealthManager: () => HealthManager;
|
|
14
|
+
export {};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { HealthStatus, Protocols } from "@waku/interfaces";
|
|
2
|
+
class HealthManager {
|
|
3
|
+
static instance;
|
|
4
|
+
health;
|
|
5
|
+
constructor() {
|
|
6
|
+
this.health = {
|
|
7
|
+
overallStatus: HealthStatus.Unhealthy,
|
|
8
|
+
protocolStatuses: new Map()
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
static getInstance() {
|
|
12
|
+
if (!HealthManager.instance) {
|
|
13
|
+
HealthManager.instance = new HealthManager();
|
|
14
|
+
}
|
|
15
|
+
return HealthManager.instance;
|
|
16
|
+
}
|
|
17
|
+
getHealthStatus() {
|
|
18
|
+
return this.health.overallStatus;
|
|
19
|
+
}
|
|
20
|
+
getProtocolStatus(protocol) {
|
|
21
|
+
return this.health.protocolStatuses.get(protocol);
|
|
22
|
+
}
|
|
23
|
+
updateProtocolHealth(multicodec, connectedPeers) {
|
|
24
|
+
const protocol = this.getNameFromMulticodec(multicodec);
|
|
25
|
+
let status = HealthStatus.Unhealthy;
|
|
26
|
+
if (connectedPeers == 1) {
|
|
27
|
+
status = HealthStatus.MinimallyHealthy;
|
|
28
|
+
}
|
|
29
|
+
else if (connectedPeers >= 2) {
|
|
30
|
+
status = HealthStatus.SufficientlyHealthy;
|
|
31
|
+
}
|
|
32
|
+
this.health.protocolStatuses.set(protocol, {
|
|
33
|
+
name: protocol,
|
|
34
|
+
status: status,
|
|
35
|
+
lastUpdate: new Date()
|
|
36
|
+
});
|
|
37
|
+
this.updateOverallHealth();
|
|
38
|
+
}
|
|
39
|
+
getNameFromMulticodec(multicodec) {
|
|
40
|
+
let name;
|
|
41
|
+
if (multicodec.includes("filter")) {
|
|
42
|
+
name = Protocols.Filter;
|
|
43
|
+
}
|
|
44
|
+
else if (multicodec.includes("lightpush")) {
|
|
45
|
+
name = Protocols.LightPush;
|
|
46
|
+
}
|
|
47
|
+
else if (multicodec.includes("store")) {
|
|
48
|
+
name = Protocols.Store;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
throw new Error(`Unknown protocol: ${multicodec}`);
|
|
52
|
+
}
|
|
53
|
+
return name;
|
|
54
|
+
}
|
|
55
|
+
updateOverallHealth() {
|
|
56
|
+
const relevantProtocols = [Protocols.LightPush, Protocols.Filter];
|
|
57
|
+
const statuses = relevantProtocols.map((p) => this.getProtocolStatus(p)?.status);
|
|
58
|
+
if (statuses.some((status) => status === HealthStatus.Unhealthy)) {
|
|
59
|
+
this.health.overallStatus = HealthStatus.Unhealthy;
|
|
60
|
+
}
|
|
61
|
+
else if (statuses.some((status) => status === HealthStatus.MinimallyHealthy)) {
|
|
62
|
+
this.health.overallStatus = HealthStatus.MinimallyHealthy;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
this.health.overallStatus = HealthStatus.SufficientlyHealthy;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
export const getHealthManager = () => HealthManager.getInstance();
|
|
70
|
+
//# sourceMappingURL=health_manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"health_manager.js","sourceRoot":"","sources":["../../src/lib/health_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Peer } from "@libp2p/interface";
|
|
2
|
-
import { type CoreProtocolResult, type IBaseProtocolCore, type IEncoder, type IMessage, type Libp2p,
|
|
2
|
+
import { type CoreProtocolResult, type IBaseProtocolCore, type IEncoder, type IMessage, type Libp2p, PubsubTopic } from "@waku/interfaces";
|
|
3
3
|
import { PushResponse } from "@waku/proto";
|
|
4
4
|
import { BaseProtocol } from "../base_protocol.js";
|
|
5
5
|
export declare const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
|
|
@@ -8,7 +8,8 @@ export { PushResponse };
|
|
|
8
8
|
* Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
|
|
9
9
|
*/
|
|
10
10
|
export declare class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
|
|
11
|
-
|
|
11
|
+
readonly pubsubTopics: PubsubTopic[];
|
|
12
|
+
constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
|
|
12
13
|
private preparePushMessage;
|
|
13
14
|
send(encoder: IEncoder, message: IMessage, peer: Peer): Promise<CoreProtocolResult>;
|
|
14
15
|
}
|
|
@@ -15,8 +15,10 @@ export { PushResponse };
|
|
|
15
15
|
* Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
|
|
16
16
|
*/
|
|
17
17
|
export class LightPushCore extends BaseProtocol {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
pubsubTopics;
|
|
19
|
+
constructor(pubsubTopics, libp2p) {
|
|
20
|
+
super(LightPushCodec, libp2p.components, log, pubsubTopics);
|
|
21
|
+
this.pubsubTopics = pubsubTopics;
|
|
20
22
|
}
|
|
21
23
|
async preparePushMessage(encoder, message) {
|
|
22
24
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/light_push/index.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/light_push/index.ts"],"names":[],"mappings":"AACA,OAAO,EAML,aAAa,EAGd,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;AAIxB;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,YAAY;IAE3B;IADlB,YACkB,YAA2B,EAC3C,MAAc;QAEd,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAH5C,iBAAY,GAAZ,YAAY,CAAe;IAI7C,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,OAAiB,EACjB,OAAiB;QAEjB,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrD,GAAG,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBAC9D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC;YAC7D,CAAC;YAED,IAAI,CAAC,CAAC,MAAM,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;gBACrD,GAAG,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBACxE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,YAAY,EAAE,CAAC;YAC5D,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,GAAG,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBAC7D,OAAO;oBACL,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,aAAa,CAAC,aAAa;iBACnC,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YACvE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;YAEnD,OAAO;gBACL,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,aAAa,CAAC,YAAY;aAClC,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,OAAiB,EACjB,OAAiB,EACjB,IAAU;QAEV,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACtE,OAAO,EACP,OAAO,CACR,CAAC;QAEF,IAAI,gBAAgB,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,gBAAgB;oBACvB,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YACzC,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,mBAAmB;oBACxC,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,IAAI,GAAiC,CAAC;QACtC,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,IAAI,CACd,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAChB,EAAE,CAAC,MAAM,EACT,MAAM,EACN,EAAE,CAAC,MAAM,EACT,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,CACpC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC;YACzD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,YAAY;oBACjC,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,QAAkC,CAAC;QACvC,IAAI,CAAC;YACH,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QAC5C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAC9C,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,aAAa;oBAClC,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACvD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,iBAAiB;oBACtC,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,oBAAoB;oBACzC,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;CACF"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type IMetadata, type Libp2pComponents,
|
|
1
|
+
import { type IMetadata, type Libp2pComponents, PubsubTopic } from "@waku/interfaces";
|
|
2
2
|
export declare const MetadataCodec = "/vac/waku/metadata/1.0.0";
|
|
3
|
-
export declare function wakuMetadata(
|
|
3
|
+
export declare function wakuMetadata(pubsubTopics: PubsubTopic[]): (components: Libp2pComponents) => IMetadata;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ProtocolError } from "@waku/interfaces";
|
|
2
2
|
import { proto_metadata } from "@waku/proto";
|
|
3
|
-
import { encodeRelayShard, Logger,
|
|
3
|
+
import { encodeRelayShard, Logger, pubsubTopicsToShardInfo } from "@waku/utils";
|
|
4
4
|
import all from "it-all";
|
|
5
5
|
import * as lp from "it-length-prefixed";
|
|
6
6
|
import { pipe } from "it-pipe";
|
|
@@ -9,12 +9,12 @@ import { BaseProtocol } from "../base_protocol.js";
|
|
|
9
9
|
const log = new Logger("metadata");
|
|
10
10
|
export const MetadataCodec = "/vac/waku/metadata/1.0.0";
|
|
11
11
|
class Metadata extends BaseProtocol {
|
|
12
|
-
|
|
12
|
+
pubsubTopics;
|
|
13
13
|
libp2pComponents;
|
|
14
14
|
handshakesConfirmed = new Map();
|
|
15
|
-
constructor(
|
|
16
|
-
super(MetadataCodec, libp2p.components, log,
|
|
17
|
-
this.
|
|
15
|
+
constructor(pubsubTopics, libp2p) {
|
|
16
|
+
super(MetadataCodec, libp2p.components, log, pubsubTopics);
|
|
17
|
+
this.pubsubTopics = pubsubTopics;
|
|
18
18
|
this.libp2pComponents = libp2p;
|
|
19
19
|
void libp2p.registrar.handle(MetadataCodec, (streamData) => {
|
|
20
20
|
void this.onRequest(streamData);
|
|
@@ -24,7 +24,7 @@ class Metadata extends BaseProtocol {
|
|
|
24
24
|
* Make a metadata query to a peer
|
|
25
25
|
*/
|
|
26
26
|
async query(peerId) {
|
|
27
|
-
const request = proto_metadata.WakuMetadataRequest.encode(this.
|
|
27
|
+
const request = proto_metadata.WakuMetadataRequest.encode(pubsubTopicsToShardInfo(this.pubsubTopics));
|
|
28
28
|
const peer = await this.peerStore.get(peerId);
|
|
29
29
|
if (!peer) {
|
|
30
30
|
return {
|
|
@@ -73,7 +73,7 @@ class Metadata extends BaseProtocol {
|
|
|
73
73
|
async onRequest(streamData) {
|
|
74
74
|
try {
|
|
75
75
|
const { stream, connection } = streamData;
|
|
76
|
-
const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode(this.
|
|
76
|
+
const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode(pubsubTopicsToShardInfo(this.pubsubTopics));
|
|
77
77
|
const encodedResponse = await pipe([encodedShardInfo], lp.encode, stream, lp.decode, async (source) => await all(source));
|
|
78
78
|
const { error, shardInfo } = this.decodeMetadataResponse(encodedResponse);
|
|
79
79
|
if (error) {
|
|
@@ -113,7 +113,7 @@ class Metadata extends BaseProtocol {
|
|
|
113
113
|
this.handshakesConfirmed.set(peerId.toString(), shardInfo);
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
|
-
export function wakuMetadata(
|
|
117
|
-
return (components) => new Metadata(
|
|
116
|
+
export function wakuMetadata(pubsubTopics) {
|
|
117
|
+
return (components) => new Metadata(pubsubTopics, components);
|
|
118
118
|
}
|
|
119
119
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/metadata/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/metadata/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,48 +1,9 @@
|
|
|
1
1
|
import type { Peer } from "@libp2p/interface";
|
|
2
|
-
import {
|
|
2
|
+
import { IDecodedMessage, IDecoder, IStoreCore, Libp2p, PubsubTopic, QueryRequestParams } from "@waku/interfaces";
|
|
3
3
|
import { BaseProtocol } from "../base_protocol.js";
|
|
4
|
-
|
|
5
|
-
export declare const StoreCodec = "/vac/waku/store/2.0.0-beta4";
|
|
6
|
-
export { PageDirection, Params };
|
|
7
|
-
export interface TimeFilter {
|
|
8
|
-
startTime: Date;
|
|
9
|
-
endTime: Date;
|
|
10
|
-
}
|
|
11
|
-
export interface QueryOptions {
|
|
12
|
-
/**
|
|
13
|
-
* The direction in which pages are retrieved:
|
|
14
|
-
* - { @link PageDirection.BACKWARD }: Most recent page first.
|
|
15
|
-
* - { @link PageDirection.FORWARD }: Oldest page first.
|
|
16
|
-
*
|
|
17
|
-
* Note: This does not affect the ordering of messages with the page
|
|
18
|
-
* (the oldest message is always first).
|
|
19
|
-
*
|
|
20
|
-
* @default { @link PageDirection.BACKWARD }
|
|
21
|
-
*/
|
|
22
|
-
pageDirection?: PageDirection;
|
|
23
|
-
/**
|
|
24
|
-
* The number of message per page.
|
|
25
|
-
*
|
|
26
|
-
* @default { @link DefaultPageSize }
|
|
27
|
-
*/
|
|
28
|
-
pageSize?: number;
|
|
29
|
-
/**
|
|
30
|
-
* Retrieve messages with a timestamp within the provided values.
|
|
31
|
-
*/
|
|
32
|
-
timeFilter?: TimeFilter;
|
|
33
|
-
/**
|
|
34
|
-
* Cursor as an index to start a query from.
|
|
35
|
-
* The cursor index will be exclusive (i.e. the message at the cursor index will not be included in the result).
|
|
36
|
-
* If undefined, the query will start from the beginning or end of the history, depending on the page direction.
|
|
37
|
-
*/
|
|
38
|
-
cursor?: Cursor;
|
|
39
|
-
}
|
|
40
|
-
/**
|
|
41
|
-
* Implements the [Waku v2 Store protocol](https://rfc.vac.dev/spec/13/).
|
|
42
|
-
*
|
|
43
|
-
* The Waku Store protocol can be used to retrieved historical messages.
|
|
44
|
-
*/
|
|
4
|
+
export declare const StoreCodec = "/vac/waku/store-query/3.0.0";
|
|
45
5
|
export declare class StoreCore extends BaseProtocol implements IStoreCore {
|
|
46
|
-
|
|
47
|
-
|
|
6
|
+
readonly pubsubTopics: PubsubTopic[];
|
|
7
|
+
constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
|
|
8
|
+
queryPerPage<T extends IDecodedMessage>(queryOpts: QueryRequestParams, decoders: Map<string, IDecoder<T>>, peer: Peer): AsyncGenerator<Promise<T | undefined>[]>;
|
|
48
9
|
}
|
package/dist/lib/store/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { proto_store as proto } from "@waku/proto";
|
|
2
1
|
import { Logger } from "@waku/utils";
|
|
3
2
|
import all from "it-all";
|
|
4
3
|
import * as lp from "it-length-prefixed";
|
|
@@ -6,29 +5,26 @@ import { pipe } from "it-pipe";
|
|
|
6
5
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
7
6
|
import { BaseProtocol } from "../base_protocol.js";
|
|
8
7
|
import { toProtoMessage } from "../to_proto_message.js";
|
|
9
|
-
import {
|
|
10
|
-
var HistoryError = proto.HistoryResponse.HistoryError;
|
|
8
|
+
import { DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE, StoreQueryRequest, StoreQueryResponse } from "./rpc.js";
|
|
11
9
|
const log = new Logger("store");
|
|
12
|
-
export const StoreCodec = "/vac/waku/store/
|
|
13
|
-
export { PageDirection };
|
|
14
|
-
/**
|
|
15
|
-
* Implements the [Waku v2 Store protocol](https://rfc.vac.dev/spec/13/).
|
|
16
|
-
*
|
|
17
|
-
* The Waku Store protocol can be used to retrieved historical messages.
|
|
18
|
-
*/
|
|
10
|
+
export const StoreCodec = "/vac/waku/store-query/3.0.0";
|
|
19
11
|
export class StoreCore extends BaseProtocol {
|
|
20
|
-
|
|
21
|
-
|
|
12
|
+
pubsubTopics;
|
|
13
|
+
constructor(pubsubTopics, libp2p) {
|
|
14
|
+
super(StoreCodec, libp2p.components, log, pubsubTopics);
|
|
15
|
+
this.pubsubTopics = pubsubTopics;
|
|
22
16
|
}
|
|
23
17
|
async *queryPerPage(queryOpts, decoders, peer) {
|
|
24
18
|
if (queryOpts.contentTopics.toString() !==
|
|
25
19
|
Array.from(decoders.keys()).toString()) {
|
|
26
20
|
throw new Error("Internal error, the decoders should match the query's content topics");
|
|
27
21
|
}
|
|
28
|
-
let currentCursor = queryOpts.
|
|
22
|
+
let currentCursor = queryOpts.paginationCursor;
|
|
29
23
|
while (true) {
|
|
30
|
-
|
|
31
|
-
|
|
24
|
+
const storeQueryRequest = StoreQueryRequest.create({
|
|
25
|
+
...queryOpts,
|
|
26
|
+
paginationCursor: currentCursor
|
|
27
|
+
});
|
|
32
28
|
let stream;
|
|
33
29
|
try {
|
|
34
30
|
stream = await this.getStream(peer);
|
|
@@ -37,50 +33,48 @@ export class StoreCore extends BaseProtocol {
|
|
|
37
33
|
log.error("Failed to get stream", e);
|
|
38
34
|
break;
|
|
39
35
|
}
|
|
40
|
-
const res = await pipe([
|
|
36
|
+
const res = await pipe([storeQueryRequest.encode()], lp.encode, stream, lp.decode, async (source) => await all(source));
|
|
41
37
|
const bytes = new Uint8ArrayList();
|
|
42
38
|
res.forEach((chunk) => {
|
|
43
39
|
bytes.append(chunk);
|
|
44
40
|
});
|
|
45
|
-
const
|
|
46
|
-
if (!
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (response.error && response.error !== HistoryError.NONE) {
|
|
52
|
-
throw "History response contains an Error: " + response.error;
|
|
41
|
+
const storeQueryResponse = StoreQueryResponse.decode(bytes);
|
|
42
|
+
if (!storeQueryResponse.statusCode ||
|
|
43
|
+
storeQueryResponse.statusCode >= 300) {
|
|
44
|
+
const errorMessage = `Store query failed with status code: ${storeQueryResponse.statusCode}, description: ${storeQueryResponse.statusDesc}`;
|
|
45
|
+
log.error(errorMessage);
|
|
46
|
+
throw new Error(errorMessage);
|
|
53
47
|
}
|
|
54
|
-
if (!
|
|
55
|
-
log.warn("Stopping pagination due to
|
|
48
|
+
if (!storeQueryResponse.messages || !storeQueryResponse.messages.length) {
|
|
49
|
+
log.warn("Stopping pagination due to empty messages in response");
|
|
56
50
|
break;
|
|
57
51
|
}
|
|
58
|
-
log.
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
52
|
+
log.info(`${storeQueryResponse.messages.length} messages retrieved from store`);
|
|
53
|
+
const decodedMessages = storeQueryResponse.messages.map((protoMsg) => {
|
|
54
|
+
if (!protoMsg.message) {
|
|
55
|
+
return Promise.resolve(undefined);
|
|
56
|
+
}
|
|
57
|
+
const contentTopic = protoMsg.message.contentTopic;
|
|
58
|
+
if (contentTopic) {
|
|
62
59
|
const decoder = decoders.get(contentTopic);
|
|
63
60
|
if (decoder) {
|
|
64
|
-
return decoder.fromProtoObj(
|
|
61
|
+
return decoder.fromProtoObj(protoMsg.pubsubTopic || "", toProtoMessage(protoMsg.message));
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
return Promise.resolve(undefined);
|
|
68
65
|
});
|
|
69
|
-
|
|
70
|
-
if (
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
66
|
+
yield decodedMessages;
|
|
67
|
+
if (queryOpts.paginationForward) {
|
|
68
|
+
currentCursor =
|
|
69
|
+
storeQueryResponse.messages[storeQueryResponse.messages.length - 1]
|
|
70
|
+
.messageHash;
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
currentCursor = storeQueryResponse.messages[0].messageHash;
|
|
75
74
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (
|
|
80
|
-
// Response page size smaller than query, meaning this is the last page
|
|
81
|
-
responsePageSize &&
|
|
82
|
-
queryPageSize &&
|
|
83
|
-
responsePageSize < queryPageSize) {
|
|
75
|
+
if (storeQueryResponse.messages.length > MAX_PAGE_SIZE &&
|
|
76
|
+
storeQueryResponse.messages.length <
|
|
77
|
+
(queryOpts.paginationLimit || DEFAULT_PAGE_SIZE)) {
|
|
84
78
|
break;
|
|
85
79
|
}
|
|
86
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { QueryRequestParams } from "@waku/interfaces";
|
|
2
|
+
import { proto_store as proto } from "@waku/proto";
|
|
3
|
+
import type { Uint8ArrayList } from "uint8arraylist";
|
|
4
|
+
export declare const DEFAULT_PAGE_SIZE = 20;
|
|
5
|
+
export declare const MAX_PAGE_SIZE = 100;
|
|
6
|
+
export declare class StoreQueryRequest {
|
|
7
|
+
proto: proto.StoreQueryRequest;
|
|
8
|
+
constructor(proto: proto.StoreQueryRequest);
|
|
9
|
+
static create(params: QueryRequestParams): StoreQueryRequest;
|
|
10
|
+
static decode(bytes: Uint8ArrayList): StoreQueryRequest;
|
|
11
|
+
encode(): Uint8Array;
|
|
12
|
+
}
|
|
13
|
+
export declare class StoreQueryResponse {
|
|
14
|
+
proto: proto.StoreQueryResponse;
|
|
15
|
+
constructor(proto: proto.StoreQueryResponse);
|
|
16
|
+
static decode(bytes: Uint8ArrayList): StoreQueryResponse;
|
|
17
|
+
encode(): Uint8Array;
|
|
18
|
+
get statusCode(): number | undefined;
|
|
19
|
+
get statusDesc(): string | undefined;
|
|
20
|
+
get messages(): proto.WakuMessageKeyValue[];
|
|
21
|
+
get paginationCursor(): Uint8Array | undefined;
|
|
22
|
+
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { proto_store as proto } from "@waku/proto";
|
|
2
|
+
import { v4 as uuid } from "uuid";
|
|
3
|
+
// https://github.com/waku-org/nwaku/blob/7205f95cff9f49ca0bb762e8fd0bf56a6a7f3b3b/waku/waku_store/common.nim#L12
|
|
4
|
+
export const DEFAULT_PAGE_SIZE = 20;
|
|
5
|
+
export const MAX_PAGE_SIZE = 100;
|
|
6
|
+
const ONE_MILLION = 1_000000;
|
|
7
|
+
export class StoreQueryRequest {
|
|
8
|
+
proto;
|
|
9
|
+
constructor(proto) {
|
|
10
|
+
this.proto = proto;
|
|
11
|
+
}
|
|
12
|
+
static create(params) {
|
|
13
|
+
const request = new StoreQueryRequest({
|
|
14
|
+
...params,
|
|
15
|
+
requestId: uuid(),
|
|
16
|
+
timeStart: params.timeStart
|
|
17
|
+
? BigInt(params.timeStart.getTime() * ONE_MILLION)
|
|
18
|
+
: undefined,
|
|
19
|
+
timeEnd: params.timeEnd
|
|
20
|
+
? BigInt(params.timeEnd.getTime() * ONE_MILLION)
|
|
21
|
+
: undefined,
|
|
22
|
+
messageHashes: params.messageHashes || [],
|
|
23
|
+
paginationLimit: params.paginationLimit
|
|
24
|
+
? BigInt(params.paginationLimit)
|
|
25
|
+
: undefined
|
|
26
|
+
});
|
|
27
|
+
// Validate request parameters based on RFC
|
|
28
|
+
if ((params.pubsubTopic && !params.contentTopics) ||
|
|
29
|
+
(!params.pubsubTopic && params.contentTopics)) {
|
|
30
|
+
throw new Error("Both pubsubTopic and contentTopics must be set or unset");
|
|
31
|
+
}
|
|
32
|
+
if (params.messageHashes &&
|
|
33
|
+
(params.pubsubTopic ||
|
|
34
|
+
params.contentTopics ||
|
|
35
|
+
params.timeStart ||
|
|
36
|
+
params.timeEnd)) {
|
|
37
|
+
throw new Error("Message hash lookup queries cannot include content filter criteria");
|
|
38
|
+
}
|
|
39
|
+
return request;
|
|
40
|
+
}
|
|
41
|
+
static decode(bytes) {
|
|
42
|
+
const res = proto.StoreQueryRequest.decode(bytes);
|
|
43
|
+
return new StoreQueryRequest(res);
|
|
44
|
+
}
|
|
45
|
+
encode() {
|
|
46
|
+
return proto.StoreQueryRequest.encode(this.proto);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
export class StoreQueryResponse {
|
|
50
|
+
proto;
|
|
51
|
+
constructor(proto) {
|
|
52
|
+
this.proto = proto;
|
|
53
|
+
}
|
|
54
|
+
static decode(bytes) {
|
|
55
|
+
const res = proto.StoreQueryResponse.decode(bytes);
|
|
56
|
+
return new StoreQueryResponse(res);
|
|
57
|
+
}
|
|
58
|
+
encode() {
|
|
59
|
+
return proto.StoreQueryResponse.encode(this.proto);
|
|
60
|
+
}
|
|
61
|
+
get statusCode() {
|
|
62
|
+
return this.proto.statusCode;
|
|
63
|
+
}
|
|
64
|
+
get statusDesc() {
|
|
65
|
+
return this.proto.statusDesc;
|
|
66
|
+
}
|
|
67
|
+
get messages() {
|
|
68
|
+
return this.proto.messages;
|
|
69
|
+
}
|
|
70
|
+
get paginationCursor() {
|
|
71
|
+
return this.proto.paginationCursor;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=rpc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/lib/store/rpc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@waku/core","version":"0.0.31-
|
|
1
|
+
{"name":"@waku/core","version":"0.0.31-39f8920.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/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.1.2","@waku/enr":"0.0.25-39f8920.0","@waku/interfaces":"0.0.26-39f8920.0","@waku/proto":"0.0.8-39f8920.0","@waku/utils":"0.0.19-39f8920.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.19.0","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.8.1","@waku/enr":"0.0.25-39f8920.0","@waku/interfaces":"0.0.26-39f8920.0","@waku/proto":"0.0.8-39f8920.0","@waku/utils":"0.0.19-39f8920.0"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"@waku/interfaces":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
|
package/src/index.ts
CHANGED
|
@@ -15,12 +15,12 @@ export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
|
|
|
15
15
|
export * as waku_store from "./lib/store/index.js";
|
|
16
16
|
export { StoreCore } from "./lib/store/index.js";
|
|
17
17
|
|
|
18
|
-
export { PageDirection } from "./lib/store/index.js";
|
|
19
|
-
|
|
20
18
|
export { waitForRemotePeer } from "./lib/wait_for_remote_peer.js";
|
|
21
19
|
|
|
22
20
|
export { ConnectionManager } from "./lib/connection_manager.js";
|
|
23
21
|
|
|
22
|
+
export { getHealthManager } from "./lib/health_manager.js";
|
|
23
|
+
|
|
24
24
|
export { KeepAliveManager } from "./lib/keep_alive_manager.js";
|
|
25
25
|
export { StreamManager } from "./lib/stream_manager/index.js";
|
|
26
26
|
|