@lark-apaas/client-toolkit 1.2.1-alpha.8 → 1.2.2-alpha.0

package/lib/components/AppContainer/utils/observable.js

@@ -6,7 +6,6 @@ const initObservable = ()=>{
             env: 'development' === process.env.NODE_ENV ? AppEnv.Dev : AppEnv.Prod,
             collectorUrl: {
                 log: `/spark/app/${window.appId}/runtime/api/v1/observability/logs/collect`,
-                trace: `/spark/app/${window.appId}/runtime/api/v1/observability/traces/collect`,
                 metric: `/spark/app/${window.appId}/runtime/api/v1/observability/metrics/collect`
             }
         });

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

@@ -1,14 +1,4 @@
 import { AxiosInstance } from 'axios';
-declare module 'axios' {
-    interface AxiosRequestConfig {
-        /** @internal 存储 Span 实例 */
-        __span?: any;
-        /** @internal 请求开始时间 */
-        _startTime?: number;
-        /** @internal 请求唯一标识 */
-        _requestUUID?: string;
-    }
-}
 /**
  * axios配置内容：拦截器、日志等
  */

package/lib/utils/axiosConfig.js

@@ -1,8 +1,6 @@
 import axios from "axios";
-import { observable } from "@lark-apaas/observable-web";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
-import { safeStringify } from "./safeStringify.js";
 const isValidResponse = (resp)=>null != resp && 'object' == typeof resp && 'config' in resp && null !== resp.config && void 0 !== resp.config && 'object' == typeof resp.config && 'status' in resp && 'number' == typeof resp.status && 'data' in resp;
 async function logResponse(ok, responseOrError) {
     if (isValidResponse(responseOrError)) {
@@ -54,7 +52,7 @@ async function logResponse(ok, responseOrError) {
             logTraceID
         };
         if (stacktrace) logMeta.stacktrace = stacktrace;
-        logger.debug({
+        if ('development' === process.env.NODE_ENV) logger.log({
             level: ok,
             args: [
                 parts.join(''),
@@ -110,7 +108,7 @@ async function logResponse(ok, responseOrError) {
         const stacktrace = await requestStacktraceMap.get(requestUUID);
         const logMeta = {};
         if (stacktrace) logMeta.stacktrace = stacktrace;
-        logger.debug({
+        logger.log({
             level: 'error',
             args: [
                 parts.join(''),
@@ -120,7 +118,7 @@ async function logResponse(ok, responseOrError) {
         });
         return;
     }
-    logger.debug({
+    logger.log({
         level: 'error',
         args: [
             '请求失败：无响应对象或配置信息'
@@ -131,61 +129,6 @@ async function logResponse(ok, responseOrError) {
 const requestStacktraceMap = new Map();
 function initAxiosConfig(axiosInstance) {
     if (!axiosInstance) axiosInstance = axios;
-    axiosInstance.interceptors.request.use((config)=>{
-        const method = (config.method || 'GET').toUpperCase();
-        const url = config.url || '';
-        const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-        try {
-            const span = observable.startSpan(`${method} ${cleanedPath}`);
-            if (span) {
-                const traceInfo = `${span.spanContext().traceId}-${span.spanContext().spanId}`;
-                config.headers["X-Tt-TraceInfo"] = traceInfo;
-                config.__span = span;
-            }
-        } catch (error) {
-            console.error('Trace 配置失败:', error);
-        }
-        return config;
-    });
-    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) {
-            observable.log('INFO', safeStringify({
-                method,
-                path: cleanedPath,
-                url,
-                user_agent: response.config.headers["user-agent"],
-                duration_ms: startTime ? Date.now() - startTime : void 0,
-                status: response.status,
-                request_body: response.config.data,
-                response: response.data
-            }), {}, 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) {
-            observable.log('ERROR', safeStringify({
-                method,
-                path: cleanedPath,
-                url,
-                user_agent: errorConfig.headers?.["user-agent"],
-                duration_ms: startTime ? Date.now() - startTime : void 0,
-                status: errorResponse.status || 200,
-                request_body: errorConfig.data,
-                response: errorResponse.data || {},
-                error_message: errorMessage
-            }), {}, 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.8",
+  "version": "1.2.2-alpha.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -31,11 +31,6 @@
       "require": "./lib/apis/logger.js",
       "types": "./lib/apis/logger.d.ts"
     },
-    "./trace": {
-      "import": "./lib/apis/trace.js",
-      "require": "./lib/apis/trace.js",
-      "types": "./lib/apis/trace.d.ts"
-    },
     "./udt-types": {
       "import": "./lib/apis/udt-types.js",
       "require": "./lib/apis/udt-types.js",
@@ -86,9 +81,9 @@
     "@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-alpha.0",
     "@lark-apaas/miaoda-inspector": "^1.0.8",
-    "@lark-apaas/observable-web": "^1.0.1-alpha.0",
+    "@lark-apaas/observable-web": "^1.0.0",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",
@@ -162,4 +157,4 @@
     "react-router-dom": ">=6.26.2",
     "styled-jsx": ">=5.0.0"
   }
-}
+}

package/lib/apis/trace.d.ts

@@ -1 +0,0 @@
-export * from '../trace';

package/lib/apis/trace.js

@@ -1 +0,0 @@
-export * from "../trace/index.js";

package/lib/trace/index.d.ts

@@ -1,2 +0,0 @@
-declare const trace: <T>(name: string, fn: (span: import("@opentelemetry/api").Span) => Promise<T>, options?: import("@opentelemetry/api").SpanOptions) => Promise<T>;
-export { trace };

package/lib/trace/index.js

@@ -1,3 +0,0 @@
-import { observable } from "@lark-apaas/observable-web";
-const trace = observable.trace;
-export { trace };