chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b4964f7)
wip
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2020 11:29:29 +0000 (12:29 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2020 11:29:29 +0000 (12:29 +0100)
src/bin/server.rs patch | blob | history
templates/script.js patch | blob | history
templates/test.tera patch | blob | history

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 685045a4947f690a0dabd8f492a0183f16371da8..04a6ec12300aaebd081c002e66797d6d96f71e18 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -201,7 +201,7 @@ fn api_move(form : Json<ApiMove>) -> impl response::Responder<'static> {
 }
 
 #[get("/_/updates/<ctoken>/<gen>")]
-#[throws(OE)]
+#[throws(rocket::response::Debug<OE>)]
 fn updates(ctoken : InstanceAccess<ClientId>, gen: u64)
            -> impl response::Responder<'static> {
   let gen = Generation(gen);
diff --git a/templates/script.js b/templates/script.js
index 4150e90d3e7fb34eec9b4f346843b11086c0498a..bd2f217d4e7297e93379a994df8c0ecaffa57a3c 100644 (file)
--- a/templates/script.js
+++ b/templates/script.js
@@ -183,13 +183,14 @@ function startup() {
   var body = document.getElementById("main-body");
   ctoken = body.dataset.ctoken;
   us = body.dataset.us;
+  gen = body.dataset.gen;
   status_node = document.getElementById('status');
   status_node.innerHTML = 'js-done'
   dragthresh = 5;
   space = document.getElementById('space');
   svg_ns = space.getAttribute('xmlns');
 
-  es = new EventSource("/_/updates/"+ctoken);
+  es = new EventSource("/_/updates/"+ctoken+'/'+gen);
   es.onmessage = function(event) {
     var j = JSON.parse(event.data);
     var k = Object.keys(j)[0];
diff --git a/templates/test.tera b/templates/test.tera
index 6b55a747071f73829a0b09bf70409bb8ac0f903d..577b9729aba01933ecab7a24a2073257fbf9030d 100644 (file)
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -1,4 +1,8 @@
-<body id="main-body" data-ctoken="{{ctoken}}" data-us="{{player}}">
+{# -*- HTML -*- -#}<body id="main-body" 
+      data-ctoken="{{ctoken}}"
+      data-us="{{player}}"
+      data-gen="{{gen}}"
+      >
 <h1>Hi!</h1>
 <div id="error"></div>
 <p>
Unnamed repository; edit this file 'description' to name the repository.