tencentcloud-sdk-nodejs 4.0.457 → 4.0.458

package/src/common/http/fetch.ts

@@ -1,12 +1,19 @@
 import fetch, { RequestInit, Response } from "node-fetch"
 import HttpsProxyAgent = require("https-proxy-agent")
 
-export default function (url: string, options: RequestInit): Promise<Response> {
-  const instanceOptions = options || {}
+export interface FetchOptions extends Omit<RequestInit, "signal"> {
+  proxy?: string
+  headers: Record<string, string>
+  // node-fetch中的signal声明与ts自带的有点冲突，以ts的为准
+  signal: AbortSignal
+}
+export default function (url: string, options: FetchOptions): Promise<Response> {
+  const instanceOptions = options || ({} as FetchOptions)
 
-  if (!options.agent && process.env.http_proxy) {
-    instanceOptions.agent = new (HttpsProxyAgent as any)(process.env.http_proxy)
+  const proxy = options.proxy || process.env.http_proxy
+  if (!options.agent && proxy) {
+    instanceOptions.agent = new (HttpsProxyAgent as any)(proxy)
   }
 
-  return fetch(url, instanceOptions)
+  return fetch(url, instanceOptions as any)
 }

package/src/common/http/http_connection.ts

@@ -4,9 +4,9 @@ import * as isStream from "is-stream"
 import * as getStream from "get-stream"
 import * as FormData from "form-data"
 import Sign from "../sign"
-import fetch from "./fetch"
-import { Response } from "node-fetch"
-
+import fetch, { FetchOptions } from "./fetch"
+import { Response, RequestInit } from "node-fetch"
+import { Agent } from "http"
 /**
  * @inner
  */
@@ -17,24 +17,26 @@ export class HttpConnection {
     data,
     timeout,
     headers = {},
+    agent,
+    proxy,
+    signal,
   }: {
     method: string
     url: string
     data: any
     timeout: number
     headers?: Record<string, string>
+    agent?: Agent
+    proxy?: string
+    signal?: AbortSignal
   }): Promise<Response> {
-    const config: {
-      method: string
-      timeout: number
-      headers: {
-        [key: string]: string
-      }
-      body?: string
-    } = {
+    const config: FetchOptions = {
       method: method,
       headers: Object.assign({}, headers),
       timeout,
+      agent,
+      proxy,
+      signal,
     }
     if (method === "GET") {
       url += "?" + QueryString.stringify(data)
@@ -61,6 +63,9 @@ export class HttpConnection {
     requestClient,
     language,
     headers = {},
+    agent,
+    proxy,
+    signal,
   }: {
     method: string
     url: string
@@ -77,6 +82,9 @@ export class HttpConnection {
     requestClient: string
     language: string
     headers?: Record<string, string>
+    agent?: Agent
+    proxy?: string
+    signal?: AbortSignal
   }): Promise<Response> {
     // data 中可能带有 readStream，由于需要计算整个 body 的 hash，
     // 所以这里把 readStream 转为 Buffer
@@ -98,14 +106,7 @@ export class HttpConnection {
     if (method === "POST") {
       payload = data
     }
-    const config: {
-      method: string
-      timeout: number
-      headers: {
-        [key: string]: any
-      }
-      body?: any
-    } = {
+    const config: FetchOptions = {
       method,
       timeout,
       headers: Object.assign({}, headers, {
@@ -117,6 +118,9 @@ export class HttpConnection {
         "X-TC-Token": token,
         "X-TC-RequestClient": requestClient,
       }),
+      agent,
+      proxy,
+      signal,
     }
 
     if (token === null) {

package/src/common/interface.ts

@@ -1,3 +1,4 @@
+import { Agent } from "http"
 /**
  * 初始化client对象参数类型
  */
@@ -65,6 +66,16 @@ export interface ClientProfile {
      * 非必选
      */
     headers?: Record<string, string>
+    /**
+     * 高级请求代理，例如 new HttpsProxyAgent("http://127.0.0.1:8899")
+     *
+     * 优先级高于 proxy 配置
+     */
+    agent?: Agent
+    /**
+     * http请求代理，例如 "http://127.0.0.1:8899"
+     */
+    proxy?: string
   }
   /**
    * api请求时附带的 language 字段

package/src/common/sdk_version.ts

@@ -1 +1 @@
-export const sdkVersion = "4.0.457"
+export const sdkVersion = "4.0.458"

package/src/services/bma/v20210624/bma_client.ts

@@ -110,7 +110,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 品牌经营管家-版权保护个人认证接口
+   * 本接口用于个人认证，新接入用户必须认证后才可以进行后续操作（个人认证和企业认证二选一），只需认证一次即可
    */
   async CreateCRUserVerify(
     req: CreateCRUserVerifyRequest,
@@ -120,7 +120,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-添加作品接口
+   * 新建作品
    */
   async CreateCRWork(
     req: CreateCRWorkRequest,
@@ -140,8 +140,9 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-新建拦截接口
-   */
+     * 新建拦截
+
+     */
   async CreateCRBlock(
     req: CreateCRBlockRequest,
     cb?: (error: string, rep: CreateCRBlockResponse) => void
@@ -150,7 +151,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 申请取证
+   * 取证申请
    */
   async ModifyCRObtainStatus(
     req: ModifyCRObtainStatusRequest,
@@ -180,7 +181,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-修改监测状态接口
+   * 开启/关闭监测
    */
   async ModifyCRMonitor(
     req: ModifyCRMonitorRequest,
@@ -210,7 +211,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 新增权属文件
+   * 权属文件添加
    */
   async CreateCRRightFile(
     req: CreateCRRightFileRequest,
@@ -220,7 +221,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-白名单修改接口
+   * 修改白名单列表
    */
   async ModifyCRWhiteList(
     req: ModifyCRWhiteListRequest,
@@ -230,7 +231,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-拦截申请接口
+   * 拦截申请
    */
   async ModifyCRBlockStatus(
     req: ModifyCRBlockStatusRequest,
@@ -300,7 +301,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 版权保护-维权申请接口
+   * 发函申请
    */
   async ModifyCRRightStatus(
     req: ModifyCRRightStatusRequest,
@@ -340,7 +341,7 @@ export class Client extends AbstractClient {
   }
 
   /**
-   * 品牌经营管家-版权保护模块企业认证接口
+   * 本接口用于企业认证，新接入用户必须认证后才可以进行后续操作（个人认证和企业认证二选一），只需认证一次即可
    */
   async CreateCRCompanyVerify(
     req: CreateCRCompanyVerifyRequest,