@cloudbase/app 3.0.5 → 3.1.0

package/package.json

@@ -1,9 +1,21 @@
 {
   "name": "@cloudbase/app",
-  "version": "3.0.5",
+  "version": "3.1.0",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
+  "exports": {
+    ".": {
+      "node": {
+        "import": "./dist/esm/index.node.js",
+        "require": "./dist/cjs/index.node.js"
+      },
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "default": "./dist/cjs/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
     "tsc": "rm -rf dist/ && tsc -p tsconfig.esm.json && tsc -p tsconfig.json",
     "lint": "eslint --fix \"./src/**/*.ts\"",
@@ -31,8 +43,8 @@
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.7.1",
     "@cloudbase/adapter-wx_mp": "^1.2.1",
-    "@cloudbase/types": "3.0.5",
-    "@cloudbase/utilities": "3.0.5"
+    "@cloudbase/types": "3.1.0",
+    "@cloudbase/utilities": "3.1.0"
   },
   "peerDependencies": {
     "@cloudbase/signature-nodejs": ">=1.0.0",
@@ -50,5 +62,5 @@
       "optional": true
     }
   },
-  "gitHead": "5f712e638aa0a0f082986a31c6288b18125a3e24"
+  "gitHead": "fa22a3b2fae8327ba8243c5634d540e99e0aefe7"
 }

package/src/index.node.ts

@@ -0,0 +1,22 @@
+/**
+ * Node.js 入口
+ * 引用 base 模块的全部导出，并额外加载 Node adapter
+ */
+import cloudbase from './index'
+
+export { getBaseEndPoint } from './constants/common'
+export { LANGS } from './libs/lang'
+export type { Cloudbase } from './index'
+export { cloudbase }
+
+// Node 环境下加载 Node adapter
+try {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
+  const nodeAdapter = require('./libs/adapter-node').default
+  cloudbase.useAdapters(nodeAdapter)
+} catch (error) {
+  throw error
+}
+
+// 默认导出实例
+export default cloudbase

package/src/index.ts

@@ -119,7 +119,7 @@ class Cloudbase implements ICloudbase {
     }
 
     const reqConfig: IRequestConfig & { auth: ICloudbaseConfig['auth'] } = {
-      timeout: config.timeout || 5000,
+      timeout: config.timeout || 15000,
       timeoutMsg: `[${getSdkName()}][REQUEST TIMEOUT] request had been abort since didn't finished within${
         config.timeout / 1000
       }s`,
@@ -294,7 +294,7 @@ class Cloudbase implements ICloudbase {
    */
   private dealNodeAdapterConfig(config: ICloudbaseConfig) {
     // node环境可以从adapter获取默认的secretId和secretKey
-    if (!process.env.IS_BROWSER_BUILD && Platform.adapter?.getSecretInfo) {
+    if (typeof process !== 'undefined' && typeof process.env !== 'undefined' && !process.env.IS_BROWSER_BUILD && Platform.adapter?.getSecretInfo) {
       const secretInfo = Platform.adapter?.getSecretInfo(config)
       // 将 adapter 提供的密钥信息写入 config.auth
       config.auth = {
@@ -328,16 +328,5 @@ export const cloudbase: ICloudbase = new Cloudbase()
 
 cloudbase.useAdapters(getWxDefaultAdapter())
 
-// Node 环境下动态引入 adapter，浏览器/小程序打包时 IS_BROWSER_BUILD=true，此分支会被 tree-shaking 移除
-if (!process.env.IS_BROWSER_BUILD) {
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
-    const nodeAdapter = require('./libs/adapter-node').default
-    cloudbase.useAdapters(nodeAdapter)
-  } catch (error) {
-    throw error
-  }
-}
-
 // 默认导出实例
 export default cloudbase

package/src/libs/adapter-node/request.ts

@@ -21,6 +21,7 @@ import {
   getCurrRunEnvTag,
 } from './utils'
 import { ICloudbaseConfig } from '@cloudbase/types'
+import { getSdkVersion } from '../../constants/common'
 // 延迟加载，避免非 Node 环境打包时引入此包
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let signFn: ((...args: any[]) => any) | null = null
@@ -133,7 +134,7 @@ export class NodeRequest implements SDKRequestInterface {
 
     options.headers = {
       ...options.headers,
-      'User-Agent': `adapter-node/${options.headers?.['X-SDK-Version'] || ''}`,
+      'User-Agent': `adapter-node/${options.headers?.['X-SDK-Version'] || `@cloudbase/js-sdk/${getSdkVersion()}`}`,
       'X-TCB-Source': SOURCE,
       'X-Client-Timestamp': new Date().valueOf(),
       'X-TCB-Region': INIT_CONFIG.region || getEnv('TENCENTCLOUD_REGION') || '',
@@ -199,6 +200,10 @@ export class NodeRequest implements SDKRequestInterface {
       headers['Content-Type'] = headers['Content-Type'].toLowerCase()
     }
 
+    if (isAdminPath && !!sessionToken) {
+      params.sessionToken = sessionToken
+    }
+
     const signedParams = {
       secretId,
       secretKey,
@@ -211,7 +216,6 @@ export class NodeRequest implements SDKRequestInterface {
       isCloudApi: !isAdminPath,
     }
 
-    console.log('======signedParams', signedParams)
 
     const sign = await getSign()
     if (!sign) return options
@@ -219,8 +223,14 @@ export class NodeRequest implements SDKRequestInterface {
     const { authorization, timestamp } = sign(signedParams)
 
     if (typeof sessionToken === 'string' && sessionToken !== '') {
-      // 临时密钥需要额外附带 Token
-      headers.Authorization = `${authorization}, Timestamp=${timestamp}, Token=${sessionToken}`
+      if (isAdminPath) {
+        headers.Authorization = `${authorization}`
+        headers['X-Timestamp'] = timestamp
+        headers['X-Signature-Expires'] = 600
+      } else  {
+        // 临时密钥需要额外附带 Token
+        headers.Authorization = `${authorization}, Timestamp=${timestamp}, Token=${sessionToken}`
+      }
     } else {
       headers.Authorization = `${authorization}, Timestamp=${timestamp}`
 
@@ -365,8 +375,6 @@ export class NodeRequest implements SDKRequestInterface {
       signal: abortController.signal,
     })
 
-    console.log('======fetchOptions', url, fetchOptions)
-
     const res = await fetch(url, fetchOptions as RequestInit)
       .then((x) => {
         clearTimeout(timer)
@@ -451,8 +459,6 @@ export class NodeRequest implements SDKRequestInterface {
       signal,
     })
 
-    console.log('======requestOptions', realUrl, requestOptions)
-
     try {
       const response = await fetch(realUrl, requestOptions as RequestInit)
       const result: ResponseObject = {

package/webpack/web.prod.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
 const path = require('path')
 const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin')

package/webpack/webpack.miniprogram.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
 const path = require('path')
 const { ignoreNodeDepsPlugins } = require('../../../webpack.ignore-node-deps')