@lark-apaas/client-toolkit 1.2.24-alpha.12 → 1.2.24-alpha.14

package/lib/utils/axiosConfig.js

@@ -6,18 +6,89 @@ import { safeStringify } from "./safeStringify.js";
 import { slardar } from "@lark-apaas/internal-slardar";
 import { normalizeBasePath } from "./utils.js";
 const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
+function stripBasePath(urlPath) {
+    const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
+    if (base && urlPath.startsWith(base)) return urlPath.slice(base.length) || '/';
+    return urlPath;
+}
+let _pageRoutes = null;
+function getPageRouteDefinitions() {
+    if (_pageRoutes) return _pageRoutes;
+    try {
+        const raw = process.env.__PAGE_ROUTE_DEFINITIONS__;
+        if (raw) {
+            const parsed = JSON.parse(raw);
+            if (Array.isArray(parsed)) {
+                _pageRoutes = parsed;
+                return _pageRoutes;
+            }
+        }
+    } catch  {}
+    _pageRoutes = [];
+    return _pageRoutes;
+}
+let _apiRoutes = null;
+function getApiRouteDefinitions() {
+    if (_apiRoutes) return _apiRoutes;
+    try {
+        const raw = process.env.__API_ROUTE_DEFINITIONS__;
+        if (raw) {
+            const parsed = JSON.parse(raw);
+            if (Array.isArray(parsed)) {
+                _apiRoutes = parsed;
+                return _apiRoutes;
+            }
+        }
+    } catch  {}
+    _apiRoutes = [];
+    return _apiRoutes;
+}
+function matchRoute(concretePath, routes) {
+    const segments = concretePath.split('/').filter(Boolean);
+    for (const route of routes){
+        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;
+}
+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;
+}
 function getRefererPath() {
     try {
-        if ('undefined' != typeof window && window.location?.pathname) return stripBasePath(window.location.pathname);
-        return '/';
+        if ('undefined' == typeof window || !window.location?.pathname) return '/';
+        const rawPath = stripBasePath(window.location.pathname);
+        return matchRoute(rawPath, getPageRouteDefinitions()) || rawPath;
     } catch  {
         return '/';
     }
 }
-function stripBasePath(urlPath) {
-    const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    if (base && urlPath.startsWith(base)) return urlPath.slice(base.length) || '/';
-    return urlPath;
+function getApiField(method, path) {
+    const matched = matchApiRoute(method, path);
+    return `${method} ${matched || path}`;
 }
 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) {
@@ -158,7 +229,7 @@ function handleSpanEnd(cfg, response, error) {
         const path = stripBasePath(rawPath);
         const durationMs = startTime ? Date.now() - startTime : void 0;
         const referer_path = getRefererPath();
-        const api = `${method} ${path}`;
+        const api = getApiField(method, path);
         const type = APP_CLIENT_API_LOG_TYPE;
         const logData = {
             method,
@@ -270,7 +341,7 @@ function initAxiosConfig(axiosInstance) {
         config.headers['Rpc-Persist-Apaas-Observability-Referer-Path'] = refererPath;
         const reqMethod = (config.method || 'GET').toUpperCase();
         const requestPath = stripBasePath((config.url || '').split('?')[0]);
-        config.headers['Rpc-Persist-Apaas-Observability-Api'] = `${reqMethod} ${requestPath}`;
+        config.headers['Rpc-Persist-Apaas-Observability-Api'] = getApiField(reqMethod, requestPath);
         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.24-alpha.12",
+  "version": "1.2.24-alpha.14",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [