From d03fcca8cc7b70afaa5c1b06bfcf5e038c227866 Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@pc16392>
Date: Thu, 29 Aug 2024 08:58:28 +0200
Subject: [PATCH] Fixed SSE error after export (Safari)

---
 client/jsFiles/SEAWebClientCommunication.js | 2 +-
 client/jsFiles/SEAWebClientGraphics.js      | 1 +
 seaweb.py                                   | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/jsFiles/SEAWebClientCommunication.js b/client/jsFiles/SEAWebClientCommunication.js
index 902db43..3f10541 100644
--- a/client/jsFiles/SEAWebClientCommunication.js
+++ b/client/jsFiles/SEAWebClientCommunication.js
@@ -64,7 +64,7 @@ function handleUpdateMessage(src, message) {
         console.log("%cfrom server (SSE): " + message.type,
                 "color:white;background:lightgray", message);
     }
-
+    // console.log(message.type, "at", new Date())
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // <---------------------------------------------------------------------------------BUG!!!
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/client/jsFiles/SEAWebClientGraphics.js b/client/jsFiles/SEAWebClientGraphics.js
index 6fc2793..477c10d 100644
--- a/client/jsFiles/SEAWebClientGraphics.js
+++ b/client/jsFiles/SEAWebClientGraphics.js
@@ -292,6 +292,7 @@ function exportCallback(selectedVariables, startDateTimeMs, endDateTimeMs, nan,
     let exportURL = "http://" + hostPort + "/export?time=" + startDateTimeMs/1000 + "," + endDateTimeMs/1000 + "&variables=" + selectedVariables + "&nan=" + nan + "&interval=" + binningParam + "&id=" + clientID
     let a = document.createElement('a');
     a.href = exportURL
+    a.download = true
     a.click()
 }
 
diff --git a/seaweb.py b/seaweb.py
index e24c1e6..00e5a29 100755
--- a/seaweb.py
+++ b/seaweb.py
@@ -92,8 +92,10 @@ def get_update(path=None):
                         lastmsg = time.time()
                     else:
                         gevent.sleep(0.5)
-        except (GeneratorExit, tcp_lineserver.Disconnected):
+        except (GeneratorExit, tcp_lineserver.Disconnected) as e:
+            logging.info("except clause %r", repr(e))
             logging.info('CLOSED %s', client.id)
+            print('CLOSE client')
             instrument.remove(client)
             pass
         except Exception as e: