Fix http fetch cors

Cargo.toml

@@ -31,6 +31,7 @@ tauri-plugin-dialog = "2.7.0"
 tauri-plugin-fs = "2.5.0"
 tauri-plugin-process = "2.3.1"
 tauri-plugin-clipboard-manager = "2.3.2"
+tauri-plugin-http = "2.5.9"
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }
@@ -47,7 +48,6 @@ sqlstmt = { path = "./src-crates/sqlstmt" }
 kvdb = { path = "./src-crates/kvdb" }
 backup = { path = "./src-crates/backup" }
 proxy = { path = "./src-crates/proxy" }
-reqwest = { path = "./src-crates/reqwest" }
 client-store = { path = "./src-crates/client-store" }
 dir = { path = "./src-crates/dir" }
 whoami = "1.6.0"

capabilities/default.json

@@ -29,6 +29,15 @@
                     "path": "**"
                 }
             ]
+        },
+        {
+            "identifier": "http:default",
+            "allow": [
+                { "url": "https://*" },
+                { "url": "https://*:*" },
+                { "url": "http://*" },
+                { "url": "http://*:*" }
+            ]
         }
     ]
 }

package.json

@@ -28,6 +28,7 @@
         "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
         "@tauri-apps/plugin-dialog": "^2.7.0",
         "@tauri-apps/plugin-fs": "^2.5.0",
+        "@tauri-apps/plugin-http": "^2.5.9",
         "@tauri-apps/plugin-opener": "^2.5.3",
         "@tauri-apps/plugin-process": "^2.3.1",
         "@tauri-apps/plugin-updater": "^2.10.1",

src-tauri/main.rs

@@ -7,7 +7,6 @@ mod backup;
 mod client;
 mod database;
 mod device;
-mod http;
 mod ipc;
 mod keychain;
 mod lifecycle;
@@ -42,6 +41,7 @@ fn main() {
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_fs::init())
+        .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_updater::Builder::new().build());
@@ -61,8 +61,6 @@ fn main() {
         // Device
         device::hostname,
         device::font_families,
-        // HTTP
-        http::fetch,
         // Keychain
         keychain::set_password,
         keychain::get_password,

src-web/pages/database/ai/services.ts

@@ -1,6 +1,7 @@
 import { createAnthropic } from '@ai-sdk/anthropic'
 import { createGoogleGenerativeAI } from '@ai-sdk/google'
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible'
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
 import {
     ChatAddToolApproveResponseFunction,
     ChatRequestOptions,
@@ -94,12 +95,17 @@ const createLanguageModel = (config: ProviderConfig, modelID: string): LanguageM
                 headers: {
                     'anthropic-dangerous-direct-browser-access': 'true',
                     'dangerouslyAllowBrowser': 'true'
-                }
+                },
+                fetch: tauriFetch
             })
             return anthropic(modelID)
         }
         case ProviderType.GoogleGemini: {
-            const googleGemini = createGoogleGenerativeAI({ apiKey: config.apiKey, baseURL })
+            const googleGemini = createGoogleGenerativeAI({
+                apiKey: config.apiKey,
+                baseURL,
+                fetch: tauriFetch
+            })
             return googleGemini(modelID)
         }
         case ProviderType.DeepSeek:
@@ -115,7 +121,8 @@ const createLanguageModel = (config: ProviderConfig, modelID: string): LanguageM
             const openai = createOpenAICompatible({
                 name: 'openai-compatible',
                 apiKey: config.apiKey,
-                baseURL: baseURL ?? defaultBaseURL(config.type)
+                baseURL: baseURL ?? defaultBaseURL(config.type),
+                fetch: tauriFetch
             })
             return openai(modelID)
         }

src-web/pages/settings/provider/api.ts

@@ -1,5 +1,6 @@
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
 import z, { ZodType } from 'zod'
-import { Http, ProviderConfig, ProviderModelConfig, ProviderType } from '../../../tauri'
+import { ProviderConfig, ProviderModelConfig, ProviderType } from '../../../tauri'
 
 export const defaultBaseURL = (type: ProviderType): string => {
     return {
@@ -28,11 +29,11 @@ export const normalizeBaseURL = <T>(url: string, emptyFallback: T): string | T =
 
 export const fetchModels = async (config: ProviderConfig): Promise<ProviderModelConfig[]> => {
     const fetchJSON = async <T extends ZodType>(url: string, schema: T, headers?: Record<string, string>) => {
-        const res = await Http.fetch(url, { method: 'GET', headers })
+        const res = await tauriFetch(url, { method: 'GET', headers })
         if (res.status !== 200) {
             throw `StatusCode: ${res.status}\nFrom: ${url}`
         }
-        const parsed = schema.safeParse(res.json())
+        const parsed = schema.safeParse(await res.json())
         if (!parsed.success) {
             const issue = parsed.error.issues[0]
             const path = issue.path.length > 0 ? ` at '${issue.path.join('.')}'` : ''
@@ -101,7 +102,12 @@ export const fetchModels = async (config: ProviderConfig): Promise<ProviderModel
                         })
                 )
             })
-            const headers = { 'x-api-key': config.apiKey, 'anthropic-version': '2023-06-01' }
+            const headers = {
+                'x-api-key': config.apiKey,
+                'anthropic-version': '2023-06-01',
+                'anthropic-dangerous-direct-browser-access': 'true',
+                'dangerouslyAllowBrowser': 'true'
+            }
             return fetchJSON(`${baseURL}/models`, schema, headers).then((json) => json.data)
         }
         case ProviderType.GoogleGemini: {

src-web/tauri/index.ts

@@ -11,4 +11,3 @@ export * from './lifecycle'
 export * from './keychain'
 export * from './event'
 export * from './backup'
-export * from './http'

src-web/utils/license.ts

@@ -1,4 +1,5 @@
-import { getPassword, setPassword, deletePassword, Http } from '../tauri'
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
+import { getPassword, setPassword, deletePassword } from '../tauri'
 
 export interface License {
     key: string
@@ -66,18 +67,18 @@ export class LicenseApi {
         }
         return new Promise(async (success, error) => {
             try {
-                let res = await Http.fetch(url.toString(), {
+                let res = await tauriFetch(url.toString(), {
                     method: data.method,
                     headers: {
                         'Content-Type': 'application/json'
                     },
                     body
                 })
                 if (res.status !== 200) {
-                    const rst: { message: string } = res.json()
+                    const rst: { message: string } = await res.json()
                     return error(rst.message)
                 }
-                success(res.json())
+                success(await res.json())
             } catch (err: any) {
                 error(err.toString())
             }