From 3b038cf75e327308111d41b0bd6be06237fccec1 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Thu, 9 Feb 2023 20:17:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84CDN=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/services/ucdn/index.d.ts | 34 ++++++++++++++++++++++++ lib/services/ucdn/index.js | 14 ++++++++++ src/services/ucdn/index.ts | 50 ++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/lib/services/ucdn/index.d.ts b/lib/services/ucdn/index.d.ts index 04fedba..e33d11c 100644 --- a/lib/services/ucdn/index.d.ts +++ b/lib/services/ucdn/index.d.ts @@ -15,6 +15,14 @@ export default class UCDNClient extends Client { * See also: https://docs.ucloud.cn/api/ucdn-api/add_certificate */ addCertificate(request?: AddCertificateRequest): Promise; + /** + * GetCertificateBaseInfoList - 配置CDN获取证书列表 + */ + getCertificateBaseInfoList(): Promise; + /** + * UpdateUcdnDomainHttpsConfig - 配置CDN域名HTTPS + */ + updateUcdnDomainHttpsConfig(request?: UpdateUcdnDomainHttpsConfigRequest): Promise; /** * ControlUcdnDomainCacheAccess - 封禁解封缓存访问 * @@ -216,6 +224,32 @@ export interface AddCertificateRequest { */ export interface AddCertificateResponse { } +/** + * 配置CDN证书获取证书清单 + */ +export interface GetCertificateBaseInfoListRequest { +} +export interface GetCertificateBaseInfoListResponse { + CertList: Array<{ + CertId: number; + CertName: string; + CertType: 'ucdn'; + }>; +} +/** + * 配置CDN的HTTPS + */ +export interface UpdateUcdnDomainHttpsConfigRequest { + ProjectId: string; + Areacode: 'cn' | 'oversea'; + DomainId: string; + HttpsStatus: 'enable' | 'disable'; + CertName?: string; + CertId: number; + CertType: 'ucdn'; +} +export interface UpdateUcdnDomainHttpsConfigResponse { +} /** * ControlUcdnDomainCacheAccess - 封禁解封缓存访问 */ diff --git a/lib/services/ucdn/index.js b/lib/services/ucdn/index.js index 58a2128..4fe82d7 100644 --- a/lib/services/ucdn/index.js +++ b/lib/services/ucdn/index.js @@ -21,6 +21,20 @@ class UCDNClient extends client_1.default { const args = Object.assign({ Action: 'AddCertificate' }, (request || {})); return this.invoke(new request_1.default(args)).then((resp) => resp.toObject()); } + /** + * GetCertificateBaseInfoList - 配置CDN获取证书列表 + */ + getCertificateBaseInfoList() { + const args = { Action: 'GetCertificateBaseInfoList' }; + return this.invoke(new request_1.default(args)).then((resp) => resp.toObject()); + } + /** + * UpdateUcdnDomainHttpsConfig - 配置CDN域名HTTPS + */ + updateUcdnDomainHttpsConfig(request) { + const args = Object.assign({ Action: 'UpdateUcdnDomainHttpsConfig' }, (request || {})); + return this.invoke(new request_1.default(args)).then((resp) => resp.toObject()); + } /** * ControlUcdnDomainCacheAccess - 封禁解封缓存访问 * diff --git a/src/services/ucdn/index.ts b/src/services/ucdn/index.ts index 563cc13..134c9b3 100644 --- a/src/services/ucdn/index.ts +++ b/src/services/ucdn/index.ts @@ -31,6 +31,28 @@ export default class UCDNClient extends Client { ); } + /** + * GetCertificateBaseInfoList - 配置CDN获取证书列表 + */ + getCertificateBaseInfoList(): Promise { + const args = { Action: 'GetCertificateBaseInfoList' }; + return this.invoke(new Request(args)).then( + (resp) => resp.toObject() as GetCertificateBaseInfoListResponse + ); + } + + /** + * UpdateUcdnDomainHttpsConfig - 配置CDN域名HTTPS + */ + updateUcdnDomainHttpsConfig( + request?: UpdateUcdnDomainHttpsConfigRequest + ): Promise { + const args = { Action: 'UpdateUcdnDomainHttpsConfig', ...(request || {}) }; + return this.invoke(new Request(args)).then( + (resp) => resp.toObject() as UpdateUcdnDomainHttpsConfigResponse + ); + } + /** * ControlUcdnDomainCacheAccess - 封禁解封缓存访问 * @@ -480,6 +502,34 @@ export interface AddCertificateRequest { */ export interface AddCertificateResponse {} +/** + * 配置CDN证书获取证书清单 + */ +export interface GetCertificateBaseInfoListRequest {} + +export interface GetCertificateBaseInfoListResponse { + CertList: Array<{ + CertId: number; + CertName: string; + CertType: 'ucdn'; + }> +} + +/** + * 配置CDN的HTTPS + */ +export interface UpdateUcdnDomainHttpsConfigRequest { + ProjectId: string; + Areacode: 'cn' | 'oversea'; + DomainId: string; + HttpsStatus: 'enable' | 'disable'; + CertName?: string; + CertId: number; + CertType: 'ucdn'; +} + +export interface UpdateUcdnDomainHttpsConfigResponse {} + /** * ControlUcdnDomainCacheAccess - 封禁解封缓存访问 */ From 256f4bd93611b44069a4392a8f677720dbe9a478 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Thu, 9 Feb 2023 20:44:58 +0800 Subject: [PATCH 2/3] add `Domain` to `GetCertificateBaseInfoListRequest` --- lib/services/ucdn/index.d.ts | 3 ++- lib/services/ucdn/index.js | 4 ++-- src/services/ucdn/index.ts | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/services/ucdn/index.d.ts b/lib/services/ucdn/index.d.ts index e33d11c..b7e8750 100644 --- a/lib/services/ucdn/index.d.ts +++ b/lib/services/ucdn/index.d.ts @@ -18,7 +18,7 @@ export default class UCDNClient extends Client { /** * GetCertificateBaseInfoList - 配置CDN获取证书列表 */ - getCertificateBaseInfoList(): Promise; + getCertificateBaseInfoList(request: GetCertificateBaseInfoListRequest): Promise; /** * UpdateUcdnDomainHttpsConfig - 配置CDN域名HTTPS */ @@ -228,6 +228,7 @@ export interface AddCertificateResponse { * 配置CDN证书获取证书清单 */ export interface GetCertificateBaseInfoListRequest { + Domain?: string; } export interface GetCertificateBaseInfoListResponse { CertList: Array<{ diff --git a/lib/services/ucdn/index.js b/lib/services/ucdn/index.js index 4fe82d7..9291a57 100644 --- a/lib/services/ucdn/index.js +++ b/lib/services/ucdn/index.js @@ -24,8 +24,8 @@ class UCDNClient extends client_1.default { /** * GetCertificateBaseInfoList - 配置CDN获取证书列表 */ - getCertificateBaseInfoList() { - const args = { Action: 'GetCertificateBaseInfoList' }; + getCertificateBaseInfoList(request) { + const args = Object.assign({ Action: 'GetCertificateBaseInfoList' }, (request || {})); return this.invoke(new request_1.default(args)).then((resp) => resp.toObject()); } /** diff --git a/src/services/ucdn/index.ts b/src/services/ucdn/index.ts index 134c9b3..2e8846a 100644 --- a/src/services/ucdn/index.ts +++ b/src/services/ucdn/index.ts @@ -34,8 +34,8 @@ export default class UCDNClient extends Client { /** * GetCertificateBaseInfoList - 配置CDN获取证书列表 */ - getCertificateBaseInfoList(): Promise { - const args = { Action: 'GetCertificateBaseInfoList' }; + getCertificateBaseInfoList(request: GetCertificateBaseInfoListRequest): Promise { + const args = { Action: 'GetCertificateBaseInfoList', ...(request || {}) }; return this.invoke(new Request(args)).then( (resp) => resp.toObject() as GetCertificateBaseInfoListResponse ); @@ -505,7 +505,9 @@ export interface AddCertificateResponse {} /** * 配置CDN证书获取证书清单 */ -export interface GetCertificateBaseInfoListRequest {} +export interface GetCertificateBaseInfoListRequest { + Domain?: string; +} export interface GetCertificateBaseInfoListResponse { CertList: Array<{ From 1e69914220bef592851791b603d6233ea90c0aa7 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Thu, 9 Feb 2023 21:27:44 +0800 Subject: [PATCH 3/3] update ts for better d.ts --- lib/services/index.d.ts | 72 +++++++++++++++++++----------- lib/services/index.js | 99 +++++++++++++++++++++-------------------- src/services/index.ts | 88 ++++++++++++++++++------------------ 3 files changed, 142 insertions(+), 117 deletions(-) diff --git a/lib/services/index.d.ts b/lib/services/index.d.ts index 2fc140e..9cc50a2 100644 --- a/lib/services/index.d.ts +++ b/lib/services/index.d.ts @@ -1,33 +1,55 @@ import { ConfigOptions } from '../core/config'; import { CredentialOptions } from '../core/credential'; -declare const BaseClient: any; +import BaseClient from '../core/client'; +import CubeClient from './cube'; +import IPSecVPNClient from './ipsecvpn'; +import PathXClient from './pathx'; +import UAccountClient from './uaccount'; +import UBillClient from './ubill'; +import UCDNClient from './ucdn'; +import UDBClient from './udb'; +import UDDBClient from './uddb'; +import UDiskClient from './udisk'; +import UDPNClient from './udpn'; +import UECClient from './uec'; +import UFileClient from './ufile'; +import UFSClient from './ufs'; +import UHostClient from './uhost'; +import UK8SClient from './uk8s'; +import ULBClient from './ulb'; +import UMemClient from './umem'; +import UNetClient from './unet'; +import UPhoneClient from './uphone'; +import UPHostClient from './uphost'; +import USMSClient from './usms'; +import UVMSClient from './uvms'; +import VPCClient from './vpc'; export declare class Client extends BaseClient { constructor({ config, credential, }: { config: ConfigOptions; credential: CredentialOptions; }); - cube(): any; - ipsecvpn(): any; - pathx(): any; - uaccount(): any; - ubill(): any; - ucdn(): any; - udb(): any; - uddb(): any; - udisk(): any; - udpn(): any; - uec(): any; - ufile(): any; - ufs(): any; - uhost(): any; - uk8s(): any; - ulb(): any; - umem(): any; - unet(): any; - uphone(): any; - uphost(): any; - usms(): any; - uvms(): any; - vpc(): any; + cube(): CubeClient; + ipsecvpn(): IPSecVPNClient; + pathx(): PathXClient; + uaccount(): UAccountClient; + ubill(): UBillClient; + ucdn(): UCDNClient; + udb(): UDBClient; + uddb(): UDDBClient; + udisk(): UDiskClient; + udpn(): UDPNClient; + uec(): UECClient; + ufile(): UFileClient; + ufs(): UFSClient; + uhost(): UHostClient; + uk8s(): UK8SClient; + ulb(): ULBClient; + umem(): UMemClient; + unet(): UNetClient; + uphone(): UPhoneClient; + uphost(): UPHostClient; + usms(): USMSClient; + uvms(): UVMSClient; + vpc(): VPCClient; } -export {}; diff --git a/lib/services/index.js b/lib/services/index.js index f16dde5..dd07568 100644 --- a/lib/services/index.js +++ b/lib/services/index.js @@ -1,129 +1,132 @@ "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.Client = void 0; -const BaseClient = require('../core/client').default; -const CubeClient = require('./cube').default; -const IPSecVPNClient = require('./ipsecvpn').default; -const PathXClient = require('./pathx').default; -const UAccountClient = require('./uaccount').default; -const UBillClient = require('./ubill').default; -const UCDNClient = require('./ucdn').default; -const UDBClient = require('./udb').default; -const UDDBClient = require('./uddb').default; -const UDiskClient = require('./udisk').default; -const UDPNClient = require('./udpn').default; -const UECClient = require('./uec').default; -const UFileClient = require('./ufile').default; -const UFSClient = require('./ufs').default; -const UHostClient = require('./uhost').default; -const UK8SClient = require('./uk8s').default; -const ULBClient = require('./ulb').default; -const UMemClient = require('./umem').default; -const UNetClient = require('./unet').default; -const UPhoneClient = require('./uphone').default; -const UPHostClient = require('./uphost').default; -const USMSClient = require('./usms').default; -const UVMSClient = require('./uvms').default; -const VPCClient = require('./vpc').default; -class Client extends BaseClient { +const client_1 = __importDefault(require("../core/client")); +const cube_1 = __importDefault(require("./cube")); +const ipsecvpn_1 = __importDefault(require("./ipsecvpn")); +const pathx_1 = __importDefault(require("./pathx")); +const uaccount_1 = __importDefault(require("./uaccount")); +const ubill_1 = __importDefault(require("./ubill")); +const ucdn_1 = __importDefault(require("./ucdn")); +const udb_1 = __importDefault(require("./udb")); +const uddb_1 = __importDefault(require("./uddb")); +const udisk_1 = __importDefault(require("./udisk")); +const udpn_1 = __importDefault(require("./udpn")); +const uec_1 = __importDefault(require("./uec")); +const ufile_1 = __importDefault(require("./ufile")); +const ufs_1 = __importDefault(require("./ufs")); +const uhost_1 = __importDefault(require("./uhost")); +const uk8s_1 = __importDefault(require("./uk8s")); +const ulb_1 = __importDefault(require("./ulb")); +const umem_1 = __importDefault(require("./umem")); +const unet_1 = __importDefault(require("./unet")); +const uphone_1 = __importDefault(require("./uphone")); +const uphost_1 = __importDefault(require("./uphost")); +const usms_1 = __importDefault(require("./usms")); +const uvms_1 = __importDefault(require("./uvms")); +const vpc_1 = __importDefault(require("./vpc")); +class Client extends client_1.default { constructor({ config, credential, }) { super({ config, credential }); } cube() { - return new CubeClient({ config: this.config, credential: this.credential }); + return new cube_1.default({ config: this.config, credential: this.credential }); } ipsecvpn() { - return new IPSecVPNClient({ + return new ipsecvpn_1.default({ config: this.config, credential: this.credential, }); } pathx() { - return new PathXClient({ + return new pathx_1.default({ config: this.config, credential: this.credential, }); } uaccount() { - return new UAccountClient({ + return new uaccount_1.default({ config: this.config, credential: this.credential, }); } ubill() { - return new UBillClient({ + return new ubill_1.default({ config: this.config, credential: this.credential, }); } ucdn() { - return new UCDNClient({ config: this.config, credential: this.credential }); + return new ucdn_1.default({ config: this.config, credential: this.credential }); } udb() { - return new UDBClient({ config: this.config, credential: this.credential }); + return new udb_1.default({ config: this.config, credential: this.credential }); } uddb() { - return new UDDBClient({ config: this.config, credential: this.credential }); + return new uddb_1.default({ config: this.config, credential: this.credential }); } udisk() { - return new UDiskClient({ + return new udisk_1.default({ config: this.config, credential: this.credential, }); } udpn() { - return new UDPNClient({ config: this.config, credential: this.credential }); + return new udpn_1.default({ config: this.config, credential: this.credential }); } uec() { - return new UECClient({ config: this.config, credential: this.credential }); + return new uec_1.default({ config: this.config, credential: this.credential }); } ufile() { - return new UFileClient({ + return new ufile_1.default({ config: this.config, credential: this.credential, }); } ufs() { - return new UFSClient({ config: this.config, credential: this.credential }); + return new ufs_1.default({ config: this.config, credential: this.credential }); } uhost() { - return new UHostClient({ + return new uhost_1.default({ config: this.config, credential: this.credential, }); } uk8s() { - return new UK8SClient({ config: this.config, credential: this.credential }); + return new uk8s_1.default({ config: this.config, credential: this.credential }); } ulb() { - return new ULBClient({ config: this.config, credential: this.credential }); + return new ulb_1.default({ config: this.config, credential: this.credential }); } umem() { - return new UMemClient({ config: this.config, credential: this.credential }); + return new umem_1.default({ config: this.config, credential: this.credential }); } unet() { - return new UNetClient({ config: this.config, credential: this.credential }); + return new unet_1.default({ config: this.config, credential: this.credential }); } uphone() { - return new UPhoneClient({ + return new uphone_1.default({ config: this.config, credential: this.credential, }); } uphost() { - return new UPHostClient({ + return new uphost_1.default({ config: this.config, credential: this.credential, }); } usms() { - return new USMSClient({ config: this.config, credential: this.credential }); + return new usms_1.default({ config: this.config, credential: this.credential }); } uvms() { - return new UVMSClient({ config: this.config, credential: this.credential }); + return new uvms_1.default({ config: this.config, credential: this.credential }); } vpc() { - return new VPCClient({ config: this.config, credential: this.credential }); + return new vpc_1.default({ config: this.config, credential: this.credential }); } } exports.Client = Client; diff --git a/src/services/index.ts b/src/services/index.ts index 73d4a53..38a9414 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -1,30 +1,30 @@ import { ConfigOptions } from '../core/config'; import { CredentialOptions } from '../core/credential'; -const BaseClient = require('../core/client').default; - -const CubeClient = require('./cube').default; -const IPSecVPNClient = require('./ipsecvpn').default; -const PathXClient = require('./pathx').default; -const UAccountClient = require('./uaccount').default; -const UBillClient = require('./ubill').default; -const UCDNClient = require('./ucdn').default; -const UDBClient = require('./udb').default; -const UDDBClient = require('./uddb').default; -const UDiskClient = require('./udisk').default; -const UDPNClient = require('./udpn').default; -const UECClient = require('./uec').default; -const UFileClient = require('./ufile').default; -const UFSClient = require('./ufs').default; -const UHostClient = require('./uhost').default; -const UK8SClient = require('./uk8s').default; -const ULBClient = require('./ulb').default; -const UMemClient = require('./umem').default; -const UNetClient = require('./unet').default; -const UPhoneClient = require('./uphone').default; -const UPHostClient = require('./uphost').default; -const USMSClient = require('./usms').default; -const UVMSClient = require('./uvms').default; -const VPCClient = require('./vpc').default; + +import BaseClient from '../core/client'; +import CubeClient from './cube'; +import IPSecVPNClient from './ipsecvpn'; +import PathXClient from './pathx'; +import UAccountClient from './uaccount'; +import UBillClient from './ubill'; +import UCDNClient from './ucdn'; +import UDBClient from './udb'; +import UDDBClient from './uddb'; +import UDiskClient from './udisk'; +import UDPNClient from './udpn'; +import UECClient from './uec'; +import UFileClient from './ufile'; +import UFSClient from './ufs'; +import UHostClient from './uhost'; +import UK8SClient from './uk8s'; +import ULBClient from './ulb'; +import UMemClient from './umem'; +import UNetClient from './unet'; +import UPhoneClient from './uphone'; +import UPHostClient from './uphost'; +import USMSClient from './usms'; +import UVMSClient from './uvms'; +import VPCClient from './vpc'; export class Client extends BaseClient { constructor({ @@ -55,100 +55,100 @@ export class Client extends BaseClient { }); } - uaccount() { + uaccount(): UAccountClient { return new UAccountClient({ config: this.config, credential: this.credential, }); } - ubill() { + ubill(): UBillClient { return new UBillClient({ config: this.config, credential: this.credential, }); } - ucdn() { + ucdn(): UCDNClient { return new UCDNClient({ config: this.config, credential: this.credential }); } - udb() { + udb(): UDBClient { return new UDBClient({ config: this.config, credential: this.credential }); } - uddb() { + uddb(): UDDBClient { return new UDDBClient({ config: this.config, credential: this.credential }); } - udisk() { + udisk(): UDiskClient { return new UDiskClient({ config: this.config, credential: this.credential, }); } - udpn() { + udpn(): UDPNClient { return new UDPNClient({ config: this.config, credential: this.credential }); } - uec() { + uec(): UECClient { return new UECClient({ config: this.config, credential: this.credential }); } - ufile() { + ufile(): UFileClient { return new UFileClient({ config: this.config, credential: this.credential, }); } - ufs() { + ufs(): UFSClient { return new UFSClient({ config: this.config, credential: this.credential }); } - uhost() { + uhost(): UHostClient { return new UHostClient({ config: this.config, credential: this.credential, }); } - uk8s() { + uk8s(): UK8SClient { return new UK8SClient({ config: this.config, credential: this.credential }); } - ulb() { + ulb(): ULBClient { return new ULBClient({ config: this.config, credential: this.credential }); } - umem() { + umem(): UMemClient { return new UMemClient({ config: this.config, credential: this.credential }); } - unet() { + unet(): UNetClient { return new UNetClient({ config: this.config, credential: this.credential }); } - uphone() { + uphone(): UPhoneClient { return new UPhoneClient({ config: this.config, credential: this.credential, }); } - uphost() { + uphost(): UPHostClient { return new UPHostClient({ config: this.config, credential: this.credential, }); } - usms() { + usms(): USMSClient { return new USMSClient({ config: this.config, credential: this.credential }); } - uvms() { + uvms(): UVMSClient { return new UVMSClient({ config: this.config, credential: this.credential }); }