mirror of
https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party
synced 2025-12-27 21:20:29 +08:00
Add some core settings
This commit is contained in:
parent
bc17f4aa30
commit
86393d7858
@ -62,7 +62,11 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
|
|||||||
core = 'mihomo',
|
core = 'mihomo',
|
||||||
autoSetDNS = true,
|
autoSetDNS = true,
|
||||||
diffWorkDir = false,
|
diffWorkDir = false,
|
||||||
mihomoCpuPriority = 'PRIORITY_NORMAL'
|
mihomoCpuPriority = 'PRIORITY_NORMAL',
|
||||||
|
disableLoopbackDetector = false,
|
||||||
|
disableEmbedCA = false,
|
||||||
|
disableSystemCA = false,
|
||||||
|
skipSafePathCheck = false
|
||||||
} = await getAppConfig()
|
} = await getAppConfig()
|
||||||
const { 'log-level': logLevel } = await getControledMihomoConfig()
|
const { 'log-level': logLevel } = await getControledMihomoConfig()
|
||||||
if (existsSync(path.join(dataDir(), 'core.pid'))) {
|
if (existsSync(path.join(dataDir(), 'core.pid'))) {
|
||||||
@ -92,12 +96,19 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
|
|||||||
}
|
}
|
||||||
const stdout = createWriteStream(logPath(), { flags: 'a' })
|
const stdout = createWriteStream(logPath(), { flags: 'a' })
|
||||||
const stderr = createWriteStream(logPath(), { flags: 'a' })
|
const stderr = createWriteStream(logPath(), { flags: 'a' })
|
||||||
|
const env = {
|
||||||
|
DISABLE_LOOPBACK_DETECTOR: String(disableLoopbackDetector),
|
||||||
|
DISABLE_EMBED_CA: String(disableEmbedCA),
|
||||||
|
DISABLE_SYSTEM_CA: String(disableSystemCA),
|
||||||
|
SKIP_SAFE_PATH_CHECK: String(skipSafePathCheck)
|
||||||
|
}
|
||||||
child = spawn(
|
child = spawn(
|
||||||
corePath,
|
corePath,
|
||||||
['-d', diffWorkDir ? mihomoProfileWorkDir(current) : mihomoWorkDir(), ctlParam, mihomoIpcPath],
|
['-d', diffWorkDir ? mihomoProfileWorkDir(current) : mihomoWorkDir(), ctlParam, mihomoIpcPath],
|
||||||
{
|
{
|
||||||
detached: detached,
|
detached: detached,
|
||||||
stdio: detached ? 'ignore' : undefined
|
stdio: detached ? 'ignore' : undefined,
|
||||||
|
env: env
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
if (process.platform === 'win32' && child.pid) {
|
if (process.platform === 'win32' && child.pid) {
|
||||||
@ -130,7 +141,7 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
|
|||||||
patchControledMihomoConfig({ tun: { enable: false } })
|
patchControledMihomoConfig({ tun: { enable: false } })
|
||||||
mainWindow?.webContents.send('controledMihomoConfigUpdated')
|
mainWindow?.webContents.send('controledMihomoConfigUpdated')
|
||||||
ipcMain.emit('updateTrayMenu')
|
ipcMain.emit('updateTrayMenu')
|
||||||
reject('虚拟网卡启动失败, 请尝试手动授予内核权限')
|
reject('虚拟网卡启动失败,请尝试手动授予内核权限')
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@ -211,10 +222,17 @@ export async function quitWithoutCore(): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function checkProfile(): Promise<void> {
|
async function checkProfile(): Promise<void> {
|
||||||
const { core = 'mihomo', diffWorkDir = false } = await getAppConfig()
|
const {
|
||||||
|
core = 'mihomo',
|
||||||
|
diffWorkDir = false,
|
||||||
|
skipSafePathCheck = false
|
||||||
|
} = await getAppConfig()
|
||||||
const { current } = await getProfileConfig()
|
const { current } = await getProfileConfig()
|
||||||
const corePath = mihomoCorePath(core)
|
const corePath = mihomoCorePath(core)
|
||||||
const execFilePromise = promisify(execFile)
|
const execFilePromise = promisify(execFile)
|
||||||
|
const env = {
|
||||||
|
SKIP_SAFE_PATH_CHECK: String(skipSafePathCheck)
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
await execFilePromise(corePath, [
|
await execFilePromise(corePath, [
|
||||||
'-t',
|
'-t',
|
||||||
@ -222,7 +240,7 @@ async function checkProfile(): Promise<void> {
|
|||||||
diffWorkDir ? mihomoWorkConfigPath(current) : mihomoWorkConfigPath('work'),
|
diffWorkDir ? mihomoWorkConfigPath(current) : mihomoWorkConfigPath('work'),
|
||||||
'-d',
|
'-d',
|
||||||
mihomoTestDir()
|
mihomoTestDir()
|
||||||
])
|
], { env })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && 'stdout' in error) {
|
if (error instanceof Error && 'stdout' in error) {
|
||||||
const { stdout } = error as { stdout: string }
|
const { stdout } = error as { stdout: string }
|
||||||
|
|||||||
@ -25,7 +25,14 @@ const CoreMap = {
|
|||||||
|
|
||||||
const Mihomo: React.FC = () => {
|
const Mihomo: React.FC = () => {
|
||||||
const { appConfig, patchAppConfig } = useAppConfig()
|
const { appConfig, patchAppConfig } = useAppConfig()
|
||||||
const { core = 'mihomo', maxLogDays = 7, sysProxy } = appConfig || {}
|
const {
|
||||||
|
core = 'mihomo',
|
||||||
|
maxLogDays = 7,
|
||||||
|
sysProxy,
|
||||||
|
disableLoopbackDetector,
|
||||||
|
disableEmbedCA,
|
||||||
|
disableSystemCA,
|
||||||
|
skipSafePathCheck } = appConfig || {}
|
||||||
const { controledMihomoConfig, patchControledMihomoConfig } = useControledMihomoConfig()
|
const { controledMihomoConfig, patchControledMihomoConfig } = useControledMihomoConfig()
|
||||||
const {
|
const {
|
||||||
ipv6,
|
ipv6,
|
||||||
@ -68,6 +75,17 @@ const Mihomo: React.FC = () => {
|
|||||||
await restartCore()
|
await restartCore()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleConfigChangeWithRestart = async (key: string, value: any) => {
|
||||||
|
try {
|
||||||
|
await patchAppConfig({ [key]: value })
|
||||||
|
await restartCore()
|
||||||
|
} catch (e) {
|
||||||
|
alert(e)
|
||||||
|
} finally {
|
||||||
|
PubSub.publish('mihomo-core-changed')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{lanOpen && <InterfaceModal onClose={() => setLanOpen(false)} />}
|
{lanOpen && <InterfaceModal onClose={() => setLanOpen(false)} />}
|
||||||
@ -116,14 +134,7 @@ const Mihomo: React.FC = () => {
|
|||||||
size="sm"
|
size="sm"
|
||||||
selectedKeys={new Set([core])}
|
selectedKeys={new Set([core])}
|
||||||
onSelectionChange={async (v) => {
|
onSelectionChange={async (v) => {
|
||||||
try {
|
handleConfigChangeWithRestart('core', v.currentKey as 'mihomo' | 'mihomo-alpha')
|
||||||
await patchAppConfig({ core: v.currentKey as 'mihomo' | 'mihomo-alpha' })
|
|
||||||
await restartCore()
|
|
||||||
} catch (e) {
|
|
||||||
alert(e)
|
|
||||||
} finally {
|
|
||||||
PubSub.publish('mihomo-core-changed')
|
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<SelectItem key="mihomo">{CoreMap['mihomo']}</SelectItem>
|
<SelectItem key="mihomo">{CoreMap['mihomo']}</SelectItem>
|
||||||
@ -634,6 +645,42 @@ const Mihomo: React.FC = () => {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
<SettingItem title="禁用回环检测器" divider>
|
||||||
|
<Switch
|
||||||
|
size="sm"
|
||||||
|
isSelected={disableLoopbackDetector}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
handleConfigChangeWithRestart('disableLoopbackDetector', v)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SettingItem>
|
||||||
|
<SettingItem title="禁用安全路径检查" divider>
|
||||||
|
<Switch
|
||||||
|
size="sm"
|
||||||
|
isSelected={skipSafePathCheck}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
handleConfigChangeWithRestart('skipSafePathCheck', v)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SettingItem>
|
||||||
|
<SettingItem title="不使用内置 CA 证书" divider>
|
||||||
|
<Switch
|
||||||
|
size="sm"
|
||||||
|
isSelected={disableEmbedCA}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
handleConfigChangeWithRestart('disableEmbedCA', v)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SettingItem>
|
||||||
|
<SettingItem title="不使用系统 CA 证书" divider>
|
||||||
|
<Switch
|
||||||
|
size="sm"
|
||||||
|
isSelected={disableSystemCA}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
handleConfigChangeWithRestart('disableSystemCA', v)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SettingItem>
|
||||||
<SettingItem title="日志保留天数" divider>
|
<SettingItem title="日志保留天数" divider>
|
||||||
<Input
|
<Input
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|||||||
4
src/shared/types.d.ts
vendored
4
src/shared/types.d.ts
vendored
@ -258,6 +258,10 @@ interface ISysProxyConfig {
|
|||||||
|
|
||||||
interface IAppConfig {
|
interface IAppConfig {
|
||||||
core: 'mihomo' | 'mihomo-alpha'
|
core: 'mihomo' | 'mihomo-alpha'
|
||||||
|
disableLoopbackDetector: boolean
|
||||||
|
disableEmbedCA: boolean
|
||||||
|
disableSystemCA: boolean
|
||||||
|
skipSafePathCheck: boolean
|
||||||
proxyDisplayMode: 'simple' | 'full'
|
proxyDisplayMode: 'simple' | 'full'
|
||||||
proxyDisplayOrder: 'default' | 'delay' | 'name'
|
proxyDisplayOrder: 'default' | 'delay' | 'name'
|
||||||
profileDisplayDate?: 'expire' | 'update'
|
profileDisplayDate?: 'expire' | 'update'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user