waku-org
/
js-waku
mirror of https://github.com/waku-org/js-waku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add getActiveSubscriptions method (#1249)

This commit is contained in:
Sasha 2023-03-21 02:44:35 +01:00 committed by GitHub
parent 0f6a594644
commit 45284db963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/core/src/lib/relay/index.ts
View File

@ -6,9 +6,10 @@ import {
} from "@chainsafe/libp2p-gossipsub"; } from "@chainsafe/libp2p-gossipsub";
import type { PeerIdStr, TopicStr } from "@chainsafe/libp2p-gossipsub/types"; import type { PeerIdStr, TopicStr } from "@chainsafe/libp2p-gossipsub/types";
import { SignaturePolicy } from "@chainsafe/libp2p-gossipsub/types"; import { SignaturePolicy } from "@chainsafe/libp2p-gossipsub/types";
import { CustomEvent } from "@libp2p/interfaces/events";
import type { import type {
ActiveSubscriptions,
Callback, Callback,
IDecodedMessage,
IDecoder, IDecoder,
IEncoder, IEncoder,
IMessage, IMessage,
@ -16,7 +17,6 @@ import type {
ProtocolCreateOptions, ProtocolCreateOptions,
SendResult, SendResult,
} from "@waku/interfaces"; } from "@waku/interfaces";
import { IDecodedMessage } from "@waku/interfaces";
import debug from "debug"; import debug from "debug";
import { DefaultPubSubTopic } from "../constants.js"; import { DefaultPubSubTopic } from "../constants.js";
@ -36,10 +36,6 @@ export type Observer<T extends IDecodedMessage> = {
export type RelayCreateOptions = ProtocolCreateOptions & GossipsubOpts; export type RelayCreateOptions = ProtocolCreateOptions & GossipsubOpts;
export type ContentTopic = string; export type ContentTopic = string;
type BasicEventPayload = {
contentTopic: string;
};
/** /**
* Implements the [Waku v2 Relay protocol](https://rfc.vac.dev/spec/11/). * Implements the [Waku v2 Relay protocol](https://rfc.vac.dev/spec/11/).
* Must be passed as a `pubsub` module to a `Libp2p` instance. * Must be passed as a `pubsub` module to a `Libp2p` instance.
@ -120,30 +116,20 @@ class Relay extends GossipSub implements IRelay {
pushOrInitMapSet(this.observers, contentTopic, observer); pushOrInitMapSet(this.observers, contentTopic, observer);
this.dispatchEvent(
new CustomEvent<BasicEventPayload>("observer:added", {
detail: {
contentTopic,
},
})
);
return () => { return () => {
const observers = this.observers.get(contentTopic); const observers = this.observers.get(contentTopic);
if (observers) { if (observers) {
observers.delete(observer); observers.delete(observer);
this.dispatchEvent(
new CustomEvent<BasicEventPayload>("observer:removed", {
detail: {
contentTopic,
},
})
);
} }
}; };
} }
public getActiveSubscriptions(): ActiveSubscriptions {
const map = new Map();
map.set(this.pubSubTopic, this.observers.keys());
return map;
}
private async processIncomingMessage<T extends IDecodedMessage>( private async processIncomingMessage<T extends IDecodedMessage>(
pubSubTopic: string, pubSubTopic: string,
bytes: Uint8Array bytes: Uint8Array

14
packages/interfaces/src/relay.ts
View File

@ -1,16 +1,13 @@
import type { GossipSub, GossipsubEvents } from "@chainsafe/libp2p-gossipsub"; import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
import type { EventEmitter } from "@libp2p/interfaces/events";
import type { IDecodedMessage, IDecoder } from "./message.js"; import type { IDecodedMessage, IDecoder } from "./message.js";
import type { Callback } from "./protocols.js"; import type { Callback } from "./protocols.js";
import type { ISender } from "./sender.js"; import type { ISender } from "./sender.js";
export interface RelayEvents { type PubSubTopic = string;
"observer:added": CustomEvent; type ContentTopic = string;
"observer:removed": CustomEvent;
}
type IRelayEmitter = EventEmitter<RelayEvents & GossipsubEvents>; export type ActiveSubscriptions = Map<PubSubTopic, ContentTopic[]>;
interface IRelayAPI { interface IRelayAPI {
addObserver: <T extends IDecodedMessage>( addObserver: <T extends IDecodedMessage>(
@ -18,6 +15,7 @@ interface IRelayAPI {
callback: Callback<T> callback: Callback<T>
) => () => void; ) => () => void;
getMeshPeers: () => string[]; getMeshPeers: () => string[];
getActiveSubscriptions: () => ActiveSubscriptions | undefined;
} }
export type IRelay = ISender & GossipSub & IRelayAPI & IRelayEmitter; export type IRelay = IRelayAPI & GossipSub & ISender;