@lark-apaas/client-toolkit 1.2.22-alpha.7 → 1.2.23

package/lib/components/AppContainer/index.js

@@ -11,6 +11,7 @@ import { useAppInfo } from "../../hooks/index.js";
 import { TrackKey } from "../../types/tea.js";
 import safety from "./safety.js";
 import { getAppId } from "../../utils/getAppId.js";
+import { isNewPathEnabled } from "../../utils/apiPath.js";
 import QueryProvider from "../QueryProvider/index.js";
 import { AuthProvider } from "@lark-apaas/auth-sdk";
 import "../../runtime/index.js";
@@ -40,15 +41,20 @@ const App = (props)=>{
         if ('production' === process.env.NODE_ENV) reportTeaEvent({
             trackKey: TrackKey.VIEW,
             trackParams: {
-                artifact_uid: getAppId(window.location.pathname),
+                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`;
     return /*#__PURE__*/ jsxs(AuthProvider, {
         config: {
-            enable: enableAuth
+            enable: enableAuth,
+            permissionApi: {
+                url: permissionApiUrl
+            }
         },
         children: [
             !disableToaster && true !== appFlags.customToaster && /*#__PURE__*/ jsx(Toaster, {}),

package/lib/components/AppContainer/safety.js

@@ -3,11 +3,12 @@ import { useEffect, useRef, useState } from "react";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
 import { getCsrfToken } from "../../utils/getCsrfToken.js";
 import { getAppId } from "../../utils/getAppId.js";
+import { isNewPathEnabled } from "../../utils/apiPath.js";
 import { useIsMobile } from "../../hooks/index.js";
 import { X } from "lucide-react";
 import { Sheet, SheetContent, SheetTrigger } from "../ui/drawer.js";
 const Component = ()=>{
-    const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId(window.location.pathname)}`;
+    const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId()}`;
     const [visible, setVisible] = useState(!window.localStorage?.getItem(HasClosedKey));
     const [open, setOpen] = useState(false);
     const isMobile = useIsMobile();
@@ -15,7 +16,9 @@ const Component = ()=>{
     const [isInternetVisible, setIsInternetVisible] = useState(false);
     const timeoutRef = useRef(null);
     useEffect(()=>{
-        fetch(`/spark/b/${getAppId(window.location.pathname)}/tenant_info`, {
+        const appId = getAppId();
+        const tenantInfoUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/tenant_info` : `/spark/b/${appId}/tenant_info`;
+        fetch(tenantInfoUrl, {
             headers: {
                 'X-Suda-Csrf-Token': getCsrfToken()
             }

package/lib/components/AppContainer/utils/getLarkUser.js

@@ -1,13 +1,15 @@
 import { getAppId } from "../../../utils/getAppId.js";
 import { getCsrfToken } from "../../../utils/getCsrfToken.js";
+import { isNewPathEnabled } from "../../../utils/apiPath.js";
 async function getLarkUserInfo() {
-    const appId = getAppId(window.location.pathname);
+    const appId = getAppId();
     if (!appId) return {
         code: 1,
         msg: 'appId is required',
         data: {}
     };
-    const response = await fetch(`/spark/b/${appId}/lark/user_info`, {
+    const url = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/lark/user_info` : `/spark/b/${appId}/lark/user_info`;
+    const response = await fetch(url, {
         headers: {
             'X-Suda-Csrf-Token': getCsrfToken()
         }

package/lib/components/AppContainer/utils/observable.js

@@ -1,11 +1,17 @@
 import { AppEnv, observable } from "@lark-apaas/observable-web";
+import { isNewPathEnabled } from "../../../utils/apiPath.js";
 const initObservable = ()=>{
     try {
         const appId = window.appId;
         observable.start({
             serviceName: "app",
             env: 'development' === process.env.NODE_ENV ? AppEnv.Dev : AppEnv.Prod,
-            collectorUrl: {
+            collectorUrl: isNewPathEnabled() ? {
+                log: `/app/${appId}/__runtime__/api/v1/observability/logs/collect`,
+                trace: `/app/${appId}/__runtime__/api/v1/observability/traces/collect`,
+                metric: `/app/${appId}/__runtime__/api/v1/observability/metrics/collect`,
+                time: `/app/${appId}/__runtime__/api/v1/observability/current_server_timestamp`
+            } : {
                 log: `/spark/app/${appId}/runtime/api/v1/observability/logs/collect`,
                 trace: `/spark/app/${appId}/runtime/api/v1/observability/traces/collect`,
                 metric: `/spark/app/${appId}/runtime/api/v1/observability/metrics/collect`,

package/lib/hooks/useLogout.js

@@ -1,28 +1,13 @@
 import { useState } from "react";
 import { getDataloom } from "../integrations/dataloom.js";
-import { isSparkRuntime } from "../utils/utils.js";
 function useLogout() {
     const [isLoading, setIsLoading] = useState(false);
     async function handlerLogout() {
         if ('production' !== process.env.NODE_ENV) return void console.log('只有生产环境才执行登出');
-        if (isSparkRuntime()) {
-            setIsLoading(true);
-            try {
-                const dataloom = await getDataloom();
-                await dataloom.service.session.signOut();
-            } catch (error) {
-                console.error('登出失败', error);
-            } finally{
-                setIsLoading(false);
-            }
-            return;
-        }
         setIsLoading(true);
         try {
-            await fetch('/ai/api/ui/page/logout', {
-                method: 'GET'
-            });
-            window.location.reload();
+            const dataloom = await getDataloom();
+            await dataloom.service.session.signOut();
         } catch (error) {
             console.error('登出失败', error);
         } finally{

package/lib/index.js

@@ -1,10 +1,17 @@
 import { createClient } from "@lark-apaas/client-capability";
 import { normalizeBasePath } from "./utils/utils.js";
+import { getAppId } from "./utils/getAppId.js";
+import { isNewPathEnabled } from "./utils/apiPath.js";
 import { logger } from "./logger/index.js";
 import { showToast } from "./components/ui/toast.js";
 import { version } from "../package.json";
+const _appId = getAppId();
+const _acquireUploadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_upload_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_upload_url";
+const _acquireDownloadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_download_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_download_url";
 const capabilityClient = createClient({
     baseURL: normalizeBasePath(process.env.CLIENT_BASE_PATH),
+    acquireUploadUrl: _acquireUploadUrl,
+    acquireDownloadUrl: _acquireDownloadUrl,
     fetchOptions: {
         headers: {
             'X-Suda-Csrf-Token': window.csrfToken ?? ''

package/lib/integrations/dataloom.js

@@ -7,7 +7,7 @@ const createDataLoomClient = (url, pat)=>{
         baseUrl: '',
         workspace: ''
     };
-    const appId = getAppId(window.location.pathname);
+    const appId = getAppId();
     return createClient(baseUrl, pat, workspace, {
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,

package/lib/integrations/services/DepartmentService.js

@@ -1,7 +1,8 @@
 import { getAppId } from "../../utils/getAppId.js";
+import { isNewPathEnabled } from "../../utils/apiPath.js";
 const DEFAULT_CONFIG = {
-    getAppId: ()=>getAppId(window.location.pathname),
-    searchDepartmentUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/search_department`
+    getAppId: ()=>getAppId(),
+    searchDepartmentUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/search_department` : `/af/app/${appId}/runtime/api/v1/account/search_department`
 };
 class DepartmentService {
     config;

package/lib/integrations/services/UserProfileService.js

@@ -1,11 +1,12 @@
 import { getAppId } from "../../utils/getAppId.js";
+import { isNewPathEnabled } from "../../utils/apiPath.js";
 const CDN_HOST = 'https://lf3-static.bytednsdoc.com';
 function getAssetsUrl(path) {
     return `${CDN_HOST}${path}`;
 }
 const DEFAULT_CONFIG = {
-    getAppId: ()=>getAppId(window.location.pathname),
-    userProfileUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/user_profile`
+    getAppId: ()=>getAppId(),
+    userProfileUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/user_profile` : `/af/app/${appId}/runtime/api/v1/account/user_profile`
 };
 class UserProfileService {
     config;

package/lib/integrations/services/UserService.js

@@ -1,8 +1,9 @@
 import { getAppId } from "../../utils/getAppId.js";
+import { isNewPathEnabled } from "../../utils/apiPath.js";
 const DEFAULT_CONFIG = {
-    getAppId: ()=>getAppId(window.location.pathname),
-    searchUserUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/search_user`,
-    listUsersUrl: (appId)=>`/af/app/${appId}/runtime/api/v1/account/list_users`
+    getAppId: ()=>getAppId(),
+    searchUserUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/search_user` : `/af/app/${appId}/runtime/api/v1/account/search_user`,
+    listUsersUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/list_users` : `/af/app/${appId}/runtime/api/v1/account/list_users`
 };
 class UserService {
     config;

package/lib/utils/apiPath.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 判断当前是否启用新的路径规范
+ * 新路径规范：CLIENT_BASE_PATH 以 /app/:appId 格式开头
+ */
+export declare function isNewPathEnabled(): boolean;

package/lib/utils/apiPath.js

@@ -0,0 +1,5 @@
+function isNewPathEnabled() {
+    const basePath = process.env.CLIENT_BASE_PATH || '/';
+    return /^\/app\/[^/]/.test(basePath);
+}
+export { isNewPathEnabled };

package/lib/utils/getAppId.d.ts

@@ -1,6 +1,4 @@
 /**
- * 提取固定前缀后的第一个目录名
- * @param {string} path - 输入路径字符串
- * @returns {string|null} - 提取的目录名或null
+ * 获取应用 ID
  */
-export declare function getAppId(path: string): string | null;
+export declare function getAppId(): string | null;

package/lib/utils/getAppId.js

@@ -1,12 +1,5 @@
-function getAppId(path) {
-    if (window.MIAODA_APP_ID) return window.MIAODA_APP_ID;
-    let prefix;
-    prefix = path.includes('/ai/feida/runtime/') ? '/ai/feida/runtime/' : path.includes('/spark/r/') ? '/spark/r/' : '/ai/miaoda/';
+function getAppId() {
     const windowAppId = window.appId || null;
-    if (!path.startsWith(prefix)) return windowAppId;
-    const remainder = path.substring(prefix.length);
-    const nextSlashIndex = remainder.indexOf('/');
-    if (-1 === nextSlashIndex) return remainder || windowAppId;
-    return remainder.substring(0, nextSlashIndex) || windowAppId;
+    return windowAppId;
 }
 export { getAppId };

package/lib/utils/getInitialInfo.js

@@ -1,5 +1,6 @@
 import { getAppId } from "./getAppId.js";
 import { getCsrfToken } from "./getCsrfToken.js";
+import { isNewPathEnabled } from "./apiPath.js";
 async function getAppPublished() {
     try {
         const headers = {
@@ -8,15 +9,16 @@ async function getAppPublished() {
             'x-miaoda-token': window.MIAODA_BUILTIN_TTT,
             'X-Suda-Csrf-Token': getCsrfToken()
         };
-        const appId = getAppId(window.location.pathname) || window.appId;
-        const url = `${window.location.origin}/spark/b/${appId}/get_published`;
+        const appId = getAppId();
+        const path = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/get_published` : `/spark/b/${appId}/get_published`;
+        const url = `${window.location.origin}${path}`;
         const response = await fetch(url, {
             method: 'GET',
             headers,
             credentials: 'include'
         });
         const res = await response.json();
-        if (0 === res.code) return res.data;
+        if (0 === res.code || '0' === res.status_code) return res.data;
         console.error('Error fetching published app info:', res);
     } catch (error) {
         console.error('Error fetching published app info:', error);

package/lib/utils/getUserProfile.js

@@ -1,9 +1,8 @@
 import { getAppId } from "./getAppId.js";
 import { getCsrfToken } from "./getCsrfToken.js";
-import { getEnvPath } from "./getEnvPath.js";
-import { isSparkRuntime } from "./utils.js";
+import { isNewPathEnabled } from "./apiPath.js";
 async function getUserProfile(request, headers = {}) {
-    const appId = getAppId(window.location.pathname);
+    const appId = getAppId();
     if (!appId) return {
         code: 1,
         msg: 'appId is required',
@@ -15,17 +14,10 @@ async function getUserProfile(request, headers = {}) {
     const mergedHeaders = {
         ...defaultHeaders,
         ...headers,
-        'X-Kunlun-Token': window.token,
-        'x-miaoda-token': window.MIAODA_BUILTIN_TTT,
-        'x-lgw-csrf-token': window.lgw_csrf_token,
         ...window.CSRF_HEADERS || {}
     };
-    const envPath = getEnvPath();
-    let endpoint;
-    if (isSparkRuntime()) {
-        endpoint = `/spark/b/${appId}/user/profile`;
-        mergedHeaders['X-Suda-Csrf-Token'] = getCsrfToken();
-    } else endpoint = `/ai/api/${envPath}/v1/apps/${appId}/user/profile`;
+    const endpoint = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/user/profile` : `/spark/b/${appId}/user/profile`;
+    mergedHeaders['X-Suda-Csrf-Token'] = getCsrfToken();
     const response = await fetch(`${window.location.origin}${endpoint}`, {
         method: 'POST',
         headers: mergedHeaders,

package/lib/utils/scopedStorage.js

@@ -1,6 +1,6 @@
 import { getAppId } from "./getAppId.js";
 function getPrefix() {
-    const appId = getAppId(window.location.pathname);
+    const appId = getAppId();
     const namespace = appId || '__global__';
     return `__miaoda_${namespace}__:`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.22-alpha.7",
+  "version": "1.2.23",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,12 +98,12 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.7",
+    "@data-loom/js": "0.4.9",
     "@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.16",
-    "@lark-apaas/observable-web": "1.0.2-alpha.8",
+    "@lark-apaas/auth-sdk": "^0.1.1",
+    "@lark-apaas/client-capability": "^0.1.5",
+    "@lark-apaas/miaoda-inspector": "^1.0.20",
+    "@lark-apaas/observable-web": "^1.0.3",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",

package/lib/apis/tools/generateImage.d.ts

@@ -1 +0,0 @@
-export * from '../../integrations/generateImage';

package/lib/apis/tools/generateImage.js

@@ -1 +0,0 @@
-export * from "../../integrations/generateImage.js";

package/lib/apis/tools/generateTextStream.d.ts

@@ -1 +0,0 @@
-export * from '../../integrations/generateTextStream';

package/lib/apis/tools/generateTextStream.js

@@ -1 +0,0 @@
-export * from "../../integrations/generateTextStream.js";

package/lib/integrations/generateImage.d.ts

@@ -1 +0,0 @@
-export declare function generateImage(prompt: string, size?: string, headers?: Record<string, string>): Promise<any>;

package/lib/integrations/generateImage.js

@@ -1,47 +0,0 @@
-import { getAppId } from "../utils/getAppId.js";
-import { getCsrfToken } from "../utils/getCsrfToken.js";
-import { getEnvPath } from "../utils/getEnvPath.js";
-import { isSparkRuntime } from "../utils/utils.js";
-async function generateImage(prompt, size = '1024x1024', headers = {}) {
-    const appId = getAppId(window.location.pathname);
-    if (!appId) return {
-        code: 1,
-        msg: 'appId is required',
-        data: {}
-    };
-    const defaultHeaders = {
-        'Content-Type': 'application/json'
-    };
-    const mergedHeaders = {
-        ...defaultHeaders,
-        ...headers,
-        'X-Kunlun-Token': window.token,
-        'x-miaoda-token': window.MIAODA_BUILTIN_TTT,
-        'x-lgw-csrf-token': window.lgw_csrf_token,
-        ...window.CSRF_HEADERS || {}
-    };
-    if (isSparkRuntime()) {
-        mergedHeaders['X-Suda-Csrf-Token'] = getCsrfToken();
-        const response = await fetch(`${window.location.origin}/spark/b/${appId}/text2image`, {
-            method: 'POST',
-            headers: mergedHeaders,
-            credentials: 'include',
-            body: JSON.stringify({
-                prompt,
-                size
-            })
-        });
-        return await response.json();
-    }
-    const response = await fetch(`${window.location.origin}/ai/api/${getEnvPath()}/v1/apps/${appId}/text2image`, {
-        method: 'POST',
-        headers: mergedHeaders,
-        credentials: 'include',
-        body: JSON.stringify({
-            prompt,
-            size
-        })
-    });
-    return await response.json();
-}
-export { generateImage };

package/lib/integrations/generateTextStream.d.ts

@@ -1,21 +0,0 @@
-interface GenerateTextOptions {
-    text: string;
-    thinking_type?: 'enabled' | 'disabled';
-    headers?: Record<string, string>;
-}
-interface GenerateTextResult {
-    content: string;
-    reasoning_content: string;
-    success: boolean;
-    error?: string;
-}
-/**
- * 文生文 - 流式版本
- * 支持实时接收生成内容的回调
- */
-export declare function generateTextStream(options: GenerateTextOptions, onChunk?: (chunk: {
-    content: string;
-    reasoning_content: string;
-    finished: boolean;
-}) => void): Promise<GenerateTextResult>;
-export {};

package/lib/integrations/generateTextStream.js

@@ -1,98 +0,0 @@
-import { getAppId } from "../utils/getAppId.js";
-import { getCsrfToken } from "../utils/getCsrfToken.js";
-import { getEnvPath } from "../utils/getEnvPath.js";
-import { isSparkRuntime } from "../utils/utils.js";
-async function generateTextStream(options, onChunk) {
-    const { text, thinking_type = 'disabled', headers = {} } = options;
-    const appId = getAppId(window.location.pathname);
-    if (!appId) return {
-        content: '',
-        reasoning_content: '',
-        success: false,
-        error: 'appId is required'
-    };
-    try {
-        const mergedHeaders = {
-            'Content-Type': 'application/json',
-            ...headers,
-            'X-Kunlun-Token': window.token,
-            'x-miaoda-token': window.MIAODA_BUILTIN_TTT,
-            'x-lgw-csrf-token': window.lgw_csrf_token,
-            ...window.CSRF_HEADERS || {}
-        };
-        let response;
-        if (isSparkRuntime()) {
-            mergedHeaders['X-Suda-Csrf-Token'] = getCsrfToken();
-            response = await fetch(`${window.location.origin}/spark/b/${appId}/text/generate`, {
-                method: 'POST',
-                headers: mergedHeaders,
-                credentials: 'include',
-                body: JSON.stringify({
-                    text,
-                    thinking_type
-                })
-            });
-        } else response = await fetch(`${window.location.origin}/ai/api/${getEnvPath()}/v1/apps/${appId}/text/generate`, {
-            method: 'POST',
-            headers: mergedHeaders,
-            credentials: 'include',
-            body: JSON.stringify({
-                text,
-                thinking_type
-            })
-        });
-        if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
-        const reader = response.body?.getReader();
-        if (!reader) throw new Error('无法获取响应流');
-        let fullContent = '';
-        let fullReasoningContent = '';
-        const decoder = new TextDecoder();
-        while(true){
-            const { done, value } = await reader.read();
-            if (done) break;
-            const chunk = decoder.decode(value, {
-                stream: true
-            });
-            const lines = chunk.split('\n').filter((line)=>line.trim());
-            for (const line of lines)if (line.startsWith('data: ')) {
-                const jsonStr = line.slice(6);
-                try {
-                    const data = JSON.parse(jsonStr);
-                    if (0 !== data.code) return {
-                        content: '',
-                        reasoning_content: '',
-                        success: false,
-                        error: data.msg || '生成失败'
-                    };
-                    if (data.data.content) fullContent += data.data.content;
-                    if (data.data.reasoning_content) fullReasoningContent += data.data.reasoning_content;
-                    if (onChunk) onChunk({
-                        content: data.data.content || '',
-                        reasoning_content: data.data.reasoning_content || '',
-                        finished: data.finished
-                    });
-                    if (data.finished) return {
-                        content: fullContent,
-                        reasoning_content: fullReasoningContent,
-                        success: true
-                    };
-                } catch (parseError) {
-                    console.error(`解析JSON失败: ${jsonStr}`);
-                }
-            }
-        }
-        return {
-            content: fullContent,
-            reasoning_content: fullReasoningContent,
-            success: true
-        };
-    } catch (error) {
-        return {
-            content: '',
-            reasoning_content: '',
-            success: false,
-            error: error instanceof Error ? error.message : '未知错误'
-        };
-    }
-}
-export { generateTextStream };