support keepalive for multi-model pages

GenieFramework · Nov 10, 2024 · b75ca84 · b75ca84
1 parent eac1690
commit b75ca84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/assets/js/keepalive.js b/assets/js/keepalive.js
@@ -4,18 +4,19 @@
 ** where x = Genie.config.webchannels_keepalive_frequency
 */
 
-function keepalive() {
-  if (window._lastMessageAt !== undefined) {
-    if (Date.now() - window._lastMessageAt < Genie.Settings.webchannels_keepalive_frequency) {
+function keepalive(WebChannel) {
+  if (WebChannel.lastMessageAt !== undefined) {
+    if (Date.now() - WebChannel.lastMessageAt + 200 < Genie.Settings.webchannels_keepalive_frequency) {
       return
     }
   }
 
   if (Genie.Settings.env == 'dev') {
     console.info('Keeping connection alive');
+    console.log(WebChannel.parent.i)
   }
 
-  Genie.WebChannels.sendMessageTo(CHANNEL, 'keepalive', {
+  WebChannel.sendMessageTo(WebChannel.channel, 'keepalive', {
     'payload': {}
   });
 }
diff --git a/src/Elements.jl b/src/Elements.jl
@@ -222,8 +222,8 @@ function vue_integration(::Type{M};
       "
       try {
         if (Genie.Settings.webchannels_keepalive_frequency > 0) {
-          clearInterval(app.keepalive_interval);
-          app.keepalive_interval = setInterval(keepalive, Genie.Settings.webchannels_keepalive_frequency);
+          clearInterval(app.WebChannel.keepalive_interval);
+          app.WebChannel.keepalive_interval = setInterval(() => keepalive(app.WebChannel), Genie.Settings.webchannels_keepalive_frequency);
         }
       } catch (e) {
         if (Genie.Settings.env === 'dev') {
@@ -239,7 +239,7 @@ function vue_integration(::Type{M};
 
   function create$vue_app_name() {
     window.counter$vue_app_name = window.counter$vue_app_name || 1
-    appName = '$vue_app_name' + ((counter$vue_app_name == 1) ? '' : '_' + window.counter$vue_app_name)
+    const appName = '$vue_app_name' + ((counter$vue_app_name == 1) ? '' : '_' + window.counter$vue_app_name)
     rootSelector = '#$vue_app_name' + ((counter$vue_app_name == 1) ? '' : '-' + window.counter$vue_app_name)
     counter$vue_app_name++