podchat-browser 12.9.6-snapshot.4 → 12.9.6

package/changelog.md

@@ -3,11 +3,39 @@
 All notable changes to this project will be documented here.
 to see complete list of changelog please visit [ChangeLog](http://gp.fanapsoft.ir/pod/pod-basic-sdk/chat-js-browser-sdk/-/blob/master/changelog.md)
 
-##[Unreleased]
+## [Unreleased]
+
+## [12.9.6] 29-07-2023
+## [12.9.6-snapshot.4] 19-07-2023
+## [12.9.6-snapshot.3] 19-07-2023
+## [12.9.6-snapshot.2] 19-07-2023
+
+### Added
+- Implemented mode: auto switch between async protocols
+
+### Fixed
+- window is undefined error in Next.js projects
+- Modified 31:LAST_SEEN_UPDATED unreadCount cache condition to prevent errors
+
+
+## [12.9.6-snapshot.1] 11-07-2023
+
+### Changed
+- Update podasync-ws-only@2.9.0-snapshot.10
+
+
+## [12.9.6-snapshot.0] 09-07-2023
+
+### Changed
+- Merge default count=25, offset=0
+- Merge sdkParams in separate module
+
+###Fixed
+- Fixed store error for not loaded thread on type 31 (unreadCount cache)
 
 ## [12.9.5] 2023-07-09
 
-## Changed
+### Changed
 - remove old cache
 - Modification on unreadCount cache to prevent unwanted higher unreadCount on event unread_count_updated
 

package/dist/node/buildConfig.json

@@ -1 +1 @@
-{"version":"12.9.6-snapshot.4","date":"۱۴۰۲/۴/۲۸","VersionInfo":"Release: false, Snapshot: true, Is For Test: true"}
+{"version":"12.9.6","date":"۱۴۰۲/۵/۷","VersionInfo":"Release: true, Snapshot: false, Is For Test: false"}

package/dist/node/chat.js

@@ -249,11 +249,16 @@ function Chat(params) {
       currentProtocol: protocol == "auto" ? 'websocket' : protocol,
       failOverProtocol: protocol == "auto" || protocol == "websocket" ? 'webrtc' : 'websocket',
       retries: 0,
-      allowedRetries: 3
+      allowedRetries: {
+        websocket: 2,
+        webrtc: 1
+      },
+      reconnectAsyncRequest: false,
+      currentWaitTime: 0
     };
 
     function _canRetry() {
-      return config.retries < config.allowedRetries;
+      return config.retries < config.allowedRetries[config.currentProtocol];
     }
 
     function _switchProtocol(protocol) {
@@ -271,10 +276,7 @@ function Chat(params) {
           config.failOverProtocol = current;
         }
 
-        console.log(">> Switching protocol::: ", {
-          current: config.currentProtocol,
-          prev: config.failOverProtocol
-        });
+        _sdkParams.sdkParams.consoleLogging && console.log("[SDK]|/| switchProtocol: ", "config.currentProtocol: ", config.currentProtocol, "config.currentWaitTime: ", config.currentWaitTime);
 
         _events.chatEvents.fireEvent("autoSwitchAsyncProtocol", {
           current: config.currentProtocol,
@@ -283,6 +285,7 @@ function Chat(params) {
 
         _resetRetries();
 
+        config.reconnectAsyncRequest = false;
         initAsync();
       });
       asyncClient.logout();
@@ -292,7 +295,7 @@ function Chat(params) {
       config.retries = 0;
     }
 
-    return {
+    var publics = {
       switchProtocol: function switchProtocol(protocol) {
         if (protocol == 'auto') {
           config.switchingEnabled = true;
@@ -316,12 +319,42 @@ function Chat(params) {
       resetRetries: function resetRetries() {
         _resetRetries();
       },
-      maybeSwitchProtocol: function maybeSwitchProtocol() {
+      onAsyncIsReconnecting: function onAsyncIsReconnecting(event) {
+        _sdkParams.sdkParams.consoleLogging && console.log("[SDK]|/| onAsyncIsReconnecting: ", "config.currentProtocol: ", config.currentProtocol, "config.currentWaitTime: ", config.currentWaitTime);
+        publics.increaseRetries();
+
+        if (config.currentWaitTime < 64) {
+          config.currentWaitTime += 3;
+        } //config.currentWaitTime = event.nextTime
+
+
         if (!_canRetry() && config.switchingEnabled) {
           _switchProtocol();
         }
+      },
+      getRetryStepTimerTime: function getRetryStepTimerTime() {
+        if (config.switchingEnabled) return config.currentWaitTime;else return 4;
+      },
+      reconnectAsync: function reconnectAsync() {
+        config.reconnectAsyncRequest = true;
+        config.currentWaitTime = 0;
+
+        if (config.switchingEnabled) {
+          if (!_canRetry()) {
+            _switchProtocol();
+          } else {
+            _switchProtocol(config.currentProtocol);
+          }
+        } else {
+          if (!_canRetry()) {
+            _switchProtocol();
+          } else {
+            _switchProtocol(config.currentProtocol);
+          }
+        }
       }
     };
+    return publics;
   }
   /*******************************************************
    *            P R I V A T E   M E T H O D S            *
@@ -382,7 +415,9 @@ function Chat(params) {
       reconnectOnClose: _sdkParams.sdkParams.reconnectOnClose,
       asyncLogging: _sdkParams.sdkParams.asyncLogging,
       logLevel: _sdkParams.sdkParams.consoleLogging ? 3 : 1,
-      webrtcConfig: _sdkParams.sdkParams.webrtcConfig
+      webrtcConfig: _sdkParams.sdkParams.webrtcConfig,
+      retryStepTimerTime: protocolManager.getRetryStepTimerTime(),
+      onStartWithRetryStepGreaterThanZero: onStateChange
     });
     callModule.asyncInitialized(asyncClient);
     chatMessaging.asyncInitialized(asyncClient);
@@ -416,7 +451,9 @@ function Chat(params) {
         }
       }, _sdkParams.sdkParams.seenIntervalPitch); //shouldReconnectCall();
     });
-    asyncClient.on('stateChange', function (state) {
+    asyncClient.on('stateChange', onStateChange);
+
+    function onStateChange(state) {
       _events.chatEvents.fireEvent('chatState', state);
 
       chatFullStateObject = state;
@@ -454,7 +491,8 @@ function Chat(params) {
 
           break;
       }
-    });
+    }
+
     asyncClient.on('connect', function (newPeerId) {
       asyncGetReadyTime = new Date().getTime();
       peerId = newPeerId;
@@ -481,10 +519,9 @@ function Chat(params) {
 
       _events.chatEvents.fireEvent('reconnect');
     });
-    asyncClient.on('reconnecting', function () {
+    asyncClient.on('reconnecting', function (event) {
       _sdkParams.sdkParams.consoleLogging && console.log("[SDK][event: asyncClient.reconnecting]");
-      protocolManager.increaseRetries();
-      protocolManager.maybeSwitchProtocol();
+      protocolManager.onAsyncIsReconnecting(event);
     });
     asyncClient.on('message', function (params, ack) {
       receivedAsyncMessageHandler(params);
@@ -11743,7 +11780,7 @@ function Chat(params) {
   };
 
   publicized.reconnect = function () {
-    asyncClient.reconnectSocket();
+    protocolManager.reconnectAsync();
   };
 
   publicized.setToken = function (newToken) {

package/dist/node/messaging.module.js

@@ -52,6 +52,7 @@ function ChatMessaging(params) {
    */
 
   this.startChatPing = function () {
+    _sdkParams.sdkParams.chatPingMessageInterval && clearInterval(_sdkParams.sdkParams.chatPingMessageInterval);
     _sdkParams.sdkParams.chatPingMessageInterval = setInterval(function () {
       currentModuleInstance.ping();
     }, 20000); //TODO: chatPingMessageInterval

package/dist/podchat-browser-bundle.js

@@ -42,6 +42,7 @@ function Async(params) {
   var protocol = params.protocol || 'websocket',
     appId = params.appId || 'PodChat',
     deviceId = params.deviceId,
+    retryStepTimerTime = typeof params.retryStepTimerTime != "undefined" ? params.retryStepTimerTime : 0,
     eventCallbacks = {
       connect: {},
       disconnect: {},
@@ -108,7 +109,8 @@ function Async(params) {
     onSendLogging = params.asyncLogging && typeof params.asyncLogging.onMessageSend === 'boolean' ? params.asyncLogging.onMessageSend : false,
     workerId = params.asyncLogging && typeof parseInt(params.asyncLogging.workerId) === 'number' ? params.asyncLogging.workerId : 0,
     webrtcConfig = params.webrtcConfig ? params.webrtcConfig : null,
-    isLoggedOut = false;
+    isLoggedOut = false,
+    onStartWithRetryStepGreaterThanZero = params.onStartWithRetryStepGreaterThanZero;
   var reconnOnClose = {
     value: false,
     oldValue: null,
@@ -127,7 +129,7 @@ function Async(params) {
   };
   reconnOnClose.set(reconnectOnClose);
   var retryStep = {
-    value: 4,
+    value: retryStepTimerTime,
     get: function get() {
       return retryStep.value;
     },
@@ -142,14 +144,26 @@ function Async(params) {
    *******************************************************/
 
   var init = function init() {
-      switch (protocol) {
-        case 'websocket':
-          initSocket();
-          break;
-        case 'webrtc':
-          initWebrtc();
-          break;
+      if (retryStep.get() > 0) {
+        onStartWithRetryStepGreaterThanZero && onStartWithRetryStepGreaterThanZero({
+          socketState: socketStateType.CLOSED,
+          timeUntilReconnect: 1000 * retryStep.get(),
+          deviceRegister: false,
+          serverRegister: false,
+          peerId: peerId
+        });
       }
+      socketReconnectRetryInterval = setTimeout(function () {
+        if (isLoggedOut) return;
+        switch (protocol) {
+          case 'websocket':
+            initSocket();
+            break;
+          case 'webrtc':
+            initWebrtc();
+            break;
+        }
+      }, 1000 * retryStep.get());
     },
     asyncLogger = function asyncLogger(type, msg) {
       Utility.asyncLogger({
@@ -244,7 +258,9 @@ function Async(params) {
             if (isLoggedOut) return;
             socket.connect();
             setTimeout(function () {
-              fireEvent("reconnecting");
+              fireEvent("reconnecting", {
+                nextTime: retryStep.get()
+              });
             }, 5);
           }, 1000 * retryStep.get());
           if (retryStep.get() < 64) {
@@ -347,6 +363,7 @@ function Async(params) {
         isSocketOpen = false;
         isDeviceRegister = false;
         oldPeerId = peerId;
+        socketState = socketStateType.CLOSED;
         fireEvent('disconnect', event);
         if (reconnOnClose.get() || reconnOnClose.getOld()) {
           if (asyncLogging) {
@@ -357,7 +374,6 @@ function Async(params) {
             }
           }
           logLevel.debug && console.debug("[Async][async.js] on connection close, retryStep:", retryStep.get());
-          socketState = socketStateType.CLOSED;
           fireEvent('stateChange', {
             socketState: socketState,
             timeUntilReconnect: 1000 * retryStep.get(),
@@ -370,6 +386,11 @@ function Async(params) {
           socketReconnectRetryInterval = setTimeout(function () {
             if (isLoggedOut) return;
             webRTCClass.connect();
+            setTimeout(function () {
+              fireEvent("reconnecting", {
+                nextTime: retryStep.get()
+              });
+            }, 5);
           }, 1000 * retryStep.get());
           if (retryStep.get() < 64) {
             // retryStep += 3;
@@ -865,6 +886,9 @@ function Async(params) {
       //     webRTCClass.connect()
     }, 4000);
   };
+  this.setRetryTimerTime = function (seconds) {
+    retryStep.set(seconds);
+  };
   this.generateUUID = Utility.generateUUID;
   init();
 }
@@ -1282,6 +1306,7 @@ function PingManager(params) {
 }
 
 function connect() {
+  variables.isDestroyed = false;
   webrtcFunctions.createPeerConnection();
 }
 var webrtcFunctions = {
@@ -1440,6 +1465,7 @@ var handshakingFunctions = {
     var retries = variables.apiCallRetries.register;
     return new Promise(promiseHandler);
     function promiseHandler(resolve, reject) {
+      if (variables.isDestroyed) return;
       var registerEndPoint = getApiUrl() + defaultConfig.registerEndpoint;
       fetch(registerEndPoint, {
         method: "POST",
@@ -1474,12 +1500,13 @@ var handshakingFunctions = {
     }
   },
   getCandidates: function getCandidates(clientId) {
-    var addIceCandidateEndPoint = getApiUrl() + defaultConfig.getICEEndpoint;
-    addIceCandidateEndPoint += "clientId=" + clientId;
+    var getIceCandidateEndPoint = getApiUrl() + defaultConfig.getICEEndpoint;
+    getIceCandidateEndPoint += "clientId=" + clientId;
     var retries = variables.apiCallRetries.getIce;
     return new Promise(promiseHandler);
     function promiseHandler(resolve, reject) {
-      fetch(addIceCandidateEndPoint, {
+      if (variables.isDestroyed) return;
+      fetch(getIceCandidateEndPoint, {
         method: "GET",
         headers: {
           "Content-Type": "application/json"
@@ -1523,6 +1550,7 @@ var handshakingFunctions = {
       retries = variables.apiCallRetries.addIce;
     return new Promise(promiseHandler);
     function promiseHandler(resolve, reject) {
+      if (variables.isDestroyed) return;
       fetch(addIceCandidateEndPoint, {
         method: "POST",
         body: JSON.stringify({
@@ -1567,7 +1595,7 @@ function resetVariables() {
   variables.deviceId = null;
   variables.candidateManager.destroy();
   variables.candidateManager = new CandidatesSendQueueManager();
-  variables.isDestroyed = false;
+  // variables.isDestroyed = false;
   if (!variables.isDestroyed && variables.eventCallback["close"]) {
     variables.eventCallback["close"]();
   }
@@ -49089,7 +49117,7 @@ WildEmitter.mixin = function (constructor) {
 WildEmitter.mixin(WildEmitter);
 
 },{}],280:[function(require,module,exports){
-module.exports={"version":"12.9.6-snapshot.4","date":"۱۴۰۲/۴/۲۸","VersionInfo":"Release: false, Snapshot: true, Is For Test: true"}
+module.exports={"version":"12.9.6","date":"۱۴۰۲/۵/۷","VersionInfo":"Release: true, Snapshot: false, Is For Test: false"}
 },{}],281:[function(require,module,exports){
 "use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");var _typeof3=require("@babel/runtime/helpers/typeof");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _toConsumableArray2=_interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));var _typeof2=_interopRequireDefault(require("@babel/runtime/helpers/typeof"));var _constants=require("./lib/constants");var _kurentoUtils=_interopRequireDefault(require("kurento-utils"));var _utility=_interopRequireDefault(require("./utility/utility"));var _eventsModule=require("./events.module.js");var _deviceManager=_interopRequireDefault(require("./lib/call/deviceManager.js"));var _errorHandler=_interopRequireWildcard(require("./lib/errorHandler"));var _sdkParams=require("./lib/sdkParams");function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function _getRequireWildcardCache(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||_typeof3(obj)!=="object"&&typeof obj!=="function"){return{"default":obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj["default"]=obj;if(cache){cache.set(obj,newObj);}return newObj;}function ChatCall(params){var _sdkParams$callOption,_sdkParams$callOption2;var//Utility = params.Utility,
 currentModuleInstance=this,asyncClient=params.asyncClient,//chatEvents = params.chatEvents,
@@ -49904,8 +49932,9 @@ minIntegerValue=Number.MAX_SAFE_INTEGER*-1,maxIntegerValue=Number.MAX_SAFE_INTEG
 //webrtcConfig = (params.webrtcConfig ? params.webrtcConfig : null);
 if(!_sdkParams.sdkParams.consoleLogging){/**
      * Disable kurento-utils logs
-     */window.Logger={error:function error(){},log:function log(){},debug:function debug(){}};}(0,_events.initEventHandler)(params);var chatMessaging=new _messaging["default"](Object.assign(params,{asyncClient:asyncClient})),callModule=new _call["default"](Object.assign(params,{asyncClient:asyncClient,chatMessaging:chatMessaging}));function ProtocolManager(_ref){var _ref$protocol=_ref.protocol,protocol=_ref$protocol===void 0?'auto':_ref$protocol;var config={switchingEnabled:protocol=="auto",currentProtocol:protocol=="auto"?'websocket':protocol,failOverProtocol:protocol=="auto"||protocol=="websocket"?'webrtc':'websocket',retries:0,allowedRetries:3};function _canRetry(){return config.retries<config.allowedRetries;}function _switchProtocol(protocol){// sdkParams.protocol = current.toLowerCase();
-asyncClient.on('asyncDestroyed',function(){var current;if(protocol){current=protocol.toLowerCase();config.failOverProtocol=current=="webrtc"?"websocket":"webrtc";config.currentProtocol=current;}else{current=config.currentProtocol;config.currentProtocol=config.failOverProtocol;config.failOverProtocol=current;}console.log(">> Switching protocol::: ",{current:config.currentProtocol,prev:config.failOverProtocol});_events.chatEvents.fireEvent("autoSwitchAsyncProtocol",{current:config.currentProtocol,previous:config.failOverProtocol});_resetRetries();initAsync();});asyncClient.logout();}function _resetRetries(){config.retries=0;}return{switchProtocol:function switchProtocol(protocol){if(protocol=='auto'){config.switchingEnabled=true;_switchProtocol("websocket");}else{config.switchingEnabled=false;_switchProtocol(protocol);}},increaseRetries:function increaseRetries(){config.retries++;},canRetry:function canRetry(){return _canRetry();},getCurrentProtocol:function getCurrentProtocol(){return config.currentProtocol;},resetRetries:function resetRetries(){_resetRetries();},maybeSwitchProtocol:function maybeSwitchProtocol(){if(!_canRetry()&&config.switchingEnabled){_switchProtocol();}}};}/*******************************************************
+     */window.Logger={error:function error(){},log:function log(){},debug:function debug(){}};}(0,_events.initEventHandler)(params);var chatMessaging=new _messaging["default"](Object.assign(params,{asyncClient:asyncClient})),callModule=new _call["default"](Object.assign(params,{asyncClient:asyncClient,chatMessaging:chatMessaging}));function ProtocolManager(_ref){var _ref$protocol=_ref.protocol,protocol=_ref$protocol===void 0?'auto':_ref$protocol;var config={switchingEnabled:protocol=="auto",currentProtocol:protocol=="auto"?'websocket':protocol,failOverProtocol:protocol=="auto"||protocol=="websocket"?'webrtc':'websocket',retries:0,allowedRetries:{websocket:2,webrtc:1},reconnectAsyncRequest:false,currentWaitTime:0};function _canRetry(){return config.retries<config.allowedRetries[config.currentProtocol];}function _switchProtocol(protocol){// sdkParams.protocol = current.toLowerCase();
+asyncClient.on('asyncDestroyed',function(){var current;if(protocol){current=protocol.toLowerCase();config.failOverProtocol=current=="webrtc"?"websocket":"webrtc";config.currentProtocol=current;}else{current=config.currentProtocol;config.currentProtocol=config.failOverProtocol;config.failOverProtocol=current;}_sdkParams.sdkParams.consoleLogging&&console.log("[SDK]|/| switchProtocol: ","config.currentProtocol: ",config.currentProtocol,"config.currentWaitTime: ",config.currentWaitTime);_events.chatEvents.fireEvent("autoSwitchAsyncProtocol",{current:config.currentProtocol,previous:config.failOverProtocol});_resetRetries();config.reconnectAsyncRequest=false;initAsync();});asyncClient.logout();}function _resetRetries(){config.retries=0;}var publics={switchProtocol:function switchProtocol(protocol){if(protocol=='auto'){config.switchingEnabled=true;_switchProtocol("websocket");}else{config.switchingEnabled=false;_switchProtocol(protocol);}},increaseRetries:function increaseRetries(){config.retries++;},canRetry:function canRetry(){return _canRetry();},getCurrentProtocol:function getCurrentProtocol(){return config.currentProtocol;},resetRetries:function resetRetries(){_resetRetries();},onAsyncIsReconnecting:function onAsyncIsReconnecting(event){_sdkParams.sdkParams.consoleLogging&&console.log("[SDK]|/| onAsyncIsReconnecting: ","config.currentProtocol: ",config.currentProtocol,"config.currentWaitTime: ",config.currentWaitTime);publics.increaseRetries();if(config.currentWaitTime<64){config.currentWaitTime+=3;}//config.currentWaitTime = event.nextTime
+if(!_canRetry()&&config.switchingEnabled){_switchProtocol();}},getRetryStepTimerTime:function getRetryStepTimerTime(){if(config.switchingEnabled)return config.currentWaitTime;else return 4;},reconnectAsync:function reconnectAsync(){config.reconnectAsyncRequest=true;config.currentWaitTime=0;if(config.switchingEnabled){if(!_canRetry()){_switchProtocol();}else{_switchProtocol(config.currentProtocol);}}else{if(!_canRetry()){_switchProtocol();}else{_switchProtocol(config.currentProtocol);}}}};return publics;}/*******************************************************
    *            P R I V A T E   M E T H O D S            *
    *******************************************************/var init=function init(){/**
      * Initialize Cache Databases
@@ -49921,8 +49950,8 @@ if(_sdkParams.sdkParams.grantDeviceIdFromSSO){var getDeviceIdWithTokenTime=new D
    * @return {undefined}
    * @return {undefined}
    */initAsync=function initAsync(){var asyncGetReadyTime=new Date().getTime();asyncClient=new _podasyncWsOnly["default"]({protocol:protocolManager.getCurrentProtocol(),//sdkParams.protocol,
-queueHost:queueHost,queuePort:queuePort,queueUsername:queueUsername,queuePassword:queuePassword,queueReceive:queueReceive,queueSend:queueSend,queueConnectionTimeout:queueConnectionTimeout,socketAddress:_sdkParams.sdkParams.socketAddress,serverName:_sdkParams.sdkParams.serverName,deviceId:_sdkParams.sdkParams.deviceId,wsConnectionWaitTime:_sdkParams.sdkParams.wsConnectionWaitTime,connectionRetryInterval:_sdkParams.sdkParams.connectionRetryInterval,connectionCheckTimeout:_sdkParams.sdkParams.connectionCheckTimeout,connectionCheckTimeoutThreshold:_sdkParams.sdkParams.connectionCheckTimeoutThreshold,messageTtl:_sdkParams.sdkParams.messageTtl,reconnectOnClose:_sdkParams.sdkParams.reconnectOnClose,asyncLogging:_sdkParams.sdkParams.asyncLogging,logLevel:_sdkParams.sdkParams.consoleLogging?3:1,webrtcConfig:_sdkParams.sdkParams.webrtcConfig});callModule.asyncInitialized(asyncClient);chatMessaging.asyncInitialized(asyncClient);asyncClient.on('asyncReady',function(){if(_sdkParams.sdkParams.actualTimingLog){_utility["default"].chatStepLogger('Async Connection ',new Date().getTime()-asyncGetReadyTime);}peerId=asyncClient.getPeerId();if(!chatMessaging.userInfo){getUserAndUpdateSDKState();}else if(chatMessaging.userInfo.id>0){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}_sdkParams.sdkParams.deliveryInterval&&clearInterval(_sdkParams.sdkParams.deliveryInterval);_sdkParams.sdkParams.deliveryInterval=setInterval(function(){if(Object.keys(_sdkParams.sdkParams.messagesDelivery).length){messagesDeliveryQueueHandler();}},_sdkParams.sdkParams.deliveryIntervalPitch);_sdkParams.sdkParams.seenInterval&&clearInterval(_sdkParams.sdkParams.seenInterval);_sdkParams.sdkParams.seenInterval=setInterval(function(){if(Object.keys(_sdkParams.sdkParams.messagesSeen).length){messagesSeenQueueHandler();}},_sdkParams.sdkParams.seenIntervalPitch);//shouldReconnectCall();
-});asyncClient.on('stateChange',function(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state;switch(state.socketState){case 1:// CONNECTED
+queueHost:queueHost,queuePort:queuePort,queueUsername:queueUsername,queuePassword:queuePassword,queueReceive:queueReceive,queueSend:queueSend,queueConnectionTimeout:queueConnectionTimeout,socketAddress:_sdkParams.sdkParams.socketAddress,serverName:_sdkParams.sdkParams.serverName,deviceId:_sdkParams.sdkParams.deviceId,wsConnectionWaitTime:_sdkParams.sdkParams.wsConnectionWaitTime,connectionRetryInterval:_sdkParams.sdkParams.connectionRetryInterval,connectionCheckTimeout:_sdkParams.sdkParams.connectionCheckTimeout,connectionCheckTimeoutThreshold:_sdkParams.sdkParams.connectionCheckTimeoutThreshold,messageTtl:_sdkParams.sdkParams.messageTtl,reconnectOnClose:_sdkParams.sdkParams.reconnectOnClose,asyncLogging:_sdkParams.sdkParams.asyncLogging,logLevel:_sdkParams.sdkParams.consoleLogging?3:1,webrtcConfig:_sdkParams.sdkParams.webrtcConfig,retryStepTimerTime:protocolManager.getRetryStepTimerTime(),onStartWithRetryStepGreaterThanZero:onStateChange});callModule.asyncInitialized(asyncClient);chatMessaging.asyncInitialized(asyncClient);asyncClient.on('asyncReady',function(){if(_sdkParams.sdkParams.actualTimingLog){_utility["default"].chatStepLogger('Async Connection ',new Date().getTime()-asyncGetReadyTime);}peerId=asyncClient.getPeerId();if(!chatMessaging.userInfo){getUserAndUpdateSDKState();}else if(chatMessaging.userInfo.id>0){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}_sdkParams.sdkParams.deliveryInterval&&clearInterval(_sdkParams.sdkParams.deliveryInterval);_sdkParams.sdkParams.deliveryInterval=setInterval(function(){if(Object.keys(_sdkParams.sdkParams.messagesDelivery).length){messagesDeliveryQueueHandler();}},_sdkParams.sdkParams.deliveryIntervalPitch);_sdkParams.sdkParams.seenInterval&&clearInterval(_sdkParams.sdkParams.seenInterval);_sdkParams.sdkParams.seenInterval=setInterval(function(){if(Object.keys(_sdkParams.sdkParams.messagesSeen).length){messagesSeenQueueHandler();}},_sdkParams.sdkParams.seenIntervalPitch);//shouldReconnectCall();
+});asyncClient.on('stateChange',onStateChange);function onStateChange(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state;switch(state.socketState){case 1:// CONNECTED
 protocolManager.resetRetries();if(state.deviceRegister&&state.serverRegister){// chatMessaging.chatState = true;
 // chatMessaging.ping();
 chatMessaging.startChatPing();}break;case 0:// CONNECTING
@@ -49930,7 +49959,7 @@ chatMessaging.chatState=false;chatMessaging.stopChatPing();break;case 2:// CLOSI
 chatMessaging.chatState=false;chatMessaging.stopChatPing();break;case 3:// CLOSED
 chatMessaging.chatState=false;chatMessaging.stopChatPing();// TODO: Check if this is OK or not?!
 //chatMessaging.sendPingTimeout && clearTimeout(chatMessaging.sendPingTimeout);
-break;}});asyncClient.on('connect',function(newPeerId){asyncGetReadyTime=new Date().getTime();peerId=newPeerId;_events.chatEvents.fireEvent('connect');chatMessaging.ping();});asyncClient.on('disconnect',function(event){oldPeerId=peerId;peerId=undefined;_events.chatEvents.fireEvent('disconnect',event);_events.chatEvents.fireEvent('callEvents',{type:'CALL_ERROR',code:7000,message:'Call Socket is closed!',error:event});});asyncClient.on('reconnect',function(newPeerId){peerId=newPeerId;_events.chatEvents.fireEvent('reconnect');});asyncClient.on('reconnecting',function(){_sdkParams.sdkParams.consoleLogging&&console.log("[SDK][event: asyncClient.reconnecting]");protocolManager.increaseRetries();protocolManager.maybeSwitchProtocol();});asyncClient.on('message',function(params,ack){receivedAsyncMessageHandler(params);ack&&ack();});asyncClient.on('error',function(error){_events.chatEvents.fireEvent('error',{code:error.errorCode,message:error.errorMessage,error:error.errorEvent});});},getUserAndUpdateSDKState=function getUserAndUpdateSDKState(){var getUserInfoTime=new Date().getTime();getUserInfo(function(userInfoResult){if(_sdkParams.sdkParams.actualTimingLog){_utility["default"].chatStepLogger('Get User Info ',new Date().getTime()-getUserInfoTime);}if(!userInfoResult.hasError){chatMessaging.userInfo=userInfoResult.result.user;// getAllThreads({
+break;}}asyncClient.on('connect',function(newPeerId){asyncGetReadyTime=new Date().getTime();peerId=newPeerId;_events.chatEvents.fireEvent('connect');chatMessaging.ping();});asyncClient.on('disconnect',function(event){oldPeerId=peerId;peerId=undefined;_events.chatEvents.fireEvent('disconnect',event);_events.chatEvents.fireEvent('callEvents',{type:'CALL_ERROR',code:7000,message:'Call Socket is closed!',error:event});});asyncClient.on('reconnect',function(newPeerId){peerId=newPeerId;_events.chatEvents.fireEvent('reconnect');});asyncClient.on('reconnecting',function(event){_sdkParams.sdkParams.consoleLogging&&console.log("[SDK][event: asyncClient.reconnecting]");protocolManager.onAsyncIsReconnecting(event);});asyncClient.on('message',function(params,ack){receivedAsyncMessageHandler(params);ack&&ack();});asyncClient.on('error',function(error){_events.chatEvents.fireEvent('error',{code:error.errorCode,message:error.errorMessage,error:error.errorEvent});});},getUserAndUpdateSDKState=function getUserAndUpdateSDKState(){var getUserInfoTime=new Date().getTime();getUserInfo(function(userInfoResult){if(_sdkParams.sdkParams.actualTimingLog){_utility["default"].chatStepLogger('Get User Info ',new Date().getTime()-getUserInfoTime);}if(!userInfoResult.hasError){chatMessaging.userInfo=userInfoResult.result.user;// getAllThreads({
 //     summary: true,
 //     cache: false
 // });
@@ -51807,7 +51836,7 @@ content:{count:count,offset:offset}};if(params){if((0,_typeof2["default"])(param
      * + locationPingRequest     {object}
      *    + content              {list} A map of { location: string, locationId: int }
      */var locationPingData={chatMessageVOType:_constants.chatMessageVOTypes.LOCATION_PING,typeCode:_sdkParams.sdkParams.generalTypeCode,//params.typeCode,
-pushMsgType:3,token:_sdkParams.sdkParams.token},content={};if(params){if(typeof params.location==='string'&&_sdkParams.sdkParams.locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=_sdkParams.sdkParams.locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&&params.threadId>0){content.locationId=+params.threadId;}else{_events.chatEvents.fireEvent('error',{code:999,message:'You set the location to be a thread, you have to send a valid ThreadId'});return;}}}else{_events.chatEvents.fireEvent('error',{code:999,message:'Send a valid location type (CHAT / THREAD / CONTACTS)'});return;}locationPingData.content=JSON.stringify(content);}else{_events.chatEvents.fireEvent('error',{code:999,message:'No params have been sent to LocationPing!'});return;}return chatMessaging.sendMessage(locationPingData,{onResult:function onResult(result){callback&&callback(result);}});};publicized.clearChatServerCaches=clearChatServerCaches;publicized.deleteCacheDatabases=deleteCacheDatabases;publicized.clearCacheDatabasesOfUser=clearCacheDatabasesOfUser;publicized.getChatState=function(){return chatFullStateObject;};publicized.reconnect=function(){asyncClient.reconnectSocket();};publicized.setToken=function(newToken){if(typeof newToken!=='undefined'){_sdkParams.sdkParams.token=newToken;_events.chatEvents.updateToken(_sdkParams.sdkParams.token);if(!chatMessaging.userInfo||!chatMessaging.userInfo.id){getUserAndUpdateSDKState();}}};publicized.generateUUID=_utility["default"].generateUUID;publicized.logout=function(){// clearChatServerCaches();
+pushMsgType:3,token:_sdkParams.sdkParams.token},content={};if(params){if(typeof params.location==='string'&&_sdkParams.sdkParams.locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=_sdkParams.sdkParams.locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&&params.threadId>0){content.locationId=+params.threadId;}else{_events.chatEvents.fireEvent('error',{code:999,message:'You set the location to be a thread, you have to send a valid ThreadId'});return;}}}else{_events.chatEvents.fireEvent('error',{code:999,message:'Send a valid location type (CHAT / THREAD / CONTACTS)'});return;}locationPingData.content=JSON.stringify(content);}else{_events.chatEvents.fireEvent('error',{code:999,message:'No params have been sent to LocationPing!'});return;}return chatMessaging.sendMessage(locationPingData,{onResult:function onResult(result){callback&&callback(result);}});};publicized.clearChatServerCaches=clearChatServerCaches;publicized.deleteCacheDatabases=deleteCacheDatabases;publicized.clearCacheDatabasesOfUser=clearCacheDatabasesOfUser;publicized.getChatState=function(){return chatFullStateObject;};publicized.reconnect=function(){protocolManager.reconnectAsync();};publicized.setToken=function(newToken){if(typeof newToken!=='undefined'){_sdkParams.sdkParams.token=newToken;_events.chatEvents.updateToken(_sdkParams.sdkParams.token);if(!chatMessaging.userInfo||!chatMessaging.userInfo.id){getUserAndUpdateSDKState();}}};publicized.generateUUID=_utility["default"].generateUUID;publicized.logout=function(){// clearChatServerCaches();
 _events.chatEvents.clearEventCallbacks();chatMessaging.messagesCallbacks={};chatMessaging.sendMessageCallbacks={};chatMessaging.threadCallbacks={};chatMessaging.stopChatPing();asyncClient.logout();};publicized.inviteeIdTypes=_constants.inviteeVOidTypes;/**
    * Check a turn server availability
    *
@@ -53110,6 +53139,7 @@ function ChatMessaging(params) {
    */
 
   this.startChatPing = function () {
+    _sdkParams.sdkParams.chatPingMessageInterval && clearInterval(_sdkParams.sdkParams.chatPingMessageInterval);
     _sdkParams.sdkParams.chatPingMessageInterval = setInterval(function () {
       currentModuleInstance.ping();
     }, 20000); //TODO: chatPingMessageInterval

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podchat-browser",
-  "version": "12.9.6-snapshot.4",
+  "version": "12.9.6",
   "description": "Javascript SDK to use POD's Chat Service - Browser Only",
   "main": "./dist/node/chat.js",
   "scripts": {

package/src/buildConfig.json

@@ -1 +1 @@
-{"version":"12.9.6-snapshot.4","date":"۱۴۰۲/۴/۲۸","VersionInfo":"Release: false, Snapshot: true, Is For Test: true"}
+{"version":"12.9.6","date":"۱۴۰۲/۵/۷","VersionInfo":"Release: true, Snapshot: false, Is For Test: false"}

package/src/chat.js

@@ -235,11 +235,16 @@ function Chat(params) {
             currentProtocol: (protocol == "auto" ? 'websocket' : protocol),
             failOverProtocol: (protocol == "auto" || protocol == "websocket"  ? 'webrtc' : 'websocket'),
             retries: 0,
-            allowedRetries: 3
+            allowedRetries: {
+                websocket: 2,
+                webrtc: 1
+            },
+            reconnectAsyncRequest: false,
+            currentWaitTime: 0
         };
 
         function canRetry() {
-            return config.retries < config.allowedRetries;
+            return config.retries < config.allowedRetries[config.currentProtocol];
         }
         function switchProtocol(protocol) {
             // sdkParams.protocol = current.toLowerCase();
@@ -256,7 +261,7 @@ function Chat(params) {
                     config.failOverProtocol = current;
                 }
 
-                console.log(">> Switching protocol::: ", {current: config.currentProtocol, prev: config.failOverProtocol})
+                sdkParams.consoleLogging && console.log("[SDK]|/| switchProtocol: ", "config.currentProtocol: ", config.currentProtocol, "config.currentWaitTime: ", config.currentWaitTime)
 
                 chatEvents.fireEvent("autoSwitchAsyncProtocol", {
                     current: config.currentProtocol,
@@ -264,6 +269,7 @@ function Chat(params) {
                 });
 
                 resetRetries();
+                config.reconnectAsyncRequest = false;
                 initAsync();
             });
 
@@ -274,7 +280,7 @@ function Chat(params) {
             config.retries = 0;
         }
 
-        return {
+        const publics =  {
             switchProtocol(protocol) {
                 if(protocol == 'auto'){
                     config.switchingEnabled = true;
@@ -296,12 +302,43 @@ function Chat(params) {
             resetRetries(){
                 resetRetries();
             },
-            maybeSwitchProtocol() {
+            onAsyncIsReconnecting(event) {
+                sdkParams.consoleLogging && console.log("[SDK]|/| onAsyncIsReconnecting: ", "config.currentProtocol: ", config.currentProtocol, "config.currentWaitTime: ", config.currentWaitTime);
+                publics.increaseRetries();
+
+                if(config.currentWaitTime < 64) {
+                    config.currentWaitTime += 3;
+                }
+                //config.currentWaitTime = event.nextTime
                 if(!canRetry() && config.switchingEnabled) {
                     switchProtocol();
                 }
+            },
+            getRetryStepTimerTime() {
+                if(config.switchingEnabled)
+                    return config.currentWaitTime;
+                else return 4;
+            },
+            reconnectAsync() {
+                config.reconnectAsyncRequest = true;
+                config.currentWaitTime = 0;
+                if(config.switchingEnabled) {
+                    if(!canRetry()) {
+                        switchProtocol();
+                    } else {
+                        switchProtocol(config.currentProtocol);
+                    }
+                } else {
+                    if(!canRetry()) {
+                        switchProtocol();
+                    } else {
+                        switchProtocol(config.currentProtocol);
+                    }
+                }
             }
         };
+
+        return publics;
     }
 
 
@@ -365,7 +402,9 @@ function Chat(params) {
                 reconnectOnClose: sdkParams.reconnectOnClose,
                 asyncLogging: sdkParams.asyncLogging,
                 logLevel: (sdkParams.consoleLogging ? 3 : 1),
-                webrtcConfig: sdkParams.webrtcConfig
+                webrtcConfig: sdkParams.webrtcConfig,
+                retryStepTimerTime: protocolManager.getRetryStepTimerTime(),
+                onStartWithRetryStepGreaterThanZero: onStateChange
             });
             callModule.asyncInitialized(asyncClient);
             chatMessaging.asyncInitialized(asyncClient);
@@ -404,7 +443,8 @@ function Chat(params) {
                 //shouldReconnectCall();
             });
 
-            asyncClient.on('stateChange', function (state) {
+            asyncClient.on('stateChange', onStateChange);
+            function onStateChange(state) {
                 chatEvents.fireEvent('chatState', state);
                 chatFullStateObject = state;
 
@@ -432,7 +472,7 @@ function Chat(params) {
                         //chatMessaging.sendPingTimeout && clearTimeout(chatMessaging.sendPingTimeout);
                         break;
                 }
-            });
+            }
 
             asyncClient.on('connect', function (newPeerId) {
                 asyncGetReadyTime = new Date().getTime();
@@ -459,10 +499,9 @@ function Chat(params) {
                 chatEvents.fireEvent('reconnect');
             });
 
-            asyncClient.on('reconnecting', function () {
+            asyncClient.on('reconnecting', function (event) {
                 sdkParams.consoleLogging && console.log("[SDK][event: asyncClient.reconnecting]")
-                protocolManager.increaseRetries();
-                protocolManager.maybeSwitchProtocol();
+                protocolManager.onAsyncIsReconnecting(event);
             });
 
 
@@ -11630,7 +11669,7 @@ function Chat(params) {
     };
 
     publicized.reconnect = function () {
-        asyncClient.reconnectSocket();
+        protocolManager.reconnectAsync();
     };
 
     publicized.setToken = function (newToken) {

package/src/messaging.module.js

@@ -36,6 +36,7 @@ import {sdkParams} from "./lib/sdkParams";
          * TODO: remove the interval when socket statet changes to closed
          */
         this.startChatPing = function () {
+            sdkParams.chatPingMessageInterval && clearInterval(sdkParams.chatPingMessageInterval);
             sdkParams.chatPingMessageInterval = setInterval(() => {
                 currentModuleInstance.ping();
             }, 20000) ;//TODO: chatPingMessageInterval