Merge pull request #72 from brendandburns/ws

Some web sockets fixes.

Author: brendandburns

node-client/src/attach.ts

@@ -3,6 +3,8 @@ import stream = require('stream');
 
 import { KubeConfig } from './config';
 import { WebSocketHandler } from './web-socket-handler';
+import { connection } from 'websocket';
+import { resolve } from 'url';
 
 export class Attach {
     public 'handler': WebSocketHandler;
@@ -13,7 +15,7 @@ export class Attach {
 
     public attach(namespace: string, podName: string, containerName: string,
                   stdout: stream.Writable | any, stderr: stream.Writable | any, stdin: stream.Readable | any,
-                  tty: boolean) {
+                  tty: boolean): Promise<void> {
         const query = {
             container: containerName,
             stderr: stderr != null,
@@ -23,8 +25,12 @@ export class Attach {
         };
         const queryStr = querystring.stringify(query);
         const path = `/api/v1/namespaces/${namespace}/pods/${podName}/attach?${queryStr}`;
-        this.handler.connect(path, null, (streamNum: number, buff: Buffer) => {
+        const promise = this.handler.connect(path, null, (streamNum: number, buff: Buffer) => {
             WebSocketHandler.handleStandardStreams(streamNum, buff, stdout, stderr);
         });
+        const result = new Promise<void>((resolvePromise, reject) => {
+            promise.then(() => resolvePromise(), (err) => reject(err));
+        });
+        return result;
     }
 }

node-client/src/config_types.ts

@@ -53,22 +53,24 @@ function userIterator(): u.ListIterator<any, User> {
             throw new Error(`users[${i}].name is missing`);
         }
         let token = null;
-        if (elt.user.token) {
-            token = elt.user.token;
-        }
-        if (elt.user['token-file']) {
-            token = fs.readFileSync(elt.user['token-file']);
+        if (elt.user) {
+            if (elt.user.token) {
+                token = elt.user.token;
+            }
+            if (elt.user['token-file']) {
+                token = fs.readFileSync(elt.user['token-file']);
+            }
         }
         return {
-            authProvider: elt.user['auth-provider'],
-            certData: elt.user['client-certificate-data'],
-            certFile: elt.user['client-certificate'],
-            keyData: elt.user['client-key-data'],
-            keyFile: elt.user['client-key'],
+            authProvider: elt.user ? elt.user['auth-provider'] : null,
+            certData: elt.user ? elt.user['client-certificate-data'] : null,
+            certFile: elt.user ? elt.user['client-certificate'] : null,
+            keyData: elt.user ? elt.user['client-key-data'] : null,
+            keyFile: elt.user ? elt.user['client-key'] :  null,
             name: elt.name,
-            password: elt.user.password,
+            password: elt.user ? elt.user.password : null,
             token,
-            username: elt.user.username,
+            username: elt.user ? elt.user.username : null,
         };
     };
 }

node-client/src/web-socket-handler.ts

@@ -69,8 +69,10 @@ export class WebSocketHandler {
                    binaryHandler: (stream: number, buff: Buffer) => void): Promise<ws.connection> {
 
         const server = this.config.getCurrentCluster().server;
-        const target = server.startsWith('https://') ? server.substr(8) : server.substr(7);
-        const uri = `wss://${target}${path}`;
+        const ssl = server.startsWith('https://');
+        const target = ssl ? server.substr(8) : server.substr(7);
+        const proto = ssl ? 'wss' : 'ws';
+        const uri = `${proto}://${target}${path}`;
 
         const opts: https.RequestOptions = {};
         this.config.applytoHTTPSOptions(opts);
@@ -97,8 +99,7 @@ export class WebSocketHandler {
             client.on('connectFailed', (err) => {
                 reject(err);
             });
-
-            client.connect(uri, protocols);
+            client.connect(uri, protocols); 
         });
     }
 }