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

package/lib/apis/trace.d.ts

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

package/lib/apis/trace.js

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

package/lib/components/AppContainer/IframeBridge.js

@@ -4,6 +4,7 @@ import { useLocation, useNavigate } from "react-router-dom";
 import { connectToParent } from "penpal";
 import { useUpdatingRef } from "../../hooks/useUpdatingRef.js";
 import { submitPostMessage } from "../../utils/postMessage.js";
+import { getPreviewParentOrigin } from "../../utils/getParentOrigin.js";
 import { childApi } from "./utils/childApi.js";
 import "./utils/listenHot.js";
 var IframeBridge_RouteMessageType = /*#__PURE__*/ function(RouteMessageType) {
@@ -20,10 +21,8 @@ async function connectParent() {
         type: 'PreviewReady',
         data: {}
     });
-    const parentOrigin = globalThis.process?.env?.FORCE_FRAMEWORK_DOMAIN_MAIN;
-    if (!parentOrigin) return;
     const connection = connectToParent({
-        parentOrigin,
+        parentOrigin: getPreviewParentOrigin(),
         methods: {
             ...childApi
         }
@@ -36,13 +35,13 @@ function IframeBridge() {
     const navigate = useNavigate();
     const navigateRef = useUpdatingRef(navigate);
     const isActive = useRef(false);
-    const historyBack = useCallback((_payload)=>{
+    const historyBack = useCallback(()=>{
         navigateRef.current(-1);
         isActive.current = true;
     }, [
         navigateRef
     ]);
-    const historyForward = useCallback((_payload)=>{
+    const historyForward = useCallback(()=>{
         navigateRef.current(1);
         isActive.current = true;
     }, [
@@ -70,8 +69,8 @@ function IframeBridge() {
         location
     ]);
     const handleMessage = useCallback((event)=>{
-        const data = event.data ?? {};
-        if ('string' == typeof data.type && isRouteMessageType(data.type)) operatorMessage[data.type](data.data);
+        const { data } = event;
+        if (isRouteMessageType(data?.type)) operatorMessage[data?.type](data?.data);
     }, [
         operatorMessage
     ]);

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

@@ -6,6 +6,7 @@ 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/trace/index.d.ts

@@ -0,0 +1,2 @@
+declare const trace: any;
+export { trace };

package/lib/trace/index.js

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

package/lib/utils/axiosConfig.d.ts

@@ -1,4 +1,14 @@
 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,6 +1,8 @@
 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)) {
@@ -52,7 +54,7 @@ async function logResponse(ok, responseOrError) {
             logTraceID
         };
         if (stacktrace) logMeta.stacktrace = stacktrace;
-        if ('development' === process.env.NODE_ENV) logger.log({
+        logger.debug({
             level: ok,
             args: [
                 parts.join(''),
@@ -108,7 +110,7 @@ async function logResponse(ok, responseOrError) {
         const stacktrace = await requestStacktraceMap.get(requestUUID);
         const logMeta = {};
         if (stacktrace) logMeta.stacktrace = stacktrace;
-        logger.log({
+        logger.debug({
             level: 'error',
             args: [
                 parts.join(''),
@@ -118,7 +120,7 @@ async function logResponse(ok, responseOrError) {
         });
         return;
     }
-    logger.log({
+    logger.debug({
         level: 'error',
         args: [
             '请求失败：无响应对象或配置信息'
@@ -129,6 +131,61 @@ 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/lib/utils/getParentOrigin.d.ts

@@ -1 +1,6 @@
 export declare function getEnv(): 'BOE' | 'PRE' | 'ONLINE';
+/**
+ * @internal
+ * 获取预览环境父级域名
+ */
+export declare function getPreviewParentOrigin(): "https://force.feishu.cn" | "https://force.feishu-pre.cn" | "https://force.feishu-boe.cn" | "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";

package/lib/utils/getParentOrigin.js

@@ -4,4 +4,13 @@ function getEnv() {
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'PRE';
     return 'BOE';
 }
-export { getEnv };
+function getPreviewParentOrigin() {
+    const { origin } = window.location;
+    if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
+    if (origin.includes('force-pre.feishuapp.net')) return 'https://force.feishu-pre.cn';
+    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
+    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
+    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
+    return 'https://miaoda.feishu-boe.cn';
+}
+export { getEnv, getPreviewParentOrigin };

package/lib/utils/postMessage.js

@@ -1,9 +1,7 @@
+import { getPreviewParentOrigin } from "./getParentOrigin.js";
 function submitPostMessage(message, targetOrigin) {
     try {
-        const parentOrigin = globalThis.process?.env?.FORCE_FRAMEWORK_DOMAIN_MAIN;
-        const origin = targetOrigin ?? parentOrigin;
-        if (!origin) return;
-        window.parent.postMessage(message, origin);
+        window.parent.postMessage(message, targetOrigin ?? getPreviewParentOrigin());
     } catch (e) {
         console.error('postMessage error', e);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.1-alpha.0",
+  "version": "1.2.1-alpha.10",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -31,6 +31,11 @@
       "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",
@@ -82,8 +87,8 @@
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "^0.4.3",
     "@lark-apaas/client-capability": "^0.1.1",
-    "@lark-apaas/miaoda-inspector": "1.0.10-alpha.0",
-    "@lark-apaas/observable-web": "^1.0.0",
+    "@lark-apaas/miaoda-inspector": "^1.0.8",
+    "@lark-apaas/observable-web": "1.0.1-alpha.2",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",
@@ -157,4 +162,4 @@
     "react-router-dom": ">=6.26.2",
     "styled-jsx": ">=5.0.0"
   }
-}
+}