Fix cvm upgrade compatible for dstack v05x (#59)

Author: Leechael

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phala",
-  "version": "1.0.27",
+  "version": "1.0.34",
   "description": "CLI for Managing Phala Cloud Services",
   "author": {
     "name": "Phala Network",

src/api/cvms.ts

@@ -199,14 +199,10 @@ export async function restartCvm(appId: string): Promise<PostCvmResponse> {
  * @returns Upgrade response
  */
 export async function upgradeCvm(appId: string, vmConfig: VMConfig): Promise<UpgradeCvmResponse> {
-  try {
-    const apiKey = getApiKey();
-    const apiClient = createClient({ apiKey: apiKey });
-    const response = await apiClient.put<UpgradeCvmResponse>(API_ENDPOINTS.CVM_UPGRADE(appId), vmConfig);
-    return upgradeCvmResponseSchema.parse(response);
-  } catch (error) {
-    throw new Error(`Failed to upgrade CVM: ${error instanceof Error ? error.message : String(error)}`);
-  }
+  const apiKey = getApiKey();
+  const apiClient = createClient({ apiKey: apiKey });
+  const response = await apiClient.put<UpgradeCvmResponse>(API_ENDPOINTS.CVM_UPGRADE(appId), vmConfig);
+  return upgradeCvmResponseSchema.parse(response);
 }
 
 /**

src/commands/cvms/upgrade.ts

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { FetchError } from 'ofetch';
 import { upgradeCvm, getCvmByAppId } from '@/src/api/cvms';
 import { logger } from '@/src/utils/logger';
 import fs from 'node:fs';
@@ -44,6 +45,7 @@ export const upgradeCommand = new Command()
 
       // Update Docker Compose file if provided
       let composeString = '';
+      let env_keys = [];
       if (options.compose) {
         try {
           composeString = fs.readFileSync(options.compose, 'utf8');
@@ -74,6 +76,7 @@ export const upgradeCommand = new Command()
           try {
             envs = parseEnv([], options.envFile);
             encrypted_env = await encryptEnvVars(envs, currentCvm.encrypted_env_pubkey);
+            env_keys = envs.map(i => i.key)
           } catch (error) {
             logger.error(`Failed to read environment file: ${error instanceof Error ? error.message : String(error)}`);
             process.exit(1);
@@ -90,9 +93,11 @@ export const upgradeCommand = new Command()
           version: "1.0.0",
           features: ["kms", "tproxy-net"],
           name: `app_${resolvedAppId}`,
+          allowed_envs: env_keys,
         },
         encrypted_env,
         allow_restart: true,
+        env_keys: env_keys,
       };
 
       // Upgrade the CVM
@@ -116,6 +121,28 @@ export const upgradeCommand = new Command()
       );
     } catch (error) {
       logger.error(`Failed to upgrade CVM: ${error instanceof Error ? error.message : String(error)}`);
+
+      // Multiple ways to check if it's a FetchError:
+      // 1. instanceof check (standard but may fail due to module loading)
+      // 2. Check constructor.name (works across module boundaries)
+      // 3. Check for FetchError-specific properties (status, statusText, data, request)
+      const isFetchError = error instanceof FetchError ||
+        (error as any)?.constructor?.name === 'FetchError' ||
+        (error && typeof error === 'object' && 'status' in error && 'statusText' in error && 'data' in error);
+
+      if (isFetchError) {
+        const fetchError = error as FetchError;
+        logger.error('=== HTTP Error Details ===');
+        logger.error('Status:', fetchError.status);
+        logger.error('Status Text:', fetchError.statusText);
+        logger.error('URL:', fetchError.request);
+        logger.error('Response Body:', JSON.stringify(fetchError.data, null, 2));
+        if (options.debug) {
+          logger.error('Full Error Object:', error);
+        }
+      } else if (options.debug) {
+        logger.error('Full Error:', error);
+      }
       process.exit(1);
     }
   }); 

src/commands/deploy/index.ts

@@ -531,6 +531,11 @@ const updateCvm = async (validatedOptions: Options, docker_compose_yml: string,
     app_compose: app_compose as ProvisionCvmComposeFileUpdateRequest["app_compose"],
   });
   if (!provision_result.success) {
+    if ("isRequestError" in provision_result.error) {
+      console.error('HTTP Error:', provision_result.error.status, provision_result.error.statusText);
+      console.error('Error message:', provision_result.error.message);
+      console.error('Response body:', JSON.stringify(provision_result.error.data, null, 2));
+    }
     throw new Error(`Failed to provision cvm compose file: ${provision_result.error.message}`);
   }
   const provision = provision_result.data as any;
@@ -571,6 +576,11 @@ const updateCvm = async (validatedOptions: Options, docker_compose_yml: string,
   const commitResult = await safeCommitCvmComposeFileUpdate(client, data);
 
   if (!commitResult.success) {
+    if ("isRequestError" in commitResult.error) {
+      console.error('HTTP Error:', commitResult.error.status, commitResult.error.statusText);
+      console.error('Error message:', commitResult.error.message);
+      console.error('Response body:', JSON.stringify(commitResult.error.data, null, 2));
+    }
     throw new Error(`Failed to commit CVM compose file update: ${commitResult.error.message}`);
   }
   if (validatedOptions?.json !== false) {