@lark-apaas/client-toolkit 1.2.28-alpha.68 → 1.2.28-alpha.69

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/components/AppContainer/index.js

@@ -9,7 +9,6 @@ import { PageHoc } from "./PageHoc.js";
 import { reportTeaEvent } from "./utils/tea.js";
 import { useAppInfo } from "../../hooks/index.js";
 import { TrackKey } from "../../types/tea.js";
-import { slardar } from "@lark-apaas/internal-slardar";
 import safety from "./safety.js";
 import { getAppId } from "../../utils/getAppId.js";
 import { isNewPathEnabled } from "../../utils/apiPath.js";
@@ -39,33 +38,14 @@ const App = (props)=>{
         });
     }, []);
     useEffect(()=>{
-        if ('production' === process.env.NODE_ENV) {
-            reportTeaEvent({
-                trackKey: TrackKey.VIEW,
-                trackParams: {
-                    artifact_uid: getAppId(),
-                    agent_id: 'agent_miaoda',
-                    url: window.location.href
-                }
-            });
-            const appId = getAppId();
-            const firstRenderTime = Math.round(performance.now());
-            const navEntry = performance.getEntriesByType('navigation')[0];
-            const pageLoadTime = navEntry && navEntry.loadEventEnd > 0 ? Math.round(navEntry.loadEventEnd - navEntry.startTime) : void 0;
-            slardar.sendEvent({
-                name: 'app-first-render',
-                metrics: {
-                    firstRenderTime,
-                    ...null != pageLoadTime ? {
-                        pageLoadTime
-                    } : {}
-                },
-                categories: {
-                    appId: appId ?? 'unknown',
-                    mode: isMiaodaPreview ? 'preview' : 'runtime'
-                }
-            });
-        }
+        if ('production' === process.env.NODE_ENV) reportTeaEvent({
+            trackKey: TrackKey.VIEW,
+            trackParams: {
+                artifact_uid: getAppId(),
+                agent_id: 'agent_miaoda',
+                url: window.location.href
+            }
+        });
     }, []);
     const appId = getAppId();
     const permissionApiUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/permissions/roles` : `/spark/app/${appId}/runtime/api/v1/permissions/roles`;

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/utils/safeStringify.js

@@ -12,11 +12,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.28-alpha.68",
+  "version": "1.2.28-alpha.69",
   "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/aily-web-sdk": "^0.0.7",
     "@lark-apaas/auth-sdk": "^0.1.3",
     "@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.2-alpha.11",
+    "@lark-apaas/miaoda-inspector": "^1.0.22",
+    "@lark-apaas/observable-web": "^1.0.5",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",

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

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

package/lib/utils/safeStringify.spec.js

@@ -1,125 +0,0 @@
-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');
-    });
-});