feat(launcher): enable retry option on launcher

jourdain · jourdain · commit 8b1ae2dbc6b6 · 2025-08-18T13:46:01.000-06:00
diff --git a/examples/launcher/.gitignore b/examples/launcher/.gitignore
@@ -0,0 +1 @@
+www
diff --git a/examples/launcher/retry.py b/examples/launcher/retry.py
@@ -0,0 +1,10 @@
+from trame.app import get_server
+from trame.widgets import html
+from trame.ui.html import DivLayout
+
+server = get_server()
+
+with DivLayout(server) as layout:
+    html.Div("App is running")
+
+server.start()
diff --git a/examples/launcher/retry_launcher.json b/examples/launcher/retry_launcher.json
@@ -0,0 +1,31 @@
+{
+  "configuration": {
+    "host": "localhost",
+    "port": 8080,
+    "endpoint": "paraview",
+    "content": "www",
+    "proxy_file": "www/proxy-mapping.txt",
+    "sessionURL": "ws://${host}:${port}/ws",
+    "timeout": 50,
+    "log_dir": "www",
+    "fields": []
+  },
+  "resources": [{ "host": "localhost", "port_range": [9001, 9001] }],
+  "properties": {},
+  "apps": {
+    "trame": {
+      "cmd": [
+        "python",
+        "retry.py",
+        "--port",
+        "$port",
+        "--server",
+        "--authKey",
+        "${secret}",
+        "--timeout",
+        "2"
+      ],
+      "ready_line": "App running at"
+    }
+  }
+}
diff --git a/examples/launcher/run_retry.sh b/examples/launcher/run_retry.sh
@@ -0,0 +1,5 @@
+export TRAME_CLIENT_TYPE=vue3
+
+rm -rf ./www/
+python -m trame.tools.www --client-type "$TRAME_CLIENT_TYPE" --output ./www
+python -m wslink.launcher ./retry_launcher.json
diff --git a/vue3-app/package-lock.json b/vue3-app/package-lock.json
diff --git a/vue3-app/package.json b/vue3-app/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@kitware/vtk.js": "^30.3.2",
-    "wslink": "^2.1.2"
+    "wslink": "^2.4.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.4",
diff --git a/vue3-app/src/core/wslink/index.js b/vue3-app/src/core/wslink/index.js
@@ -56,6 +56,11 @@ function configDecorator(config) {
   outputConfig.application =
     document.querySelector("html").dataset.appName || outputConfig.application;
 
+  // Extract retry from html
+  outputConfig.launcherRetry = JSON.parse(
+    document.querySelector("html").dataset.launcherRetry || "[]"
+  );
+
   const sessionManagerURL =
     document.querySelector("html").dataset.sessionManagerUrl ||
     outputConfig.sessionManagerURL;
diff --git a/vue3-app/src/main.js b/vue3-app/src/main.js
@@ -52,7 +52,7 @@ async function start() {
 
   // Handle client/server connection error
   function reportWsError(message) {
-    if (trame) {
+    if (trame && trame.state) {
       console.log("about to replace template", message);
       trame.state.set("trame_error_report_msg", message);
       let templateName = "trame__template_main";
@@ -77,15 +77,15 @@ async function start() {
       console.log("template replaced", trame.state.get(templateName));
     } else {
       app.unmount();
-      document.querySelector("#app").innerHTML(message);
+      document.querySelector("#app").innerHTML = message;
     }
   }
 
   // Connect client to server
   try {
     config = await trame.connect(config);
   } catch (e) {
-    reportWsError("try/catch on connect()");
+    reportWsError(e?.response?.error || "try/catch on connect()");
     return;
   }
 
