@lark-apaas/client-toolkit 1.2.1-alpha.14 → 1.2.1-alpha.16

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

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

package/lib/utils/axiosConfig.js

@@ -144,9 +144,9 @@ function initAxiosConfig(axiosInstance) {
                 'post',
                 'put',
                 'patch',
-                "postForm",
-                "putForm",
-                "patchForm"
+                'postForm',
+                'putForm',
+                'patchForm'
             ];
             const allMethods = [
                 'request',
@@ -205,16 +205,17 @@ function initAxiosConfig(axiosInstance) {
         const method = (response.config.method || 'GET').toUpperCase();
         const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
         if (span) {
-            observable.log('INFO', safeStringify({
+            const logData = {
                 method,
                 path: cleanedPath,
-                url,
-                user_agent: response.config.headers["user-agent"],
+                url: response.request?.responseURL || url || "",
                 duration_ms: startTime ? Date.now() - startTime : void 0,
-                status: response.status,
-                request_body: response.config.data,
-                response: response.data
-            }), {}, span);
+                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;
@@ -224,17 +225,18 @@ function initAxiosConfig(axiosInstance) {
         const method = (errorConfig.method || 'GET').toUpperCase();
         const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
         if (span) {
-            observable.log('ERROR', safeStringify({
+            const logData = {
                 method,
                 path: cleanedPath,
-                url,
-                user_agent: errorConfig.headers?.["user-agent"],
+                url: errorResponse.request?.responseURL || errorConfig.url || "",
                 duration_ms: startTime ? Date.now() - startTime : void 0,
                 status: errorResponse.status || 200,
-                request_body: errorConfig.data,
-                response: errorResponse.data || {},
                 error_message: errorMessage
-            }), {}, span);
+            };
+            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);
@@ -258,5 +260,13 @@ function initAxiosConfig(axiosInstance) {
         logResponse('error', error.response || error);
         return Promise.reject(error);
     });
+    if ('function' == typeof axiosInstance) axiosInstance = new Proxy(axiosInstance, {
+        apply (target, thisArg, args) {
+            const requestMethod = target.request;
+            if ('function' != typeof requestMethod) return Reflect.apply(target, thisArg, args);
+            return requestMethod.apply(target, args);
+        }
+    });
+    return axiosInstance;
 }
 export { initAxiosConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.1-alpha.14",
+  "version": "1.2.1-alpha.16",
   "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",