release 3.0.10-beta source code for nodejs

Author: Huaweicloud-SDK

CHANGELOG.md

@@ -1,3 +1,62 @@
+# 3.0.10-beta 2021-07-09
+
+### HuaweiCloud SDK Core
+- _feature_
+  - None
+- _Bug Fix_
+  - The response level is incorrect.
+- _Change_
+  - Optimize exception information.
+  
+### HuaweiCloud SDK CCE
+
+- _Features_
+  - Support the interfaces `RemoveNode`,`MigrateNode`.
+- _Bug Fix_
+  - None
+- _Change_
+  - Add the request parameter `tobedeleted` to the interface `DeleteCluster`.
+
+### HuaweiCloud SDK EIP
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - Add the response parameter `publicip_border_group` to the interfaces `CreateSharedBandwidth`,`ListBandwidths`.
+
+### HuaweiCloud SDK IMS
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - Add the response parameters `__root_origin`,`checksum`,`size` to the interfaces `GlanceCreateImageMetadata`.
+  - Remove the request parameters `deleted`, `deleted_at` of the interface `GlanceAddImageMember`, and add the following request parameters:
+    - `__lazyloading`
+    - `__os_feature_list`
+    - `__root_origin`
+    - `__sequence_num`
+    - `__support_agent_list`
+    - `__system__cmkid`
+    - `active_at`
+    - `hw_vif_multiqueue_enabled`
+    - `max_ram`
+    - `__image_location`
+    - `__is_config_init`
+    - `__account_code`
+
+### HuaweiCloud SDK IoTDA
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - Add the response parameters `edge_node_ids`, `last_update_time` to the interface `ListRules`.
+
 # 3.0.9-beta 2021-06-29
 
 ### HuaweiCloud SDK Core

CHANGELOG_CN.md

@@ -1,3 +1,63 @@
+# 3.0.10-beta 2021-07-09
+
+### HuaweiCloud SDK Core
+- _新增特性_
+  - 无
+- _解决问题_
+  - 修复 Response 返回层级错误
+- _特性变更_
+  - 优化异常信息
+
+  
+### HuaweiCloud SDK CCE
+
+- _新增特性_
+  - 支持接口`RemoveNode`、`MigrateNode`
+- _解决问题_
+  - 无
+- _特性变更_
+  - 接口`DeleteCluster`新增请求参数`tobedeleted`
+
+### HuaweiCloud SDK EIP
+
+- _新增特性_
+  - 无
+- _解决问题_
+  - 无
+- _特性变更_
+  - 接口`CreateSharedBandwidth`、`ListBandwidths`新增响应参数`publicip_border_group`
+
+### HuaweiCloud SDK IMS
+
+- _新增特性_
+  - 无
+- _解决问题_
+  - 无
+- _特性变更_
+  - 接口`GlanceCreateImageMetadata`新增响应参数`__root_origin`、`checksum`、`size`
+  - 接口`GlanceAddImageMember`移除请求参数`deleted`、`deleted_at`,新增以下请求参数：
+    - `__lazyloading`
+    - `__os_feature_list`
+    - `__root_origin`
+    - `__sequence_num`
+    - `__support_agent_list`
+    - `__system__cmkid`
+    - `active_at`
+    - `hw_vif_multiqueue_enabled`
+    - `max_ram`
+    - `__image_location`
+    - `__is_config_init`
+    - `__account_code`
+
+### HuaweiCloud SDK IoTDA
+
+- _新增特性_
+  - 无
+- _解决问题_
+  - 无
+- _特性变更_
+  - 接口`ListRules`新增响应参数`edge_node_ids`、`last_update_time`
+
 # 3.0.9-beta 2021-06-29
 
 ### HuaweiCloud SDK Core

core/HcClient.ts

@@ -26,6 +26,7 @@ import { HttpRequestBuilder } from "./http/IHttpRequestBuilder";
 import { SdkResponse } from "./SdkResponse";
 import { ExceptionUtil } from "./exception/ExceptionUtil";
 import { getLogger, Logger, LogLevel } from './logger';
+import { DefaultHttpResponse } from "./http/DefaultHttpResponse";
 
 export class HcClient {
     private httpClient: HttpClient;
@@ -58,17 +59,15 @@ export class HcClient {
         return this;
     }
 
-    public sendRequest<T>(options: any): Promise<T> {
+    public sendRequest<T extends SdkResponse>(options: any): Promise<T> | Promise<any> {
         this.logger.debug('send request');
 
         const request = this.buildRequest(options);
         // @ts-ignore
-        return this.httpClient.sendRequest(request).then(res => {
-            return this.extractResponse(res);
+        return this.httpClient.sendRequest<T>(request).then(res => {
+            return this.extractResponse<T>(res);
         }, err => {
-            let error = err;
-            let statusCode = error.status;
-            return ExceptionUtil.generalException(statusCode, error.body);
+            return ExceptionUtil.generalException(err);
         });
     }
 
@@ -94,19 +93,21 @@ export class HcClient {
         if (options['responseHeaders']) {
             httpRequest['responseHeaders'] = options['responseHeaders'];
         }
+        httpRequest.proxy = this.proxyAgent;
         return httpRequest;
     }
 
-    private extractResponse(result?: any) {
+    private extractResponse<T extends SdkResponse>(result: DefaultHttpResponse<T>): T {
         const headers = result.headers;
         let contentType = headers['content-type'];
         contentType = contentType.toLowerCase();
         if (contentType && contentType == 'application/octet-stream') {
-            return result.result;
+            return result.data as T;
         } else {
-            let response = new SdkResponse();
-            response.setStatusCode(result.status);
-            response.setResult(result.result);
+            let response = result.data instanceof Object ? result.data : {} as T;
+            let sdkRespone = response as SdkResponse;
+            sdkRespone.httpStatusCode = result.statusCode;
+
             return response;
         }
     }

core/SdkResponse.ts

@@ -20,22 +20,5 @@
  */
 
 export class SdkResponse {
-    private httpStatusCode: number | undefined;
-    public result?: any;
-    public constructor(statusCode?: number) {
-        this.httpStatusCode = statusCode;
-    }
-
-    public getStatusCode(): number {
-        return <number>this.httpStatusCode;
-    }
-    public setStatusCode(code: number) {
-        this.httpStatusCode = code;
-    }
-    public setResult(result: any) {
-        this.result = result;
-    }
-    public getResult() {
-        return this.result;
-    }
+    httpStatusCode?: number;
 }

core/exception/ExceptionResponse.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 Huawei Technologies Co.,Ltd.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface ExceptionResponse {
+    data?: any;
+    status?: number;
+    headers?: any;
+    request?: any;
+    message?: string;
+    config?: any;
+    originalError?: any;
+    requestId?: string;
+}

core/exception/ExceptionUtil.ts

@@ -20,26 +20,18 @@
  */
 
 import { ClientRequestException } from "./ClientRequestException";
+import { ExceptionResponse } from "./ExceptionResponse";
 import { ServerResponseException } from "./ServerResponseException";
 import { ServiceResponseException } from "./ServiceResponseException";
 
 export class ExceptionUtil {
-    static generalException(httpStatusCode: string | number, errorData: { error_code: any; error_msg: any; request_id: any; code: any; message: any; } | null | undefined) {
-        let errorCode;
-        let errorMsg;
-        let requestId;
-        if (errorData !== null && errorData !== undefined) {
-            errorCode = errorData.error_code;
-            errorMsg = errorData.error_msg;
-            requestId = errorData.request_id;
-            if (errorCode === null || errorCode === undefined) {
-                errorCode = errorData.code;
-                errorMsg = errorData.message;
-                if (errorCode === null || errorCode === undefined) {
-                    errorMsg = errorData;
-                }               
-            }
-        }
+    static generalException(exception: ExceptionResponse) {
+        const data = exception.data || {};
+        let errorCode = data.error ? data.error.code : exception.status;
+        let errorMsg = data.error ? data.error.message : exception.message;
+        let requestId = exception.requestId;
+
+        const httpStatusCode = exception.status;
         if (httpStatusCode) {
             if (httpStatusCode >= 400 && httpStatusCode < 500) {
                 return new ClientRequestException(httpStatusCode, errorMsg, errorCode, requestId);