@gm-mobile/mp-request 3.12.4 → 3.12.5-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/mp-request",
-  "version": "3.12.4",
+  "version": "3.12.5-beta.0",
   "description": "> TODO: description",
   "author": "zhongsink <zhongink@gmail.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -20,9 +20,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-tool": "^3.12.4",
-    "@gm-mobile/locales": "^3.12.4",
-    "@gm-mobile/mp": "^3.12.4",
+    "@gm-mobile/c-tool": "^3.12.5-beta.0",
+    "@gm-mobile/locales": "^3.12.5-beta.0",
+    "@gm-mobile/mp": "^3.12.5-beta.0",
     "js-base64": "^3.6.0"
   },
   "peerDependencies": {
@@ -30,5 +30,5 @@
     "taro-axios": "^1.1.1",
     "weapp-cookie": "^1.4.6"
   },
-  "gitHead": "b693849244eb99ea05e351d1d7a8110eed8bd132"
+  "gitHead": "b4c4723f59e2c855d0e19632f87c8d9a8a7a2088"
 }

package/src/config_error.ts

@@ -29,7 +29,7 @@ function wrap(
   // 如果错误了
   if (_.isNaN(code) || !sucCode.includes(code + '')) {
     if (code) {
-      message = `${getLocale('未知错误')}: ${code}`
+      message = `${getLocale('未知错误')}`
     }
 
     errorCallback(message, wrapRes)

package/src/index.ts

@@ -23,4 +23,6 @@ export {
   configPrivateDomain,
   clearPrivateDomain,
 }
+
+export { formatErrorMessage } from './util'
 export type { Response } from './types'

package/src/util.ts

@@ -154,6 +154,42 @@ function getUrlRandom(url: string): string {
   return stringifyUrl(obj)
 }
 
+/**
+ * 格式化错误信息
+ *
+ * 异常编码不存在或<2000:
+ * <异常编码> <异常详细信息或异常编码翻译> rid: <请求ID> 日期: <请求时间>
+ *
+ * 异常编码>=2000:
+ * <异常编码> <异常详细信息或异常编码翻译>
+ */
+function formatErrorMessage(
+  code: number,
+  message: string,
+  statusCodeMap: Record<string, string>,
+  response?: AxiosResponse
+): string {
+  let customizeReason = response?.data.message.detail?.reason
+  const codeMessage = statusCodeMap[code]
+  const rid = response?.config.headers['X-Request-Id']
+  const timestamp =
+    response?.config.headers['X-Timestamp'] || new Date().valueOf()
+
+  const isGrpcStatusCode = code < 2000
+
+  if (!customizeReason) {
+    customizeReason = codeMessage || message || '服务异常'
+  }
+
+  let reason = `${code} ${customizeReason}`
+
+  if (isGrpcStatusCode) {
+    reason += ` rid: ${rid} 日期: ${timestamp}`
+  }
+
+  return reason
+}
+
 export {
   requestUrl,
   requestEnvUrl,
@@ -165,4 +201,5 @@ export {
   isProduction,
   requestTrim,
   formatToResponse,
+  formatErrorMessage,
 }