projects
/
xogo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more debug on Checkered (still not ready: turn/color issues..)
[xogo.git]
/
server.js
diff --git
a/server.js
b/server.js
index
7e1a99b
..
06d9866
100644
(file)
--- a/
server.js
+++ b/
server.js
@@
-7,7
+7,6
@@
const wss = new WebSocket.Server({
let challenges = {}; //variantName --> socketId, name
let games = {}; //gameId --> gameInfo (vname, fen, players, options, time)
let challenges = {}; //variantName --> socketId, name
let games = {}; //gameId --> gameInfo (vname, fen, players, options, time)
-let moveHash = {}; //gameId --> set of hashes seen so far
let sockets = {}; //socketId --> socket
const variants = require("./variants.js");
const Crypto = require("crypto");
let sockets = {}; //socketId --> socket
const variants = require("./variants.js");
const Crypto = require("crypto");
@@
-28,24
+27,21
@@
function initializeGame(vname, players, options) {
vname: vname,
players: players,
options: options,
vname: vname,
players: players,
options: options,
- time: Date.now()
+ time: Date.now(),
+ moveHash: {} //set of moves hashes seen so far
};
return gid;
}
// Provide seed in case of, so that both players initialize with same FEN
function launchGame(gid) {
};
return gid;
}
// Provide seed in case of, so that both players initialize with same FEN
function launchGame(gid) {
- moveHash[gid] = {};
const gameInfo = Object.assign(
const gameInfo = Object.assign(
- {seed: Math.floor(Math.random() * 1984), gid: gid},
+ {seed: Math.floor(Math.random() * 1984
0
), gid: gid},
games[gid]
);
// players array is supposed to be full:
games[gid]
);
// players array is supposed to be full:
- for (const p of games[gid].players) {
- send(p.sid,
- "gamestart",
- Object.assign({randvar: p.randvar}, gameInfo));
- }
+ for (const p of games[gid].players)
+ send(p.sid, "gamestart", gameInfo);
}
function getRandomVariant() {
}
function getRandomVariant() {
@@
-59,7
+55,13
@@
wss.on("connection", (socket, req) => {
sockets[sid] = socket;
socket.isAlive = true;
socket.on("pong", () => socket.isAlive = true);
sockets[sid] = socket;
socket.isAlive = true;
socket.on("pong", () => socket.isAlive = true);
-
+ if (params.dev == true) {
+ const chokidar = require("chokidar");
+ const watcher = chokidar.watch(
+ ["*.js", "*.css", "utils/", "variants/"],
+ {persistent: true});
+ watcher.on("change", path => send(sid, "filechange", {path: path}));
+ }
socket.on("message", (msg) => {
const obj = JSON.parse(msg);
switch (obj.code) {
socket.on("message", (msg) => {
const obj = JSON.parse(msg);
switch (obj.code) {
@@
-137,11
+139,10
@@
wss.on("connection", (socket, req) => {
const allrand = games[obj.gid].rematch.every(r => r == 2);
if (allrand)
vname = getRandomVariant();
const allrand = games[obj.gid].rematch.every(r => r == 2);
if (allrand)
vname = getRandomVariant();
- games[obj.gid].players.forEach(p =>
- p.randvar = allrand ? true : false);
+ games[obj.gid].players.forEach(p => p.randvar = allrand);
const gid = initializeGame(vname,
const gid = initializeGame(vname,
- games[obj.gid].players.reverse(),
- games[obj.gid].options);
+
games[obj.gid].players.reverse(),
+
games[obj.gid].options);
launchGame(gid);
}
}
launchGame(gid);
}
}
@@
-199,11
+200,11
@@
wss.on("connection", (socket, req) => {
const hash = Crypto.createHash("md5")
.update(JSON.stringify(obj.fen))
.digest("hex");
const hash = Crypto.createHash("md5")
.update(JSON.stringify(obj.fen))
.digest("hex");
- if (moveHash[hash])
+ if (
games[obj.gid].
moveHash[hash])
break;
break;
- moveHash[hash] = true;
+
games[obj.gid].
moveHash[hash] = true;
games[obj.gid].fen = obj.fen;
games[obj.gid].fen = obj.fen;
- games[obj.gid].time = Date.now(); //update
timestamp in case of
+ games[obj.gid].time = Date.now(); //update
useful if verrry slow game
const playingWhite = (games[obj.gid].players[0].sid == sid);
const oppSid = games[obj.gid].players[playingWhite ? 1 : 0].sid;
send(oppSid, "newmove", {moves: obj.moves});
const playingWhite = (games[obj.gid].players[0].sid == sid);
const oppSid = games[obj.gid].players[playingWhite ? 1 : 0].sid;
send(oppSid, "newmove", {moves: obj.moves});