@lark-apaas/client-toolkit 1.2.2-test.1 → 1.2.2-test.3

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

@@ -1,4 +1,4 @@
-import type { Department, SearchDepartmentsParams, SearchDepartmentsResponse } from './types';
+import type { SearchDepartmentsParams, SearchDepartmentsResponse } from './types';
 export type DepartmentServiceConfig = {
     getAppId?: () => string | null | undefined;
     searchDepartmentUrl?: (appId: string) => string;
@@ -7,8 +7,4 @@ export declare class DepartmentService {
     private config;
     constructor(config?: DepartmentServiceConfig);
     searchDepartments(params: SearchDepartmentsParams): Promise<SearchDepartmentsResponse>;
-    createFetcher(): (search: string) => Promise<{
-        items: Department[];
-    }>;
-    private getDepartmentDisplayName;
 }

package/lib/integrations/services/DepartmentService.js

@@ -25,24 +25,5 @@ class DepartmentService {
         if (!response.ok) throw new Error('Failed to search departments');
         return response.json();
     }
-    createFetcher() {
-        return async (search)=>{
-            const response = await this.searchDepartments({
-                query: search,
-                pageSize: 100
-            });
-            const departmentList = response?.data?.departmentList || [];
-            return {
-                items: departmentList.map((department)=>({
-                        id: department.departmentID,
-                        name: this.getDepartmentDisplayName(department.name),
-                        raw: department
-                    }))
-            };
-        };
-    }
-    getDepartmentDisplayName(name) {
-        return name?.zh_cn || name?.en_us || '';
-    }
 }
 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

@@ -1,4 +1,4 @@
-import type { AccountType, SearchUsersParams, SearchUsersResponse, User } from './types';
+import type { BatchGetUsersResponse, SearchUsersParams, SearchUsersResponse } from './types';
 export type UserServiceConfig = {
     getAppId?: () => string | null | undefined;
     searchUserUrl?: (appId: string) => string;
@@ -6,17 +6,7 @@ export type UserServiceConfig = {
 };
 export declare class UserService {
     private config;
-    private cache;
     constructor(config?: UserServiceConfig);
     searchUsers(params: SearchUsersParams): Promise<SearchUsersResponse>;
-    fetchUsersByIds(userIds: string[], accountType?: AccountType): Promise<User[]>;
-    createFetcher(accountType?: AccountType): (search: string) => Promise<{
-        items: User[];
-    }>;
-    clearCache(): void;
-    private getCachedUsers;
-    private createUnknownUser;
-    private userInfoToUser;
-    private getUserDisplayName;
-    private getUserId;
+    listUsersByIds(userIds: string[]): Promise<BatchGetUsersResponse>;
 }

package/lib/integrations/services/UserService.js

@@ -6,7 +6,6 @@ const DEFAULT_CONFIG = {
 };
 class UserService {
     config;
-    cache = new Map();
     constructor(config = {}){
         this.config = {
             ...DEFAULT_CONFIG,
@@ -27,96 +26,21 @@ class UserService {
         if (!response.ok) throw new Error('Failed to search users');
         return response.json();
     }
-    async fetchUsersByIds(userIds, accountType = 'apaas') {
-        if (0 === userIds.length) return [];
-        const uniqueIds = [
-            ...new Set(userIds)
-        ];
-        const { cachedUsers, missingIds } = this.getCachedUsers(uniqueIds);
-        if (0 === missingIds.length) return uniqueIds.map((id)=>cachedUsers.get(id) || this.createUnknownUser(id));
+    async listUsersByIds(userIds) {
         const appId = this.config.getAppId();
         if (!appId) throw new Error('Failed to get appId');
-        try {
-            const response = await fetch(this.config.listUsersUrl(appId), {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    userIDList: missingIds.map((id)=>Number(id))
-                }),
-                credentials: 'include'
-            });
-            if (!response.ok) throw new Error('Failed to fetch users by ids');
-            const data = await response.json();
-            const userInfoMap = data?.data?.userInfoMap || {};
-            for (const id of missingIds){
-                const userInfo = userInfoMap[id];
-                if (userInfo) {
-                    const user = this.userInfoToUser(userInfo, accountType);
-                    this.cache.set(user.id, user);
-                }
-            }
-            return uniqueIds.map((id)=>this.cache.get(id) || this.createUnknownUser(id));
-        } catch (error) {
-            console.error('Failed to fetch users by ids:', error);
-            return uniqueIds.map((id)=>this.cache.get(id) || this.createUnknownUser(id));
-        }
-    }
-    createFetcher(accountType = 'apaas') {
-        return async (search)=>{
-            const response = await this.searchUsers({
-                query: search,
-                pageSize: 100
-            });
-            const userList = response?.data?.userList || [];
-            return {
-                items: userList.map((user)=>({
-                        id: this.getUserId(user, accountType),
-                        name: this.getUserDisplayName(user.name),
-                        avatar: user.avatar,
-                        raw: user
-                    }))
-            };
-        };
-    }
-    clearCache() {
-        this.cache.clear();
-    }
-    getCachedUsers(ids) {
-        const cachedUsers = new Map();
-        const missingIds = [];
-        for (const id of ids){
-            const cached = this.cache.get(id);
-            if (cached) cachedUsers.set(id, cached);
-            else missingIds.push(id);
-        }
-        return {
-            cachedUsers,
-            missingIds
-        };
-    }
-    createUnknownUser(id) {
-        return {
-            id,
-            name: '未知用户',
-            avatar: void 0,
-            raw: void 0
-        };
-    }
-    userInfoToUser(userInfo, accountType) {
-        return {
-            id: this.getUserId(userInfo, accountType),
-            name: this.getUserDisplayName(userInfo.name),
-            avatar: userInfo.avatar?.image?.large,
-            raw: userInfo
-        };
-    }
-    getUserDisplayName(name) {
-        return name.zh_cn || name.en_us || '';
-    }
-    getUserId(user, accountType) {
-        return 'lark' === accountType ? user.larkUserID : user.userID;
+        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

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

package/lib/integrations/services/index.js

@@ -1,3 +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

@@ -61,14 +61,31 @@ export type SearchDepartmentsResponse = {
     };
     status_code: string;
 };
-export type User = {
-    id: string;
-    name: string;
+export type UserProfileAccountStatus = 0 | 1 | 2 | 3 | 4;
+export type SimpleUserProfileInfo = {
+    name?: string;
     avatar?: string;
-    raw?: UserInfo;
+    email?: string;
+    userStatus: UserProfileAccountStatus;
+    userType: '_employee' | '_externalUser';
 };
-export type Department = {
-    id: string;
-    name: string;
-    raw?: DepartmentInfo;
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.2-test.1",
+  "version": "1.2.2-test.3",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [