cmd-control-client-lib 3.0.11 → 3.0.12

package/package.json

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

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

@@ -20,14 +20,12 @@ describe("WebSocket connection", () => {
   });
 
   it("Should make 5 attempts if webSocket open failed", () => {
-    logger.warn = jest.fn();
+    logger.log = jest.fn();
     jest.useFakeTimers();
     const error = "Connection failed Mock";
     // @ts-ignore
     global.WebSocket = jest.fn().mockImplementation(() => {
-      throw new Error(error);
-
-      return {};
+      return { readyState: 3 };
     });
 
     const connectionConfig = new ConnectionConfig();
@@ -42,122 +40,93 @@ describe("WebSocket connection", () => {
     const CMDConnection = new CmdConnection(connectionConfig);
     CMDConnection.connect();
     expect(global.WebSocket).toHaveBeenCalledWith("wss://hostMock:wssPortMock");
-    expect(CMDConnection["_socket"]).toBeUndefined();
+    expect(global.WebSocket).toHaveBeenCalledTimes(1);
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(0);
+
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
     //First attempt
     expect(setTimeout).toHaveBeenCalledTimes(1);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 15000);
 
+    const firstError = new VControlErrorEvent("error");
+    firstError.reConnectTimeout = 15000;
+    firstError.isFatal = false;
+    expect(connectionConfig.onError).toHaveBeenCalledWith(firstError);
     jest.runOnlyPendingTimers();
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 15000 ms");
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(1);
+
     //Second attempt
+    expect(global.WebSocket).toHaveBeenCalledTimes(2);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
+
     const secondError = new VControlErrorEvent("error");
-    secondError.reConnectTimeout = 15000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(secondError);
+    secondError.reConnectTimeout = 30000;
+    secondError.isFatal = false;
     expect(setTimeout).toHaveBeenCalledTimes(2);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 30000);
+    expect(connectionConfig.onError).toHaveBeenCalledWith(secondError);
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 30000 ms");
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(2);
 
     jest.runOnlyPendingTimers();
     //Third attempt
+    expect(global.WebSocket).toHaveBeenCalledTimes(3);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
+
     const thirdError = new VControlErrorEvent("error");
-    thirdError.reConnectTimeout = 30000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(thirdError);
+    thirdError.reConnectTimeout = 45000;
+    thirdError.isFatal = false;
     expect(setTimeout).toHaveBeenCalledTimes(3);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 45000);
+    expect(connectionConfig.onError).toHaveBeenCalledWith(thirdError);
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 45000 ms");
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(3);
 
     jest.runOnlyPendingTimers();
     //Fourth attempt
+    expect(global.WebSocket).toHaveBeenCalledTimes(4);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
+
     const fourthError = new VControlErrorEvent("error");
-    fourthError.reConnectTimeout = 45000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(fourthError);
+    fourthError.reConnectTimeout = 60000;
+    fourthError.isFatal = false;
     expect(setTimeout).toHaveBeenCalledTimes(4);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 60000);
+    expect(connectionConfig.onError).toHaveBeenCalledWith(fourthError);
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 60000 ms");
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(4);
 
     jest.runOnlyPendingTimers();
     //Final attempt
-    const finalError = new VControlErrorEvent("error");
-    finalError.reConnectTimeout = 60000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(finalError);
+    expect(global.WebSocket).toHaveBeenCalledTimes(5);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
+
+    const fifthError = new VControlErrorEvent("error");
+    fifthError.reConnectTimeout = 75000;
+    fifthError.isFatal = false;
     expect(setTimeout).toHaveBeenCalledTimes(5);
     expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 75000);
+    expect(connectionConfig.onError).toHaveBeenCalledWith(fifthError);
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(5);
 
     jest.runOnlyPendingTimers();
