Fixed bugs:

- Check for login expiration was in milliseconds (should be seconds)
- The proper node binary was not used by connect handlers
- Lack of refresh command name

+ Deploy script

Author: kevinwang5658

package.json

@@ -139,7 +139,8 @@
     "test": "vitest",
     "version": "oclif readme && git add README.md",
     "start:dev": "./bin/dev.js",
-    "start:vm": "npm run build && npm run pack:macos && npm run start:vm"
+    "start:vm": "npm run build && npm run pack:macos && npm run start:vm",
+    "deploy": "npm run pkg && npm run notarize && npm run upload"
   },
   "version": "1.0.0",
   "bugs": "https://github.com/kevinwang5658/codify/issues",

src/connect/http-routes/handlers/apply-handler.ts

@@ -29,7 +29,7 @@ export function applyHandler() {
 
     session.additionalData.filePath = filePath;
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} apply -p ${filePath}`], {
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} apply -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/import-handler.ts

@@ -55,7 +55,7 @@ export function importHandler() {
       } 
     }
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} import ${args} -p ${filePath}`], {
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} import ${args} -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/plan-handler.ts

@@ -29,7 +29,7 @@ export function planHandler() {
 
     session.additionalData.filePath = filePath;
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} plan -p ${filePath}`], {
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} plan -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/refresh-handler.ts

@@ -55,7 +55,7 @@ export function refreshHandler() {
       }
     }
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} refresh ${args} -p ${filePath}`], {
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} refresh ${args} -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/login-helper.ts

@@ -35,7 +35,8 @@ export class LoginHelper {
       return LoginHelper.instance;
     }
 
-    if (new Date(credentials.expiry).getTime() < Date.now()) {
+    // Expiry dates are in seconds, Date.now() is in milliseconds
+    if (new Date(credentials.expiry).getTime() < (Date.now() / 1000)) {
       LoginHelper.instance = new LoginHelper(false);
       return LoginHelper.instance;
     }

src/orchestrators/connect.ts

@@ -12,6 +12,7 @@ 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) {
     const login = LoginHelper.get()?.isLoggedIn;
@@ -21,14 +22,15 @@ export class ConnectOrchestrator {
     }
 
     this.rootCommand = oclifConfig.options.root;
+    this.nodeBinary = process.execPath;
 
     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, (error) => {
       if (error) {
         if (error.message.includes('EADDRINUSE')) {

src/orchestrators/login.ts

@@ -45,36 +45,28 @@ Manually open it here: ${config.dashboardUrl}/auth/cli`
       open(`${config.dashboardUrl}/auth/cli`);
     })
 
-    await Promise.race([
-      new Promise<void>((resolve, reject) => {
-        app.post('/', async (req, res) => {
-          try {
-            const body = req.body as Credentials;
+    await new Promise<void>((resolve, reject) => {
+      app.post('/', async (req, res) => {
+        try {
+          const body = req.body as Credentials;
 
-            if (!ajv.validate(schema, body)) {
-              console.error(chalk.red('Received invalid credentials. Please submit a support ticket'))
-              return res.status(400).send({ message: ajv.errorsText() })
-            }
+          if (!ajv.validate(schema, body)) {
+            console.error(chalk.red('Received invalid credentials. Please submit a support ticket'))
+            return res.status(400).send({ message: ajv.errorsText() })
+          }
 
-            console.log(chalk.green('\nSuccessfully received sign-in credentials...'))
+          console.log(chalk.green('\nSuccessfully received sign-in credentials...'))
 
-            await LoginHelper.save(body.accessToken);
-            res.sendStatus(200);
+          await LoginHelper.save(body.accessToken);
+          res.sendStatus(200);
 
-            resolve();
-          } catch (error) {
-            console.error(error);
-            reject(error);
-          }
-        });
-      }),
-      new Promise<void>((resolve) => {
-        setTimeout(() => {
-          console.error(chalk.red('Did not receive sign-in credentials in 5 minutes, please re-run the command'));
           resolve();
-        }, 5 * 60 * 1000);
-      })
-    ])
+        } catch (error) {
+          console.error(error);
+          reject(error);
+        }
+      });
+    })
 
     server.close(() => {});
   }

src/ui/reporters/default-reporter.tsx

@@ -22,6 +22,7 @@ const ProgressLabelMapping = {
   [ProcessName.APPLY]: 'Codify apply',
   [ProcessName.PLAN]: 'Codify plan',
   [ProcessName.DESTROY]: 'Codify destroy',
+  [ProcessName.REFRESH]: 'Codify refresh',
   [ProcessName.IMPORT]: 'Codify import',
   [ProcessName.INIT]: 'Codify init',
   [SubProcessName.APPLYING_RESOURCE]: 'Applying resource',