X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=sockets.js;h=2d9117d2a3270a87a93d7792a929a1fa8b67138e;hb=9a3c9f790aa28fd4708faefe41b4624173922c8e;hp=f1354f3666d36f936efbd3d98c6e9ddc97a2d85d;hpb=da06a6eb0237123ce43fdb01cb06246b8b57f5e5;p=vchess.git

diff --git a/sockets.js b/sockets.js
index f1354f36..2d9117d2 100644
--- a/sockets.js
+++ b/sockets.js
@@ -2,6 +2,17 @@ const url = require('url');
 const sqlite3 = require('sqlite3');
 const db = new sqlite3.Database('db/vchess.sqlite');
 
+// Node version in Ubuntu 16.04 does not know about URL class
+function getJsonFromUrl(url) {
+	var query = url.substr(2); //starts with "/?"
+	var result = {};
+	query.split("&").forEach(function(part) {
+		var item = part.split("=");
+		result[item[0]] = decodeURIComponent(item[1]);
+	});
+	return result;
+}
+
 module.exports = function(wss) {
 	db.serialize(function() {
 		db.all("SELECT * FROM Variants", (err,variants) => {
@@ -12,9 +23,12 @@ module.exports = function(wss) {
 			// No-op function as a callback when sending messages
 			const noop = () => { };
 			wss.on("connection", (socket, req) => {
-				const params = new URL("http://localhost" + req.url).searchParams;
-				const sid = params.get("sid");
-				const page = params.get("page");
+//				const params = new URL("http://localhost" + req.url).searchParams;
+//				const sid = params.get("sid");
+//				const page = params.get("page");
+				var query = getJsonFromUrl(req.url);
+				const sid = query["sid"];
+				const page = query["page"];
 				// Ignore duplicate connections:
 				if (!!clients[page][sid])
 				{
@@ -46,6 +60,13 @@ module.exports = function(wss) {
 						let obj = JSON.parse(objtxt);
 						switch (obj.code)
 						{
+							case "newchat":
+								if (!!clients[page][obj.oppid])
+								{
+									clients[page][obj.oppid].send(
+										JSON.stringify({code:"newchat",msg:obj.msg}), noop);
+								}
+								break;
 							case "newmove":
 								if (!!clients[page][obj.oppid])
 								{
@@ -55,7 +76,15 @@ module.exports = function(wss) {
 								break;
 							case "ping":
 								if (!!clients[page][obj.oppid])
-									socket.send(JSON.stringify({code:"pong"}));
+									socket.send(JSON.stringify({code:"pong",gameId:obj.gameId}));
+								break;
+							case "myname":
+								// Reveal my username to opponent
+								if (!!clients[page][obj.oppid])
+								{
+									clients[page][obj.oppid].send(JSON.stringify({
+										code:"oppname", name:obj.name}));
+								}
 								break;
 							case "lastate":
 								if (!!clients[page][obj.oppid])