@cloudbase/app 3.0.3 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.7.1",
     "@cloudbase/adapter-wx_mp": "^1.2.1",
-    "@cloudbase/types": "3.0.3",
-    "@cloudbase/utilities": "3.0.3"
+    "@cloudbase/types": "3.0.4",
+    "@cloudbase/utilities": "3.0.4"
   },
-  "gitHead": "f636691d8dd8edef8c44e788512fa5a1bbbb11af"
+  "gitHead": "b5f5f8541b7e0d944bf345f8aa23c4e0ccb42b4f"
 }

package/src/index.ts

@@ -101,12 +101,6 @@ class Cloudbase implements ICloudbase {
     ],
   })
   public init(config: ICloudbaseConfig & { lang?: LANGS }): Cloudbase {
-    if (!config.env) {
-      throw new Error(JSON.stringify({
-        code: ERRORS.INVALID_PARAMS,
-        msg: 'env must not be specified',
-      }),)
-    }
     config.endPointMode = config.endPointMode || 'GATEWAY'
 
     // 初始化时若未兼容平台，则使用默认adapter
@@ -114,11 +108,22 @@ class Cloudbase implements ICloudbase {
       this.useDefaultAdapter()
     }
 
-    const reqConfig: IRequestConfig = {
+    // 在判断config.env之前，先处理node环境的配置
+    config = this.dealNodeAdapterConfig(config)
+
+    if (!config.env) {
+      throw new Error(JSON.stringify({
+        code: ERRORS.INVALID_PARAMS,
+        msg: 'env must not be specified',
+      }),)
+    }
+
+    const reqConfig: IRequestConfig & { auth: ICloudbaseConfig['auth'] } = {
       timeout: config.timeout || 5000,
       timeoutMsg: `[${getSdkName()}][REQUEST TIMEOUT] request had been abort since didn't finished within${
         config.timeout / 1000
       }s`,
+      auth: config.auth,
     }
 
     this.requestClient = new Platform.adapter.reqClass(reqConfig)
@@ -148,12 +153,18 @@ class Cloudbase implements ICloudbase {
       _fromApp: app,
       i18n,
       endPointMode: config.endPointMode,
+      auth: config.auth,
     })
     app.requestClient = this.requestClient
     ;(this as any)?.fire?.('cloudbase_init', app)
 
     this.try2InitAuth(app)
 
+    // node环境可以从adapter获取nodeTool的方法
+    if (Platform.adapter?.nodeTool) {
+      Platform.adapter?.nodeTool(app, this.cloudbaseConfig)
+    }
+
     return app
   }
 
@@ -273,6 +284,39 @@ class Cloudbase implements ICloudbase {
       console.log('try2InitAuth error:', error)
     }
   }
+
+  /**
+   * 处理 Node 环境下 adapter 的配置信息
+   * 在 Node 环境中，通过 adapter 自动获取密钥、环境ID、accessKey 等配置，
+   * 减少用户手动传入配置的负担
+   * @param config - 云开发初始化配置对象
+   * @returns 补充了 Node adapter 信息后的配置对象
+   */
+  private dealNodeAdapterConfig(config: ICloudbaseConfig) {
+    // node环境可以从adapter获取默认的secretId和secretKey
+    if (Platform.adapter?.getSecretInfo) {
+      const secretInfo = Platform.adapter?.getSecretInfo(config)
+      // 将 adapter 提供的密钥信息写入 config.auth
+      config.auth = {
+        secretId: secretInfo.secretId,
+        secretKey: secretInfo.secretKey,
+        sessionToken: secretInfo.sessionToken,
+        secretType: secretInfo.secretType as any,
+      }
+
+      // node 环境可能可以从上下文获取env，用户未显式指定时自动填充
+      if (!config.env) {
+        config.env = secretInfo.env
+      }
+
+      // node adapter环境能读取到 process.env.CLOUDBASE_APIKEY 时，在没有传入accessKey时，使用 node adapter 提供的 accessKey（process.env.CLOUDBASE_APIKEY）
+      if (!config.accessKey && secretInfo.accessKey) {
+        config.accessKey = secretInfo.accessKey
+      }
+    }
+
+    return config
+  }
 }
 
 // 类型导出

package/src/libs/request.ts

@@ -113,10 +113,11 @@ export class CloudbaseRequest implements ICloudbaseRequest {
    */
   constructor(config: ICloudbaseRequestConfig & { throw?: boolean }) {
     this.config = config
-    const reqConfig: IRequestConfig = {
+    const reqConfig: IRequestConfig & { auth: ICloudbaseRequestConfig['auth'] } = {
       timeout: this.config.timeout,
       timeoutMsg: `[@cloudbase/js-sdk] 请求在${this.config.timeout / 1000}s内未完成，已中断`,
       restrictedMethods: ['post', 'put'],
+      auth: config.auth,
     }
     this.reqClass = new Platform.adapter.reqClass(reqConfig)
     this.throwWhenRequestFail = config.throw || false
@@ -201,6 +202,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       search?: string
       defaultQuery?: KV<any>
       headers?: KV<string>
+      endPointMode?: 'CLOUD_API' | 'GATEWAY'
     },
     customReqOpts?: ICustomReqOpts,
   ): Promise<ResponseObject> {
@@ -284,7 +286,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         ...formatQuery,
       })
 
-    const endPointMode = this.config.endPointMode || 'CLOUD_API'
+    const endPointMode = options?.endPointMode || this.config.endPointMode || 'CLOUD_API'
 
     const url = getEndPointInfo(this.config.env, endPointMode)
     let BASE_URL = url.baseUrl