cmd-control-client-lib 3.0.43 → 3.0.46

package/dist/protocol/media.d.ts

@@ -5,20 +5,29 @@ import { MediaFile, MediaMd5 } from "./message";
 export declare type MayHaveChannelId = {
     channelId?: string;
 };
+export declare enum ChannelMediaLinkState {
+    NONE = "NONE",
+    FREE = "FREE",
+    OFFER = "OFFER",
+    PAID = "PAID"
+}
 /**
  * media info, may have a channel id
  */
 export declare class CMDC_CMEDIA implements ICOMMAND {
     action: ACTION;
-    params: MayHaveChannelId & MediaFile;
+    params: MediaFile & MayHaveChannelId & {
+        linkState?: ChannelMediaLinkState;
+    };
 }
 /**
  * check for media already was uploaded.
  * mediaMd5 - comaseparated media md5
+ * channelId - comaseparated channelId
  */
 export declare class CMDP_SCHECKUPLOADEDMEDIA implements ICOMMAND {
     action: ACTION;
-    params: baseParamsType & MediaMd5;
+    params: baseParamsType & MediaMd5 & MayHaveChannelId;
 }
 /**
  *  media infos, if any found in cache

package/dist/protocol/mediaupload.d.ts

@@ -42,7 +42,7 @@ export declare class CMDP_SUPLOADMEDIA implements ICOMMAND {
     params: baseParamsType & MessageParams & UploadServiceReadOnlyParams & MediaOffer;
 }
 /**
- * Response for CMDP_INIT
+ * Response for CMDP_SUPLOADMEDIA
  */
 export declare class CMDP_SUPLOADMEDIA_RESPONSE extends CMDP_SUPLOADMEDIA implements IRESPONSE, IBACKENDPAYLOAD {
     result: RESULT;

package/package.json

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

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

@@ -43,75 +43,90 @@ describe("WebSocket connection", () => {
 
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
-    //First attempt
+
+    //Zero attempt (immediate reconnect)
     expect(setTimeout).toHaveBeenCalledTimes(1);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 15000);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 0);
 
-    const firstError = { reConnectionTimeout: 15000 };
+    const firstError = { reConnectionTimeout: 0 };
     expect(connectionConfig.onError).toHaveBeenCalledWith(firstError);
     jest.runOnlyPendingTimers();
-    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 15000 ms");
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 0 ms");
     expect(CMDConnection._reConnectAttemptsCount).toEqual(1);
 
-    //Second attempt
+    //First attempt
     expect(global.WebSocket).toHaveBeenCalledTimes(2);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const secondError = { reConnectionTimeout: 30000 };
+    const secondError = { reConnectionTimeout: 15000 };
     expect(setTimeout).toHaveBeenCalledTimes(2);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 30000);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 15000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(secondError);
-    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 30000 ms");
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 15000 ms");
     expect(CMDConnection._reConnectAttemptsCount).toEqual(2);
 
     jest.runOnlyPendingTimers();
-    //Third attempt
+    //Second attempt
     expect(global.WebSocket).toHaveBeenCalledTimes(3);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const thirdError = { reConnectionTimeout: 45000 };
+    const thirdError = { reConnectionTimeout: 30000 };
     expect(setTimeout).toHaveBeenCalledTimes(3);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 45000);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 30000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(thirdError);
-    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 45000 ms");
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 30000 ms");
     expect(CMDConnection._reConnectAttemptsCount).toEqual(3);
 
     jest.runOnlyPendingTimers();
-    //Fourth attempt
+
+    //Third attempt
     expect(global.WebSocket).toHaveBeenCalledTimes(4);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const fourthError = { reConnectionTimeout: 60000 };
+    const fourthError = { reConnectionTimeout: 45000 };
     expect(setTimeout).toHaveBeenCalledTimes(4);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 60000);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 45000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(fourthError);
-    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 60000 ms");
+    expect(logger.log).toHaveBeenCalledWith("CMDP. retry connect in 45000 ms");
     expect(CMDConnection._reConnectAttemptsCount).toEqual(4);
 
     jest.runOnlyPendingTimers();
-    //Final attempt
+
+    //Fourth attempt
     expect(global.WebSocket).toHaveBeenCalledTimes(5);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
-    const fifthError = { reConnectionTimeout: 75000 };
+    const fifthError = { reConnectionTimeout: 60000 };
     expect(setTimeout).toHaveBeenCalledTimes(5);
-    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 75000);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 60000);
     expect(connectionConfig.onError).toHaveBeenCalledWith(fifthError);
     expect(CMDConnection._reConnectAttemptsCount).toEqual(5);
 
     jest.runOnlyPendingTimers();
+    //Final attempt
     expect(global.WebSocket).toHaveBeenCalledTimes(6);
     CMDConnection._socket.onerror();
     CMDConnection._socket.onclose();
 
+    const finalError = { reConnectionTimeout: 75000 };
+    expect(setTimeout).toHaveBeenCalledTimes(6);
+    expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 75000);
+    expect(connectionConfig.onError).toHaveBeenCalledWith(finalError);
+    expect(CMDConnection._reConnectAttemptsCount).toEqual(6);
+
+    jest.runOnlyPendingTimers();
+    expect(global.WebSocket).toHaveBeenCalledTimes(7);
+    CMDConnection._socket.onerror();
+    CMDConnection._socket.onclose();
+
     const fatalError = { isFatal: true };
     expect(connectionConfig.onError).toHaveBeenCalledWith(fatalError);
     //No more setTimeout was called
-    expect(setTimeout).toHaveBeenCalledTimes(5);
+    expect(setTimeout).toHaveBeenCalledTimes(6);
     expect(logger.log).toHaveBeenCalledWith("CMDP. maximum reconnect attempts count reached");
   });
 });