Resolve circular dependency around Subscriber using token injection

Author: mondoreale

packages/sdk/src/encryption/SubscriberKeyExchange.ts

@@ -10,7 +10,7 @@ import { StreamMessage, StreamMessageType } from '../protocol/StreamMessage'
 import { createRandomMsgChainId } from '../publish/messageChain'
 import { MessageSigner } from '../signature/MessageSigner'
 import { SignatureValidator } from '../signature/SignatureValidator'
-import { Subscriber } from '../subscribe/Subscriber'
+import type { Subscriber } from '../subscribe/Subscriber'
 import { LoggerFactory } from '../utils/LoggerFactory'
 import { pOnce, withThrottling } from '../utils/promises'
 import { MaxSizedSet } from '../utils/utils'
@@ -21,6 +21,7 @@ import { AsymmetricEncryptionType, ContentType, EncryptionType, GroupKeyRequest,
 import { KeyExchangeKeyPair } from './KeyExchangeKeyPair'
 import { createCompliantExchangeKeys } from '../utils/encryptionCompliance'
 import { StreamrClientError } from '../StreamrClientError'
+import { Tokens } from '../tokens'
 
 const MAX_PENDING_REQUEST_COUNT = 50000 // just some limit, we can tweak the number if needed
 
@@ -51,7 +52,7 @@ export class SubscriberKeyExchange {
         signatureValidator: SignatureValidator,
         messageSigner: MessageSigner,
         store: LocalGroupKeyStore,
-        subscriber: Subscriber,
+        @inject(Tokens.Subscriber) subscriber: Subscriber,
         @inject(ConfigInjectionToken) config: Pick<StrictStreamrClientConfig, 'encryption' | 'validation'>,
         @inject(IdentityInjectionToken) identity: Identity,
         loggerFactory: LoggerFactory

packages/sdk/src/register.ts

@@ -1,7 +1,12 @@
 import { container } from 'tsyringe'
 import { Resends } from './subscribe/Resends'
+import { Subscriber } from './subscribe/Subscriber'
 import { Tokens } from './tokens'
 
 container.register(Tokens.Resends, {
     useClass: Resends,
 })
+
+container.register(Tokens.Subscriber, {
+    useClass: Subscriber,
+})

packages/sdk/src/tokens.ts

@@ -1,3 +1,4 @@
 export const Tokens = {
-    Resends: Symbol('Resends')
+    Resends: Symbol('Resends'),
+    Subscriber: Symbol('Subscriber')
 }