ovh
diff --git a/‎ui/src/app/app.component.ts
Lines changed: 28 additions & 3 deletions b/‎ui/src/app/app.component.ts
Lines changed: 28 additions & 3 deletions
diff --git a/‎ui/src/app/app.service.ts
Lines changed: 3 additions & 0 deletions b/‎ui/src/app/app.service.ts
Lines changed: 3 additions & 0 deletions
diff --git a/‎ui/src/assets/worker/sharedWorker.js
Lines changed: 15 additions & 2 deletions b/‎ui/src/assets/worker/sharedWorker.js
Lines changed: 15 additions & 2 deletions
@@ -34,6 +34,7 @@ export class AppComponent  implements OnInit {
     versionWorker: CDSWebWorker;
 
     sseWorker: CDSWorker;
+    heartbeatToken: number;
 
     zone: NgZone;
 
@@ -42,13 +43,14 @@ export class AppComponent  implements OnInit {
 
     languageSubscriber: Subscription;
     versionWorkerSubscription: Subscription;
-    sseWorkerSubscription: Subscription;
     _routerSubscription: Subscription;
     _routerNavEndSubscription: Subscription;
 
     displayResolver = false;
     toasterConfig: any;
 
+    lastPing: number;
+
     constructor(_translate: TranslateService, private _language: LanguageStore,
                 private _activatedRoute: ActivatedRoute, private _titleService: Title,
                 private _authStore: AuthentificationStore, private _router: Router,
@@ -77,7 +79,7 @@ export class AppComponent  implements OnInit {
         this._authStore.getUserlst().subscribe(user => {
             if (!user) {
                 this.isConnected = false;
-                this.stopWorker(this.sseWorker, this.sseWorkerSubscription);
+                this.stopWorker(this.sseWorker, null);
             } else {
                 this.isConnected = true;
                 this.startSSE();
@@ -133,6 +135,9 @@ export class AppComponent  implements OnInit {
     }
 
     startSSE(): void {
+        if (this.sseWorker) {
+            this.stopWorker(this.sseWorker, null);
+        }
         let authKey: string;
         let authValue: string;
         // ADD user AUTH
@@ -147,6 +152,17 @@ export class AppComponent  implements OnInit {
 
         if (window['SharedWorker']) {
             this.sseWorker = new CDSSharedWorker('./assets/worker/sharedWorker.js');
+            if (this.heartbeatToken !== 0) {
+                clearInterval(this.heartbeatToken);
+            }
+
+            this.heartbeatToken = setInterval(() => {
+                let d = (new Date()).getTime();
+                if (this.lastPing !== 0 && (d - this.lastPing) > 11000) {
+                    // If no ping in the last 11s restart SSE
+                    this.startSSE();
+                }
+            });
         } else {
             this.sseWorker = new CDSWebWorker('./assets/worker/webWorker.js');
         }
@@ -164,7 +180,16 @@ export class AppComponent  implements OnInit {
                 return;
             }
             this.zone.run(() => {
-                this._appService.manageEvent(<Event>e);
+                if (e.healthCheck != null) {
+                    this.lastPing = (new Date()).getTime();
+                    // 0 = CONNECTING, 1 = OPEN, 2 = CLOSED
+                    if (e.healthCheck > 1) {
+                        // Reopen SSE
+                        this.startSSE();
+                    }
+                } else {
+                    this._appService.manageEvent(<Event>e);
+                }
             });
         });
     }
 
@@ -46,6 +46,9 @@ export class AppService {
     }
 
     manageEvent(event: Event): void {
+        if (!event.type_event) {
+            return
+        }
         if (event.type_event.indexOf(EventType.ACTION_PREFIX) === 0) {
             this._actionStore.resync();
         }
 
@@ -6,7 +6,7 @@ var sseURL;
 var pingUrl;
 var headerKey;
 var headerValue;
-const connections = [];
+var connections = [];
 var offline = false;
 onconnect = function(e) {
     var port = e.ports[0];
@@ -29,6 +29,7 @@ function initSSE(force) {
             if (evt.data.indexOf('ACK: ') === 0) {
                 return;
             }
+
             try {
                 var jsonEvent = JSON.parse(evt.data);
                 connections.forEach(p => {
@@ -42,6 +43,18 @@ function initSSE(force) {
     }
 }
 
+// Send state of the connexion every 5 seconds
+setInterval(() => {
+    if (sse && sse.readyState > 1) {
+        sse.close();
+        sse = undefined;
+    }
+    connections.forEach( p => {
+        p.postMessage({ healthCheck: sse.readyState });
+    });
+}, 5000);
+
+// Check if token is still valid
 setInterval(() => {
     if (pingUrl) {
         try {
@@ -71,4 +84,4 @@ setInterval(() => {
         }
 
     }
-}, 5000);
+}, 60000);
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ export class AppService {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`manageEvent(event: Event): void {`
	`49`	`+ if (!event.type_event) {`
	`50`	`+ return`
	`51`	`+ }`
`49`	`52`	`if (event.type_event.indexOf(EventType.ACTION_PREFIX) === 0) {`
`50`	`53`	`this._actionStore.resync();`
`51`	`54`	`}`