Added the useful ability to kill the previous codify connect so you don't have to go find it

Author: kevinwang5658

package-lock.json

@@ -57,6 +57,7 @@
     "@types/jju": "^1.4.5",
     "@types/js-yaml": "^4.0.9",
     "@types/json5": "^2.2.0",
+    "@types/kill-port": "^2.0.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^20",
     "@types/react": "^18.3.1",
@@ -73,6 +74,7 @@
     "eslint-config-oclif-typescript": "^3.1.13",
     "eslint-config-prettier": "^9.0.0",
     "ink-testing-library": "^4.0.0",
+    "kill-port": "^2.0.1",
     "memfs": "^4.14.0",
     "mocha": "^10",
     "oclif": "^4.15.29",
@@ -106,8 +108,12 @@
     "bin": "codify",
     "dirname": "codify",
     "commands": "./dist/commands",
-    "additionalVersionFlags": ["-v"],
-    "additionalHelpFlags": ["-h"],
+    "additionalVersionFlags": [
+      "-v"
+    ],
+    "additionalHelpFlags": [
+      "-h"
+    ],
     "defaultCommand": "edit",
     "plugins": [
       "@oclif/plugin-help",

package.json

@@ -19,6 +19,6 @@ For more information, visit: https://docs.codifycli.com/commands/validate
     const { flags } = await this.parse(Connect)
     const config = this.config;
 
-    await ConnectOrchestrator.run(config);
+    await ConnectOrchestrator.run(config, this.reporter);
   }
 }

src/commands/connect.ts

@@ -21,7 +21,7 @@ For more information, visit: https://docs.codifycli.com/commands/validate
     const { flags } = await this.parse(Edit);
     const config = this.config;
 
-    await EditOrchestrator.run(config);
+    await EditOrchestrator.run(config, this.reporter);
 
   }
 }

src/commands/edit.ts

@@ -28,6 +28,7 @@ export enum ProcessName {
   IMPORT = 'import',
   REFRESH = 'refresh',
   INIT = 'init',
+  TERMINATE = 'terminate',
 }
 
 export enum SubProcessName {

src/events/context.ts

@@ -1,23 +1,27 @@
 import { Config } from '@oclif/core';
 import cors from 'cors';
 import express, { json } from 'express';
+import killPort from 'kill-port';
 import { randomBytes } from 'node:crypto';
+import { Server } from 'node:http';
 import open from 'open';
 
 import { config } from '../config.js';
 import router from '../connect/http-routes/router.js';
 import { LoginHelper } from '../connect/login-helper.js';
 import { SocketServer } from '../connect/socket-server.js';
+import { ProcessName, ctx } from '../events/context.js';
+import { Reporter } from '../ui/reporters/reporter.js';
 import { LoginOrchestrator } from './login.js';
 
 export class ConnectOrchestrator {
   static rootCommand: string;
   static nodeBinary: string;
 
-  static async run(oclifConfig: Config, openBrowser = true, onOpen?: (connectionCode: string) => void) {
+  static async run(oclifConfig: Config, reporter: Reporter, openBrowser = true, onOpen?: (connectionCode: string) => void) {
     const login = LoginHelper.get()?.isLoggedIn;
     if (!login) {
-      console.log('User is not logged in. Attempting to log in...')
+      ctx.log('User is not logged in. Attempting to log in...')
       await LoginOrchestrator.run();
     }
 
@@ -31,16 +35,7 @@ export class ConnectOrchestrator {
     app.use(json())
     app.use(router);
 
-    const server = app.listen(config.connectServerPort, (error) => {
-      if (error) {
-        if (error.message.includes('EADDRINUSE')) {
-          console.error('An instance of \'codify connect\' is already running.\n\nExiting...')
-          return;
-        }
-
-        throw error;
-      }
-
+    const server = await ConnectOrchestrator.listen(app, reporter, () => {
       if (openBrowser) {
         open(`${config.dashboardUrl}/connection/success?code=${connectionSecret}`)
         console.log(`Open browser window to store code.
@@ -55,6 +50,38 @@ ${connectionSecret}`)
     SocketServer.init(server, connectionSecret);
   }
 
+  private static listen(app: express.Application, reporter: Reporter, onOpen: () => void): Promise<Server> {
+     return new Promise((resolve) => {
+      const server = app.listen(config.connectServerPort, async (error) => {
+        if (error) {
+          if (error.message.includes('EADDRINUSE')) {
+            const ifTerminate = await reporter.promptConfirmation('An instance of \'codify connect\' is already running. Do you want to terminate the existing instance and continue?');
+
+            if (!ifTerminate) {
+              console.error('\n\nExiting...')
+              process.exit(1);
+            }
+
+            ctx.processStarted(ProcessName.TERMINATE)
+            await reporter.displayProgress();
+            await killPort(config.connectServerPort);
+            ctx.processFinished(ProcessName.TERMINATE);
+            await reporter.hide();
+
+            setTimeout(() => {
+              ctx.log('Retrying connection...')
+              ConnectOrchestrator.listen(app, reporter, onOpen).then((server) => resolve(server));
+            }, 300);
+
+          }
+        } else {
+          resolve(server);
+          onOpen();
+        }
+      });
+    });
+  }
+
   private static tokenGenerate(bytes = 4): string {
     return Buffer.from(randomBytes(bytes)).toString('hex')
   }

src/orchestrators/connect.ts

@@ -4,12 +4,13 @@ import open from 'open';
 import { DashboardApiClient } from '../api/dashboard/index.js';
 import { config } from '../config.js';
 import { LoginHelper } from '../connect/login-helper.js';
+import { Reporter } from '../ui/reporters/reporter.js';
 import { ConnectOrchestrator } from './connect.js';
 import { LoginOrchestrator } from './login.js';
 
 export class EditOrchestrator {
 
-  static async run(oclifConfig: Config) {
+  static async run(oclifConfig: Config, reporter: Reporter) {
     const login = LoginHelper.get()?.isLoggedIn;
     if (!login) {
       console.log('User is not logged in. Attempting to log in...')
@@ -24,10 +25,10 @@ export class EditOrchestrator {
     }
 
     const url = defaultDocumentId
-      ? `${config.dashboardUrl}/file/${defaultDocumentId}`
+      ? `${config.dashboardUrl}/document/${defaultDocumentId}`
       : config.dashboardUrl;
 
-    await ConnectOrchestrator.run(oclifConfig, false, (code) => {
+    await ConnectOrchestrator.run(oclifConfig, reporter, false, (code) => {
       open(`${url}?connection_code=${code}`);
       console.log(
 `Opening default Codify file:

src/orchestrators/edit.ts

@@ -25,6 +25,7 @@ const ProgressLabelMapping = {
   [ProcessName.REFRESH]: 'Codify refresh',
   [ProcessName.IMPORT]: 'Codify import',
   [ProcessName.INIT]: 'Codify init',
+  [ProcessName.TERMINATE]: 'Attempting to terminate existing instance',
   [SubProcessName.APPLYING_RESOURCE]: 'Applying resource',
   [SubProcessName.GENERATE_PLAN]: 'Refresh states and generating plan',
   [SubProcessName.INITIALIZE_PLUGINS]: 'Initializing plugins',

src/ui/reporters/default-reporter.tsx

@@ -4,6 +4,7 @@
     "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
     "jsx": "react",
     "outDir": "dist",
     "rootDir": "src",