@@ -11,7 +11,7 @@ const { pipe } = require('it-pipe')
11
11
const MulticodecTopology = require ( '../topology/multicodec-topology' )
12
12
const { codes } = require ( './errors' )
13
13
14
- const { rpc , RPC , Message , SubOpts } = require ( './message' ) // eslint-disable-line no-unused-vars
14
+ const message = require ( './message' )
15
15
const PeerStreams = require ( './peer-streams' )
16
16
const { SignaturePolicy } = require ( './signature-policy' )
17
17
const utils = require ( './utils' )
@@ -27,9 +27,9 @@ const {
27
27
* @typedef {import('bl') } BufferList
28
28
* @typedef {import('../stream-muxer/types').MuxedStream } MuxedStream
29
29
* @typedef {import('../connection/connection') } Connection
30
- * @typedef {RPC } RPCM
31
- * @typedef {SubOpts } RPCSubOpts
32
- * @typedef {Message } RPCMessage
30
+ * @typedef {import('./message/types'). RPC } RPC
31
+ * @typedef {import('./message/types'). SubOpts } RPCSubOpts
32
+ * @typedef {import('./message/types'). Message } RPCMessage
33
33
* @typedef {import('./signature-policy').SignaturePolicyType } SignaturePolicyType
34
34
*/
35
35
@@ -372,7 +372,7 @@ class PubsubBaseProtocol extends EventEmitter {
372
372
*
373
373
* @param {string } idB58Str
374
374
* @param {PeerStreams } peerStreams
375
- * @param {RPCM } rpc
375
+ * @param {RPC } rpc
376
376
* @returns {boolean }
377
377
*/
378
378
_processRpc ( idB58Str , peerStreams , rpc ) {
@@ -394,7 +394,7 @@ class PubsubBaseProtocol extends EventEmitter {
394
394
}
395
395
396
396
if ( msgs . length ) {
397
- // @ts -ignore RPC message
397
+ // @ts -ignore RPC message is modified
398
398
msgs . forEach ( ( message ) => {
399
399
if ( ! ( this . canRelayMessage || message . topicIDs . some ( ( /** @type {string } */ topic ) => this . subscriptions . has ( topic ) ) ) ) {
400
400
this . log ( 'received message we didn\'t subscribe to. Dropping.' )
@@ -505,28 +505,28 @@ class PubsubBaseProtocol extends EventEmitter {
505
505
* This can be override to use a custom router protobuf.
506
506
*
507
507
* @param {Uint8Array } bytes
508
- * @returns {RPCM }
508
+ * @returns {RPC }
509
509
*/
510
510
_decodeRpc ( bytes ) {
511
- return rpc . RPC . decode ( bytes )
511
+ return message . rpc . RPC . decode ( bytes )
512
512
}
513
513
514
514
/**
515
515
* Encode RPC object into a Uint8Array.
516
516
* This can be override to use a custom router protobuf.
517
517
*
518
- * @param {RPCM } rpc
518
+ * @param {RPC } rpc
519
519
* @returns {Uint8Array }
520
520
*/
521
521
_encodeRpc ( rpc ) {
522
- return rpc . RPC . encode ( rpc )
522
+ return message . rpc . RPC . encode ( rpc )
523
523
}
524
524
525
525
/**
526
526
* Send an rpc object to a peer
527
527
*
528
528
* @param {string } id - peer id
529
- * @param {RPCM } rpc
529
+ * @param {RPC } rpc
530
530
* @returns {void }
531
531
*/
532
532
_sendRpc ( id , rpc ) {
@@ -744,7 +744,7 @@ class PubsubBaseProtocol extends EventEmitter {
744
744
}
745
745
}
746
746
747
- PubsubBaseProtocol . message = { rpc }
747
+ PubsubBaseProtocol . message = message
748
748
PubsubBaseProtocol . utils = utils
749
749
PubsubBaseProtocol . SignaturePolicy = SignaturePolicy
750
750
0 commit comments