Gracefully handle system errors while updating a draft extension

packages/app/src/cli/models/extensions/extension-instance.test.ts

@@ -414,7 +414,7 @@ describe('draftMessages', async () => {
     const result = extensionInstance.draftMessages.errorMessage
 
     // Then
-    expect(result).toEqual('Error while deploying updated extension draft')
+    expect(result).toEqual('Error updating extension draft for test-ui-extension')
   })
 
   test('returns no error message when the extension is draftable but configuration', async () => {

packages/app/src/cli/models/extensions/extension-instance.ts

@@ -170,7 +170,7 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
   get draftMessages() {
     if (this.isAppConfigExtension) return {successMessage: undefined, errorMessage: undefined}
     const successMessage = `Draft updated successfully for extension: ${this.localIdentifier}`
-    const errorMessage = `Error while deploying updated extension draft`
+    const errorMessage = `Error updating extension draft for ${this.localIdentifier}`
     return {successMessage, errorMessage}
   }
 

packages/app/src/cli/services/dev/update-extension.test.ts

@@ -278,7 +278,179 @@
         bundlePath: tmpDir,
       })
 
-      expect(stderr.write).toHaveBeenCalledWith('Error while updating drafts: Error1, Error2')
+      expect(stderr.write).toHaveBeenCalledWith('Error updating extension draft for test-ui-extension: Error1, Error2')
+    })
+  })
+
+  test('handles system error with errors array', async () => {
+    const systemError = {
+      errors: [{message: 'Network error'}, {message: 'Timeout error'}],
+    }
+    const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient({
+      updateExtension: (_extensionInput: ExtensionUpdateDraftMutationVariables) => Promise.reject(systemError),
+    })
+
+    await inTemporaryDirectory(async (tmpDir) => {
+      const mockExtension = await testUIExtension({
+        devUUID: '1',
+        directory: tmpDir,
+        type: 'web_pixel_extension',
+        uid: 'uid1',
+      })
+
+      await mkdir(joinPath(tmpDir, 'uid1', 'dist'))
+      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      await writeFile(outputPath, 'test content')
+
+      await updateExtensionDraft({
+        extension: mockExtension,
+        developerPlatformClient,
+        apiKey,
+        registrationId,
+        stdout,
+        stderr,
+        appConfiguration: placeholderAppConfiguration,
+        bundlePath: tmpDir,
+      })
+
+      expect(stderr.write).toHaveBeenCalledWith(
+        'Error updating extension draft for test-ui-extension: Network error, Timeout error',
+      )
+    })
+  })
+
+  test('handles system error with message string', async () => {
+    const systemError = {message: 'API connection failed'}
+    const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient({
+      updateExtension: (_extensionInput: ExtensionUpdateDraftMutationVariables) => Promise.reject(systemError),
+    })
+
+    await inTemporaryDirectory(async (tmpDir) => {
+      const mockExtension = await testUIExtension({
+        devUUID: '1',
+        directory: tmpDir,
+        type: 'web_pixel_extension',
+        uid: 'uid1',
+      })
+
+      await mkdir(joinPath(tmpDir, 'uid1', 'dist'))
+      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      await writeFile(outputPath, 'test content')
+
+      await updateExtensionDraft({
+        extension: mockExtension,
+        developerPlatformClient,
+        apiKey,
+        registrationId,
+        stdout,
+        stderr,
+        appConfiguration: placeholderAppConfiguration,
+        bundlePath: tmpDir,
+      })
+
+      expect(stderr.write).toHaveBeenCalledWith(
+        'Error updating extension draft for test-ui-extension: API connection failed',
+      )
+    })
+  })
+
+  test('handles string error', async () => {
+    const systemError = 'Connection timeout'
+    const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient({
+      updateExtension: (_extensionInput: ExtensionUpdateDraftMutationVariables) => Promise.reject(systemError),
+    })
+
+    await inTemporaryDirectory(async (tmpDir) => {
+      const mockExtension = await testUIExtension({
+        devUUID: '1',
+        directory: tmpDir,
+        type: 'web_pixel_extension',
+        uid: 'uid1',
+      })
+
+      await mkdir(joinPath(tmpDir, 'uid1', 'dist'))
+      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      await writeFile(outputPath, 'test content')
+
+      await updateExtensionDraft({
+        extension: mockExtension,
+        developerPlatformClient,
+        apiKey,
+        registrationId,
+        stdout,
+        stderr,
+        appConfiguration: placeholderAppConfiguration,
+        bundlePath: tmpDir,
+      })
+
+      expect(stderr.write).toHaveBeenCalledWith(
+        'Error updating extension draft for test-ui-extension: Connection timeout',
+      )
+    })
+  })
+
+  test('handles null/undefined error with fallback message', async () => {
+    const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient({
+      updateExtension: (_extensionInput: ExtensionUpdateDraftMutationVariables) => Promise.reject(null),
+    })
+
+    await inTemporaryDirectory(async (tmpDir) => {
+      const mockExtension = await testUIExtension({
+        devUUID: '1',
+        directory: tmpDir,
+        type: 'web_pixel_extension',
+        uid: 'uid1',
+      })
+
+      await mkdir(joinPath(tmpDir, 'uid1', 'dist'))
+      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      await writeFile(outputPath, 'test content')
+
+      await updateExtensionDraft({
+        extension: mockExtension,
+        developerPlatformClient,
+        apiKey,
+        registrationId,
+        stdout,
+        stderr,
+        appConfiguration: placeholderAppConfiguration,
+        bundlePath: tmpDir,
+      })
+
+      expect(stderr.write).toHaveBeenCalledWith('Error updating extension draft for test-ui-extension: Unknown error')
+    })
+  })
+
+  test('handles object error without errors or message properties', async () => {
+    const systemError = {status: 500, code: 'INTERNAL_ERROR'}
+    const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient({
+      updateExtension: (_extensionInput: ExtensionUpdateDraftMutationVariables) => Promise.reject(systemError),
+    })
+
+    await inTemporaryDirectory(async (tmpDir) => {
+      const mockExtension = await testUIExtension({
+        devUUID: '1',
+        directory: tmpDir,
+        type: 'web_pixel_extension',
+        uid: 'uid1',
+      })
+
+      await mkdir(joinPath(tmpDir, 'uid1', 'dist'))
+      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      await writeFile(outputPath, 'test content')
+
+      await updateExtensionDraft({
+        extension: mockExtension,
+        developerPlatformClient,
+        apiKey,
+        registrationId,
+        stdout,
+        stderr,
+        appConfiguration: placeholderAppConfiguration,
+        bundlePath: tmpDir,
+      })
+
+      expect(stderr.write).toHaveBeenCalledWith('Error updating extension draft for test-ui-extension: Unknown error')
     })
   })
 })

