Resolve some minor changes

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

Author: XavierGeerinck

src/implementation/Server/GRPCServer/GRPCServer.ts

@@ -17,7 +17,7 @@ export default class GRPCServer implements IServer {
   server: IServerType;
   serverImpl: IServerImplType;
   serverCredentials: grpc.ServerCredentials;
-  serverStartupDelay = 1000;
+  daprSidecarPollingDelayMs = 1000;
   client: DaprClient;
 
   constructor(client: DaprClient) {
@@ -82,7 +82,7 @@ export default class GRPCServer implements IServer {
     console.log(`[Dapr-JS] Letting Dapr pick-up the server (Maximum 60s wait time)`);
     while (!isHealthy) {
       console.log(`[Dapr-JS] - Waiting till Dapr Started (#${isHealthyRetryCount})`);
-      await NodeJSUtils.sleep(this.serverStartupDelay);
+      await NodeJSUtils.sleep(this.daprSidecarPollingDelayMs);
       isHealthy = await this.client.health.isHealthy();
       isHealthyRetryCount++;
 

src/implementation/Server/HTTPServer/HTTPServer.ts

@@ -18,7 +18,7 @@ export default class HTTPServer implements IServer {
   server: IServerType;
   serverAddress: string;
   serverImpl: IServerImplType;
-  serverStartupDelay = 1000;
+  daprSidecarPollingDelayMs = 1000;
   client: DaprClient;
 
   constructor(client: DaprClient) {
@@ -110,7 +110,7 @@ export default class HTTPServer implements IServer {
     console.log(`[Dapr-JS] Letting Dapr pick-up the server (Maximum 60s wait time)`);
     while (!isHealthy) {
       console.log(`[Dapr-JS] - Waiting till Dapr Started (#${isHealthyRetryCount})`);
-      await NodeJSUtils.sleep(this.serverStartupDelay);
+      await NodeJSUtils.sleep(this.daprSidecarPollingDelayMs);
       isHealthy = await this.client.health.isHealthy();
       isHealthyRetryCount++;
 
@@ -125,7 +125,6 @@ export default class HTTPServer implements IServer {
   }
 
   async stop(): Promise<void> {
-    const s = this.server.getServer();
     const httpTerminator = createHttpTerminator({ server: this.server.getServer() });
     await httpTerminator.terminate();
     // await this.server.close();

test/e2e/actors.http.test.ts

@@ -53,22 +53,6 @@ describe('http/actors', () => {
     // await client.stop();
   });
 
-  describe('general', () => {
-    it('should allow us to use promises as some testing libraries have issues within the Node Ecosystem', async () => {
-      const mock = jest.fn(() => {
-        return new Promise((resolve) => setTimeout(resolve, 500));
-      });
-
-      const handler = jest.fn();
-
-      await mock().then(handler);
-
-      await (new Promise(resolve => setTimeout(resolve, 2000)));
-
-      expect(handler).toHaveBeenCalled();
-    });
-  });
-
   describe('actorProxy', () => {
     it('should be able to create an actor object through the proxy', async () => {
       const builder = new ActorProxyBuilder<DemoActorCounterImpl>(DemoActorCounterImpl, client);

test/e2e/main.http.test.ts

@@ -1,5 +1,4 @@
 import { CommunicationProtocolEnum, DaprClient, DaprServer, HttpMethod } from '../../src';
-import DemoActorCounterImpl from '../actor/DemoActorCounterImpl';
 
 const serverHost = '127.0.0.1';
 const serverPort = '50001';
@@ -38,22 +37,6 @@ describe('http/main', () => {
     await client.stop();
   });
 
-  describe('general', () => {
-    it('should allow us to use promises as some testing libraries have issues within the Node Ecosystem', async () => {
-      const mock = jest.fn(() => {
-        return new Promise((resolve) => setTimeout(resolve, 500));
-      });
-
-      const handler = jest.fn();
-
-      await mock().then(handler);
-
-      await (new Promise(resolve => setTimeout(resolve, 2000)));
-
-      expect(handler).toHaveBeenCalled();
-    });
-  });
-
   describe('metadata', () => {
     it('should be able to get the metadata of the Dapr sidecar', async () => {
       const res = await client.metadata.get();