podchat-browser 12.7.2-snapshot.6 → 12.7.2-snapshot.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node/chat.js +14 -2
- package/dist/podchat-browser-bundle.js +21 -9
- package/package.json +2 -2
- package/src/chat.js +12 -12
package/dist/node/chat.js
CHANGED
|
@@ -55,7 +55,12 @@ consoleLogging:consoleLogging,chatEvents:_events.chatEvents,asyncClient:asyncCli
|
|
|
55
55
|
*/initAsync=function initAsync(){var asyncGetReadyTime=new Date().getTime();asyncClient=new _podasyncWsOnly["default"]({protocol:protocol,queueHost:queueHost,queuePort:queuePort,queueUsername:queueUsername,queuePassword:queuePassword,queueReceive:queueReceive,queueSend:queueSend,queueConnectionTimeout:queueConnectionTimeout,socketAddress:socketAddress,serverName:serverName,deviceId:deviceId,wsConnectionWaitTime:wsConnectionWaitTime,connectionRetryInterval:connectionRetryInterval,connectionCheckTimeout:connectionCheckTimeout,connectionCheckTimeoutThreshold:connectionCheckTimeoutThreshold,messageTtl:messageTtl,reconnectOnClose:reconnectOnClose,asyncLogging:asyncLogging,logLevel:consoleLogging?3:1});callModule.asyncInitialized(asyncClient);chatMessaging.asyncInitialized(asyncClient);asyncClient.on('asyncReady',function(){chatMessaging.startChatPing();if(actualTimingLog){_utility["default"].chatStepLogger('Async Connection ',new Date().getTime()-asyncGetReadyTime);}peerId=asyncClient.getPeerId();if(!chatMessaging.userInfo){var getUserInfoTime=new Date().getTime();getUserInfo(function(userInfoResult){if(actualTimingLog){_utility["default"].chatStepLogger('Get User Info ',new Date().getTime()-getUserInfoTime);}if(!userInfoResult.hasError){chatMessaging.userInfo=userInfoResult.result.user;getAllThreads({summary:true,cache:false});/**
|
|
56
56
|
* Check if user has KeyId stored in their cache or not?
|
|
57
57
|
*/if(canUseCache){if(db){db.users.where('id').equals(parseInt(chatMessaging.userInfo.id)).toArray().then(function(users){if(users.length>0&&typeof users[0].keyId!='undefined'){var user=users[0];getEncryptionKey({keyId:user.keyId},function(result){if(!result.hasError){cacheSecret=result.secretKey;chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}else{if(result.message!==''){try{var response=JSON.parse(result.message);if(response.error==='invalid_param'){generateEncryptionKey({keyAlgorithm:'AES',keySize:256},function(){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();});}}catch(e){consoleLogging&&console.log(e);}}}});}else{generateEncryptionKey({keyAlgorithm:'AES',keySize:256},function(){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();});}})["catch"](function(error){_events.chatEvents.fireEvent('error',{code:error.errorCode,message:error.errorMessage,error:error});});}else{_events.chatEvents.fireEvent('error',{code:6601,message:CHAT_ERRORS[6601],error:null});}}else{chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}}});}else if(chatMessaging.userInfo.id>0){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}deliveryInterval&&clearInterval(deliveryInterval);deliveryInterval=setInterval(function(){if(Object.keys(messagesDelivery).length){messagesDeliveryQueueHandler();}},deliveryIntervalPitch);seenInterval&&clearInterval(seenInterval);seenInterval=setInterval(function(){if(Object.keys(messagesSeen).length){messagesSeenQueueHandler();}},seenIntervalPitch);//shouldReconnectCall();
|
|
58
|
-
});asyncClient.on('stateChange',function(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state
|
|
58
|
+
});asyncClient.on('stateChange',function(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state;// if(![0,2].includes(state.socketState)) {
|
|
59
|
+
// isAsyncReconnecting = false;
|
|
60
|
+
// } else if([0,2].includes(state.socketState)) {
|
|
61
|
+
// isAsyncReconnecting = true;
|
|
62
|
+
// }
|
|
63
|
+
switch(state.socketState){case 1:// CONNECTED
|
|
59
64
|
if(state.deviceRegister&&state.serverRegister){chatMessaging.chatState=true;chatMessaging.ping();}break;case 0:// CONNECTING
|
|
60
65
|
case 2:// CLOSING
|
|
61
66
|
case 3:// CLOSED
|
|
@@ -2166,7 +2171,14 @@ content:{count:count,offset:offset}};if(params){if((0,_typeof2["default"])(param
|
|
|
2166
2171
|
* + locationPingRequest {object}
|
|
2167
2172
|
* + content {list} A map of { location: string, locationId: int }
|
|
2168
2173
|
*/var locationPingData={chatMessageVOType:_constants.chatMessageVOTypes.LOCATION_PING,typeCode:generalTypeCode,//params.typeCode,
|
|
2169
|
-
pushMsgType:3,token:token},content={};if(params){if(typeof params.location==='string'&&locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&¶ms.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(callback){if(!isAsyncReconnecting)
|
|
2174
|
+
pushMsgType:3,token:token},content={};if(params){if(typeof params.location==='string'&&locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&¶ms.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(callback){// if(!isAsyncReconnecting) {
|
|
2175
|
+
asyncClient.reconnectSocket();// isAsyncReconnecting = true;
|
|
2176
|
+
// callback && callback({hasError: false, message: "Reconnecting..."});
|
|
2177
|
+
// } else {
|
|
2178
|
+
// callback && callback({hasError: true, message: "Socket state is not suitable for reconnecting."});
|
|
2179
|
+
// consoleLogging && console.log("[SDK] Socket state is not suitable for reconnecting.")
|
|
2180
|
+
// }
|
|
2181
|
+
};publicized.setToken=function(newToken){if(typeof newToken!=='undefined'){token=newToken;callModule.updateToken(token);chatMessaging.updateToken(token);_events.chatEvents.updateToken(token);}};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;/**
|
|
2170
2182
|
* Check a turn server availability
|
|
2171
2183
|
*
|
|
2172
2184
|
* @param turnIp
|
|
@@ -39848,13 +39848,13 @@ module.exports = function (thing, encoding, name) {
|
|
|
39848
39848
|
// }
|
|
39849
39849
|
// }, 5000);
|
|
39850
39850
|
|
|
39851
|
-
socketWatchTimeout && clearTimeout(socketWatchTimeout);
|
|
39852
|
-
socketWatchTimeout = setTimeout(() => {
|
|
39853
|
-
|
|
39854
|
-
|
|
39855
|
-
|
|
39856
|
-
|
|
39857
|
-
}, 5000);
|
|
39851
|
+
// socketWatchTimeout && clearTimeout(socketWatchTimeout);
|
|
39852
|
+
// socketWatchTimeout = setTimeout(() => {
|
|
39853
|
+
// if(socket.readyState !== 1) {
|
|
39854
|
+
// onCloseHandler(null);
|
|
39855
|
+
// socket.close();
|
|
39856
|
+
// }
|
|
39857
|
+
// }, 5000);
|
|
39858
39858
|
|
|
39859
39859
|
socket.onopen = function(event) {
|
|
39860
39860
|
waitForSocketToConnect(function() {
|
|
@@ -45958,7 +45958,12 @@ consoleLogging:consoleLogging,chatEvents:_events.chatEvents,asyncClient:asyncCli
|
|
|
45958
45958
|
*/initAsync=function initAsync(){var asyncGetReadyTime=new Date().getTime();asyncClient=new _podasyncWsOnly["default"]({protocol:protocol,queueHost:queueHost,queuePort:queuePort,queueUsername:queueUsername,queuePassword:queuePassword,queueReceive:queueReceive,queueSend:queueSend,queueConnectionTimeout:queueConnectionTimeout,socketAddress:socketAddress,serverName:serverName,deviceId:deviceId,wsConnectionWaitTime:wsConnectionWaitTime,connectionRetryInterval:connectionRetryInterval,connectionCheckTimeout:connectionCheckTimeout,connectionCheckTimeoutThreshold:connectionCheckTimeoutThreshold,messageTtl:messageTtl,reconnectOnClose:reconnectOnClose,asyncLogging:asyncLogging,logLevel:consoleLogging?3:1});callModule.asyncInitialized(asyncClient);chatMessaging.asyncInitialized(asyncClient);asyncClient.on('asyncReady',function(){chatMessaging.startChatPing();if(actualTimingLog){_utility["default"].chatStepLogger('Async Connection ',new Date().getTime()-asyncGetReadyTime);}peerId=asyncClient.getPeerId();if(!chatMessaging.userInfo){var getUserInfoTime=new Date().getTime();getUserInfo(function(userInfoResult){if(actualTimingLog){_utility["default"].chatStepLogger('Get User Info ',new Date().getTime()-getUserInfoTime);}if(!userInfoResult.hasError){chatMessaging.userInfo=userInfoResult.result.user;getAllThreads({summary:true,cache:false});/**
|
|
45959
45959
|
* Check if user has KeyId stored in their cache or not?
|
|
45960
45960
|
*/if(canUseCache){if(db){db.users.where('id').equals(parseInt(chatMessaging.userInfo.id)).toArray().then(function(users){if(users.length>0&&typeof users[0].keyId!='undefined'){var user=users[0];getEncryptionKey({keyId:user.keyId},function(result){if(!result.hasError){cacheSecret=result.secretKey;chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}else{if(result.message!==''){try{var response=JSON.parse(result.message);if(response.error==='invalid_param'){generateEncryptionKey({keyAlgorithm:'AES',keySize:256},function(){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();});}}catch(e){consoleLogging&&console.log(e);}}}});}else{generateEncryptionKey({keyAlgorithm:'AES',keySize:256},function(){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();});}})["catch"](function(error){_events.chatEvents.fireEvent('error',{code:error.errorCode,message:error.errorMessage,error:error});});}else{_events.chatEvents.fireEvent('error',{code:6601,message:CHAT_ERRORS[6601],error:null});}}else{chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}}});}else if(chatMessaging.userInfo.id>0){chatMessaging.chatState=true;_events.chatEvents.fireEvent('chatReady');chatSendQueueHandler();}deliveryInterval&&clearInterval(deliveryInterval);deliveryInterval=setInterval(function(){if(Object.keys(messagesDelivery).length){messagesDeliveryQueueHandler();}},deliveryIntervalPitch);seenInterval&&clearInterval(seenInterval);seenInterval=setInterval(function(){if(Object.keys(messagesSeen).length){messagesSeenQueueHandler();}},seenIntervalPitch);//shouldReconnectCall();
|
|
45961
|
-
});asyncClient.on('stateChange',function(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state
|
|
45961
|
+
});asyncClient.on('stateChange',function(state){_events.chatEvents.fireEvent('chatState',state);chatFullStateObject=state;// if(![0,2].includes(state.socketState)) {
|
|
45962
|
+
// isAsyncReconnecting = false;
|
|
45963
|
+
// } else if([0,2].includes(state.socketState)) {
|
|
45964
|
+
// isAsyncReconnecting = true;
|
|
45965
|
+
// }
|
|
45966
|
+
switch(state.socketState){case 1:// CONNECTED
|
|
45962
45967
|
if(state.deviceRegister&&state.serverRegister){chatMessaging.chatState=true;chatMessaging.ping();}break;case 0:// CONNECTING
|
|
45963
45968
|
case 2:// CLOSING
|
|
45964
45969
|
case 3:// CLOSED
|
|
@@ -48069,7 +48074,14 @@ content:{count:count,offset:offset}};if(params){if((0,_typeof2["default"])(param
|
|
|
48069
48074
|
* + locationPingRequest {object}
|
|
48070
48075
|
* + content {list} A map of { location: string, locationId: int }
|
|
48071
48076
|
*/var locationPingData={chatMessageVOType:_constants.chatMessageVOTypes.LOCATION_PING,typeCode:generalTypeCode,//params.typeCode,
|
|
48072
|
-
pushMsgType:3,token:token},content={};if(params){if(typeof params.location==='string'&&locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&¶ms.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(callback){if(!isAsyncReconnecting)
|
|
48077
|
+
pushMsgType:3,token:token},content={};if(params){if(typeof params.location==='string'&&locationPingTypes.hasOwnProperty(params.location.toUpperCase())){content.location=locationPingTypes[params.location.toUpperCase()];if(params.location.toUpperCase()==='THREAD'){if(typeof params.threadId==='number'&¶ms.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(callback){// if(!isAsyncReconnecting) {
|
|
48078
|
+
asyncClient.reconnectSocket();// isAsyncReconnecting = true;
|
|
48079
|
+
// callback && callback({hasError: false, message: "Reconnecting..."});
|
|
48080
|
+
// } else {
|
|
48081
|
+
// callback && callback({hasError: true, message: "Socket state is not suitable for reconnecting."});
|
|
48082
|
+
// consoleLogging && console.log("[SDK] Socket state is not suitable for reconnecting.")
|
|
48083
|
+
// }
|
|
48084
|
+
};publicized.setToken=function(newToken){if(typeof newToken!=='undefined'){token=newToken;callModule.updateToken(token);chatMessaging.updateToken(token);_events.chatEvents.updateToken(token);}};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;/**
|
|
48073
48085
|
* Check a turn server availability
|
|
48074
48086
|
*
|
|
48075
48087
|
* @param turnIp
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "podchat-browser",
|
|
3
|
-
"version": "12.7.2-snapshot.
|
|
3
|
+
"version": "12.7.2-snapshot.8",
|
|
4
4
|
"description": "Javascript SDK to use POD's Chat Service - Browser Only",
|
|
5
5
|
"main": "./dist/node/chat.js",
|
|
6
6
|
"scripts": {
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"faker": "^5.5.3",
|
|
52
52
|
"kurento-utils": "^6.16.0",
|
|
53
53
|
"node-rsa": "^1.1.1",
|
|
54
|
-
"podasync-ws-only": "^2.7.10-snapshot.
|
|
54
|
+
"podasync-ws-only": "^2.7.10-snapshot.6",
|
|
55
55
|
"query-string": "^6.8.1",
|
|
56
56
|
"webrtc-adapter": "^8.0.0"
|
|
57
57
|
},
|
package/src/chat.js
CHANGED
|
@@ -417,11 +417,11 @@ function Chat(params) {
|
|
|
417
417
|
chatEvents.fireEvent('chatState', state);
|
|
418
418
|
chatFullStateObject = state;
|
|
419
419
|
|
|
420
|
-
if(![0,2].includes(state.socketState)) {
|
|
421
|
-
|
|
422
|
-
} else if([0,2].includes(state.socketState)) {
|
|
423
|
-
|
|
424
|
-
}
|
|
420
|
+
// if(![0,2].includes(state.socketState)) {
|
|
421
|
+
// isAsyncReconnecting = false;
|
|
422
|
+
// } else if([0,2].includes(state.socketState)) {
|
|
423
|
+
// isAsyncReconnecting = true;
|
|
424
|
+
// }
|
|
425
425
|
|
|
426
426
|
switch (state.socketState) {
|
|
427
427
|
case 1: // CONNECTED
|
|
@@ -14147,14 +14147,14 @@ function Chat(params) {
|
|
|
14147
14147
|
};
|
|
14148
14148
|
|
|
14149
14149
|
publicized.reconnect = function (callback) {
|
|
14150
|
-
if(!isAsyncReconnecting) {
|
|
14150
|
+
// if(!isAsyncReconnecting) {
|
|
14151
14151
|
asyncClient.reconnectSocket();
|
|
14152
|
-
isAsyncReconnecting = true;
|
|
14153
|
-
callback && callback({hasError: false, message: "Reconnecting..."});
|
|
14154
|
-
} else {
|
|
14155
|
-
|
|
14156
|
-
|
|
14157
|
-
}
|
|
14152
|
+
// isAsyncReconnecting = true;
|
|
14153
|
+
// callback && callback({hasError: false, message: "Reconnecting..."});
|
|
14154
|
+
// } else {
|
|
14155
|
+
// callback && callback({hasError: true, message: "Socket state is not suitable for reconnecting."});
|
|
14156
|
+
// consoleLogging && console.log("[SDK] Socket state is not suitable for reconnecting.")
|
|
14157
|
+
// }
|
|
14158
14158
|
};
|
|
14159
14159
|
|
|
14160
14160
|
publicized.setToken = function (newToken) {
|