Compare commits

..

No commits in common. "f541b5ead1eb1955fa065beb636023683bbd137e" and "b76757bc192f3221bdd93640965193895569adaa" have entirely different histories.

10 changed files with 120 additions and 184 deletions

View File

@ -142,7 +142,6 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
useProxy: item.useProxy || false,
allowFixedInterval: item.allowFixedInterval || false,
autoUpdate: item.autoUpdate ?? false,
authToken: item.authToken,
updated: new Date().getTime()
} as IProfileItem
switch (newItem.type) {
@ -160,24 +159,14 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
} else {
urlObj.searchParams.delete('proxy')
}
const headers: Record<string, string> = {
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
}
if (item.authToken) {
headers['Authorization'] = item.authToken
}
res = await chromeRequest.get(urlObj.toString(), {
headers,
headers: {
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
},
responseType: 'text',
timeout: subscriptionTimeout
})
} else {
const headers: Record<string, string> = {
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
}
if (item.authToken) {
headers['Authorization'] = item.authToken
}
res = await chromeRequest.get(item.url, {
proxy: newItem.useProxy
? {
@ -186,7 +175,9 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
port: mixedPort
}
: false,
headers,
headers: {
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
},
responseType: 'text',
timeout: subscriptionTimeout
})

View File

@ -307,7 +307,7 @@ async function cleanupWindowsNamedPipes(): Promise<void> {
try {
const { stdout } = await execPromise(
`powershell -NoProfile -Command "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; Get-Process | Where-Object {$_.ProcessName -like '*mihomo*'} | Select-Object Id,ProcessName | ConvertTo-Json"`,
`powershell -Command "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; Get-Process | Where-Object {$_.ProcessName -like '*mihomo*'} | Select-Object Id,ProcessName | ConvertTo-Json"`,
{ encoding: 'utf8' }
)
@ -678,13 +678,13 @@ export async function restartAsAdmin(forTun: boolean = true): Promise<void> {
try {
// 处理路径和参数的引号
const escapedExePath = exePath.replace(/'/g, "''")
const argsString = restartArgs.map((arg) => arg.replace(/'/g, "''")).join("', '")
const argsString = restartArgs.map(arg => arg.replace(/'/g, "''")).join("', '")
let command: string
if (restartArgs.length > 0) {
command = `powershell -NoProfile -Command "Start-Process -FilePath '${escapedExePath}' -ArgumentList '${argsString}' -Verb RunAs"`
command = `powershell -Command "Start-Process -FilePath '${escapedExePath}' -ArgumentList '${argsString}' -Verb RunAs"`
} else {
command = `powershell -NoProfile -Command "Start-Process -FilePath '${escapedExePath}' -Verb RunAs"`
command = `powershell -Command "Start-Process -FilePath '${escapedExePath}' -Verb RunAs"`
}
await managerLogger.info('Restarting as administrator with command', command)

View File

@ -111,9 +111,9 @@ export async function downloadAndInstallUpdate(version: string): Promise<void> {
// 提升权限安装
const escapedPath = installerPath.replace(/'/g, "''")
const args = ['/S', '--force-run']
const argsString = args.map((arg) => arg.replace(/'/g, "''")).join("', '")
const argsString = args.map(arg => arg.replace(/'/g, "''")).join("', '")
const command = `powershell -NoProfile -Command "Start-Process -FilePath '${escapedPath}' -ArgumentList '${argsString}' -Verb RunAs -WindowStyle Hidden"`
const command = `powershell -Command "Start-Process -FilePath '${escapedPath}' -ArgumentList '${argsString}' -Verb RunAs -WindowStyle Hidden"`
await appLogger.info('Starting installer with elevated privileges')

View File

@ -88,13 +88,11 @@ export async function enableAutoRun(): Promise<void> {
const isAdmin = await checkAdminPrivileges()
await writeFile(taskFilePath, Buffer.from(`\ufeff${getTaskXml(isAdmin)}`, 'utf-16le'))
if (isAdmin) {
await execPromise(
`%SystemRoot%\\System32\\schtasks.exe /create /tn "${appName}" /xml "${taskFilePath}" /f`
)
await execPromise(`%SystemRoot%\\System32\\schtasks.exe /create /tn "${appName}" /xml "${taskFilePath}" /f`)
} else {
try {
await execPromise(
`powershell -NoProfile -Command "Start-Process schtasks -Verb RunAs -ArgumentList '/create', '/tn', '${appName}', '/xml', '${taskFilePath}', '/f' -WindowStyle Hidden"`
`powershell -Command "Start-Process schtasks -Verb RunAs -ArgumentList '/create', '/tn', '${appName}', '/xml', '${taskFilePath}', '/f' -WindowStyle Hidden"`
)
}
catch (e) {
@ -142,9 +140,7 @@ export async function disableAutoRun(): Promise<void> {
await execPromise(`%SystemRoot%\\System32\\schtasks.exe /delete /tn "${appName}" /f`)
} else {
try {
await execPromise(
`powershell -NoProfile -Command "Start-Process schtasks -Verb RunAs -ArgumentList '/delete', '/tn', '${appName}', '/f' -WindowStyle Hidden"`
)
await execPromise(`powershell -Command "Start-Process schtasks -Verb RunAs -ArgumentList '/delete', '/tn', '${appName}', '/f' -WindowStyle Hidden"`)
} catch (e) {
await managerLogger.info('Maybe the user rejected the UAC dialog?')
}

View File

@ -43,7 +43,7 @@ export async function openUWPTool(): Promise<void> {
if (!isAdmin) {
const escapedPath = uwpToolPath.replace(/'/g, "''")
const command = `powershell -NoProfile -Command "Start-Process -FilePath '${escapedPath}' -Verb RunAs -Wait"`
const command = `powershell -Command "Start-Process -FilePath '${escapedPath}' -Verb RunAs -Wait"`
await execPromise(command, { windowsHide: true })
return

View File

@ -91,18 +91,6 @@ const EditInfoModal: React.FC<Props> = (props) => {
}}
/>
</SettingItem>
<SettingItem title={t('profiles.editInfo.authToken')}>
<Input
size="sm"
type="password"
className={cn(inputWidth)}
value={values.authToken || ''}
onValueChange={(v) => {
setValues({ ...values, authToken: v })
}}
placeholder={t('profiles.editInfo.authTokenPlaceholder')}
/>
</SettingItem>
<SettingItem title={t('profiles.editInfo.useProxy')}>
<Switch
size="sm"

View File

@ -438,8 +438,6 @@
"profiles.editInfo.title": "Edit Information",
"profiles.editInfo.name": "Name",
"profiles.editInfo.url": "Subscription URL",
"profiles.editInfo.authToken": "Authorization Token",
"profiles.editInfo.authTokenPlaceholder": "Bearer token or other auth header value",
"profiles.editInfo.useProxy": "Use Proxy to Update",
"profiles.editInfo.interval": "Upd. Interval",
"profiles.editInfo.intervalPlaceholder": "e.g.: 30 or '0 * * * *'",

View File

@ -443,8 +443,6 @@
"profiles.editInfo.title": "编辑信息",
"profiles.editInfo.name": "名称",
"profiles.editInfo.url": "订阅地址",
"profiles.editInfo.authToken": "授权令牌",
"profiles.editInfo.authTokenPlaceholder": "Bearer token 或其他认证头值",
"profiles.editInfo.useProxy": "使用代理更新",
"profiles.editInfo.interval": "更新间隔",
"profiles.editInfo.intervalPlaceholder": "例如30 或 '0 * * * *'",

View File

@ -7,8 +7,7 @@ import {
DropdownItem,
DropdownMenu,
DropdownTrigger,
Input,
Tooltip
Input
} from '@heroui/react'
import BasePage from '@renderer/components/base/base-page'
import ProfileItem from '@renderer/components/profiles/profile-item'
@ -51,8 +50,6 @@ const Profiles: React.FC = () => {
const navigate = useNavigate()
const [sortedItems, setSortedItems] = useState(items)
const [useProxy, setUseProxy] = useState(false)
const [authToken, setAuthToken] = useState('')
const [showAdvanced, setShowAdvanced] = useState(false)
const [subStoreImporting, setSubStoreImporting] = useState(false)
const [importing, setImporting] = useState(false)
const [updating, setUpdating] = useState(false)
@ -128,15 +125,8 @@ const Profiles: React.FC = () => {
}, [subs, collections])
const handleImport = async (): Promise<void> => {
setImporting(true)
await addProfileItem({
name: '',
type: 'remote',
url,
useProxy,
authToken: authToken || undefined
})
await addProfileItem({ name: '', type: 'remote', url, useProxy })
setUrl('')
setAuthToken('')
setImporting(false)
}
const pageRef = useRef<HTMLDivElement>(null)
@ -235,15 +225,13 @@ const Profiles: React.FC = () => {
}
>
<div className="sticky profiles-sticky top-0 z-40 bg-background">
<div className="flex flex-col gap-2 p-2">
<div className="flex gap-2">
<div className="flex p-2">
<Input
size="sm"
placeholder={t('profiles.input.placeholder')}
value={url}
onValueChange={setUrl}
onKeyUp={handleInputKeyUp}
className="flex-1"
endContent={
<>
<Button
@ -270,19 +258,10 @@ const Profiles: React.FC = () => {
}
/>
<Tooltip content={t('profiles.editInfo.authToken')} placement="bottom">
<Button
size="sm"
variant={showAdvanced ? 'solid' : 'light'}
isIconOnly
onPress={() => setShowAdvanced(!showAdvanced)}
>
🔑
</Button>
</Tooltip>
<Button
size="sm"
color="primary"
className="ml-2"
isDisabled={isUrlEmpty}
isLoading={importing}
onPress={handleImport}
@ -300,7 +279,7 @@ const Profiles: React.FC = () => {
<Button
isLoading={subStoreImporting}
title="Sub-Store"
className="substore-import"
className="ml-2 substore-import"
size="sm"
isIconOnly
color="primary"
@ -367,7 +346,7 @@ const Profiles: React.FC = () => {
)}
<Dropdown>
<DropdownTrigger>
<Button className="new-profile" size="sm" isIconOnly color="primary">
<Button className="ml-2 new-profile" size="sm" isIconOnly color="primary">
<FaPlus />
</Button>
</DropdownTrigger>
@ -398,19 +377,6 @@ const Profiles: React.FC = () => {
</DropdownMenu>
</Dropdown>
</div>
{showAdvanced && (
<Input
size="sm"
type="password"
placeholder={t('profiles.editInfo.authTokenPlaceholder')}
value={authToken}
onValueChange={setAuthToken}
onKeyUp={handleInputKeyUp}
className="w-full"
startContent={<span className="text-default-400 text-sm">🔑</span>}
/>
)}
</div>
<Divider />
</div>
<DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={onDragEnd}>

View File

@ -492,7 +492,6 @@ interface IProfileItem {
substore?: boolean
allowFixedInterval?: boolean
autoUpdate?: boolean
authToken?: string
}
interface ISubStoreSub {