@lark-apaas/client-toolkit 1.2.54-alpha.4 → 1.2.54-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/apis/components/UniversalLink.d.ts +3 -0
- package/lib/apis/components/UniversalLink.js +42 -3
- package/lib/auth.d.ts +2 -0
- package/lib/auth.js +2 -2
- package/lib/components/AppContainer/Watermark.d.ts +60 -0
- package/lib/components/AppContainer/Watermark.js +364 -0
- package/lib/components/AppContainer/__test__/Watermark.test.d.ts +1 -0
- package/lib/components/AppContainer/__test__/Watermark.test.js +121 -0
- package/lib/components/AppContainer/__test__/safety-error-boundary.test.d.ts +1 -0
- package/lib/components/AppContainer/__test__/safety-error-boundary.test.js +53 -0
- package/lib/components/AppContainer/doubao-watermark-asset.d.ts +2 -0
- package/lib/components/AppContainer/doubao-watermark-asset.js +4 -0
- package/lib/components/AppContainer/index.js +7 -3
- package/lib/components/AppContainer/safety-error-boundary.d.ts +23 -0
- package/lib/components/AppContainer/safety-error-boundary.js +29 -0
- package/lib/components/AppContainer/safety.js +50 -0
- package/lib/components/User/UserSelect.js +3 -5
- package/lib/hooks/useCurrentUserProfile.d.ts +5 -15
- package/lib/hooks/useCurrentUserProfile.js +17 -12
- package/lib/hooks/useLogout.js +2 -3
- package/lib/index.d.ts +40 -0
- package/lib/index.js +32 -2
- package/lib/integrations/__test__/dataloom.test.d.ts +1 -0
- package/lib/integrations/__test__/dataloom.test.js +83 -0
- package/lib/integrations/dataloom.d.ts +1 -1
- package/lib/integrations/dataloom.js +11 -12
- package/lib/integrations/getCurrentUserProfile.d.ts +3 -4
- package/lib/integrations/services/types.d.ts +0 -34
- package/lib/locales/messages.js +4 -0
- package/lib/types/iframe-events.d.ts +12 -1
- package/lib/utils/postMessage.d.ts +1 -0
- package/lib/utils/postMessage.js +1 -1
- package/lib/utils/requestManager.js +2 -4
- package/package.json +5 -4
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { jsx } from "react/jsx-runtime";
|
|
2
|
+
import "react";
|
|
3
|
+
import { render, screen } from "@testing-library/react";
|
|
4
|
+
import { describe, expect, it, vi } from "vitest";
|
|
5
|
+
import { slardar } from "@lark-apaas/internal-slardar";
|
|
6
|
+
import { SafetyErrorBoundary } from "../safety-error-boundary.js";
|
|
7
|
+
vi.mock('@lark-apaas/internal-slardar', ()=>({
|
|
8
|
+
slardar: {
|
|
9
|
+
sendLog: vi.fn()
|
|
10
|
+
}
|
|
11
|
+
}));
|
|
12
|
+
describe('SafetyErrorBoundary', ()=>{
|
|
13
|
+
it('renders children when no error', ()=>{
|
|
14
|
+
render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
|
|
15
|
+
children: /*#__PURE__*/ jsx("div", {
|
|
16
|
+
"data-testid": "child",
|
|
17
|
+
children: "child content"
|
|
18
|
+
})
|
|
19
|
+
}));
|
|
20
|
+
expect(screen.getByTestId('child').textContent).toBe('child content');
|
|
21
|
+
});
|
|
22
|
+
it('renders null fallback when child throws', ()=>{
|
|
23
|
+
const Throwing = ()=>{
|
|
24
|
+
throw new Error('Failed to fetch dynamically imported module: safety-XXX.js');
|
|
25
|
+
};
|
|
26
|
+
const errSpy = vi.spyOn(console, 'error').mockImplementation(()=>{});
|
|
27
|
+
const { container } = render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
|
|
28
|
+
children: /*#__PURE__*/ jsx(Throwing, {})
|
|
29
|
+
}));
|
|
30
|
+
expect(container.innerHTML).toBe('');
|
|
31
|
+
errSpy.mockRestore();
|
|
32
|
+
});
|
|
33
|
+
it('logs error via slardar when child throws', ()=>{
|
|
34
|
+
const Throwing = ()=>{
|
|
35
|
+
throw new Error('chunk load failed');
|
|
36
|
+
};
|
|
37
|
+
const errSpy = vi.spyOn(console, 'error').mockImplementation(()=>{});
|
|
38
|
+
slardar.sendLog.mockClear();
|
|
39
|
+
render(/*#__PURE__*/ jsx(SafetyErrorBoundary, {
|
|
40
|
+
children: /*#__PURE__*/ jsx(Throwing, {})
|
|
41
|
+
}));
|
|
42
|
+
expect(slardar.sendLog).toHaveBeenCalledTimes(1);
|
|
43
|
+
expect(slardar.sendLog).toHaveBeenCalledWith(expect.objectContaining({
|
|
44
|
+
content: expect.stringContaining('chunk load failed'),
|
|
45
|
+
level: 'error',
|
|
46
|
+
extra: expect.objectContaining({
|
|
47
|
+
stack: expect.any(String),
|
|
48
|
+
componentStack: expect.any(String)
|
|
49
|
+
})
|
|
50
|
+
}));
|
|
51
|
+
errSpy.mockRestore();
|
|
52
|
+
});
|
|
53
|
+
});
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export declare const DOUBAO_LOGO_SRC = "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui/setting_voice.svg";
|
|
2
|
+
export declare const DOUBAO_PILL_MOBILE_PNG = "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui/Frame%202147223991%20(3).png";
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
const CDN = 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui';
|
|
2
|
+
const DOUBAO_LOGO_SRC = `${CDN}/setting_voice.svg`;
|
|
3
|
+
const DOUBAO_PILL_MOBILE_PNG = `${CDN}/Frame%202147223991%20(3).png`;
|
|
4
|
+
export { DOUBAO_LOGO_SRC, DOUBAO_PILL_MOBILE_PNG };
|
|
@@ -7,9 +7,11 @@ import IframeBridge from "./IframeBridge.js";
|
|
|
7
7
|
import { Toaster } from "./sonner.js";
|
|
8
8
|
import { PageHoc } from "./PageHoc.js";
|
|
9
9
|
import { reportTeaEvent } from "./utils/tea.js";
|
|
10
|
+
import { SafetyErrorBoundary } from "./safety-error-boundary.js";
|
|
10
11
|
import { useAppInfo } from "../../hooks/index.js";
|
|
11
12
|
import { TrackKey } from "../../types/tea.js";
|
|
12
13
|
import { slardar } from "@lark-apaas/internal-slardar";
|
|
14
|
+
import Watermark, { isDoubaoSource } from "./Watermark.js";
|
|
13
15
|
import { getAppId } from "../../utils/getAppId.js";
|
|
14
16
|
import { isNewPathEnabled } from "../../utils/apiPath.js";
|
|
15
17
|
import QueryProvider from "../QueryProvider/index.js";
|
|
@@ -196,9 +198,11 @@ const AppContainer_AppContainer = (props)=>{
|
|
|
196
198
|
};
|
|
197
199
|
return /*#__PURE__*/ jsxs(Fragment, {
|
|
198
200
|
children: [
|
|
199
|
-
/*#__PURE__*/ jsx(
|
|
200
|
-
|
|
201
|
-
|
|
201
|
+
/*#__PURE__*/ jsx(SafetyErrorBoundary, {
|
|
202
|
+
children: isDoubaoSource() ? /*#__PURE__*/ jsx(Watermark, {}) : /*#__PURE__*/ jsx(Suspense, {
|
|
203
|
+
fallback: null,
|
|
204
|
+
children: /*#__PURE__*/ jsx(Safety, {})
|
|
205
|
+
})
|
|
202
206
|
}),
|
|
203
207
|
/*#__PURE__*/ jsx(QueryProvider, {
|
|
204
208
|
children: /*#__PURE__*/ jsx(ConfigProvider, {
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
interface Props {
|
|
3
|
+
children: React.ReactNode;
|
|
4
|
+
}
|
|
5
|
+
interface State {
|
|
6
|
+
hasError: boolean;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* SafetyErrorBoundary - 包裹 Safety 徽章的 lazy import 失败兜底
|
|
10
|
+
*
|
|
11
|
+
* Why: AppContainer 内 `<Suspense fallback={null}><Safety /></Suspense>` 中 Safety 是 React.lazy
|
|
12
|
+
* 拆出的非核心徽章 chunk。chunk 加载失败(CDN 缓存窗 / 部署漂移 / dev preview hash 漂移 / 网络抖动)
|
|
13
|
+
* 时 rejected Promise 越过 Suspense 上抛,会冒到 React root 让整应用 unmount = 白屏。
|
|
14
|
+
*
|
|
15
|
+
* ErrorBoundary 把失败局限在徽章自身:徽章不显示,应用继续跑。同时上报 slardar 便于事后归因。
|
|
16
|
+
*/
|
|
17
|
+
export declare class SafetyErrorBoundary extends React.Component<Props, State> {
|
|
18
|
+
state: State;
|
|
19
|
+
static getDerivedStateFromError(): State;
|
|
20
|
+
componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void;
|
|
21
|
+
render(): React.ReactNode;
|
|
22
|
+
}
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import react from "react";
|
|
2
|
+
import { slardar } from "@lark-apaas/internal-slardar";
|
|
3
|
+
class SafetyErrorBoundary extends react.Component {
|
|
4
|
+
state = {
|
|
5
|
+
hasError: false
|
|
6
|
+
};
|
|
7
|
+
static getDerivedStateFromError() {
|
|
8
|
+
return {
|
|
9
|
+
hasError: true
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
componentDidCatch(error, errorInfo) {
|
|
13
|
+
try {
|
|
14
|
+
slardar.sendLog({
|
|
15
|
+
content: `safety_chunk_load_error: ${error.message}`,
|
|
16
|
+
level: 'error',
|
|
17
|
+
extra: {
|
|
18
|
+
stack: error.stack ?? '',
|
|
19
|
+
componentStack: errorInfo.componentStack ?? ''
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
} catch {}
|
|
23
|
+
}
|
|
24
|
+
render() {
|
|
25
|
+
if (this.state.hasError) return null;
|
|
26
|
+
return this.props.children;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export { SafetyErrorBoundary };
|
|
@@ -2,12 +2,32 @@ import { jsx, jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { useEffect, useRef, useState } from "react";
|
|
3
3
|
import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
|
|
4
4
|
import { getAppId } from "../../utils/getAppId.js";
|
|
5
|
+
import { getEnv } from "../../utils/getParentOrigin.js";
|
|
5
6
|
import { getCsrfToken } from "../../utils/getCsrfToken.js";
|
|
6
7
|
import { isNewPathEnabled } from "../../utils/apiPath.js";
|
|
7
8
|
import { useIsMobile } from "../../hooks/index.js";
|
|
8
9
|
import { X } from "lucide-react";
|
|
9
10
|
import { Sheet, SheetContent, SheetTrigger } from "../ui/drawer.js";
|
|
10
11
|
import { t } from "../../locales/index.js";
|
|
12
|
+
const ICON_FEEDBACK_URL = 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui/icon_feedback_outlined.png';
|
|
13
|
+
const REPORT_DOMAIN = {
|
|
14
|
+
BOE: 'tns.feishu-boe.cn',
|
|
15
|
+
PRE: 'tns.feishu-pre.cn',
|
|
16
|
+
ONLINE: 'tns.feishu.cn'
|
|
17
|
+
};
|
|
18
|
+
const openReport = ()=>{
|
|
19
|
+
const appId = getAppId();
|
|
20
|
+
if (!appId) return;
|
|
21
|
+
const params = JSON.stringify({
|
|
22
|
+
scene: 'miaoda_app_report',
|
|
23
|
+
entity_id: appId,
|
|
24
|
+
entity_type: 'miaoda_app',
|
|
25
|
+
extra: ''
|
|
26
|
+
});
|
|
27
|
+
const domain = REPORT_DOMAIN[getEnv()] ?? REPORT_DOMAIN.ONLINE;
|
|
28
|
+
const url = `https://${domain}/cust/lark_report/?type=common¶ms=${encodeURIComponent(params)}&lang=zh-CN`;
|
|
29
|
+
window.open(url, '_blank', 'noopener,noreferrer');
|
|
30
|
+
};
|
|
11
31
|
const Component = ()=>{
|
|
12
32
|
const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId()}`;
|
|
13
33
|
const [visible, setVisible] = useState(!window.localStorage?.getItem(HasClosedKey));
|
|
@@ -129,6 +149,21 @@ const Component = ()=>{
|
|
|
129
149
|
children: t('safety.ai.disclaimer')
|
|
130
150
|
})
|
|
131
151
|
]
|
|
152
|
+
}),
|
|
153
|
+
/*#__PURE__*/ jsxs("div", {
|
|
154
|
+
className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
|
|
155
|
+
"data-custom-element": "safety-report",
|
|
156
|
+
onClick: openReport,
|
|
157
|
+
children: [
|
|
158
|
+
/*#__PURE__*/ jsx("img", {
|
|
159
|
+
src: ICON_FEEDBACK_URL,
|
|
160
|
+
className: "shrink-0 w-[14px] h-[14px]"
|
|
161
|
+
}),
|
|
162
|
+
/*#__PURE__*/ jsx("p", {
|
|
163
|
+
className: "shrink-0 m-0! text-[#646A73] text-sm underline underline-offset-2",
|
|
164
|
+
children: t('safety.report')
|
|
165
|
+
})
|
|
166
|
+
]
|
|
132
167
|
})
|
|
133
168
|
]
|
|
134
169
|
}),
|
|
@@ -248,6 +283,21 @@ const Component = ()=>{
|
|
|
248
283
|
children: t('safety.ai.disclaimer')
|
|
249
284
|
})
|
|
250
285
|
]
|
|
286
|
+
}),
|
|
287
|
+
/*#__PURE__*/ jsxs("div", {
|
|
288
|
+
className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
|
|
289
|
+
"data-custom-element": "safety-report",
|
|
290
|
+
onClick: openReport,
|
|
291
|
+
children: [
|
|
292
|
+
/*#__PURE__*/ jsx("img", {
|
|
293
|
+
src: ICON_FEEDBACK_URL,
|
|
294
|
+
className: "shrink-0 w-[12px] h-[12px]"
|
|
295
|
+
}),
|
|
296
|
+
/*#__PURE__*/ jsx("p", {
|
|
297
|
+
className: "shrink-0 m-0! text-[#a6a6a6] underline underline-offset-2",
|
|
298
|
+
children: t('safety.report')
|
|
299
|
+
})
|
|
300
|
+
]
|
|
251
301
|
})
|
|
252
302
|
]
|
|
253
303
|
}),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import react from "react";
|
|
3
|
-
import {
|
|
3
|
+
import { authClient } from "@lark-apaas/auth-sdk";
|
|
4
4
|
import { UserSelectUI } from "./UserSelectUI/index.js";
|
|
5
5
|
const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholder, fetchUsers })=>{
|
|
6
6
|
const normalizedIds = react.useMemo(()=>{
|
|
@@ -67,8 +67,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
|
|
|
67
67
|
if (!normalizedIds.length) return void setUiValue(void 0);
|
|
68
68
|
const fetchProfiles = async ()=>{
|
|
69
69
|
try {
|
|
70
|
-
const
|
|
71
|
-
const response = await dataloom.service.user.getByIds(normalizedIds);
|
|
70
|
+
const response = await authClient.user.getByIds(normalizedIds);
|
|
72
71
|
const fetchedList = Array.isArray(response?.data) ? response?.data : Array.isArray(response?.data?.user_list) ? response?.data?.user_list : [];
|
|
73
72
|
const fetchedMap = new Map();
|
|
74
73
|
fetchedList.forEach((profile)=>{
|
|
@@ -115,8 +114,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
|
|
|
115
114
|
const fetchUsersImpl = react.useCallback(async (search)=>{
|
|
116
115
|
if (fetchUsers) return fetchUsers(search);
|
|
117
116
|
try {
|
|
118
|
-
const
|
|
119
|
-
const { data } = await dataloom.service.user.search({
|
|
117
|
+
const { data } = await authClient.user.search({
|
|
120
118
|
name: search,
|
|
121
119
|
pageSize: 20
|
|
122
120
|
});
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { IUserProfile } from '../apis/udt-types';
|
|
2
2
|
/**
|
|
3
3
|
* useCurrentUserProfile 的返回类型。
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* 判断是否已加载完成应使用 `if (!userInfo?.user_id)` 而非 `if (!userInfo)`(因为空对象是 truthy)。
|
|
4
|
+
* 与 client-toolkit-lite 完全一致:所有字段保证非 undefined(未加载时为空字符串),
|
|
5
|
+
* 使用 `if (!userInfo.user_id)` 判断是否已加载完成。
|
|
7
6
|
*/
|
|
8
|
-
export
|
|
7
|
+
export interface ICompatibilityUserProfile extends IUserProfile {
|
|
9
8
|
/**
|
|
10
9
|
* @deprecated please use `name`
|
|
11
10
|
*/
|
|
@@ -14,14 +13,5 @@ export type ICompatibilityUserProfile = Partial<IUserProfile & {
|
|
|
14
13
|
* @deprecated please use `avatar`
|
|
15
14
|
*/
|
|
16
15
|
userAvatar: string;
|
|
17
|
-
}
|
|
18
|
-
export declare const useCurrentUserProfile: () =>
|
|
19
|
-
/**
|
|
20
|
-
* @deprecated please use `name`
|
|
21
|
-
*/
|
|
22
|
-
userName: string;
|
|
23
|
-
/**
|
|
24
|
-
* @deprecated please use `avatar`
|
|
25
|
-
*/
|
|
26
|
-
userAvatar: string;
|
|
27
|
-
}>;
|
|
16
|
+
}
|
|
17
|
+
export declare const useCurrentUserProfile: () => ICompatibilityUserProfile;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useEffect, useState } from "react";
|
|
2
|
+
import { authClient } from "@lark-apaas/auth-sdk";
|
|
2
3
|
import { logger } from "../logger/index.js";
|
|
3
4
|
import { getCurrentUserProfile } from "../integrations/getCurrentUserProfile.js";
|
|
4
|
-
import { getDataloom } from "../integrations/dataloom.js";
|
|
5
5
|
import { isSparkRuntime } from "../utils/utils.js";
|
|
6
6
|
import { getAxiosForBackend } from "../utils/getAxiosForBackend.js";
|
|
7
7
|
function getNameFromArray(nameArray) {
|
|
@@ -25,9 +25,14 @@ function fetchLarkUserId() {
|
|
|
25
25
|
function getCompatibilityUserProfile() {
|
|
26
26
|
const userInfo = getCurrentUserProfile();
|
|
27
27
|
return {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
user_id: userInfo.user_id ?? '',
|
|
29
|
+
email: userInfo.email ?? '',
|
|
30
|
+
name: userInfo.name ?? '',
|
|
31
|
+
avatar: userInfo.avatar ?? '',
|
|
32
|
+
status: userInfo.status,
|
|
33
|
+
lark_user_id: userInfo.lark_user_id,
|
|
34
|
+
userName: userInfo.name ?? '',
|
|
35
|
+
userAvatar: userInfo.avatar ?? ''
|
|
31
36
|
};
|
|
32
37
|
}
|
|
33
38
|
const useCurrentUserProfile = ()=>{
|
|
@@ -35,18 +40,18 @@ const useCurrentUserProfile = ()=>{
|
|
|
35
40
|
useEffect(()=>{
|
|
36
41
|
let cancelled = false;
|
|
37
42
|
const fetchAndSetUserInfo = async ()=>{
|
|
38
|
-
const
|
|
39
|
-
const result = await dataloom?.service?.session?.getUserInfo();
|
|
43
|
+
const result = await authClient.session.getUserInfo();
|
|
40
44
|
if (cancelled) return;
|
|
41
45
|
const info = result?.data?.user_info;
|
|
42
|
-
const userName = getNameFromArray(info?.name);
|
|
46
|
+
const userName = getNameFromArray(info?.name) ?? '';
|
|
47
|
+
const avatar = info?.avatar?.image?.large ?? '';
|
|
43
48
|
const newUserInfo = {
|
|
44
|
-
user_id: info?.user_id?.toString(),
|
|
45
|
-
email: info?.email,
|
|
49
|
+
user_id: info?.user_id?.toString() ?? '',
|
|
50
|
+
email: info?.email ?? '',
|
|
46
51
|
name: userName,
|
|
47
|
-
avatar
|
|
48
|
-
userName
|
|
49
|
-
userAvatar:
|
|
52
|
+
avatar,
|
|
53
|
+
userName,
|
|
54
|
+
userAvatar: avatar
|
|
50
55
|
};
|
|
51
56
|
const larkUserId = await fetchLarkUserId();
|
|
52
57
|
if (larkUserId) newUserInfo.lark_user_id = larkUserId;
|
package/lib/hooks/useLogout.js
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { useState } from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { authClient } from "@lark-apaas/auth-sdk";
|
|
3
3
|
function useLogout() {
|
|
4
4
|
const [isLoading, setIsLoading] = useState(false);
|
|
5
5
|
async function handlerLogout() {
|
|
6
6
|
if ('production' !== process.env.NODE_ENV) return void console.log('只有生产环境才执行登出');
|
|
7
7
|
setIsLoading(true);
|
|
8
8
|
try {
|
|
9
|
-
|
|
10
|
-
await dataloom.service.session.signOut();
|
|
9
|
+
await authClient.session.signOut();
|
|
11
10
|
} catch (error) {
|
|
12
11
|
console.error('登出失败', error);
|
|
13
12
|
} finally{
|
package/lib/index.d.ts
CHANGED
|
@@ -1,6 +1,46 @@
|
|
|
1
|
+
import { getAppId } from './utils/getAppId';
|
|
2
|
+
import { logger } from './logger';
|
|
1
3
|
export declare const capabilityClient: import("@lark-apaas/client-capability").CapabilityClient;
|
|
2
4
|
export { showConfirm } from './components/ui/confirm';
|
|
3
5
|
export type { ConfirmOptions } from './components/ui/confirm';
|
|
6
|
+
export { default as AppContainer } from './components/AppContainer';
|
|
7
|
+
export { default as QueryProvider } from './components/QueryProvider';
|
|
8
|
+
export { default as PagePlaceholder } from './components/PagePlaceholder';
|
|
9
|
+
export { default as Welcome } from './components/PagePlaceholder';
|
|
10
|
+
export { default as ErrorRender } from './components/ErrorRender';
|
|
11
|
+
export { ActiveLink } from './apis/components/ActiveLink';
|
|
12
|
+
export { NavLink } from './apis/components/NavLink';
|
|
13
|
+
export { UniversalLink } from './apis/components/UniversalLink';
|
|
14
|
+
export { useAppInfo } from './hooks/useAppInfo';
|
|
15
|
+
export { useCurrentUserProfile } from './hooks/useCurrentUserProfile';
|
|
16
|
+
export { useIsMobile } from './hooks/useIsMobile';
|
|
17
|
+
export { useLogout } from './hooks/useLogout';
|
|
18
|
+
export { clsxWithTw, isPreview, normalizeBasePath, getWsPath } from './utils/utils';
|
|
19
|
+
export { getCsrfToken } from './utils/getCsrfToken';
|
|
20
|
+
export { scopedStorage } from './utils/scopedStorage';
|
|
21
|
+
export { copyToClipboard } from './utils/copyToClipboard';
|
|
22
|
+
export { isIpad, isMobile, isIOS } from './utils/deviceType';
|
|
23
|
+
export { resolveAppUrl } from './utils/resolveAppUrl';
|
|
24
|
+
export { getEnvPath } from './utils/getEnvPath';
|
|
25
|
+
export { safeStringify } from './utils/safeStringify';
|
|
26
|
+
export { getAxiosForBackend, axiosForBackend } from './utils/getAxiosForBackend';
|
|
27
|
+
export { initAxiosConfig } from './utils/axiosConfig';
|
|
28
|
+
export { getAppId };
|
|
29
|
+
export { getAppInfo } from './integrations/getAppInfo';
|
|
30
|
+
export { getCurrentUserProfile } from './integrations/getCurrentUserProfile';
|
|
31
|
+
export { getDataloom } from './integrations/dataloom';
|
|
32
|
+
export { logger };
|
|
33
|
+
export type { LogLevel, LogWithMeta } from './logger/log-types';
|
|
34
|
+
export { trace } from './trace';
|
|
35
|
+
export { initObservable } from './runtime/observable';
|
|
36
|
+
export type { AppInfoPayload } from './types/common';
|
|
37
|
+
export type { IUserProfile, IJson, IFileAttachment } from './apis/udt-types';
|
|
38
|
+
export type { TrackParams } from './types/tea';
|
|
39
|
+
export { TrackKey } from './types/tea';
|
|
40
|
+
export { reportTeaEvent } from './components/AppContainer/utils/tea';
|
|
41
|
+
export * as avatarImages from './apis/constants/img-resources/avatar';
|
|
42
|
+
export * as bannerImages from './apis/constants/img-resources/banner';
|
|
43
|
+
export * as coverImages from './apis/constants/img-resources/cover';
|
|
4
44
|
declare const _default: {
|
|
5
45
|
version: string;
|
|
6
46
|
};
|
package/lib/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createClient } from "@lark-apaas/client-capability";
|
|
2
|
-
import { normalizeBasePath } from "./utils/utils.js";
|
|
2
|
+
import { clsxWithTw, getWsPath, isPreview, normalizeBasePath } from "./utils/utils.js";
|
|
3
3
|
import { getAppId } from "./utils/getAppId.js";
|
|
4
4
|
import { isNewPathEnabled } from "./utils/apiPath.js";
|
|
5
5
|
import { logger } from "./logger/index.js";
|
|
@@ -7,6 +7,36 @@ import { showToast } from "./components/ui/toast.js";
|
|
|
7
7
|
import { t } from "./locales/index.js";
|
|
8
8
|
import { version } from "../package.json";
|
|
9
9
|
import { showConfirm } from "./components/ui/confirm.js";
|
|
10
|
+
import AppContainer from "./components/AppContainer/index.js";
|
|
11
|
+
import QueryProvider from "./components/QueryProvider/index.js";
|
|
12
|
+
import PagePlaceholder from "./components/PagePlaceholder/index.js";
|
|
13
|
+
import ErrorRender from "./components/ErrorRender/index.js";
|
|
14
|
+
import { ActiveLink } from "./apis/components/ActiveLink.js";
|
|
15
|
+
import { NavLink } from "./apis/components/NavLink.js";
|
|
16
|
+
import { UniversalLink } from "./apis/components/UniversalLink.js";
|
|
17
|
+
import { useAppInfo } from "./hooks/useAppInfo.js";
|
|
18
|
+
import { useCurrentUserProfile } from "./hooks/useCurrentUserProfile.js";
|
|
19
|
+
import { useIsMobile } from "./hooks/useIsMobile.js";
|
|
20
|
+
import { useLogout } from "./hooks/useLogout.js";
|
|
21
|
+
import { getCsrfToken } from "./utils/getCsrfToken.js";
|
|
22
|
+
import { scopedStorage } from "./utils/scopedStorage.js";
|
|
23
|
+
import { copyToClipboard } from "./utils/copyToClipboard.js";
|
|
24
|
+
import { isIOS, isIpad, isMobile } from "./utils/deviceType.js";
|
|
25
|
+
import { resolveAppUrl } from "./utils/resolveAppUrl.js";
|
|
26
|
+
import { getEnvPath } from "./utils/getEnvPath.js";
|
|
27
|
+
import { safeStringify } from "./utils/safeStringify.js";
|
|
28
|
+
import { axiosForBackend, getAxiosForBackend } from "./utils/getAxiosForBackend.js";
|
|
29
|
+
import { initAxiosConfig } from "./utils/axiosConfig.js";
|
|
30
|
+
import { getAppInfo } from "./integrations/getAppInfo.js";
|
|
31
|
+
import { getCurrentUserProfile } from "./integrations/getCurrentUserProfile.js";
|
|
32
|
+
import { getDataloom } from "./integrations/dataloom.js";
|
|
33
|
+
import { trace } from "./trace/index.js";
|
|
34
|
+
import { initObservable } from "./runtime/observable.js";
|
|
35
|
+
import { TrackKey } from "./types/tea.js";
|
|
36
|
+
import { reportTeaEvent } from "./components/AppContainer/utils/tea.js";
|
|
37
|
+
import * as __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_avatar_js_2c154035__ from "./apis/constants/img-resources/avatar.js";
|
|
38
|
+
import * as __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_banner_js_72c990bf__ from "./apis/constants/img-resources/banner.js";
|
|
39
|
+
import * as __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_cover_js_90a812c2__ from "./apis/constants/img-resources/cover.js";
|
|
10
40
|
const _appId = getAppId();
|
|
11
41
|
const _acquireUploadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_upload_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_upload_url";
|
|
12
42
|
const _acquireDownloadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_download_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_download_url";
|
|
@@ -27,4 +57,4 @@ const capabilityClient = createClient({
|
|
|
27
57
|
const src = {
|
|
28
58
|
version: version
|
|
29
59
|
};
|
|
30
|
-
export { capabilityClient, src as default, showConfirm };
|
|
60
|
+
export { ActiveLink, AppContainer, ErrorRender, NavLink, PagePlaceholder, QueryProvider, TrackKey, UniversalLink, PagePlaceholder as Welcome, __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_avatar_js_2c154035__ as avatarImages, axiosForBackend, __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_banner_js_72c990bf__ as bannerImages, capabilityClient, clsxWithTw, copyToClipboard, __WEBPACK_EXTERNAL_MODULE__apis_constants_img_resources_cover_js_90a812c2__ as coverImages, src as default, getAppId, getAppInfo, getAxiosForBackend, getCsrfToken, getCurrentUserProfile, getDataloom, getEnvPath, getWsPath, initAxiosConfig, initObservable, isIOS, isIpad, isMobile, isPreview, logger, normalizeBasePath, reportTeaEvent, resolveAppUrl, safeStringify, scopedStorage, showConfirm, trace, useAppInfo, useCurrentUserProfile, useIsMobile, useLogout };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { getDataloom } from "../dataloom.js";
|
|
3
|
+
const { getInitialInfoMock, getAppPublishedMock, getAppIdMock, createClientMock, authUserMock, authSessionMock } = vi.hoisted(()=>({
|
|
4
|
+
getInitialInfoMock: vi.fn(),
|
|
5
|
+
getAppPublishedMock: vi.fn(),
|
|
6
|
+
getAppIdMock: vi.fn(),
|
|
7
|
+
createClientMock: vi.fn(),
|
|
8
|
+
authUserMock: {},
|
|
9
|
+
authSessionMock: {}
|
|
10
|
+
}));
|
|
11
|
+
vi.mock('../../utils/getInitialInfo', ()=>({
|
|
12
|
+
getInitialInfo: getInitialInfoMock,
|
|
13
|
+
getAppPublished: getAppPublishedMock
|
|
14
|
+
}));
|
|
15
|
+
vi.mock('../../utils/getAppId', ()=>({
|
|
16
|
+
getAppId: getAppIdMock
|
|
17
|
+
}));
|
|
18
|
+
vi.mock('@lark-apaas/dataloom', ()=>({
|
|
19
|
+
createClient: createClientMock
|
|
20
|
+
}));
|
|
21
|
+
vi.mock('@lark-apaas/auth-sdk', ()=>({
|
|
22
|
+
authClient: {
|
|
23
|
+
user: authUserMock,
|
|
24
|
+
session: authSessionMock
|
|
25
|
+
}
|
|
26
|
+
}));
|
|
27
|
+
beforeEach(()=>{
|
|
28
|
+
getInitialInfoMock.mockReset();
|
|
29
|
+
getAppPublishedMock.mockReset();
|
|
30
|
+
getAppIdMock.mockReset();
|
|
31
|
+
createClientMock.mockReset();
|
|
32
|
+
});
|
|
33
|
+
afterEach(()=>{
|
|
34
|
+
vi.restoreAllMocks();
|
|
35
|
+
});
|
|
36
|
+
describe('getDataloom', ()=>{
|
|
37
|
+
it('返回-createClient实例-改用getInitialInfo-新签名不取token/url-appId注入-并发去重-缓存复用', async ()=>{
|
|
38
|
+
getAppIdMock.mockReturnValue('app-1');
|
|
39
|
+
getInitialInfoMock.mockResolvedValue({
|
|
40
|
+
app_runtime_extra: {
|
|
41
|
+
token: 'pat',
|
|
42
|
+
url: 'https://x'
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
const client = {
|
|
46
|
+
__id: 'client-1'
|
|
47
|
+
};
|
|
48
|
+
createClientMock.mockReturnValue(client);
|
|
49
|
+
const p1 = getDataloom();
|
|
50
|
+
const p2 = getDataloom();
|
|
51
|
+
expect(p1).toBe(p2);
|
|
52
|
+
const [c1, c2] = await Promise.all([
|
|
53
|
+
p1,
|
|
54
|
+
p2
|
|
55
|
+
]);
|
|
56
|
+
expect(c1).toBe(client);
|
|
57
|
+
expect(c2).toBe(client);
|
|
58
|
+
expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
|
|
59
|
+
expect(getAppPublishedMock).not.toHaveBeenCalled();
|
|
60
|
+
expect(createClientMock).toHaveBeenCalledTimes(1);
|
|
61
|
+
const args = createClientMock.mock.calls[0];
|
|
62
|
+
expect(args).toHaveLength(1);
|
|
63
|
+
const options = args[0];
|
|
64
|
+
expect(typeof options).toBe('object');
|
|
65
|
+
expect(options).not.toBe('https://x');
|
|
66
|
+
expect(options).not.toBe('pat');
|
|
67
|
+
expect(options.global).toBeDefined();
|
|
68
|
+
expect(options.global).not.toHaveProperty('url');
|
|
69
|
+
expect(options.global).not.toHaveProperty('key');
|
|
70
|
+
expect(options.global?.appId).toBe('app-1');
|
|
71
|
+
expect(options.global?.accountServices).toEqual({
|
|
72
|
+
user: authUserMock,
|
|
73
|
+
session: authSessionMock
|
|
74
|
+
});
|
|
75
|
+
const cached1 = await getDataloom();
|
|
76
|
+
const cached2 = await getDataloom();
|
|
77
|
+
expect(cached1).toBe(client);
|
|
78
|
+
expect(cached2).toBe(client);
|
|
79
|
+
expect(cached1).toBe(cached2);
|
|
80
|
+
expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
|
|
81
|
+
expect(createClientMock).toHaveBeenCalledTimes(1);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
declare const createDataLoomClient: (
|
|
1
|
+
declare const createDataLoomClient: () => import("@lark-apaas/dataloom").DataloomClient;
|
|
2
2
|
/** 获取dataloom实例 */
|
|
3
3
|
export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
|
|
4
4
|
export {};
|
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import { splitWorkspaceUrl } from "../utils/url.js";
|
|
2
1
|
import { createClient } from "@lark-apaas/dataloom";
|
|
2
|
+
import { authClient } from "@lark-apaas/auth-sdk";
|
|
3
3
|
import { getAppId } from "../utils/getAppId.js";
|
|
4
|
-
import {
|
|
5
|
-
const createDataLoomClient = (
|
|
6
|
-
const { baseUrl } = url ? splitWorkspaceUrl(url) : {
|
|
7
|
-
baseUrl: ''
|
|
8
|
-
};
|
|
4
|
+
import { getInitialInfo } from "../utils/getInitialInfo.js";
|
|
5
|
+
const createDataLoomClient = ()=>{
|
|
9
6
|
const appId = getAppId();
|
|
10
|
-
return createClient(
|
|
7
|
+
return createClient({
|
|
11
8
|
global: {
|
|
12
9
|
enableDataloomLog: 'production' !== process.env.NODE_ENV,
|
|
13
10
|
requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
|
|
14
11
|
brandName: 'miaoda',
|
|
15
|
-
appId
|
|
12
|
+
appId,
|
|
13
|
+
accountServices: {
|
|
14
|
+
user: authClient.user,
|
|
15
|
+
session: authClient.session
|
|
16
|
+
}
|
|
16
17
|
}
|
|
17
18
|
});
|
|
18
19
|
};
|
|
@@ -21,10 +22,8 @@ let pendingPromise = null;
|
|
|
21
22
|
function getDataloom() {
|
|
22
23
|
if (dataloom) return Promise.resolve(dataloom);
|
|
23
24
|
if (pendingPromise) return pendingPromise;
|
|
24
|
-
pendingPromise =
|
|
25
|
-
|
|
26
|
-
const DATALOOM_PAT = info?.app_runtime_extra?.token;
|
|
27
|
-
dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
|
|
25
|
+
pendingPromise = getInitialInfo().then(()=>{
|
|
26
|
+
dataloom = createDataLoomClient();
|
|
28
27
|
return dataloom;
|
|
29
28
|
}).finally(()=>{
|
|
30
29
|
pendingPromise = null;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { IUserProfile } from '../apis/udt-types';
|
|
2
2
|
/**
|
|
3
3
|
* 获取当前用户信息。
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* 异步获取用户信息后才会被填充为完整的 IUserProfile。
|
|
4
|
+
* 与 client-toolkit-lite 一致返回 IUserProfile(非 Partial);
|
|
5
|
+
* 调用方需自行处理 window._userInfo 未就绪时空对象的情况。
|
|
7
6
|
*/
|
|
8
|
-
export declare function getCurrentUserProfile():
|
|
7
|
+
export declare function getCurrentUserProfile(): IUserProfile;
|
|
9
8
|
/**
|
|
10
9
|
* @deprecated 请使用 getCurrentUserProfile 代替
|
|
11
10
|
*/
|