Merge pull request #93 from hapinessjs/next

Next into master

Author: fauvillej

README.md

@@ -115,6 +115,15 @@ To set up your development environment:
 [Back to top](#table-of-contents)
 
 ## Change History
+* v1.5.4 (2018-06-19)
+    * WebSocketServer: add sec-websocket-protocol in response
+* v1.5.3 (2018-05-29)
+    * HttpRequestInfo types
+    * Add credentials
+* v1.5.2 (2018-05-09)
+    * Shutdown all extensions if one failed in bootstrap
+* v1.5.1 (2018-04-06)
+    * Allow to import many time the same modules if it has no routes inside
 * v1.5.0 (2018-03-27)
     * EventManager Extension
     * Documentation

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/core",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "description": "Project to have a HapiJS (https://hapijs.com/) based framework to create easier NodeJS back-end with some awesome features",
     "main": "commonjs/index.js",
     "types": "index.d.ts",

package.json

@@ -99,7 +99,7 @@ export class WebSocketServer {
      * @param  {request} _request
      */
     private onRequestHandler(_request: request): void {
-        const connection = _request.accept(null, _request.origin);
+        const connection = _request.accept(<string>_request.httpRequest.headers['sec-websocket-protocol'] || '', _request.origin);
         const socket = new Socket(_request, connection, this.rooms);
         const index = this.sockets.push(socket) - 1;
         connection.on('close', conn => {