packages/app/src/cli/services/dev/update-extension.ts

@@ -1,4 +1,7 @@
-import {ExtensionUpdateDraftMutationVariables} from '../../api/graphql/partners/generated/update-draft.js'
+import {
+  ExtensionUpdateDraftMutation,
+  ExtensionUpdateDraftMutationVariables,
+} from '../../api/graphql/partners/generated/update-draft.js'
 import {AppConfigurationWithoutPath} from '../../models/app/app.js'
 import {
   loadConfigurationFileContent,
@@ -71,10 +74,32 @@ export async function updateExtensionDraft({
     registrationId,
   }
 
-  const mutationResult = await developerPlatformClient.updateExtension(extensionInput)
-  if (mutationResult.extensionUpdateDraft?.userErrors && mutationResult.extensionUpdateDraft?.userErrors?.length > 0) {
-    const errors = mutationResult.extensionUpdateDraft.userErrors.map((error) => error.message).join(', ')
-    stderr.write(`Error while updating drafts: ${errors}`)
+  let mutationResult: ExtensionUpdateDraftMutation | undefined
+  let errors: {message: string}[] = []
+  try {
+    mutationResult = await developerPlatformClient.updateExtension(extensionInput)
+    // eslint-disable-next-line no-catch-all/no-catch-all
+  } catch (error: unknown) {
+    errors = [{message: 'Unknown error'}]
+
+    if (error && typeof error === 'object') {
+      const errorObj = error as {errors?: {message: string}[]; message?: string}
+      if (errorObj.errors?.length) {
+        errors = errorObj.errors
+      } else if (errorObj.message) {
+        errors = [{message: errorObj.message}]
+      }
+    } else if (typeof error === 'string') {
+      errors = [{message: error}]
+    }
+  }
+  const userErrors = mutationResult?.extensionUpdateDraft?.userErrors
+  if (userErrors?.length) {
+    errors.push(...userErrors)
+  }
+  if (errors.length > 0) {
+    const errorMessages = errors.map((error: {message: string}) => error.message).join(', ')
+    stderr.write(`${extension.draftMessages.errorMessage}: ${errorMessages}`)
   } else {
     const draftUpdateSuccesMessage = extension.draftMessages.successMessage
     if (draftUpdateSuccesMessage) outputInfo(draftUpdateSuccesMessage, stdout)