ksyun-sdk-node 1.2.4 → 1.4.9

package/dist/service/Waf/v20200707/index.js

@@ -8,239 +8,239 @@ module.exports = class Client extends BaseClient {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "_baseConfig", {
-      'protocol': 'http://',
-      'endpoint': 'waf.api.ksyun.com',
-      'config': {
-        'timeout': 60,
+      protocol: "http://",
+      endpoint: "waf.api.ksyun.com",
+      config: {
+        timeout: 60,
         //设置timeout
-        'headers': {
-          'Accept': 'application/json'
+        headers: {
+          Accept: "application/json"
         },
-        'credentials': {
-          'region': 'cn-shanghai-3',
-          'service': 'waf'
+        credentials: {
+          region: "cn-shanghai-3",
+          service: "waf"
         }
       }
     });
     _defineProperty(this, "_apiList", {
-      'CreateDomain': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'CreateDomain'
+      CreateDomain: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "CreateDomain"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecord': 'String',
-          'HttpRewrite': 'Boolean',
-          'HttpSource': 'Boolean',
-          'CertificateId': 'String',
-          'CertificateRegion': 'String',
-          'LbMethod': 'String',
-          'HasProxy': 'Boolean',
-          'ProjectId': 'Int',
-          'HeaderMark': 'String',
-          'HeaderValue': 'String',
-          'HealthMonitor': 'String',
-          'HttpPort': 'Filter',
-          'HttpsPort': 'Filter',
-          'Sources': 'String'
+        paramsType: {
+          ResourceRecord: "String",
+          HttpRewrite: "Boolean",
+          HttpSource: "Boolean",
+          CertificateId: "String",
+          CertificateRegion: "String",
+          LbMethod: "String",
+          HasProxy: "Boolean",
+          ProjectId: "Int",
+          HeaderMark: "String",
+          HeaderValue: "String",
+          HealthMonitor: "String",
+          HttpPort: "Filter",
+          HttpsPort: "Filter",
+          Sources: "String"
         }
       },
-      'DescribeDomains': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DescribeDomains'
+      DescribeDomains: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DescribeDomains"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecord': 'String'
+        paramsType: {
+          ResourceRecord: "String"
         }
       },
-      'ModifyDomain': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'ModifyDomain'
+      ModifyDomain: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "ModifyDomain"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecordId': 'String',
-          'HttpRewrite': 'Boolean',
-          'HttpSource': 'Boolean',
-          'CertificateId': 'String',
-          'CertificateRegion': 'String',
-          'LbMethod': 'String',
-          'HasProxy': 'Boolean',
-          'ProjectId': 'Int',
-          'HeaderMark': 'String',
-          'HeaderValue': 'String',
-          'HealthMonitor': 'String',
-          'HttpPort': 'Filter',
-          'HttpsPort': 'Filter',
-          'Sources': 'String'
+        paramsType: {
+          ResourceRecordId: "String",
+          HttpRewrite: "Boolean",
+          HttpSource: "Boolean",
+          CertificateId: "String",
+          CertificateRegion: "String",
+          LbMethod: "String",
+          HasProxy: "Boolean",
+          ProjectId: "Int",
+          HeaderMark: "String",
+          HeaderValue: "String",
+          HealthMonitor: "String",
+          HttpPort: "Filter",
+          HttpsPort: "Filter",
+          Sources: "String"
         }
       },
-      'DeleteDomain': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DeleteDomain'
+      DeleteDomain: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DeleteDomain"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecordId': 'String'
+        paramsType: {
+          ResourceRecordId: "String"
         }
       },
-      'CreateAccessControlRule': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'CreateAccessControlRule'
+      CreateAccessControlRule: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "CreateAccessControlRule"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecordId': 'String',
-          'RuleName': 'String',
-          'RuleType': 'String',
-          'ArgName': 'String',
-          'RuleData': 'String',
-          'MatchRule': 'Int',
-          'Level': 'Int',
-          'RuleAction': 'Int',
-          'Status': 'Boolean'
+        paramsType: {
+          ResourceRecordId: "String",
+          RuleName: "String",
+          RuleType: "String",
+          ArgName: "String",
+          RuleData: "String",
+          MatchRule: "Int",
+          Level: "Int",
+          RuleAction: "Int",
+          Status: "Boolean"
         }
       },
-      'DescribeAccessControlRules': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DescribeAccessControlRules'
+      DescribeAccessControlRules: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DescribeAccessControlRules"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'RuleId': 'String',
-          'ResourceRecordId': 'String',
-          'RuleName': 'String'
+        paramsType: {
+          RuleId: "String",
+          ResourceRecordId: "String",
+          RuleName: "String"
         }
       },
-      'ModifyAccessControlRule': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'ModifyAccessControlRule'
+      ModifyAccessControlRule: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "ModifyAccessControlRule"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'RuleId': 'String',
-          'RuleName': 'String',
-          'RuleType': 'String',
-          'RuleData': 'String',
-          'MatchRule': 'String',
-          'ArgName': 'String',
-          'Level': 'Int',
-          'RuleAction': 'Int',
-          'Status': 'Boolean'
+        paramsType: {
+          RuleId: "String",
+          RuleName: "String",
+          RuleType: "String",
+          RuleData: "String",
+          MatchRule: "String",
+          ArgName: "String",
+          Level: "Int",
+          RuleAction: "Int",
+          Status: "Boolean"
         }
       },
-      'DeleteAccessControlRule': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DeleteAccessControlRule'
+      DeleteAccessControlRule: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DeleteAccessControlRule"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'RuleId': 'String'
+        paramsType: {
+          RuleId: "String"
         }
       },
-      'DescribeCertificates': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DescribeCertificates'
+      DescribeCertificates: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DescribeCertificates"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'Request': 'String'
+        paramsType: {
+          Request: "String"
         }
       },
-      'CreateIpv6Protection': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'CreateIpv6Protection'
+      CreateIpv6Protection: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "CreateIpv6Protection"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecordId': 'Array'
+        paramsType: {
+          ResourceRecordId: "Array"
         }
       },
