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
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"node": true
},
"rules": {
"@typescript-eslint/ban-ts-comment": "off"
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": ["warn", {
"varsIgnorePattern": "^_",
"argsIgnorePattern": "^_"
}]
}
}
6 changes: 3 additions & 3 deletions examples/configuration/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { DaprClient, CommunicationProtocolEnum } from "dapr-client";
import { DaprClient } from "dapr-client";

const daprHost = "127.0.0.1";
const daprAppId = "example-config";
const daprPortDefault = "3500";

async function start() {

const client = new DaprClient(
daprHost,
process.env.DAPR_HTTP_PORT
process.env.DAPR_HTTP_PORT ?? daprPortDefault
);

const config = await client.configuration.get('config-store', ['key1', 'key2']);
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc/hello-world/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "d

const daprHost = "127.0.0.1";
const daprPort = "50050"; // Dapr Sidecar Port of this Example Server
const daprPortActor = "10002"; // Dapr Sidecar Port of the Actor Server
// const daprPortActor = "10002"; // Dapr Sidecar Port of the Actor Server
const serverHost = "127.0.0.1"; // App Host of this Example Server
const serverPort = "50051"; // App Port of this Example Server
const daprAppId = "example-hello-world";
Expand Down
4 changes: 1 addition & 3 deletions examples/http/actor/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DaprServer, DaprClient, HttpMethod } from "dapr-client";
import { DaprServer, DaprClient } from "dapr-client";
import DemoActorCounterImpl from "./actor/DemoActorCounterImpl";
import DemoActorReminderImpl from "./actor/DemoActorReminderImpl";
import DemoActorSayImpl from "./actor/DemoActorSayImpl";
Expand All @@ -8,7 +8,6 @@ const daprHost = "127.0.0.1";
const daprPort = "50000"; // Dapr Sidecar Port of this Example Server
const serverHost = "127.0.0.1"; // App Host of this Example Server
const serverPort = "50001"; // App Port of this Example Server
const daprAppId = "example-hello-world";

