From 2630392deef2fbaea192ef2572714b307d676356 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 14 May 2018 19:23:54 +0200 Subject: hashing useragent it wouldn't load on mobiles because of this --- client.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/client.js b/client.js index e67fa23..4fe2cad 100644 --- a/client.js +++ b/client.js @@ -69,6 +69,21 @@ if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phon var carea = 0; var linifile; var pinifile; +var hdid; + +hashCode = function(str) { + var hash = 0, i, chr, len; + if (str.length === 0) return hash; + for (i = 0, len = str.length; i < len; i++) { + chr = str.charCodeAt(i); + hash = ((hash << 5) - hash) + chr; + hash |= 0; // Convert to 32bit integer + } + return hash; + }; + +hdid = hashCode(navigator.userAgent); + serv.onopen = function(evt) { onOpen(evt) }; @@ -335,7 +350,7 @@ function updateText() { function onOpen(e) { if (mode == "join") { - serv.send("HI#" + navigator.userAgent + "#%"); + serv.send("HI#" + hdid + "#%"); serv.send("ID#webAO#2.4.5#%"); } else { document.getElementById("client_loading").style.display = "none"; @@ -350,13 +365,13 @@ function onClose(e) { function ReconnectButton() { serv = new WebSocket("ws://" + serverIP); if (serv) { - serv.send("HI#" + navigator.userAgent + "#%"); + serv.send("HI#" + hdid + "#%"); document.getElementById("client_error").style.display = "none"; } } function RetryButton() { -serv.send("HI#" + navigator.userAgent + "#%"); +serv.send("HI#" + hdid + "#%"); } function onError(e) { -- cgit From 6a24543e4bb0c89f241bef0fc62ee8a992e86abd Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 23 May 2018 14:40:41 +0200 Subject: Revert "hashing useragent" This reverts commit 2630392deef2fbaea192ef2572714b307d676356. --- client.js | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/client.js b/client.js index 4fe2cad..e67fa23 100644 --- a/client.js +++ b/client.js @@ -69,21 +69,6 @@ if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phon var carea = 0; var linifile; var pinifile; -var hdid; - -hashCode = function(str) { - var hash = 0, i, chr, len; - if (str.length === 0) return hash; - for (i = 0, len = str.length; i < len; i++) { - chr = str.charCodeAt(i); - hash = ((hash << 5) - hash) + chr; - hash |= 0; // Convert to 32bit integer - } - return hash; - }; - -hdid = hashCode(navigator.userAgent); - serv.onopen = function(evt) { onOpen(evt) }; @@ -350,7 +335,7 @@ function updateText() { function onOpen(e) { if (mode == "join") { - serv.send("HI#" + hdid + "#%"); + serv.send("HI#" + navigator.userAgent + "#%"); serv.send("ID#webAO#2.4.5#%"); } else { document.getElementById("client_loading").style.display = "none"; @@ -365,13 +350,13 @@ function onClose(e) { function ReconnectButton() { serv = new WebSocket("ws://" + serverIP); if (serv) { - serv.send("HI#" + hdid + "#%"); + serv.send("HI#" + navigator.userAgent + "#%"); document.getElementById("client_error").style.display = "none"; } } function RetryButton() { -serv.send("HI#" + hdid + "#%"); +serv.send("HI#" + navigator.userAgent + "#%"); } function onError(e) { -- cgit From bb3c510a8440ac33eee48b838cd3b4dace0fe19d Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 23 May 2018 18:51:03 +0200 Subject: updated readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 56da082..ffbcd76 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Attorney Online Web Client -Guide: https://docs.google.com/document/d/1X4OjG0tfoTZayqY9MM6fqzL_aGMKFAECg7NSQRYafAU/edit +Link to the client in this repo: http://stoneddiscord.github.io/webAO/master.html + +Guide to installing it locally: https://docs.google.com/document/d/1X4OjG0tfoTZayqY9MM6fqzL_aGMKFAECg7NSQRYafAU/edit This is a client for the Attorney Online roleplaying chatroom written in HTML and Javascript. It works with the serverD software when the server has WebSockets enabled. -- cgit From 1a501c5b54fab1104ef43657e693617bb6df2456 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 17 Jun 2018 15:14:05 +0200 Subject: fixed up master.js --- webAO/master.js | 68 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/webAO/master.js b/webAO/master.js index fa10eaf..4c29a7c 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -1,21 +1,23 @@ -MASTERSERVER_IP = "master.aceattorneyonline.com:27016" +MASTERSERVER_IP = "master.aceattorneyonline.com:27014" +//MASTERSERVER_IP = "192.168.1.28:27014" masterserver = new WebSocket("ws://" + MASTERSERVER_IP); -masterserver.onopen = function(evt) { onOpen(evt) }; -masterserver.onclose = function(evt) { onClose(evt) }; -masterserver.onmessage = function(evt) { onMessage(evt) }; -masterserver.onerror = function(evt) { onError(evt) }; +masterserver.onopen = (evt) => onOpen(evt); +masterserver.onclose = (evt) => onClose(evt); +masterserver.onmessage = (evt) => onMessage(evt); +masterserver.onerror = (evt) => onError(evt); var idnow; var descs = []; descs[99]="This is your computer on port 27016"; var onlinec = []; var serverpics = []; + function UrlExists(url) { var http = new XMLHttpRequest(); http.open('HEAD', url, false); http.send(); - return http.status!=404; + return http.status != 404; } function setServ(ID) { @@ -38,26 +40,25 @@ function setServ(ID) { function onOpen(e) { console.log("Open"); - masterserver.send("askforservers#%") - masterserver.send("VC#%") + masterserver.send("ID#webAO#webAO#%"); + masterserver.send("ALL#%"); + masterserver.send("VC#%"); }; function checkOnline(serverID,coIP) { function onCOOpen(e) { console.log("Open"); - console.log("YES") - oserv.send("HI#" + navigator.userAgent + "#%"); - oserv.send("ID#webAO#2.4.5#%"); + document.getElementById('server'+serverID).className = "available"; + oserv.send("HI#webAO#%"); + oserv.send("ID#webAO#webAO#%"); }; function onCOMessage(e) { comsg = e.data; console.log(comsg) - console.log("YES") coheader = comsg.split('#', 2)[0]; coarguments = comsg.split('#').slice(1) if (coheader == 'PN') { onlinec[serverID]=coarguments[0]+"/"+coarguments[1]; - document.getElementById('server'+serverID).className = "available"; oserv.close(); } }; @@ -65,11 +66,11 @@ function checkOnline(serverID,coIP) { var oserv = new WebSocket("ws://" + coIP); oserv.onopen = function(evt) { - onCOOpen(evt) + onCOOpen(evt); }; oserv.onmessage = function(evt) { - onCOMessage(evt) + onCOMessage(evt); }; } @@ -78,31 +79,28 @@ function onMessage(e) { msg = e.data; console.log(msg) header = msg.split('#', 2)[0]; - arguments = msg.split('#').slice(1) - if (header == 'SN') { - console.log(arguments[2].substring(0, 7)); - if (arguments[2].substring(0, 7) == 'serverD') { - unavv = 'class="available" '; - } - else if (arguments[2] == 'VANILLA'){ - unavv = 'class="unavailable" '; - }else{ - unavv = ''; + if (header == 'ALL') { + let servers = msg.split('#').slice(1) + for (let i = 0; i < servers.length; i++) { + let serverEntry = servers[i]; + let arguments = serverEntry.split('&'); + document.getElementById('masterlist').innerHTML += + `

  • ${arguments[0]}

    ` + + `Watch` + + `Join

    • `; + descs[i] = arguments[1]; + setTimeout(checkOnline(i, arguments[2] + ':' + arguments[3]), 3); } - document.getElementById('masterlist').innerHTML += '

  • ' + arguments[4] + '

    WatchJoin

    • ' - serverpics[arguments[0]] = arguments[2]; - descs[arguments[0]] = arguments[5]; - setTimeout(checkOnline(arguments[0],arguments[1] + ':' + arguments[3]), 3); } - else if (header == 'servercheok') - { + else if (header == 'servercheok') { + let arguments = msg.split('#').slice(1) console.log(arguments); - document.getElementById('clientinfo').innerHTML = "Client version - "+arguments[0]; + document.getElementById('clientinfo').innerHTML = "Client version: " + arguments[0]; } - else if (header == 'SV') - { + else if (header == 'SV') { + let arguments = msg.split('#').slice(1) console.log(arguments); - document.getElementById('serverinfo').innerHTML = "Masterserver version - "+arguments[0]; + document.getElementById('serverinfo').innerHTML = "Master server version: "+arguments[0]; } }; -- cgit