Refactor CLI commands and enhance environment management; update Node.js version and improve logging paths

Author: Kinin-Code-Offical

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.x]
+        node-version: [20.x]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 22.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Install dependencies

.gitignore

@@ -8,4 +8,4 @@ coverage/
 bin/
 
 *.exe
-*.zip
+*.zip

README.md

@@ -23,20 +23,23 @@ cloudsqlctl [command] [options]
 
 ### Commands
 
-| Command   | Description                                              |
-| :-------- | :------------------------------------------------------- |
-| `install` | Download and install the Cloud SQL Proxy binary.         |
-| `update`  | Update the Cloud SQL Proxy binary to the latest version. |
-| `list`    | List available Cloud SQL instances.                      |
-| `select`  | Interactively select a Cloud SQL instance to proxy.      |
-| `connect` | Connect to a specific instance directly.                 |
-| `start`   | Start the proxy for the selected instance.               |
-| `stop`    | Stop the running proxy process.                          |
-| `restart` | Restart the proxy process.                               |
-| `status`  | Check if the proxy is running and view details.          |
-| `logs`    | View the tail of the proxy logs.                         |
-| `doctor`  | Run diagnostics to verify environment setup.             |
-| `reset`   | Reset configuration and remove local files.              |
+| Command   | Description                                                   |
+| :-------- | :------------------------------------------------------------ |
+| `install` | Download and install the Cloud SQL Proxy binary (User scope). |
+| `update`  | Update the Cloud SQL Proxy binary to the latest version.      |
+| `list`    | List available Cloud SQL instances.                           |
+| `select`  | Interactively select a Cloud SQL instance to proxy.           |
+| `connect` | Connect to a specific instance directly.                      |
+| `start`   | Start the proxy for the selected instance.                    |
+| `stop`    | Stop the running proxy process.                               |
+| `service` | Manage Windows Service (Admin required).                      |
+| `env`     | Manage environment variables (User/Machine scope).            |
+| `gcloud`  | Manage Google Cloud CLI (install portable version).           |
+| `restart` | Restart the proxy process.                                    |
+| `status`  | Check if the proxy is running and view details.               |
+| `logs`    | View the tail of the proxy logs.                              |
+| `doctor`  | Run diagnostics to verify environment setup.                  |
+| `reset`   | Reset configuration and remove local files.                   |
 
 ### Example
 

bin/cloudsqlctl.exe

@@ -2,14 +2,14 @@
   "name": "cloudsqlctl",
   "version": "0.2.0",
   "description": "Windows-native CLI tool that installs, updates, and manages Google Cloud SQL Auth Proxy via gcloud CLI.",
