@lark-apaas/client-toolkit 1.2.20 → 1.2.22-alpha.0

package/lib/hooks/useCurrentUserProfile.js

@@ -19,37 +19,29 @@ function getCompatibilityUserProfile() {
 const useCurrentUserProfile = ()=>{
     const [userInfo, setUserInfo] = useState(()=>getCompatibilityUserProfile());
     useEffect(()=>{
+        let cancelled = false;
+        const fetchAndSetUserInfo = async ()=>{
+            const dataloom = await getDataloom();
+            const result = await dataloom?.service?.session?.getUserInfo();
+            if (cancelled) return;
+            const info = result?.data?.user_info;
+            const userName = getNameFromArray(info?.name);
+            const newUserInfo = {
+                user_id: info?.user_id?.toString(),
+                email: info?.email,
+                name: userName,
+                avatar: info?.avatar?.image?.large,
+                userName: userName,
+                userAvatar: info?.avatar?.image?.large
+            };
+            if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', newUserInfo);
+            setUserInfo(newUserInfo);
+        };
         let handleMetaInfoChanged;
         if (isSparkRuntime()) {
-            (async ()=>{
-                const dataloom = await getDataloom();
-                const result = await dataloom?.service?.session?.getUserInfo();
-                const userInfo = result?.data?.user_info;
-                const userName = getNameFromArray(userInfo?.name);
-                setUserInfo({
-                    user_id: userInfo?.user_id?.toString(),
-                    email: userInfo?.email,
-                    name: userName,
-                    avatar: userInfo?.avatar?.image?.large,
-                    userName: userName,
-                    userAvatar: userInfo?.avatar?.image?.large
-                });
-            })();
-            handleMetaInfoChanged = async ()=>{
-                const dataloom = await getDataloom();
-                const result = await dataloom?.service?.session?.getUserInfo();
-                const userInfo = result?.data?.user_info;
-                const userName = getNameFromArray(userInfo?.name);
-                const newUserInfo = {
-                    user_id: userInfo?.user_id?.toString(),
-                    email: userInfo?.email,
-                    name: userName,
-                    avatar: userInfo?.avatar?.image?.large,
-                    userName: userName,
-                    userAvatar: userInfo?.avatar?.image?.large
-                };
-                if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', newUserInfo);
-                setUserInfo(newUserInfo);
+            fetchAndSetUserInfo();
+            handleMetaInfoChanged = ()=>{
+                fetchAndSetUserInfo();
             };
         } else handleMetaInfoChanged = ()=>{
             if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', getCompatibilityUserProfile());
@@ -57,6 +49,7 @@ const useCurrentUserProfile = ()=>{
         };
         window.addEventListener('MiaoDaMetaInfoChanged', handleMetaInfoChanged);
         return ()=>{
+            cancelled = true;
             window.removeEventListener('MiaoDaMetaInfoChanged', handleMetaInfoChanged);
         };
     }, []);

package/lib/integrations/dataloom.d.ts

@@ -1,2 +1,4 @@
+declare const createDataLoomClient: (url?: string, pat?: string) => import("@data-loom/js").DataloomClient<any, "public", any>;
 /** 获取dataloom实例 */
-export declare function getDataloom(): Promise<import("@data-loom/js").DataloomClient<any, "public", any>>;
+export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
+export {};

package/lib/integrations/dataloom.js

@@ -23,12 +23,18 @@ const createDataLoomClient = (url, pat)=>{
     });
 };
 let dataloom = null;
-async function getDataloom() {
-    if (dataloom) return dataloom;
-    const info = await getInitialInfo();
-    const DATALOOM_CLIENT_URL = info?.app_runtime_extra?.url;
-    const DATALOOM_PAT = info?.app_runtime_extra?.token;
-    dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
-    return dataloom;
+let pendingPromise = null;
+function getDataloom() {
+    if (dataloom) return Promise.resolve(dataloom);
+    if (pendingPromise) return pendingPromise;
+    pendingPromise = getInitialInfo().then((info)=>{
+        const DATALOOM_CLIENT_URL = info?.app_runtime_extra?.url;
+        const DATALOOM_PAT = info?.app_runtime_extra?.token;
+        dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
+        return dataloom;
+    }).finally(()=>{
+        pendingPromise = null;
+    });
+    return pendingPromise;
 }
 export { getDataloom };

package/lib/utils/getInitialInfo.d.ts

@@ -13,9 +13,10 @@ interface AppRuntimePublished {
 interface BucketConfig {
     default_bucket_id?: string;
 }
-/** 获取应用初始化信息（仅全栈沙箱模式下使用） */
-export declare function getInitialInfo(refresh?: boolean): Promise<{
+declare let initialInfo: {
     app_info?: AppRuntimePublished;
     app_runtime_extra?: AppRuntimeExtra;
-}>;
+} | undefined;
+/** 获取应用初始化信息（仅全栈沙箱模式下使用） */
+export declare function getInitialInfo(refresh?: boolean): Promise<typeof initialInfo>;
 export {};

package/lib/utils/getInitialInfo.js

@@ -23,10 +23,17 @@ async function getAppPublished() {
     }
 }
 let initialInfo;
-async function getInitialInfo(refresh = false) {
-    if (initialInfo && !refresh) return initialInfo;
-    initialInfo = await getAppPublished();
-    if (initialInfo) window._bucket_id = initialInfo.app_runtime_extra?.bucket?.default_bucket_id;
-    return initialInfo;
+let pendingPromise = null;
+function getInitialInfo(refresh = false) {
+    if (initialInfo && !refresh) return Promise.resolve(initialInfo);
+    if (pendingPromise && !refresh) return pendingPromise;
+    pendingPromise = getAppPublished().then((info)=>{
+        initialInfo = info;
+        if (initialInfo) window._bucket_id = initialInfo.app_runtime_extra?.bucket?.default_bucket_id;
+        return initialInfo;
+    }).finally(()=>{
+        pendingPromise = null;
+    });
+    return pendingPromise;
 }
 export { getInitialInfo };

package/lib/utils/postMessage.js

@@ -1,19 +1,3 @@
-const PARENT_ORIGIN_KEY = '__parentOrigin';
-function getParentOriginFromParams() {
-    try {
-        const params = new URLSearchParams(window.location.search);
-        const origin = params.get(PARENT_ORIGIN_KEY);
-        if (origin) {
-            sessionStorage.setItem(PARENT_ORIGIN_KEY, origin);
-            return origin;
-        }
-    } catch  {}
-    try {
-        return sessionStorage.getItem(PARENT_ORIGIN_KEY) || void 0;
-    } catch  {
-        return;
-    }
-}
 function getLegacyParentOrigin() {
     const { origin } = window.location;
     if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
@@ -24,8 +8,6 @@ function getLegacyParentOrigin() {
     return 'https://miaoda.feishu-boe.cn';
 }
 function resolveParentOrigin() {
-    const paramOrigin = getParentOriginFromParams();
-    if (paramOrigin) return paramOrigin;
     return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();
 }
 function submitPostMessage(message, targetOrigin) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.20",
+  "version": "1.2.22-alpha.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,11 +99,11 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.7",
-    "@lark-apaas/aily-web-sdk": "^0.0.4",
+    "@lark-apaas/aily-web-sdk": ">=0.0.1",
     "@lark-apaas/auth-sdk": "^0.1.0",
     "@lark-apaas/client-capability": "^0.1.4",
-    "@lark-apaas/miaoda-inspector": "^1.0.19",
-    "@lark-apaas/observable-web": "^1.0.2",
+    "@lark-apaas/miaoda-inspector": "^1.0.16",
+    "@lark-apaas/observable-web": "^1.0.1",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",

package/lib/apis/utils/resolveAppUrl.d.ts

@@ -1 +0,0 @@
-export { resolveAppUrl } from '../../utils/resolveAppUrl';

package/lib/apis/utils/resolveAppUrl.js

@@ -1,2 +0,0 @@
-import { resolveAppUrl } from "../../utils/resolveAppUrl.js";
-export { resolveAppUrl };

package/lib/utils/resolveAppUrl.d.ts

@@ -1,27 +0,0 @@
-/**
- * 解析应用内路径，自动补全 CLIENT_BASE_PATH 前缀，返回完整 URL
- * 适用于生成分享链接、二维码等需要完整 URL 的场景
- *
- * - 相对路径：补全前缀 + 当前域名
- * - 当前域名的完整 URL：修正路径部分，补全前缀
- * - 其他域名的 URL：原样返回，不做处理
- *
- * @param path - 应用内相对路径或完整 URL
- * @returns 完整的 URL 字符串
- *
- * @example
- * // 假设 CLIENT_BASE_PATH = '/app/abc'，当前域名为 https://example.com
- *
- * resolveAppUrl('/detail/123')
- * // => 'https://example.com/app/abc/detail/123'
- *
- * resolveAppUrl('https://example.com/detail/123')
- * // => 'https://example.com/app/abc/detail/123'
- *
- * resolveAppUrl('https://example.com/app/abc/detail/123')
- * // => 'https://example.com/app/abc/detail/123' (已有前缀，不重复添加)
- *
- * resolveAppUrl('https://other-site.com/page')
- * // => 'https://other-site.com/page' (非当前域名，原样返回)
- */
-export declare function resolveAppUrl(path: string): string;

package/lib/utils/resolveAppUrl.js

@@ -1,19 +0,0 @@
-import { normalizeBasePath } from "./utils.js";
-function ensureBasePath(pathname, basePath) {
-    if (!basePath) return pathname;
-    if (pathname.startsWith(basePath)) return pathname;
-    return `${basePath}${pathname.startsWith('/') ? '' : '/'}${pathname}`;
-}
-function resolveAppUrl(path) {
-    const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    try {
-        const url = new URL(path);
-        if (url.origin !== window.location.origin) return path;
-        url.pathname = ensureBasePath(url.pathname, basePath);
-        return url.toString();
-    } catch  {}
-    const normalizedPath = path.startsWith('/') ? path : `/${path}`;
-    const resolvedPath = ensureBasePath(normalizedPath, basePath);
-    return `${window.location.origin}${resolvedPath}`;
-}
-export { resolveAppUrl };