@lark-apaas/client-toolkit 1.2.44-alpha.1 → 1.2.44-alpha.2

package/lib/auth.d.ts

@@ -1,2 +1,4 @@
 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';
+export { authClient, AccountClient } from '@lark-apaas/auth-sdk';
+export type { AccountClient as AuthClient, AccountServiceResponse, AccountServiceError, SearchParams, User, UserResponse, SignInRedirectionOptions, UserBaseInfo, UserInfoResponse, Avatar, } from '@lark-apaas/auth-sdk';

package/lib/auth.js

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

package/lib/components/User/UserSelect.js

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import react from "react";
-import { getDataloom } from "../../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 import { UserSelectUI } from "./UserSelectUI/index.js";
 const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholder, fetchUsers })=>{
     const normalizedIds = react.useMemo(()=>{
@@ -67,8 +67,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
         if (!normalizedIds.length) return void setUiValue(void 0);
         const fetchProfiles = async ()=>{
             try {
-                const dataloom = await getDataloom();
-                const response = await dataloom.service.user.getByIds(normalizedIds);
+                const response = await authClient.user.getByIds(normalizedIds);
                 const fetchedList = Array.isArray(response?.data) ? response?.data : Array.isArray(response?.data?.user_list) ? response?.data?.user_list : [];
                 const fetchedMap = new Map();
                 fetchedList.forEach((profile)=>{
@@ -115,8 +114,7 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
     const fetchUsersImpl = react.useCallback(async (search)=>{
         if (fetchUsers) return fetchUsers(search);
         try {
-            const dataloom = await getDataloom();
-            const { data } = await dataloom.service.user.search({
+            const { data } = await authClient.user.search({
                 name: search,
                 pageSize: 20
             });

package/lib/hooks/useCurrentUserProfile.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
+import { authClient } from "@lark-apaas/auth-sdk";
 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) {
@@ -35,8 +35,7 @@ const useCurrentUserProfile = ()=>{
     useEffect(()=>{
         let cancelled = false;
         const fetchAndSetUserInfo = async ()=>{
-            const dataloom = await getDataloom();
-            const result = await dataloom?.service?.session?.getUserInfo();
+            const result = await authClient.session.getUserInfo();
             if (cancelled) return;
             const info = result?.data?.user_info;
             const userName = getNameFromArray(info?.name);

package/lib/hooks/useLogout.js

@@ -1,13 +1,12 @@
 import { useState } from "react";
-import { getDataloom } from "../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 function useLogout() {
     const [isLoading, setIsLoading] = useState(false);
     async function handlerLogout() {
         if ('production' !== process.env.NODE_ENV) return void console.log('只有生产环境才执行登出');
         setIsLoading(true);
         try {
-            const dataloom = await getDataloom();
-            await dataloom.service.session.signOut();
+            await authClient.session.signOut();
         } catch (error) {
             console.error('登出失败', error);
         } finally{

package/lib/integrations/dataloom.d.ts

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

package/lib/integrations/dataloom.js

@@ -1,23 +1,22 @@
 import { splitWorkspaceUrl } from "../utils/url.js";
-import { createClient } from "@data-loom/js";
+import { createClient } from "@lark-apaas/dataloom";
+import { authClient } from "@lark-apaas/auth-sdk";
 import { getAppId } from "../utils/getAppId.js";
 import { getAppPublished } from "../utils/getInitialInfo.js";
 const createDataLoomClient = (url, pat)=>{
-    const { baseUrl, workspace } = url ? splitWorkspaceUrl(url) : {
-        baseUrl: '',
-        workspace: ''
+    const { baseUrl } = url ? splitWorkspaceUrl(url) : {
+        baseUrl: ''
     };
     const appId = getAppId();
-    return createClient(baseUrl, pat, workspace, {
+    return createClient(baseUrl, pat, {
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
             brandName: 'miaoda',
             appId,
-            onError: (error, dataloomInstance)=>{
-                if (error?.status === 401) {
-                    if (error?.code === 'k_ident_013001') dataloomInstance.service.session.redirectToLogin();
-                }
+            accountServices: {
+                user: authClient.user,
+                session: authClient.session
             }
         }
     });

package/lib/locales/messages.js

@@ -102,6 +102,30 @@ const messages_messages = {
     'userProfile.label.email': {
         zh: '邮箱',
         en: 'Email'
+    },
+    'axios.log.requestSuccess': {
+        zh: '请求成功：',
+        en: 'Request succeeded: '
+    },
+    'axios.log.requestFailed': {
+        zh: '请求失败：',
+        en: 'Request failed: '
+    },
+    'axios.log.networkFailed': {
+        zh: '网络请求失败：',
+        en: 'Network request failed: '
+    },
+    'axios.log.noResponseOrConfig': {
+        zh: '请求失败：无响应对象或配置信息',
+        en: 'Request failed: no response object or config'
+    },
+    'axios.log.forbidden': {
+        zh: '请求被拒绝(403)：{method} {url}',
+        en: 'Request rejected (403): {method} {url}'
+    },
+    'axios.log.unknownError': {
+        zh: '未知错误',
+        en: 'Unknown error'
     }
 };
 const messages = messages_messages;

package/lib/utils/axiosConfig.js

@@ -5,6 +5,7 @@ import { getStacktrace } from "../logger/selected-logs.js";
 import { safeStringify } from "./safeStringify.js";
 import { slardar } from "@lark-apaas/internal-slardar";
 import { normalizeBasePath } from "./utils.js";
+import { t } from "../locales/index.js";
 const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
 function stripBasePath(urlPath) {
     const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
@@ -95,8 +96,8 @@ async function logResponse(ok, responseOrError) {
     if (isValidResponse(responseOrError)) {
         const response = responseOrError;
         const okToTextMap = {
-            success: '请求成功：',
-            error: '请求失败：'
+            success: t('axios.log.requestSuccess'),
+            error: t('axios.log.requestFailed')
         };
         const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
         const method = (response.config.method || 'GET').toUpperCase();
@@ -154,13 +155,13 @@ async function logResponse(ok, responseOrError) {
     const error = responseOrError;
     if (error && error.config && 'object' == typeof error.config) {
         const errorType = error.code || 'UNKNOWN_ERROR';
-        const errorMessage = error.message || '未知错误';
+        const errorMessage = error.message || t('axios.log.unknownError');
         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 = [
-            '网络请求失败：',
+            t('axios.log.networkFailed'),
             method,
             ' ',
             url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
@@ -210,7 +211,7 @@ async function logResponse(ok, responseOrError) {
     logger.log({
         level: 'error',
         args: [
-            '请求失败：无响应对象或配置信息'
+            t('axios.log.noResponseOrConfig')
         ],
         meta: {}
     });
@@ -360,7 +361,10 @@ function initAxiosConfig(axiosInstance) {
                 logger.log({
                     level: 'warn',
                     args: [
-                        `请求被拒绝(403)：${method} ${url}`,
+                        t('axios.log.forbidden', {
+                            method,
+                            url
+                        }),
                         {
                             状态码: 403,
                             返回数据: error.response.data

package/lib/utils/locale.d.ts

@@ -1,9 +1,17 @@
 /**
  * 统一的语言判断方法。
  *
- * 基于浏览器 Accept-Language（navigator.language）判断。
- * 返回标准化的 locale code：'zh' | 'en'。
- * 目前只区分中英文，未来需要更多语言时在此扩展。
+ * 生产环境（`process.env.NODE_ENV === 'production'`）：
+ *   只看浏览器容器语言（navigator.language）。
+ *
+ * 非生产环境（沙箱预览场景）：
+ *   优先级 query > localStorage > navigator。
+ *   URL query `locale`（值为 `zh_CN` / `en_US`）由宿主平台（miaoda）
+ *   通过 iframe src 透传，确保产物内的语言与宿主一致；
+ *   读到 query 时会同步写入 localStorage，便于后续无 query 的跳转/刷新场景使用。
+ *
+ * 返回标准化 locale code：'zh' | 'en'。
+ * 目前只区分中英文，未来扩展时在此调整。
  */
 export type Locale = 'zh' | 'en';
 export declare function getLocale(): Locale;

package/lib/utils/locale.js

@@ -1,5 +1,41 @@
+const STORAGE_KEY = 'miaoda:preview-locale';
+function toLocale(value) {
+    const lang = value ?? 'zh';
+    return lang.toLowerCase().startsWith('zh') ? 'zh' : 'en';
+}
+function readLocaleFromQuery() {
+    if ('undefined' == typeof window) return null;
+    try {
+        const value = new URLSearchParams(window.location.search).get('locale');
+        return value && value.length > 0 ? value : null;
+    } catch  {
+        return null;
+    }
+}
+function readLocaleFromStorage() {
+    if ('undefined' == typeof window) return null;
+    try {
+        const value = window.localStorage?.getItem(STORAGE_KEY);
+        return value && value.length > 0 ? value : null;
+    } catch  {
+        return null;
+    }
+}
+function writeLocaleToStorage(value) {
+    if ('undefined' == typeof window) return;
+    try {
+        window.localStorage?.setItem(STORAGE_KEY, value);
+    } catch  {}
+}
 function getLocale() {
-    const lang = navigator.language || 'zh';
-    return lang.startsWith('zh') ? 'zh' : 'en';
+    if ('production' === process.env.NODE_ENV) return toLocale(navigator.language);
+    const fromQuery = readLocaleFromQuery();
+    if (fromQuery) {
+        writeLocaleToStorage(fromQuery);
+        return toLocale(fromQuery);
+    }
+    const fromStorage = readLocaleFromStorage();
+    if (fromStorage) return toLocale(fromStorage);
+    return toLocale(navigator.language);
 }
 export { getLocale };

package/lib/utils/postMessage.js

@@ -24,6 +24,12 @@ function getLegacyParentOrigin() {
     return 'https://miaoda.feishu-boe.cn';
 }
 function resolveParentOrigin() {
+    try {
+        if (document.referrer) {
+            const referrerOrigin = new URL(document.referrer).origin;
+            if (referrerOrigin.startsWith('http://localhost') || referrerOrigin.startsWith('http://127.0.0.1')) return referrerOrigin;
+        }
+    } catch  {}
     const paramOrigin = getParentOriginFromParams();
     if (paramOrigin) return paramOrigin;
     return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();

package/lib/utils/requestManager.js

@@ -1,10 +1,8 @@
-import { getDataloom } from "../integrations/dataloom.js";
+import { authClient } from "@lark-apaas/auth-sdk";
 const pendingRequests = new Map();
 async function fetchUserProfilesByIds(ids) {
     try {
-        const dataloom = await getDataloom();
-        if (!dataloom) throw new Error('Dataloom client is unavailable');
-        const response = await dataloom.service.user.getByIds(ids);
+        const response = await authClient.user.getByIds(ids);
         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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.44-alpha.1",
+  "version": "1.2.44-alpha.2",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,10 +98,10 @@
   "dependencies": {
     "@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.10-alpha.0",
-    "@lark-apaas/auth-sdk": "^0.1.4",
+    "@lark-apaas/aily-web-sdk": "^0.0.9",
+    "@lark-apaas/auth-sdk": "0.1.5-alpha.0",
     "@lark-apaas/client-capability": "^0.1.6",
+    "@lark-apaas/dataloom": "0.1.2-alpha.2",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",