@lark-apaas/client-toolkit 1.2.24-alpha.5 → 1.2.24-alpha.7

package/lib/components/AppContainer/api-proxy/core.js

@@ -139,7 +139,8 @@ class ApiProxy {
             ...config,
             headers: {
                 ...this.defaultConfig.headers,
-                ...config.headers
+                ...config.headers,
+                'X-Page-Route': 'undefined' != typeof window ? window.location?.pathname || '/' : '/'
             }
         };
         const requestKey = this.generateRequestKey(mergedConfig);

package/lib/components/AppContainer/safety.js

@@ -14,17 +14,31 @@ const Component = ()=>{
     const isMobile = useIsMobile();
     const [userinfo, setUserinfo] = useState(null);
     const [isInternetVisible, setIsInternetVisible] = useState(false);
+    const [showBadge, setShowBadge] = useState(true);
+    const [badgeLoaded, setBadgeLoaded] = useState(false);
     const timeoutRef = useRef(null);
     useEffect(()=>{
         const appId = getAppId();
+        const csrfHeaders = {
+            'X-Suda-Csrf-Token': getCsrfToken()
+        };
         const tenantInfoUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/tenant_info` : `/spark/b/${appId}/tenant_info`;
         fetch(tenantInfoUrl, {
-            headers: {
-                'X-Suda-Csrf-Token': getCsrfToken()
-            }
+            headers: csrfHeaders
         }).then((res)=>res.json()).then((data)=>{
             setUserinfo(data?.data?.tenant_info);
             setIsInternetVisible(data?.data?.is_internet_visible);
+        }).catch(()=>{});
+        const getPublishedUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/get_published` : `/spark/b/${appId}/get_published`;
+        fetch(getPublishedUrl, {
+            headers: csrfHeaders
+        }).then((res)=>res.json()).then((data)=>{
+            const badge = data?.data?.app_info?.show_badge;
+            setShowBadge(false !== badge);
+        }).catch(()=>{
+            setShowBadge(true);
+        }).finally(()=>{
+            setBadgeLoaded(true);
         });
     }, []);
     useEffect(()=>{
@@ -39,6 +53,8 @@ const Component = ()=>{
         isMobile
     ]);
     if ('production' !== process.env.NODE_ENV) return null;
+    if (!badgeLoaded) return null;
+    if (!showBadge) return null;
     if (!visible) return null;
     if (isMobile) return /*#__PURE__*/ jsxs(Sheet, {
         open: open,
@@ -47,7 +63,7 @@ const Component = ()=>{
             /*#__PURE__*/ jsx(SheetTrigger, {
                 asChild: true,
                 children: /*#__PURE__*/ jsxs("div", {
-                    className: "fixed right-[12px] bottom-[80px] inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-[10px] py-[6px] bg-[#1f2329e5] backdrop-blur-[5px] shadow-[0px_6px_12px_0px_#41444a0a,0px_8px_24px_8px_#41444a0a] rounded-md text-[#ebebeb)] font-['PingFang_SC'] text-xs leading-[20px] tracking-[0px] z-[10000000]",
+                    className: "fixed right-[12px] bottom-[80px] inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-[10px] py-[6px] bg-[#1f2329e5] backdrop-blur-[5px] shadow-[0px_6px_12px_0px_#41444a0a,0px_8px_24px_8px_#41444a0a] rounded-[6px] text-[#ebebeb)] font-['PingFang_SC'] text-xs leading-[20px] tracking-[0px] z-[10000000]",
                     onClick: ()=>{
                         setOpen(true);
                     },
@@ -242,7 +258,7 @@ const Component = ()=>{
                                     className: "w-full self-stretch shrink-0 flex items-start gap-x-[8px]",
                                     children: [
                                         /*#__PURE__*/ jsx("div", {
-                                            className: "flex-1 flex rounded-lg items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
+                                            className: "flex-1 flex rounded-[8px] items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
                                             "data-custom-element": "safety-close",
                                             onClick: (e)=>{
                                                 e.stopPropagation();
@@ -253,7 +269,7 @@ const Component = ()=>{
                                             children: "不再展示"
                                         }),
                                         /*#__PURE__*/ jsx("div", {
-                                            className: "flex-1 flex rounded-lg items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
+                                            className: "flex-1 flex rounded-[8px] items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
                                             "data-custom-element": "safety-more",
                                             onClick: ()=>{
                                                 window.open('https://miaoda.feishu.cn/landing', '_blank');

package/lib/integrations/services/ChatService.d.ts

@@ -0,0 +1,12 @@
+import type { BatchGetChatsResponse, SearchChatsParams, SearchChatsResponse } from './types';
+export type ChatServiceConfig = {
+    getAppId?: () => string | null | undefined;
+    searchChatsUrl?: (appId: string) => string;
+    listChatsUrl?: (appId: string) => string;
+};
+export declare class ChatService {
+    private config;
+    constructor(config?: ChatServiceConfig);
+    searchChats(params: SearchChatsParams): Promise<SearchChatsResponse>;
+    listChatsByIds(chatIds: string[]): Promise<BatchGetChatsResponse>;
+}

package/lib/integrations/services/ChatService.js

@@ -0,0 +1,67 @@
+import { getAppId } from "../../utils/getAppId.js";
+const DEFAULT_CONFIG = {
+    getAppId: ()=>getAppId(),
+    searchChatsUrl: (appId)=>`/app/${appId}/__runtime__/api/v1/account/search`,
+    listChatsUrl: (appId)=>`/app/${appId}/__runtime__/api/v1/account/chat/list_chats`
+};
+class ChatService {
+    config;
+    constructor(config = {}){
+        this.config = {
+            ...DEFAULT_CONFIG,
+            ...config
+        };
+    }
+    async searchChats(params) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.searchChatsUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                query: params.query,
+                filters: {
+                    userParam: {
+                        commonParam: {
+                            searchable: false
+                        }
+                    },
+                    departmentParam: {
+                        commonParam: {
+                            searchable: false
+                        }
+                    },
+                    chatParam: {
+                        commonParam: {
+                            searchable: true,
+                            pageSize: params.pageSize ?? 100,
+                            offset: params.offset ?? 0
+                        }
+                    }
+                }
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to search chats');
+        return response.json();
+    }
+    async listChatsByIds(chatIds) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.listChatsUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                chatIDList: chatIds
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to fetch chats by ids');
+        return response.json();
+    }
+}
+export { ChatService };

package/lib/integrations/services/index.d.ts

@@ -1,4 +1,5 @@
 export * from './types';
 export * from './UserService';
 export * from './DepartmentService';
+export * from './ChatService';
 export * from './UserProfileService';

package/lib/integrations/services/index.js

@@ -1,4 +1,5 @@
 export * from "./types.js";
 export * from "./UserService.js";
 export * from "./DepartmentService.js";
+export * from "./ChatService.js";
 export * from "./UserProfileService.js";

package/lib/integrations/services/types.d.ts

@@ -62,6 +62,40 @@ export type SearchDepartmentsResponse = {
     };
     status_code: string;
 };
+export type ChatInfo = {
+    /** 群组 ID */
+    chatID: string;
+    /** 群组名称（国际化文本） */
+    name: I18nText;
+    /** 头像：URL 或 16 进制 RGB 颜色 */
+    avatar: string;
+    /** 是否是外部群 */
+    isExternal?: boolean;
+    /** 群成员数量（不包括机器人），搜索接口返回，批量查询接口不返回 */
+    userCount?: number;
+};
+export type SearchChatsParams = {
+    query?: string;
+    offset?: number;
+    pageSize?: number;
+};
+export type SearchChatsResponse = {
+    data: {
+        result: {
+            chatResult?: {
+                total: number;
+                items: ChatInfo[];
+            };
+        };
+    };
+    status_code: string;
+};
+export type BatchGetChatsResponse = {
+    data: {
+        chatInfoMap: Record<string, ChatInfo>;
+    };
+    status_code: string;
+};
 export type UserProfileAccountStatus = 0 | 1 | 2 | 3 | 4;
 export type SimpleUserProfileInfo = {
     name?: string;

package/lib/utils/axiosConfig.js

@@ -4,21 +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 { normalizeBasePath } from "./utils.js";
-const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
-function getRefererPath() {
-    try {
-        if ('undefined' != typeof window && window.location?.pathname) return stripBasePath(window.location.pathname);
-        return '/';
-    } 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;
-}
 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,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 = `${method} ${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;
@@ -180,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);
@@ -266,11 +239,7 @@ function initAxiosConfig(axiosInstance) {
         config._startTime = config._startTime || Date.now();
         const csrfToken = window.csrfToken;
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
-        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]);
-        config.headers['Rpc-Persist-Apaas-Observability-Api'] = `${reqMethod} ${requestPath}`;
+        if ('undefined' != typeof window && window.location?.pathname) config.headers['X-Page-Route'] = window.location.pathname;
         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.5",
+  "version": "1.2.24-alpha.7",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,13 +98,13 @@
   "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.11",
+    "@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",
+    "@lark-apaas/observable-web": "^1.0.5",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",