X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=42e6507a23f129badaa193598de3f674f4843b29;hb=a68d899d21456de948c4d1cb96594a981a510c44;hp=1338132324f1c51746a340835b482fb67c96e45f;hpb=1d184b4c016a645228251ce984d4c980e60420b0;p=vchess.git diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index 13381323..42e6507a 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -1,3 +1,5 @@ +// TODO: use indexedDB instead of localStorage? (more flexible...) + Vue.component('my-game', { data: function() { return { @@ -8,10 +10,13 @@ Vue.component('my-game', { start: {}, //pixels coordinates + id of starting square (click or drag) selectedPiece: null, //moving piece (or clicked piece) conn: null, //socket messages - endofgame: "", //end of game message + score: "*", //'*' means 'unfinished' mode: "idle", //human, computer or idle (when not playing) oppid: "", //opponent ID in case of HH game oppConnected: false, + seek: false, + fenStart: "", + incheck: [], }; }, render(h) { @@ -19,24 +24,55 @@ Vue.component('my-game', { // Precompute hints squares to facilitate rendering let hintSquares = doubleArray(sizeX, sizeY, false); this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; }); + // Also precompute in-check squares + let incheckSq = doubleArray(sizeX, sizeY, false); + this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; }); let elementArray = []; let square00 = document.getElementById("sq-0-0"); let squareWidth = !!square00 ? parseFloat(window.getComputedStyle(square00).width.slice(0,-2)) : 0; + const playingHuman = (this.mode == "human"); + const playingComp = (this.mode == "computer"); let actionArray = [ h('button', { - on: { click: () => this.newGame("human") }, + on: { + click: () => { + if (this.mode == "human") + return; //no newgame while playing + if (this.seek) + delete localStorage["newgame"]; //cancel game seek + else + { + localStorage["newgame"] = variant; + this.newGame("human"); + } + this.seek = !this.seek; + } + }, attrs: { "aria-label": 'New game VS human' }, - 'class': { "tooltip":true }, + 'class': { + "tooltip": true, + "seek": this.seek, + "playing": playingHuman, + }, }, [h('i', { 'class': { "material-icons": true } }, "accessibility")]), h('button', { - on: { click: () => this.newGame("computer") }, + on: { + click: () => { + if (this.mode == "human") + return; //no newgame while playing + this.newGame("computer"); + } + }, attrs: { "aria-label": 'New game VS computer' }, - 'class': { "tooltip":true }, + 'class': { + "tooltip":true, + "playing": playingComp, + }, }, [h('i', { 'class': { "material-icons": true } }, "computer")]) ]; @@ -137,8 +173,8 @@ Vue.component('my-game', { ) ); } - const lm = this.vr.lastMove; //TODO: interruptions (FEN local storage..) - const highlight = !!lm && _.isMatch(lm.end, {x:ci,y:cj}); //&& _.isMatch(lm.start, {x:ci,y:cj}) + const lm = this.vr.lastMove; + const highlight = !!lm && _.isMatch(lm.end, {x:ci,y:cj}); return h( 'div', { @@ -147,6 +183,7 @@ Vue.component('my-game', { 'light-square': !highlight && (i+j)%2==0, 'dark-square': !highlight && (i+j)%2==1, 'highlight': highlight, + 'incheck': incheckSq[ci][cj], }, attrs: { id: this.getSquareId({x:ci,y:cj}), @@ -185,6 +222,45 @@ Vue.component('my-game', { // ); // elementArray.push(reserve); // } + let eogMessage = "Unfinished"; + switch (this.score) + { + case "1-0": + eogMessage = "White win"; + break; + case "0-1": + eogMessage = "Black win"; + break; + case "1/2": + eogMessage = "Draw"; + break; + } + let elemsOfEog = + [ + h('label', + { + attrs: { "for": "modal-control" }, + "class": { "modal-close": true }, + } + ), + h('h3', + { + "class": { "section": true }, + domProps: { innerHTML: eogMessage }, + } + ) + ]; + if (this.score != "*") + { + elemsOfEog.push( + h('p', //'textarea', //TODO: selectable! + { + domProps: { innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart) }, + //attrs: { "readonly": true }, + } + ) + ); + } const modalEog = [ h('input', { @@ -200,26 +276,7 @@ Vue.component('my-game', { { "class": { "card": true, "smallpad": true }, }, - [ - h('label', - { - attrs: { "for": "modal-control" }, - "class": { "modal-close": true }, - } - ), - h('h3', - { - "class": { "section": true }, - domProps: { innerHTML: "End of game" }, - } - ), - h('p', - { - "class": { "section": true }, - domProps: { innerHTML: this.endofgame }, - } - ) - ] + elemsOfEog ) ] ) @@ -305,17 +362,26 @@ Vue.component('my-game', { // random enough (TODO: function) : (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase(); this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); - this.conn.onopen = () => { + const socketOpenListener = () => { if (continuation) { // TODO: check FEN integrity with opponent - this.newGame("human", localStorage.getItem("fen"), - localStorage.getItem("mycolor"), localStorage.getItem("oppid"), true); + const fen = localStorage.getItem("fen"); + const mycolor = localStorage.getItem("mycolor"); + const oppid = localStorage.getItem("oppid"); + const moves = JSON.parse(localStorage.getItem("moves")); + this.newGame("human", fen, mycolor, oppid, moves, true); // Send ping to server, which answers pong if opponent is connected this.conn.send(JSON.stringify({code:"ping", oppid:this.oppId})); } + else if (localStorage.getItem("newgame") === variant) + { + // New game request has been cancelled on disconnect + this.seek = true; + this.newGame("human", "reconnect"); + } }; - this.conn.onmessage = msg => { + const socketMessageListener = msg => { const data = JSON.parse(msg.data); switch (data.code) { @@ -329,7 +395,7 @@ Vue.component('my-game', { this.oppConnected = true; break; case "resign": //..you won! - this.endGame("Victory!"); + this.endGame(this.mycolor=="w"?"1-0":"0-1"); break; // TODO: also use (dis)connect info to count online players case "connect": @@ -339,11 +405,23 @@ Vue.component('my-game', { break; } }; + const socketCloseListener = () => { + console.log("Lost connection -- reconnect"); + this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); + this.conn.addEventListener('open', socketOpenListener); + this.conn.addEventListener('message', socketMessageListener); + this.conn.addEventListener('close', socketCloseListener); + }; + this.conn.onopen = socketOpenListener; + this.conn.onmessage = socketMessageListener; + this.conn.onclose = socketCloseListener; }, methods: { - endGame: function(message) { - this.endofgame = message; - document.getElementById("modal-control").checked = true; + endGame: function(score) { + this.score = score; + let modalBox = document.getElementById("modal-control"); + modalBox.checked = true; + //setTimeout(() => { modalBox.checked = false; }, 2000); //disabled, to show PGN if (this.mode == "human") this.clearStorage(); this.mode = "idle"; @@ -351,17 +429,26 @@ Vue.component('my-game', { }, resign: function() { if (this.mode == "human" && this.oppConnected) - this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); - this.endGame("Try again!"); - }, - updateStorage: function() { - if (!localStorage.getItem("myid")) { - localStorage.setItem("myid", this.myid); - localStorage.setItem("variant", variant); - localStorage.setItem("mycolor", this.mycolor); - localStorage.setItem("oppid", this.oppid); + try { + this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); + } catch (INVALID_STATE_ERR) { + return; //resign failed for some reason... + } } + this.endGame(this.mycolor=="w"?"0-1":"1-0"); + }, + setStorage: function() { + localStorage.setItem("myid", this.myid); + localStorage.setItem("variant", variant); + localStorage.setItem("mycolor", this.mycolor); + localStorage.setItem("oppid", this.oppid); + localStorage.setItem("fenStart", this.fenStart); + localStorage.setItem("moves", JSON.stringify(this.vr.moves)); + localStorage.setItem("fen", this.vr.getFen()); + }, + updateStorage: function() { + localStorage.setItem("moves", JSON.stringify(this.vr.moves)); localStorage.setItem("fen", this.vr.getFen()); }, clearStorage: function() { @@ -369,21 +456,44 @@ Vue.component('my-game', { delete localStorage["myid"]; delete localStorage["mycolor"]; delete localStorage["oppid"]; + delete localStorage["fenStart"]; delete localStorage["fen"]; + delete localStorage["moves"]; }, - newGame: function(mode, fenInit, color, oppId, continuation) { + newGame: function(mode, fenInit, color, oppId, moves, continuation) { const fen = fenInit || VariantRules.GenRandInitFen(); console.log(fen); //DEBUG + this.score = "*"; if (mode=="human" && !oppId) { + const storageVariant = localStorage.getItem("variant"); + if (!!storageVariant && storageVariant !== variant) + { + // TODO: find a better way to ensure this. Newgame system is currently a mess. + alert("Finish your " + storageVariant + " game first!"); + return; + } // Send game request and wait.. this.clearStorage(); //in case of - this.conn.send(JSON.stringify({code:"newgame", fen:fen})); - document.getElementById("modal-control2").checked = true; + try { + this.conn.send(JSON.stringify({code:"newgame", fen:fen})); + } catch (INVALID_STATE_ERR) { + return; //nothing achieved + } + if (!fenInit || fenInit!="reconnect") //TODO: bad HACK... + { + let modalBox = document.getElementById("modal-control2"); + modalBox.checked = true; + setTimeout(() => { modalBox.checked = false; }, 2000); + } return; } - this.vr = new VariantRules(fen); + this.vr = new VariantRules(fen, moves || []); this.mode = mode; + this.incheck = []; //in case of + this.fenStart = continuation + ? localStorage.getItem("fenStart") + : fen.split(" ")[0]; //Only the position matters if (mode=="human") { // Opponent found! @@ -396,6 +506,17 @@ Vue.component('my-game', { this.oppid = oppId; this.oppConnected = true; this.mycolor = color; + this.seek = false; + if (!!moves && moves.length > 0) //imply continuation + { + const oppCol = this.vr.turn; + const lastMove = moves[moves.length-1]; + this.vr.undo(lastMove, "ingame"); + this.incheck = this.vr.getCheckSquares(lastMove, oppCol); + this.vr.play(lastMove, "ingame"); + } + delete localStorage["newgame"]; + this.setStorage(); //in case of interruptions } else //against computer { @@ -521,12 +642,18 @@ Vue.component('my-game', { this.animateMove(move); return; } + const oppCol = this.vr.getOppCol(this.vr.turn); + this.incheck = this.vr.getCheckSquares(move, oppCol); //is opponent in check? // Not programmatic, or animation is over if (this.mode == "human" && this.vr.turn == this.mycolor) { if (!this.oppConnected) return; //abort move if opponent is gone - this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid})); + try { + this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid})); + } catch(INVALID_STATE_ERR) { + return; //abort also if sending failed + } } new Audio("/sounds/chessmove1.mp3").play(); this.vr.play(move, "ingame");