@cloudbase/app 3.0.5 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "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.5",
-    "@cloudbase/utilities": "3.0.5"
+    "@cloudbase/types": "3.0.6",
+    "@cloudbase/utilities": "3.0.6"
   },
   "peerDependencies": {
     "@cloudbase/signature-nodejs": ">=1.0.0",
@@ -50,5 +50,5 @@
       "optional": true
     }
   },
-  "gitHead": "5f712e638aa0a0f082986a31c6288b18125a3e24"
+  "gitHead": "157feb77139fd344ddcb80fd3bd94c282e853664"
 }

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`,

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')