Merge pull request #3488 from NativeScript/fatme/update-ws

Update ws module version

Author: Fatme

lib/common

@@ -103,10 +103,10 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 				callback(true);
 			}
 		});
-		server.on("connection", (webSocket) => {
+		server.on("connection", (webSocket, req) => {
 			const encoding = "utf16le";
 
-			const deviceSocket: net.Socket = (<any>webSocket.upgradeReq)["__deviceSocket"];
+			const deviceSocket: net.Socket = (<any>req)["__deviceSocket"];
 			const packets = new PacketStream();
 			deviceSocket.pipe(packets);
 
@@ -122,7 +122,7 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 				this.$logger.trace("Error on debugger deviceSocket", err);
 			});
 
-			webSocket.on("message", (message, flags) => {
+			webSocket.on("message", (message: string) => {
 				const length = Buffer.byteLength(message, encoding);
 				const payload = new Buffer(length + 4);
 				payload.writeInt32BE(length, 0);

lib/definitions/ws.d.ts

@@ -30,7 +30,6 @@
     "mobile"
   ],
   "dependencies": {
-    "@types/ora": "1.3.2",
     "bplist-parser": "0.1.0",
     "bufferpack": "0.0.6",
     "byline": "4.2.1",
@@ -79,7 +78,7 @@
     "universal-analytics": "0.4.15",
     "uuid": "3.0.1",
     "winreg": "0.0.17",
-    "ws": "2.2.0",
+    "ws": "5.1.0",
     "xcode": "https://github.com/NativeScript/node-xcode/archive/1.4.0.tar.gz",
     "xml2js": "0.4.19",
     "xmldom": "0.1.21",
@@ -95,12 +94,14 @@
     "@types/color": "3.0.0",
     "@types/lockfile": "1.0.0",
     "@types/node": "6.0.61",
+    "@types/ora": "1.3.3",
     "@types/qr-image": "3.2.0",
     "@types/request": "0.0.45",
     "@types/semver": "^5.3.31",
     "@types/sinon": "4.0.0",
     "@types/source-map": "0.5.0",
     "@types/universal-analytics": "0.4.1",
+    "@types/ws": "4.0.1",
     "@types/xml2js": "^0.4.2",
     "chai": "4.0.2",
     "chai-as-promised": "7.0.0",