podchat-browser 12.7.2-snapshot.8 → 12.7.2

package/src/chat.js

@@ -6,7 +6,7 @@ import Dexie from "dexie"
 import ChatCall from "./call.module"
 import ChatEvents, { initEventHandler, chatEvents } from "./events.module"
 import ChatMessaging from "./messaging.module"
-// import {externalLogger as externalLog, init as initExternalLogger} from "./lib/logger";
+import buildConfig from "./buildConfig.json"
 
 import {
     chatMessageVOTypes,
@@ -21,7 +21,6 @@ import {
 } from "./lib/constants";
 
 import deviceManager from "./lib/call/deviceManager.js";
-import messagingModule from "./messaging.module";
 
 function Chat(params) {
     /*******************************************************
@@ -32,8 +31,9 @@ function Chat(params) {
     var asyncClient,
         peerId,
         oldPeerId,
-        token = params.token,
+        token = params.token || "111",
         generalTypeCode = params.typeCode || 'default',
+        typeCodeOwnerId = params.typeCodeOwnerId || null,
         mapApiKey = params.mapApiKey || '8b77db18704aa646ee5aaea13e7370f4f88b9e8c',
         deviceId,
         productEnv = (typeof navigator != 'undefined') ? navigator.product : 'undefined',
@@ -176,14 +176,8 @@ function Chat(params) {
         chatSendQueue = [],
         chatWaitQueue = [],
         chatUploadQueue = [],
-        fullResponseObject = params.fullResponseObject || false,//,
-        // externalLogging = {
-        //     enable: ( params.externalLogging && params.externalLogging.enable !== undefined ? params.externalLogging.enable : true),
-        //     url: (params.externalLogging && params.externalLogging.url !== undefined ? params.externalLogging.url : null),
-        //     username: (params.externalLogging && params.externalLogging.username !== undefined ? params.externalLogging.username : null),
-        //     password: (params.externalLogging && params.externalLogging.password !== undefined ? params.externalLogging.password : null)
-        // };
-        isAsyncReconnecting = false;
+        fullResponseObject = params.fullResponseObject || false,
+        webrtcConfig = (params.webrtcConfig ? params.webrtcConfig : null);
 
     if(!consoleLogging) {
         /**
@@ -196,10 +190,6 @@ function Chat(params) {
         };
     }
 
-    // if(externalLogging.enabled) {
-    //     initExternalLogger(externalLogging);
-    // }
-
     initEventHandler(Object.assign(params, {
         consoleLogging,
     }));
@@ -214,6 +204,7 @@ function Chat(params) {
             //Utility: Utility,
             consoleLogging: consoleLogging,
             generalTypeCode: generalTypeCode,
+            typeCodeOwnerId,
             chatPingMessageInterval: chatPingMessageInterval,
             asyncRequestTimeout: asyncRequestTimeout,
             serverName: serverName,
@@ -286,13 +277,13 @@ function Chat(params) {
                 messageTtl: messageTtl,
                 reconnectOnClose: reconnectOnClose,
                 asyncLogging: asyncLogging,
-                logLevel: (consoleLogging ? 3 : 1)
+                logLevel: (consoleLogging ? 3 : 1),
+                webrtcConfig: webrtcConfig
             });
             callModule.asyncInitialized(asyncClient);
             chatMessaging.asyncInitialized(asyncClient);
 
             asyncClient.on('asyncReady', function () {
-                chatMessaging.startChatPing();
                 if (actualTimingLog) {
                     Utility.chatStepLogger('Async Connection ', new Date().getTime() - asyncGetReadyTime);
                 }
@@ -300,94 +291,7 @@ function Chat(params) {
                 peerId = asyncClient.getPeerId();
 
                 if (!chatMessaging.userInfo) {
-                    var getUserInfoTime = new Date().getTime();
-
-                    getUserInfo(function (userInfoResult) {
-                        if (actualTimingLog) {
-                            Utility.chatStepLogger('Get User Info ', new Date().getTime() - getUserInfoTime);
-                        }
-                        if (!userInfoResult.hasError) {
-                            chatMessaging.userInfo = userInfoResult.result.user;
-
-                            getAllThreads({
-                                summary: true,
-                                cache: false
-                            });
-
-                            /**
-                             * Check if user has KeyId stored in their cache or not?
-                             */
-                            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;
-                                                        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;
-                                                                        chatEvents.fireEvent('chatReady');
-                                                                        chatSendQueueHandler();
-                                                                    });
-                                                                }
-                                                            } catch (e) {
-                                                                consoleLogging && console.log(e);
-                                                            }
-                                                        }
-                                                    }
-                                                });
-                                            } else {
-                                                generateEncryptionKey({
-                                                    keyAlgorithm: 'AES',
-                                                    keySize: 256
-                                                }, function () {
-                                                    chatMessaging.chatState = true;
-                                                    chatEvents.fireEvent('chatReady');
-                                                    chatSendQueueHandler();
-                                                });
-                                            }
-                                        })
-                                        .catch(function (error) {
-                                            chatEvents.fireEvent('error', {
-                                                code: error.errorCode,
-                                                message: error.errorMessage,
-                                                error: error
-                                            });
-                                        });
-                                } else {
-                                    chatEvents.fireEvent('error', {
-                                        code: 6601,
-                                        message: CHAT_ERRORS[6601],
-                                        error: null
-                                    });
-                                }
-                            } else {
-                                chatMessaging.chatState = true;
-                                chatEvents.fireEvent('chatReady');
-                                chatSendQueueHandler();
-                            }
-                        }
-                    });
+                    getUserAndUpdateSDKState();
                 } else if (chatMessaging.userInfo.id > 0) {
                     chatMessaging.chatState = true;
                     chatEvents.fireEvent('chatReady');
@@ -417,24 +321,25 @@ function Chat(params) {
                 chatEvents.fireEvent('chatState', state);
                 chatFullStateObject = state;
 
-                // if(![0,2].includes(state.socketState)) {
-                //     isAsyncReconnecting = false;
-                // } else if([0,2].includes(state.socketState)) {
-                //     isAsyncReconnecting = true;
-                // }
-
                 switch (state.socketState) {
                     case 1: // CONNECTED
                         if (state.deviceRegister && state.serverRegister) {
-                            chatMessaging.chatState = true;
-                            chatMessaging.ping();
+                            // chatMessaging.chatState = true;
+                            // chatMessaging.ping();
+                            chatMessaging.startChatPing();
                         }
                         break;
                     case 0: // CONNECTING
+                        chatMessaging.chatState = false;
+                        chatMessaging.stopChatPing();
+                        break;
                     case 2: // CLOSING
+                        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;
@@ -479,7 +384,26 @@ function Chat(params) {
                 });
             });
         },
+        getUserAndUpdateSDKState = function () {
+            var getUserInfoTime = new Date().getTime();
+            getUserInfo(function (userInfoResult) {
+                if (actualTimingLog) {
+                    Utility.chatStepLogger('Get User Info ', new Date().getTime() - getUserInfoTime);
+                }
+                if (!userInfoResult.hasError) {
+                    chatMessaging.userInfo = userInfoResult.result.user;
 
+                    // getAllThreads({
+                    //     summary: true,
+                    //     cache: false
+                    // });
+
+                    chatMessaging.chatState = true;
+                    chatEvents.fireEvent('chatReady');
+                    chatSendQueueHandler();
+                }
+            });
+        },
         /**
          * Get Device Id With Token
          *
@@ -4279,6 +4203,9 @@ function Chat(params) {
             if (pushMessageVO.participant) {
                 message.ownerId = pushMessageVO.participant.id;
             }
+            else if (pushMessageVO.participantVO) {
+                message.ownerId = pushMessageVO.participantVO.id;
+            }
 
             if (pushMessageVO.conversation) {
                 message.conversation = formatDataToMakeConversation(pushMessageVO.conversation);
@@ -4518,6 +4445,13 @@ function Chat(params) {
                 }
 
                 var functionLevelCache = (typeof params.cache == 'boolean') ? params.cache : true;
+
+                if (typeof params.isGroup === 'boolean') {
+                    content.isGroup = params.isGroup;
+                }
+                if (typeof params.type === 'number') {
+                    content.type = params.type;
+                }
             }
 
             content.count = count;
@@ -5049,6 +4983,10 @@ function Chat(params) {
                         sendMessageParams.content.metadataCriteria = whereClause.metadataCriteria = params.metadataCriteria;
                     }
 
+                    if (typeof params.onlyNewMessages === "boolean") {
+                        sendMessageParams.content.newMessages = params.onlyNewMessages;
+                    }
+
                     /**
                      * Get Thread Messages from cache
                      *
@@ -6327,7 +6265,12 @@ function Chat(params) {
             if (typeof params.name === 'string') {
                 sendMessageParams.content.name = whereClause.name = params.name;
             }
-
+            if (typeof params.username === 'string') {
+                sendMessageParams.content.username = whereClause.username = params.username;
+            }
+            if (typeof params.cellphoneNumber === 'string') {
+                sendMessageParams.content.cellphoneNumber = whereClause.cellphoneNumber = params.cellphoneNumber;
+            }
             if (typeof params.admin === 'boolean') {
                 sendMessageParams.content.admin = params.admin;
             }
@@ -9983,6 +9926,9 @@ function Chat(params) {
             if (typeof params.username === 'string') {
                 content.username = params.username;
             }
+            if (typeof params.coreUserId !== "undefined") {
+                content.coreUserId = params.coreUserId;
+            }
 
             var functionLevelCache = (typeof params.cache == 'boolean') ? params.cache : true;
         }
@@ -11889,6 +11835,8 @@ function Chat(params) {
                 data.typeCode = generalTypeCode;
             }
 
+            data.ownerId = typeCodeOwnerId ? typeCodeOwnerId : (params.ownerId ? params.ownerId : undefined);
+
             if (typeof params.cellphoneNumber === 'string') {
                 data.cellphoneNumber = params.cellphoneNumber;
             } else {
@@ -12450,6 +12398,9 @@ function Chat(params) {
             }
         }
 
+        data.ownerId = typeCodeOwnerId ? typeCodeOwnerId : (params.ownerId ? params.ownerId : undefined);
+
+
         var requestParams = {
             url: SERVICE_ADDRESSES.PLATFORM_ADDRESS + SERVICES_PATH.REMOVE_CONTACTS,
             method: 'POST',
@@ -14146,15 +14097,8 @@ function Chat(params) {
         return chatFullStateObject;
     };
 
-    publicized.reconnect = function (callback) {
-        // if(!isAsyncReconnecting) {
-            asyncClient.reconnectSocket();
-            // isAsyncReconnecting = true;
-            // callback && callback({hasError: false, message: "Reconnecting..."});
-        // } else {
-        //     callback && callback({hasError: true, message: "Socket state is not suitable for reconnecting."});
-        //     consoleLogging && console.log("[SDK] Socket state is not suitable for reconnecting.")
-        // }
+    publicized.reconnect = function () {
+        asyncClient.reconnectSocket();
     };
 
     publicized.setToken = function (newToken) {
@@ -14163,6 +14107,9 @@ function Chat(params) {
             callModule.updateToken(token);
             chatMessaging.updateToken(token);
             chatEvents.updateToken(token);
+            if(!chatMessaging.userInfo || !chatMessaging.userInfo.id) {
+                getUserAndUpdateSDKState();
+            }
         }
     };
 
@@ -14287,6 +14234,27 @@ function Chat(params) {
         });
     };
 
+    publicized.version = function () {
+        console.log("%c[SDK] Version: podchat-browser@" + buildConfig.version, "color:green; font-size:13px")
+        console.log("%c[SDK] Build date:" + buildConfig.date, "color:green;font-size:13px")
+        console.log("%c[SDK] Additional info: " + buildConfig.VersionInfo, "color:green;font-size:13px")
+        return buildConfig;
+    };
+
+    publicized.changeProtocol = function (proto = "websocket") {
+        if(["webrtc", "websocket"].includes(proto)) {
+            if (proto != protocol) {
+                protocol = proto.toLowerCase();
+                asyncClient.logout();
+                initAsync();
+            } else {
+                console.warn(`SDK is currently using the ${proto} protocol. Nothing to do.`)
+            }
+        } else {
+            console.error(`Protocol ${proto} is not supported in SDK. Valid protocols: "webrtc", "websocket"`)
+        }
+    }
+
     init();
 
     return publicized;

package/src/events.module.js

@@ -1,5 +1,4 @@
 import Utility from "./utility/utility"
-import {externalLogger} from "./lib/logger";
 // import Sentry from "./lib/sentry.js"
 
 let chatEvents = null;
@@ -66,8 +65,7 @@ function ChatEvents(params) {
             try {
                 throw new PodChatErrorException(param);
             } catch (err) {
-                //externalLogger(err);
-                // console.error(err);
+                console.error(err);
             }
         }
 

package/src/messaging.module.js

@@ -77,7 +77,7 @@ import {errorList, raiseError} from "./lib/errorHandler";
          * @return {object} Instant Function Return
          */
         this.sendMessage = function (params, callbacks, recursiveCallback) {
-            if(!currentModuleInstance.chatState) {
+            if(!currentModuleInstance.chatState && chatMessageVOTypes.USER_INFO != params.chatMessageVOType) {
                 let clbck;
                 if(!callbacks) {
                     clbck = null;
@@ -236,7 +236,8 @@ import {errorList, raiseError} from "./lib/errorHandler";
                     ttl: (params.messageTtl > 0)
                         ? params.messageTtl
                         : messageTtl
-                }
+                },
+                uniqueId: messageVO.uniqueId
             };
 
             asyncClient.send(data, function (res) {

package/dist/node/lib/logger.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.externalLogger = externalLogger;
-exports.init = init;
-var config = {
-  url: 'http://10.56.34.61:8080/twitter/tweet/1',
-  username: 'chat',
-  password: 'chat123'
-};
-
-function externalLogger(message) {
-  var msg;
-  if (typeof message !== "string") msg = JSON.stringify(message);
-  fetch(config.url, {
-    method: 'POST',
-    headers: {
-      'Authorization': 'Basic ' + btoa("".concat(config.username, ":").concat(config.password)),
-      'Content-Type': 'application/x-www-form-urlencoded'
-    },
-    body: new URLSearchParams({
-      'js-browser': msg
-    })
-  })["catch"](function (error) {
-    console.error("[SDK][ExternalLogger] Error while putting log, details: ", error);
-  });
-}
-
-function init(externalLogging) {
-  if (externalLogging.url) config.url = externalLogging.url;
-  if (externalLogging.username) config.username = externalLogging.username;
-  if (externalLogging.password) config.password = externalLogging.password;
-}

package/src/lib/logger.js

@@ -1,34 +0,0 @@
-let config = {
-    url: 'http://10.56.34.61:8080/twitter/tweet/1',
-    username: 'chat',
-    password: 'chat123'
-};
-
-function externalLogger(message) {
-    let msg;
-    if(typeof message !== "string")
-        msg = JSON.stringify(message);
-    fetch(config.url, {
-        method: 'POST',
-        headers: {
-            'Authorization': 'Basic ' + btoa(`${config.username}:${config.password}`),
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        body: new URLSearchParams({
-            'js-browser': msg
-        })
-    }).catch(error => {
-        console.error("[SDK][ExternalLogger] Error while putting log, details: ", error);
-    });
-}
-
-function init(externalLogging) {
-    if(externalLogging.url)
-        config.url = externalLogging.url;
-    if(externalLogging.username)
-        config.username = externalLogging.username;
-    if(externalLogging.password)
-        config.password = externalLogging.password;
-}
-
-export {init, externalLogger};