async function start() {
const server = new DaprServer(serverHost, serverPort, daprHost, daprPort);
Expand All @@ -33,7 +32,6 @@ async function start() {
console.log("EXECUTING CLIENT - ACTORS");
console.log("Note: we create new client for now since Actors are not supported internally!")
console.log("===============================================================");
const actorId = "MyActorId1";

const resRegisteredActors = await server.actor.getRegisteredActors();
console.log(`Registered Actor Types: ${JSON.stringify(resRegisteredActors)}`);
Expand Down
1 change: 0 additions & 1 deletion examples/http/pubsub/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const daprHost = "127.0.0.1";
const daprPort = "50000"; // Dapr Sidecar Port of this Example Server
const serverHost = "127.0.0.1"; // App Host of this Example Server
const serverPort = "50001"; // App Port of this Example Server
const daprAppId = "example-http-pubsub";

async function start() {
// Create a Server (will subscribe) and Client (will publish)
Expand Down
2 changes: 1 addition & 1 deletion examples/invocation/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "dapr-client";
import { DaprServer, DaprClient, HttpMethod } from "dapr-client";

// Common settings
const daprAppId = "example-invocation";
Expand Down
2 changes: 1 addition & 1 deletion examples/pubsub/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DaprServer, DaprClient, CommunicationProtocolEnum } from "dapr-client";
import { DaprServer, DaprClient } from "dapr-client";

// Common settings
const serverHost = "127.0.0.1"; // App Host of this Example Server
Expand Down
10 changes: 5 additions & 5 deletions src/actors/client/ActorClient/ActorClientGRPC.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default class ActorClientGRPC implements IClientActor {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.executeActorStateTransaction(msgService, (err, res) => {
client.executeActorStateTransaction(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down Expand Up @@ -126,7 +126,7 @@ export default class ActorClientGRPC implements IClientActor {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.registerActorReminder(msgService, (err, res) => {
client.registerActorReminder(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand All @@ -145,7 +145,7 @@ export default class ActorClientGRPC implements IClientActor {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.unregisterActorReminder(msgService, (err, res) => {
client.unregisterActorReminder(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down Expand Up @@ -180,7 +180,7 @@ export default class ActorClientGRPC implements IClientActor {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.registerActorTimer(msgService, (err, res) => {
client.registerActorTimer(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand All @@ -199,7 +199,7 @@ export default class ActorClientGRPC implements IClientActor {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.unregisterActorTimer(msgService, (err, res) => {
client.unregisterActorTimer(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down
2 changes: 1 addition & 1 deletion src/actors/client/ActorProxyBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class ActorProxyBuilder<T> {
const actorClient = this.actorClient;

const handler = {
get(target: any, propKey: any, receiver: any) {
get(_target: any, propKey: any, _receiver: any) {
return async function (...args: any) {
const body = args.length > 0 ? args : null;
const res = await actorClient.actor.invoke(actorTypeClassName, actorId, propKey, body);
Expand Down
4 changes: 2 additions & 2 deletions src/actors/runtime/AbstractActor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default abstract class AbstractActor {
* @param <Type> Type of the state object
* @return Async void response
*/
async registerActorReminder<Type>(reminderName: string, dueTime: Temporal.Duration, period: Temporal.Duration, state?: any) {
async registerActorReminder<_Type>(reminderName: string, dueTime: Temporal.Duration, period: Temporal.Duration, state?: any) {
await this.actorClient.actor.registerActorReminder(this.actorType, this.id, reminderName, {
period,
dueTime,
Expand Down Expand Up @@ -184,7 +184,7 @@ export default abstract class AbstractActor {
return;
}

async receiveReminder(data: string): Promise<void> {
async receiveReminder(_data: string): Promise<void> {
console.warn(JSON.stringify({
error: "ACTOR_METHOD_NOT_IMPLEMENTED",
errorMsg: `A reminder was created for the actor with id: ${this.id} but the method 'receiveReminder' was not implemented`,
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/GRPCClient/binding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class GRPCClientBinding implements IClientBinding {
// Send an event to an external system
// @todo: should pass the metadata object
// @todo: should return a specific typed Promise<TypeBindingResponse> instead of Promise<object>
async send(bindingName: string, operation: string, data: any, metadata: object = {}): Promise<object> {
async send(bindingName: string, operation: string, data: any, _metadata: object = {}): Promise<object> {
const msgService = new InvokeBindingRequest();
msgService.setName(bindingName);
msgService.setOperation(operation);
Expand Down
4 changes: 2 additions & 2 deletions src/implementation/Client/GRPCClient/health.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export default class GRPCClientHealth implements IClientHealth {

// There is no gRPC implementation of /healthz, so we try to fetch the metadata
async isHealthy(): Promise<boolean> {
return new Promise((resolve, reject) => {
return new Promise((resolve, _reject) => {
const client = this.client.getClient();

try {
client.getMetadata(new Empty(), (err, res: GetMetadataResponse) => {
client.getMetadata(new Empty(), (err, _res: GetMetadataResponse) => {
if (err) {
return resolve(false);
}
Expand Down
1 change: 0 additions & 1 deletion src/implementation/Client/GRPCClient/invoker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export default class GRPCClientInvoker implements IClientInvoker {

// const res = await fetch(`${this.daprUrl}/invoke/${appId}/method/${methodName}`, fetchOptions);
// return ResponseUtil.handleResponse(res);
const resContentType = res.getContentType();
const resData = Buffer.from((res.getData() as Any).getValue()).toString();

try {
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/GRPCClient/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class GRPCClientMetadata implements IClientMetadata {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.setMetadata(msg, (err, res: Empty) => {
client.setMetadata(msg, (err, _res: Empty) => {
if (err) {
return reject(false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/GRPCClient/pubsub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class GRPCClientPubSub implements IClientPubSub {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.publishEvent(msgService, (err, res) => {
client.publishEvent(msgService, (err, _res) => {
if (err) {
console.error(err);
return reject(false);
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/GRPCClient/secret.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class GRPCClientSecret implements IClientSecret {
}

// @todo: implement metadata
async get(secretStoreName: string, key: string, metadata = ""): Promise<object> {
async get(secretStoreName: string, key: string, _metadata = ""): Promise<object> {
const msgService = new GetSecretRequest();
msgService.setStoreName(secretStoreName);
msgService.setKey(key);
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/GRPCClient/sidecar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class GRPCClientSidecar implements IClientSidecar {
async shutdown(): Promise<void> {
return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.shutdown(new Empty(), (err, res: Empty) => {
client.shutdown(new Empty(), (err, _res: Empty) => {
if (err) {
return reject(err);
}
Expand Down
8 changes: 4 additions & 4 deletions src/implementation/Client/GRPCClient/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class GRPCClientState implements IClientState {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.saveState(msgService, (err, res) => {
client.saveState(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down Expand Up @@ -75,7 +75,7 @@ export default class GRPCClientState implements IClientState {
})
}

async getBulk(storeName: string, keys: string[], parallelism = 10, metadata = ""): Promise<KeyValueType[]> {
async getBulk(storeName: string, keys: string[], parallelism = 10, _metadata = ""): Promise<KeyValueType[]> {
const msgService = new GetBulkStateRequest();
msgService.setStoreName(storeName);
msgService.setKeysList(keys);
Expand Down Expand Up @@ -122,7 +122,7 @@ export default class GRPCClientState implements IClientState {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.deleteState(msgService, (err, res) => {
client.deleteState(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down Expand Up @@ -172,7 +172,7 @@ export default class GRPCClientState implements IClientState {

return new Promise((resolve, reject) => {
const client = this.client.getClient();
client.executeStateTransaction(msgService, (err, res) => {
client.executeStateTransaction(msgService, (err, _res) => {
if (err) {
return reject(err);
}
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/HTTPClient/health.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class HTTPClientHealth implements IClientHealth {
// Send an event to an external system
async isHealthy(): Promise<boolean> {
try {
const result = await this.client.execute(`/healthz`, {
await this.client.execute(`/healthz`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Client/HTTPClient/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default class HTTPClientMetadata implements IClientMetadata {
}

async set(key: string, value: string): Promise<boolean> {
const result = await this.client.execute(`/metadata/${key}`, {
await this.client.execute(`/metadata/${key}`, {
method: "PUT",
headers: {
"Content-Type": "text/plain"
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/Server/GRPCServer/GRPCServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default class GRPCServer implements IServer {
private async initializeBind(): Promise<void> {
console.log(`[Dapr-JS][gRPC] Starting to listen on ${this.serverHost}:${this.serverPort}`);
return new Promise((resolve, reject) => {
this.server.bindAsync(`${this.serverHost}:${this.serverPort}`, this.serverCredentials, (err, port) => {
this.server.bindAsync(`${this.serverHost}:${this.serverPort}`, this.serverCredentials, (err, _port) => {
if (err) {
return reject(err);
}
Expand Down
5 changes: 2 additions & 3 deletions src/implementation/Server/GRPCServer/actor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import GRPCServer from './GRPCServer';
import IServerActor from '../../../interfaces/Server/IServerActor';
import AbstractActor from '../../../actors/runtime/AbstractActor';
import Class from '../../../types/Class';
import GRPCClient from '../../Client/GRPCClient/GRPCClient';

// https://docs.dapr.io/reference/api/bindings_api/
export default class GRPCServerActor implements IServerActor {
Expand All @@ -12,7 +11,7 @@ export default class GRPCServerActor implements IServerActor {
this.server = server;
}

deactivateActor(actorType: string, actorId: string): Promise<void> {
deactivateActor(_actorType: string, _actorId: string): Promise<void> {
throw new Error('Method not implemented.');
}

Expand All @@ -24,7 +23,7 @@ export default class GRPCServerActor implements IServerActor {
throw new Error('Method not implemented.');
}

registerActor<T extends AbstractActor>(cls: Class<T>): Promise<void> {
registerActor<T extends AbstractActor>(_cls: Class<T>): Promise<void> {
throw new Error('Method not implemented.');
}
}
1 change: 0 additions & 1 deletion src/implementation/Server/GRPCServer/binding.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import GRPCServer from './GRPCServer';
import { TypeDaprBindingCallback } from '../../../types/DaprBindingCallback.type';
import IServerBinding from '../../../interfaces/Server/IServerBinding';
import GRPCClient from '../../Client/GRPCClient/GRPCClient';

// https://docs.dapr.io/reference/api/bindings_api/
export default class DaprBinding implements IServerBinding {
Expand Down
1 change: 0 additions & 1 deletion src/implementation/Server/GRPCServer/invoker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { TypeDaprInvokerCallback } from '../../../types/DaprInvokerCallback.type
import { InvokerListenOptionsType } from '../../../types/InvokerListenOptions.type';
import { HttpMethod } from '../../../enum/HttpMethod.enum';
import IServerInvoker from '../../../interfaces/Server/IServerInvoker';
import GRPCClient from '../../Client/GRPCClient/GRPCClient';

// https://docs.dapr.io/reference/api/service_invocation_api/
export default class DaprInvoker implements IServerInvoker {
Expand Down
7 changes: 0 additions & 7 deletions src/utils/Logger.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ const CURRENT_LOGGER_LEVEL = process.env.LOGGER_LEVEL || LoggerLevel.VERBOSE;

console.log(`CURRENT LOG LEVEL: ${CURRENT_LOGGER_LEVEL}`)

interface ILoggerMemory {
rss: number;
heapUsed: number;
heapTotal: number;
external: number;
}

export class Logger {
static print(level: LoggerLevel, message: string, category = 'Server') {
if (level > CURRENT_LOGGER_LEVEL) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/actors.http.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CommunicationProtocolEnum, DaprClient, DaprServer, Temporal } from '../../src';
import { CommunicationProtocolEnum, DaprClient, DaprServer } from '../../src';

import DemoActorActivateImpl from '../actor/DemoActorActivateImpl';
import DemoActorCounterImpl from '../actor/DemoActorCounterImpl';
Expand Down
Loading