Apply suggestions from code review

Co-authored-by: Shubham Sharma <[email protected]> Signed-off-by: Elena Kolevska <[email protected]>
dapr · Dec 5, 2023 · 16ccf46 · 16ccf46
1 parent 2a7fa82
commit 16ccf46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/implementation/Client/DaprClient.ts b/src/implementation/Client/DaprClient.ts
@@ -151,7 +151,7 @@ export default class DaprClient {
     this.options = {
       daprHost: options.daprHost,
       daprPort: options.daprPort,
-      communicationProtocol: options.communicationProtocol ?? Settings.getDefaultCommunicationProtocol(),
+      communicationProtocol: this.daprClient.options.communicationProtocol,
       isKeepAlive: options.isKeepAlive,
       logger: options.logger,
       actor: options.actor,

diff --git a/src/implementation/Client/GRPCClient/GRPCClient.ts b/src/implementation/Client/GRPCClient/GRPCClient.ts
@@ -79,16 +79,16 @@ export default class GRPCClient implements IClient {
   }
 
   private generateEndpoint(options: Partial<DaprClientOptions>): GrpcEndpoint {
-    let host = Settings.getDefaultHost();
-    let port = Settings.getDefaultPort(communicationProtocolEnum.GRPC);
+        let host = options?.daprHost ?? Settings.getDefaultHost();
+    let port = options?.daprPort ?? Settings.getDefaultGrpcPort();
     let uri = `${host}:${port}`;
 
-    if (options?.daprHost || options?.daprPort) {
-      host = options?.daprHost ?? Settings.getDefaultHost();
-      port = options?.daprPort ?? Settings.getDefaultPort(communicationProtocolEnum.GRPC);
-      uri = `${host}:${port}`;
-    } else if (Settings.getDefaultGrpcEndpoint() != "") {
-      uri = Settings.getDefaultGrpcEndpoint();
+    if (!(options?.daprHost || options?.daprPort)) {
+      // If neither host nor port are specified, check the endpoint environment variable.
+      let endpoint = Settings.getDefaultGrpcEndpoint();
+      if (endpoint != "") {
+        uri = endpoint;
+      }
     }
 
     return new GrpcEndpoint(uri);

diff --git a/src/network/HttpEndpoint.ts b/src/network/HttpEndpoint.ts
@@ -36,10 +36,10 @@ export class HttpEndpoint extends Endpoint {
   // if they are not specified so that the URL class can parse it
   private preprocessUri(url: string) {
     if (url.startsWith(":")) {
-      url = URIParseConfig.DEFAULT_SCHEME_HTTP + "://" + URIParseConfig.DEFAULT_HOSTNAME + url;
+return URIParseConfig.DEFAULT_SCHEME_HTTP + "://" + URIParseConfig.DEFAULT_HOSTNAME + url;
     }
     if (!url.includes("://")) {
-      url = URIParseConfig.DEFAULT_SCHEME_HTTP + "://" + url;
+return URIParseConfig.DEFAULT_SCHEME_HTTP + "://" + url;
     }
     return url;
   }