Skip to content

Update ws module version #3488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Update ws module version #3488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2923ff5
Update ws module version
Fatme Mar 23, 2018
13c2f45
Save @types/ora and @types/ws as dev-dependencies
Fatme Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 1 files
+2 −2 package.json
134 changes: 0 additions & 134 deletions lib/definitions/ws.d.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions lib/device-sockets/ios/socket-proxy-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down
44 changes: 31 additions & 13 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"mobile"
],
"dependencies": {
"@types/ora": "1.3.2",
"bplist-parser": "0.1.0",
"bufferpack": "0.0.6",
"byline": "4.2.1",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down