release 0.0.4-beta source code for nodejs

Author: unionsdk

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.0.4-beta # 0.0.4-beta 2023-02-20
+
+### G42Cloud SDK IMS
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - Add the enum values `IsoImage` to the request parameter `type` to the interface `CreateImage`
+
 # 0.0.3-beta 2023-01-06
 
 ### G42Cloud SDK IMS

core/ClientBuilder.ts

@@ -90,6 +90,10 @@ export class ClientBuilder<T> {
             axiosOptions.headers["User-Agent"] = this.userOptions.customUserAgent;
         }
 
+        if (this.userOptions?.axiosRequestConfig) {
+            axiosOptions.axiosRequestConfig = this.userOptions.axiosRequestConfig;
+        }
+
         if (!this.credential) {
             this.credential = this.getCredentialFromEnvironment();
         }

core/HcClient.ts

@@ -28,6 +28,7 @@ import { ExceptionUtil } from "./exception/ExceptionUtil";
 import { getLogger, Logger, LogLevel } from './logger';
 import { DefaultHttpResponse } from "./http/DefaultHttpResponse";
 import { Region } from "./region/region";
+import { SdkStreamResponse } from "./SdkStreamResponse";
 
 export class HcClient {
     private httpClient: HttpClient;
@@ -126,21 +127,30 @@ export class HcClient {
             httpRequest['responseHeaders'] = options['responseHeaders'];
         }
         httpRequest.proxy = this.proxyAgent;
+        if(options.axiosRequestConfig){
+            httpRequest.axiosRequestConfig= options.axiosRequestConfig;
+        }
+       
         return httpRequest;
     }
 
     private extractResponse<T extends SdkResponse>(result: DefaultHttpResponse<T>): T {
         const headers = result.headers;
         let contentType = headers['content-type'];
-        contentType = contentType.toLowerCase();
-        if (contentType && (contentType.startsWith('application/octet-stream') || contentType.startsWith("image"))) {
-            return result.data as T;
+        contentType = contentType?.toLowerCase();
+        if (contentType
+            && (contentType.startsWith('application/octet-stream')
+                || contentType.startsWith("image")
+                || contentType.startsWith("application/zip"))) {
+            const streamRes = new SdkStreamResponse();
+            streamRes.body = result.data;
+            streamRes.httpStatusCode = result.statusCode;
+            return streamRes as T;
         } else {
-            let response = result.data instanceof Object ? result.data : {} as T;
-            let sdkRespone = response as SdkResponse;
+            const response = result.data instanceof Object ? result.data : {} as T;
+            const sdkRespone = response as SdkResponse;
             sdkRespone.httpStatusCode = result.statusCode;
-
-            return response;
+            return sdkRespone as T;
         }
     }
 }

core/SdkStreamResponse.ts

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 G42 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 class SdkStreamResponse {
+    httpStatusCode?: number;
+    body?: any;
+}

core/UserOptions.ts

@@ -1,3 +1,6 @@
+import { AxiosRequestConfig } from "axios";
+
 export class UserOptions {
     customUserAgent?: string;
+    axiosRequestConfig?: AxiosRequestConfig;
 }

core/auth/AKSKSigner.ts

