@lark-apaas/client-toolkit 1.2.1-alpha.20 → 1.2.1-alpha.22

package/lib/utils/axiosConfig.d.ts

@@ -14,4 +14,4 @@ declare module 'axios' {
  * @param originalInstance 原始的 axios 实例
  */
 export declare function wrapAxiosWithTrace(originalInstance: AxiosInstance): AxiosInstance;
-export declare function initAxiosConfig(axiosInstance?: AxiosInstance): AxiosInstance;
+export declare function initAxiosConfig(axiosInstance?: AxiosInstance): void;

package/lib/utils/axiosConfig.js

@@ -130,6 +130,7 @@ async function logResponse(ok, responseOrError) {
 }
 const requestStacktraceMap = new Map();
 function wrapAxiosWithTrace(originalInstance) {
+    const originalRequestMethod = originalInstance.request;
     const tracedRequest = function(configOrUrl, config) {
         let finalConfig;
         if ('string' == typeof configOrUrl) {
@@ -141,8 +142,8 @@ function wrapAxiosWithTrace(originalInstance) {
             if (!finalConfig.__span) {
                 const url = finalConfig.url || '';
                 const actualMethod = (finalConfig.method || 'GET').toUpperCase();
-                const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-                span = observable.startSpan(`${actualMethod} ${cleanedPath}`);
+                const path = url.split('?')[0] || '/';
+                span = observable.startSpan(`${actualMethod} ${path}`);
                 if (span) {
                     const spanContext = span.spanContext();
                     if (spanContext && spanContext.traceId) {
@@ -150,15 +151,16 @@ function wrapAxiosWithTrace(originalInstance) {
                         if (!finalConfig.headers) finalConfig.headers = {};
                         finalConfig.headers['X-Tt-TraceInfo'] = traceInfo;
                         finalConfig.__span = span;
+                        finalConfig._startTime = finalConfig._startTime || Date.now();
                     }
                 }
             }
         } catch (e) {
             console.error('[ProxyTrace] Start axios trace span failed:', e);
         }
-        const promise = originalInstance.request.call(originalInstance, finalConfig);
+        const promise = originalRequestMethod.call(originalInstance, finalConfig);
         return promise.then((response)=>{
-            handleSpanEnd(response.config, response, null);
+            handleSpanEnd(response.config || finalConfig, response, null);
             return response;
         }, (error)=>{
             handleSpanEnd(error.config || finalConfig, null, error);
@@ -169,12 +171,12 @@ function wrapAxiosWithTrace(originalInstance) {
         try {
             const currentSpan = cfg?.__span;
             if (!currentSpan) return;
-            const startTime = cfg._startTime;
-            const url = cfg.url || "";
-            const method = (cfg.method || 'GET').toUpperCase();
-            const path = url.split('?')[0] || '/';
             const errorResponse = error?.response || {};
             const errorMessage = error?.message || '未知错误';
+            const startTime = cfg._startTime;
+            const url = response?.request?.responseURL || errorResponse?.request?.responseURL || cfg.url || "";
+            const method = (cfg.method || 'GET').toUpperCase();
+            const path = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
             const logData = {
                 method,
                 path,
@@ -207,26 +209,25 @@ function wrapAxiosWithTrace(originalInstance) {
     });
 }
 function initAxiosConfig(axiosInstance) {
-    const instance = axiosInstance || axios;
-    instance.interceptors.request.use((config)=>{
+    if (!axiosInstance) axiosInstance = axios;
+    axiosInstance.interceptors.request.use((config)=>{
         const requestUUID = crypto.randomUUID();
         if ('production' !== process.env.NODE_ENV) {
             const stacktrace = getStacktrace();
             requestStacktraceMap.set(requestUUID, stacktrace);
         }
         config._requestUUID = requestUUID;
-        config._startTime = Date.now();
+        config._startTime = config._startTime || Date.now();
         const csrfToken = window.csrfToken;
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
         return config;
     }, (error)=>Promise.reject(error));
-    'production' !== process.env.NODE_ENV && instance.interceptors.response.use((response)=>{
+    'production' !== process.env.NODE_ENV && axiosInstance.interceptors.response.use((response)=>{
         logResponse('success', response);
         return response;
     }, (error)=>{
         logResponse('error', error.response || error);
         return Promise.reject(error);
     });
-    return wrapAxiosWithTrace(instance);
 }
 export { initAxiosConfig, wrapAxiosWithTrace };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.1-alpha.20",
+  "version": "1.2.1-alpha.22",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [