working console

Author: mms-gianni

client/src/components/apps/console.vue

@@ -109,7 +109,7 @@ export default defineComponent({
     }),
     methods: {
         loadPods() {
-            axios.get(`/api/status/pods/${this.pipeline}/${this.phase}`).then((response) => {
+            axios.get(`/api/status/pods/${this.pipeline}/${this.phase}/${this.app}`).then((response) => {
                 //this.loadContainers();
                 for (let pod of response.data) {
                     const p = {name: pod.name, containers: pod.containers.map((c: any) => c.name)} as Pod;
@@ -123,13 +123,17 @@ export default defineComponent({
             socket.emit("terminal", {
                 room: this.room,
                 data: "exit\r\nexit\r\nexit\r\nexit\r\nexit\r\n",
+                //data: "exit\r\n",
             });
             // wait a bit for the exit to be processed
             setTimeout(() => {
                 this.socketLeave()
             }, 1000);
-            this.connected = false;
+            //this.connected = false;
             term.dispose()
+
+            // close popup window
+            window.close()
         },
         connect() {
             this.createTerminal()

client/src/components/apps/detail.vue

@@ -202,15 +202,17 @@ export default defineComponent({
             this.loadingState = false;
         },
         openConsole() {
+            /*
             Swal.fire({
                 title: "Open Console",
                 text: "This feature is not yet implemented. It will be available in a future release.",
                 icon: "info",
                 background: "rgb(var(--v-theme-cardBackground))",
-                /*background: "rgb(var(--v-theme-on-surface-variant))",*/
+                /*background: "rgb(var(--v-theme-on-surface-variant))",
                 color: "rgba(var(--v-theme-on-background),var(--v-high-emphasis-opacity));",
             })
-            //window.open(`https://${this.appData.spec.domain}`, '_blank');
+            */
+            window.open(`/popup/console/${this.pipeline}/${this.phase}/${this.app}`, '_blank', 'popup=yes,location=no,height=1000,width=1000,scrollbars=yes,status=no');
         },
     },
 

server/src/kubero.ts

@@ -37,7 +37,7 @@ export class Kubero {
     private podLogStreams: string[]= []
     public config: IKuberoConfig;
     private audit: Audit;
-    private execStreams: {[key: string]: {websocket: WebSocket, stream: Stream}} = {};
+    private execStreams: {[key: string]: {websocket: WebSocket, stream: any}} = {};
 
     constructor(io: Server, audit: Audit) {
         this.config = this.loadConfig(process.env.KUBERO_CONFIG_PATH as string || './config.yaml');
@@ -52,6 +52,22 @@ export class Kubero {
         debug.debug('Kubero Config: '+JSON.stringify(this.config));
 
         this.audit = audit;
+
+
+        this._io.on('connection', client => {
+            client.on('terminal', (data: any) => {
+                //console.log('terminal input', data.data);
+                //console.log('ws.OPEN', ws.readyState == ws.OPEN);
+                //console.log(ws.url);
+                //console.log(ws.eventNames());
+                //execStream.write(data.data);
+                if (this.execStreams[data.room]) {
+                    this.execStreams[data.room].stream.write(data.data);
+                }
+                //this.execStreams[data.room].stream.write(data.data);
+            }
+            )}
+        );
     }
 
     public getKubernetesVersion() {
@@ -981,7 +997,7 @@ export class Kubero {
     public async execInContainer(pipelineName: string, phaseName: string, appName: string, podName: string, containerName: string, command: string, user: User) {
         const contextName = this.getContext(pipelineName, phaseName);
         if (contextName) {
-            const streamname = `${pipelineName}-${phaseName}-${appName}-${podName}-${containerName}`;
+            const streamname = `${pipelineName}-${phaseName}-${appName}-${podName}-${containerName}-terminal`;
 
             if ( process.env.KUBERO_READONLY == 'true'){
                 console.log('KUBERO_READONLY is set to true, not deleting app');
@@ -993,8 +1009,12 @@ export class Kubero {
                     console.log('execInContainer: execStream already running');
                     return;
                 } else {
-                    console.log('execInContainer: execStream already running but not open, deleting');
+                    console.log('CLOSED', this.execStreams[streamname].websocket.CLOSED)
+                    console.log('execInContainer: execStream already running but not open, deleting :', this.execStreams[streamname].websocket.readyState);
                     delete this.execStreams[streamname];
+
+                    // wait a bit to make sure the stream is closed
+                    await new Promise(resolve => setTimeout(resolve, 3000));
                 }
             }
 
@@ -1014,29 +1034,14 @@ export class Kubero {
 
             let stream = {
                 websocket: ws as unknown as WebSocket,
-                stream: execStream as Stream
+                stream: execStream
             };
             this.execStreams[streamname] = stream;
 
             // sending the terminal output to the client
             ws.on('message', (data: Buffer) => {
-                const roomname = `${pipelineName}-${phaseName}-${appName}-${podName}-${containerName}-terminal`;
-                //console.log('execInContainer message', roomname, data.toString());
-                this._io.to(roomname).emit('consoleresponse', data.toString())
+                this._io.to(streamname).emit('consoleresponse', data.toString())
             });
-
-            // Sending the terminal input to the container
-            this._io.on('connection', client => {
-                //console.log('connection');
-                client.on('terminal', (data: any) => {
-                    //console.log('terminal input', data.data);
-                    //console.log('ws.OPEN', ws.readyState == ws.OPEN);
-                    //console.log(ws.url);
-                    //console.log(ws.eventNames());
-                    execStream.write(data.data);
-                }
-                )}
-            );
         }
     }
 
@@ -1497,7 +1502,7 @@ export class Kubero {
         }
     }
 
-    public async getPods(pipelineName: string, phaseName: string): Promise<Workload[]> {
+    public async getPods(pipelineName: string, phaseName: string, appName: string): Promise<Workload[]> {
         const contextName = this.getContext(pipelineName, phaseName);
         const namespace = pipelineName+'-'+phaseName;
 
@@ -1508,6 +1513,11 @@ export class Kubero {
             const workload = await this.kubectl.getPods(namespace, contextName);
             //return workload
             for (const pod of workload) {
+                // check if app label name starts with appName
+                if (!pod.metadata?.generateName?.startsWith(appName+'-kuberoapp')) {
+                    continue;
+                }
+
                 let workload = {
                     name: pod.metadata?.name,
                     namespace: pod.metadata?.namespace,

server/src/modules/kubectl.ts

@@ -3,7 +3,6 @@ debug('app:kubectl')
 
 import {
     KubeConfig,
-    Attach,
     Exec,
     VersionApi,
     CoreV1Api,
@@ -50,7 +49,6 @@ export class Kubectl {
     private patchUtils: PatchUtils = {} as PatchUtils;
     public log: KubeLog;
     public config: IKuberoConfig;
-    private attach: Attach = {} as Attach;
     private exec: Exec = {} as Exec;
 
     constructor(config: IKuberoConfig) {
@@ -85,7 +83,6 @@ export class Kubectl {
             this.networkingV1Api = this.kc.makeApiClient(NetworkingV1Api);
             this.metricsApi = new Metrics(this.kc);
             this.patchUtils = new PatchUtils();
-            this.attach = new Attach(this.kc);
             this.exec = new Exec(this.kc)
             this.customObjectsApi = this.kc.makeApiClient(CustomObjectsApi);
         } catch (error) {

server/src/routes/logs.ts

@@ -142,10 +142,6 @@ Router.post('/console/:pipeline/:phase/:app/exec', authMiddleware, async functio
 
     // #swagger.tags = ['UI']
     // #swagger.summary = 'Start a container console'
-    req.params.pipeline = "test";
-    req.params.phase = "production";
-    req.params.app = "go-httpbin";
-
     const user = 'nobody'
 
     const podName = req.body.podName;
@@ -156,11 +152,11 @@ Router.post('/console/:pipeline/:phase/:app/exec', authMiddleware, async functio
     res.send(console);
 });
 
-Router.get('/status/pods/:pipeline/:phase', authMiddleware, async function (req: Request, res: Response) {
+Router.get('/status/pods/:pipeline/:phase/:app', authMiddleware, async function (req: Request, res: Response) {
     // #swagger.tags = ['UI']
     // #swagger.summary = 'Get the Pod workload from an Namespace'
 
-    req.app.locals.kubero.getPods(req.params.pipeline, req.params.phase)
+    req.app.locals.kubero.getPods(req.params.pipeline, req.params.phase, req.params.app)
         .then((result: any) => {
             res.send(result);
         })

server/src/socket.ts

@@ -34,7 +34,11 @@ export function init(httpServer: HttpServer, authentication: boolean = false) {
             debug.log('joining room', join.room)
             client.join(join.room);
         });
-
+/*
+        client.on('terminal', terminal => {
+            console.log('main terminal', terminal)
+        });
+*/
         client.on('leave', leave => {
             debug.log('leaving room', leave.room)
             client.leave(leave.room);