-      'DeleteIpv6Protection': {
-        'url': '/',
-        'method': 'GET',
-        'config': {
-          'query': {
-            'Version': '2020-07-07',
-            'Action': 'DeleteIpv6Protection'
+      DeleteIpv6Protection: {
+        url: "/",
+        method: "GET",
+        config: {
+          query: {
+            Version: "2020-07-07",
+            Action: "DeleteIpv6Protection"
           },
-          'headers': {
-            'Content-Type': 'application/x-www-form-urlencoded'
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
           }
         },
-        'paramsType': {
-          'ResourceRecordId': 'Array'
+        paramsType: {
+          ResourceRecordId: "Array"
         }
       }
     });

package/example/iam.js

@@ -14,7 +14,8 @@ const clientConfig = {
         method: 'POST', // 请求方法 GET 或者 POST
         timeout: 60, // 请求超时时间秒
         protocol: '', // 协议 http:// 或者 https://
-        endpoint: '' // 接入点域名 如 iam.api.ksyun.com
+        endpoint: '', // 接入点域名 如 iam.api.ksyun.com
+        path: '' // 自定义URL路径 如 /api/v1/xxx
     },
 }
 let client = new Client(clientConfig)

package/example/res.js

@@ -14,7 +14,8 @@ const clientConfig = {
         method: '', // 请求方法 get 或者 post
         timeout: 60, // 请求超时时间秒
         protocol: 'http://', // 协议 http:// 或者 https://
-        endpoint: '' // 接入点域名 如 iam.api.ksyun.com
+        endpoint: '', // 接入点域名 如 iam.api.ksyun.com
+        path: '' // 自定义URL路径 如 /api/v1/xxx
     },
 }
 let client = new Client(clientConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ksyun-sdk-node",
-    "version": "1.2.4",
+    "version": "1.4.9",
     "description": "",
     "main": "dist/index.js",
     "scripts": {

package/src/base/BaseClient.js

@@ -39,6 +39,25 @@ module.exports = class BaseClient {
             ...(apiConfig.config.headers || {})
         }
 
+        // 处理自定义path
+        let customPath = this.httpProfile.path || ''
+        // 清理path中的?参数
+        if (customPath && customPath.includes('?')) {
+            customPath = customPath.split('?')[0]
+        }
+
+        // 处理path拼接，避免双斜杠
+        let finalPath = apiConfig.url
+        if (customPath) {
+            // 清理endpoint末尾的斜杠
+            endpoint = endpoint.replace(/\/+$/, '')
+            // 确保customPath以/开头
+            if (!customPath.startsWith('/')) {
+                customPath = '/' + customPath
+            }
+            finalPath = customPath
+        }
+
         let query = apiConfig.config.query
         if (['GET', 'OPTION', 'HEAD'].includes(method)) {
             query = {
@@ -50,7 +69,7 @@ module.exports = class BaseClient {
         let body = this.getBody(method, headers['Content-Type'], params)
 
         let signParams = {
-            path: apiConfig.url,
+            path: finalPath,
             query,
             body: body || '',
             headers,
@@ -64,9 +83,13 @@ module.exports = class BaseClient {
 
         let signHeaders = getSignatureHeaders(signParams)
 
-        let url = `${protocol}${endpoint}${apiConfig.url}?${getCanonicalizedQuery(query)}`
+        let url = `${protocol}${endpoint}${finalPath}?${getCanonicalizedQuery(query)}`
 
         let timeoutSecond = this.httpProfile.timeout || this._baseConfig.config.timeout
+
+        // 打印 curl 命令
+        this.printCurl(url, method, signHeaders, body)
+
         return fetch(url, {
             method: method,
             timeout: timeoutSecond * 1000,
@@ -92,7 +115,7 @@ module.exports = class BaseClient {
             if (['String', 'Int', 'Double', 'Long', 'Boolean', 'Array'].includes(type) && params[key] != null) {
                 res[key] = params[key]
             }
-            if (type == 'Filter') {
+            if (type == 'Filter' || type == 'Object') {
                 res = {
                     ...res,
                     ...this.formatFilter(key, params[key])
@@ -131,11 +154,35 @@ module.exports = class BaseClient {
         }
         // 目前只有下面这两种
         if (contentType == 'application/x-www-form-urlencoded') {
-            return qs.stringify(params)
+            return qs.stringify(params, {
+                allowDots: true,      // 对象转成a.b.c
+                arrayFormat: 'indices' // 数组转成a[0]=b&a[1]=c
+            })
         }
         if (contentType == 'application/json') {
             return JSON.stringify(params)
         }
         return JSON.stringify(params)
     }
+
+    /**
+     * 打印 curl 命令
+     */
+    printCurl(url, method, headers, body) {
+        let curlCmd = `curl -X ${method} '${url}'`
+
+        // 添加 headers
+        Object.keys(headers).forEach(key => {
+            curlCmd += ` \\\n  -H '${key}: ${headers[key]}'`
+        })
+
+        // 添加 body
+        if (body) {
+            curlCmd += ` \\\n  -d '${body}'`
+        }
+
+        console.log('\n========== CURL 请求 ==========')
+        console.log(curlCmd)
+        console.log('================================\n')
+    }
 }

package/src/service/Actiontrail/v20190401/index.js

@@ -1,47 +1,47 @@
 const BaseClient = require("../../../base/BaseClient.js");
 
 module.exports = class Client extends BaseClient {
-    _baseConfig = {
-        'protocol': 'http://',
-        'endpoint': 'actiontrail.api.ksyun.com',
-        'config': {
-            'timeout': 60,  //设置timeout
-            'headers': {
-                'Accept': 'application/json'
-            },
-            'credentials': {
-                'region': 'cn-shanghai-3',
-                'service': 'actiontrail',
-            },
+  _baseConfig = {
+    protocol: "http://",
+    endpoint: "actiontrail.api.ksyun.com",
+    config: {
+      timeout: 60, //设置timeout
+      headers: {
+        Accept: "application/json",
+      },
+      credentials: {
+        region: "cn-shanghai-3",
+        service: "actiontrail",
+      },
+    },
+  };
+  _apiList = {
+    ListOperateLogs: {
+      url: "/",
+      method: "GET",
+      config: {
+        query: {
+          Version: "2019-04-01",
+          Action: "ListOperateLogs",
         },
-    }
-    _apiList = {
-        'ListOperateLogs': {
-            'url': '/',
-            'method': 'GET',
-            'config': {
-                'query': {
-                    'Version': '2019-04-01',
-                    'Action': 'ListOperateLogs',
-                },
-                'headers': {
-                    'Content-Type': 'application/json'
-                },
-            },
-            'paramsType': {
-                'EventName': 'String',
-                'EventRw': 'String',
-                'ServiceName': 'String',
-                'UserName': 'String',
-                'AccessKey': 'String',
-                'EventBeginDate': 'String',
-                'EventEndDate': 'String',
-                'ResourceType': 'String',
-                'ResourceName': 'String',
-                'Page': 'String',
-                'PageSize': 'String',
-                'SearchAfter': 'String',
-            }
+        headers: {
+          "Content-Type": "application/json",
         },
-    }
-}
+      },
+      paramsType: {
+        EventName: "String",
+        EventRw: "String",
+        ServiceName: "String",
+        UserName: "String",
+        AccessKey: "String",
+        EventBeginDate: "String",
+        EventEndDate: "String",
+        ResourceType: "String",
+        ResourceName: "String",
+        Page: "String",
+        PageSize: "String",
+        SearchAfter: "String",
+      },
+    },
+  };
+};