Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/implementation/Client/DaprClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import HTTPClient from './HTTPClient/HTTPClient';

import CommunicationProtocolEnum from '../../enum/CommunicationProtocol.enum';
import { DaprClientOptions } from '../../types/DaprClientOptions';
import { Settings } from '../../utils/Settings.util';

export default class DaprClient {
readonly daprHost: string;
Expand All @@ -52,15 +53,15 @@ export default class DaprClient {
readonly actor: IClientActorBuilder;

constructor(
daprHost: string
, daprPort: string
daprHost?: string
, daprPort?: string
, communicationProtocol: CommunicationProtocolEnum = CommunicationProtocolEnum.HTTP
, options: DaprClientOptions = {
isKeepAlive: true
}
) {
this.daprHost = daprHost;
this.daprPort = daprPort;
this.daprHost = daprHost ?? Settings.getDefaultHost();
this.daprPort = daprPort ?? Settings.getDefaultPort(communicationProtocol);
this.communicationProtocol = communicationProtocol;
this.options = options;

Expand Down
13 changes: 8 additions & 5 deletions src/implementation/Client/GRPCClient/GRPCClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@ import { DaprClient } from "../../../proto/dapr/proto/runtime/v1/dapr_grpc_pb"
import IClient from "../../../interfaces/Client/IClient";
import CommunicationProtocolEnum from "../../../enum/CommunicationProtocol.enum";
import { DaprClientOptions } from "../../../types/DaprClientOptions";
import { Settings } from '../../../utils/Settings.util';

export default class GRPCClient implements IClient {
private isInitialized: boolean;
private readonly client: DaprClient;
private readonly clientCredentials: grpc.ChannelCredentials;
private readonly clientHost: string;
private readonly clientPort: string;
private readonly options: DaprClientOptions;

constructor(host = "127.0.0.1", port = "50050", options: DaprClientOptions = {
isKeepAlive: true
}) {
this.isInitialized = true;
constructor(
host = Settings.getDefaultHost()
, port = Settings.getDefaultGrpcPort()
, options: DaprClientOptions = {
isKeepAlive: true
}
) {
this.clientHost = host;
this.clientPort = port;
this.clientCredentials = ChannelCredentials.createInsecure();
Expand Down
13 changes: 8 additions & 5 deletions src/implementation/Client/HTTPClient/HTTPClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import IClient from "../../../interfaces/Client/IClient";
import http from "http";
import https from "https";
import { DaprClientOptions } from "../../../types/DaprClientOptions";
import { Settings } from '../../../utils/Settings.util';

export default class HTTPClient implements IClient {
private readonly isInitialized: boolean;
private client: typeof fetch;
private readonly clientHost: string;
private readonly clientPort: string;
Expand All @@ -16,10 +16,13 @@ export default class HTTPClient implements IClient {
private readonly httpAgent;
private readonly httpsAgent;

constructor(host = "127.0.0.1", port = "50050", options: DaprClientOptions = {
isKeepAlive: true
}) {
this.isInitialized = true;
constructor(
host = Settings.getDefaultHost()
, port = Settings.getDefaultHttpPort()
, options: DaprClientOptions = {
isKeepAlive: true
}
) {
this.clientHost = host;
this.clientPort = port;
this.options = options;
Expand Down
17 changes: 9 additions & 8 deletions src/implementation/Server/DaprServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import HTTPServerInvoker from './HTTPServer/invoker';
import HTTPServerActor from './HTTPServer/actor';
import { DaprClientOptions } from '../../types/DaprClientOptions';
import { DaprClient } from '../..';
import { Settings } from '../../utils/Settings.util';

export default class DaprServer {
// App details
Expand All @@ -35,19 +36,19 @@ export default class DaprServer {
readonly client: DaprClient;

constructor(
serverHost = "127.0.0.1"
, serverPort: string = process.env.DAPR_SERVER_PORT || "50050"
, daprHost = "127.0.0.1"
, daprPort = "50051"
serverHost?: string
, serverPort?: string
, daprHost?: string
, daprPort?: string
, communicationProtocol: CommunicationProtocolEnum = CommunicationProtocolEnum.HTTP
, clientOptions: DaprClientOptions = {
isKeepAlive: true
}
) {
this.serverHost = serverHost;
this.serverPort = serverPort;
this.daprHost = daprHost;
this.daprPort = daprPort;
this.serverHost = serverHost ?? Settings.getDefaultHost();
this.serverPort = serverPort ?? Settings.getDefaultAppPort(communicationProtocol);
this.daprHost = daprHost ?? Settings.getDefaultHost();
this.daprPort = daprPort ?? Settings.getDefaultPort(communicationProtocol);

// Create a client to interface with the sidecar from the server side
this.client = new DaprClient(daprHost, daprPort, communicationProtocol, clientOptions);
Expand Down
57 changes: 57 additions & 0 deletions src/utils/Settings.util.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import CommunicationProtocolEnum from "../enum/CommunicationProtocol.enum";

export class Settings {
private static readonly defaultHost: string = "127.0.0.1";
private static readonly defaultHttpAppPort: string = "3000";
private static readonly defaultHttpPort: string = "3500";
private static readonly defaultGrpcAppPort: string = "50000";
private static readonly defaultGrpcPort: string = "50001";

static getDefaultHost(): string {
return Settings.defaultHost;
}

static getDefaultHttpPort(): string {
return process.env.DAPR_HTTP_PORT ?? Settings.defaultHttpPort;
}

static getDefaultGrpcPort(): string {
return process.env.DAPR_GRPC_PORT ?? Settings.defaultGrpcPort;
}

/**
* Gets the default port that the Dapr sidecar is listening to.
* @param communicationProtocolEnum communication protocol
* @returns port number
*/
static getDefaultPort(communicationProtocolEnum: CommunicationProtocolEnum): string {
switch (communicationProtocolEnum) {
case CommunicationProtocolEnum.GRPC:
return this.getDefaultGrpcPort();
default:
return this.getDefaultHttpPort();
}
}

static getDefaultHttpAppPort(): string {
return process.env.APP_PORT ?? Settings.defaultHttpAppPort;
}

static getDefaultGrpcAppPort(): string {
return process.env.APP_PORT ?? Settings.defaultGrpcAppPort;
}

/**
* Gets the default port that the application is listening on.
* @param communicationProtocolEnum communication protocol
* @returns port number
*/
static getDefaultAppPort(communicationProtocolEnum: CommunicationProtocolEnum): string {
switch (communicationProtocolEnum) {
case CommunicationProtocolEnum.GRPC:
return this.getDefaultGrpcAppPort();
default:
return this.getDefaultHttpAppPort();
}
}
}
25 changes: 25 additions & 0 deletions test/unit/utils/Settings.util.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { CommunicationProtocolEnum } from "../../../src";
import { Settings } from "../../../src/utils/Settings.util";

describe('Settings', () => {
describe('getDefaultPort returns the correct default when', () => {
it('communication protocol is GRPC', () => {
expect(Settings.getDefaultPort(CommunicationProtocolEnum.GRPC))
.toEqual(Settings.getDefaultGrpcPort())
});
it('communication protocol is HTTP', () => {
expect(Settings.getDefaultPort(CommunicationProtocolEnum.HTTP))
.toEqual(Settings.getDefaultHttpPort())
});
});
describe('getDefaultAppPort returns the correct default when', () => {
it('communication protocol is GRPC', () => {
expect(Settings.getDefaultAppPort(CommunicationProtocolEnum.GRPC))
.toEqual(Settings.getDefaultGrpcAppPort())
});
it('communication protocol is HTTP', () => {
expect(Settings.getDefaultAppPort(CommunicationProtocolEnum.HTTP))
.toEqual(Settings.getDefaultHttpAppPort())
});
});
})