Skip to content

fix(proxy): correctly clear plugin config when disabled #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VaalaCat merged 1 commit into from
Feb 16, 2026
Merged

fix(proxy): correctly clear plugin config when disabled #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 56 additions & 12 deletions www/components/frpc/proxy_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,13 @@ export const TCPProxyForm: React.FC<ProxyFormProps> = ({
const [pluginConfig, setPluginConfig] = useState<TypedClientPluginOptions | undefined>(defaultConfig.plugin)

const onSubmit = async (values: z.infer<typeof TCPConfigSchema>) => {
const cfgToSubmit = { ...defaultConfig, ...values, plugin: pluginConfig, type: 'tcp', name: proxyName } as TCPProxyConfig
const cfgToSubmit = {
...defaultConfig,
...values,
plugin: usePlugin ? pluginConfig : undefined,
type: 'tcp',
name: proxyName,
} as TCPProxyConfig
if (!TypedProxyConfigValid(cfgToSubmit)) {
toast.error('Invalid configuration')
return
Expand Down Expand Up @@ -211,10 +217,15 @@ export const TCPProxyForm: React.FC<ProxyFormProps> = ({
name="usePlugin"
label={t('proxy.form.use_plugin')}
defaultValue={usePlugin}
setValue={setUsePlugin}
setValue={(value) => {
setUsePlugin(value)
if (!value) {
setPluginConfig(undefined)
}
}}
/>
{usePlugin ? (
<PluginConfigForm defaultPluginConfig={defaultConfig.plugin} setPluginConfig={setPluginConfig} />
<PluginConfigForm defaultPluginConfig={pluginConfig} setPluginConfig={setPluginConfig} />
) : null}
<Button type="submit" disabled={isSaveDisabled} variant={'outline'} className="w-full">
<YesIcon className={`mr-2 h-4 w-4 ${isSaveDisabled ? '' : 'hidden'}`}></YesIcon>
Expand Down Expand Up @@ -252,7 +263,13 @@ export const STCPProxyForm: React.FC<ProxyFormProps> = ({
const [pluginConfig, setPluginConfig] = useState<TypedClientPluginOptions | undefined>(defaultConfig.plugin)

const onSubmit = async (values: z.infer<typeof STCPConfigSchema>) => {
const cfgToSubmit = { ...defaultConfig, ...values, plugin: pluginConfig, type: 'stcp', name: proxyName } as STCPProxyConfig
const cfgToSubmit = {
...defaultConfig,
...values,
plugin: usePlugin ? pluginConfig : undefined,
type: 'stcp',
name: proxyName,
} as STCPProxyConfig
if (!TypedProxyConfigValid(cfgToSubmit)) {
toast.error('Invalid configuration')
return
Expand Down Expand Up @@ -291,11 +308,16 @@ export const STCPProxyForm: React.FC<ProxyFormProps> = ({
<SwitchWithLabel
name="usePlugin"
defaultValue={usePlugin}
setValue={setUsePlugin}
setValue={(value) => {
setUsePlugin(value)
if (!value) {
setPluginConfig(undefined)
}
}}
label={t('proxy.form.use_plugin')}
/>
{usePlugin ? (
<PluginConfigForm defaultPluginConfig={defaultConfig.plugin} setPluginConfig={setPluginConfig} />
<PluginConfigForm defaultPluginConfig={pluginConfig} setPluginConfig={setPluginConfig} />
) : null}
<SecretStringField name="secretKey" control={form.control} label={t('proxy.form.secret_key') + '*'} />
<Button type="submit" disabled={isSaveDisabled} variant={'outline'} className="w-full">
Expand Down Expand Up @@ -334,7 +356,13 @@ export const UDPProxyForm: React.FC<ProxyFormProps> = ({
const [pluginConfig, setPluginConfig] = useState<TypedClientPluginOptions | undefined>(defaultConfig.plugin)

const onSubmit = async (values: z.infer<typeof UDPConfigSchema>) => {
const cfgToSubmit = { ...defaultConfig, ...values, plugin: pluginConfig, type: 'udp', name: proxyName } as UDPProxyConfig
const cfgToSubmit = {
...defaultConfig,
...values,
plugin: usePlugin ? pluginConfig : undefined,
type: 'udp',
name: proxyName,
} as UDPProxyConfig
if (!TypedProxyConfigValid(cfgToSubmit)) {
toast.error('Invalid configuration')
return
Expand Down Expand Up @@ -393,11 +421,16 @@ export const UDPProxyForm: React.FC<ProxyFormProps> = ({
<SwitchWithLabel
name="usePlugin"
defaultValue={usePlugin}
setValue={setUsePlugin}
setValue={(value) => {
setUsePlugin(value)
if (!value) {
setPluginConfig(undefined)
}
}}
label={t('proxy.form.use_plugin')}
/>
{usePlugin ? (
<PluginConfigForm defaultPluginConfig={defaultConfig.plugin} setPluginConfig={setPluginConfig} />
<PluginConfigForm defaultPluginConfig={pluginConfig} setPluginConfig={setPluginConfig} />
) : null}
<Button type="submit" disabled={isSaveDisabled} variant={'outline'} className="w-full">
<YesIcon className={`mr-2 h-4 w-4 ${isSaveDisabled ? '' : 'hidden'}`}></YesIcon>
Expand Down Expand Up @@ -442,7 +475,13 @@ export const HTTPProxyForm: React.FC<ProxyFormProps> = ({
const [pluginConfig, setPluginConfig] = useState<TypedClientPluginOptions | undefined>(defaultConfig.plugin)

const onSubmit = async (values: z.infer<typeof HTTPConfigSchema>) => {
const cfgToSubmit = { ...defaultConfig, ...values, plugin: pluginConfig, type: 'http', name: proxyName } as HTTPProxyConfig
const cfgToSubmit = {
...defaultConfig,
...values,
plugin: usePlugin ? pluginConfig : undefined,
type: 'http',
name: proxyName,
} as HTTPProxyConfig
if (!TypedProxyConfigValid(cfgToSubmit)) {
toast.error('Invalid configuration')
return
Expand Down Expand Up @@ -526,11 +565,16 @@ export const HTTPProxyForm: React.FC<ProxyFormProps> = ({
<SwitchWithLabel
name="usePlugin"
defaultValue={usePlugin}
setValue={setUsePlugin}
setValue={(value) => {
setUsePlugin(value)
if (!value) {
setPluginConfig(undefined)
}
}}
label={t('proxy.form.use_plugin')}
/>
{usePlugin ? (
<PluginConfigForm defaultPluginConfig={defaultConfig.plugin} setPluginConfig={setPluginConfig} />
<PluginConfigForm defaultPluginConfig={pluginConfig} setPluginConfig={setPluginConfig} />
) : null}
<SwitchWithLabel
name="moreSettings"
Expand Down
Loading