@lark-apaas/client-toolkit 1.1.21-alpha.auth.dev.0 → 1.1.21-alpha.auth.dev.10

package/lib/utils/axiosConfig.js

@@ -1,59 +1,129 @@
 import axios from "axios";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
-async function logResponse(ok, response) {
-    const okToTextMap = {
-        success: '请求成功：',
-        error: '请求失败：'
-    };
-    const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
-    const parts = [
-        okToTextMap[realOK ? 'success' : 'error'],
-        (response.config.url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
-        ' - ',
-        Date.now() - response.config._startTime,
-        'ms'
-    ];
-    const logTraceID = response.headers['x-log-trace-id'];
-    const queryParams = {};
-    const url = response.config.url || '';
-    const queryString = url.split('?')[1];
-    if (queryString) {
-        const urlParams = new URLSearchParams(queryString);
-        urlParams.forEach((value, key)=>{
-            queryParams[key] = value;
+const isValidResponse = (resp)=>null != resp && 'object' == typeof resp && 'config' in resp && null !== resp.config && void 0 !== resp.config && 'object' == typeof resp.config && 'status' in resp && 'number' == typeof resp.status && 'data' in resp;
+async function logResponse(ok, responseOrError) {
+    if (isValidResponse(responseOrError)) {
+        const response = responseOrError;
+        const okToTextMap = {
+            success: '请求成功：',
+            error: '请求失败：'
+        };
+        const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
+        const method = (response.config.method || 'GET').toUpperCase();
+        const parts = [
+            okToTextMap[realOK ? 'success' : 'error'],
+            method,
+            ' ',
+            (response.config.url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
+            ' - ',
+            Date.now() - response.config._startTime,
+            'ms'
+        ];
+        const logTraceID = response.headers?.['x-log-trace-id'];
+        const queryParams = {};
+        const url = response.config.url || '';
+        const queryString = url.split('?')[1];
+        if (queryString) {
+            const urlParams = new URLSearchParams(queryString);
+            urlParams.forEach((value, key)=>{
+                queryParams[key] = value;
+            });
+        }
+        if (response.config.params) Object.assign(queryParams, response.config.params);
+        const args = [
+            {
+                请求参数: response.config.data,
+                ...Object.keys(queryParams).length > 0 && {
+                    查询参数: queryParams
+                },
+                返回数据: response.data,
+                请求摘要: {
+                    方法: method,
+                    TraceID: logTraceID,
+                    状态: `${response.statusText}[状态码${response.status}]`,
+                    时间: `${new Date().toLocaleString()}`
+                }
+            }
+        ];
+        const requestUUID = response.config._requestUUID;
+        const stacktrace = await requestStacktraceMap.get(requestUUID);
+        const logMeta = {
+            logTraceID
+        };
+        if (stacktrace) logMeta.stacktrace = stacktrace;
+        logger.log({
+            level: ok,
+            args: [
+                parts.join(''),
+                ...args
+            ],
+            meta: logMeta
         });
+        return;
     }
-    if (response.config.params) Object.assign(queryParams, response.config.params);
-    const args = [
-        {
-            '请求参数：': response.config.data,
-            ...Object.keys(queryParams).length > 0 && {
-                '查询参数：': queryParams
-            },
-            '返回数据：': response.data,
-            '请求摘要：': {
-                TraceID: logTraceID,
-                状态: `${response.statusText}[状态码${response.status}]`,
-                时间: `${new Date().toLocaleString()}`
-            }
+    const error = responseOrError;
+    if (error && error.config && 'object' == typeof error.config) {
+        const errorType = error.code || 'UNKNOWN_ERROR';
+        const errorMessage = error.message || '未知错误';
+        const method = (error.config.method || 'GET').toUpperCase();
+        const url = error.config.url || '';
+        const startTime = error.config._startTime;
+        const duration = startTime ? Date.now() - startTime : 0;
+        const parts = [
+            '网络请求失败：',
+            method,
+            ' ',
+            url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
+            ' - ',
+            errorType,
+            duration > 0 ? ` (${duration}ms)` : ''
+        ];
+        const queryParams = {};
+        const queryString = url.split('?')[1];
+        if (queryString) {
+            const urlParams = new URLSearchParams(queryString);
+            urlParams.forEach((value, key)=>{
+                queryParams[key] = value;
+            });
         }
-    ];
-    const requestUUID = response.config._requestUUID;
-    const stacktrace = await requestStacktraceMap.get(requestUUID);
-    const logMeta = {
-        logTraceID
-    };
-    if (stacktrace) logMeta.stacktrace = stacktrace;
+        if (error.config.params) Object.assign(queryParams, error.config.params);
+        const args = [
+            {
+                请求参数: error.config.data,
+                ...Object.keys(queryParams).length > 0 && {
+                    查询参数: queryParams
+                },
+                错误信息: errorMessage,
+                请求摘要: {
+                    方法: method,
+                    错误类型: errorType,
+                    错误代码: error.code,
+                    超时设置: error.config.timeout,
+                    时间: `${new Date().toLocaleString()}`
+                }
+            }
+        ];
+        const requestUUID = error.config._requestUUID;
+        const stacktrace = await requestStacktraceMap.get(requestUUID);
+        const logMeta = {};
+        if (stacktrace) logMeta.stacktrace = stacktrace;
+        logger.log({
+            level: 'error',
+            args: [
+                parts.join(''),
+                ...args
+            ],
+            meta: logMeta
+        });
+        return;
+    }
     logger.log({
-        level: ok,
+        level: 'error',
         args: [
-            parts.join(''),
-            ...args
+            '请求失败：无响应对象或配置信息'
         ],
-        meta: {
-            logTraceID
-        }
+        meta: {}
     });
 }
 const requestStacktraceMap = new Map();
@@ -73,7 +143,7 @@ function initAxiosConfig(axiosInstance) {
         logResponse('success', response);
         return response;
     }, (error)=>{
-        logResponse('error', error.response);
+        logResponse('error', error.response || error);
         return Promise.reject(error);
     });
 }

package/lib/utils/deviceType.d.ts

@@ -0,0 +1,3 @@
+export declare const isIpad: () => boolean;
+export declare const isMobile: () => boolean;
+export declare const isIOS: () => boolean;

package/lib/utils/deviceType.js

@@ -0,0 +1,13 @@
+const isIpad = ()=>{
+    const _isIpad = /iPad|Tab|Tablet/i.test(navigator.userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 1;
+    return Boolean(_isIpad);
+};
+const isMobile = ()=>{
+    const isPhone = /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent);
+    return isPhone || isIpad();
+};
+const isIOS = ()=>{
+    if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) return true;
+    return false;
+};
+export { isIOS, isIpad, isMobile };

package/lib/utils/getAxiosForBackend.d.ts

@@ -0,0 +1,11 @@
+import { AxiosInstance } from 'axios';
+declare module 'axios' {
+    interface AxiosRequestConfig {
+        meta?: {
+            autoJumpToLogin?: boolean;
+        };
+    }
+}
+/** 获取axios实例 */
+export declare function getAxiosForBackend(): AxiosInstance;
+export declare const axiosForBackend: AxiosInstance;

package/lib/utils/getAxiosForBackend.js

@@ -0,0 +1,21 @@
+import axios from "axios";
+import { initAxiosConfig } from "./axiosConfig.js";
+let axiosInstance;
+function getAxiosForBackend() {
+    if (!axiosInstance) {
+        axiosInstance = axios.create({
+            baseURL: process.env.CLIENT_BASE_PATH || '/'
+        });
+        axiosInstance.interceptors.response.use(null, (err)=>{
+            if (err.config.meta?.autoJumpToLogin !== false) {
+                const loginUrl = err.response?.headers?.['x-login-url'];
+                if (loginUrl) window.location.href = loginUrl;
+            }
+            return Promise.reject(err);
+        });
+        initAxiosConfig(axiosInstance);
+    }
+    return axiosInstance;
+}
+const axiosForBackend = getAxiosForBackend();
+export { axiosForBackend, getAxiosForBackend };

package/lib/utils/getParentOrigin.d.ts

@@ -1,5 +1,6 @@
+export declare function getEnv(): 'BOE' | 'PRE' | 'ONLINE';
 /**
  * @internal
  * 获取预览环境父级域名
  */
-export declare function getPreviewParentOrigin(): "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";
+export declare function getPreviewParentOrigin(): "https://force.feishu-boe.cn" | "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";

package/lib/utils/getParentOrigin.js

@@ -1,7 +1,14 @@
+function getEnv() {
+    const { origin } = window.location;
+    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'ONLINE';
+    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'PRE';
+    return 'BOE';
+}
 function getPreviewParentOrigin() {
     const { origin } = window.location;
+    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
     if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
     return 'https://miaoda.feishu-boe.cn';
 }
-export { getPreviewParentOrigin };
+export { getEnv, getPreviewParentOrigin };

package/lib/utils/requestManager.d.ts

@@ -0,0 +1,2 @@
+import type { IUserProfile } from '../apis/udt-types';
+export declare function fetchWithDeduplication(ids: string[]): Promise<IUserProfile[] | null>;

package/lib/utils/requestManager.js

@@ -0,0 +1,26 @@
+import { getDataloom } from "../integrations/dataloom.js";
+const pendingRequests = new Map();
+async function fetchUserProfilesByIds(ids) {
+    try {
+        const dataloom = await getDataloom();
+        if (!dataloom) throw new Error('Dataloom client is unavailable');
+        const numericIds = ids.map(Number).filter(Number.isFinite);
+        if (0 === numericIds.length) return [];
+        const response = await dataloom.service.user.getByIds(numericIds);
+        return Array.isArray(response?.data) ? response.data : response?.data?.user_list || [];
+    } catch (error) {
+        console.error(`Failed to fetch profiles for user IDs ${ids.join(', ')}:`, error);
+        return null;
+    }
+}
+function fetchWithDeduplication(ids) {
+    const key = ids.sort().join(',');
+    if (pendingRequests.has(key)) return pendingRequests.get(key);
+    const fetchPromise = fetchUserProfilesByIds(ids);
+    pendingRequests.set(key, fetchPromise);
+    fetchPromise.finally(()=>{
+        pendingRequests.delete(key);
+    });
+    return fetchPromise;
+}
+export { fetchWithDeduplication };

package/lib/utils/userProfileCache.d.ts

@@ -0,0 +1,12 @@
+import type { IUserProfile } from '../apis/udt-types';
+export interface ICachedUserProfile {
+    profile: IUserProfile;
+    timestamp: number;
+}
+export declare const cache: Map<string, ICachedUserProfile>;
+export declare const cacheExpiry: number;
+export declare function setCachedUserProfiles(profiles: IUserProfile[]): void;
+export declare function getCachedUserProfiles(ids: string[]): {
+    cachedProfiles: IUserProfile[];
+    remainingIds: string[];
+};

package/lib/utils/userProfileCache.js

@@ -0,0 +1,26 @@
+const cache = new Map();
+const cacheExpiry = 1 / 0;
+function setCachedUserProfiles(profiles) {
+    const now = Date.now();
+    profiles.forEach((profile)=>{
+        if (profile && profile.user_id) cache.set(String(profile.user_id), {
+            profile,
+            timestamp: now
+        });
+    });
+}
+function getCachedUserProfiles(ids) {
+    const cachedProfiles = [];
+    const remainingIds = [];
+    const now = Date.now();
+    ids.forEach((id)=>{
+        const cachedItem = cache.get(id);
+        if (cachedItem && now - cachedItem.timestamp < cacheExpiry) cachedProfiles.push(cachedItem.profile);
+        else remainingIds.push(id);
+    });
+    return {
+        cachedProfiles,
+        remainingIds
+    };
+}
+export { cache, cacheExpiry, getCachedUserProfiles, setCachedUserProfiles };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.1.21-alpha.auth.dev.0",
+  "version": "1.1.21-alpha.auth.dev.10",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -15,6 +15,11 @@
       "require": "./lib/index.js",
       "types": "./lib/index.d.ts"
     },
+    "./antd-table": {
+      "import": "./lib/antd-table.js",
+      "require": "./lib/antd-table.js",
+      "types": "./lib/antd-table.d.ts"
+    },
     "./lib/index.css": "./lib/index.css",
     "./dataloom": {
       "import": "./lib/apis/dataloom.js",
@@ -55,6 +60,11 @@
       "import": "./lib/apis/utils/*.js",
       "require": "./lib/apis/utils/*.js",
       "types": "./lib/apis/utils/*.d.ts"
+    },
+    "./auth": {
+      "import": "./lib/auth.js",
+      "require": "./lib/auth.js",
+      "types": "./lib/auth.d.ts"
     }
   },
   "scripts": {
@@ -75,17 +85,19 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "^0.4.0",
-    "@lark-apaas/auth-sdk": "^0.1.0-alpha.3",
-    "@lark-apaas/miaoda-inspector": "^1.0.4",
+    "@data-loom/js": "0.4.4-auth-alpha.11",
+    "@lark-apaas/auth-sdk": "0.1.0-alpha.13",
+    "@lark-apaas/miaoda-inspector": "^1.0.5",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@zumer/snapdom": "^1.9.14",
     "axios": "^1.12.2",
+    "blueimp-md5": "2.10.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "~2.0.1",
+    "crypto-js": "3.1.9-1",
     "dayjs": "^1.11.13",
     "echarts": "^6.0.0",
     "lodash": "^4.17.21",
@@ -118,6 +130,8 @@
     "@tailwindcss/postcss": "^4.1.0",
     "@testing-library/jest-dom": "^6.6.4",
     "@testing-library/react": "^16.3.0",
+    "@types/blueimp-md5": "^2.18.2",
+    "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.10.2",
     "@types/react": "^18.3.23",
@@ -143,6 +157,7 @@
     "antd": ">=5.26.6",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
-    "react-router-dom": ">=6.26.2"
+    "react-router-dom": ">=6.26.2",
+    "styled-jsx": ">=5.0.0"
   }
 }