Remove DaprClient reference in ActorClient, not needed since we build it again anyways

Signed-off-by: Xavier Geerinck <[email protected]>

Author: XavierGeerinck

src/actors/client/ActorClient/ActorClient.ts

@@ -7,29 +7,29 @@ import ActorClientGRPC from './ActorClientGRPC';
 import ActorClientHTTP from './ActorClientHTTP';
 
 export default class ActorClient {
-  readonly daprClient: DaprClient;
+  readonly daprHost: string;
+  readonly daprPort: string;
+  readonly communicationProtocol: CommunicationProtocolEnum;
   readonly actor: IClientActor;
 
-  constructor(daprClient: DaprClient) {
-    this.daprClient = daprClient;
+  constructor(daprHost: string, daprPort: string, communicationProtocol: CommunicationProtocolEnum) {
+    this.daprHost = daprHost;
+    this.daprPort = daprPort;
+    this.communicationProtocol = communicationProtocol;
 
     // Builder
-    switch (daprClient.communicationProtocol) {
+    switch (communicationProtocol) {
       case CommunicationProtocolEnum.GRPC: {
-        const client = new GRPCClient(this.daprClient.daprHost, this.daprClient.daprPort);
+        const client = new GRPCClient(this.daprHost, this.daprPort);
         this.actor = new ActorClientGRPC(client);
         break;
       }
       case CommunicationProtocolEnum.HTTP:
       default: {
-        const client = new HTTPClient(this.daprClient.daprHost, this.daprClient.daprPort);
+        const client = new HTTPClient(this.daprHost, this.daprPort);
         this.actor = new ActorClientHTTP(client);
         break;
       }
     }
   }
-
-  getDaprClient(): DaprClient {
-    return this.daprClient;
-  }
 }

src/actors/client/ActorProxyBuilder.ts

@@ -11,7 +11,7 @@ export default class ActorProxyBuilder<T> {
   constructor(actorTypeClass: Class<T>, daprClient: DaprClient) {
     this.actorTypeClass = actorTypeClass;
     this.daprClient = daprClient;
-    this.actorClient = new ActorClient(daprClient);
+    this.actorClient = new ActorClient(daprClient.getDaprHost(), daprClient.getDaprPort(), daprClient.getCommunicationProtocol());
   }
 
   build(actorId: ActorId): T {

src/actors/runtime/AbstractActor.ts

@@ -38,7 +38,7 @@ export default abstract class AbstractActor {
    */
   constructor(daprClient: DaprClient, id: ActorId) {
     this.daprClient = daprClient;
-    this.actorClient = new ActorClient(daprClient);
+    this.actorClient = new ActorClient(daprClient.getDaprHost(), daprClient.getDaprPort(), daprClient.getCommunicationProtocol());
 
     this.id = id;
 

src/implementation/Client/DaprClient.ts

@@ -91,4 +91,8 @@ export default class DaprClient {
   getDaprPort(): string {
     return this.daprPort;
   }
+
+  getCommunicationProtocol(): CommunicationProtocolEnum {
+    return this.communicationProtocol;
+  }
 }