@lark-apaas/client-toolkit 1.2.33 → 1.2.35

package/lib/apis/udt-types.d.ts

@@ -9,6 +9,10 @@ export type IUserProfile = {
      * inactive 2
      */
     status?: number;
+    /**
+     * 飞书 user_id
+     */
+    lark_user_id?: string;
 };
 export type IFileAttachment = {
     bucket_id: string;

package/lib/auth.d.ts

@@ -1 +1,2 @@
-export { CanRole, AbilityContext, ROLE_SUBJECT, useAuth, } from '@lark-apaas/auth-sdk';
+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';

package/lib/auth.js

@@ -1,2 +1,2 @@
-import { AbilityContext, CanRole, ROLE_SUBJECT, useAuth } from "@lark-apaas/auth-sdk";
-export { AbilityContext, CanRole, ROLE_SUBJECT, useAuth };
+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 };

package/lib/components/AppContainer/safety.js

@@ -7,6 +7,7 @@ import { isNewPathEnabled } from "../../utils/apiPath.js";
 import { useIsMobile } from "../../hooks/index.js";
 import { X } from "lucide-react";
 import { Sheet, SheetContent, SheetTrigger } from "../ui/drawer.js";
+import { t } from "../../locales/index.js";
 const Component = ()=>{
     const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId()}`;
     const [visible, setVisible] = useState(!window.localStorage?.getItem(HasClosedKey));
@@ -46,7 +47,7 @@ const Component = ()=>{
             const link = document.createElement('link');
             link.rel = 'preload';
             link.as = 'image';
-            link.href = 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-mobile.png';
+            link.href = t('safety.cover.mobile');
             document.head.appendChild(link);
         }
     }, [
@@ -74,7 +75,7 @@ const Component = ()=>{
                         }),
                         /*#__PURE__*/ jsx("p", {
                             className: "shrink-0 min-w-[28px] m-0! text-[#EBEBEB]",
-                            children: "妙搭"
+                            children: t('safety.badge.label')
                         })
                     ]
                 })
@@ -90,7 +91,7 @@ const Component = ()=>{
                             onClick: ()=>setOpen(false)
                         }),
                         /*#__PURE__*/ jsx("img", {
-                            src: "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-mobile.png",
+                            src: t('safety.cover.mobile'),
                             alt: "",
                             className: "w-full h-full",
                             onClick: ()=>{
@@ -110,12 +111,11 @@ const Component = ()=>{
                                                     src: "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/icon/icon_company_outlined.svg",
                                                     className: "shrink-0 w-[14px] h-[14px]"
                                                 }),
-                                                /*#__PURE__*/ jsxs("p", {
+                                                /*#__PURE__*/ jsx("p", {
                                                     className: "shrink-0 min-w-[96px] m-0! text-[#646A73] text-sm",
-                                                    children: [
-                                                        userinfo?.name,
-                                                        "运营"
-                                                    ]
+                                                    children: t('safety.tenant.operated', {
+                                                        name: userinfo?.name ?? ''
+                                                    })
                                                 })
                                             ]
                                         }),
@@ -128,7 +128,7 @@ const Component = ()=>{
                                                 }),
                                                 /*#__PURE__*/ jsx("p", {
                                                     className: "shrink-0 min-w-[163px] m-0! text-[#646A73] text-sm",
-                                                    children: "包含 AI 生成内容，请注意甄别"
+                                                    children: t('safety.ai.disclaimer')
                                                 })
                                             ]
                                         })
@@ -146,14 +146,14 @@ const Component = ()=>{
                                                 setTimeout(()=>setVisible(false), 200);
                                                 window.localStorage?.setItem(HasClosedKey, 'true');
                                             },
-                                            children: "不再展示"
+                                            children: t('safety.button.dontShowAgain')
                                         }),
                                         /*#__PURE__*/ jsx("div", {
                                             className: "flex-1 flex rounded-[99px] items-center justify-center border-[0.5px] border-black bg-black text-white cursor-pointer text-lg py-[12px]",
                                             onClick: ()=>{
                                                 window.open('https://miaoda.feishu.cn/landing', '_blank');
                                             },
-                                            children: "了解更多"
+                                            children: t('safety.button.learnMore')
                                         })
                                     ]
                                 })
@@ -186,7 +186,7 @@ const Component = ()=>{
                         }),
                         /*#__PURE__*/ jsx("p", {
                             className: "shrink-0 min-w-[60px] m-0! text-[#EBEBEB]",
-                            children: "由妙搭搭建"
+                            children: t('safety.badge.builtWith')
                         })
                     ]
                 })
@@ -210,7 +210,7 @@ const Component = ()=>{
                     className: "flex flex-col bg-[#1A1A1A]",
                     children: [
                         /*#__PURE__*/ jsx("img", {
-                            src: "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover.png",
+                            src: t('safety.cover.pc'),
                             alt: "",
                             className: "w-[286px] h-[128px] cursor-pointer",
                             onClick: ()=>{
@@ -230,12 +230,11 @@ const Component = ()=>{
                                                     src: "https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/icon/icon_company_outlined.svg",
                                                     className: "shrink-0 w-[12px] h-[12px]"
                                                 }),
-                                                /*#__PURE__*/ jsxs("p", {
+                                                /*#__PURE__*/ jsx("p", {
                                                     className: "shrink-0 min-w-[96px] m-0! text-[#a6a6a6]",
-                                                    children: [
-                                                        userinfo?.name,
-                                                        "运营"
-                                                    ]
+                                                    children: t('safety.tenant.operated', {
+                                                        name: userinfo?.name ?? ''
+                                                    })
                                                 })
                                             ]
                                         }),
@@ -248,7 +247,7 @@ const Component = ()=>{
                                                 }),
                                                 /*#__PURE__*/ jsx("p", {
                                                     className: "shrink-0 min-w-[163px] m-0! text-[#a6a6a6]",
-                                                    children: "包含 AI 生成内容，请注意甄别"
+                                                    children: t('safety.ai.disclaimer')
                                                 })
                                             ]
                                         })
@@ -266,7 +265,7 @@ const Component = ()=>{
                                                 setVisible(false);
                                                 window.localStorage?.setItem(HasClosedKey, 'true');
                                             },
-                                            children: "不再展示"
+                                            children: t('safety.button.dontShowAgain')
                                         }),
                                         /*#__PURE__*/ jsx("div", {
                                             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]",
@@ -274,7 +273,7 @@ const Component = ()=>{
                                             onClick: ()=>{
                                                 window.open('https://miaoda.feishu.cn/landing', '_blank');
                                             },
-                                            children: "了解更多"
+                                            children: t('safety.button.learnMore')
                                         })
                                     ]
                                 })

package/lib/hooks/useCurrentUserProfile.js

@@ -3,11 +3,25 @@ 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) {
     if (!nameArray || 0 === nameArray.length) return;
     const chineseName = nameArray.find((item)=>2052 === item.language_code);
     return chineseName?.text ?? nameArray[0]?.text;
 }
+let _larkUserIdCache = null;
+let _larkUserIdPromise = null;
+function fetchLarkUserId() {
+    if (null !== _larkUserIdCache) return Promise.resolve(_larkUserIdCache);
+    if (_larkUserIdPromise) return _larkUserIdPromise;
+    _larkUserIdPromise = getAxiosForBackend().get('/api/authnpaas/lark-user-id').then(({ data })=>{
+        _larkUserIdCache = data?.lark_user_id || null;
+        return _larkUserIdCache;
+    }).catch(()=>null).finally(()=>{
+        _larkUserIdPromise = null;
+    });
+    return _larkUserIdPromise;
+}
 function getCompatibilityUserProfile() {
     const userInfo = getCurrentUserProfile();
     return {
@@ -34,6 +48,8 @@ const useCurrentUserProfile = ()=>{
                 userName: userName,
                 userAvatar: info?.avatar?.image?.large
             };
+            const larkUserId = await fetchLarkUserId();
+            if (larkUserId) newUserInfo.lark_user_id = larkUserId;
             if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', newUserInfo);
             setUserInfo(newUserInfo);
         };

package/lib/locales/index.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 获取当前语言环境下的翻译文案。
+ *
+ * 支持 `{key}` 形式的变量替换：
+ * ```ts
+ * t('safety.tenant.operated', { name: '字节' })
+ * // zh → "字节运营"
+ * // en → "Operated by 字节"
+ * ```
+ *
+ * 如果 key 不存在，fallback 到中文；中文也没有则返回 key 本身。
+ */
+export declare function t(key: string, params?: Record<string, string>): string;
+export { getLocale } from '../utils/locale';
+export type { Locale } from '../utils/locale';

package/lib/locales/index.js

@@ -0,0 +1,10 @@
+import messages from "./messages.js";
+import { getLocale } from "../utils/locale.js";
+function t(key, params) {
+    const locale = getLocale();
+    const entry = messages[key];
+    let text = entry?.[locale] ?? entry?.zh ?? key;
+    if (params) for (const [k, v] of Object.entries(params))text = text.replace(`{${k}}`, v);
+    return text;
+}
+export { getLocale, t };

package/lib/locales/messages.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 中英文文案源（统一管理）。
+ *
+ * 每条文案同时包含 zh 和 en，方便对照和维护。
+ * Key 规则：`{组件}.{区域}.{标识}`
+ * 文案来源：https://bytedance.larkoffice.com/wiki/BJCQwv9auiP9erkudMfcVIIGnRg
+ */
+declare const messages: Record<string, {
+    zh: string;
+    en: string;
+}>;
+export default messages;

package/lib/locales/messages.js

@@ -0,0 +1,36 @@
+const messages_messages = {
+    'safety.badge.label': {
+        zh: '妙搭',
+        en: 'Spark'
+    },
+    'safety.badge.builtWith': {
+        zh: '由妙搭搭建',
+        en: 'Built with Spark'
+    },
+    'safety.ai.disclaimer': {
+        zh: '包含 AI 生成内容，请注意甄别',
+        en: 'AI-generated content. Use with care.'
+    },
+    'safety.tenant.operated': {
+        zh: '{name}运营',
+        en: 'Operated by {name}'
+    },
+    'safety.button.dontShowAgain': {
+        zh: '不再展示',
+        en: "Don't show again"
+    },
+    'safety.button.learnMore': {
+        zh: '了解更多',
+        en: 'Learn more'
+    },
+    'safety.cover.pc': {
+        zh: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover.png',
+        en: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-pcen.png'
+    },
+    'safety.cover.mobile': {
+        zh: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-mobile.png',
+        en: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-weben.png'
+    }
+};
+const messages = messages_messages;
+export { messages as default };

package/lib/utils/locale.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 统一的语言判断方法。
+ *
+ * 基于浏览器 Accept-Language（navigator.language）判断。
+ * 返回标准化的 locale code：'zh' | 'en'。
+ * 目前只区分中英文，未来需要更多语言时在此扩展。
+ */
+export type Locale = 'zh' | 'en';
+export declare function getLocale(): Locale;

package/lib/utils/locale.js

@@ -0,0 +1,5 @@
+function getLocale() {
+    const lang = navigator.language || 'zh';
+    return lang.startsWith('zh') ? 'zh' : 'en';
+}
+export { getLocale };

package/lib/utils/safeStringify.js

@@ -12,6 +12,11 @@ function safeStringify(obj) {
             if (value instanceof Set) return Array.from(value);
             if (void 0 === value) return 'undefined';
             if ('symbol' == typeof value) return value.toString();
+            if (value instanceof Error) return {
+                name: value.name,
+                message: value.message,
+                stack: value.stack
+            };
             return value;
         });
     } catch  {

package/lib/utils/safeStringify.spec.d.ts

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

package/lib/utils/safeStringify.spec.js

@@ -0,0 +1,125 @@
+import { describe, expect, it } from "vitest";
+import { mapLogLevel, processLogParams, safeStringify } from "./safeStringify.js";
+describe('safeStringify', ()=>{
+    it('should serialize a plain string', ()=>{
+        expect(safeStringify('hello')).toBe('"hello"');
+    });
+    it('should serialize a plain object', ()=>{
+        expect(safeStringify({
+            a: 1
+        })).toBe('{"a":1}');
+    });
+    it('should handle circular references', ()=>{
+        const obj = {
+            a: 1
+        };
+        obj.self = obj;
+        expect(safeStringify(obj)).toBe('{"a":1,"self":"[Circular]"}');
+    });
+    it('should serialize BigInt as string', ()=>{
+        expect(safeStringify(BigInt(123))).toBe('"123"');
+    });
+    it('should serialize Date as ISO string', ()=>{
+        const date = new Date('2024-01-01T00:00:00.000Z');
+        expect(safeStringify(date)).toBe('"2024-01-01T00:00:00.000Z"');
+    });
+    it('should serialize Map as object', ()=>{
+        const map = new Map([
+            [
+                'key',
+                'value'
+            ]
+        ]);
+        expect(safeStringify(map)).toBe('{"key":"value"}');
+    });
+    it('should serialize Set as array', ()=>{
+        const set = new Set([
+            1,
+            2,
+            3
+        ]);
+        expect(safeStringify(set)).toBe('[1,2,3]');
+    });
+    it('should serialize undefined as string', ()=>{
+        expect(safeStringify({
+            a: void 0
+        })).toBe('{"a":"undefined"}');
+    });
+    it('should serialize Symbol as string', ()=>{
+        expect(safeStringify({
+            s: Symbol('test')
+        })).toBe('{"s":"Symbol(test)"}');
+    });
+    it('should serialize Error with name, message and stack', ()=>{
+        const err = new Error('something went wrong');
+        const result = JSON.parse(safeStringify(err));
+        expect(result.name).toBe('Error');
+        expect(result.message).toBe('something went wrong');
+        expect(result.stack).toContain('something went wrong');
+    });
+    it('should serialize Error subclass with correct name', ()=>{
+        const err = new TypeError('bad type');
+        const result = JSON.parse(safeStringify(err));
+        expect(result.name).toBe('TypeError');
+        expect(result.message).toBe('bad type');
+    });
+    it('should serialize Error nested in object', ()=>{
+        const err = new Error('inner error');
+        const result = JSON.parse(safeStringify({
+            err
+        }));
+        expect(result.err.name).toBe('Error');
+        expect(result.err.message).toBe('inner error');
+    });
+    it('should return empty string on unexpected failure', ()=>{
+        const bad = {
+            toJSON () {
+                throw new Error('fail');
+            }
+        };
+        expect(safeStringify(bad)).toBe('');
+    });
+});
+describe('processLogParams', ()=>{
+    it('should serialize single argument directly', ()=>{
+        expect(processLogParams([
+            'hello'
+        ])).toBe('"hello"');
+    });
+    it('should serialize single object argument', ()=>{
+        expect(processLogParams([
+            {
+                a: 1
+            }
+        ])).toBe('{"a":1}');
+    });
+    it('should serialize multiple arguments as indexed object', ()=>{
+        const result = JSON.parse(processLogParams([
+            'msg',
+            {
+                key: 'val'
+            }
+        ]));
+        expect(result['0']).toBe('msg');
+        expect(result['1']).toEqual({
+            key: 'val'
+        });
+    });
+});
+describe('mapLogLevel', ()=>{
+    it('should map error to ERROR', ()=>{
+        expect(mapLogLevel('error')).toBe('ERROR');
+    });
+    it('should map info to INFO', ()=>{
+        expect(mapLogLevel('info')).toBe('INFO');
+    });
+    it('should map success to INFO', ()=>{
+        expect(mapLogLevel('success')).toBe('INFO');
+    });
+    it('should map warn to WARN', ()=>{
+        expect(mapLogLevel('warn')).toBe('WARN');
+    });
+    it('should default unknown level to INFO', ()=>{
+        expect(mapLogLevel('debug')).toBe('INFO');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.33",
+  "version": "1.2.35",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,12 +99,12 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.13",
-    "@lark-apaas/aily-web-sdk": "^0.0.8",
-    "@lark-apaas/auth-sdk": "^0.1.3",
+    "@lark-apaas/aily-web-sdk": "^0.0.9",
+    "@lark-apaas/auth-sdk": "^0.1.4",
     "@lark-apaas/client-capability": "^0.1.6",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
-    "@lark-apaas/observable-web": "^1.0.5",
+    "@lark-apaas/observable-web": "^1.0.6",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",