Merge pull request #107 from saltyrtc/close-code-3008

Add close code 3008

Author: dbrgn

src/closecode.ts

@@ -7,16 +7,17 @@
 
 export const enum CloseCode {
     ClosingNormal = 1000,
-    GoingAway,
-    NoSharedSubprotocol,
+    GoingAway = 1001,
+    NoSharedSubprotocol = 1002,
     PathFull = 3000,
-    ProtocolError,
-    InternalError,
-    Handover,
-    DroppedByInitiator,
-    InitiatorCouldNotDecrypt,
-    NoSharedTask,
-    InvalidKey,
+    ProtocolError = 3001,
+    InternalError = 3002,
+    Handover = 3003,
+    DroppedByInitiator = 3004,
+    InitiatorCouldNotDecrypt = 3005,
+    NoSharedTask = 3006,
+    InvalidKey = 3007,
+    Timeout = 3008,
 }
 
 export function explainCloseCode(code: CloseCode): string {
@@ -43,6 +44,8 @@ export function explainCloseCode(code: CloseCode): string {
             return 'No shared task was found';
         case CloseCode.InvalidKey:
             return 'Invalid key';
+        case CloseCode.Timeout:
+            return 'Timeout';
         default:
             return 'Unknown';
     }

src/signaling/common.ts

@@ -242,31 +242,32 @@ export abstract class Signaling implements saltyrtc.Signaling {
         if (ev.code === CloseCode.Handover) {
             console.info(this.logTag, 'Closed WebSocket connection due to handover');
         } else {
-            console.info(this.logTag, 'Closed WebSocket connection');
+            console.info(this.logTag, 'Closed WebSocket connection with close code ' + ev.code +
+                                      ' (' + explainCloseCode(ev.code) + ')');
             this.setState('closed');
             this.client.emit({type: 'connection-closed', data: ev.code});
-            const log = (reason: string) => console.error(this.logTag, 'Websocket close reason:', reason);
+            const logError = (reason: string) => console.error(this.logTag, 'Websocket close reason:', reason);
             switch (ev.code) {
                 case CloseCode.GoingAway:
-                    log('Server is being shut down');
+                    logError('Server is being shut down');
                     break;
                 case CloseCode.NoSharedSubprotocol:
-                    log('No shared sub-protocol could be found');
+                    logError('No shared sub-protocol could be found');
                     break;
                 case CloseCode.PathFull:
-                    log('Path full (no free responder byte)');
+                    logError('Path full (no free responder byte)');
                     break;
                 case CloseCode.ProtocolError:
-                    log('Protocol error');
+                    logError('Protocol error');
                     break;
                 case CloseCode.InternalError:
-                    log('Internal error');
+                    logError('Internal error');
                     break;
                 case CloseCode.DroppedByInitiator:
-                    log('Dropped by initiator');
+                    logError('Dropped by initiator');
                     break;
                 case CloseCode.InvalidKey:
-                    log('Invalid server key');
+                    logError('Invalid server key');
                     break;
             }
         }