Fix websocket types

Author: sheldonkwok

node-client/package-lock.json

@@ -27,6 +27,7 @@
     "@types/node": "^8.0.2",
     "@types/request": "^2.47.0",
     "@types/underscore": "^1.8.1",
+    "@types/websocket": "0.0.38",
     "base-64": "^0.1.0",
     "bluebird": "^3.3.5",
     "byline": "^5.0.0",

node-client/package.json

@@ -1,5 +1,6 @@
 import querystring = require('querystring');
 import stream = require('stream');
+import ws = require('websocket');
 
 import { WebSocketHandler } from './web-socket-handler';
 import { KubeConfig } from './config';
@@ -9,10 +10,10 @@ export class Exec {
 
     public constructor(config: KubeConfig) {
         this.handler = new WebSocketHandler(config);
-    }        
+    }
 
     // TODO: make command an array and support multiple args
-    public async exec(namespace: string, podName: string, containerName: string, command: string, stdout: stream.Writable | any, stderr: stream.Writable | any, stdin: stream.Readable | any, tty: boolean): Promise<WebSocket> {
+    public async exec(namespace: string, podName: string, containerName: string, command: string, stdout: stream.Writable | any, stderr: stream.Writable | any, stdin: stream.Readable | any, tty: boolean): Promise<ws.connection> {
         var query = {
             stdout: stdout != null,
             stderr: stderr != null,
@@ -29,6 +30,6 @@ export class Exec {
         if (stdin != null) {
             WebSocketHandler.handleStandardInput(conn, stdin);
         }
-        return conn as WebSocket;
+        return conn;
     }
 }

node-client/src/exec.ts

@@ -31,10 +31,8 @@ export class WebSocketHandler {
         const server = this.config.getCurrentCluster().server;
         const target = server.startsWith('https://') ? server.substr(8) : server.substr(7);
         const uri = `wss://${target}${path}`;
-        const opts = { uri };
 
-        this.config.applyToRequest(opts);
-        let client = new ws.client({ 'tlsOptions': opts });
+        const client = new ws.client();
 
         return new Promise((resolve, reject) => {
             client.on('connect', (connection) => {
@@ -46,7 +44,7 @@ export class WebSocketHandler {
                     }
                     else if (message.type === 'binary') {
                         if (binaryHandler) {
-                            let stream = message.binaryData.readInt8();
+                            let stream = message.binaryData.readInt8(0);
                             binaryHandler(stream, message.binaryData.slice(1));
                         }
                     }
@@ -98,7 +96,7 @@ export class WebSocketHandler {
         });
 
         stdin.on('end', () => {
-            conn.close(ws.connection.CLOSE_REASON_NORMAL);
+            conn.close();
         });
     }
 }