From f334f6758750fa935b93d9d3d7dfce5bcd75b90d Mon Sep 17 00:00:00 2001
From: Owen Kaluza <owen@kaluza.id.au>
Date: Fri, 11 Oct 2024 14:34:02 +1100
Subject: [PATCH] JupyterHub+lab new connect url parser

Should fix interactivity on NCI ARE
---
 lavavu/html/control.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lavavu/html/control.js b/lavavu/html/control.js
index 82d05f3c..1b38788a 100755
--- a/lavavu/html/control.js
+++ b/lavavu/html/control.js
@@ -86,12 +86,17 @@ function WindowInteractor(id, uid, port) {
   } else {
 
     //Several possible modes to try
-    //JupyterHub URL
-    var regex = /\/user\/[a-z0-9-]+\//i;
+    //Modern JupyterHub lab URL
+    var regex = /\/lab\//;
     var parsed = regex.exec(loc.href);
     if (parsed && parsed.length > 0) {
-      var base = parsed[0];
-      connect(loc.href.substring(0,parsed.index) + base + "proxy/" + port);
+      connect(loc.href.substring(0,parsed.index) + "/proxy/" + port);
+    }
+    //Old JupyterHub URL
+    regex = /\/user\/[a-z0-9-]+\//i;
+    parsed = regex.exec(loc.href);
+    if (parsed && parsed.length > 0) {
+      connect(loc.href.substring(0,parsed.index) + parsed[0] + "proxy/" + port);
     }
 
     if (loc.protocol != 'file:') {