@railgun-community/waku-broadcaster-client-node 7.2.6 → 7.2.7

package/dist/transact/broadcaster-transaction.js

@@ -124,9 +124,10 @@ export class BroadcasterTransaction {
                 return response.txHash;
             }
             if (isDefined(response.error)) {
+                BroadcasterDebug.log(`Broadcast error: ${response.error}`);
                 BroadcasterTransactResponse.clearSharedKey();
-                throw new Error(response.error, {
-                    cause: new Error('Received response error from broadcaster.'),
+                throw new Error('Received response error from broadcaster.', {
+                    cause: new Error(response.error),
                 });
             }
         }

package/dist/transact/broadcaster-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-transaction.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getRailgunWalletAddressData,\n  encryptDataWithSharedKey,\n  getCompletedTxidFromNullifiers,\n} from '@railgun-community/wallet';\nimport {\n  Chain,\n  EncryptDataWithSharedKeyResponse,\n  poll,\n  PreTransactionPOIsPerTxidLeafPerList,\n  BroadcasterEncryptedMethodParams,\n  BroadcasterRawParamsTransact,\n  TXIDVersion,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { bytesToHex } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport {\n  WakuTransactResponse,\n  BroadcasterTransactResponse,\n} from './broadcaster-transact-response.js';\nimport { getAddress, isHexString } from 'ethers';\n\n//\n// Transact: Encryption Flow\n//\n// Client:\n// 1. Generates random 16 bytes: `responseKey` and adds to transact data\n// 2. Generates a `sharedKey` from a random `privkey` and the Broadcaster's `pubkey`\n// 3. Encrypts the transact data asymmetrically, using `sharedKey` (`encryptedData = encrypt(transactData, sharedKey)`)\n// 4. Includes `publicKey` and `encryptedData` in transact message\n// 5. Sends the message\n//\n// Broadcaster:\n// 1. Decrypts the `encryptedData` using Broadcaster privkey and `sharedKey` (if error, it's not addressed to us)\n// 2. Processes transaction\n// 3. Encrypts response (`txHash` or `error`) using `responseKey` (symmetric: AES-GCM-256)\n// 4. Sends back encrypted response on transact-response: {encryptedData}\n//\n// Client:\n// 1. Catches all `transact-response`'s after sending a transaction.\n// 2. Decrypts each using the `responseKey`. (If error, not addressed to us)\n// 3. After successful decryption, parses `txHash` or `error`.\n//\n\nenum BroadcastRetryState {\n  RetryTransact = 'RetryTransact',\n  Wait = 'Wait',\n  Timeout = 'Timeout',\n}\n\ntype BroadcastMessageData = {\n  method: string;\n  params: BroadcasterEncryptedMethodParams;\n};\n\n// NOTE: Broadcaster default transaction-send timeout is 45 seconds.\nconst SECONDS_PER_RETRY = 2;\nconst POLL_DELAY_SECONDS = 0.1;\nconst RETRY_TRANSACTION_SECONDS = 20;\nconst POST_ALERT_TOTAL_WAITING_SECONDS = 120;\n\nexport class BroadcasterTransaction {\n  private messageData: BroadcastMessageData;\n  private contentTopic: string;\n  private txidVersionForInputs: TXIDVersion;\n  private chain: Chain;\n  private nullifiers: string[];\n\n  private constructor(\n    encryptedDataResponse: EncryptDataWithSharedKeyResponse,\n    txidVersionForInputs: TXIDVersion,\n    chain: Chain,\n    nullifiers: string[],\n  ) {\n    this.messageData = {\n      method: 'transact',\n      params: {\n        pubkey: encryptedDataResponse.randomPubKey,\n        encryptedData: encryptedDataResponse.encryptedData,\n      },\n    };\n    this.contentTopic = contentTopics.transact(chain);\n    this.txidVersionForInputs = txidVersionForInputs;\n    this.chain = chain;\n    this.nullifiers = nullifiers;\n    BroadcasterTransactResponse.setSharedKey(encryptedDataResponse.sharedKey);\n  }\n\n  static async create(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    nullifiers: string[],\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<BroadcasterTransaction> {\n    const encryptedDataResponse = await this.encryptTransaction(\n      txidVersionForInputs,\n      to,\n      data,\n      broadcasterRailgunAddress,\n      broadcasterFeesID,\n      chain,\n      overallBatchMinGasPrice,\n      useRelayAdapt,\n      preTransactionPOIsPerTxidLeafPerList,\n    );\n    return new BroadcasterTransaction(\n      encryptedDataResponse,\n      txidVersionForInputs,\n      chain,\n      nullifiers,\n    );\n  }\n\n  private static async encryptTransaction(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<EncryptDataWithSharedKeyResponse> {\n    if (!isHexString(data)) {\n      throw new Error('Data field must be a hex string.');\n    }\n\n    const { viewingPublicKey: broadcasterViewingKey } =\n      getRailgunWalletAddressData(broadcasterRailgunAddress);\n\n    const transactData: BroadcasterRawParamsTransact = {\n      txidVersion: txidVersionForInputs,\n      to: getAddress(to),\n      data,\n      broadcasterViewingKey: bytesToHex(broadcasterViewingKey),\n      chainID: chain.id,\n      chainType: chain.type,\n      minGasPrice: overallBatchMinGasPrice.toString(),\n      feesID: broadcasterFeesID,\n      useRelayAdapt,\n      devLog: BroadcasterConfig.IS_DEV,\n      minVersion: BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n      maxVersion: BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n      preTransactionPOIsPerTxidLeafPerList,\n    };\n\n    const encryptedDataResponse = await encryptDataWithSharedKey(\n      transactData,\n      broadcasterViewingKey,\n    );\n\n    return encryptedDataResponse;\n  }\n\n  private async findMatchingNullifierTxid(): Promise<Optional<string>> {\n    try {\n      const { txid } = await getCompletedTxidFromNullifiers(\n        this.txidVersionForInputs,\n        this.chain,\n        this.nullifiers,\n      );\n      return txid;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Failed to find matching nullifier txid', { cause }),\n      );\n      return undefined;\n    }\n  }\n\n  private async getTransactionResponse(): Promise<\n    Optional<WakuTransactResponse>\n  > {\n    if (BroadcasterTransactResponse.storedTransactionResponse) {\n      return BroadcasterTransactResponse.storedTransactionResponse;\n    }\n\n    const nullifiersTxid = await this.findMatchingNullifierTxid();\n    if (isDefined(nullifiersTxid)) {\n      return {\n        id: 'nullifier-transaction',\n        txHash: nullifiersTxid,\n      };\n    }\n\n    return undefined;\n  }\n\n  private getBroadcastRetryState(retryNumber: number): BroadcastRetryState {\n    const retrySeconds = retryNumber * SECONDS_PER_RETRY;\n    if (retrySeconds <= RETRY_TRANSACTION_SECONDS) {\n      return BroadcastRetryState.RetryTransact;\n    }\n    if (retrySeconds >= POST_ALERT_TOTAL_WAITING_SECONDS) {\n      return BroadcastRetryState.Timeout;\n    }\n    return BroadcastRetryState.Wait;\n  }\n\n  async send(): Promise<string> {\n    return this.broadcast();\n  }\n\n  private async broadcast(retryNumber = 0): Promise<string> {\n    const broadcastRetryState = this.getBroadcastRetryState(retryNumber);\n    switch (broadcastRetryState) {\n      case BroadcastRetryState.RetryTransact:\n        // 0-20 seconds.\n        BroadcasterDebug.log(\n          `Broadcast Waku message: ${this.messageData.method} via ${this.contentTopic}`,\n        );\n        await WakuBroadcasterWakuCore.broadcastMessage(\n          this.messageData,\n          this.contentTopic,\n        );\n        break;\n      case BroadcastRetryState.Wait:\n        // 21-60 seconds.\n        // Do nothing.\n        break;\n      case BroadcastRetryState.Timeout:\n        // Exactly 60 seconds.\n        throw new Error('Request timed out.');\n    }\n\n    // 15 iterations (1.5 sec total, iterate every 100ms).\n    const pollIterations = SECONDS_PER_RETRY / POLL_DELAY_SECONDS;\n\n    const response: Optional<WakuTransactResponse> = await poll(\n      async () => this.getTransactionResponse(),\n      (result: Optional<WakuTransactResponse>) => result != null,\n      POLL_DELAY_SECONDS * 1000,\n      pollIterations,\n    );\n    if (isDefined(response)) {\n      if (isDefined(response.txHash)) {\n        BroadcasterTransactResponse.clearSharedKey();\n        return response.txHash;\n      }\n      if (isDefined(response.error)) {\n        BroadcasterTransactResponse.clearSharedKey();\n        throw new Error(response.error, {\n          cause: new Error('Received response error from broadcaster.'),\n        });\n      }\n    }\n\n    // Retry.\n    return this.broadcast(retryNumber + 1);\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-transaction.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getRailgunWalletAddressData,\n  encryptDataWithSharedKey,\n  getCompletedTxidFromNullifiers,\n} from '@railgun-community/wallet';\nimport {\n  Chain,\n  EncryptDataWithSharedKeyResponse,\n  poll,\n  PreTransactionPOIsPerTxidLeafPerList,\n  BroadcasterEncryptedMethodParams,\n  BroadcasterRawParamsTransact,\n  TXIDVersion,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { bytesToHex } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport {\n  WakuTransactResponse,\n  BroadcasterTransactResponse,\n} from './broadcaster-transact-response.js';\nimport { getAddress, isHexString } from 'ethers';\n\n//\n// Transact: Encryption Flow\n//\n// Client:\n// 1. Generates random 16 bytes: `responseKey` and adds to transact data\n// 2. Generates a `sharedKey` from a random `privkey` and the Broadcaster's `pubkey`\n// 3. Encrypts the transact data asymmetrically, using `sharedKey` (`encryptedData = encrypt(transactData, sharedKey)`)\n// 4. Includes `publicKey` and `encryptedData` in transact message\n// 5. Sends the message\n//\n// Broadcaster:\n// 1. Decrypts the `encryptedData` using Broadcaster privkey and `sharedKey` (if error, it's not addressed to us)\n// 2. Processes transaction\n// 3. Encrypts response (`txHash` or `error`) using `responseKey` (symmetric: AES-GCM-256)\n// 4. Sends back encrypted response on transact-response: {encryptedData}\n//\n// Client:\n// 1. Catches all `transact-response`'s after sending a transaction.\n// 2. Decrypts each using the `responseKey`. (If error, not addressed to us)\n// 3. After successful decryption, parses `txHash` or `error`.\n//\n\nenum BroadcastRetryState {\n  RetryTransact = 'RetryTransact',\n  Wait = 'Wait',\n  Timeout = 'Timeout',\n}\n\ntype BroadcastMessageData = {\n  method: string;\n  params: BroadcasterEncryptedMethodParams;\n};\n\n// NOTE: Broadcaster default transaction-send timeout is 45 seconds.\nconst SECONDS_PER_RETRY = 2;\nconst POLL_DELAY_SECONDS = 0.1;\nconst RETRY_TRANSACTION_SECONDS = 20;\nconst POST_ALERT_TOTAL_WAITING_SECONDS = 120;\n\nexport class BroadcasterTransaction {\n  private messageData: BroadcastMessageData;\n  private contentTopic: string;\n  private txidVersionForInputs: TXIDVersion;\n  private chain: Chain;\n  private nullifiers: string[];\n\n  private constructor(\n    encryptedDataResponse: EncryptDataWithSharedKeyResponse,\n    txidVersionForInputs: TXIDVersion,\n    chain: Chain,\n    nullifiers: string[],\n  ) {\n    this.messageData = {\n      method: 'transact',\n      params: {\n        pubkey: encryptedDataResponse.randomPubKey,\n        encryptedData: encryptedDataResponse.encryptedData,\n      },\n    };\n    this.contentTopic = contentTopics.transact(chain);\n    this.txidVersionForInputs = txidVersionForInputs;\n    this.chain = chain;\n    this.nullifiers = nullifiers;\n    BroadcasterTransactResponse.setSharedKey(encryptedDataResponse.sharedKey);\n  }\n\n  static async create(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    nullifiers: string[],\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<BroadcasterTransaction> {\n    const encryptedDataResponse = await this.encryptTransaction(\n      txidVersionForInputs,\n      to,\n      data,\n      broadcasterRailgunAddress,\n      broadcasterFeesID,\n      chain,\n      overallBatchMinGasPrice,\n      useRelayAdapt,\n      preTransactionPOIsPerTxidLeafPerList,\n    );\n    return new BroadcasterTransaction(\n      encryptedDataResponse,\n      txidVersionForInputs,\n      chain,\n      nullifiers,\n    );\n  }\n\n  private static async encryptTransaction(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<EncryptDataWithSharedKeyResponse> {\n    if (!isHexString(data)) {\n      throw new Error('Data field must be a hex string.');\n    }\n\n    const { viewingPublicKey: broadcasterViewingKey } =\n      getRailgunWalletAddressData(broadcasterRailgunAddress);\n\n    const transactData: BroadcasterRawParamsTransact = {\n      txidVersion: txidVersionForInputs,\n      to: getAddress(to),\n      data,\n      broadcasterViewingKey: bytesToHex(broadcasterViewingKey),\n      chainID: chain.id,\n      chainType: chain.type,\n      minGasPrice: overallBatchMinGasPrice.toString(),\n      feesID: broadcasterFeesID,\n      useRelayAdapt,\n      devLog: BroadcasterConfig.IS_DEV,\n      minVersion: BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n      maxVersion: BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n      preTransactionPOIsPerTxidLeafPerList,\n    };\n\n    const encryptedDataResponse = await encryptDataWithSharedKey(\n      transactData,\n      broadcasterViewingKey,\n    );\n\n    return encryptedDataResponse;\n  }\n\n  private async findMatchingNullifierTxid(): Promise<Optional<string>> {\n    try {\n      const { txid } = await getCompletedTxidFromNullifiers(\n        this.txidVersionForInputs,\n        this.chain,\n        this.nullifiers,\n      );\n      return txid;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Failed to find matching nullifier txid', { cause }),\n      );\n      return undefined;\n    }\n  }\n\n  private async getTransactionResponse(): Promise<\n    Optional<WakuTransactResponse>\n  > {\n    if (BroadcasterTransactResponse.storedTransactionResponse) {\n      return BroadcasterTransactResponse.storedTransactionResponse;\n    }\n\n    const nullifiersTxid = await this.findMatchingNullifierTxid();\n    if (isDefined(nullifiersTxid)) {\n      return {\n        id: 'nullifier-transaction',\n        txHash: nullifiersTxid,\n      };\n    }\n\n    return undefined;\n  }\n\n  private getBroadcastRetryState(retryNumber: number): BroadcastRetryState {\n    const retrySeconds = retryNumber * SECONDS_PER_RETRY;\n    if (retrySeconds <= RETRY_TRANSACTION_SECONDS) {\n      return BroadcastRetryState.RetryTransact;\n    }\n    if (retrySeconds >= POST_ALERT_TOTAL_WAITING_SECONDS) {\n      return BroadcastRetryState.Timeout;\n    }\n    return BroadcastRetryState.Wait;\n  }\n\n  async send(): Promise<string> {\n    return this.broadcast();\n  }\n\n  private async broadcast(retryNumber = 0): Promise<string> {\n    const broadcastRetryState = this.getBroadcastRetryState(retryNumber);\n    switch (broadcastRetryState) {\n      case BroadcastRetryState.RetryTransact:\n        // 0-20 seconds.\n        BroadcasterDebug.log(\n          `Broadcast Waku message: ${this.messageData.method} via ${this.contentTopic}`,\n        );\n        await WakuBroadcasterWakuCore.broadcastMessage(\n          this.messageData,\n          this.contentTopic,\n        );\n        break;\n      case BroadcastRetryState.Wait:\n        // 21-60 seconds.\n        // Do nothing.\n        break;\n      case BroadcastRetryState.Timeout:\n        // Exactly 60 seconds.\n        throw new Error('Request timed out.');\n    }\n\n    // 15 iterations (1.5 sec total, iterate every 100ms).\n    const pollIterations = SECONDS_PER_RETRY / POLL_DELAY_SECONDS;\n\n    const response: Optional<WakuTransactResponse> = await poll(\n      async () => this.getTransactionResponse(),\n      (result: Optional<WakuTransactResponse>) => result != null,\n      POLL_DELAY_SECONDS * 1000,\n      pollIterations,\n    );\n    if (isDefined(response)) {\n      if (isDefined(response.txHash)) {\n        BroadcasterTransactResponse.clearSharedKey();\n        return response.txHash;\n      }\n      if (isDefined(response.error)) {\n        BroadcasterDebug.log(`Broadcast error: ${response.error}`);\n        BroadcasterTransactResponse.clearSharedKey();\n        throw new Error('Received response error from broadcaster.', {\n          cause: new Error(response.error),\n        });\n      }\n    }\n\n    // Retry.\n    return this.broadcast(retryNumber + 1);\n  }\n}\n"]}

package/dist/waku/waku-broadcaster-waku-core.d.ts

@@ -1,21 +1,21 @@
 import { Chain } from '@railgun-community/shared-models';
-import { RelayNode } from '@waku/interfaces';
+import { LightNode } from '@waku/interfaces';
 import { BroadcasterOptions } from '../models/index.js';
 export declare class WakuBroadcasterWakuCore {
     static hasError: boolean;
-    static waku: Optional<RelayNode>;
+    static waku: Optional<LightNode>;
     private static pubSubTopic;
     private static additionalDirectPeers;
     private static peerDiscoveryTimeout;
     static initWaku: (chain: Chain) => Promise<void>;
-    static reinitWaku: (chain: Chain, resetCache?: boolean) => Promise<void>;
-    static setBroadcasterOptions(BroadcasterOptions: BroadcasterOptions): void;
-    static disconnect: (removeObservers?: boolean) => Promise<void>;
+    static reinitWaku: (chain: Chain) => Promise<void>;
+    static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions): void;
+    static disconnect: () => Promise<void>;
     private static connect;
     static getMeshPeerCount(): number;
     static getPubSubPeerCount(): number;
     static getLightPushPeerCount(): Promise<number>;
     static getFilterPeerCount(): Promise<number>;
     private static waitForRemotePeer;
-    static broadcastMessage(data: object, contentTopic: string, retry?: number): Promise<void>;
+    static broadcastMessage(data: object, contentTopic: string): Promise<void>;
 }

package/dist/waku/waku-broadcaster-waku-core.js

@@ -3,13 +3,12 @@ import { waitForRemotePeer, createEncoder } from '@waku/core';
 import { Protocols } from '@waku/interfaces';
 import { WakuObservers } from './waku-observers.js';
 import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
-import { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';
 import { utf8ToBytes } from '../utils/conversion.js';
 import { isDefined } from '../utils/is-defined.js';
 import { bootstrap } from '@libp2p/bootstrap';
 import { tcp } from '@libp2p/tcp';
-import { createRelayNode } from '@waku/sdk/relay';
-import { WAKU_RAILGUN_DEFAULT_PEERS_NODE, WAKU_RAILGUN_PUB_SUB_TOPIC, } from '../models/constants.js';
+import { createLightNode } from '@waku/sdk';
+import { WAKU_RAILGUN_DEFAULT_PEERS_NODE, WAKU_RAILGUN_DEFAULT_PEERS_WEB, WAKU_RAILGUN_PUB_SUB_TOPIC, } from '../models/constants.js';
 export class WakuBroadcasterWakuCore {
     static hasError = false;
     static waku;
@@ -34,48 +33,44 @@ export class WakuBroadcasterWakuCore {
             throw err;
         }
     };
-    static reinitWaku = async (chain, resetCache = true) => {
+    static reinitWaku = async (chain) => {
         if (isDefined(WakuBroadcasterWakuCore.waku) &&
             WakuBroadcasterWakuCore.waku.isStarted()) {
             await WakuBroadcasterWakuCore.disconnect();
         }
-        if (resetCache) {
-            BroadcasterFeeCache.resetCache(chain);
-        }
         await WakuBroadcasterWakuCore.initWaku(chain);
     };
-    static setBroadcasterOptions(BroadcasterOptions) {
-        if (isDefined(BroadcasterOptions.pubSubTopic)) {
-            WakuBroadcasterWakuCore.pubSubTopic = BroadcasterOptions.pubSubTopic;
+    static setBroadcasterOptions(broadcasterOptions) {
+        if (isDefined(broadcasterOptions.pubSubTopic)) {
+            WakuBroadcasterWakuCore.pubSubTopic = broadcasterOptions.pubSubTopic;
         }
-        if (BroadcasterOptions.additionalDirectPeers) {
+        if (broadcasterOptions.additionalDirectPeers) {
             WakuBroadcasterWakuCore.additionalDirectPeers =
-                BroadcasterOptions.additionalDirectPeers;
+                broadcasterOptions.additionalDirectPeers;
         }
-        if (isDefined(BroadcasterOptions.peerDiscoveryTimeout)) {
+        if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {
             WakuBroadcasterWakuCore.peerDiscoveryTimeout =
-                BroadcasterOptions.peerDiscoveryTimeout;
+                broadcasterOptions.peerDiscoveryTimeout;
         }
     }
-    static disconnect = async (removeObservers = false) => {
-        if (removeObservers) {
-            BroadcasterDebug.log('Disconnecting... Removing Observers.');
-            await WakuObservers.removeAllObservers();
-        }
+    static disconnect = async () => {
         await WakuBroadcasterWakuCore.waku?.stop();
         WakuBroadcasterWakuCore.waku = undefined;
     };
     static connect = async () => {
         try {
             WakuBroadcasterWakuCore.hasError = false;
-            BroadcasterDebug.log(`Creating waku client`);
+            BroadcasterDebug.log(`Creating waku broadcast client`);
             const peers = [
                 ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,
+                ...WAKU_RAILGUN_DEFAULT_PEERS_WEB,
                 ...this.additionalDirectPeers,
             ];
-            const waitTimeoutBeforeBootstrap = 1250;
-            const waku = await createRelayNode({
+            const waitTimeoutBeforeBootstrap = 250;
+            const waku = await createLightNode({
                 pubsubTopics: [WakuBroadcasterWakuCore.pubSubTopic],
+                pingKeepAlive: 60,
+                relayKeepAlive: 60,
                 libp2p: {
                     transports: [tcp()],
                     peerDiscovery: [
@@ -90,8 +85,8 @@ export class WakuBroadcasterWakuCore {
             await waku.start();
             BroadcasterDebug.log('Waiting for remote peer.');
             await this.waitForRemotePeer(waku);
-            if (!isDefined(waku.relay)) {
-                throw new Error('No Waku instantiated.');
+            if (!isDefined(waku.lightPush)) {
+                throw new Error('No Waku LightPush instantiated.');
             }
             BroadcasterDebug.log('Waku peers:');
             for (const peer of waku.libp2p.getPeers()) {
@@ -110,21 +105,23 @@ export class WakuBroadcasterWakuCore {
         }
     };
     static getMeshPeerCount() {
-        return (this.waku?.relay.getMeshPeers(WAKU_RAILGUN_PUB_SUB_TOPIC).length ?? 0);
+        return this.getPubSubPeerCount();
     }
     static getPubSubPeerCount() {
         const peers = this.waku?.libp2p.getPeers() ?? [];
         return peers.length;
     }
     static async getLightPushPeerCount() {
-        return 0;
+        const peers = (await this.waku?.lightPush.allPeers()) ?? [];
+        return peers.length;
     }
     static async getFilterPeerCount() {
-        return 0;
+        const peers = (await this.waku?.filter.allPeers()) ?? [];
+        return peers.length;
     }
     static async waitForRemotePeer(waku) {
         try {
-            const protocols = [Protocols.Relay];
+            const protocols = [Protocols.LightPush, Protocols.Filter];
             await promiseTimeout(waitForRemotePeer(waku, protocols), WakuBroadcasterWakuCore.peerDiscoveryTimeout);
         }
         catch (err) {
@@ -135,21 +132,21 @@ export class WakuBroadcasterWakuCore {
             throw new Error(err.message);
         }
     }
-    static async broadcastMessage(data, contentTopic, retry = 0) {
+    static async broadcastMessage(data, contentTopic) {
+        const dataString = JSON.stringify(data);
+        const payload = utf8ToBytes(dataString);
+        const message = { payload };
         try {
-            const dataString = JSON.stringify(data);
-            const payload = utf8ToBytes(dataString);
-            const message = { payload };
-            await WakuBroadcasterWakuCore.waku.relay.send(createEncoder({
+            const results = await WakuBroadcasterWakuCore.waku?.lightPush.send(createEncoder({
                 contentTopic,
                 pubsubTopic: WakuBroadcasterWakuCore.pubSubTopic,
             }), message);
         }
         catch (err) {
-            BroadcasterDebug.error(err);
             if (!(err instanceof Error)) {
                 throw err;
             }
+            BroadcasterDebug.error(err);
         }
     }
 }

package/dist/waku/waku-broadcaster-waku-core.js.map

@@ -1 +1 @@
-{"version":3,"file":"waku-broadcaster-waku-core.js","sourceRoot":"","sources":["../../src/waku/waku-broadcaster-waku-core.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, delay, promiseTimeout } from '@railgun-community/shared-models';\nimport { waitForRemotePeer, createEncoder } from '@waku/core';\nimport { Protocols, IMessage, RelayNode } from '@waku/interfaces';\nimport { WakuObservers } from './waku-observers.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { utf8ToBytes } from '../utils/conversion.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { bootstrap } from '@libp2p/bootstrap';\nimport { tcp } from '@libp2p/tcp';\nimport { createRelayNode } from '@waku/sdk/relay';\nimport { BroadcasterOptions } from '../models/index.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\n\nexport class WakuBroadcasterWakuCore {\n  static hasError = false;\n\n  static waku: Optional<RelayNode>;\n  private static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;\n  private static additionalDirectPeers: string[] = [];\n  private static peerDiscoveryTimeout = 60000;\n\n  static initWaku = async (chain: Chain): Promise<void> => {\n    try {\n      await WakuBroadcasterWakuCore.connect();\n      if (!WakuBroadcasterWakuCore.waku) {\n        BroadcasterDebug.log('No waku instance found');\n        return;\n      }\n      WakuObservers.resetCurrentChain();\n      await WakuObservers.setObserversForChain(\n        WakuBroadcasterWakuCore.waku,\n        chain,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw err;\n    }\n  };\n\n  static reinitWaku = async (chain: Chain, resetCache = true) => {\n    if (\n      isDefined(WakuBroadcasterWakuCore.waku) &&\n      WakuBroadcasterWakuCore.waku.isStarted()\n    ) {\n      await WakuBroadcasterWakuCore.disconnect();\n    }\n\n    // Resets connection status to \"Connecting\" for this network.\n    if (resetCache) {\n      BroadcasterFeeCache.resetCache(chain);\n    }\n\n    await WakuBroadcasterWakuCore.initWaku(chain);\n  };\n\n  static setBroadcasterOptions(BroadcasterOptions: BroadcasterOptions) {\n    if (isDefined(BroadcasterOptions.pubSubTopic)) {\n      WakuBroadcasterWakuCore.pubSubTopic = BroadcasterOptions.pubSubTopic;\n    }\n    if (BroadcasterOptions.additionalDirectPeers) {\n      WakuBroadcasterWakuCore.additionalDirectPeers =\n        BroadcasterOptions.additionalDirectPeers;\n    }\n    if (isDefined(BroadcasterOptions.peerDiscoveryTimeout)) {\n      WakuBroadcasterWakuCore.peerDiscoveryTimeout =\n        BroadcasterOptions.peerDiscoveryTimeout;\n    }\n  }\n\n  static disconnect = async (removeObservers: boolean = false) => {\n    if (removeObservers) {\n      BroadcasterDebug.log('Disconnecting... Removing Observers.');\n      await WakuObservers.removeAllObservers();\n    }\n    await WakuBroadcasterWakuCore.waku?.stop();\n    WakuBroadcasterWakuCore.waku = undefined;\n  };\n\n  private static connect = async (): Promise<void> => {\n    try {\n      WakuBroadcasterWakuCore.hasError = false;\n\n      BroadcasterDebug.log(`Creating waku client`);\n\n      const peers: string[] = [\n        ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n        ...this.additionalDirectPeers,\n      ];\n      const waitTimeoutBeforeBootstrap = 1250; // 250 ms - default is 1000ms\n      const waku: RelayNode = await createRelayNode({\n        pubsubTopics: [WakuBroadcasterWakuCore.pubSubTopic],\n        libp2p: {\n          transports: [tcp()],\n          peerDiscovery: [\n            bootstrap({\n              list: peers,\n              timeout: waitTimeoutBeforeBootstrap,\n            }),\n          ],\n        },\n      });\n\n      BroadcasterDebug.log('Start Waku.');\n      await waku.start();\n\n      BroadcasterDebug.log('Waiting for remote peer.');\n      await this.waitForRemotePeer(waku);\n\n      if (!isDefined(waku.relay)) {\n        throw new Error('No Waku instantiated.');\n      }\n\n      BroadcasterDebug.log('Waku peers:');\n      for (const peer of waku.libp2p.getPeers()) {\n        BroadcasterDebug.log(JSON.stringify(peer));\n      }\n\n      BroadcasterDebug.log('Connected to Waku');\n      WakuBroadcasterWakuCore.waku = waku;\n      WakuBroadcasterWakuCore.hasError = false;\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      WakuBroadcasterWakuCore.hasError = true;\n      throw err;\n    }\n  };\n\n  static getMeshPeerCount(): number {\n    return (\n      this.waku?.relay.getMeshPeers(WAKU_RAILGUN_PUB_SUB_TOPIC).length ?? 0\n    );\n  }\n\n  static getPubSubPeerCount(): number {\n    const peers = this.waku?.libp2p.getPeers() ?? [];\n    return peers.length;\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    return 0;\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    return 0;\n  }\n\n  private static async waitForRemotePeer(waku: RelayNode) {\n    try {\n      const protocols = [Protocols.Relay];\n      await promiseTimeout(\n        waitForRemotePeer(waku, protocols),\n        WakuBroadcasterWakuCore.peerDiscoveryTimeout,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw new Error(err.message);\n    }\n  }\n\n  static async broadcastMessage(\n    data: object,\n    contentTopic: string,\n    retry: number = 0,\n  ): Promise<void> {\n    try {\n      const dataString = JSON.stringify(data);\n      const payload = utf8ToBytes(dataString);\n      const message: IMessage = { payload };\n      // @ts-ignore - waku.relay may not be defined\n      await WakuBroadcasterWakuCore.waku.relay.send(\n        createEncoder({\n          contentTopic,\n          pubsubTopic: WakuBroadcasterWakuCore.pubSubTopic,\n        }),\n        message,\n      );\n    } catch (err) {\n      BroadcasterDebug.error(err);\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"waku-broadcaster-waku-core.js","sourceRoot":"","sources":["../../src/waku/waku-broadcaster-waku-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAuB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,EACL,+BAA+B,EAC/B,8BAA8B,EAC9B,0BAA0B,GAC3B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,OAAO,uBAAuB;IAClC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;IAExB,MAAM,CAAC,IAAI,CAAsB;IAEzB,MAAM,CAAC,WAAW,GAAG,0BAA0B,CAAC;IAChD,MAAM,CAAC,qBAAqB,GAAa,EAAE,CAAC;IAC5C,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAE5C,MAAM,CAAC,QAAQ,GAAG,KAAK,EAAE,KAAY,EAAiB,EAAE;QACtD,IAAI;YACF,MAAM,uBAAuB,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE;gBACjC,gBAAgB,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBAC/C,OAAO;aACR;YACD,aAAa,CAAC,iBAAiB,EAAE,CAAC;YAClC,MAAM,aAAa,CAAC,oBAAoB,CACtC,uBAAuB,CAAC,IAAI,EAC5B,KAAK,CACN,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,GAAG,CAAC;SACX;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,UAAU,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;QACzC,IACE,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC;YACvC,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,EACxC;YACA,MAAM,uBAAuB,CAAC,UAAU,EAAE,CAAC;SAC5C;QAED,MAAM,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,MAAM,CAAC,qBAAqB,CAAC,kBAAsC;QACjE,IAAI,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;YAC7C,uBAAuB,CAAC,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC;SACtE;QACD,IAAI,kBAAkB,CAAC,qBAAqB,EAAE;YAC5C,uBAAuB,CAAC,qBAAqB;gBAC3C,kBAAkB,CAAC,qBAAqB,CAAC;SAC5C;QACD,IAAI,SAAS,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,EAAE;YACtD,uBAAuB,CAAC,oBAAoB;gBAC1C,kBAAkB,CAAC,oBAAoB,CAAC;SAC3C;IACH,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,KAAK,IAAI,EAAE;QAC7B,MAAM,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3C,uBAAuB,CAAC,IAAI,GAAG,SAAS,CAAC;IAC3C,CAAC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,KAAK,IAAmB,EAAE;QACjD,IAAI;YACF,uBAAuB,CAAC,QAAQ,GAAG,KAAK,CAAC;YAEzC,gBAAgB,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;YAEvD,MAAM,KAAK,GAAa;gBACtB,GAAG,+BAA+B;gBAClC,GAAG,8BAA8B;gBACjC,GAAG,IAAI,CAAC,qBAAqB;aAC9B,CAAC;YACF,MAAM,0BAA0B,GAAG,GAAG,CAAC;YACvC,MAAM,IAAI,GAAc,MAAM,eAAe,CAAC;gBAC5C,YAAY,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC;gBACnD,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,EAAE;gBAClB,MAAM,EAAE;oBACN,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC;oBACnB,aAAa,EAAE;wBACb,SAAS,CAAC;4BACR,IAAI,EAAE,KAAK;4BACX,OAAO,EAAE,0BAA0B;yBACpC,CAAC;qBACH;iBACF;aACF,CAAC,CAAC;YAEH,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YAEnB,gBAAgB,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;YAED,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;gBACzC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;aAC5C;YAED,gBAAgB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAC1C,uBAAuB,CAAC,IAAI,GAAG,IAAI,CAAC;YACpC,uBAAuB,CAAC,QAAQ,GAAG,KAAK,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,uBAAuB,CAAC,QAAQ,GAAG,IAAI,CAAC;YACxC,MAAM,GAAG,CAAC;SACX;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,gBAAgB;QACrB,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,kBAAkB;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB;QAChC,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB;QAC7B,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAe;QACpD,IAAI;YACF,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,cAAc,CAClB,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,EAClC,uBAAuB,CAAC,oBAAoB,CAC7C,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC9B;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,IAAY,EACZ,YAAoB;QAEpB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,OAAO,GAAa,EAAE,OAAO,EAAE,CAAC;QACtC,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAChE,aAAa,CAAC;gBACZ,YAAY;gBACZ,WAAW,EAAE,uBAAuB,CAAC,WAAW;aACjD,CAAC,EACF,OAAO,CACR,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC7B;IACH,CAAC","sourcesContent":["import { Chain, promiseTimeout } from '@railgun-community/shared-models';\nimport { waitForRemotePeer, createEncoder } from '@waku/core';\nimport { Protocols, IMessage, LightNode } from '@waku/interfaces';\nimport { WakuObservers } from './waku-observers.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { utf8ToBytes } from '../utils/conversion.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { bootstrap } from '@libp2p/bootstrap';\nimport { tcp } from '@libp2p/tcp';\nimport { createLightNode } from '@waku/sdk';\nimport { BroadcasterOptions } from '../models/index.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n  WAKU_RAILGUN_DEFAULT_PEERS_WEB,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\n\nexport class WakuBroadcasterWakuCore {\n  static hasError = false;\n\n  static waku: Optional<LightNode>;\n\n  private static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;\n  private static additionalDirectPeers: string[] = [];\n  private static peerDiscoveryTimeout = 60000;\n\n  static initWaku = async (chain: Chain): Promise<void> => {\n    try {\n      await WakuBroadcasterWakuCore.connect();\n      if (!WakuBroadcasterWakuCore.waku) {\n        BroadcasterDebug.log('No waku instance found');\n        return;\n      }\n      WakuObservers.resetCurrentChain();\n      await WakuObservers.setObserversForChain(\n        WakuBroadcasterWakuCore.waku,\n        chain,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw err;\n    }\n  };\n\n  static reinitWaku = async (chain: Chain) => {\n    if (\n      isDefined(WakuBroadcasterWakuCore.waku) &&\n      WakuBroadcasterWakuCore.waku.isStarted()\n    ) {\n      await WakuBroadcasterWakuCore.disconnect();\n    }\n\n    await WakuBroadcasterWakuCore.initWaku(chain);\n  };\n\n  static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions) {\n    if (isDefined(broadcasterOptions.pubSubTopic)) {\n      WakuBroadcasterWakuCore.pubSubTopic = broadcasterOptions.pubSubTopic;\n    }\n    if (broadcasterOptions.additionalDirectPeers) {\n      WakuBroadcasterWakuCore.additionalDirectPeers =\n        broadcasterOptions.additionalDirectPeers;\n    }\n    if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {\n      WakuBroadcasterWakuCore.peerDiscoveryTimeout =\n        broadcasterOptions.peerDiscoveryTimeout;\n    }\n  }\n\n  static disconnect = async () => {\n    await WakuBroadcasterWakuCore.waku?.stop();\n    WakuBroadcasterWakuCore.waku = undefined;\n  };\n\n  private static connect = async (): Promise<void> => {\n    try {\n      WakuBroadcasterWakuCore.hasError = false;\n\n      BroadcasterDebug.log(`Creating waku broadcast client`);\n\n      const peers: string[] = [\n        ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n        ...WAKU_RAILGUN_DEFAULT_PEERS_WEB,\n        ...this.additionalDirectPeers,\n      ];\n      const waitTimeoutBeforeBootstrap = 250; // 250 ms - default is 1000ms\n      const waku: LightNode = await createLightNode({\n        pubsubTopics: [WakuBroadcasterWakuCore.pubSubTopic],\n        pingKeepAlive: 60,\n        relayKeepAlive: 60,\n        libp2p: {\n          transports: [tcp()],\n          peerDiscovery: [\n            bootstrap({\n              list: peers,\n              timeout: waitTimeoutBeforeBootstrap,\n            }),\n          ],\n        },\n      });\n\n      BroadcasterDebug.log('Start Waku.');\n      await waku.start();\n\n      BroadcasterDebug.log('Waiting for remote peer.');\n      await this.waitForRemotePeer(waku);\n\n      if (!isDefined(waku.lightPush)) {\n        throw new Error('No Waku LightPush instantiated.');\n      }\n\n      BroadcasterDebug.log('Waku peers:');\n      for (const peer of waku.libp2p.getPeers()) {\n        BroadcasterDebug.log(JSON.stringify(peer));\n      }\n\n      BroadcasterDebug.log('Connected to Waku');\n      WakuBroadcasterWakuCore.waku = waku;\n      WakuBroadcasterWakuCore.hasError = false;\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      WakuBroadcasterWakuCore.hasError = true;\n      throw err;\n    }\n  };\n\n  static getMeshPeerCount(): number {\n    return this.getPubSubPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    const peers = this.waku?.libp2p.getPeers() ?? [];\n    return peers.length;\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    const peers = (await this.waku?.lightPush.allPeers()) ?? [];\n    return peers.length;\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    const peers = (await this.waku?.filter.allPeers()) ?? [];\n    return peers.length;\n  }\n\n  private static async waitForRemotePeer(waku: LightNode) {\n    try {\n      const protocols = [Protocols.LightPush, Protocols.Filter];\n      await promiseTimeout(\n        waitForRemotePeer(waku, protocols),\n        WakuBroadcasterWakuCore.peerDiscoveryTimeout,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw new Error(err.message);\n    }\n  }\n\n  static async broadcastMessage(\n    data: object,\n    contentTopic: string,\n  ): Promise<void> {\n    const dataString = JSON.stringify(data);\n    const payload = utf8ToBytes(dataString);\n    const message: IMessage = { payload };\n    try {\n      const results = await WakuBroadcasterWakuCore.waku?.lightPush.send(\n        createEncoder({\n          contentTopic,\n          pubsubTopic: WakuBroadcasterWakuCore.pubSubTopic,\n        }),\n        message,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n    }\n  }\n}\n"]}

package/dist/waku/waku-observers.d.ts

@@ -1,16 +1,20 @@
 import { Chain } from '@railgun-community/shared-models';
-import { RelayNode } from '@waku/interfaces';
+import { LightNode } from '@waku/interfaces';
 export declare class WakuObservers {
     private static currentChain;
     private static currentContentTopics;
     private static currentSubscriptions;
-    static setObserversForChain: (waku: Optional<RelayNode>, chain: Chain) => Promise<void>;
+    static setObserversForChain: (waku: Optional<LightNode>, chain: Chain) => Promise<void>;
     static resetCurrentChain: () => void;
-    static removeAllObservers: () => Promise<void>;
+    private static resubScribeLoop;
+    private static isPinging;
+    static pingAllSubscriptions: (waku: Optional<LightNode>) => Promise<void>;
+    private static removeAllObservers;
     private static getDecodersForChain;
     static subscribedPeers: string[];
     private static addChainObservers;
-    static addTransportSubscription(waku: Optional<RelayNode>, topic: string, callback: (message: any) => void): Promise<void>;
+    static hasStartedPinging: boolean;
+    static addTransportSubscription(waku: Optional<LightNode>, topic: string, callback: (message: any) => void): Promise<void>;
     private static addSubscriptions;
-    static getCurrentContentTopics(waku?: RelayNode): string[];
+    static getCurrentContentTopics(): string[];
 }

package/dist/waku/waku-observers.js

@@ -1,4 +1,4 @@
-import { compareChains } from '@railgun-community/shared-models';
+import { compareChains, delay } from '@railgun-community/shared-models';
 import { createDecoder } from '@waku/core';
 import { contentTopics } from './waku-topics.js';
 import { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';
@@ -6,10 +6,11 @@ import { BroadcasterTransactResponse } from '../transact/broadcaster-transact-re
 import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
 import { isDefined } from '../utils/is-defined.js';
 import { WAKU_RAILGUN_PUB_SUB_TOPIC } from '../models/constants.js';
+import { WakuBroadcasterClient } from '../waku-broadcaster-client.js';
 export class WakuObservers {
     static currentChain;
     static currentContentTopics = [];
-    static currentSubscriptions = [];
+    static currentSubscriptions;
     static setObserversForChain = async (waku, chain) => {
         if (!waku) {
             return;
@@ -20,19 +21,92 @@ export class WakuObservers {
         }
         BroadcasterDebug.log(`Add Waku observers for chain: ${chain.type}:${chain.id}`);
         WakuObservers.currentChain = chain;
-        await WakuObservers.removeAllObservers();
+        await WakuObservers.removeAllObservers(waku);
+        BroadcasterDebug.log('Removed all observers');
         await WakuObservers.addChainObservers(waku, chain);
         BroadcasterDebug.log(`Waku listening for events on chain: ${chain.type}:${chain.id}`);
     };
     static resetCurrentChain = () => {
-        this.currentChain = undefined;
+        WakuObservers.currentChain = undefined;
     };
-    static removeAllObservers = async () => {
-        for (const unsubscribe of this.currentSubscriptions ?? []) {
-            await unsubscribe();
+    static resubScribeLoop = async (subscription, decoder, callback) => {
+        BroadcasterDebug.log('Resubscribe Loop');
+        const result = await subscription
+            .subscribe(decoder, callback)
+            .then(() => {
+            BroadcasterDebug.log('Resubscribed');
+        })
+            .catch(err => {
+            BroadcasterDebug.error(new Error(`Error re-subscribing: ${err.message}`));
+            return undefined;
+        });
+        return;
+    };
+    static isPinging = false;
+    static pingAllSubscriptions = async (waku) => {
+        if (WakuObservers.isPinging === true) {
+            return;
+        }
+        WakuObservers.isPinging = true;
+        if (isDefined(WakuObservers.currentSubscriptions)) {
+            try {
+                if (WakuObservers.currentSubscriptions.length === 0) {
+                    BroadcasterDebug.log('No subscriptions to ping');
+                    throw new Error('No subscriptions to ping');
+                }
+                for (const { subscription, params, } of WakuObservers.currentSubscriptions) {
+                    if (!WakuObservers.isPinging) {
+                        BroadcasterDebug.log('Stop pinging');
+                        break;
+                    }
+                    let pingSuccess = false;
+                    await subscription
+                        .ping()
+                        .then(() => {
+                        BroadcasterDebug.log('Ping Success');
+                        pingSuccess = true;
+                    })
+                        .catch(async (err) => {
+                        BroadcasterDebug.error(new Error(`Ping Error: ${err.message}`));
+                        throw new Error(err.message);
+                    })
+                        .finally(() => {
+                        if (!pingSuccess) {
+                            BroadcasterDebug.log("pingAllSubscriptions: Ping failed, let's reconnect");
+                            throw new Error('Ping failed, lets reconnect');
+                        }
+                    });
+                }
+            }
+            catch (error) {
+                await WakuBroadcasterClient.tryReconnect();
+                WakuObservers.isPinging = false;
+                WakuObservers.subscribedPeers = [];
+                await WakuObservers.addSubscriptions(WakuObservers.currentChain, waku).catch(err => {
+                    BroadcasterDebug.error(new Error(`Error adding subscriptions. ${err.message}`));
+                });
+            }
+        }
+        await delay(15 * 1000);
+        WakuObservers.isPinging = false;
+        WakuObservers.pingAllSubscriptions(waku);
+    };
+    static removeAllObservers = async (waku) => {
+        if (!isDefined(waku?.lightPush)) {
+            return;
+        }
+        if (isDefined(WakuObservers.currentSubscriptions)) {
+            for (const { subscription } of WakuObservers.currentSubscriptions) {
+                await subscription
+                    .unsubscribe(WakuObservers.currentContentTopics)
+                    .catch((err) => {
+                    BroadcasterDebug.log(`Unsubscribe Error ${err.message}`);
+                });
+            }
+            WakuObservers.currentSubscriptions = [];
+            WakuObservers.currentContentTopics = [];
+            WakuObservers.subscribedPeers = [];
         }
-        this.currentContentTopics = [];
-        this.currentSubscriptions = [];
     };
     static getDecodersForChain = (chain) => {
         const contentTopicFees = contentTopics.fees(chain);
@@ -55,18 +129,23 @@ export class WakuObservers {
     };
     static subscribedPeers = [];
     static addChainObservers = async (waku, chain) => {
-        if (!isDefined(waku.relay)) {
+        if (!isDefined(waku.filter)) {
             return;
         }
         await WakuObservers.addSubscriptions(chain, waku).catch(err => {
             BroadcasterDebug.log(`Error adding Observers. ${err.message}`);
         });
+        if (!WakuObservers.hasStartedPinging) {
+            WakuObservers.hasStartedPinging = true;
+            WakuObservers.pingAllSubscriptions(waku);
+        }
         const currentContentTopics = WakuObservers.getCurrentContentTopics();
         BroadcasterDebug.log('Waku content topics:');
         for (const observer of currentContentTopics) {
             BroadcasterDebug.log(observer);
         }
     };
+    static hasStartedPinging;
     static async addTransportSubscription(waku, topic, callback) {
         if (!isDefined(waku)) {
             BroadcasterDebug.log('No waku instance found, Transport Subscription not added.');
@@ -74,9 +153,26 @@ export class WakuObservers {
         }
         const transportTopic = contentTopics.encrypted(topic);
         const decoder = createDecoder(transportTopic, WAKU_RAILGUN_PUB_SUB_TOPIC);
-        const unsubscribe = await waku.relay.subscribe(decoder, callback);
-        this.currentSubscriptions.push(unsubscribe);
-        this.currentContentTopics.push(transportTopic);
+        const peers = await waku.filter.allPeers();
+        for (const peer of peers) {
+            if (WakuObservers.subscribedPeers.includes(peer.id.toString())) {
+                continue;
+            }
+            const filterSubscription = await waku.filter.createSubscription(WAKU_RAILGUN_PUB_SUB_TOPIC, peer.id);
+            const params = {
+                topic: transportTopic,
+                decoder,
+                callback,
+            };
+            await filterSubscription.subscribe(decoder, callback);
+            WakuObservers.currentSubscriptions?.push({
+                subscription: filterSubscription,
+                params: [params],
+            });
+            WakuObservers.subscribedPeers.push(peer.id.toString());
+            BroadcasterDebug.log(`Adding peer complete ${peer.id.toString()}`);
+        }
+        WakuObservers.currentContentTopics.push(transportTopic);
     }
     static async addSubscriptions(chain, waku) {
         if (!isDefined(chain) || !isDefined(waku)) {
@@ -85,16 +181,30 @@ export class WakuObservers {
         }
         const subscriptionParams = WakuObservers.getDecodersForChain(chain);
         const topics = subscriptionParams.map(subParam => subParam.topic);
-        const newTopics = topics.filter(topic => !this.currentContentTopics.includes(topic));
-        this.currentContentTopics.push(...newTopics);
-        for (const subParam of subscriptionParams) {
-            const { decoder, callback } = subParam;
-            const unsubscribe = await waku.relay.subscribe(decoder, callback);
-            this.currentSubscriptions.push(unsubscribe);
+        const newTopics = topics.filter(topic => !WakuObservers.currentContentTopics.includes(topic));
+        WakuObservers.currentContentTopics.push(...newTopics);
+        const peers = await waku.libp2p.peerStore.all();
+        for (const peer of peers) {
+            if (WakuObservers.subscribedPeers.includes(peer.id.toString())) {
+                continue;
+            }
+            const filterSubscription = await waku.filter.createSubscription(WAKU_RAILGUN_PUB_SUB_TOPIC, peer.id);
+            for (const subParam of subscriptionParams) {
+                const { decoder, callback } = subParam;
+                await filterSubscription.subscribe(decoder, callback);
+            }
+            this.currentSubscriptions ??= [];
+            const newParams = {
+                subscription: filterSubscription,
+                params: subscriptionParams,
+            };
+            WakuObservers.currentSubscriptions?.push(newParams);
+            WakuObservers.subscribedPeers.push(peer.id.toString());
+            BroadcasterDebug.log(`Adding peer complete ${peer.id.toString()}`);
         }
     }
-    static getCurrentContentTopics(waku) {
-        return this.currentContentTopics;
+    static getCurrentContentTopics() {
+        return WakuObservers.currentContentTopics;
     }
 }
 //# sourceMappingURL=waku-observers.js.map

package/dist/waku/waku-observers.js.map

@@ -1 +1 @@
-{"version":3,"file":"waku-observers.js","sourceRoot":"","sources":["../../src/waku/waku-observers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, compareChains, delay } from '@railgun-community/shared-models';\nimport { createDecoder } from '@waku/core';\nimport { contentTopics } from './waku-topics.js';\nimport {\n  IMessage,\n  IFilterSubscription,\n  IDecoder,\n  RelayNode,\n  Unsubscribe,\n} from '@waku/interfaces';\nimport { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';\nimport { BroadcasterTransactResponse } from '../transact/broadcaster-transact-response.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WAKU_RAILGUN_PUB_SUB_TOPIC } from '../models/constants.js';\n\ntype SubscriptionParams = {\n  topic: string;\n  decoder: IDecoder<any> | IDecoder<any>[];\n  callback: (message: any) => void;\n};\n\nexport class WakuObservers {\n  private static currentChain: Optional<Chain>;\n  private static currentContentTopics: string[] = [];\n  private static currentSubscriptions: Unsubscribe[] = [];\n  static setObserversForChain = async (\n    waku: Optional<RelayNode>,\n    chain: Chain,\n  ) => {\n    if (!waku) {\n      return;\n    }\n    if (\n      WakuObservers.currentChain &&\n      compareChains(WakuObservers.currentChain, chain)\n    ) {\n      return;\n    }\n    BroadcasterDebug.log(\n      `Add Waku observers for chain: ${chain.type}:${chain.id}`,\n    );\n    WakuObservers.currentChain = chain;\n    await WakuObservers.removeAllObservers();\n    await WakuObservers.addChainObservers(waku, chain);\n    BroadcasterDebug.log(\n      `Waku listening for events on chain: ${chain.type}:${chain.id}`,\n    );\n  };\n\n  static resetCurrentChain = () => {\n    this.currentChain = undefined;\n  };\n\n  static removeAllObservers = async () => {\n    for (const unsubscribe of this.currentSubscriptions ?? []) {\n      await unsubscribe();\n    }\n    this.currentContentTopics = [];\n    this.currentSubscriptions = [];\n  };\n\n  private static getDecodersForChain = (chain: Chain) => {\n    const contentTopicFees = contentTopics.fees(chain);\n    const contentTopicTransactResponse = contentTopics.transactResponse(chain);\n    const feesDecoder = createDecoder(\n      contentTopicFees,\n      WAKU_RAILGUN_PUB_SUB_TOPIC,\n    );\n    const transactResponseDecoder = createDecoder(\n      contentTopicTransactResponse,\n      WAKU_RAILGUN_PUB_SUB_TOPIC,\n    );\n    const feesCallback = (message: IMessage) =>\n      handleBroadcasterFeesMessage(chain, message, contentTopicFees);\n    const transactResponseCallback =\n      BroadcasterTransactResponse.handleBroadcasterTransactionResponseMessage;\n\n    const feesSubscriptionParams = {\n      topic: contentTopicFees,\n      decoder: feesDecoder,\n      callback: feesCallback,\n    };\n    const transactResponseSubscriptionParams = {\n      topic: contentTopicTransactResponse,\n      decoder: transactResponseDecoder,\n      callback: transactResponseCallback,\n    };\n    return [feesSubscriptionParams, transactResponseSubscriptionParams];\n  };\n\n  static subscribedPeers: string[] = [];\n\n  private static addChainObservers = async (waku: RelayNode, chain: Chain) => {\n    if (!isDefined(waku.relay)) {\n      return;\n    }\n\n    await WakuObservers.addSubscriptions(chain, waku).catch(err => {\n      BroadcasterDebug.log(`Error adding Observers. ${err.message}`);\n    });\n\n    // Log current list of observers\n    const currentContentTopics = WakuObservers.getCurrentContentTopics();\n    BroadcasterDebug.log('Waku content topics:');\n    for (const observer of currentContentTopics) {\n      BroadcasterDebug.log(observer);\n    }\n  };\n\n  static async addTransportSubscription(\n    waku: Optional<RelayNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    if (!isDefined(waku)) {\n      BroadcasterDebug.log(\n        'No waku instance found, Transport Subscription not added.',\n      );\n      return;\n    }\n    const transportTopic = contentTopics.encrypted(topic);\n    const decoder = createDecoder(transportTopic, WAKU_RAILGUN_PUB_SUB_TOPIC);\n    const unsubscribe = await waku.relay.subscribe(decoder, callback);\n    this.currentSubscriptions.push(unsubscribe);\n    this.currentContentTopics.push(transportTopic);\n  }\n\n  private static async addSubscriptions(\n    chain: Optional<Chain>,\n    waku: Optional<RelayNode>,\n  ) {\n    if (!isDefined(chain) || !isDefined(waku)) {\n      BroadcasterDebug.log('AddSubscription: No Waku or Chain defined.');\n      return;\n    }\n\n    const subscriptionParams = WakuObservers.getDecodersForChain(chain);\n    const topics = subscriptionParams.map(subParam => subParam.topic);\n    const newTopics = topics.filter(\n      topic => !this.currentContentTopics.includes(topic),\n    );\n    this.currentContentTopics.push(...newTopics);\n\n    for (const subParam of subscriptionParams) {\n      const { decoder, callback } = subParam;\n      const unsubscribe = await waku.relay.subscribe(decoder, callback);\n      this.currentSubscriptions.push(unsubscribe);\n    }\n  }\n\n  static getCurrentContentTopics(waku?: RelayNode): string[] {\n    return this.currentContentTopics;\n  }\n}\n"]}
+{"version":3,"file":"waku-observers.js","sourceRoot":"","sources":["../../src/waku/waku-observers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, compareChains, delay } from '@railgun-community/shared-models';\nimport { createDecoder } from '@waku/core';\nimport { contentTopics } from './waku-topics.js';\nimport {\n  LightNode,\n  IMessage,\n  IFilterSubscription,\n  IDecoder,\n  Unsubscribe,\n} from '@waku/interfaces';\nimport { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';\nimport { BroadcasterTransactResponse } from '../transact/broadcaster-transact-response.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WAKU_RAILGUN_PUB_SUB_TOPIC } from '../models/constants.js';\nimport { WakuBroadcasterClient } from '../waku-broadcaster-client.js';\n\ntype SubscriptionParams = {\n  topic: string;\n  decoder: IDecoder<any> | IDecoder<any>[];\n  callback: (message: any) => void;\n};\n\nexport class WakuObservers {\n  private static currentChain: Optional<Chain>;\n  private static currentContentTopics: string[] = [];\n  private static currentSubscriptions:\n    | { subscription: IFilterSubscription; params: SubscriptionParams[] }[]\n    | undefined;\n\n  static setObserversForChain = async (\n    waku: Optional<LightNode>,\n    chain: Chain,\n  ) => {\n    if (!waku) {\n      return;\n    }\n    if (\n      WakuObservers.currentChain &&\n      compareChains(WakuObservers.currentChain, chain)\n    ) {\n      return;\n    }\n    BroadcasterDebug.log(\n      `Add Waku observers for chain: ${chain.type}:${chain.id}`,\n    );\n    WakuObservers.currentChain = chain;\n    await WakuObservers.removeAllObservers(waku);\n    BroadcasterDebug.log('Removed all observers');\n    await WakuObservers.addChainObservers(waku, chain);\n    BroadcasterDebug.log(\n      `Waku listening for events on chain: ${chain.type}:${chain.id}`,\n    );\n  };\n\n  static resetCurrentChain = () => {\n    WakuObservers.currentChain = undefined;\n  };\n\n  private static resubScribeLoop = async (\n    subscription: IFilterSubscription,\n    decoder: IDecoder<any> | IDecoder<any>[],\n    callback: (message: any) => void,\n  ): Promise<void> => {\n    BroadcasterDebug.log('Resubscribe Loop');\n    const result = await subscription\n      .subscribe(decoder, callback)\n      .then(() => {\n        BroadcasterDebug.log('Resubscribed');\n      })\n      .catch(err => {\n        BroadcasterDebug.error(\n          new Error(`Error re-subscribing: ${err.message}`),\n        );\n        return undefined;\n      });\n\n    return;\n  };\n  private static isPinging = false;\n  static pingAllSubscriptions = async (waku: Optional<LightNode>) => {\n    if (WakuObservers.isPinging === true) {\n      return;\n    }\n    WakuObservers.isPinging = true;\n    if (isDefined(WakuObservers.currentSubscriptions)) {\n      try {\n        if (WakuObservers.currentSubscriptions.length === 0) {\n          BroadcasterDebug.log('No subscriptions to ping');\n          throw new Error('No subscriptions to ping');\n        }\n        for (const {\n          subscription,\n          params,\n        } of WakuObservers.currentSubscriptions) {\n          if (!WakuObservers.isPinging) {\n            // removeAllObservers was called. Stop pinging.\n            BroadcasterDebug.log('Stop pinging');\n            break;\n          }\n          let pingSuccess = false;\n          await subscription\n            .ping()\n            .then(() => {\n              BroadcasterDebug.log('Ping Success');\n              pingSuccess = true;\n            })\n            .catch(async (err: Error) => {\n              // No response received for request\n              // Failed to get a connection to the peer\n              // the connection is being closed\n              // peer has no subscriptions\n              BroadcasterDebug.error(new Error(`Ping Error: ${err.message}`));\n              throw new Error(err.message);\n            })\n            .finally(() => {\n              if (!pingSuccess) {\n                BroadcasterDebug.log(\n                  \"pingAllSubscriptions: Ping failed, let's reconnect\",\n                );\n                throw new Error('Ping failed, lets reconnect');\n              }\n            });\n        }\n      } catch (error) {\n        await WakuBroadcasterClient.tryReconnect();\n        WakuObservers.isPinging = false;\n        WakuObservers.subscribedPeers = [];\n        await WakuObservers.addSubscriptions(\n          WakuObservers.currentChain,\n          waku,\n        ).catch(err => {\n          BroadcasterDebug.error(\n            new Error(`Error adding subscriptions. ${err.message}`),\n          );\n        });\n      }\n    }\n    await delay(15 * 1000);\n    WakuObservers.isPinging = false;\n    WakuObservers.pingAllSubscriptions(waku);\n  };\n\n  private static removeAllObservers = async (waku: Optional<LightNode>) => {\n    if (!isDefined(waku?.lightPush)) {\n      return;\n    }\n    if (isDefined(WakuObservers.currentSubscriptions)) {\n      for (const { subscription } of WakuObservers.currentSubscriptions) {\n        await subscription\n          .unsubscribe(WakuObservers.currentContentTopics)\n          .catch((err: Error) => {\n            BroadcasterDebug.log(`Unsubscribe Error ${err.message}`);\n          });\n      }\n      WakuObservers.currentSubscriptions = [];\n      WakuObservers.currentContentTopics = [];\n      WakuObservers.subscribedPeers = [];\n    }\n  };\n\n  private static getDecodersForChain = (chain: Chain) => {\n    const contentTopicFees = contentTopics.fees(chain);\n    const contentTopicTransactResponse = contentTopics.transactResponse(chain);\n    const feesDecoder = createDecoder(\n      contentTopicFees,\n      WAKU_RAILGUN_PUB_SUB_TOPIC,\n    );\n    const transactResponseDecoder = createDecoder(\n      contentTopicTransactResponse,\n      WAKU_RAILGUN_PUB_SUB_TOPIC,\n    );\n    const feesCallback = (message: IMessage) =>\n      handleBroadcasterFeesMessage(chain, message, contentTopicFees);\n    const transactResponseCallback =\n      BroadcasterTransactResponse.handleBroadcasterTransactionResponseMessage;\n\n    const feesSubscriptionParams = {\n      topic: contentTopicFees,\n      decoder: feesDecoder,\n      callback: feesCallback,\n    };\n    const transactResponseSubscriptionParams = {\n      topic: contentTopicTransactResponse,\n      decoder: transactResponseDecoder,\n      callback: transactResponseCallback,\n    };\n    return [feesSubscriptionParams, transactResponseSubscriptionParams];\n  };\n\n  static subscribedPeers: string[] = [];\n\n  private static addChainObservers = async (waku: LightNode, chain: Chain) => {\n    if (!isDefined(waku.filter)) {\n      return;\n    }\n\n    await WakuObservers.addSubscriptions(chain, waku).catch(err => {\n      BroadcasterDebug.log(`Error adding Observers. ${err.message}`);\n    });\n    if (!WakuObservers.hasStartedPinging) {\n      WakuObservers.hasStartedPinging = true;\n      WakuObservers.pingAllSubscriptions(waku);\n    }\n    // Log current list of observers\n    const currentContentTopics = WakuObservers.getCurrentContentTopics();\n    BroadcasterDebug.log('Waku content topics:');\n    for (const observer of currentContentTopics) {\n      BroadcasterDebug.log(observer);\n    }\n  };\n  static hasStartedPinging: boolean;\n\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    if (!isDefined(waku)) {\n      BroadcasterDebug.log(\n        'No waku instance found, Transport Subscription not added.',\n      );\n      return;\n    }\n    const transportTopic = contentTopics.encrypted(topic);\n    const decoder = createDecoder(transportTopic, WAKU_RAILGUN_PUB_SUB_TOPIC);\n    const peers = await waku.filter.allPeers();\n\n    for (const peer of peers) {\n      if (WakuObservers.subscribedPeers.includes(peer.id.toString())) {\n        continue;\n      }\n      const filterSubscription = await waku.filter.createSubscription(\n        WAKU_RAILGUN_PUB_SUB_TOPIC,\n        peer.id,\n      );\n      const params: SubscriptionParams = {\n        topic: transportTopic,\n        decoder,\n        callback,\n      };\n      await filterSubscription.subscribe(decoder, callback);\n      WakuObservers.currentSubscriptions?.push({\n        subscription: filterSubscription,\n        params: [params],\n      });\n      WakuObservers.subscribedPeers.push(peer.id.toString());\n      BroadcasterDebug.log(`Adding peer complete ${peer.id.toString()}`);\n    }\n    WakuObservers.currentContentTopics.push(transportTopic);\n  }\n\n  private static async addSubscriptions(\n    chain: Optional<Chain>,\n    waku: Optional<LightNode>,\n  ) {\n    if (!isDefined(chain) || !isDefined(waku)) {\n      BroadcasterDebug.log('AddSubscription: No Waku or Chain defined.');\n      return;\n    }\n    const subscriptionParams = WakuObservers.getDecodersForChain(chain);\n    const topics = subscriptionParams.map(subParam => subParam.topic);\n    const newTopics = topics.filter(\n      topic => !WakuObservers.currentContentTopics.includes(topic),\n    );\n    WakuObservers.currentContentTopics.push(...newTopics);\n    const peers = await waku.libp2p.peerStore.all();\n    for (const peer of peers) {\n      if (WakuObservers.subscribedPeers.includes(peer.id.toString())) {\n        continue;\n      }\n      const filterSubscription = await waku.filter.createSubscription(\n        WAKU_RAILGUN_PUB_SUB_TOPIC,\n        peer.id,\n      );\n      for (const subParam of subscriptionParams) {\n        const { decoder, callback } = subParam;\n        await filterSubscription.subscribe(decoder, callback);\n      }\n      this.currentSubscriptions ??= [];\n      const newParams = {\n        subscription: filterSubscription,\n        params: subscriptionParams,\n      };\n      WakuObservers.currentSubscriptions?.push(newParams);\n      WakuObservers.subscribedPeers.push(peer.id.toString());\n      BroadcasterDebug.log(`Adding peer complete ${peer.id.toString()}`);\n    }\n  }\n\n  static getCurrentContentTopics(): string[] {\n    return WakuObservers.currentContentTopics;\n  }\n}\n"]}

package/dist/waku-broadcaster-client.d.ts

@@ -1,14 +1,15 @@
 import { Chain, SelectedBroadcaster } from '@railgun-community/shared-models';
 import { BroadcasterConnectionStatusCallback, BroadcasterDebugger, BroadcasterOptions } from './models/export-models.js';
-import { RelayNode } from '@waku/sdk';
+import type { LightNode } from '@waku/interfaces';
 export declare class WakuBroadcasterClient {
     private static chain;
     private static statusCallback;
     private static started;
     private static isRestarting;
     static pollDelay: number;
-    static failureCount: number;
     static start(chain: Chain, broadcasterOptions: BroadcasterOptions, statusCallback: BroadcasterConnectionStatusCallback, broadcasterDebugger?: BroadcasterDebugger): Promise<void>;
+    private static peerRetryCount;
+    private static pollConnection;
     static stop(): Promise<void>;
     static isStarted(): boolean;
     static setChain(chain: Chain): Promise<void>;
@@ -22,12 +23,12 @@ export declare class WakuBroadcasterClient {
     static findRandomBroadcasterForToken(chain: Chain, tokenAddress: string, useRelayAdapt: boolean, percentageThreshold?: number): Optional<SelectedBroadcaster>;
     static findBroadcastersForToken(chain: Chain, tokenAddress: string, useRelayAdapt: boolean): Optional<SelectedBroadcaster[]>;
     static setAddressFilters(allowlist: Optional<string[]>, blocklist: Optional<string[]>): void;
-    static tryReconnect(resetCache?: boolean): Promise<void>;
+    static tryReconnect(): Promise<void>;
     static supportsToken(chain: Chain, tokenAddress: string, useRelayAdapt: boolean): boolean;
     private static restart;
     private static pollStatus;
     private static updateStatus;
-    static addTransportSubscription(waku: Optional<RelayNode>, topic: string, callback: (message: any) => void): Promise<void>;
+    static addTransportSubscription(waku: Optional<LightNode>, topic: string, callback: (message: any) => void): Promise<void>;
     static sendTransport(data: object, topic: string): void;
-    static getWakuCore(): Optional<RelayNode>;
+    static getWakuCore(): Optional<LightNode>;
 }

package/dist/waku-broadcaster-client.js

@@ -13,7 +13,6 @@ export class WakuBroadcasterClient {
     static started = false;
     static isRestarting = false;
     static pollDelay = 3000;
-    static failureCount = 0;
     static async start(chain, broadcasterOptions, statusCallback, broadcasterDebugger) {
         this.chain = chain;
         this.statusCallback = statusCallback;
@@ -36,8 +35,26 @@ export class WakuBroadcasterClient {
             throw new Error('Cannot connect to Broadcaster network.', { cause });
         }
     }
+    static peerRetryCount = 0;
+    static pollConnection = async () => {
+        const peerCount = WakuBroadcasterWakuCore.getMeshPeerCount();
+        if (peerCount < 1) {
+            if (this.peerRetryCount >= 2) {
+                this.peerRetryCount = 0;
+                await this.restart();
+            }
+            else {
+                this.peerRetryCount += 1;
+            }
+        }
+        else {
+            this.peerRetryCount = 0;
+        }
+        await delay(WakuBroadcasterClient.pollDelay);
+        this.pollConnection();
+    };
     static async stop() {
-        await WakuBroadcasterWakuCore.disconnect(true);
+        await WakuBroadcasterWakuCore.disconnect();
         this.started = false;
         this.updateStatus();
     }
@@ -95,24 +112,21 @@ export class WakuBroadcasterClient {
         AddressFilter.setAllowlist(allowlist);
         AddressFilter.setBlocklist(blocklist);
     }
-    static async tryReconnect(resetCache = true) {
-        if (resetCache) {
-            BroadcasterFeeCache.resetCache(WakuBroadcasterClient.chain);
-        }
+    static async tryReconnect() {
         WakuBroadcasterClient.updateStatus();
-        await WakuBroadcasterClient.restart(resetCache);
+        await WakuBroadcasterClient.restart();
     }
     static supportsToken(chain, tokenAddress, useRelayAdapt) {
         return BroadcasterFeeCache.supportsToken(chain, tokenAddress, useRelayAdapt);
     }
-    static async restart(resetCache = true) {
+    static async restart() {
         if (this.isRestarting || !this.started) {
             return;
         }
         this.isRestarting = true;
         try {
             BroadcasterDebug.log('Restarting Waku...');
-            await WakuBroadcasterWakuCore.reinitWaku(this.chain, resetCache);
+            await WakuBroadcasterWakuCore.reinitWaku(this.chain);
             this.isRestarting = false;
         }
         catch (cause) {
@@ -124,17 +138,11 @@ export class WakuBroadcasterClient {
         }
     }
     static async pollStatus() {
-        const pubsubPeers = WakuBroadcasterWakuCore.getPubSubPeerCount();
-        if (pubsubPeers === 0) {
-            if (WakuBroadcasterClient.failureCount > 2) {
-                await this.tryReconnect(false);
-                WakuBroadcasterClient.failureCount = 0;
-            }
-            WakuBroadcasterClient.failureCount += 1;
+        if (!this.isRestarting) {
+            this.updateStatus();
         }
         else {
             this.updateStatus();
-            WakuBroadcasterClient.failureCount = 0;
         }
         await delay(WakuBroadcasterClient.pollDelay);
         this.pollStatus();

package/dist/waku-broadcaster-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"waku-broadcaster-client.js","sourceRoot":"","sources":["../src/waku-broadcaster-client.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Chain,\n  delay,\n  isDefined,\n  POI_REQUIRED_LISTS,\n  BroadcasterConnectionStatus,\n  SelectedBroadcaster,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from './fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from './filters/address-filter.js';\nimport {\n  BroadcasterConnectionStatusCallback,\n  BroadcasterDebugger,\n  BroadcasterOptions,\n} from './models/export-models.js';\nimport { BroadcasterSearch } from './search/best-broadcaster.js';\nimport { BroadcasterStatus } from './status/broadcaster-connection-status.js';\nimport { BroadcasterDebug } from './utils/broadcaster-debug.js';\nimport { WakuObservers } from './waku/waku-observers.js';\nimport { WakuBroadcasterWakuCore } from './waku/waku-broadcaster-waku-core.js';\nimport { RelayNode } from '@waku/sdk';\nimport { contentTopics } from './waku/waku-topics.js';\n\nexport class WakuBroadcasterClient {\n  private static chain: Chain;\n  private static statusCallback: BroadcasterConnectionStatusCallback;\n  private static started = false;\n  private static isRestarting = false;\n\n  static pollDelay = 3000;\n  static failureCount = 0;\n\n  static async start(\n    chain: Chain,\n    broadcasterOptions: BroadcasterOptions,\n    statusCallback: BroadcasterConnectionStatusCallback,\n    broadcasterDebugger?: BroadcasterDebugger,\n  ) {\n    this.chain = chain;\n    this.statusCallback = statusCallback;\n\n    WakuBroadcasterWakuCore.setBroadcasterOptions(broadcasterOptions);\n\n    if (broadcasterDebugger) {\n      BroadcasterDebug.setDebugger(broadcasterDebugger);\n    }\n\n    BroadcasterFeeCache.init(\n      broadcasterOptions.poiActiveListKeys ??\n        POI_REQUIRED_LISTS.map(list => list.key),\n    );\n\n    try {\n      this.started = false;\n      await WakuBroadcasterWakuCore.initWaku(chain);\n      this.started = true;\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.pollStatus();\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      throw new Error('Cannot connect to Broadcaster network.', { cause });\n    }\n  }\n\n  static async stop() {\n    await WakuBroadcasterWakuCore.disconnect(true);\n    this.started = false;\n    this.updateStatus();\n  }\n\n  static isStarted() {\n    return this.started;\n  }\n\n  static async setChain(chain: Chain): Promise<void> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    WakuBroadcasterClient.chain = chain;\n    await WakuObservers.setObserversForChain(\n      WakuBroadcasterWakuCore.waku,\n      chain,\n    );\n    WakuBroadcasterClient.updateStatus();\n  }\n\n  static getContentTopics(): string[] {\n    return WakuObservers.getCurrentContentTopics();\n  }\n\n  static getMeshPeerCount(): number {\n    return WakuBroadcasterWakuCore.getMeshPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    return WakuBroadcasterWakuCore.getPubSubPeerCount();\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getLightPushPeerCount();\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getFilterPeerCount();\n  }\n  /**\n   * The function `findBestBroadcaster` finds the broadcaster with the lowest fees for a given chain and token.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBestBroadcaster(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  /**\n   * The function `findAllBroadcastersForChain` returns an array of all available broadcasters fee-tokens for a given chain.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find all broadcasters for.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return [];\n    }\n\n    return BroadcasterSearch.findAllBroadcastersForChain(chain, useRelayAdapt);\n  }\n\n  /**\n   * The function `findRandomBroadcasterForToken` selects a random broadcaster from a list of broadcasters that is based on\n   * their fees for a specific token, and how much higher their fees are compared to the broadcaster with\n   * the lowest fees.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @param {number} [percentageThreshold=5] - The `percentageThreshold` parameter is a number that\n   * represents the maximum percentage increase in fees that a broadcaster can have compared to the broadcaster\n   * with the lowest fees. For example, if the `percentageThreshold` is set to 5, it means that a\n   * broadcaster can have a maximum of 5% higher fees than the broadcaster with the lowest fees and still be selected.\n   * Defaults to 5.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number = 5,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findRandomBroadcasterForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n      percentageThreshold,\n    );\n  }\n\n  /**\n   * The function `findBroadcastersForToken` takes in a chain, token address, and a boolean flag, and\n   * returns an array of selected broadcasters based on the provided parameters.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network; a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  static setAddressFilters(\n    allowlist: Optional<string[]>,\n    blocklist: Optional<string[]>,\n  ): void {\n    AddressFilter.setAllowlist(allowlist);\n    AddressFilter.setBlocklist(blocklist);\n  }\n\n  static async tryReconnect(resetCache = true): Promise<void> {\n    // Reset fees, which will reset status to \"Searching\".\n    if (resetCache) {\n      BroadcasterFeeCache.resetCache(WakuBroadcasterClient.chain);\n    }\n    WakuBroadcasterClient.updateStatus();\n\n    await WakuBroadcasterClient.restart(resetCache);\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ) {\n    return BroadcasterFeeCache.supportsToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  private static async restart(resetCache = true): Promise<void> {\n    if (this.isRestarting || !this.started) {\n      return;\n    }\n    this.isRestarting = true;\n    try {\n      BroadcasterDebug.log('Restarting Waku...');\n      await WakuBroadcasterWakuCore.reinitWaku(this.chain, resetCache);\n      this.isRestarting = false;\n    } catch (cause) {\n      this.isRestarting = false;\n      if (!(cause instanceof Error)) {\n        return;\n      }\n      BroadcasterDebug.error(\n        new Error('Error reinitializing Waku Broadcaster Client', { cause }),\n      );\n    }\n  }\n\n  /**\n   * Start keep-alive poller which checks Broadcaster status every few seconds.\n   */\n  private static async pollStatus(): Promise<void> {\n    const pubsubPeers = WakuBroadcasterWakuCore.getPubSubPeerCount();\n\n    if (pubsubPeers === 0) {\n      if (WakuBroadcasterClient.failureCount > 2) {\n        await this.tryReconnect(false);\n        WakuBroadcasterClient.failureCount = 0;\n      }\n      WakuBroadcasterClient.failureCount += 1;\n    } else {\n      this.updateStatus();\n      WakuBroadcasterClient.failureCount = 0;\n    }\n\n    await delay(WakuBroadcasterClient.pollDelay);\n\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.pollStatus();\n  }\n\n  private static updateStatus() {\n    const status = BroadcasterStatus.getBroadcasterConnectionStatus(this.chain);\n\n    this.statusCallback(this.chain, status);\n\n    if (\n      status === BroadcasterConnectionStatus.Disconnected ||\n      status === BroadcasterConnectionStatus.Error\n    ) {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.restart();\n    }\n  }\n  // Waku Transport functions\n  static async addTransportSubscription(\n    waku: Optional<RelayNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    await WakuObservers.addTransportSubscription(\n      WakuBroadcasterWakuCore.waku,\n      topic,\n      callback,\n    );\n  }\n\n  static sendTransport(data: object, topic: string): void {\n    const customTopic = contentTopics.encrypted(topic);\n    WakuBroadcasterWakuCore.broadcastMessage(data, customTopic);\n  }\n\n  static getWakuCore(): Optional<RelayNode> {\n    return WakuBroadcasterWakuCore.waku;\n  }\n}\n"]}
+{"version":3,"file":"waku-broadcaster-client.js","sourceRoot":"","sources":["../src/waku-broadcaster-client.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Chain,\n  delay,\n  POI_REQUIRED_LISTS,\n  BroadcasterConnectionStatus,\n  SelectedBroadcaster,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from './fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from './filters/address-filter.js';\nimport {\n  BroadcasterConnectionStatusCallback,\n  BroadcasterDebugger,\n  BroadcasterOptions,\n} from './models/export-models.js';\nimport { BroadcasterSearch } from './search/best-broadcaster.js';\nimport { BroadcasterStatus } from './status/broadcaster-connection-status.js';\nimport { BroadcasterDebug } from './utils/broadcaster-debug.js';\nimport { WakuObservers } from './waku/waku-observers.js';\nimport { WakuBroadcasterWakuCore } from './waku/waku-broadcaster-waku-core.js';\nimport type { LightNode } from '@waku/interfaces';\nimport { contentTopics } from './waku/waku-topics.js';\n\nexport class WakuBroadcasterClient {\n  private static chain: Chain;\n  private static statusCallback: BroadcasterConnectionStatusCallback;\n  private static started = false;\n  private static isRestarting = false;\n\n  static pollDelay = 3000;\n\n  static async start(\n    chain: Chain,\n    broadcasterOptions: BroadcasterOptions,\n    statusCallback: BroadcasterConnectionStatusCallback,\n    broadcasterDebugger?: BroadcasterDebugger,\n  ) {\n    this.chain = chain;\n    this.statusCallback = statusCallback;\n\n    WakuBroadcasterWakuCore.setBroadcasterOptions(broadcasterOptions);\n\n    if (broadcasterDebugger) {\n      BroadcasterDebug.setDebugger(broadcasterDebugger);\n    }\n\n    BroadcasterFeeCache.init(\n      broadcasterOptions.poiActiveListKeys ??\n        POI_REQUIRED_LISTS.map(list => list.key),\n    );\n\n    try {\n      this.started = false;\n      await WakuBroadcasterWakuCore.initWaku(chain);\n      this.started = true;\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.pollStatus();\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      throw new Error('Cannot connect to Broadcaster network.', { cause });\n    }\n  }\n  private static peerRetryCount = 0;\n  private static pollConnection = async () => {\n    const peerCount = WakuBroadcasterWakuCore.getMeshPeerCount();\n    if (peerCount < 1) {\n      if (this.peerRetryCount >= 2) {\n        this.peerRetryCount = 0;\n        await this.restart();\n      } else {\n        this.peerRetryCount += 1;\n      }\n    } else {\n      this.peerRetryCount = 0;\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n    this.pollConnection();\n  };\n\n  static async stop() {\n    await WakuBroadcasterWakuCore.disconnect();\n    this.started = false;\n    this.updateStatus();\n  }\n\n  static isStarted() {\n    return this.started;\n  }\n\n  static async setChain(chain: Chain): Promise<void> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    WakuBroadcasterClient.chain = chain;\n    await WakuObservers.setObserversForChain(\n      WakuBroadcasterWakuCore.waku,\n      chain,\n    );\n    WakuBroadcasterClient.updateStatus();\n  }\n\n  static getContentTopics(): string[] {\n    return WakuObservers.getCurrentContentTopics();\n  }\n\n  static getMeshPeerCount(): number {\n    return WakuBroadcasterWakuCore.getMeshPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    return WakuBroadcasterWakuCore.getPubSubPeerCount();\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getLightPushPeerCount();\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getFilterPeerCount();\n  }\n  /**\n   * The function `findBestBroadcaster` finds the broadcaster with the lowest fees for a given chain and token.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBestBroadcaster(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  /**\n   * The function `findAllBroadcastersForChain` returns an array of all available broadcasters fee-tokens for a given chain.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find all broadcasters for.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return [];\n    }\n\n    return BroadcasterSearch.findAllBroadcastersForChain(chain, useRelayAdapt);\n  }\n\n  /**\n   * The function `findRandomBroadcasterForToken` selects a random broadcaster from a list of broadcasters that is based on\n   * their fees for a specific token, and how much higher their fees are compared to the broadcaster with\n   * the lowest fees.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @param {number} [percentageThreshold=5] - The `percentageThreshold` parameter is a number that\n   * represents the maximum percentage increase in fees that a broadcaster can have compared to the broadcaster\n   * with the lowest fees. For example, if the `percentageThreshold` is set to 5, it means that a\n   * broadcaster can have a maximum of 5% higher fees than the broadcaster with the lowest fees and still be selected.\n   * Defaults to 5.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number = 5,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findRandomBroadcasterForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n      percentageThreshold,\n    );\n  }\n\n  /**\n   * The function `findBroadcastersForToken` takes in a chain, token address, and a boolean flag, and\n   * returns an array of selected broadcasters based on the provided parameters.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network; a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  static setAddressFilters(\n    allowlist: Optional<string[]>,\n    blocklist: Optional<string[]>,\n  ): void {\n    AddressFilter.setAllowlist(allowlist);\n    AddressFilter.setBlocklist(blocklist);\n  }\n\n  static async tryReconnect(): Promise<void> {\n    WakuBroadcasterClient.updateStatus();\n\n    await WakuBroadcasterClient.restart();\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ) {\n    return BroadcasterFeeCache.supportsToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  private static async restart(): Promise<void> {\n    if (this.isRestarting || !this.started) {\n      return;\n    }\n    this.isRestarting = true;\n    try {\n      BroadcasterDebug.log('Restarting Waku...');\n      await WakuBroadcasterWakuCore.reinitWaku(this.chain);\n      this.isRestarting = false;\n    } catch (cause) {\n      this.isRestarting = false;\n      if (!(cause instanceof Error)) {\n        return;\n      }\n      BroadcasterDebug.error(\n        new Error('Error reinitializing Waku Broadcaster Client', { cause }),\n      );\n    }\n  }\n\n  /**\n   * Start keep-alive poller which checks Broadcaster status every few seconds.\n   */\n  private static async pollStatus(): Promise<void> {\n    if (!this.isRestarting) {\n      this.updateStatus();\n    } else {\n      this.updateStatus();\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.pollStatus();\n  }\n\n  private static updateStatus() {\n    const status = BroadcasterStatus.getBroadcasterConnectionStatus(this.chain);\n\n    this.statusCallback(this.chain, status);\n    if (\n      status === BroadcasterConnectionStatus.Disconnected ||\n      status === BroadcasterConnectionStatus.Error\n    ) {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.restart();\n    }\n  }\n\n  // Waku Transport functions\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    await WakuObservers.addTransportSubscription(\n      WakuBroadcasterWakuCore.waku,\n      topic,\n      callback,\n    );\n  }\n\n  static sendTransport(data: object, topic: string): void {\n    const customTopic = contentTopics.encrypted(topic);\n    WakuBroadcasterWakuCore.broadcastMessage(data, customTopic);\n  }\n\n  static getWakuCore(): Optional<LightNode> {\n    return WakuBroadcasterWakuCore.waku;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@railgun-community/waku-broadcaster-client-node",
-  "version": "7.2.6",
+  "version": "7.2.7",
   "license": "MIT",
   "main": "dist/index.js",
   "type": "module",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@libp2p/bootstrap": "^10.0.11",
+    "@libp2p/interface-peer-id": "^2.0.2",
     "@libp2p/tcp": "9.0.17",
     "@waku/core": "0.0.27",
     "@waku/relay": "0.0.10",