diff --git a/entrypoints/background/index.ts b/entrypoints/background/index.ts index 1b9ff650..d762c414 100644 --- a/entrypoints/background/index.ts +++ b/entrypoints/background/index.ts @@ -17,7 +17,7 @@ import { registerDeclarativeNetRequestRule } from '@/utils/web-request' import { BackgroundDatabaseManager } from './database' import { BackgroundCacheServiceManager } from './services/cache-service' import { BackgroundChatHistoryServiceManager } from './services/chat-history-service' -import { waitForSidepanelLoaded } from './utils' +import { waitUntilSidepanelLoaded } from './utils' export default defineBackground(() => { if (import.meta.env.CHROME) { @@ -122,11 +122,11 @@ export default defineBackground(() => { if (typeof info.menuItemId === 'string' && ['quick-actions', 'add-image-to-chat'].some((id) => info.menuItemId.toString().includes(id))) { if (browser.sidePanel) { await browser.sidePanel.open({ windowId: tab.windowId }) - await waitForSidepanelLoaded().catch((err) => logger.error(err)) + await waitUntilSidepanelLoaded().catch((err) => logger.error(err)) } else if (browser.sidebarAction) { await browser.sidebarAction.open() - await waitForSidepanelLoaded().catch((err) => logger.error(err)) + await waitUntilSidepanelLoaded().catch((err) => logger.error(err)) } await b2sRpc.emit('contextMenuClicked', { ...info, menuItemId: info.menuItemId as ContextMenuId, tabInfo: tabToTabInfo(tab) }) } diff --git a/entrypoints/background/utils.ts b/entrypoints/background/utils.ts index 8cc3f68f..a15e00c2 100644 --- a/entrypoints/background/utils.ts +++ b/entrypoints/background/utils.ts @@ -5,7 +5,7 @@ const checkSidepanelLoaded = async () => { try { const r = await Promise.race([ b2sRpc.getSidepanelStatus().then((status) => !!status), - sleep(2000).then(() => false), + sleep(1000).then(() => false), ]) return r } @@ -14,10 +14,10 @@ const checkSidepanelLoaded = async () => { } } -export async function waitForSidepanelLoaded() { +export async function waitUntilSidepanelLoaded() { const start = Date.now() while (!(await checkSidepanelLoaded())) { - if (Date.now() - start > 5000) { + if (Date.now() - start > 3000) { throw new Error('Timeout waiting for sidepanel to load') } await sleep(500) diff --git a/entrypoints/settings/components/GeneralSettings/index.vue b/entrypoints/settings/components/GeneralSettings/index.vue index e76f45ba..c76a3307 100644 --- a/entrypoints/settings/components/GeneralSettings/index.vue +++ b/entrypoints/settings/components/GeneralSettings/index.vue @@ -245,6 +245,7 @@ import { MIN_CONTEXT_WINDOW_SIZE, OLLAMA_HOMEPAGE_URL, OLLAMA_SEARCH_URL, OLLAMA import { useI18n } from '@/utils/i18n/index' import logger from '@/utils/logger' import { useOllamaStatusStore } from '@/utils/pinia-store/store' +import { settings2bRpc } from '@/utils/rpc' import { getUserConfig } from '@/utils/user-config' import { useSettingsInitialQuery } from '../../composables/useQuery' @@ -303,9 +304,8 @@ const testConnection = async () => { try { await reScanOllama() const success = await ollamaStatusStore.updateConnectionStatus() - if (success) { - await ollamaStatusStore.updateModelList() - } + success ? (await ollamaStatusStore.updateModelList()) : ollamaStatusStore.clearModelList() + settings2bRpc.updateSidepanelModelList() return success } catch (error) { diff --git a/entrypoints/sidepanel/components/Onboarding/OllamaTutorialCard.vue b/entrypoints/sidepanel/components/Onboarding/OllamaTutorialCard.vue index 4d0360a4..f63ade37 100644 --- a/entrypoints/sidepanel/components/Onboarding/OllamaTutorialCard.vue +++ b/entrypoints/sidepanel/components/Onboarding/OllamaTutorialCard.vue @@ -23,7 +23,7 @@ color="primary" class="grow-0 shrink-0" > - + {{ t('onboarding.guide.features.1') }} @@ -34,7 +34,7 @@ color="primary" class="grow-0 shrink-0" > - + {{ t('onboarding.guide.features.2') }} @@ -45,7 +45,7 @@ color="primary" class="grow-0 shrink-0" > - + {{ t('onboarding.guide.features.3') }} diff --git a/entrypoints/sidepanel/components/Onboarding/SloganCard.vue b/entrypoints/sidepanel/components/Onboarding/SloganCard.vue index 8fa4e183..6651747f 100644 --- a/entrypoints/sidepanel/components/Onboarding/SloganCard.vue +++ b/entrypoints/sidepanel/components/Onboarding/SloganCard.vue @@ -1,7 +1,7 @@