cmd-control-client-lib 3.0.12 → 3.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cmd-control-client-lib",
   "description": "Cmd-Client-Library",
-  "version": "3.0.12",
+  "version": "3.0.17",
   "directories": {
     "lib": "./dist"
   },

package/test/open-web-socket.spec.ts

@@ -1,6 +1,5 @@
 import { CmdConnection, ConnectionConfig } from "../src/cmd-connection";
 import { logger } from "../src/logger";
-import { VControlErrorEvent } from "../src/v-control-error-event";
 
 describe("WebSocket connection", () => {
   it("Should open webSocket successfully", () => {
@@ -22,7 +21,6 @@ describe("WebSocket connection", () => {
   it("Should make 5 attempts if webSocket open failed", () => {
     logger.log = jest.fn();
     jest.useFakeTimers();
-    const error = "Connection failed Mock";
     // @ts-ignore
     global.WebSocket = jest.fn().mockImplementation(() => {
       return { readyState: 3 };
@@ -49,9 +47,7 @@ describe("WebSocket connection", () => {
     expect(setTimeout).toHaveBeenCalledTimes(1);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 15000);
 
-    const firstError = new VControlErrorEvent("error");
-    firstError.reConnectTimeout = 15000;
-    firstError.isFatal = false;
+    const firstError = { reConnectionTimeout: 15000 };
     expect(connectionConfig.onError).toHaveBeenCalledWith(firstError);
     jest.runOnlyPendingTimers();
     expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 15000 ms");
@@ -62,9 +58,7 @@ describe("WebSocket connection", () => {
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const secondError = new VControlErrorEvent("error");
-    secondError.reConnectTimeout = 30000;
-    secondError.isFatal = false;
+    const secondError = { reConnectionTimeout: 30000 };
     expect(setTimeout).toHaveBeenCalledTimes(2);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 30000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(secondError);
@@ -77,9 +71,7 @@ describe("WebSocket connection", () => {
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const thirdError = new VControlErrorEvent("error");
-    thirdError.reConnectTimeout = 45000;
-    thirdError.isFatal = false;
+    const thirdError = { reConnectionTimeout: 45000 };
     expect(setTimeout).toHaveBeenCalledTimes(3);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 45000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(thirdError);
@@ -92,9 +84,7 @@ describe("WebSocket connection", () => {
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const fourthError = new VControlErrorEvent("error");
-    fourthError.reConnectTimeout = 60000;
-    fourthError.isFatal = false;
+    const fourthError = { reConnectionTimeout: 60000 };
     expect(setTimeout).toHaveBeenCalledTimes(4);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 60000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(fourthError);
@@ -107,9 +97,7 @@ describe("WebSocket connection", () => {
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const fifthError = new VControlErrorEvent("error");
-    fifthError.reConnectTimeout = 75000;
-    fifthError.isFatal = false;
+    const fifthError = { reConnectionTimeout: 75000 };
     expect(setTimeout).toHaveBeenCalledTimes(5);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 75000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(fifthError);
@@ -119,14 +107,11 @@ describe("WebSocket connection", () => {
     expect(global.WebSocket).toHaveBeenCalledTimes(6);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
-    const fatalError = new VControlErrorEvent("error");
-    fatalError.reConnectTimeout = 90000;
-    fatalError.isFatal = true;
+
+    const fatalError = { isFatal: true };
+    expect(connectionConfig.onError).toHaveBeenCalledWith(fatalError);
     //No more setTimeout was called
     expect(setTimeout).toHaveBeenCalledTimes(5);
-    expect(global.WebSocket).toHaveBeenCalledTimes(6);
-    expect(connectionConfig.onError).toHaveBeenCalledWith(fatalError);
     expect(logger.log).toHaveBeenCalledWith("CMDP. maximum reconnect attempts count reached");
-    expect(CMDConnection._reConnectAttemptsCount).toEqual(0);
   });
 });

package/dist/v-control-error-event.d.ts

@@ -1,4 +0,0 @@
-export declare class VControlErrorEvent extends Event {
-    reConnectTimeout?: number;
-    isFatal?: boolean;
-}