Merge pull request #7 from CeeblueTV/dev

minor fix and feature update

Author: jobl

src/Util.ts

@@ -142,17 +142,17 @@ export function objectEntries(value: any): [string, any][] {
  * @param obj Any objects, strings, exceptions, errors, or number
  * @param params.space `''`, allows to configure space in the string representation
  * @param params.decimal `2`, allows to choose the number of decimal to display in the string representation
- * @param params.recursive `false`, allows to serialize recursively every object value, beware if a value refers to a already parsed value an infinite loop will occur
+ * @param params.recursion `1`, recursion depth to stringify recursively every object value until this depth, beware if a value refers to a already parsed value an infinite loop will occur
  * @param params.noBin `false`, when set skip binary encoding and write inplace a bin-length information
  * @returns the final string representation
  */
 // Online Javascript Editor for free
 // Write, Edit and Run your Javascript code using JS Online Compiler
 export function stringify(
     obj: any,
-    params: { space?: string; decimal?: number; recursive?: number; noBin?: boolean } = {}
+    params: { space?: string; decimal?: number; recursion?: number; noBin?: boolean } = {}
 ): string {
-    params = Object.assign({ space: ' ', decimal: 2, recursive: 1, noBin: false }, params);
+    params = Object.assign({ space: ' ', decimal: 2, recursion: 1, noBin: false }, params);
     if (obj == null) {
         return String(obj);
     }
@@ -173,7 +173,7 @@ export function stringify(
         return '[' + obj.byteLength + '#bytes]';
     }
     // boolean or string type or stop recursivity
-    if (typeof obj === 'boolean' || obj.substring || !params.recursive) {
+    if (typeof obj === 'boolean' || obj.substring || !params.recursion) {
         // is already a string OR has to be stringified
         return String(obj);
     }
@@ -185,14 +185,14 @@ export function stringify(
         let res = '';
         for (const value of obj) {
             res += (res ? ',' : '[') + space;
-            res += stringify(value, Object.assign({ ...params }, { recursive: params.recursive - 1 }));
+            res += stringify(value, Object.assign({ ...params }, { recursion: params.recursion - 1 }));
         }
         return (res += space + ']');
     }
     let res = '';
     for (const name in obj) {
         res += (res ? ',' : '{') + space + name + ':';
-        res += stringify(obj[name], Object.assign({ ...params }, { recursive: params.recursive - 1 }));
+        res += stringify(obj[name], Object.assign({ ...params }, { recursion: params.recursion - 1 }));
     }
     return (res += space + '}');
 }

src/WebSocketReliable.ts

@@ -168,13 +168,15 @@ export class WebSocketReliable extends EventEmitter {
         ws.onclose = (e: CloseEvent) => {
             if (!this._opened) {
                 // close during connection
-                this.close(url.toString() + ' connection failed (' + String(e.reason || e.code) + ')');
+                // the caller can differentiate this case of one server shutdown by looking if onOpen was op
+                this.close(url.toString() + ' connection failed, ' + String(e.reason || e.code));
             } else if (e.code === 1000 || e.code === 1005) {
-                // normal disconnection from server (no error code)
+                // normal disconnection from server, no error to indicate that a reconnection is possible!
+                // the caller can differentiate this case of one explicit websocket.close() call in the encpasulating class
                 this.close(url.toString() + ' shutdown');
             } else {
-                // disconnection from server
-                this.close(url.toString() + ' disconnection (' + String(e.reason || e.code) + ')');
+                // abnormal disconnection from server
+                this.close(url.toString() + ' disconnection, ' + String(e.reason || e.code));
             }
         };
         // Wrap send method to queue messages until connection is established.
@@ -193,7 +195,7 @@ export class WebSocketReliable extends EventEmitter {
      * @returns this
      */
     send(message: string | ArrayBuffer | ArrayBufferView, queueing: boolean = false) {
-        if (!this._ws) {
+        if (this._closed) {
             throw Error('Open socket before to send data');
         }
         if (queueing || !this._opened) {
@@ -230,10 +232,13 @@ export class WebSocketReliable extends EventEmitter {
         this._ws.onopen = this._ws.onclose = this._ws.onmessage = null; // otherwise can receive message AFTER close!
         this._ws.close(); // Don't set to undefined to keep this._ws properties valid!
         // release resources!
-        this._opened = false;
+
         this._queueing.length = 0;
         this._queueingBytes = 0;
         this.onClose(error);
+        // Reset _opened in last to allow to differenciate in onClose an error while connecting OR while connected
+        // Is welcome to attempt a reconnection when no error OR when error on connection!
+        this._opened = false;
     }
 
     private _send(message: string | ArrayBuffer | ArrayBufferView) {