@lark-apaas/client-toolkit 1.2.17-alpha.10 → 1.2.17-alpha.12

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/logger/intercept-global-error.js

@@ -1,6 +1,5 @@
-import { slardar } from "@lark-apaas/internal-slardar";
 import { getHmrApi } from "../utils/hmr-api.js";
-import { submitPostMessage } from "../utils/postMessage.js";
+import { submitPostMessage, submitSlardarEvent } from "../utils/postMessage.js";
 import { levelSchema } from "./log-types.js";
 import { logger } from "./logger.js";
 let devServerDisconnectInfo = null;
@@ -20,26 +19,22 @@ function processDevServerLog(log) {
                 status: 'disconnected'
             }
         });
-        slardar.sendEvent({
+        submitSlardarEvent({
             name: 'sandbox-devServer',
-            metrics: {
-                time
-            },
             categories: {
-                type: 'disconnected'
+                type: 'disconnected',
+                time
             }
         });
         return;
     }
     if (!devServerDisconnectInfo) return;
     if (devFlag && log.includes('Trying to reconnect')) {
-        if (retryCount) slardar.sendEvent({
+        if (retryCount) submitSlardarEvent({
             name: 'sandbox-devServer',
-            metrics: {
-                retryCount: retryCount + 1
-            },
             categories: {
-                type: 'reconnect-failed'
+                type: 'reconnect-failed',
+                retryCount: retryCount + 1
             }
         });
         retryCount++;
@@ -57,14 +52,12 @@ function processDevServerLog(log) {
         const startTime = devServerDisconnectInfo.time;
         const duration = Date.now() - startTime;
         devServerDisconnectInfo = null;
-        slardar.sendEvent({
+        submitSlardarEvent({
             name: 'sandbox-devServer',
-            metrics: {
+            categories: {
+                type: 'devServer-reconnected',
                 startTime,
                 duration
-            },
-            categories: {
-                type: 'devServer-reconnected'
             }
         });
     }
@@ -83,7 +76,7 @@ function listenModuleHmr() {
         });
         hmr.onError((error)=>{
             console.warn('hmr apply failed', error);
-            slardar.sendEvent({
+            submitSlardarEvent({
                 name: 'sandbox-devServer',
                 categories: {
                     type: 'hmr-apply-failed',

package/lib/utils/axiosConfig.js

@@ -3,21 +3,6 @@ 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";
-import { slardar } from "@lark-apaas/internal-slardar";
-import { getCurrentRoutePattern } from "./routePattern.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 || fallbackPath;
-    return `${method} ${routePath}`;
-}
 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)) {
@@ -154,17 +139,12 @@ function handleSpanEnd(cfg, response, error) {
         const url = response?.request?.responseURL || errorResponse?.request?.responseURL || cfg.url || "";
         const method = (cfg.method || 'GET').toUpperCase();
         const path = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
-        const referer_path = getRefererPath();
-        const api = getApiField(method, response, errorResponse, path);
-        const type = APP_CLIENT_API_LOG_TYPE;
         const logData = {
             method,
             path,
             url,
             duration_ms: startTime ? Date.now() - startTime : void 0,
-            status: response ? response.status : errorResponse.status || 0,
-            referer_path,
-            type
+            status: response ? response.status : errorResponse.status || 0
         };
         if (error) logData.error_message = errorMessage;
         if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
@@ -177,11 +157,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
-        }, currentSpan);
+        observable.log(level, safeStringify(logData), {}, currentSpan);
         'function' == typeof currentSpan.end && currentSpan.end();
     } catch (e) {
         console.error('[AxiosTrace] Log span failed:', e);
@@ -217,10 +193,6 @@ AxiosProto.request = function(configOrUrl, config) {
         return response;
     }, (error)=>{
         handleSpanEnd(error.config || finalConfig, null, error);
-        slardar.captureException(error, {
-            source: 'toolkit',
-            module: 'axios-request'
-        });
         throw error;
     });
 };
@@ -281,24 +253,9 @@ function initAxiosConfig(axiosInstance) {
                     ],
                     meta: {}
                 });
-                slardar.sendEvent({
-                    name: 'toolkit_axios_403_downgrade',
-                    categories: {
-                        url: String(error.config?.url || ''),
-                        method: String(error.config?.method || '')
-                    }
-                });
                 return error.response;
             }
         } catch (e) {}
-        slardar.sendEvent({
-            name: 'toolkit_axios_response_error',
-            categories: {
-                url: String(error.config?.url || ''),
-                method: String(error.config?.method || ''),
-                status: String(error.response?.status || '')
-            }
-        });
         return Promise.reject(error);
     });
     'production' !== process.env.NODE_ENV && instance.interceptors.response.use((response)=>{

package/lib/utils/postMessage.d.ts

@@ -1,6 +1,7 @@
 import type { IncomingMessage, OutgoingMessage } from '../types/iframe-events';
 export declare function resolveParentOrigin(): string;
 export declare function submitPostMessage<T extends OutgoingMessage>(message: T, targetOrigin?: string): void;
+export declare function submitSlardarEvent(event: unknown): void;
 export declare function isOutgoingMessage<T extends OutgoingMessage['type']>(msg: OutgoingMessage, type: T): msg is Extract<OutgoingMessage, {
     type: T;
 }>;

package/lib/utils/postMessage.js

@@ -38,10 +38,15 @@ function submitPostMessage(message, targetOrigin) {
         console.error('postMessage error', e);
     }
 }
+function submitSlardarEvent(event) {
+    const slardar = window.KSlardarWeb;
+    if ('function' == typeof slardar) slardar('sendEvent', event);
+    else console.warn('hmr listen function not found');
+}
 function isOutgoingMessage(msg, type) {
     return msg.type === type;
 }
 function isIncomingMessage(msg, type) {
     return msg.type === type;
 }
-export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage };
+export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage, submitSlardarEvent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.17-alpha.10",
+  "version": "1.2.17-alpha.12",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,10 +99,9 @@
     "@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/aily-web-sdk": "0.0.2-alpha.14",
     "@lark-apaas/auth-sdk": "^0.1.1",
     "@lark-apaas/client-capability": "^0.1.5",
-    "@lark-apaas/internal-slardar": ">=0.0.1",
     "@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,10 +0,0 @@
-/**
- * 根据当前 pathname 匹配路由模式并更新存储
- * 使用 react-router 的 matchPath 确保匹配逻辑与路由一致
- */
-export declare function updateRoutePattern(pathname: string): Promise<void>;
-/**
- * 获取当前匹配的参数化路由模式
- * 供 axiosConfig 等非 React 上下文使用
- */
-export declare function getCurrentRoutePattern(): string;

package/lib/utils/routePattern.js

@@ -1,45 +0,0 @@
-import { matchPath } from "react-router-dom";
-import { normalizeBasePath } from "./utils.js";
-let currentRoutePattern = '/';
-let routeDefinitions = null;
-async function loadRouteDefinitions() {
-    if (routeDefinitions) 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: '/'
-            }
-        ];
-    }
-    return routeDefinitions;
-}
-async function updateRoutePattern(pathname) {
-    const routes = await 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, updateRoutePattern };