@@ -79,7 +79,7 @@ export class AKSKSigner {
         let allHeaders = {};
         let current_headers:any = {};
         Object.assign(current_headers, request.headers);
-        if (current_headers['content-type'].indexOf('multipart/form-data') !== -1) {
+        if (current_headers['content-type']?.indexOf('multipart/form-data') !== -1) {
             delete current_headers['content-type'];
         }
         Object.assign(allHeaders, current_headers, authenticationHeaders);

core/http/DefaultHttpClient.ts

@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import axios, { AxiosResponse, AxiosError } from 'axios';
+import axios, { AxiosResponse, AxiosError, AxiosRequestConfig } from 'axios';
 import { IHttpRequest } from './IHttpRequest';
 import { stringify as qsStringify } from 'querystring';
 import { HttpClient } from './HttpClient';
@@ -66,8 +66,7 @@ export class DefaultHttpClient implements HttpClient {
         if (this.defaultOption.proxy && this.defaultOption.proxy !== '') {
             proxyAgent = HttpsProxyAgent(this.defaultOption.proxy);
         }
-
-        this.axiosInstance = axios.create({
+        const axiosRequestConfig: AxiosRequestConfig = {
             maxContentLength: Infinity,
             headers: Object.assign(
                 this.DEFAULT_HEADERS,
@@ -76,7 +75,13 @@ export class DefaultHttpClient implements HttpClient {
             proxy: false,
             httpAgent: proxyAgent,
             httpsAgent: proxyAgent
-        });
+        };
+
+        if (this.defaultOption.axiosRequestConfig) {
+            Object.assign(axiosRequestConfig, this.defaultOption.axiosRequestConfig);
+        }
+
+        this.axiosInstance = axios.create(axiosRequestConfig);
 
         this.axiosInstance.interceptors.request.use((request: any) => {
             const { url, method, data, headers } = request;
@@ -118,7 +123,7 @@ export class DefaultHttpClient implements HttpClient {
             const result = this._convertResponse<T>(httpRequest, res);
 
             return {
-                data: result instanceof String ? undefined : result,
+                data: result,
                 statusCode: res.status,
                 headers: res.headers
             };
@@ -143,7 +148,7 @@ export class DefaultHttpClient implements HttpClient {
         if (this.defaultOption.headers) {
             const customUserAgent = this.defaultOption.headers['User-Agent'];
             if (customUserAgent) {
-                headers['User-Agent'] = ["huaweicloud-usdk-nodejs/3.0",customUserAgent].join(" ");
+                headers['User-Agent'] = ["huaweicloud-usdk-nodejs/3.0", customUserAgent].join(" ");
             } else {
                 headers['User-Agent'] = "huaweicloud-usdk-nodejs/3.0"
             }
@@ -159,6 +164,11 @@ export class DefaultHttpClient implements HttpClient {
                 return qsStringify(params);
             },
         };
+        
+        if (httpRequest.axiosRequestConfig) {
+            Object.assign(requestParams, httpRequest.axiosRequestConfig);
+        }
+
         const methods: string[] = ['PUT', 'POST', 'PATCH', 'DELETE'];
         if (method && methods.indexOf(method.toUpperCase()) !== -1) {
             requestParams = Object.assign(requestParams, {
@@ -204,7 +214,7 @@ export class DefaultHttpClient implements HttpClient {
             data: error.response ? error.response.data : undefined,
             status: error.response ? error.response.status : undefined,
             headers: error.response ? error.response.headers : undefined,
-            message: error.message || undefined,  
+            message: error.message || undefined,
             requestId: error.response?.headers['x-request-id']
         }
         return transformedResponse;
@@ -223,4 +233,5 @@ export interface ClientOptions {
     headers?: any,
     logger?: Logger,
     logLevel?: LogLevel;
+    axiosRequestConfig?: AxiosRequestConfig
 }

core/http/IHttpRequest.ts

@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import { AxiosRequestConfig } from "axios";
+
 
 export interface IHttpRequest {
     params?: any;
@@ -33,9 +35,11 @@ export interface IHttpRequest {
 
     getPathParams?: () => any;
     responseHeaders?: any;
+    axiosRequestConfig?: AxiosRequestConfig;
 }
 
 export class HttpRequestImpl implements IHttpRequest {
+    axiosRequestConfig?: AxiosRequestConfig;
     public params: any;
     public endpoint: string | undefined;
     public contentType: string | undefined;

core/package.json

@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.172",
     "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.37",
-    "@types/sinon": "^10.0.2",
+    "@types/sinon": "^10.0.13",
     "busboy": "^0.3.1",
     "chai": "^4.3.4",
     "chai-like": "^1.1.1",
@@ -47,8 +47,8 @@
     "nock": "^13.1.0",
     "nyc": "^15.1.0",
     "shx": "^0.3.2",
-    "sinon": "^11.1.2",
-    "ts-node": "^9.1.1",
+    "sinon": "^15.0.1",
+    "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
     "typescript": "^4.1.0"
   }

core/tests/HttpClient.spec.ts

@@ -7,6 +7,7 @@ import { GlobalCredentials } from "../auth/GlobalCredentials";
 import { HcClient } from "../HcClient";
 import { DefaultHttpClient } from "../http/DefaultHttpClient";
 import { Region } from "../region/region";
+import { SdkResponse } from "../SdkResponse";
 
 const regions =
 {
@@ -119,7 +120,7 @@ describe('httpclient  tests', () => {
         after(() => {
             nock.cleanAll();
         });
-        it('should set domain id correctly', function (done) { 
+        it('should set domain id correctly', function (done) {
             const client = new DefaultHttpClient();
             const hcClient = new HcClient(client);
             let credential = new GlobalCredentials();
@@ -149,4 +150,19 @@ describe('httpclient  tests', () => {
 
         });
     });
+
+    describe("should return sdkstreamresponse", function () {
+        const defaultClient = new DefaultHttpClient();
+        let hcClient = new HcClient(defaultClient);
+
+        const res = hcClient['extractResponse']({
+            data: new SdkResponse(),
+            statusCode: 200,
+            headers: { 'content-type': 'application/zip' }
+        });
+
+        expect(res).not.to.be.null;
+        expect(res.httpStatusCode).to.equal(200);
+        expect(res).to.have.property('body');
+    });
 });