From 3754160407a73449c386ea0f4143eb4a6aab1488 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Tue, 18 Feb 2025 14:26:20 +0800 Subject: [PATCH 1/5] Add omeToken --- app/client/api.ts | 4 ++++ app/components/home.tsx | 25 +++++++++++++++++++++++++ app/components/sidebar.tsx | 11 ----------- app/store/config.ts | 12 ++++++++++-- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/app/client/api.ts b/app/client/api.ts index 64ac82b2a..f57be79f1 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -10,6 +10,7 @@ import { ModelType, useAccessStore, useChatStore, + useAppConfig, } from "../store"; import { ChatGPTApi, DalleRequestPayload } from "./platforms/openai"; import { GeminiProApi } from "./platforms/google"; @@ -233,6 +234,7 @@ export function validString(x: string): boolean { } export function getHeaders(ignoreHeaders: boolean = false) { + const appConfig = useAppConfig.getState(); const accessStore = useAccessStore.getState(); const chatStore = useChatStore.getState(); let headers: Record = {}; @@ -348,6 +350,8 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } + headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; + return headers; } diff --git a/app/components/home.tsx b/app/components/home.tsx index 98f759a48..7d0a3a515 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -239,6 +239,8 @@ export function Home() { useLoadData(); useHtmlLang(); + const appConfig = useAppConfig(); + useEffect(() => { console.log("[Config] got config from build time", getClientConfig()); useAccessStore.getState().fetch(); @@ -258,6 +260,29 @@ export function Home() { initMcp(); }, []); + useEffect(() => { + window.parent.postMessage("omemetis is ready", "*"); + + const handleMessage = (event: any) => { + // 确保消息来自信任的源 + if (!event.origin.includes("omeoffice")) { + return; // 如果不是信任的源，忽略消息 + } + + // 处理消息 + if (event?.data?.omeToken !== null || event?.data?.omeToken !== undefined) + appConfig.setOmeToken(event.data.omeToken); + }; + + // 添加事件监听器 + window.addEventListener("message", handleMessage); + + // 清理事件监听器：组件卸载时移除事件监听 + return () => { + window.removeEventListener("message", handleMessage); + }; + }, []); + if (!useHasHydrated()) { return ; } diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx index 56bc5bb43..6cc25bf19 100644 --- a/app/components/sidebar.tsx +++ b/app/components/sidebar.tsx @@ -4,7 +4,6 @@ import styles from "./home.module.scss"; import { IconButton } from "./button"; import SettingsIcon from "../icons/settings.svg"; -import GithubIcon from "../icons/github.svg"; import ChatGptIcon from "../icons/chatgpt.svg"; import AddIcon from "../icons/add.svg"; import DeleteIcon from "../icons/delete.svg"; @@ -23,7 +22,6 @@ import { MIN_SIDEBAR_WIDTH, NARROW_SIDEBAR_WIDTH, Path, - REPO_URL, } from "../constant"; import { Link, useNavigate } from "react-router-dom"; @@ -336,15 +334,6 @@ export function SideBar(props: { className?: string }) { /> -
- - } - shadow - /> - -
} secondaryAction={ diff --git a/app/store/config.ts b/app/store/config.ts index 45e21b026..f360293d1 100644 --- a/app/store/config.ts +++ b/app/store/config.ts @@ -46,7 +46,8 @@ export const DEFAULT_CONFIG = { fontSize: 14, fontFamily: "", theme: Theme.Auto as Theme, - tightBorder: !!config?.isApp, + // tightBorder: !!config?.isApp, + tightBorder: true, sendPreviewBubble: true, enableAutoGenerateTitle: true, sidebarWidth: DEFAULT_SIDEBAR_WIDTH, @@ -104,6 +105,7 @@ export const DEFAULT_CONFIG = { temperature: 0.9, voice: "alloy" as Voice, }, + omeToken: "", }; export type ChatConfig = typeof DEFAULT_CONFIG; @@ -165,7 +167,13 @@ export const useAppConfig = createPersistStore( { ...DEFAULT_CONFIG }, (set, get) => ({ reset() { - set(() => ({ ...DEFAULT_CONFIG })); + const { omeToken } = get(); + + set(() => ({ ...DEFAULT_CONFIG, omeToken })); + }, + + setOmeToken(omeToken: string) { + set(() => ({ omeToken })); }, mergeModels(newModels: LLMModel[]) { From 65edb38ec970c3233fad74fccf160b00e23ad8c4 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Tue, 18 Feb 2025 14:53:29 +0800 Subject: [PATCH 2/5] enhance code --- app/components/home.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 7d0a3a515..40419e6ff 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -30,6 +30,7 @@ import { type ClientApi, getClientApi } from "../client/api"; import { useAccessStore } from "../store"; import clsx from "clsx"; import { initializeMcpSystem, isMcpEnabled } from "../mcp/actions"; +import { isEmpty } from "lodash-es"; export function Loading(props: { noLogo?: boolean }) { return ( @@ -270,7 +271,7 @@ export function Home() { } // 处理消息 - if (event?.data?.omeToken !== null || event?.data?.omeToken !== undefined) + if (!isEmpty(event?.data?.omeToken)) appConfig.setOmeToken(event.data.omeToken); }; From 99f3398826b94bf6432d377461853fccbed47b46 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Tue, 18 Feb 2025 14:55:47 +0800 Subject: [PATCH 3/5] delete comment --- app/components/home.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 40419e6ff..b91fdece2 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -265,7 +265,6 @@ export function Home() { window.parent.postMessage("omemetis is ready", "*"); const handleMessage = (event: any) => { - // 确保消息来自信任的源 if (!event.origin.includes("omeoffice")) { return; // 如果不是信任的源，忽略消息 } From dfde8d439726e562ebebba07a4de4ca0c72d9cf2 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Tue, 18 Feb 2025 14:57:18 +0800 Subject: [PATCH 4/5] delete comment --- app/components/home.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index b91fdece2..e5697a47b 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -269,7 +269,6 @@ export function Home() { return; // 如果不是信任的源，忽略消息 } - // 处理消息 if (!isEmpty(event?.data?.omeToken)) appConfig.setOmeToken(event.data.omeToken); }; From 0820e636a7b2edbbaa957ffa4ac512bb48b5bcc4 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Tue, 18 Feb 2025 15:17:24 +0800 Subject: [PATCH 5/5] delete comment --- app/components/home.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index e5697a47b..16e33c763 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -273,10 +273,8 @@ export function Home() { appConfig.setOmeToken(event.data.omeToken); }; - // 添加事件监听器 window.addEventListener("message", handleMessage); - // 清理事件监听器：组件卸载时移除事件监听 return () => { window.removeEventListener("message", handleMessage); };