@lark-apaas/client-toolkit 1.2.1-alpha.15 → 1.2.1-alpha.17

package/lib/index.js

@@ -1,5 +1,6 @@
 import { createClient } from "@lark-apaas/client-capability";
 import { normalizeBasePath } from "./utils/utils.js";
+import { logger } from "./logger/index.js";
 import { version } from "../package.json";
 const capabilityClient = createClient({
     baseURL: normalizeBasePath(process.env.CLIENT_BASE_PATH),
@@ -7,7 +8,8 @@ const capabilityClient = createClient({
         headers: {
             'X-Suda-Csrf-Token': window.csrfToken ?? ''
         }
-    }
+    },
+    logger: logger
 });
 const src = {
     version: version

package/lib/utils/axiosConfig.d.ts

@@ -9,7 +9,4 @@ declare module 'axios' {
         _requestUUID?: string;
     }
 }
-/**
- * axios配置内容：拦截器、日志等
- */
 export declare function initAxiosConfig(axiosInstance?: AxiosInstance): void;

package/lib/utils/axiosConfig.js

@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios, { Axios } from "axios";
 import { observable } from "@lark-apaas/observable-web";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
@@ -129,118 +129,96 @@ async function logResponse(ok, responseOrError) {
     });
 }
 const requestStacktraceMap = new Map();
+let isPrototypeInjected = false;
 function initAxiosConfig(axiosInstance) {
     if (!axiosInstance) axiosInstance = axios;
-    try {
-        if (axiosInstance && !axiosInstance._isTraced) {
-            axiosInstance._isTraced = true;
-            const methodsWithNoData = [
-                'get',
-                'delete',
-                'head',
-                'options'
-            ];
-            const methodsWithData = [
-                'post',
-                'put',
-                'patch',
-                "postForm",
-                "putForm",
-                "patchForm"
-            ];
-            const allMethods = [
-                'request',
-                ...methodsWithNoData,
-                ...methodsWithData
-            ];
-            allMethods.forEach((methodName)=>{
-                const originalMethod = axiosInstance[methodName];
-                if ('function' != typeof originalMethod) return;
-                axiosInstance[methodName] = function() {
-                    const args = Array.prototype.slice.call(arguments);
-                    try {
-                        let config;
-                        let url = '';
-                        let actualMethod = methodName.toUpperCase();
-                        if ('request' === methodName) if ('string' == typeof args[0]) {
-                            url = args[0];
-                            config = args[1] = args[1] || {};
-                        } else {
-                            config = args[0] = args[0] || {};
-                            url = config.url || '';
-                            actualMethod = (config.method || 'GET').toUpperCase();
+    if (!isPrototypeInjected) {
+        isPrototypeInjected = true;
+        const originalRequest = Axios.prototype.request;
+        Axios.prototype.request = function(configOrUrl, config) {
+            let finalConfig;
+            if ('string' == typeof configOrUrl) {
+                finalConfig = config || {};
+                finalConfig.url = configOrUrl;
+            } else finalConfig = configOrUrl || {};
+            let span;
+            try {
+                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}`);
+                    if (span) {
+                        const spanContext = span.spanContext();
+                        if (spanContext && spanContext.traceId) {
+                            const traceInfo = `${spanContext.traceId}-${spanContext.spanId}`;
+                            if (!finalConfig.headers) finalConfig.headers = {};
+                            finalConfig.headers['X-Tt-TraceInfo'] = traceInfo;
+                            finalConfig.__span = span;
                         }
-                        else if (methodsWithNoData.includes(methodName)) {
-                            url = args[0];
-                            config = args[1] = args[1] || {};
-                        } else if (methodsWithData.includes(methodName)) {
-                            url = args[0];
-                            config = args[2] = args[2] || {};
-                        }
-                        if (config && !config.__span) {
-                            const cleanedPath = (url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-                            const span = observable.startSpan(`${actualMethod} ${cleanedPath}`);
-                            if (span) {
-                                const spanContext = span.spanContext();
-                                if (spanContext && spanContext.traceId) {
-                                    const traceInfo = `${spanContext.traceId}-${spanContext.spanId}`;
-                                    if (!config.headers) config.headers = {};
-                                    config.headers['X-Tt-TraceInfo'] = traceInfo;
-                                    config.__span = span;
-                                }
-                            }
-                        }
-                    } catch (innerError) {
-                        console.error(`Trace wrapper inner error [${methodName}]:`, innerError);
                     }
-                    return originalMethod.apply(this, args);
-                };
+                }
+            } catch (e) {
+                console.error('Failed to start axios trace span in prototype:', e);
+            }
+            const promise = originalRequest.apply(this, arguments);
+            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);
+                }
+                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);
+                }
+                return Promise.reject(error);
             });
-        }
-    } catch (e) {
-        console.error('Failed to init axios trace config wrapper:', e);
+        };
     }
-    axiosInstance.interceptors.response.use((response)=>{
-        const { __span: span, _startTime: startTime, url = "" } = response.config || {};
-        const method = (response.config.method || 'GET').toUpperCase();
-        const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-        if (span) {
-            const logData = {
-                method,
-                path: cleanedPath,
-                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), {}, span);
-            'function' == typeof span.end && span.end();
-        }
-        return response;
-    }, (error)=>{
-        const { config: errorConfig = {}, response: errorResponse = {}, message: errorMessage = '未知错误' } = error;
-        const { __span: span, _startTime: startTime, url = "" } = errorConfig || {};
-        const method = (errorConfig.method || 'GET').toUpperCase();
-        const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-        if (span) {
-            const logData = {
-                method,
-                path: cleanedPath,
-                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), {}, span);
-            'function' == typeof span.end && span.end();
-        }
-        return Promise.reject(error);
-    });
     axiosInstance.interceptors.request.use((config)=>{
         const requestUUID = crypto.randomUUID();
         if ('production' !== process.env.NODE_ENV) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.1-alpha.15",
+  "version": "1.2.1-alpha.17",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -86,7 +86,7 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "^0.4.3",
-    "@lark-apaas/client-capability": "^0.1.1",
+    "@lark-apaas/client-capability": "^0.1.2",
     "@lark-apaas/miaoda-inspector": "^1.0.8",
     "@lark-apaas/observable-web": "1.0.1-alpha.2",
     "@radix-ui/react-avatar": "^1.1.10",