@lark-apaas/client-toolkit 1.2.1-alpha.18 → 1.2.1-alpha.19

package/lib/utils/axiosConfig.d.ts

@@ -9,5 +9,9 @@ declare module 'axios' {
         _requestUUID?: string;
     }
 }
-export declare function patchCreate(): void;
-export declare function initAxiosConfig(axiosInstance?: AxiosInstance): void;
+/**
+ * 使用 Proxy 包装 Axios 实例，实现全链路 Trace 注入
+ * @param originalInstance 原始的 axios 实例
+ */
+export declare function wrapAxiosWithTrace(originalInstance: AxiosInstance): AxiosInstance;
+export declare function initAxiosConfig(axiosInstance?: AxiosInstance): AxiosInstance;

package/lib/utils/axiosConfig.js

@@ -1,4 +1,4 @@
-import axios, { Axios } from "axios";
+import axios from "axios";
 import { observable } from "@lark-apaas/observable-web";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
@@ -129,12 +129,8 @@ async function logResponse(ok, responseOrError) {
     });
 }
 const requestStacktraceMap = new Map();
-let isPrototypeInjected = false;
-function injectAxiosPrototype() {
-    if (isPrototypeInjected) return;
-    isPrototypeInjected = true;
-    const originalRequest = Axios.prototype.request;
-    Axios.prototype.request = function(configOrUrl, config) {
+function wrapAxiosWithTrace(originalInstance) {
+    const tracedRequest = function(configOrUrl, config) {
         let finalConfig;
         if ('string' == typeof configOrUrl) {
             finalConfig = config || {};
@@ -158,78 +154,61 @@ function injectAxiosPrototype() {
                 }
             }
         } catch (e) {
-            console.error('Failed to start axios trace span in prototype:', e);
+            console.error('[ProxyTrace] Start axios trace span failed:', e);
         }
-        const promise = originalRequest.apply(this, arguments);
+        const promise = originalInstance.request.call(originalInstance, finalConfig);
         return promise.then((response)=>{
-            try {
-                const currentSpan = response.config?.__span;
-                if (currentSpan) {
-                    const startTime = response.config._startTime;
-                    const url = response.config.url || "";
-                    const method = (response.config.method || 'GET').toUpperCase();
-                    const path = url.split('?')[0] || '/';
-                    const logData = {
-                        method,
-                        path,
-                        url: response.request?.responseURL || url || "",
-                        duration_ms: startTime ? Date.now() - startTime : void 0,
-                        status: response.status
-                    };
-                    if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
-                    if (response.config.data) logData.request_body = response.config.data;
-                    if (response.data) logData.response = response.data || {};
-                    observable.log('INFO', safeStringify(logData), {}, currentSpan);
-                    'function' == typeof currentSpan.end && currentSpan.end();
-                }
-            } catch (e) {
-                console.error('Failed to log success span:', e);
-            }
+            handleSpanEnd(response.config, response, null);
             return response;
         }, (error)=>{
-            try {
-                const errorConfig = error.config || {};
-                const currentSpan = errorConfig.__span;
-                if (currentSpan) {
-                    const errorResponse = error.response || {};
-                    const startTime = errorConfig._startTime;
-                    const url = errorConfig.url || "";
-                    const method = (errorConfig.method || 'GET').toUpperCase();
-                    const path = url.split('?')[0] || '/';
-                    const errorMessage = error.message || '未知错误';
-                    const logData = {
-                        method,
-                        path,
-                        url: errorResponse.request?.responseURL || errorConfig.url || "",
-                        duration_ms: startTime ? Date.now() - startTime : void 0,
-                        status: errorResponse.status || 200,
-                        error_message: errorMessage
-                    };
-                    if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
-                    if (errorConfig.data) logData.request_body = errorConfig.data;
-                    if (errorResponse.data) logData.response = errorResponse.data || {};
-                    observable.log('ERROR', safeStringify(logData), {}, currentSpan);
-                    'function' == typeof currentSpan.end && currentSpan.end();
-                }
-            } catch (e) {
-                console.error('Failed to log error span:', e);
-            }
+            handleSpanEnd(error.config || finalConfig, null, error);
             return Promise.reject(error);
         });
     };
-}
-function patchCreate() {
-    const originalCreate = axios.create;
-    axios.create = function(config) {
-        injectAxiosPrototype();
-        const instance = originalCreate.call(axios, config);
-        initAxiosConfig(instance);
-        return instance;
-    };
+    function handleSpanEnd(cfg, response, error) {
+        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 logData = {
+                method,
+                path,
+                url: response?.request?.responseURL || errorResponse?.request?.responseURL || url || "",
+                duration_ms: startTime ? Date.now() - startTime : void 0,
+                status: response ? response.status : errorResponse.status || 0
+            };
+            if (error) logData.error_message = errorMessage;
+            if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
+            if (cfg.data) logData.request_body = cfg.data;
+            const responseData = response?.data || errorResponse?.data;
+            if (responseData) logData.response = responseData;
+            const level = error ? 'ERROR' : 'INFO';
+            observable.log(level, safeStringify(logData), {}, currentSpan);
+            'function' == typeof currentSpan.end && currentSpan.end();
+        } catch (e) {
+            console.error('[ProxyTrace] Log span failed:', e);
+        }
+    }
+    return new Proxy(originalInstance, {
+        apply (target, thisArg, args) {
+            return tracedRequest(...args);
+        },
+        get (target, prop, receiver) {
+            if ('request' === prop) return tracedRequest;
+            const value = Reflect.get(target, prop, receiver);
+            if ('function' == typeof value && 'create' !== prop) return value.bind(receiver);
+            return value;
+        }
+    });
 }
 function initAxiosConfig(axiosInstance) {
-    if (!axiosInstance) axiosInstance = axios;
-    axiosInstance.interceptors.request.use((config)=>{
+    const instance = axiosInstance || axios;
+    instance.interceptors.request.use((config)=>{
         const requestUUID = crypto.randomUUID();
         if ('production' !== process.env.NODE_ENV) {
             const stacktrace = getStacktrace();
@@ -241,12 +220,13 @@ function initAxiosConfig(axiosInstance) {
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
         return config;
     }, (error)=>Promise.reject(error));
-    'production' !== process.env.NODE_ENV && axiosInstance.interceptors.response.use((response)=>{
+    'production' !== process.env.NODE_ENV && instance.interceptors.response.use((response)=>{
         logResponse('success', response);
         return response;
     }, (error)=>{
         logResponse('error', error.response || error);
         return Promise.reject(error);
     });
+    return wrapAxiosWithTrace(instance);
 }
-export { initAxiosConfig, patchCreate };
+export { initAxiosConfig, wrapAxiosWithTrace };

package/lib/utils/getAxiosForBackend.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { initAxiosConfig, patchCreate } from "./axiosConfig.js";
+import { initAxiosConfig } from "./axiosConfig.js";
 let axiosInstance;
 function showToast(message, duration = 3000) {
     return new Promise((resolve)=>{
@@ -54,7 +54,6 @@ function showToast(message, duration = 3000) {
     });
 }
 function getAxiosForBackend() {
-    patchCreate();
     if (!axiosInstance) {
         axiosInstance = axios.create({
             baseURL: process.env.CLIENT_BASE_PATH || '/'

package/package.json

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