@lark-apaas/client-toolkit 1.2.22-alpha.2 → 1.2.22-alpha.3

package/lib/hooks/useCurrentUserProfile.js

@@ -19,29 +19,37 @@ 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()) {
-            fetchAndSetUserInfo();
-            handleMetaInfoChanged = ()=>{
-                fetchAndSetUserInfo();
+            (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);
             };
         } else handleMetaInfoChanged = ()=>{
             if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', getCompatibilityUserProfile());
@@ -49,7 +57,6 @@ const useCurrentUserProfile = ()=>{
         };
         window.addEventListener('MiaoDaMetaInfoChanged', handleMetaInfoChanged);
         return ()=>{
-            cancelled = true;
             window.removeEventListener('MiaoDaMetaInfoChanged', handleMetaInfoChanged);
         };
     }, []);

package/lib/integrations/dataloom.d.ts

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

package/lib/integrations/dataloom.js

@@ -23,18 +23,12 @@ const createDataLoomClient = (url, pat)=>{
     });
 };
 let dataloom = null;
-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;
+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;
 }
 export { getDataloom };

package/lib/utils/getInitialInfo.d.ts

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

package/lib/utils/getInitialInfo.js

@@ -23,17 +23,10 @@ async function getAppPublished() {
     }
 }
 let 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;
+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;
 }
 export { getInitialInfo };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.22-alpha.2",
+  "version": "1.2.22-alpha.3",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,7 +99,7 @@
     "@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.1",
+    "@lark-apaas/aily-web-sdk": "0.0.2-alpha.11",
     "@lark-apaas/auth-sdk": "^0.1.0",
     "@lark-apaas/client-capability": "^0.1.4",
     "@lark-apaas/miaoda-inspector": "^1.0.16",