diff --git a/README.md b/README.md index ef6c883..ec5127b 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,12 @@ I wanted to play the old MSN(r) Messenger(tm) Activities online. ## Client compatibility: Server: whatever node.js version uWS supports + Client: does it ES6? ## TODOs -* Client synchronization should be "less bad and less prone to desynching" +* Add something! ## Desires * Discover more Activities that aren't Flash-based, and hope they don't use some other foregone extension. -* Pray Ruffle finally starts supporting the scripability APIs needed to support Flash-based activities. \ No newline at end of file +* Pray Ruffle finally starts supporting the scripability APIs needed to support Flash-based activities. diff --git a/client.js b/client.js index 03c645b..933a074 100644 --- a/client.js +++ b/client.js @@ -184,7 +184,7 @@ channelSocket.onmessage = function(event) { break; } default: { - __messengerjs__.fade.textContent = "server error:" + args[1] + "code (" + args[2] + ")"; + __messengerjs__.fade.textContent = "server error: " + args[1] + " code ( " + args[2] + " )"; __messengerjs__.fade.style.display = "block"; channelSocket.close(1000, "server sent non-zero error"); __messengerjs__.callIfExists("Channel_OnTypeChanged"); @@ -283,4 +283,4 @@ document.addEventListener("DOMContentLoaded", function(event) { __messengerjs__.onloadfunction = fn; } }); -}); \ No newline at end of file +}); diff --git a/server.js b/server.js index 498948e..9d1a937 100644 --- a/server.js +++ b/server.js @@ -1,4 +1,4 @@ -const config = {port: 9091}; +const config = {"__proto__": null, port: 9091}; var uidcounter = 0; Object.freeze(config); // Config should not be modified after initialization! @@ -109,7 +109,7 @@ const MessageParser = function(webSocket, message, isBinary) { }; if(ChannelStorage.get(getChannelId).fourCC !== args[2]) { // if the fourCC is not the same as the channel, error as such - webSocket.send(EncodeCommandString(["error", `data is incompatible! (You: ${args[2]}, Remote: ${ChannelStorage.get(getChannelId).fourCC}.`, 256]), true); + webSocket.send(EncodeCommandString(["error", `activity is incompatible! (You: ${args[2]}, Remote: ${ChannelStorage.get(getChannelId).fourCC}).`, 256]), true); break; } @@ -225,4 +225,4 @@ require("process").on('SIGINT', function() { require("process").on('SIGINT', function(){console.warn("emergency shutdown was engaged, clients may be confused!");require("process").exit()}); console.log("shutting down server, giving clients 5 seconds..."); setTimeout(function(){console.log("server stopping now");server.close();require("process").exit()}, 5000) -}); \ No newline at end of file +});