status-im
/
js-waku
mirror of https://github.com/status-im/js-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: pass pubsub topic when creating waku filter

This commit is contained in:
Franck Royer 2022-07-25 20:28:52 +10:00 committed by fryorcraken.eth
parent 275eb72959
commit 8922511cc9
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/waku.ts
View File

@ -104,8 +104,7 @@ export async function createWaku(options?: CreateOptions): Promise<Waku> {
const wakuStore = new WakuStore(libp2p, options);
const wakuLightPush = new WakuLightPush(libp2p, options);
// TODO pass options
const wakuFilter = new WakuFilter(libp2p);
const wakuFilter = new WakuFilter(libp2p, options);
await libp2p.start();

19
src/lib/waku_filter/index.ts
View File

@ -20,6 +20,18 @@ export const FilterCodec = "/vac/waku/filter/2.0.0-beta1";
const log = debug("waku:filter");
export interface CreateOptions {
/**
* The PubSub Topic to use. Defaults to {@link DefaultPubSubTopic}.
*
* The usage of the default pubsub topic is recommended.
* See [Waku v2 Topic Usage Recommendations](https://rfc.vac.dev/spec/23/) for details.
*
* @default {@link DefaultPubSubTopic}
*/
pubSubTopic?: string;
}
type FilterSubscriptionOpts = {
/**
* The Pubsub topic for the subscription
@ -43,16 +55,17 @@ type UnsubscribeFunction = () => Promise<void>;
* - https://github.com/status-im/nwaku/issues/948
*/
export class WakuFilter {
pubSubTopic: string;
private subscriptions: Map<string, FilterCallback>;
public decryptionKeys: Map<
Uint8Array,
{ method?: DecryptionMethod; contentTopics?: string[] }
>;
// TODO: Accept options (pubsubtopic)
constructor(public libp2p: Libp2p) {
constructor(public libp2p: Libp2p, options?: CreateOptions) {
this.subscriptions = new Map();
this.decryptionKeys = new Map();
this.pubSubTopic = options?.pubSubTopic ?? DefaultPubSubTopic;
this.libp2p
.handle(FilterCodec, this.onRequest.bind(this))
.catch((e) => log("Failed to register filter protocol", e));
@ -69,7 +82,7 @@ export class WakuFilter {
contentTopics: string[],
opts?: FilterSubscriptionOpts
): Promise<UnsubscribeFunction> {
const topic = opts?.pubsubTopic || DefaultPubSubTopic;
const topic = opts?.pubsubTopic ?? this.pubSubTopic;
const contentFilters = contentTopics.map((contentTopic) => ({
contentTopic,
}));