@lark-apaas/client-toolkit 1.2.48-alpha.14 → 1.2.48-alpha.16

package/lib/auth.d.ts

@@ -1,2 +1,4 @@
 export { AuthProvider, useAuth, Can, CanRole, useCan, AbilityContext, useUserPermissions, PermissionClient, ROLE_SUBJECT, } from '@lark-apaas/auth-sdk';
 export type { AuthProviderProps, PermissionApiResponse, PermissionApiConfig, PermissionPointData, AuthSdkConfig, } from '@lark-apaas/auth-sdk';
+export { authClient, AccountClient } from '@lark-apaas/auth-sdk';
+export type { AccountClient as AuthClient, AccountServiceResponse, AccountServiceError, SearchParams, User, UserResponse, SignInRedirectionOptions, UserBaseInfo, UserInfoResponse, Avatar, } from '@lark-apaas/auth-sdk';

package/lib/auth.js

@@ -1,2 +1,2 @@
-import { AbilityContext, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, useAuth, useCan, useUserPermissions } from "@lark-apaas/auth-sdk";
-export { AbilityContext, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, useAuth, useCan, useUserPermissions };
+import { AbilityContext, AccountClient, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, authClient, useAuth, useCan, useUserPermissions } from "@lark-apaas/auth-sdk";
+export { AbilityContext, AccountClient, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, authClient, useAuth, useCan, useUserPermissions };

package/lib/components/AppContainer/index.js

@@ -7,7 +7,6 @@ import IframeBridge from "./IframeBridge.js";
 import { Toaster } from "./sonner.js";
 import { PageHoc } from "./PageHoc.js";
 import { reportTeaEvent } from "./utils/tea.js";
-import { SafetyErrorBoundary } from "./safety-error-boundary.js";
 import { useAppInfo } from "../../hooks/index.js";
 import { TrackKey } from "../../types/tea.js";
 import { slardar } from "@lark-apaas/internal-slardar";
