refactor: update checksum handling and improve download logic; add extract-zip for file extraction

Author: Kinin-Code-Offical

artifacts/SHA256SUMS.txt

@@ -1 +1,2 @@
-cc7a6dce911bcc4778a8e8f315428dcf1f42d21a29240cbc94849ea85309ad63  cloudsqlctl.exe
+fba808877110583ee067cfa9d19144c42ce8d8d8675a654b17a98c5b204b5567  cloudsqlctl-setup.exe
+d2427408dcbed72aa00a28fdfb55325ecb5ab847d1d7e23cdb8abef900308d12  cloudsqlctl.exe

bin/cloudsqlctl.exe

@@ -117,7 +117,7 @@ begin
   begin
     // Copy to Common AppData
     ForceDirectories(ExpandConstant('{commonappdata}\CloudSQLCTL\bin'));
-    if FileCopy(UserBin, CommonBin, False) then
+    if CopyFile(UserBin, CommonBin, False) then
     begin
       Result := CommonBin;
       exit;

installer/cloudsqlctl.iss

@@ -36,11 +36,13 @@
     "commander": "^12.0.0",
     "conf": "^15.0.2",
     "execa": "^9.6.1",
+    "extract-zip": "2.0.1",
     "fs-extra": "^11.2.0",
     "inquirer": "^9.2.15",
     "winston": "^3.11.0"
   },
   "devDependencies": {
+    "@types/extract-zip": "2.0.0",
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.12",

package-lock.json

@@ -21,17 +21,13 @@ import { authCommand } from './commands/auth.js';
 import { setupCommand } from './commands/setup.js';
 import { pathsCommand } from './commands/paths.js';
 import { logger } from './core/logger.js';
-import { createRequire } from 'module';
-
-const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
 
 const program = new Command();
 
 program
     .name('cloudsqlctl')
     .description('CLI for managing Google Cloud SQL Auth Proxy')
-    .version(pkg.version);
+    .version(process.env.CLOUDSQLCTL_VERSION ?? '0.0.0');
 
 program.addCommand(installCommand);
 program.addCommand(updateCommand);

package.json

@@ -6,7 +6,7 @@ import { PATHS } from '../system/paths.js';
 import fs from 'fs-extra';
 import path from 'path';
 import axios from 'axios';
-import { execa } from 'execa';
+import extract from 'extract-zip';
 
 // 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';
@@ -55,9 +55,9 @@ gcloudCommand.command('install')
                 writer.on('error', reject);
             });
 
-            logger.info('Extracting...');
-            // Use PowerShell to extract
-            await execa('powershell', ['-Command', `Expand-Archive -Path "${zipPath}" -DestinationPath "${PATHS.GCLOUD_DIR}" -Force`]);
+            logger.info('Extracting (this may take a moment)...');
+            // Use extract-zip for faster and reliable extraction
+            await extract(zipPath, { dir: PATHS.GCLOUD_DIR });
 
             const gcloudExe = path.join(PATHS.GCLOUD_DIR, 'google-cloud-sdk', 'bin', 'gcloud.cmd');
 

src/cli.ts

@@ -35,27 +35,25 @@ async function verifyChecksum(filePath: string, expectedChecksum: string): Promi
 
 export async function downloadProxy(version: string, targetPath: string = PATHS.PROXY_EXE) {
     let downloadUrl: string | undefined;
-    let checksumUrl: string | undefined;
+    let expectedChecksum: string | undefined;
 
     try {
         const releaseUrl = `https://api.github.com/repos/${GITHUB_REPO}/releases/tags/${version}`;
         const response = await axios.get(releaseUrl);
-        const assets = response.data.assets;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const asset = assets.find((a: any) => a.name === ASSET_NAME);
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const checksumAsset = assets.find((a: any) => a.name === CHECKSUM_ASSET_NAME);
-
-        if (asset) {
-            downloadUrl = asset.browser_download_url;
-        }
 
-        if (checksumAsset) {
-            checksumUrl = checksumAsset.browser_download_url;
-        }
+        // Google Cloud SQL Proxy v2 binaries are hosted on GCS
+        downloadUrl = `https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/${version}/${ASSET_NAME}`;
+
+        // Extract checksum from release body
+        const body = response.data.body;
+        // Regex to match: | [cloud-sql-proxy.x64.exe](...) | <hash> |
+        const checksumRegex = new RegExp(`\\| \\[${ASSET_NAME.replace(/\./g, '\\.')}\\]\\(.*?\\) \\| ([a-f0-9]{64}) \\|`);
+        const match = body.match(checksumRegex);
 
-        if (!downloadUrl) {
-            throw new Error(`Could not find asset ${ASSET_NAME} in release ${version}`);
+        if (match && match[1]) {
+            expectedChecksum = match[1];
+        } else {
+            logger.warn(`Could not extract checksum for ${ASSET_NAME} from release notes.`);
         }
 
         logger.info(`Downloading ${ASSET_NAME} from ${downloadUrl}...`);
@@ -79,11 +77,9 @@ export async function downloadProxy(version: string, targetPath: string = PATHS.
 
         logger.info('Download complete.');
 
-        if (checksumUrl) {
+        if (expectedChecksum) {
             logger.info('Verifying checksum...');
             try {
-                const checksumResponse = await axios.get(checksumUrl);
-                const expectedChecksum = checksumResponse.data.trim().split(' ')[0];
                 const isValid = await verifyChecksum(targetPath, expectedChecksum);
 
                 if (!isValid) {
@@ -96,6 +92,8 @@ export async function downloadProxy(version: string, targetPath: string = PATHS.
                 await fs.remove(targetPath);
                 throw err;
             }
+        } else {
+            logger.warn('Skipping checksum verification (checksum not found).');
         }
 
     } catch (error) {

src/commands/gcloud.ts

@@ -1,4 +1,7 @@
 import { defineConfig } from 'tsup';
+import { readFileSync } from 'fs';
+
+const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf-8'));
 
 export default defineConfig({
     entry: ['src/cli.ts'],
@@ -9,6 +12,10 @@ export default defineConfig({
     dts: false,
     sourcemap: false,
     shims: true,
+    splitting: false,
+    define: {
+        'process.env.CLOUDSQLCTL_VERSION': JSON.stringify(pkg.version),
+    },
     noExternal: [/(.*)/], // Bundle everything
     outExtension({ format }) {
         return {