Changed connect commands to use rootCommand that way it updates with the current project and doesn't rely on global codify. Added error if port is already in use.

Author: kevinwang5658

src/commands/connect.ts

@@ -1,5 +1,4 @@
 import { BaseCommand } from '../common/base-command.js';
-import { LoginOrchestrator } from '../orchestrators/login.js';
 import { ConnectOrchestrator } from '../orchestrators/connect.js';
 
 export default class Connect extends BaseCommand {
@@ -18,7 +17,8 @@ For more information, visit: https://docs.codifycli.com/commands/validate
 
   public async run(): Promise<void> {
     const { flags } = await this.parse(Connect)
+    const config = this.config;
 
-    await ConnectOrchestrator.run();
+    await ConnectOrchestrator.run(config);
   }
 }

src/commands/edit.ts

@@ -18,6 +18,6 @@ For more information, visit: https://docs.codifycli.com/commands/validate
   public async run(): Promise<void> {
     const { flags } = await this.parse(Edit)
 
-    await ConnectOrchestrator.run();
+    // await ConnectOrchestrator.run();
   }
 }

src/connect/http-routes/handlers/create-command.ts

@@ -2,6 +2,7 @@ import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
 import chalk from 'chalk';
 import { Router } from 'express';
 
+import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
 import { SocketServer } from '../../socket-server.js';
 
 export enum ConnectCommand {
@@ -17,15 +18,15 @@ const CommandInfo = {
     requiresDocumentId: false,
   },
   [ConnectCommand.APPLY]: {
-    command: (args) => ['-c', `codify apply ${args}`],
+    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} apply ${args}`],
     requiresDocumentId: true,
   },
   [ConnectCommand.PLAN]: {
-    command: (args) => ['-c', `codify plan ${args}`],
+    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} plan ${args}`],
     requiresDocumentId: true,
   },
   [ConnectCommand.IMPORT]: {
-    command: (args) => ['-c', `codify import -p ${args}`],
+    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} import -p ${args}`],
     requiresDocumentId: true,
   }
 }

src/orchestrators/connect.ts

@@ -1,3 +1,4 @@
+import { Config } from '@oclif/core';
 import cors from 'cors';
 import express, { json } from 'express';
 import { randomBytes } from 'node:crypto';
@@ -8,15 +9,28 @@ import router from '../connect/http-routes/router.js';
 import { SocketServer } from '../connect/socket-server.js';
 
 export class ConnectOrchestrator {
-  static async run() {
+  static rootCommand: string;
+
+  static async run(oclifConfig: Config) {
+    this.rootCommand = oclifConfig.options.root;
+    
     const connectionSecret = ConnectOrchestrator.tokenGenerate()
     const app = express();
 
     app.use(cors({ origin: config.corsAllowedOrigins }))
     app.use(json())
     app.use(router);
 
-    const server = app.listen(config.connectServerPort, () => {
+    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;
+      }
+
       open(`http://localhost:3000/connection/success?code=${connectionSecret}`)
       console.log(`Open browser window to store code.