other stuff

binary stuff, globals stuff, npm stuff, etc

Author: hcortezr

package-lock.json

@@ -5,14 +5,12 @@ require("./utils/methods/Globals");
 const Logger = pocketnode("logger/Logger");
 const Server = pocketnode("Server");
 
-const g = global;
-
 function PocketNode(paths){
-    global.pocketnode.START_TIME = Date.now();
-    global.pocketnode.NAME = "PocketNode";
-    global.pocketnode.CODENAME = "[BEGINNINGS]";
-    global.pocketnode.VERSION = "0.0.4";
-    global.pocketnode.API_VERSION = "1.0.0";
+    this.START_TIME = Date.now();
+    this.NAME = "PocketNode";
+    this.CODENAME = "[BEGINNINGS]";
+    this.VERSION = "0.0.5";
+    this.API_VERSION = "1.0.0";
 
     let logger = new Logger("Server");
     let path = {
@@ -21,19 +19,12 @@ function PocketNode(paths){
         plugins: Path.normalize(__dirname + "/../../plugins/")
     };
 
-    for(let i in paths){
-        if(typeof path[i] !== "undefined"){
-            path[i] = paths[i];
-        }
-    }
+    for(let i in paths) if(typeof path[i] !== "undefined") path[i] = paths[i];
 
     logger.info("Loading PocketNode...");
 
-    global.pocketnode.TRAVIS_BUILD = process.argv.indexOf("--travis-build") !== -1;
-    global.pocketnode.RUNNING_LOCALLY = (process.argv.indexOf("--local") !== -1 || process.argv.indexOf("-l") !== -1);
-
-    let server = new Server(logger, path);
-    if(pocketnode.TRAVIS_BUILD === true){
+    let server = new Server(this, logger, path);
+    if(TRAVIS_BUILD === true){
         server.shutdown();
     }
 

src/pocketnode/PocketNode.js

@@ -23,6 +23,8 @@ const SFS = pocketnode("utils/SimpleFileSystem");
 
 class Server {
     initVars(){
+        this._pocketnode = {};
+
         this._bannedIps = {};
         this._bannedNames = {};
         this._ops = {};
@@ -70,9 +72,11 @@ class Server {
         this._entityCount = 0;
     }
 
-    constructor(logger, paths){
+    constructor(pocketnode, logger, paths){
         this.initVars();
 
+        this._pocketnode = pocketnode;
+
         this._logger = logger;
         this._paths = paths;
 
@@ -108,7 +112,7 @@ class Server {
         this._maxPlayers = this._config.getNested("server.max-players", 20);
         this._onlineMode = this._config.getNested("server.online-mode", true);
 
-        if(!pocketnode.TRAVIS_BUILD) process.stdout.write("\x1b]0;" + this.getName() + " " + this.getPocketNodeVersion() + "\x07");
+        if(!TRAVIS_BUILD) process.stdout.write("\x1b]0;" + this.getName() + " " + this.getPocketNodeVersion() + "\x07");
 
         this.getLogger().debug("Server Id:", this._serverId);
 
@@ -145,7 +149,7 @@ class Server {
 
         this._tickCounter = 0;
 
-        this.getLogger().info("Done ("+(Date.now() - pocketnode.START_TIME)+"ms)!");
+        this.getLogger().info("Done ("+(Date.now() - this._pocketnode.START_TIME)+"ms)!");
 
         this.tickProcessor();
         //this.forceShutdown();
@@ -180,21 +184,21 @@ class Server {
      * @return {string}
      */
     getName(){
-        return pocketnode.NAME;
+        return this._pocketnode.NAME;
     }
 
     /**
      * @return {string}
      */
     getCodeName(){
-        return pocketnode.CODENAME;
+        return this._pocketnode.CODENAME;
     }
 
     /**
      * @return {string}
      */
     getPocketNodeVersion(){
-        return pocketnode.VERSION;
+        return this._pocketnode.VERSION;
     }
 
     /**
@@ -215,7 +219,7 @@ class Server {
      * @return {string}
      */
     getApiVersion(){
-        return pocketnode.API_VERSION;
+        return this._pocketnode.API_VERSION;
     }
 
     /**
@@ -303,7 +307,7 @@ class Server {
      * @return {string}
      */
     getMotd(){
-        return this._config.getNested("server.motd", pocketnode.NAME + " Server");
+        return this._config.getNested("server.motd", this._pocketnode.NAME + " Server");
     }
 
     /**

src/pocketnode/Server.js

@@ -1,6 +1,4 @@
-console.log(global.pocketnode.RUNNING_LOCALLY);
-
-const RakNetServer = (pocketnode.RUNNING_LOCALLY ? require("../../../../RakNet") : require("raknet"));
+const RakNetServer = (global.RUNNING_LOCALLY ? require("../../../../RakNet") : require("raknet"));
 
 const Logger = pocketnode("logger/Logger");
 

src/pocketnode/network/RakNetAdapter.js

@@ -49,7 +49,7 @@ class LoginPacket extends DataPacket {
             return;
         }
 
-        let stream = new BinaryStream(this.readString(true));
+        let stream = new BinaryStream(this.read(this.readUnsignedVarInt()));
         this.chainData = JSON.parse(stream.read(stream.readLInt()).toString());
 
         this.chainData.chain.forEach(chain => {

src/pocketnode/network/minecraft/protocol/LoginPacket.js

@@ -25,6 +25,11 @@ class TextPacket extends DataPacket {
         this.xuid = "";
     }
 
+    constructor(){
+        super();
+        this.initVars();
+    }
+
     _decodePayload(){
         this.type = this.readByte();
         this.needsTranslation = this.readBool();