fix: fix cos error convert, add test for convert (#188)

* fix: fix cos error convert, add test for convert

* fix: fix cos test name

* fix: fix test of invalid cos name

Author: wwwzbwcom

__tests__/cos.test.ts

@@ -1,3 +1,4 @@
+import { convertCosError } from './../src/modules/cos/index';
 import { CosDeployInputs, CosWebsiteInputs } from './../src/modules/cos/interface';
 import { Cos } from '../src';
 import path from 'path';
@@ -75,10 +76,33 @@ describe('Cos', () => {
       const res = await cos.deploy({ ...inputs, bucket: '1234567890' });
       expect(res).toBe(undefined);
     } catch (err) {
+      console.log(JSON.stringify(err));
       expect(err.type).toBe('API_COS_putBucket');
     }
   });
 
+  test('should convert error correct', async () => {
+    expect(
+      convertCosError({
+        message: 'message',
+      }).message,
+    ).toBe('message');
+
+    expect(
+      convertCosError({
+        error: 'message',
+      }).message,
+    ).toBe('message');
+
+    expect(
+      convertCosError({
+        error: {
+          Message: 'message',
+        },
+      }).message,
+    ).toBe('message');
+  });
+
   test('should deploy Cos success', async () => {
     const res = await cos.deploy(inputs);
     await sleep(1000);
@@ -88,6 +112,15 @@ describe('Cos', () => {
     expect(data).toMatch(/Serverless\sFramework/gi);
   });
 
+  test('should deploy Cos success again (update)', async () => {
+    const res = await cos.deploy(inputs);
+    await sleep(1000);
+    const reqUrl = `https://${bucket}.cos.${process.env.REGION}.myqcloud.com/index.html`;
+    const { data } = await axios.get(reqUrl);
+    expect(res).toEqual(inputs);
+    expect(data).toMatch(/Serverless\sFramework/gi);
+  });
+
   test('should Cos getObjectUrl success', async () => {
     const res = await cos.getObjectUrl({
       bucket,

src/modules/cos/index.ts

@@ -35,28 +35,37 @@ import fs from 'fs';
 import { traverseDirSync } from '../../utils';
 import { ApiTypeError, ApiError } from '../../utils/error';
 
-interface CosError {
-  error?: {
-    Code?: string;
-    Message?: string;
-    Stack?: string;
-    RequestId?: string;
-  };
+export interface CosError {
+  error?:
+    | {
+        Code?: string;
+        Message?: string;
+        Stack?: string;
+        RequestId?: string;
+      }
+    | string;
   code?: string;
   message?: string;
   stack?: string;
   requestId?: string;
 }
 
 /** 将 Cos error 转为统一的形式 */
-function convertCosError(err: CosError) {
-  const e = {
+export function convertCosError(err: CosError) {
+  if (typeof err.error === 'string') {
+    return {
+      code: err.code!,
+      message: err.message! ?? err.error,
+      stack: err?.stack,
+      reqId: err?.requestId,
+    };
+  }
+  return {
     code: err?.error?.Code ?? err.code!,
     message: err?.error?.Message ?? err.message!,
     stack: err?.stack ?? err?.error?.Stack!,
     reqId: err?.error?.RequestId ?? err.requestId!,
   };
-  return e;
 }
 
 function constructCosError(