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

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

@@ -14,7 +14,7 @@ async function getSourceMap() {
     return sourceMapContent;
 }
 const childApi = {
-    getRoutes: getRouteDefinitions,
+    getRoutes: ()=>Promise.resolve(getRouteDefinitions()),
     updateAppInfo: (appInfo)=>{
         dispatchEvent(new CustomEvent('MiaoDaMetaInfoChanged', {
             detail: appInfo

package/lib/utils/axiosConfig.js

@@ -16,13 +16,47 @@ function getRefererPath() {
 }
 function getApiField(method, response, errorResponse, fallbackPath) {
     const matchRoute = response?.headers?.['x-match-route'] || errorResponse?.headers?.['x-match-route'] || '';
-    const routePath = matchRoute || fallbackPath;
+    const routePath = matchRoute || matchApiRoute(method, fallbackPath) || fallbackPath;
     return `${method} ${routePath}`;
 }
-function stripBasePath(path) {
+function stripBasePath(urlPath) {
     const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    if (base && path.startsWith(base)) return path.slice(base.length) || '/';
-    return 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) {
@@ -272,6 +306,12 @@ 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/lib/utils/routePattern.d.ts

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

package/lib/utils/routePattern.js

@@ -2,41 +2,30 @@ import { matchPath } from "react-router-dom";
 import { normalizeBasePath } from "./utils.js";
 let currentRoutePattern = '/';
 let routeDefinitions = null;
-function getInjectedRouteDefinitions() {
+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) return parsed;
+            if (Array.isArray(parsed) && parsed.length > 0) {
+                routeDefinitions = parsed;
+                return routeDefinitions;
+            }
         }
     } catch  {}
-    return null;
-}
-async function loadRouteDefinitions() {
-    if (routeDefinitions) return routeDefinitions;
-    const injected = getInjectedRouteDefinitions();
-    if (injected) {
-        routeDefinitions = injected;
-        return routeDefinitions;
-    }
-    try {
-        const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-        const res = await fetch(`${basePath}/routes.json`);
-        routeDefinitions = await res.json();
-    } catch  {
-        routeDefinitions = [
-            {
-                path: '/'
-            }
-        ];
-    }
+    routeDefinitions = [
+        {
+            path: '/'
+        }
+    ];
     return routeDefinitions;
 }
-async function getRouteDefinitions() {
+function getRouteDefinitions() {
     return loadRouteDefinitions();
 }
-async function updateRoutePattern(pathname) {
-    const routes = await 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) || '/';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.17-alpha.16",
+  "version": "1.2.17-alpha.17",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [