wip move lots from dataset

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 726eb590d1d97bba35e2db517db32d9009c44eb7..cccaa7ef8c5c473384d1f1beaa19e28ecba3fb15 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -55,11 +55,25 @@ struct SessionRenderContext {
   ctoken : String,
   player : PlayerId,
   gen : Generation,
-  uses : Vec<String>,
+  uses : Vec<SessionPieceContext>,
   defs : Vec<(VisiblePieceId,String)>,
   nick : String,
 }
 
+#[derive(Serialize,Debug)]
+struct SessionPieceContext {
+  id: VisiblePieceId,
+  pos: Pos,
+  info: String,
+}
+
+#[derive(Serialize,Debug)]
+struct SessionPieceLoadJson<'r> {
+  gplayer : &'r Option<PlayerId>,
+  z : ZCoord,
+  zg : Generation,
+}
+
 #[derive(Deserialize)]
 struct SessionForm {
   ptoken : String,
@@ -97,19 +111,18 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       let defs = pr.make_defs(&pri);
       alldefs.push((pri.id, defs));
 
-      let gplayer = match pr.held {
-        None => "".to_owned(),
-        Some(o) => format!("{}",o),
+      let for_info = SessionPieceLoadJson {
+        gplayer : &pr.held,
+        z  : pr.zlevel.0,
+        zg : pr.zlevel.1,
+      };
+
+      let for_piece = SessionPieceContext {
+        id: pri.id,
+        pos : pr.pos,
+        info : serde_json::to_string(&for_info)?,
       };
-      uses.push(format!(
-        r##"<use id="{}" href="#{}" data-piece="{}" data-gplayer="{}" x="{}" y="{}" data-z="{}" data-zg="{}"/>"##,
-        pri.id_use(),
-        pri.id_piece(),
-        pri.id,
-        &gplayer,
-        pr.pos[0], pr.pos[1],
-        pr.zlevel.0, pr.zlevel.1,
-      ));
+      uses.push(for_piece);
     }
 
     let src = SessionRenderContext {

diff --git a/src/error.rs b/src/error.rs
index 2ff9da471fd5c702e4aeb6a8a66c00f54b99ed57..51ec90cce8fd1b6805b41b3d469558755e32bcd4 100644 (file)
--- a/src/error.rs
+++ b/src/error.rs
@@ -21,6 +21,8 @@ pub enum OnlineError {
   NoPlayer,
   #[error("invalid Z coordinate")]
   InvalidZCoord,
+  #[error("JSON~ serialisation error: {0:?}")]
+  JSONSerializeFailed(#[from] serde_json::error::Error),
 }
 
 pub use OnlineError::{NoClient,NoPlayer};

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 3d1f17b0502322b18565be60f116adce2b160a81..fc4a2909101cb6eec86e2629c6755af55cffa705 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -95,8 +95,10 @@ pub struct PieceRecord {
 #[derive(Debug,Serialize)]
 pub struct PreparedPieceState {
   pub pos : Pos,
-  pub held : Option<PlayerId>,
   pub svg : String,
+  pub held : Option<PlayerId>,
+  pub z : ZCoord,
+  pub zg : Generation,
 }
 
 impl PieceRecord {
@@ -125,6 +127,8 @@ impl PieceRecord {
       pos        : self.pos,
       held       : self.held,
       svg        : self.make_defs(pri),
+      z          : self.zlevel.0,
+      zg         : self.zlevel.1,
     }
   }
 

diff --git a/src/http.rs b/src/http.rs
index b9711025e39eb2b0b2f57575762e9ae2b86400c3..50f4b5c3854dee1a1284536925b7f3d2dc64df9c 100644 (file)
--- a/src/http.rs
+++ b/src/http.rs
@@ -11,7 +11,8 @@ impl<'r> Responder<'r> for OnlineError {
     use rocket::http::Status;
     use OnlineError::*;
     let status = match self {
-      GameCorrupted => Status::InternalServerError,
+      GameCorrupted | JSONSerializeFailed(_)
+        => Status::InternalServerError,
       NoClient | NoPlayer => Status::NotFound,
       InvalidZCoord => Status::BadRequest,
     };

diff --git a/templates/script.ts b/templates/script.ts
index bcdbb7caae05b9b0d4e5d64f31f095cc56dd5575..c64bc05214b98ada3fd7004378ba97671923a521 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -11,9 +11,6 @@
 //      #use{}
 //      <use id="use{}", href="#piece{}" x= y= >
 //         .piece   piece id (static)
-//         .gplayer  grabbed user (player id string, or "")
-//         .cseq     client sequence (see PROTOCOL.md)
-//         .z, .zg   Z level
 //      container to allow quick movement and hang stuff off
 //
 //   delem
@@ -44,8 +41,28 @@ type Pos = [number, number];
 type ClientSeq = number;
 type Generation = number;
 
+type PieceInfo = {
+  gplayer : PlayerId | null,
+  cseq : number | null,
+  z : number,
+  zg : Generation,
+  uelem : SVGGraphicsElement,
+  delem : SVGGraphicsElement,
+  pelem : SVGGraphicsElement,
+}
+
+/*
+interface PieceMap {
+  [piece: string]: PieceInfo;
+}
+var pieces : PieceMap = new Map();
+*/
+
+let pieces : { [typeid: string]: PieceInfo } = Object();
+    //Object.create(null);
+
 type MessageHandler = (op: Object) => void;
-type PieceHandler = (piece: PieceId, info: Object) => void;
+type PieceHandler = (piece: PieceId, p: PieceInfo, info: Object) => void;
 interface DispatchTable<H> { [key: string]: H };
 
 var general_timeout : number = 10000;
@@ -119,13 +136,15 @@ function api_posted() {
 }
 
 function api_piece(f: (meth: string, payload: Object) => void,
-                  meth: string, piece: string,
-                  uelem: SVGGraphicsElement, op: Object) {
+                  meth: string,
+                  piece: PieceId, p: PieceInfo,
+                  op: Object) {
   cseq += 1;
-  uelem.dataset.cseq! = cseq+"";
+  p.cseq = cseq;
   f(meth, {
     ctoken : ctoken,
     piece : piece,
+    p : p,
     gen : gen,
     cseq : cseq,
     op : op,
@@ -151,7 +170,7 @@ enum DRAGGING { // bitmask
   YES          = 4,
 };
 
-var drag_uelem : SVGGraphicsElement | null;
+var drag_piece : PieceId | null;
 var dragging = DRAGGING.NO;
 
 var dox : number | null;
@@ -164,47 +183,46 @@ const DRAGTHRESH = 5;
 function drag_mousedown(e : MouseEvent) {
   console.log('mousedown', e);
   var target = e.target as SVGGraphicsElement; // we check this just now!
-  var piece = target.dataset.piece;
+  var piece = target.dataset.piece!;
   if (!piece) { return; }
   drag_cancel();
-  drag_uelem = target;
-  var gplayer = drag_uelem.dataset.gplayer;
-  if (gplayer != "" && gplayer != us) { return; }
-  var pelem = piece_element('piece',piece)!;
+  let p = pieces[piece]!;
+  drag_piece = piece;
+  var gplayer = p.gplayer;
+  if (gplayer != null && gplayer != us) { return; }
 
   dcx = e.clientX;
   dcy = e.clientY;
-  dox = parseFloat(drag_uelem.getAttributeNS(null,"x")!);
-  doy = parseFloat(drag_uelem.getAttributeNS(null,"y")!);
+  dox = parseFloat(p.uelem.getAttributeNS(null,"x")!);
+  doy = parseFloat(p.uelem.getAttributeNS(null,"y")!);
 
   if (gplayer == us) {
     dragging = DRAGGING.MAYBE_UNGRAB;
   } else {
     dragging = DRAGGING.MAYBE_GRAB;
-    set_grab(drag_uelem, pelem, piece, us);
-    api_piece(api, 'grab', piece, drag_uelem, { });
+    set_grab(piece,p, us);
+    api_piece(api, 'grab', piece,p, { });
   }
 
   window.addEventListener('mousemove', drag_mousemove, true);
   window.addEventListener('mouseup',   drag_mouseup,   true);
 }
 
-function set_grab(uelem: SVGGraphicsElement, pelem: SVGGraphicsElement,
-                 piece: PieceId, owner: PlayerId) {
+function set_grab(piece: PieceId, p: PieceInfo, owner: PlayerId) {
   var nelem = document.createElementNS(svg_ns,'use');
-  uelem.dataset.gplayer = owner;
-  piece_cleanup_grab(pelem);
+  p.gplayer = owner;
+  piece_cleanup_grab(piece, p);
   nelem.setAttributeNS(null,'href','#select'+piece);
   nelem.setAttributeNS(null,'stroke-dasharray',"3 1  1 1  1 1");
-  pelem.appendChild(nelem);
+  p.pelem.appendChild(nelem);
 }
-function set_ungrab(uelem: SVGGraphicsElement, pelem: SVGGraphicsElement) {
-  uelem.dataset.gplayer = "";
-  piece_cleanup_grab(pelem);
+function set_ungrab(piece: PieceId, p: PieceInfo) {
+  p.gplayer = "";
+  piece_cleanup_grab(piece,p);
 }
-function piece_cleanup_grab(pelem: SVGGraphicsElement) {
-  while (pelem.children.length > 1) {
-    pelem.lastElementChild!.remove();
+function piece_cleanup_grab(piece: PieceId, p: PieceInfo) {
+  while (p.pelem.children.length > 1) {
+    p.pelem.lastElementChild!.remove();
   }
 }
 
@@ -220,13 +238,13 @@ function drag_mousemove(e: MouseEvent) {
   }
   //console.log('mousemove', ddx, ddy, dragging);
   if (dragging & DRAGGING.YES) {
+    let piece = drag_piece!;
+    let p = pieces[piece]!;
     var x = Math.round(dox! + ddx);
     var y = Math.round(doy! + ddy);
-    drag_uelem!.setAttributeNS(null, "x", x+"");
-    drag_uelem!.setAttributeNS(null, "y", y+"");
-    var piece = drag_uelem!.dataset.piece!;
-    var pelem = document.getElementById('piece'+piece);
-    api_piece(api_delay, 'm', piece, drag_uelem!, [x, y] );
+    p.uelem.setAttributeNS(null, "x", x+"");
+    p.uelem.setAttributeNS(null, "y", y+"");
+    api_piece(api_delay, 'm', piece,p, [x, y] );
   }
   return ddr2;
 }
@@ -234,22 +252,22 @@ function drag_mousemove(e: MouseEvent) {
 function drag_mouseup(e: MouseEvent) {
   console.log('mouseup', dragging);
   let ddr2 : number = drag_mousemove(e);
-  let uelem = drag_uelem!;
-  let piece = uelem.dataset.piece!;
-  let pelem = piece_element('piece',piece)!;
-  let dragraise = +pelem.dataset.dragraise!;
+  let piece = drag_piece!;
+  let p = pieces[piece]!;
+  let dragraise = +p.pelem.dataset.dragraise!;
   console.log('CHECK RAISE ', dragraise, dragraise*dragraise, ddr2);
   if (dragraise > 0 && ddr2 >= dragraise*dragraise) {
-    piece_set_zlevel(uelem, (old_top) => {
-      let z = +(old_top.dataset.z!) + 1;
-      uelem.dataset.z = z+"";
-      api_piece(api, "setz", piece, uelem, { z: z });
+    piece_set_zlevel(piece,p, (oldtop_piece) => {
+      let oldtop_p = pieces[oldtop_piece]!;
+      let z = oldtop_p.z + 1;
+      p.z = z;
+      api_piece(api, "setz", piece,p, { z: z });
     });
   }
   if (dragging == DRAGGING.MAYBE_UNGRAB ||
       dragging == (DRAGGING.MAYBE_GRAB | DRAGGING.YES)) {
-    set_ungrab(uelem, pelem);
-    api_piece(api, 'ungrab', piece, drag_uelem!, { });
+    set_ungrab(piece,p);
+    api_piece(api, 'ungrab', piece,p, { });
   }
   drag_cancel();
 }
@@ -258,7 +276,7 @@ function drag_cancel() {
   window.removeEventListener('mousemove', drag_mousemove, true);
   window.removeEventListener('mouseup',   drag_mouseup,   true);
   dragging = DRAGGING.NO;
-  drag_uelem = null;
+  drag_piece = null;
 }
 
 // ----- logs -----
@@ -298,30 +316,31 @@ messages.Piece = <MessageHandler>function
   var piece = j.piece;
   var m = j.op as { [k: string]: Object };
   var k = Object.keys(m)[0];
-  pieceops[k](piece, m[k]);
+  let p = pieces[piece]!;
+  pieceops[k](piece,p, m[k]);
 };
 
 pieceops.Modify = <PieceHandler>function
-(piece: PieceId, info: { svg: string, held: PlayerId, pos: Pos }) {
+(piece: PieceId, p: PieceInfo,
+ info: { svg: string, held: PlayerId, pos: Pos, z: number, zg: Generation}) {
   console.log('PIECE UPDATE MODIFY ',piece,info)
-  var delem = piece_element('defs',piece)!;
-  delem.innerHTML = info.svg;
-  var uelem = piece_element('use',piece)!;
-  var pelem = piece_element('piece',piece)!;
-  uelem.setAttributeNS(null, "x", info.pos[0]+"");
-  uelem.setAttributeNS(null, "y", info.pos[1]+"");
-  uelem_checkconflict(piece, uelem);
+  p.delem.innerHTML = info.svg;
+  p.pelem= piece_element('piece',piece)!;
+  p.uelem.setAttributeNS(null, "x", info.pos[0]+"");
+  p.uelem.setAttributeNS(null, "y", info.pos[1]+"");
+  piece_checkconflict(piece,p);
   if (info.held == null) {
-    set_ungrab(uelem, pelem);
+    set_ungrab(piece,p);
   } else {
-    set_grab(uelem, pelem, piece, info.held);
+    set_grab(piece,p, info.held);
   }
+  // xxx handle z
   console.log('MODIFY DONE');
 }
 
-function piece_set_zlevel(uelem: SVGGraphicsElement,
-                         modify : (old_top: SVGGraphicsElement) => void) {
-  // Calls modify, which should set .dataset.z and/or .gz, and/or
+function piece_set_zlevel(piece: PieceId, p: PieceInfo,
+                         modify : (oldtop_piece: PieceId) => void) {
+  // Calls modify, which should set .z and/or .gz, and/or
   // make any necessary API call.
   //
   // Then moves uelem to the right place in the DOM.  This is done
@@ -329,46 +348,47 @@ function piece_set_zlevel(uelem: SVGGraphicsElement,
   // O(new depth), which is right (since the UI for inserting
   // an object is itself O(new depth) UI operations to prepare.
 
-  let old_top = (defs_marker.previousElementSibling! as
-                unknown as SVGGraphicsElement);
-  modify(old_top);
-  let container = uelem.parentElement!;
+  let oldtop_elem = (defs_marker.previousElementSibling! as
+                    unknown as SVGGraphicsElement);
+  let oldtop_piece = oldtop_elem.dataset.piece!;
+  modify(oldtop_piece);
 
   let ins_before = defs_marker
-  let earlier;
-  for (; ; ins_before = earlier) {
-    earlier = (ins_before.previousElementSibling! as
+  let earlier_elem;
+  for (; ; ins_before = earlier_elem) {
+    earlier_elem = (ins_before.previousElementSibling! as
                   unknown as SVGGraphicsElement);
-    if (earlier == pieces_marker) break;
-    if (earlier == uelem) continue;
-    if (!piece_z_before(uelem, earlier)) break;
+    if (earlier_elem == pieces_marker) break;
+    if (earlier_elem == p.uelem) continue;
+    let earlier_p = pieces[earlier_elem.dataset.piece!]!;
+    if (!piece_z_before(p, earlier_p)) break;
   }
-  if (ins_before != uelem)
-    container.insertBefore(uelem, ins_before);
+  if (ins_before != p.uelem)
+    space.insertBefore(p.uelem, ins_before);
 }
 
-function piece_z_before(a: SVGGraphicsElement, b: SVGGraphicsElement) {
-  if (+(a.dataset.z !) < +(b.dataset.z !)) return true;
-  if (+(a.dataset.z !) > +(b.dataset.z !)) return false;
-  if (+(a.dataset.zg!) < +(b.dataset.zg!)) return true;
-  if (+(a.dataset.zg!) > +(b.dataset.zg!)) return false;
+function piece_z_before(a: PieceInfo, b: PieceInfo) {
+  if (a.z  < b.z ) return true;
+  if (a.z  > b.z ) return false;
+  if (a.zg < b.zg) return true;
+  if (a.zg > b.zg) return false;
   return false;
 }
 
 pieceops.Move = <PieceHandler>function
-(piece, info: Pos ) {
-  var uelem = piece_element('use',piece)!;
-  uelem_checkconflict(piece, uelem);
-  uelem.setAttributeNS(null, "x", info[0]+"");
-  uelem.setAttributeNS(null, "y", info[1]+"");
+(piece,p, info: Pos ) {
+  piece_checkconflict(piece,p);
+  p.uelem.setAttributeNS(null, "x", info[0]+"");
+  p.uelem.setAttributeNS(null, "y", info[1]+"");
 }
 
 pieceops.SetZLevel = <PieceHandler>function
-(piece, info: { z: Number, zg: Generation }) {
+(piece,p, info: { z: number, zg: Generation }) {
   let uelem = piece_element('use',piece)!;
-  piece_set_zlevel(uelem, (old_top)=>{
-    uelem.dataset.z  = info.z +"";
-    uelem.dataset.zg = info.zg+"";
+  piece_set_zlevel(piece,p, (oldtop_piece)=>{
+    let oldtop_p = pieces[oldtop_piece]!;
+    p.z  = info.z;
+    p.zg = info.zg;
   });
 }
 
@@ -376,30 +396,22 @@ messages.Recorded = <MessageHandler>function
 (j: { piece: PieceId, cseq: ClientSeq, gen: Generation,
       zg: Generation|null } ) {
   let piece = j.piece;
-  var uelem = piece_element('use',piece)!;
-  if (uelem.dataset.cseq != null && j.cseq >= +uelem.dataset.cseq) {
-    delete uelem.dataset.cseq;
-    let marker = piece_element('raisemarker',piece);
-    if (marker != null) {
-      marker.remove();
-    }
+  let p = pieces[piece]!;
+  if (p.cseq != null && j.cseq >= p.cseq) {
+    p.cseq == null;
   }
   if (j.zg != null) {
-    piece_set_zlevel(uelem, (old_top: SVGGraphicsElement)=>{
-      uelem.dataset.zg = j.zg+"";
+    var zg_new = j.zg; // type narrowing doesn't propagate :-/
+    piece_set_zlevel(piece,p, (oldtop_piece: PieceId)=>{
+      p.zg = zg_new;
     });
   }
   gen = j.gen;
 }
 
-function uelem_checkconflict(piece: PieceId, uelem: SVGGraphicsElement) {
-  if (uelem.dataset.cseq == null) { return; }
-  delete uelem.dataset.cseq;
-  let marker = piece_element('raisemarker',piece);
-  if (marker != null) {
-    uelem.parentElement!.insertBefore(marker,uelem);
-    marker.remove();
-  }
+function piece_checkconflict(piece: PieceId, p: PieceInfo) {
+  if (p.cseq == null) { return; }
+  p.cseq = null;
   add_log_message('Conflict! - simultaneous update');
 }
 
@@ -424,6 +436,18 @@ function startup() {
   defs_marker = svg_element("defs_marker")!;
   svg_ns = space.getAttribute('xmlns')!;
 
+  for (let uelem = pieces_marker.nextElementSibling! as SVGGraphicsElement;
+       uelem != defs_marker;
+       uelem = uelem.nextElementSibling! as SVGGraphicsElement) {
+    let piece = uelem.dataset.piece!;
+    let p = JSON.parse(uelem.dataset.info!);
+    p.uelem = uelem;
+    p.delem = piece_element('defs',piece);
+    p.pelem = piece_element('piece',piece);
+    delete uelem.dataset.info;
+    pieces[piece] = p;
+  }
+
   var es = new EventSource("/_/updates/"+ctoken+'/'+gen);
   es.onmessage = function(event) {
     console.log('GOTEVE', event)

diff --git a/templates/session.tera b/templates/session.tera
index aa2f865a5eb629d34fbf00b69455f9a88748e81b..b3d4d99150c9f28c77d9f01f69b873c8c44824e1 100644 (file)
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -16,7 +16,9 @@
       <rect fill="green" x="20" y="5" width="200" height="100"/>
       <g id="pieces_marker"></g>
 {%- for piece in uses %}
-      {{piece}}
+      <use id="use{{ piece.id }}" href="#piece{{ piece.id }}"
+          x="{{ piece.pos[0] }}" y="{{ piece.pos[1] }}"
+          data-piece="{{ piece.id }}" data-info="{{ piece.info | escape }}" />
 {%- endfor %}
       <g id="defs_marker"></g>
 {%- for piece in defs %}