@@ -197,11 +196,9 @@ const AppContainer_AppContainer = (props)=>{
     };
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
-            /*#__PURE__*/ jsx(SafetyErrorBoundary, {
-                children: /*#__PURE__*/ jsx(Suspense, {
-                    fallback: null,
-                    children: /*#__PURE__*/ jsx(Safety, {})
-                })
+            /*#__PURE__*/ jsx(Suspense, {
+                fallback: null,
+                children: /*#__PURE__*/ jsx(Safety, {})
             }),
             /*#__PURE__*/ jsx(QueryProvider, {
                 children: /*#__PURE__*/ jsx(ConfigProvider, {

package/lib/components/User/UserSelect.js

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import react from "react";
-import { getDataloom } from "../../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 import { UserSelectUI } from "./UserSelectUI/index.js";
 const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholder, fetchUsers })=>{
     const normalizedIds = react.useMemo(()=>{
@@ -67,8 +67,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
         if (!normalizedIds.length) return void setUiValue(void 0);
         const fetchProfiles = async ()=>{
             try {
-                const dataloom = await getDataloom();
-                const response = await dataloom.service.user.getByIds(normalizedIds);
+                const response = await authClient.user.getByIds(normalizedIds);
                 const fetchedList = Array.isArray(response?.data) ? response?.data : Array.isArray(response?.data?.user_list) ? response?.data?.user_list : [];
                 const fetchedMap = new Map();
                 fetchedList.forEach((profile)=>{
@@ -115,8 +114,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
     const fetchUsersImpl = react.useCallback(async (search)=>{
         if (fetchUsers) return fetchUsers(search);
         try {
-            const dataloom = await getDataloom();
-            const { data } = await dataloom.service.user.search({
+            const { data } = await authClient.user.search({
                 name: search,
                 pageSize: 20
             });

package/lib/hooks/useCurrentUserProfile.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
+import { authClient } from "@lark-apaas/auth-sdk";
 import { logger } from "../logger/index.js";
 import { getCurrentUserProfile } from "../integrations/getCurrentUserProfile.js";
-import { getDataloom } from "../integrations/dataloom.js";
 import { isSparkRuntime } from "../utils/utils.js";
 import { getAxiosForBackend } from "../utils/getAxiosForBackend.js";
 function getNameFromArray(nameArray) {
@@ -35,8 +35,7 @@ const useCurrentUserProfile = ()=>{
     useEffect(()=>{
         let cancelled = false;
         const fetchAndSetUserInfo = async ()=>{
-            const dataloom = await getDataloom();
-            const result = await dataloom?.service?.session?.getUserInfo();
+            const result = await authClient.session.getUserInfo();
             if (cancelled) return;
             const info = result?.data?.user_info;
             const userName = getNameFromArray(info?.name);

package/lib/hooks/useLogout.js

@@ -1,13 +1,12 @@
 import { useState } from "react";
-import { getDataloom } from "../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 function useLogout() {
     const [isLoading, setIsLoading] = useState(false);
     async function handlerLogout() {
         if ('production' !== process.env.NODE_ENV) return void console.log('只有生产环境才执行登出');
         setIsLoading(true);
         try {
-            const dataloom = await getDataloom();
-            await dataloom.service.session.signOut();
+            await authClient.session.signOut();
         } catch (error) {
             console.error('登出失败', error);
         } finally{

package/lib/integrations/dataloom.js

@@ -1,5 +1,6 @@
 import { splitWorkspaceUrl } from "../utils/url.js";
 import { createClient } from "@lark-apaas/dataloom";
+import { authClient } from "@lark-apaas/auth-sdk";
 import { getAppId } from "../utils/getAppId.js";
 import { getAppPublished } from "../utils/getInitialInfo.js";
 const createDataLoomClient = (url, pat)=>{
@@ -12,7 +13,11 @@ const createDataLoomClient = (url, pat)=>{
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
             brandName: 'miaoda',
-            appId
+            appId,
+            accountServices: {
+                user: authClient.user,
+                session: authClient.session
+            }
         }
     });
 };

package/lib/utils/requestManager.js

@@ -1,10 +1,8 @@
-import { getDataloom } from "../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 const pendingRequests = new Map();
 async function fetchUserProfilesByIds(ids) {
     try {
-        const dataloom = await getDataloom();
-        if (!dataloom) throw new Error('Dataloom client is unavailable');
-        const response = await dataloom.service.user.getByIds(ids);
+        const response = await authClient.user.getByIds(ids);
         return Array.isArray(response?.data) ? response.data : response?.data?.user_list || [];
     } catch (error) {
         console.error(`Failed to fetch profiles for user IDs ${ids.join(', ')}:`, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.48-alpha.14",
+  "version": "1.2.48-alpha.16",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,9 +99,9 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@lark-apaas/aily-web-sdk": "^0.0.11",
-    "@lark-apaas/auth-sdk": "^0.1.4",
-    "@lark-apaas/client-capability": "^0.1.6",
-    "@lark-apaas/dataloom": "^0.1.1",
+    "@lark-apaas/auth-sdk": "^0.1.5",
+    "@lark-apaas/client-capability": "^0.1.7",
+    "@lark-apaas/dataloom": "0.1.3-alpha.12",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",

package/lib/components/AppContainer/__test__/safety-error-boundary.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/AppContainer/__test__/safety-error-boundary.test.js

@@ -1,53 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-import "react";
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
-import { slardar } from "@lark-apaas/internal-slardar";
-import { SafetyErrorBoundary } from "../safety-error-boundary.js";
-vi.mock('@lark-apaas/internal-slardar', ()=>({
-        slardar: {
-            sendLog: vi.fn()
-        }
-    }));
-describe('SafetyErrorBoundary', ()=>{
-    it('renders children when no error', ()=>{
-        render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
-            children: /*#__PURE__*/ jsx("div", {
-                "data-testid": "child",
-                children: "child content"
-            })
-        }));
-        expect(screen.getByTestId('child').textContent).toBe('child content');
-    });
-    it('renders null fallback when child throws', ()=>{
-        const Throwing = ()=>{
-            throw new Error('Failed to fetch dynamically imported module: safety-XXX.js');
-        };
-        const errSpy = vi.spyOn(console, 'error').mockImplementation(()=>{});
-        const { container } = render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
-            children: /*#__PURE__*/ jsx(Throwing, {})
-        }));
-        expect(container.innerHTML).toBe('');
-        errSpy.mockRestore();
-    });
-    it('logs error via slardar when child throws', ()=>{
-        const Throwing = ()=>{
-            throw new Error('chunk load failed');
-        };
-        const errSpy = vi.spyOn(console, 'error').mockImplementation(()=>{});
-        slardar.sendLog.mockClear();
-        render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
-            children: /*#__PURE__*/ jsx(Throwing, {})
-        }));
-        expect(slardar.sendLog).toHaveBeenCalledTimes(1);
-        expect(slardar.sendLog).toHaveBeenCalledWith(expect.objectContaining({
-            content: expect.stringContaining('chunk load failed'),
-            level: 'error',
-            extra: expect.objectContaining({
-                stack: expect.any(String),
-                componentStack: expect.any(String)
-            })
-        }));
-        errSpy.mockRestore();
-    });
-});

package/lib/components/AppContainer/safety-error-boundary.d.ts

@@ -1,23 +0,0 @@
-import React from 'react';
-interface Props {
-    children: React.ReactNode;
-}
-interface State {
-    hasError: boolean;
-}
-/**
- * SafetyErrorBoundary - 包裹 Safety 徽章的 lazy import 失败兜底
- *
- * Why: AppContainer 内 `<Suspense fallback={null}><Safety /></Suspense>` 中 Safety 是 React.lazy
- * 拆出的非核心徽章 chunk。chunk 加载失败（CDN 缓存窗 / 部署漂移 / dev preview hash 漂移 / 网络抖动）
- * 时 rejected Promise 越过 Suspense 上抛，会冒到 React root 让整应用 unmount = 白屏。
- *
- * ErrorBoundary 把失败局限在徽章自身：徽章不显示，应用继续跑。同时上报 slardar 便于事后归因。
- */
-export declare class SafetyErrorBoundary extends React.Component<Props, State> {
-    state: State;
-    static getDerivedStateFromError(): State;
-    componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void;
-    render(): React.ReactNode;
-}
-export {};

package/lib/components/AppContainer/safety-error-boundary.js

@@ -1,29 +0,0 @@
-import react from "react";
-import { slardar } from "@lark-apaas/internal-slardar";
-class SafetyErrorBoundary extends react.Component {
-    state = {
-        hasError: false
-    };
-    static getDerivedStateFromError() {
-        return {
-            hasError: true
-        };
-    }
-    componentDidCatch(error, errorInfo) {
-        try {
-            slardar.sendLog({
-                content: `safety_chunk_load_error: ${error.message}`,
-                level: 'error',
-                extra: {
-                    stack: error.stack ?? '',
-                    componentStack: errorInfo.componentStack ?? ''
-                }
-            });
-        } catch  {}
-    }
-    render() {
-        if (this.state.hasError) return null;
-        return this.props.children;
-    }
-}
-export { SafetyErrorBoundary };