@everymatrix/casino-tournaments-page-controller 0.0.258 → 0.0.261

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/casino-tournaments-page-controller",
-  "version": "0.0.258",
+  "version": "0.0.261",
   "main": "dist/casino-tournaments-page-controller.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "29d9cee256c6fbdf17d95ed82bc3ebcc62241704"
+  "gitHead": "a93c0ae8104c039af7d54949a0889c11bca83acb"
 }

package/src/CasinoTournamentsPageController.svelte

@@ -24,6 +24,7 @@
   export let tablelimit: string = '30';
   export let namemask: string = '';
   export let mobiletablelimit:string = '15';
+  export let updatetableintime:string = 'true';
   // Variables of topics for communication
   let sessionTopic;
 
@@ -42,7 +43,7 @@
   let firstRowData: any = {};
   let firstRowAvailable: boolean = false;
 
-  let tableUpdateEventSource: EventSourcePolyfill;
+  let tableUpdateEventSource: any;
 
   let currentUserData:any = {};
   let currentUserInPage:Boolean = false;
@@ -79,7 +80,7 @@
             currentUserData = item;
             currentUserInPage = true;
           }
-          // added duplicated properties for mobile version, requirement more information for desktop version 
+          // added duplicated properties for mobile version, requirement more information for desktop version
           tableData.push({
             Rank: item.rank,
             Player: item.shortName,
@@ -99,13 +100,13 @@
       if (!message.data) {
         return;
       }
-      try {
-        let messageData: any = message.data;
-        let updateTableData: any = JSON.parse(messageData);
-        if (!updateTableData || !updateTableData.Items) {
+      try{
+        let messageData:any = message.data;
+        let updateTableData:any = JSON.parse(messageData);
+        if(!updateTableData || !updateTableData.items){
           return;
         }
-        let newTableData = transformTableData(updateTableData.Items);
+        let newTableData = transformTableData(updateTableData.items);
         if(updateTableData.item && !currentUserInPage){
           firstRowAvailable = true;
           firstRowData = transFormCurrentUserData(updateTableData.item);
@@ -122,16 +123,19 @@
       }
     },
     startupTableDataChangeListener = (tournamentID: String, searchParams: any) => {
-      let endpointURL: String = `${endpoint}/tournaments/${tournamentID}/leaderboard/updates?HeartBeat=false&`;
-      endpointURL += searchParams.toString();
-      tableUpdateEventSource = new EventSourcePolyfill(endpointURL, {
-        headers: {
-          'accept': 'text/event-stream',
-          'X-SessionID': session
-        }
-      });
+      let endpointURL: String = `${endpoint}/tournaments/${tournamentID}/leaderboard/updates?HeartBeat=false&XSessionId=${session}`;
+      if(tableUpdateEventSource){
+        return;
+      }
+      if(!EventSource){
+        tableUpdateEventSource = new EventSourcePolyfill(endpointURL,{headers: {'accept': 'text/event-stream'}});
+      }else{
+        tableUpdateEventSource = new EventSource(endpointURL);
+      }
       if (typeof (tableUpdateEventSource) != "undefined") {
+        tableUpdateEventSource.addEventListener('open', tableUpdateMessageHandler);
         tableUpdateEventSource.addEventListener('message', tableUpdateMessageHandler);
+        tableUpdateEventSource.addEventListener('error', tableUpdateMessageHandler);
       }
     };
 
@@ -141,8 +145,7 @@
 
     url.searchParams.append('expand', 'games');
     url.searchParams.append('language', lang);
-
-    reqHeaders.append('platform', getDevice(userAgent));
+    url.searchParams.append('platform', getDevice(userAgent));
 
     let requestOptions = {
       method: 'GET',
@@ -171,7 +174,8 @@
       url.searchParams.append('pagination', `offset=0,limit=${limit}`);
       reqHeaders.append('X-SessionID', session);
     }
-    reqHeaders.append('platform', getDevice(userAgent));
+    
+    url.searchParams.append('platform', getDevice(userAgent));
 
     let requestOptions = {
       method: 'GET',
@@ -197,7 +201,9 @@
         if (firstRowAvailable) {
           window.postMessage({type: 'CasinoTableFirstRowData', tableData: firstRowData}, window.location.href);
         }
-        startupTableDataChangeListener(tourID, url.searchParams);
+        if(updatetableintime === 'true'){
+          startupTableDataChangeListener(tourID, url.searchParams);
+        }
         if (currentUserInPage){
           window.postMessage({ type: 'CasinoTableCurrentUserData', tableData: currentUserData }, window.location.href);
         }
@@ -261,7 +267,11 @@
 
     return () => {
       window.removeEventListener('message', messageHandler);
-      tableUpdateEventSource.removeEventListener('message', tableUpdateMessageHandler);
+      if(tableUpdateEventSource){
+        tableUpdateEventSource.removeEventListener('open', tableUpdateMessageHandler);
+        tableUpdateEventSource.removeEventListener('message', tableUpdateMessageHandler);
+        tableUpdateEventSource.removeEventListener('error', tableUpdateMessageHandler);
+      }
     }
   });