@lark-apaas/client-toolkit 1.2.1-alpha.21 → 1.2.1-alpha.23

package/lib/apis/tools/services.d.ts

@@ -0,0 +1 @@
+export * from '../../integrations/services';

package/lib/apis/tools/services.js

@@ -0,0 +1 @@
+export * from "../../integrations/services/index.js";

package/lib/components/AppContainer/IframeBridge.js

@@ -3,8 +3,7 @@ import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import { connectToParent } from "penpal";
 import { useUpdatingRef } from "../../hooks/useUpdatingRef.js";
-import { submitPostMessage } from "../../utils/postMessage.js";
-import { getPreviewParentOrigin } from "../../utils/getParentOrigin.js";
+import { resolveParentOrigin, submitPostMessage } from "../../utils/postMessage.js";
 import { childApi } from "./utils/childApi.js";
 import "./utils/listenHot.js";
 var IframeBridge_RouteMessageType = /*#__PURE__*/ function(RouteMessageType) {
@@ -21,8 +20,10 @@ async function connectParent() {
         type: 'PreviewReady',
         data: {}
     });
+    const parentOrigin = resolveParentOrigin();
+    if (!parentOrigin) return;
     const connection = connectToParent({
-        parentOrigin: getPreviewParentOrigin(),
+        parentOrigin,
         methods: {
             ...childApi
         }
@@ -35,13 +36,13 @@ function IframeBridge() {
     const navigate = useNavigate();
     const navigateRef = useUpdatingRef(navigate);
     const isActive = useRef(false);
-    const historyBack = useCallback(()=>{
+    const historyBack = useCallback((_payload)=>{
         navigateRef.current(-1);
         isActive.current = true;
     }, [
         navigateRef
     ]);
-    const historyForward = useCallback(()=>{
+    const historyForward = useCallback((_payload)=>{
         navigateRef.current(1);
         isActive.current = true;
     }, [
@@ -69,8 +70,8 @@ function IframeBridge() {
         location
     ]);
     const handleMessage = useCallback((event)=>{
-        const { data } = event;
-        if (isRouteMessageType(data?.type)) operatorMessage[data?.type](data?.data);
+        const data = event.data ?? {};
+        if ('string' == typeof data.type && isRouteMessageType(data.type)) operatorMessage[data.type](data.data);
     }, [
         operatorMessage
     ]);

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

@@ -0,0 +1,10 @@
+import type { SearchDepartmentsParams, SearchDepartmentsResponse } from './types';
+export type DepartmentServiceConfig = {
+    getAppId?: () => string | null | undefined;
+    searchDepartmentUrl?: (appId: string) => string;
+};
+export declare class DepartmentService {
+    private config;
+    constructor(config?: DepartmentServiceConfig);
+    searchDepartments(params: SearchDepartmentsParams): Promise<SearchDepartmentsResponse>;
+}

package/lib/integrations/services/DepartmentService.js

@@ -0,0 +1,29 @@
+import { getAppId } from "../../utils/getAppId.js";
+const DEFAULT_CONFIG = {
+    getAppId: ()=>getAppId(window.location.pathname),
+    searchDepartmentUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/search_department`
+};
+class DepartmentService {
+    config;
+    constructor(config = {}){
+        this.config = {
+            ...DEFAULT_CONFIG,
+            ...config
+        };
+    }
+    async searchDepartments(params) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.searchDepartmentUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(params),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to search departments');
+        return response.json();
+    }
+}
+export { DepartmentService };

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

@@ -0,0 +1,14 @@
+import type { AccountType, UserProfileData } from './types';
+/**
+ * 获取 CDN 资源 URL
+ */
+export declare function getAssetsUrl(path: string): string;
+export type UserProfileServiceConfig = {
+    getAppId?: () => string | null | undefined;
+    userProfileUrl?: (appId: string) => string;
+};
+export declare class UserProfileService {
+    private config;
+    constructor(config?: UserProfileServiceConfig);
+    getUserProfile(userId: string, accountType?: AccountType, signal?: AbortSignal): Promise<UserProfileData>;
+}

package/lib/integrations/services/UserProfileService.js

@@ -0,0 +1,36 @@
+import { getAppId } from "../../utils/getAppId.js";
+const CDN_HOST = 'https://lf3-static.bytednsdoc.com';
+function getAssetsUrl(path) {
+    return `${CDN_HOST}${path}`;
+}
+const DEFAULT_CONFIG = {
+    getAppId: ()=>getAppId(window.location.pathname),
+    userProfileUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/user_profile`
+};
+class UserProfileService {
+    config;
+    constructor(config = {}){
+        this.config = {
+            ...DEFAULT_CONFIG,
+            ...config
+        };
+    }
+    async getUserProfile(userId, accountType = 'apaas', signal) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const params = new URLSearchParams();
+        if ('lark' === accountType) params.append('larkUserID', userId);
+        else params.append('userID', userId);
+        const response = await fetch(`${this.config.userProfileUrl(appId)}?${params.toString()}`, {
+            signal,
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error(`Failed to fetch user profile: ${response.status}`);
+        const data = await response.json();
+        return data.data;
+    }
+}
+export { UserProfileService, getAssetsUrl };

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

@@ -0,0 +1,12 @@
+import type { BatchGetUsersResponse, SearchUsersParams, SearchUsersResponse } from './types';
+export type UserServiceConfig = {
+    getAppId?: () => string | null | undefined;
+    searchUserUrl?: (appId: string) => string;
+    listUsersUrl?: (appId: string) => string;
+};
+export declare class UserService {
+    private config;
+    constructor(config?: UserServiceConfig);
+    searchUsers(params: SearchUsersParams): Promise<SearchUsersResponse>;
+    listUsersByIds(userIds: string[]): Promise<BatchGetUsersResponse>;
+}

package/lib/integrations/services/UserService.js

@@ -0,0 +1,46 @@
+import { getAppId } from "../../utils/getAppId.js";
+const DEFAULT_CONFIG = {
+    getAppId: ()=>getAppId(window.location.pathname),
+    searchUserUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/search_user`,
+    listUsersUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/list_users`
+};
+class UserService {
+    config;
+    constructor(config = {}){
+        this.config = {
+            ...DEFAULT_CONFIG,
+            ...config
+        };
+    }
+    async searchUsers(params) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.searchUserUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(params),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to search users');
+        return response.json();
+    }
+    async listUsersByIds(userIds) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.listUsersUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                userIDList: userIds.map((id)=>Number(id))
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to fetch users by ids');
+        return response.json();
+    }
+}
+export { UserService };

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

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

package/lib/integrations/services/index.js

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

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

@@ -0,0 +1,91 @@
+export type I18nText = {
+    zh_cn: string;
+    en_us?: string;
+    ja_jp?: string;
+};
+export type DepartmentBasic = {
+    departmentID: string;
+    name: I18nText;
+};
+export type UserInfo = {
+    userID: string;
+    larkUserID: string;
+    name: I18nText;
+    avatar: string;
+    userType: '_employee' | '_externalUser' | '_anonymousUser';
+    department: DepartmentBasic;
+};
+export type DepartmentInfo = {
+    departmentID: string;
+    larkDepartmentID: string;
+    name: I18nText;
+};
+export type AccountType = 'apaas' | 'lark';
+export type SearchAvatar = {
+    avatar: {
+        image: {
+            large: string;
+        };
+    };
+};
+export type SearchUsersParams = {
+    query?: string;
+    offset?: number;
+    pageSize?: number;
+};
+export type SearchUsersResponse = {
+    data: {
+        userList: UserInfo[];
+        total: number;
+    };
+    status_code: string;
+};
+export type BatchGetUsersResponse = {
+    data: {
+        userInfoMap: Record<string, UserInfo & SearchAvatar>;
+        baseResp?: {
+            statusCode?: number;
+            statusMessage?: string;
+        };
+    };
+};
+export type SearchDepartmentsParams = {
+    query?: string;
+    offset?: number;
+    pageSize?: number;
+};
+export type SearchDepartmentsResponse = {
+    data: {
+        departmentList: DepartmentInfo[];
+        total: number;
+    };
+    status_code: string;
+};
+export type UserProfileAccountStatus = 0 | 1 | 2 | 3 | 4;
+export type SimpleUserProfileInfo = {
+    name?: string;
+    avatar?: string;
+    email?: string;
+    userStatus: UserProfileAccountStatus;
+    userType: '_employee' | '_externalUser';
+};
+export type LarkCardParam = {
+    needRedirect?: boolean;
+    redirectURL?: string;
+    larkAppID: string;
+    jsAPITicket: string;
+    larkOpenID: string;
+    targetLarkOpenID: string;
+};
+export type SimpleUserProfileData = {
+    useLarkCard: false;
+    userProfileInfo: SimpleUserProfileInfo;
+};
+export type OfficialUserProfileData = {
+    useLarkCard: true;
+    larkCardParam: LarkCardParam;
+};
+export type UserProfileData = SimpleUserProfileData | OfficialUserProfileData;
+export type UserProfileResponse = {
+    data: UserProfileData;
+};

package/lib/utils/axiosConfig.d.ts

@@ -14,4 +14,4 @@ declare module 'axios' {
  * @param originalInstance 原始的 axios 实例
  */
 export declare function wrapAxiosWithTrace(originalInstance: AxiosInstance): AxiosInstance;
-export declare function initAxiosConfig(axiosInstance?: AxiosInstance): AxiosInstance;
+export declare function initAxiosConfig(axiosInstance?: AxiosInstance): void;

package/lib/utils/axiosConfig.js

@@ -140,9 +140,9 @@ function wrapAxiosWithTrace(originalInstance) {
         let span;
         try {
             if (!finalConfig.__span) {
-                const url = finalConfig.url || '';
+                const fullUrl = originalInstance.getUri(finalConfig);
                 const actualMethod = (finalConfig.method || 'GET').toUpperCase();
-                const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
+                const cleanedPath = fullUrl.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
                 span = observable.startSpan(`${actualMethod} ${cleanedPath}`);
                 if (span) {
                     const spanContext = span.spanContext();
@@ -176,7 +176,7 @@ function wrapAxiosWithTrace(originalInstance) {
             const startTime = cfg._startTime;
             const url = response?.request?.responseURL || errorResponse?.request?.responseURL || cfg.url || "";
             const method = (cfg.method || 'GET').toUpperCase();
-            const path = url.split('?')[0] || '/';
+            const path = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
             const logData = {
                 method,
                 path,
@@ -186,7 +186,13 @@ function wrapAxiosWithTrace(originalInstance) {
             };
             if (error) logData.error_message = errorMessage;
             if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
-            if (cfg.data) logData.request_body = cfg.data;
+            if (cfg.data) try {
+                const parsed = JSON.parse(cfg.data);
+                if (parsed) logData.request_body = parsed;
+                else logData.request_body = cfg.data;
+            } catch  {
+                logData.request_body = cfg.data;
+            }
             const responseData = response?.data || errorResponse?.data;
             if (responseData) logData.response = responseData;
             const level = error ? 'ERROR' : 'INFO';
@@ -209,9 +215,8 @@ function wrapAxiosWithTrace(originalInstance) {
     });
 }
 function initAxiosConfig(axiosInstance) {
-    const isGlobal = !axiosInstance;
-    const instance = axiosInstance || axios;
-    instance.interceptors.request.use((config)=>{
+    if (!axiosInstance) axiosInstance = axios;
+    axiosInstance.interceptors.request.use((config)=>{
         const requestUUID = crypto.randomUUID();
         if ('production' !== process.env.NODE_ENV) {
             const stacktrace = getStacktrace();
@@ -223,29 +228,12 @@ function initAxiosConfig(axiosInstance) {
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
         return config;
     }, (error)=>Promise.reject(error));
-    'production' !== process.env.NODE_ENV && instance.interceptors.response.use((response)=>{
+    'production' !== process.env.NODE_ENV && axiosInstance.interceptors.response.use((response)=>{
         logResponse('success', response);
         return response;
     }, (error)=>{
         logResponse('error', error.response || error);
         return Promise.reject(error);
     });
-    const proxied = wrapAxiosWithTrace(instance);
-    if (isGlobal) {
-        const methods = [
-            'request',
-            'get',
-            'post',
-            'put',
-            'delete',
-            'patch',
-            'head',
-            'options'
-        ];
-        methods.forEach((method)=>{
-            instance[method] = proxied[method];
-        });
-    }
-    return proxied;
 }
 export { initAxiosConfig, wrapAxiosWithTrace };

package/lib/utils/getParentOrigin.d.ts

@@ -1,6 +1 @@
 export declare function getEnv(): 'BOE' | 'PRE' | 'ONLINE';
-/**
- * @internal
- * 获取预览环境父级域名
- */
-export declare function getPreviewParentOrigin(): "https://force.feishu.cn" | "https://force.feishu-pre.cn" | "https://force.feishu-boe.cn" | "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";

package/lib/utils/getParentOrigin.js

@@ -4,13 +4,4 @@ function getEnv() {
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'PRE';
     return 'BOE';
 }
-function getPreviewParentOrigin() {
-    const { origin } = window.location;
-    if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
-    if (origin.includes('force-pre.feishuapp.net')) return 'https://force.feishu-pre.cn';
-    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
-    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
-    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
-    return 'https://miaoda.feishu-boe.cn';
-}
-export { getEnv, getPreviewParentOrigin };
+export { getEnv };

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: any): 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

@@ -1,14 +1,28 @@
-import { getPreviewParentOrigin } from "./getParentOrigin.js";
+function getLegacyParentOrigin() {
+    const { origin } = window.location;
+    if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
+    if (origin.includes('force-pre.feishuapp.net')) return 'https://force.feishu-pre.cn';
+    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
+    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
+    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
+    return 'https://miaoda.feishu-boe.cn';
+}
+function resolveParentOrigin() {
+    return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();
+}
 function submitPostMessage(message, targetOrigin) {
     try {
-        window.parent.postMessage(message, targetOrigin ?? getPreviewParentOrigin());
+        const parentOrigin = resolveParentOrigin();
+        const origin = targetOrigin ?? parentOrigin;
+        if (!origin) return;
+        window.parent.postMessage(message, origin);
     } catch (e) {
         console.error('postMessage error', e);
     }
 }
 function submitSlardarEvent(event) {
-    const slardar = window['KSlardarWeb'];
-    if (slardar && 'function' == typeof slardar) slardar('sendEvent', event);
+    const slardar = window.KSlardarWeb;
+    if ('function' == typeof slardar) slardar('sendEvent', event);
     else console.warn('hmr listen function not found');
 }
 function isOutgoingMessage(msg, type) {
@@ -17,4 +31,4 @@ function isOutgoingMessage(msg, type) {
 function isIncomingMessage(msg, type) {
     return msg.type === type;
 }
-export { isIncomingMessage, isOutgoingMessage, submitPostMessage, submitSlardarEvent };
+export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage, submitSlardarEvent };

package/package.json

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