@cloudbase/node-sdk 3.14.1 → 3.15.0

package/dist/cloudbase.js

@@ -115,67 +115,14 @@ class CloudBase {
                     token: (await this.auth().getClientCredential()).access_token
                 });
                 return result.body;
-            }, (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 })
+            }, (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' })
             });
             this.models = httpClient;
         }
         catch (e) {
             // ignore
         }
-        try {
-            const getEntity = (options) => {
-                const envId = this.config.envName === symbol_1.SYMBOL_CURRENT_ENV
-                    ? openapicommonrequester.getEnvIdFromContext()
-                    : this.config.envName;
-                const { instance = 'default', database = envId } = options || {};
-                const mysqlClient = wx_cloud_client_sdk_1.default.generateMySQLClient(this, {
-                    mysqlBaseUrl: (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({
-                        serviceUrl: this.config.serviceUrl,
-                        envId,
-                        path: '/v1/rdb/rest',
-                        region: this.config.region
-                    }),
-                    fetch: async (url, options) => {
-                        var _a;
-                        let headers = {};
-                        if (options.headers instanceof Headers) {
-                            options.headers.forEach((value, key) => {
-                                headers[key] = value;
-                            });
-                        }
-                        else {
-                            headers = options.headers || {};
-                        }
-                        const result = await openapicommonrequester.request({
-                            config: this.config,
-                            data: safeParseJSON(options.body),
-                            method: (_a = options.method) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
-                            url: url instanceof URL ? url.href : String(url),
-                            headers: Object.assign({ 'Content-Type': 'application/json' }, headersInitToRecord(Object.assign({ 'X-Db-Instance': instance, 'Accept-Profile': database, 'Content-Profile': database }, headers))),
-                            token: (await this.auth().getClientCredential()).access_token
-                        });
-                        const data = result.body;
-                        const res = {
-                            ok: (result === null || result === void 0 ? void 0 : result.statusCode) >= 200 && (result === null || result === void 0 ? void 0 : result.statusCode) < 300,
-                            status: (result === null || result === void 0 ? void 0 : result.statusCode) || 200,
-                            statusText: (result === null || result === void 0 ? void 0 : result.statusMessage) || 'OK',
-                            json: async () => await Promise.resolve(data || {}),
-                            text: async () => await Promise.resolve(typeof data === 'string' ? data : JSON.stringify(data || {})),
-                            headers: new Headers((result === null || result === void 0 ? void 0 : result.headers) || {})
-                        };
-                        return res;
-                    }
-                });
-                return mysqlClient;
-            };
-            this.mysql = (options) => {
-                return getEntity(options)(options);
-            };
-        }
-        catch (e) {
-            // ignore
-        }
     }
     logger() {
         if (!this.clsLogger) {

package/dist/utils/tcbopenapicommonrequester.js

@@ -88,8 +88,7 @@ class TcbOpenApiHttpCommonRequester {
             : args.config.envName;
         const url = args.url || (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({
             envId,
-            path: args.path,
-            region: config.region
+            path: args.path
         });
         const timeout = ((_a = this.args.opts) === null || _a === void 0 ? void 0 : _a.timeout) || this.config.timeout || this.defaultTimeout;
         const opts = {
@@ -108,7 +107,7 @@ class TcbOpenApiHttpCommonRequester {
             opts.keepalive = typeof config.keepalive === 'boolean' && config.keepalive;
         }
         if (args.data) {
-            if (['post', 'put', 'patch', 'delete'].includes(args.method.toLowerCase())) {
+            if (['post', 'put'].includes(args.method.toLowerCase())) {
                 if (args.isFormData) {
                     opts.formData = args.data;
                     opts.encoding = null;

package/dist/utils/tcbopenapiendpoint.js

@@ -1,23 +1,14 @@
 "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://${getGatewayUrl(options)}/v1/cloudrun/${options.name}`;
+    const endpoint = `https://${options.envId}.api.tcloudbasegateway.com/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 || getGatewayUrl(options)}${options.path}`;
+    return `${options.protocol || 'https'}://${options.serviceUrl || `${options.envId}.api.tcloudbasegateway.com`}${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.1",
+  "version": "3.15.0",
   "description": "tencent cloud base server sdk for node.js",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@cloudbase/database": "1.4.2",
-    "@cloudbase/signature-nodejs": "2.0.0",
+    "@cloudbase/signature-nodejs": "2.2.0",
     "@cloudbase/wx-cloud-client-sdk": "1.7.1",
     "agentkeepalive": "^4.3.0",
     "axios": "0.27.2",

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)
@@ -238,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/tcbopenapirequester.ts

@@ -131,6 +131,7 @@ export class TcbOpenApiHttpRequester {
         }
       } else {
         /* istanbul ignore next */
+        // 这里 qs 参数暂时并没使用
         opts.qs = args.data
       }
     } else {
@@ -184,13 +185,20 @@ export class TcbOpenApiHttpRequester {
 
     requiredHeaders = { ...config.headers, ...args.headers, ...requiredHeaders }
 
+    let params = args.data || ''
+
+    // GET 方法不支持传 BODY
+    if (method.toLowerCase() === 'get') {
+      params = ''
+    }
+
     // TODO: 升级SDK版本，否则没传 args.data 时会签名失败
     const { authorization, timestamp } = sign({
       secretId,
       secretKey,
       method,
       url,
-      params: args.data || '',
+      params,
       headers: requiredHeaders,
       timestamp: second() - 1,
       withSignedParams: false,

package/types/index.d.ts

@@ -394,7 +394,7 @@ export interface CallFunctionResult<T> {
 // https://developers.weixin.qq.com/miniprogram/dev/wxcloudservice/wxcloud/reference-sdk-api/container/Cloud.callContainer.html
 export interface ICallContainerOptions<T> {
   name: string
-  method?: 'POST'
+  method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS'
   path?: string
   header?: IHeaderOpts & {
     // 'X-WX-SERVICE': string