-  "main": "dist/cli.js",
+  "main": "dist/cli.cjs",
   "type": "module",
   "bin": {
-    "cloudsqlctl": "./dist/cli.js"
+    "cloudsqlctl": "./dist/cli.cjs"
   },
   "scripts": {
     "build": "tsup src/cli.ts --format cjs --minify --out-dir dist --no-splitting",
-    "package": "pkg dist/cli.js --targets node20-win-x64 --output bin/cloudsqlctl.exe",
+    "package": "npm run build && powershell -ExecutionPolicy Bypass -File tools/build-sea.ps1",
     "zip": "powershell -Command \"Get-ChildItem -Path . -Force | Where-Object { $_.Name -notin 'node_modules', 'dist', 'bin', 'coverage', '.git', '.vs', '.DS_Store' -and $_.Extension -notin '.zip', '.exe', '.log' } | Compress-Archive -DestinationPath cloudsqlctl.zip -Force\"",
     "lint": "eslint src",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --passWithNoTests",

package.json

@@ -11,10 +11,12 @@ import { statusCommand } from './commands/status.js';
 import { logsCommand } from './commands/logs.js';
 import { doctorCommand } from './commands/doctor.js';
 import { resetCommand } from './commands/reset.js';
-import { setenvCommand } from './commands/setenv.js';
+import { envCommand } from './commands/env.js';
+import { serviceCommand } from './commands/service.js';
 import { ps1Command } from './commands/ps1.js';
 import { repairCommand } from './commands/repair.js';
 import { checkCommand } from './commands/check.js';
+import { gcloudCommand } from './commands/gcloud.js';
 import { logger } from './core/logger.js';
 
 const program = new Command();
@@ -35,10 +37,12 @@ program.addCommand(statusCommand);
 program.addCommand(logsCommand);
 program.addCommand(doctorCommand);
 program.addCommand(resetCommand);
-program.addCommand(setenvCommand);
+program.addCommand(envCommand);
+program.addCommand(serviceCommand);
 program.addCommand(ps1Command);
 program.addCommand(repairCommand);
 program.addCommand(checkCommand);
+program.addCommand(gcloudCommand);
 
 program.parseAsync(process.argv).catch(err => {
     logger.error('Unhandled error', err);

src/cli.ts

@@ -0,0 +1,20 @@
+import { Command } from 'commander';
+import { setupEnvironment } from '../system/env.js';
+import { logger } from '../core/logger.js';
+
+export const envCommand = new Command('env')
+    .description('Manage environment variables');
+
+envCommand.command('set')
+    .description('Set environment variables')
+    .option('--scope <scope>', 'Scope of environment variables (User|Machine)', 'User')
+    .action(async (options) => {
+        try {
+            const scope = options.scope === 'Machine' ? 'Machine' : 'User';
+            await setupEnvironment(scope);
+            logger.info('Environment variables set successfully.');
+        } catch (error) {
+            logger.error('Failed to set environment variables', error);
+            process.exit(1);
+        }
+    });

src/commands/env.ts

@@ -0,0 +1,79 @@
+import { Command } from 'commander';
+import { checkGcloudInstalled, getActiveAccount } from '../core/gcloud.js';
+import { logger } from '../core/logger.js';
+import { readConfig, writeConfig } from '../core/config.js';
+import { PATHS } from '../system/paths.js';
+import fs from 'fs-extra';
+import path from 'path';
+import axios from 'axios';
+import { execa } from 'execa';
+
+// Official Google Cloud SDK download URL pattern
+const GCLOUD_DOWNLOAD_URL = 'https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-windows-x86_64.zip';
+
+export const gcloudCommand = new Command('gcloud')
+    .description('Manage Google Cloud CLI');
+
+gcloudCommand.command('status')
+    .description('Check gcloud CLI status')
+    .action(async () => {
+        const config = await readConfig();
+        logger.info(`Configured gcloud path: ${config.gcloudPath || '(default)'}`);
+
+        const installed = await checkGcloudInstalled();
+        if (installed) {
+            logger.info('✅ gcloud CLI is installed and reachable.');
+            const account = await getActiveAccount();
+            logger.info(`Active account: ${account || 'None'}`);
+        } else {
+            logger.warn('❌ gcloud CLI is NOT installed or not found.');
+        }
+    });
+
+gcloudCommand.command('install')
+    .description('Install portable Google Cloud CLI')
+    .action(async () => {
+        try {
+            logger.info('Installing portable Google Cloud CLI...');
+            await fs.ensureDir(PATHS.GCLOUD_DIR);
+
+            const zipPath = path.join(PATHS.TEMP, 'google-cloud-sdk.zip');
+            await fs.ensureDir(PATHS.TEMP);
+
+            logger.info(`Downloading from ${GCLOUD_DOWNLOAD_URL}...`);
+            const response = await axios({
+                url: GCLOUD_DOWNLOAD_URL,
+                method: 'GET',
+                responseType: 'stream'
+            });
+
+            const writer = fs.createWriteStream(zipPath);
+            response.data.pipe(writer);
+
+            await new Promise<void>((resolve, reject) => {
+                writer.on('finish', () => resolve());
+                writer.on('error', reject);
+            });
+
+            logger.info('Extracting...');
+            // Use PowerShell to extract
+            await execa('powershell', ['-Command', `Expand-Archive -Path "${zipPath}" -DestinationPath "${PATHS.GCLOUD_DIR}" -Force`]);
+
+            const gcloudExe = path.join(PATHS.GCLOUD_DIR, 'google-cloud-sdk', 'bin', 'gcloud.cmd');
+
+            if (await fs.pathExists(gcloudExe)) {
+                logger.info(`gcloud installed to ${gcloudExe}`);
+                await writeConfig({ gcloudPath: gcloudExe });
+                logger.info('Configuration updated.');
+            } else {
+                throw new Error('gcloud.cmd not found after extraction');
+            }
+
+            // Cleanup
+            await fs.remove(zipPath);
+
+        } catch (error) {
+            logger.error('Failed to install gcloud', error);
+            process.exit(1);
+        }
+    });

src/commands/gcloud.ts

@@ -2,12 +2,9 @@ import { Command } from 'commander';
 import { getLatestVersion, downloadProxy } from '../core/updater.js';
 import { logger } from '../core/logger.js';
 import { isRunning, stopProxy } from '../core/proxy.js';
-import { setupEnvironment } from '../system/env.js';
-import { generateScripts } from '../system/ps1.js';
-import { installService } from '../system/service.js';
 
 export const installCommand = new Command('install')
-    .description('Download and install Cloud SQL Proxy, setup environment and service')
+    .description('Download and install Cloud SQL Proxy')
     .option('-v, --version <version>', 'Specific version to install')
     .action(async (options) => {
         try {
@@ -24,16 +21,7 @@ export const installCommand = new Command('install')
             logger.info(`Installing Cloud SQL Proxy version ${version}...`);
             await downloadProxy(version);
 
-            logger.info('Setting up environment variables...');
-            await setupEnvironment();
-
-            logger.info('Generating PowerShell scripts...');
-            await generateScripts();
-
-            logger.info('Installing Windows Service...');
-            await installService();
-
-            logger.info('Installation and setup successful.');
+            logger.info('Installation successful.');
         } catch (error) {
             logger.error('Installation failed', error);
             process.exit(1);