-    const lastTimeout = new VControlErrorEvent("error");
-    lastTimeout.reConnectTimeout = 75000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(lastTimeout);
-    //No more setTimeout was called
-    expect(setTimeout).toHaveBeenCalledTimes(5);
-    expect(logger.warn).toHaveBeenCalledWith(
-      "CMDP._openSocket SECURITY_ERR, maximum reconnect attempts count reached",
-      new Error(error),
-    );
-    //Calling error function that was provided through settings with fatal:true flag
+    expect(global.WebSocket).toHaveBeenCalledTimes(6);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
     const fatalError = new VControlErrorEvent("error");
+    fatalError.reConnectTimeout = 90000;
     fatalError.isFatal = true;
+    //No more setTimeout was called
+    expect(setTimeout).toHaveBeenCalledTimes(5);
+    expect(global.WebSocket).toHaveBeenCalledTimes(6);
     expect(connectionConfig.onError).toHaveBeenCalledWith(fatalError);
-  });
-
-  it("Should make up to 5 attempts if opened websocket failed", () => {
-    logger.log = jest.fn();
-    logger.warn = jest.fn();
-    jest.useFakeTimers();
-    // @ts-ignore
-    global.WebSocket = jest.fn().mockImplementationOnce(() => ({ send: jest.fn() }));
-    const connectionConfig = new ConnectionConfig();
-    connectionConfig.https = true;
-    connectionConfig.host = "hostMock";
-    connectionConfig.wssport = "wssPortMock";
-    connectionConfig.useWS = true;
-    connectionConfig.connectionRetryInterval = 15000;
-    connectionConfig.onError = jest.fn();
-
-    const CMDConnection = new CmdConnection(connectionConfig);
-    CMDConnection.connect();
-    expect(global.WebSocket).toHaveBeenCalledWith("wss://hostMock:wssPortMock");
-    //Socket is opened
-    expect(CMDConnection["_socket"]).not.toBeUndefined();
-
-    const closeEvent = { reason: "Mocked WebSocket close imitation" } as CloseEvent;
-    CMDConnection["_closing"] = false;
-    // @ts-ignore
-    CMDConnection._onclose(closeEvent);
-    expect(logger.log).toHaveBeenCalledWith("CMDP.socket.onclose", closeEvent);
-    expect(logger.log).toHaveBeenCalledWith("CMDP.retry connect in 15000 ms");
-
-    const error = "Connection failed Mock";
-    // @ts-ignore
-    global.WebSocket = jest.fn().mockImplementation(() => {
-      throw new Error(error);
-
-      return {};
-    });
-    jest.runOnlyPendingTimers();
-    //Socket was killed
-    expect(CMDConnection["_socket"]).toBeUndefined();
-    expect(global.WebSocket).toHaveBeenCalledWith("wss://hostMock:wssPortMock");
-    expect(setTimeout).toHaveBeenCalledTimes(2);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 30000);
-    jest.runOnlyPendingTimers();
-
-    const firstError = new VControlErrorEvent("error");
-    firstError.reConnectTimeout = 30000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(firstError);
-    expect(setTimeout).toHaveBeenCalledTimes(3);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 45000);
-    jest.runOnlyPendingTimers();
-
-    const secondError = new VControlErrorEvent("error");
-    secondError.reConnectTimeout = 45000;
-    expect(connectionConfig.onError).toHaveBeenCalledWith(secondError);
-    expect(setTimeout).toHaveBeenCalledTimes(4);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 60000);
-
-    //Imitating reconnect success on fourth attempt
-    //Socket can be opened successfully
-    // @ts-ignore
-    global.WebSocket = jest.fn().mockImplementationOnce(() => ({ send: jest.fn() }));
-    jest.runOnlyPendingTimers();
-    expect(setTimeout).toHaveBeenCalledTimes(4);
-    //Socket was successfully reconnected
-    expect(global.WebSocket).toHaveBeenCalledWith("wss://hostMock:wssPortMock");
-    expect(CMDConnection["_socket"]).not.toBeUndefined();
+    expect(logger.log).toHaveBeenCalledWith("CMDP. maximum reconnect attempts count reached");
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(0);
   });
 });