nicer

nicer and some other changes so webstorm will stfu

Author: hcortezr

src/BinaryStream.js

@@ -15,6 +15,12 @@ class BinaryStream {
         }
     }
 
+    /*
+     *******************************
+     * Stream Management Functions *
+     *******************************
+    */
+
     /**
      * Read a set of bytes from the buffer
      * @param len {number}
@@ -42,6 +48,37 @@ class BinaryStream {
         this.offset = offset;
     }
 
+    /**
+     * Increase the stream's offset
+     * @param v   {number}
+     * @param ret {boolean}
+     * @return {number}
+     */
+    increaseOffset(v, ret = false){
+        return (ret === true ? (this.offset += v) : (this.offset += v) - v);
+    }
+
+    /**
+     * Append data to stream's buffer
+     * @param buf {*}
+     * @return {BinaryStream}
+     */
+    append(buf){
+        if(buf instanceof Buffer){
+            this.buffer = Buffer.concat([this.buffer, buf]);
+            this.offset += buf.length;
+        }else if(typeof buf === "string"){
+            buf = Buffer.from(buf, "hex");
+            this.buffer = Buffer.concat([this.buffer, buf]);
+            this.offset += buf.length;
+        }else if(Array.isArray(buf)){
+            buf = Buffer.from(buf);
+            this.buffer = Buffer.concat([this.buffer, buf]);
+            this.offset += buf.length;
+        }
+        return this;
+    }
+
     /**
      * Get the read/write offset of the stream
      * @return {number}
@@ -66,6 +103,12 @@ class BinaryStream {
         return this.buffer.length;
     }
 
+    /*
+     *******************************
+     * Buffer Management Functions *
+     *******************************
+    */
+
     /**
      * Get the amount of remaining bytes that can be read
      * @return {number}
@@ -84,37 +127,6 @@ class BinaryStream {
         return buf;
     }
 
-    /**
-     * Increase the stream's offset
-     * @param v   {number}
-     * @param ret {boolean}
-     * @return {number}
-     */
-    increaseOffset(v, ret = false){
-        return (ret === true ? (this.offset += v) : (this.offset += v) - v);
-    }
-
-    /**
-     * Append data to stream's buffer
-     * @param buf {*}
-     * @return {BinaryStream}
-     */
-    append(buf){
-        if(buf instanceof Buffer){
-            this.buffer = Buffer.concat([this.buffer, buf]);
-            this.offset += buf.length;
-        }else if(typeof buf === "string"){
-            buf = Buffer.from(buf, "hex");
-            this.buffer = Buffer.concat([this.buffer, buf]);
-            this.offset += buf.length;
-        }else if(Array.isArray(buf)){
-            buf = Buffer.from(buf);
-            this.buffer = Buffer.concat([this.buffer, buf]);
-            this.offset += buf.length;
-        }
-        return this;
-    }
-
     /**
      * Reads a byte boolean
      * @return {boolean}
@@ -167,7 +179,7 @@ class BinaryStream {
      */
     writeShort(v){
         let buf = Buffer.alloc(2);
-        buf.writeUInt16BE(v);
+        buf.writeUInt16BE(v, 0);
         this.append(buf);
 
         return this;
@@ -188,7 +200,7 @@ class BinaryStream {
      */
     writeSignedShort(v){
         let buf = Buffer.alloc(2);
-        buf.writeInt16BE(v);
+        buf.writeInt16BE(v, 0);
         this.append(buf);
 
         return this;
@@ -209,7 +221,7 @@ class BinaryStream {
      */
     writeLShort(v){
         let buf = Buffer.alloc(2);
-        buf.writeUInt16LE(v);
+        buf.writeUInt16LE(v, 0);
         this.append(buf);
 
         return this;
@@ -230,7 +242,7 @@ class BinaryStream {
      */
     writeSignedLShort(v){
         let buf = Buffer.alloc(2);
-        buf.writeInt16LE(v);
+        buf.writeInt16LE(v, 0);
         this.append(buf);
 
         return this;
@@ -293,7 +305,7 @@ class BinaryStream {
      */
     writeInt(v){
         let buf = Buffer.alloc(4);
-        buf.writeInt32BE(v);
+        buf.writeInt32BE(v, 0);
         this.append(buf);
 
         return this;
@@ -314,7 +326,7 @@ class BinaryStream {
      */
     writeLInt(v){
         let buf = Buffer.alloc(4);
-        buf.writeInt32LE(v);
+        buf.writeInt32LE(v, 0);
         this.append(buf);
 
         return this;
@@ -341,7 +353,7 @@ class BinaryStream {
      */
     writeFloat(v) {
         let buf = Buffer.alloc(8);
-        let bytes = buf.writeFloatBE(v);
+        let bytes = buf.writeFloatBE(v, 0);
         this.append(buf.slice(0, bytes));
 
         return this;
@@ -368,7 +380,7 @@ class BinaryStream {
      */
     writeLFloat(v){
         let buf = Buffer.alloc(8);
-        let bytes = buf.writeFloatLE(v);
+        let bytes = buf.writeFloatLE(v, 0);
         this.append(buf.slice(0, bytes));
 
         return this;
@@ -387,7 +399,7 @@ class BinaryStream {
      */
     writeDouble(v) {
         let buf = Buffer.alloc(8);
-        buf.writeDoubleBE(v);
+        buf.writeDoubleBE(v, 0);
         this.append(buf);
 
         return this;
@@ -406,7 +418,7 @@ class BinaryStream {
      */
     writeLDouble(v){
         let buf = Buffer.alloc(8);
-        buf.writeDoubleLE(v);
+        buf.writeDoubleLE(v, 0);
         this.append(buf);
 
         return this;
@@ -611,7 +623,7 @@ class BinaryStream {
      * @return {BinaryStream}
      */
     writeString(v){
-        this.append(Buffer.from(v));
+        this.append(Buffer.alloc(v.length).write(v, "utf8"));
         return this;
     }