sse url prefix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/server.toml b/server.toml
index dd73a45c3a3758012c83e5aea815b8d8dd30c7fa..b6ae80d33bd5cd4b99a5b5ee3e825103e10ae821 100644 (file)
--- a/server.toml
+++ b/server.toml
@@ -8,6 +8,7 @@
 # USER=rustcargo target/debug/otter --config ~ian/Rustup/Game/server/server.toml --scope-server reset --reset-table ~ian/Rustup/Game/server/specs/test.table.toml dummy  ~ian/Rustup/Game/server/specs/test.game.toml
 
 public_url = "http://localhost:8000"
+#sse_wildcard_url = "http://*.sse.localhost:8000"
 
 save_directory = "/home/rustcargo/Rustup/Game/server"
 template_dir = "/home/ian/Rustup/Game/server/templates"

diff --git a/src/session.rs b/src/session.rs
index 224a2fd7ea7499bca653503e2601fe0951687010..736f5a797dc79154d6530d7be1fb771b3d40709e 100644 (file)
--- a/src/session.rs
+++ b/src/session.rs
@@ -158,7 +158,11 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
     }).collect();
 
     let sse_url_prefix = match &config().sse_wildcard_url {
-      Some((lhs, rhs)) => format!("{}{}{}", lhs, client, rhs),
+      Some((lhs, rhs)) => {
+        let mut clpart = client.to_string();
+        clpart.make_ascii_lowercase();
+        format!("{}{}{}", lhs, clpart, rhs)
+      },
       None => "".into(),
     };
 

diff --git a/templates/script.ts b/templates/script.ts
index 973311f1f8d133efba782ff06db46e69adcb8c33..42bb4192ee62830133a8d6130aed55fa163abce5 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -1066,6 +1066,7 @@ function startup() {
   ctoken = body.dataset.ctoken!;
   us = body.dataset.us!;
   gen = +body.dataset.gen!;
+  let sse_url_prefix = body.dataset.sseUrlPrefix!;
   status_node = document.getElementById('status')!;
   status_node.innerHTML = 'js-done';
   log_elem = document.getElementById("log")!;
@@ -1093,7 +1094,7 @@ function startup() {
     redisplay_ancillaries(piece,p);
   }
 
-  var es = new EventSource("/_/updates/"+ctoken+'/'+gen);
+  var es = new EventSource(sse_url_prefix + "/_/updates/"+ctoken+'/'+gen);
   es.onmessage = function(event) {
     console.log('GOTEVE', event);
     var k;