Add new commands for environment setup, service management, and system checks; enhance existing commands and update scripts

Kinin-Code-Offical · Kinin-Code-Offical · commit e4b0570e1b48 · 2025-12-21T00:51:45.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ coverage/
 bin/
 
 *.exe
+*.zip
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
   },
   "scripts": {
     "build": "tsup src/cli.ts --format cjs --minify --out-dir dist --no-splitting",
-    "package": "powershell -ExecutionPolicy Bypass -File tools/build-sea.ps1",
+    "package": "pkg dist/cli.js --targets node20-win-x64 --output bin/cloudsqlctl.exe",
+    "zip": "powershell -Command \"Get-ChildItem -Path src, tests, tools, package.json, tsconfig.json, tsup.config.ts, jest.config.ts, .gitignore, eslint.config.mjs, LICENSE, *.md -ErrorAction SilentlyContinue | Compress-Archive -DestinationPath cloudsqlctl.zip -Force\"",
     "lint": "eslint src",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --passWithNoTests",
     "prepare": "husky install"
diff --git a/src/cli.ts b/src/cli.ts
@@ -11,6 +11,10 @@ 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 { ps1Command } from './commands/ps1.js';
+import { repairCommand } from './commands/repair.js';
+import { checkCommand } from './commands/check.js';
 import { logger } from './core/logger.js';
 
 const program = new Command();
@@ -31,6 +35,10 @@ program.addCommand(statusCommand);
 program.addCommand(logsCommand);
 program.addCommand(doctorCommand);
 program.addCommand(resetCommand);
+program.addCommand(setenvCommand);
+program.addCommand(ps1Command);
+program.addCommand(repairCommand);
+program.addCommand(checkCommand);
 
 program.parseAsync(process.argv).catch(err => {
     logger.error('Unhandled error', err);
diff --git a/src/commands/check.ts b/src/commands/check.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander';
+import { checkEnvironment } from '../system/env.js';
+import { isServiceInstalled, isServiceRunning } from '../system/service.js';
+import { SYSTEM_PATHS } from '../system/paths.js';
+import fs from 'fs-extra';
+import { logger } from '../core/logger.js';
+
+export const checkCommand = new Command('check')
+    .description('Verify full system configuration')
+    .action(async () => {
+        try {
+            logger.info('Checking system configuration...');
+
+            const envOk = await checkEnvironment();
+            logger.info(`Environment Variables: ${envOk ? 'OK' : 'MISSING/INCORRECT'}`);
+
+            const binaryOk = await fs.pathExists(SYSTEM_PATHS.PROXY_EXE);
+            logger.info(`Proxy Binary: ${binaryOk ? 'OK' : 'MISSING'}`);
+
+            const serviceInstalled = await isServiceInstalled();
+            logger.info(`Service Installed: ${serviceInstalled ? 'YES' : 'NO'}`);
+
+            if (serviceInstalled) {
+                const serviceRunning = await isServiceRunning();
+                logger.info(`Service Running: ${serviceRunning ? 'YES' : 'NO'}`);
+            }
+
+            if (envOk && binaryOk && serviceInstalled) {
+                logger.info('System check passed.');
+            } else {
+                logger.warn('System check failed. Run "cloudsqlctl repair" to fix.');
+                process.exit(1);
+            }
+        } catch (error) {
+            logger.error('Check failed', error);
+            process.exit(1);
+        }
+    });
diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
@@ -1,6 +1,10 @@
 import { Command } from 'commander';
 import { logger } from '../core/logger.js';
 import { checkGcloudInstalled, getActiveAccount } from '../core/gcloud.js';
+import { checkEnvironment } from '../system/env.js';
+import { isServiceInstalled } from '../system/service.js';
+import { SYSTEM_PATHS } from '../system/paths.js';
+import fs from 'fs-extra';
 import axios from 'axios';
 
 export const doctorCommand = new Command('doctor')
@@ -24,6 +28,28 @@ export const doctorCommand = new Command('doctor')
             logger.warn('⚠️ No active gcloud account found. Run "gcloud auth login"');
         }
 
+        // Check Environment Variables
+        const envOk = await checkEnvironment();
+        if (envOk) {
+            logger.info('✅ System Environment Variables are correct');
+        } else {
+            logger.warn('⚠️ System Environment Variables are missing or incorrect');
+        }
+
+        // Check Proxy Binary
+        if (await fs.pathExists(SYSTEM_PATHS.PROXY_EXE)) {
+            logger.info('✅ Cloud SQL Proxy binary found');
+        } else {
+            logger.error('❌ Cloud SQL Proxy binary NOT found');
+        }
+
+        // Check Service
+        if (await isServiceInstalled()) {
+            logger.info('✅ Windows Service is installed');
+        } else {
+            logger.info('ℹ️ Windows Service is NOT installed (Optional)');
+        }
+
         // Check Network (GitHub API)
         try {
             await axios.get('https://api.github.com');
diff --git a/src/commands/install.ts b/src/commands/install.ts
@@ -2,9 +2,12 @@ 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')
+    .description('Download and install Cloud SQL Proxy, setup environment and service')
     .option('-v, --version <version>', 'Specific version to install')
     .action(async (options) => {
         try {
@@ -20,7 +23,17 @@ export const installCommand = new Command('install')
             }
             logger.info(`Installing Cloud SQL Proxy version ${version}...`);
             await downloadProxy(version);
-            logger.info('Installation successful.');
+
+            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.');
         } catch (error) {
             logger.error('Installation failed', error);
             process.exit(1);
diff --git a/src/commands/ps1.ts b/src/commands/ps1.ts
@@ -0,0 +1,18 @@
+import { Command } from 'commander';
+import { generateScripts } from '../system/ps1.js';
+import { logger } from '../core/logger.js';
+
+export const ps1Command = new Command('ps1')
+    .description('Manage PowerShell scripts');
+
+ps1Command.command('generate')
+    .description('Generate management PowerShell scripts')
+    .action(async () => {
+        try {
+            await generateScripts();
+            logger.info('PowerShell scripts generated successfully.');
+        } catch (error) {
+            logger.error('Failed to generate scripts', error);
+            process.exit(1);
+        }
+    });
diff --git a/src/commands/repair.ts b/src/commands/repair.ts
@@ -0,0 +1,14 @@
+import { Command } from 'commander';
+import { selfHeal } from '../system/selfheal.js';
+import { logger } from '../core/logger.js';
+
+export const repairCommand = new Command('repair')
+    .description('Self-heal missing or corrupted files and configurations')
+    .action(async () => {
+        try {
+            await selfHeal();
+        } catch (error) {
+            logger.error('Repair failed', error);
+            process.exit(1);
+        }
+    });
diff --git a/src/commands/setenv.ts b/src/commands/setenv.ts
@@ -0,0 +1,15 @@
+import { Command } from 'commander';
+import { setupEnvironment } from '../system/env.js';
+import { logger } from '../core/logger.js';
+
+export const setenvCommand = new Command('setenv')
+    .description('Create system-wide environment variables')
+    .action(async () => {
+        try {
+            await setupEnvironment();
+            logger.info('Environment variables set successfully.');
+        } catch (error) {
+            logger.error('Failed to set environment variables', error);
+            process.exit(1);
+        }
+    });
diff --git a/src/commands/status.ts b/src/commands/status.ts
@@ -2,21 +2,37 @@ import { Command } from 'commander';
 import { isRunning } from '../core/proxy.js';
 import { logger } from '../core/logger.js';
 import { readConfig } from '../core/config.js';
+import { isServiceInstalled, isServiceRunning } from '../system/service.js';
 
 export const statusCommand = new Command('status')
-    .description('Check the status of the Cloud SQL Proxy')
+    .description('Check the status of the Cloud SQL Proxy and Service')
     .action(async () => {
         try {
-            const running = await isRunning();
+            const processRunning = await isRunning();
+            const serviceInstalled = await isServiceInstalled();
+            const serviceRunning = serviceInstalled ? await isServiceRunning() : false;
             const config = await readConfig();
 
-            if (running) {
-                logger.info('Proxy is RUNNING');
+            logger.info('--- Status ---');
+
+            if (serviceInstalled) {
+                logger.info(`Service: ${serviceRunning ? 'RUNNING' : 'STOPPED'}`);
+            } else {
+                logger.info('Service: NOT INSTALLED');
+            }
+
+            if (processRunning) {
+                logger.info('Process: RUNNING');
                 logger.info(`Instance: ${config.selectedInstance || 'Unknown'}`);
                 logger.info(`Port: ${config.proxyPort || 5432}`);
             } else {
-                logger.info('Proxy is STOPPED');
+                logger.info('Process: STOPPED');
             }
+
+            if (!processRunning && !serviceRunning) {
+                logger.info('Cloud SQL Proxy is not active.');
+            }
+
         } catch (error) {
             logger.error('Failed to check status', error);
             process.exit(1);
diff --git a/src/commands/stop.ts b/src/commands/stop.ts
@@ -1,14 +1,21 @@
 import { Command } from 'commander';
 import { stopProxy } from '../core/proxy.js';
 import { logger } from '../core/logger.js';
+import { isServiceRunning, stopService } from '../system/service.js';
 
 export const stopCommand = new Command('stop')
-    .description('Stop the Cloud SQL Proxy')
+    .description('Stop the Cloud SQL Proxy or Service')
     .action(async () => {
         try {
-            logger.info('Stopping proxy...');
-            await stopProxy();
-            logger.info('Proxy stopped.');
+            if (await isServiceRunning()) {
+                logger.info('Stopping Cloud SQL Proxy Service...');
+                await stopService();
+                logger.info('Service stopped.');
+            } else {
+                logger.info('Stopping proxy process...');
+                await stopProxy();
+                logger.info('Proxy stopped.');
+            }
         } catch (error) {
             logger.error('Failed to stop proxy', error);
             process.exit(1);
diff --git a/src/core/updater.ts b/src/core/updater.ts
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import fs from 'fs-extra';
 import crypto from 'crypto';
-import { PATHS } from './config.js';
+import { SYSTEM_PATHS } from '../system/paths.js';
 import { logger } from './logger.js';
 
 const GITHUB_REPO = 'GoogleCloudPlatform/cloud-sql-proxy';
@@ -63,8 +63,8 @@ export async function downloadProxy(version: string) {
 
     logger.info(`Downloading Cloud SQL Proxy ${version} from ${downloadUrl}`);
 
-    await fs.ensureDir(PATHS.BIN_DIR);
-    const tempFile = `${PATHS.PROXY_EXE}.temp`;
+    await fs.ensureDir(SYSTEM_PATHS.BIN);
+    const tempFile = `${SYSTEM_PATHS.PROXY_EXE}.temp`;
     const writer = fs.createWriteStream(tempFile);
 
     const response = await axios({
@@ -108,6 +108,6 @@ export async function downloadProxy(version: string) {
         }
     }
 
-    await fs.move(tempFile, PATHS.PROXY_EXE, { overwrite: true });
+    await fs.move(tempFile, SYSTEM_PATHS.PROXY_EXE, { overwrite: true });
     logger.info('Installation successful');
 }
diff --git a/src/system/env.ts b/src/system/env.ts
@@ -0,0 +1,32 @@
+import { runPs, isAdmin } from './powershell.js';
+import { SYSTEM_PATHS, ENV_VARS } from './paths.js';
+import { logger } from '../core/logger.js';
+
+export async function setSystemEnv(name: string, value: string) {
+    if (!await isAdmin()) {
+        throw new Error('Admin privileges required to set system environment variables.');
+    }
+    logger.info(`Setting system environment variable: ${name}=${value}`);
+    await runPs(`[Environment]::SetEnvironmentVariable("${name}", "${value}", "Machine")`);
+}
+
+export async function setupEnvironment() {
+    logger.info('Configuring system environment variables...');
+
+    await setSystemEnv(ENV_VARS.HOME, SYSTEM_PATHS.HOME);
+    await setSystemEnv(ENV_VARS.LOGS, SYSTEM_PATHS.LOGS);
+    await setSystemEnv(ENV_VARS.PROXY_PATH, SYSTEM_PATHS.PROXY_EXE);
+
+    // We don't overwrite GOOGLE_APPLICATION_CREDENTIALS if it exists, but we could ensure it points to a standard location if needed.
+    // For now, we'll leave it as user-managed or set it if missing and we have a default.
+}
+
+export async function checkEnvironment(): Promise<boolean> {
+    const home = await runPs(`[Environment]::GetEnvironmentVariable("${ENV_VARS.HOME}", "Machine")`);
+    const logs = await runPs(`[Environment]::GetEnvironmentVariable("${ENV_VARS.LOGS}", "Machine")`);
+    const proxy = await runPs(`[Environment]::GetEnvironmentVariable("${ENV_VARS.PROXY_PATH}", "Machine")`);
+
+    return home === SYSTEM_PATHS.HOME &&
+        logs === SYSTEM_PATHS.LOGS &&
+        proxy === SYSTEM_PATHS.PROXY_EXE;
+}
diff --git a/src/system/paths.ts b/src/system/paths.ts
@@ -0,0 +1,26 @@
+import path from 'path';
+import os from 'os';
+
+const PROGRAM_DATA = process.env.ProgramData || 'C:\\ProgramData';
+const APP_DATA = process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
+const LOCAL_APP_DATA = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+
+export const SYSTEM_PATHS = {
+    HOME: path.join(PROGRAM_DATA, 'CloudSQLCTL'),
+    LOGS: path.join(PROGRAM_DATA, 'CloudSQLCTL', 'logs'),
+    BIN: path.join(PROGRAM_DATA, 'CloudSQLCTL', 'bin'),
+    PROXY_EXE: path.join(PROGRAM_DATA, 'CloudSQLCTL', 'cloud_sql_proxy.exe'),
+    USER_CONFIG_DIR: path.join(APP_DATA, 'CloudSQLCTL'),
+    USER_CONFIG_FILE: path.join(APP_DATA, 'CloudSQLCTL', 'config.json'),
+    TEMP: path.join(LOCAL_APP_DATA, 'CloudSQLCTL', 'temp'),
+    SCRIPTS: path.join(PROGRAM_DATA, 'CloudSQLCTL', 'scripts')
+};
+
+export const ENV_VARS = {
+    HOME: 'CLOUDSQLCTL_HOME',
+    LOGS: 'CLOUDSQLCTL_LOGS',
+    PROXY_PATH: 'CLOUDSQLCTL_PROXY_PATH',
+    GOOGLE_CREDS: 'GOOGLE_APPLICATION_CREDENTIALS'
+};
+
+export const SERVICE_NAME = 'cloudsql-proxy';
diff --git a/src/system/powershell.ts b/src/system/powershell.ts
@@ -0,0 +1,31 @@
+import { execa } from 'execa';
+import { logger } from '../core/logger.js';
+
+export async function runPs(command: string): Promise<string> {
+    try {
+        const { stdout } = await execa('powershell', ['-NoProfile', '-NonInteractive', '-Command', command]);
+        return stdout.trim();
+    } catch (error: any) {
+        logger.debug(`PowerShell command failed: ${command}`, error);
+        throw error;
+    }
+}
+
+export async function isAdmin(): Promise<boolean> {
+    try {
+        // 'net session' only works with admin privileges
+        await execa('net', ['session'], { stdio: 'ignore' });
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+export async function getEnvVar(name: string, scope: 'Machine' | 'User' | 'Process' = 'Machine'): Promise<string | null> {
+    try {
+        const val = await runPs(`[Environment]::GetEnvironmentVariable("${name}", "${scope}")`);
+        return val || null;
+    } catch {
+        return null;
+    }
+}
diff --git a/src/system/ps1.ts b/src/system/ps1.ts
diff --git a/src/system/selfheal.ts b/src/system/selfheal.ts
diff --git a/src/system/service.ts b/src/system/service.ts
diff --git a/tests/gcloud.test.ts b/tests/gcloud.test.ts
diff --git a/tests/system.test.ts b/tests/system.test.ts

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@ coverage/`
`8`	`8`	`bin/`
`9`	`9`
`10`	`10`	`*.exe`
	`11`	`+*.zip`