@lark-apaas/client-toolkit 1.2.17-alpha.17 → 1.2.17-alpha.19

package/lib/components/AppContainer/index.js

@@ -4,7 +4,6 @@ import { ConfigProvider } from "antd";
 import { MiaodaInspector } from "@lark-apaas/miaoda-inspector";
 import zh_CN from "antd/locale/zh_CN";
 import IframeBridge from "./IframeBridge.js";
-import RoutePatternTracker from "./RoutePatternTracker.js";
 import { Toaster } from "./sonner.js";
 import { PageHoc } from "./PageHoc.js";
 import { reportTeaEvent } from "./utils/tea.js";
@@ -61,7 +60,6 @@ const App = (props)=>{
             !disableToaster && true !== appFlags.customToaster && /*#__PURE__*/ jsx(Toaster, {}),
             'production' !== process.env.NODE_ENV && /*#__PURE__*/ jsx(MiaodaInspector, {}),
             'production' !== process.env.NODE_ENV && /*#__PURE__*/ jsx(IframeBridge, {}),
-            /*#__PURE__*/ jsx(RoutePatternTracker, {}),
             /*#__PURE__*/ jsx(PageHoc, {
                 children: props.children
             })

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

@@ -1,6 +1,20 @@
 import { normalizeBasePath } from "../../../utils/utils.js";
 import { api_delete, api_get, api_head, api_options, api_patch, api_post, api_put } from "./api-panel.js";
-import { getRouteDefinitions } from "../../../utils/routePattern.js";
+async function getRoutes() {
+    let routes = [
+        {
+            path: '/'
+        }
+    ];
+    try {
+        const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
+        const res = await fetch(`${basePath}/routes.json`);
+        routes = await res.json();
+    } catch (error) {
+        console.warn('get routes.json error', error);
+    }
+    return routes;
+}
 async function getSourceMap() {
     if ('vite' === process.env.BUILD_TOOL) return '';
     let sourceMapContent = '';
@@ -14,7 +28,7 @@ async function getSourceMap() {
     return sourceMapContent;
 }
 const childApi = {
-    getRoutes: ()=>Promise.resolve(getRouteDefinitions()),
+    getRoutes,
     updateAppInfo: (appInfo)=>{
         dispatchEvent(new CustomEvent('MiaoDaMetaInfoChanged', {
             detail: appInfo

package/lib/utils/axiosConfig.js

@@ -4,60 +4,6 @@ import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
 import { safeStringify } from "./safeStringify.js";
 import { slardar } from "@lark-apaas/internal-slardar";
-import { getCurrentRoutePattern } from "./routePattern.js";
-import { normalizeBasePath } from "./utils.js";
-const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
-function getRefererPath() {
-    try {
-        return getCurrentRoutePattern();
-    } catch  {
-        return '/';
-    }
-}
-function getApiField(method, response, errorResponse, fallbackPath) {
-    const matchRoute = response?.headers?.['x-match-route'] || errorResponse?.headers?.['x-match-route'] || '';
-    const routePath = matchRoute || matchApiRoute(method, fallbackPath) || fallbackPath;
-    return `${method} ${routePath}`;
-}
-function stripBasePath(urlPath) {
-    const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    if (base && urlPath.startsWith(base)) return urlPath.slice(base.length) || '/';
-    return urlPath;
-}
-let apiRouteDefinitions = null;
-function getApiRouteDefinitions() {
-    if (apiRouteDefinitions) return apiRouteDefinitions;
-    try {
-        const raw = process.env.__API_ROUTE_DEFINITIONS__;
-        if (raw) {
-            const parsed = JSON.parse(raw);
-            if (Array.isArray(parsed)) {
-                apiRouteDefinitions = parsed;
-                return apiRouteDefinitions;
-            }
-        }
-    } catch  {}
-    apiRouteDefinitions = [];
-    return apiRouteDefinitions;
-}
-function matchApiRoute(method, concretePath) {
-    const routes = getApiRouteDefinitions();
-    const segments = concretePath.split('/').filter(Boolean);
-    for (const route of routes){
-        if ('*' !== route.method && route.method !== method) continue;
-        const routeSegments = route.path.split('/').filter(Boolean);
-        if (routeSegments.length !== segments.length) continue;
-        let match = true;
-        for(let i = 0; i < routeSegments.length; i++)if (!routeSegments[i].startsWith(':')) {
-            if (routeSegments[i] !== segments[i]) {
-                match = false;
-                break;
-            }
-        }
-        if (match) return route.path;
-    }
-    return null;
-}
 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)) {
@@ -193,20 +139,13 @@ function handleSpanEnd(cfg, response, error) {
         const errorMessage = error?.message || '未知错误';
         const url = response?.request?.responseURL || errorResponse?.request?.responseURL || cfg.url || "";
         const method = (cfg.method || 'GET').toUpperCase();
-        const rawPath = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
-        const path = stripBasePath(rawPath);
-        const durationMs = startTime ? Date.now() - startTime : void 0;
-        const referer_path = getRefererPath();
-        const api = getApiField(method, response, errorResponse, path);
-        const type = APP_CLIENT_API_LOG_TYPE;
+        const path = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
         const logData = {
             method,
             path,
             url,
-            duration_ms: durationMs,
-            status: response ? response.status : errorResponse.status || 0,
-            referer_path,
-            type
+            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;
@@ -219,12 +158,7 @@ function handleSpanEnd(cfg, response, error) {
         const responseData = response?.data || errorResponse?.data;
         if (responseData) logData.response = responseData;
         const level = error ? 'ERROR' : 'INFO';
-        observable.log(level, safeStringify(logData), {
-            referer_path,
-            api,
-            type,
-            duration_ms: durationMs
-        }, currentSpan);
+        observable.log(level, safeStringify(logData), {}, currentSpan);
         'function' == typeof currentSpan.end && currentSpan.end();
     } catch (e) {
         console.error('[AxiosTrace] Log span failed:', e);
@@ -306,12 +240,6 @@ function initAxiosConfig(axiosInstance) {
         const csrfToken = window.csrfToken;
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
         if ('undefined' != typeof window && window.location?.pathname) config.headers['X-Page-Route'] = window.location.pathname;
-        const refererPath = getRefererPath();
-        config.headers['Rpc-Persist-Apaas-Observability-Referer-Path'] = refererPath;
-        const reqMethod = (config.method || 'GET').toUpperCase();
-        const requestPath = stripBasePath((config.url || '').split('?')[0]);
-        const parameterizedPath = matchApiRoute(reqMethod, requestPath) || requestPath;
-        config.headers['Rpc-Persist-Apaas-Observability-Api'] = `${reqMethod} ${parameterizedPath}`;
         return config;
     }, (error)=>Promise.reject(error));
     instance.interceptors.response.use((response)=>response, (error)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.17-alpha.17",
+  "version": "1.2.17-alpha.19",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,11 +98,11 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.9",
-    "@lark-apaas/aily-web-sdk": "^0.0.6",
-    "@lark-apaas/auth-sdk": "^0.1.1",
-    "@lark-apaas/client-capability": "^0.1.5",
-    "@lark-apaas/internal-slardar": ">=0.0.1",
+    "@data-loom/js": "0.4.10",
+    "@lark-apaas/aily-web-sdk": "^0.0.7",
+    "@lark-apaas/auth-sdk": "^0.1.2",
+    "@lark-apaas/client-capability": "^0.1.6",
+    "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.20",
     "@lark-apaas/observable-web": "^1.0.4",
     "@radix-ui/react-avatar": "^1.1.10",

package/lib/components/AppContainer/RoutePatternTracker.d.ts

@@ -1,5 +0,0 @@
-/**
- * 监听路由变化，更新当前匹配的参数化路由模式
- * 供观测 SDK 获取 referer_path 字段
- */
-export default function RoutePatternTracker(): any;

package/lib/components/AppContainer/RoutePatternTracker.js

@@ -1,13 +0,0 @@
-import { useEffect } from "react";
-import { useLocation } from "react-router-dom";
-import { updateRoutePattern } from "../../utils/routePattern.js";
-function RoutePatternTracker() {
-    const location = useLocation();
-    useEffect(()=>{
-        updateRoutePattern(location.pathname);
-    }, [
-        location.pathname
-    ]);
-    return null;
-}
-export { RoutePatternTracker as default };

package/lib/utils/routePattern.d.ts

@@ -1,17 +0,0 @@
-/**
- * 获取路由定义列表
- * 供 childApi 等外部模块使用
- */
-export declare function getRouteDefinitions(): {
-    path: string;
-}[];
-/**
- * 根据当前 pathname 匹配路由模式并更新存储
- * 使用 react-router 的 matchPath 确保匹配逻辑与路由一致
- */
-export declare function updateRoutePattern(pathname: string): void;
-/**
- * 获取当前匹配的参数化路由模式
- * 供 axiosConfig 等非 React 上下文使用
- */
-export declare function getCurrentRoutePattern(): string;

package/lib/utils/routePattern.js

@@ -1,52 +0,0 @@
-import { matchPath } from "react-router-dom";
-import { normalizeBasePath } from "./utils.js";
-let currentRoutePattern = '/';
-let routeDefinitions = null;
-function loadRouteDefinitions() {
-    if (routeDefinitions) return routeDefinitions;
-    try {
-        const raw = process.env.__ROUTE_DEFINITIONS__;
-        if (raw) {
-            const parsed = JSON.parse(raw);
-            if (Array.isArray(parsed) && parsed.length > 0) {
-                routeDefinitions = parsed;
-                return routeDefinitions;
-            }
-        }
-    } catch  {}
-    routeDefinitions = [
-        {
-            path: '/'
-        }
-    ];
-    return routeDefinitions;
-}
-function getRouteDefinitions() {
-    return loadRouteDefinitions();
-}
-function updateRoutePattern(pathname) {
-    const routes = loadRouteDefinitions();
-    const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    let relativePath = pathname;
-    if (basePath && pathname.startsWith(basePath)) relativePath = pathname.slice(basePath.length) || '/';
-    const sortedRoutes = [
-        ...routes
-    ].sort((a, b)=>b.path.length - a.path.length);
-    for (const route of sortedRoutes){
-        let routePath = route.path;
-        if (basePath && routePath.startsWith(basePath)) routePath = routePath.slice(basePath.length) || '/';
-        const match = matchPath({
-            path: routePath,
-            end: true
-        }, relativePath);
-        if (match) {
-            currentRoutePattern = routePath;
-            return;
-        }
-    }
-    currentRoutePattern = relativePath;
-}
-function getCurrentRoutePattern() {
-    return currentRoutePattern;
-}
-export { getCurrentRoutePattern, getRouteDefinitions, updateRoutePattern };