@cloudbase/node-sdk 3.14.0 → 3.14.2

package/dist/cloudbase.js

@@ -115,8 +115,8 @@ class CloudBase {
                     token: (await this.auth().getClientCredential()).access_token
                 });
                 return result.body;
-            }, (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/model' }), {
-                sqlBaseUrl: (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/sql' })
+            }, (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/model', region: this.config.region }), {
+                sqlBaseUrl: (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/sql', region: this.config.region })
             });
             this.models = httpClient;
         }
@@ -133,7 +133,8 @@ class CloudBase {
                     mysqlBaseUrl: (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({
                         serviceUrl: this.config.serviceUrl,
                         envId,
-                        path: '/v1/rdb/rest'
+                        path: '/v1/rdb/rest',
+                        region: this.config.region
                     }),
                     fetch: async (url, options) => {
                         var _a;
@@ -171,6 +172,9 @@ class CloudBase {
             this.mysql = (options) => {
                 return getEntity(options)(options);
             };
+            this.rdb = (options) => {
+                return getEntity(options)(options);
+            };
         }
         catch (e) {
             // ignore

package/dist/utils/tcbopenapicommonrequester.js

@@ -88,7 +88,8 @@ class TcbOpenApiHttpCommonRequester {
             : args.config.envName;
         const url = args.url || (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({
             envId,
-            path: args.path
+            path: args.path,
+            region: config.region
         });
         const timeout = ((_a = this.args.opts) === null || _a === void 0 ? void 0 : _a.timeout) || this.config.timeout || this.defaultTimeout;
         const opts = {

package/dist/utils/tcbopenapiendpoint.js

@@ -1,14 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildCommonOpenApiUrlWithPath = exports.buildUrl = void 0;
+const ZONE_CHINA = ['ap-shanghai', 'ap-guangzhou', 'ap-shenzhen-fsi', 'ap-shanghai-fsi', 'ap-nanjing', 'ap-beijing', 'ap-chengdu', 'ap-chongqing', 'ap-hongkong'];
 /* eslint-disable complexity */
 function buildUrl(options) {
-    const endpoint = `https://${options.envId}.api.tcloudbasegateway.com/v1/cloudrun/${options.name}`;
+    const endpoint = `https://${getGatewayUrl(options)}/v1/cloudrun/${options.name}`;
     const path = options.path.startsWith('/') ? options.path : `/${options.path}`;
     return `${endpoint}${path}`;
 }
 exports.buildUrl = buildUrl;
 function buildCommonOpenApiUrlWithPath(options) {
-    return `${options.protocol || 'https'}://${options.serviceUrl || `${options.envId}.api.tcloudbasegateway.com`}${options.path}`;
+    return `${options.protocol || 'https'}://${options.serviceUrl || getGatewayUrl(options)}${options.path}`;
 }
 exports.buildCommonOpenApiUrlWithPath = buildCommonOpenApiUrlWithPath;
+function getGatewayUrl(options) {
+    const region = options.region || 'ap-shanghai';
+    let baseUrl = `${options.envId}.api.tcloudbasegateway.com`;
+    if (!ZONE_CHINA.includes(region)) {
+        baseUrl = `${options.envId}.api.intl.tcloudbasegateway.com`;
+    }
+    return baseUrl;
+}

package/dist/utils/tcbopenapirequester.js

@@ -88,7 +88,7 @@ class TcbOpenApiHttpRequester {
             : args.config.envName;
         const url = (0, tcbopenapiendpoint_1.buildUrl)({
             envId,
-            // region: this.config.region,
+            region: this.config.region,
             // protocol: this.config.protocol || 'https',
             // serviceUrl: this.config.serviceUrl,
             // seqId: this.tracingInfo.seqId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/node-sdk",
-  "version": "3.14.0",
+  "version": "3.14.2",
   "description": "tencent cloud base server sdk for node.js",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",

package/src/cloudbase.ts

@@ -82,6 +82,7 @@ export class CloudBase {
   public models: OrmClient & OrmRawQueryClient
 
   public mysql: IMySqlClient
+  public rdb: IMySqlClient
 
   public constructor(config?: ICloudBaseConfig) {
     this.init(config)
@@ -161,8 +162,8 @@ export class CloudBase {
           token: (await this.auth().getClientCredential()).access_token
         })
         return result.body
-      }, buildCommonOpenApiUrlWithPath({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/model' }), {
-        sqlBaseUrl: buildCommonOpenApiUrlWithPath({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/sql' })
+      }, buildCommonOpenApiUrlWithPath({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/model', region: this.config.region }), {
+        sqlBaseUrl: buildCommonOpenApiUrlWithPath({ serviceUrl: this.config.serviceUrl, envId, path: '/v1/sql', region: this.config.region })
       })
 
       this.models = httpClient
@@ -183,7 +184,8 @@ export class CloudBase {
           mysqlBaseUrl: buildCommonOpenApiUrlWithPath({
             serviceUrl: this.config.serviceUrl,
             envId,
-            path: '/v1/rdb/rest'
+            path: '/v1/rdb/rest',
+            region: this.config.region
           }),
 
           fetch: async (url: RequestInfo | URL, options: RequestInit) => {
@@ -237,6 +239,9 @@ export class CloudBase {
       this.mysql = (options: IMySqlOptions) => {
         return getEntity(options)(options)
       }
+      this.rdb = (options: IMySqlOptions) => {
+        return getEntity(options)(options)
+      }
     } catch (e) {
       // ignore
     }

package/src/utils/tcbopenapicommonrequester.ts

@@ -91,7 +91,8 @@ export class TcbOpenApiHttpCommonRequester {
 
     const url = args.url || buildCommonOpenApiUrlWithPath({
       envId,
-      path: args.path
+      path: args.path,
+      region: config.region
     })
 
     const timeout = this.args.opts?.timeout || this.config.timeout || this.defaultTimeout

package/src/utils/tcbopenapiendpoint.ts

@@ -1,6 +1,8 @@
+const ZONE_CHINA = ['ap-shanghai', 'ap-guangzhou', 'ap-shenzhen-fsi', 'ap-shanghai-fsi', 'ap-nanjing', 'ap-beijing', 'ap-chengdu', 'ap-chongqing', 'ap-hongkong']
+
 /* eslint-disable complexity */
 export function buildUrl(options: {
-  envId?: string
+  envId: string
   region?: string
   protocol?: 'http' | 'https'
   serviceUrl?: string
@@ -9,7 +11,7 @@ export function buildUrl(options: {
   name: string
   path: string
 }): string {
-  const endpoint = `https://${options.envId}.api.tcloudbasegateway.com/v1/cloudrun/${options.name}`
+  const endpoint = `https://${getGatewayUrl(options)}/v1/cloudrun/${options.name}`
   const path = options.path.startsWith('/') ? options.path : `/${options.path}`
   return `${endpoint}${path}`
 }
@@ -19,6 +21,20 @@ export function buildCommonOpenApiUrlWithPath(options: {
   protocol?: 'http' | 'https'
   path: string
   serviceUrl?: string
+  region?: string
 }): string {
-  return `${options.protocol || 'https'}://${options.serviceUrl || `${options.envId}.api.tcloudbasegateway.com`}${options.path}`
+  return `${options.protocol || 'https'}://${options.serviceUrl || getGatewayUrl(options)}${options.path}`
+}
+
+function getGatewayUrl(options: {
+  envId: string
+  region?: string
+}): string {
+  const region = options.region || 'ap-shanghai'
+  let baseUrl = `${options.envId}.api.tcloudbasegateway.com`
+
+  if (!ZONE_CHINA.includes(region)) {
+    baseUrl = `${options.envId}.api.intl.tcloudbasegateway.com`
+  }
+  return baseUrl
 }

package/src/utils/tcbopenapirequester.ts

@@ -93,7 +93,7 @@ export class TcbOpenApiHttpRequester {
 
     const url = buildUrl({
       envId,
-      // region: this.config.region,
+      region: this.config.region,
       // protocol: this.config.protocol || 'https',
       // serviceUrl: this.config.serviceUrl,
       // seqId: this.tracingInfo.seqId,

package/types/index.d.ts

@@ -194,6 +194,7 @@ export interface ICloudBaseConfig extends IKeyValue {
   proxy?: string
   version?: string
   credentials?: ICredentialsInfo
+  region?: string
 
   // @cloudbase/functions-framework 函数上下文，只要求部分字段
   context?: Readonly<{