Start to refactor

Author: antoineleclair

src/commands/interactive.ts

@@ -1,4 +1,3 @@
-import WebSocket from 'ws';
 import {Args, Command, Flags} from '@oclif/core'
 
 import {getDisco} from '../config.js'
@@ -22,24 +21,6 @@ export default class Interactive extends Command {
   }
 
   public async run(): Promise<void> {
-    const ws = new WebSocket('wss://app1.antoineleclair.ca/api/projects/flask/runs-ws');
-    ws.on('error', console.error);
-    ws.on('message', (data) => {
-      if (data instanceof Buffer && data.length >= 2) {
-        const prefix = data.subarray(0, 2).toString('utf8');
-        const restOfMessage = data.subarray(2);
-        if (prefix === 'o:') {
-          process.stdout.write(restOfMessage);
-        } else if (prefix === 'e:') {
-          process.stderr.write(restOfMessage);
-        }
-      }
-    });
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.on( 'data', (key) => {      
-      ws.send(key, {binary: true});
-    });
   }
 }
 

src/commands/run.ts

@@ -1,3 +1,4 @@
+import WebSocket from 'ws';
 import {Args, Command, Flags} from '@oclif/core'
 
 import {getDisco} from '../config.js'
@@ -30,14 +31,31 @@ export default class Run extends Command {
       timeout: flags.timeout,
     }
     const res = await request({method: 'POST', url, discoConfig, body, expectedStatuses: [202]})
-    const data = (await res.json()) as any
-
-    const outputUrl = `https://${discoConfig.host}/api/projects/${flags.project}/runs/${data.run.number}/output`
-    readEventSource(outputUrl, discoConfig, {
-      onMessage(event: MessageEvent) {
-        const message = JSON.parse(event.data)
-        process.stdout.write(message.text)
-      },
-    })
+    const respBody = (await res.json()) as {run: {
+      id: string,
+      number: number,
+    }};
+    const wsUrl = `wss://${discoConfig.host}/api/projects/${flags.project}/runs/${respBody.run.id}/ws`;
+    const ws = new WebSocket(wsUrl);
+    ws.on('error', console.error);
+    ws.on('message', (data) => {
+      if (data instanceof Buffer && data.length >= 2) {
+        const prefix = data.subarray(0, 2).toString('utf8');
+        const restOfMessage = data.subarray(2);
+        if (prefix === 'o:') {
+          process.stdout.write(restOfMessage);
+        } else if (prefix === 'e:') {
+          process.stderr.write(restOfMessage);
+        } else if (prefix === 's:') {
+          const statusCode = Number.parseInt(restOfMessage.toString('utf8'), 10);
+          this.exit(statusCode);
+        }
+      }
+    });
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on( 'data', (key) => {      
+      ws.send(key, {binary: true});
+    });
   }
 }