chore: move effects created outside render

This commit is contained in:
kunish 2024-10-10 20:16:51 +08:00
parent 000272e31f
commit 99e4f48106
No known key found for this signature in database
GPG Key ID: 647A12B4F782C430
5 changed files with 39 additions and 51 deletions

View File

@ -43,7 +43,7 @@ export const App: ParentComponent = ({ children }) => {
<div class="flex-1 overflow-y-auto p-2 sm:p-4">{children}</div> <div class="flex-1 overflow-y-auto p-2 sm:p-4">{children}</div>
<Show when={endpoint()}> <Show when={!!endpoint()}>
<ProtectedResources /> <ProtectedResources />
</Show> </Show>
</div> </div>

View File

@ -1,10 +1,11 @@
import { createForm } from '@felte/solid' import { createForm } from '@felte/solid'
import { validator } from '@felte/validator-zod' import { validator } from '@felte/validator-zod'
import type { Accessor, Component } from 'solid-js' import type { Accessor, Component, ParentComponent } from 'solid-js'
import { toast } from 'solid-toast' import { toast } from 'solid-toast'
import { z } from 'zod' import { z } from 'zod'
import { import {
fetchBackendConfigAPI, fetchBackendConfigAPI,
fetchBackendVersionAPI,
flushFakeIPDataAPI, flushFakeIPDataAPI,
flushingFakeIPData, flushingFakeIPData,
isUpdateAvailableAPI, isUpdateAvailableAPI,
@ -37,11 +38,6 @@ import {
useRequest, useRequest,
useTwemoji, useTwemoji,
} from '~/signals' } from '~/signals'
import {
backendVersion,
isSingBox,
updateBackendVersion,
} from '~/signals/version'
import type { DNSQuery } from '~/types' import type { DNSQuery } from '~/types'
const dnsQueryFormSchema = z.object({ const dnsQueryFormSchema = z.object({
@ -113,7 +109,9 @@ const configFormSchema = z.object({
'mixed-port': z.number(), 'mixed-port': z.number(),
}) })
const ConfigForm = () => { const ConfigForm: ParentComponent<{ isSingBox: Accessor<boolean> }> = ({
isSingBox,
}) => {
const [t] = useI18n() const [t] = useI18n()
const portList = [ const portList = [
@ -180,9 +178,9 @@ const ConfigForm = () => {
} }
}) })
const modes = () => { const modes = createMemo(
return configsData()?.modes || ['rule', 'direct', 'global'] () => configsData()?.modes || ['rule', 'direct', 'global'],
} )
return ( return (
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
@ -538,7 +536,12 @@ export default () => {
const [t] = useI18n() const [t] = useI18n()
updateBackendVersion() const [backendVersion, setBackendVersion] = createSignal('')
const isSingBox = createMemo(() => backendVersion().includes('sing-box'))
onMount(() => {
fetchBackendVersionAPI().then(setBackendVersion)
})
return ( return (
<> <>
@ -553,7 +556,7 @@ export default () => {
<ConfigTitle withDivider>{t('coreConfig')}</ConfigTitle> <ConfigTitle withDivider>{t('coreConfig')}</ConfigTitle>
<ConfigForm /> <ConfigForm isSingBox={isSingBox} />
<ConfigTitle withDivider>{t('xdConfig')}</ConfigTitle> <ConfigTitle withDivider>{t('xdConfig')}</ConfigTitle>

View File

@ -28,7 +28,7 @@ export default () => {
const onSetupSuccess = (id: string) => { const onSetupSuccess = (id: string) => {
setSelectedEndpoint(id) setSelectedEndpoint(id)
navigate('/overview') navigate('/overview', { replace: true })
} }
const checkEndpoint = (url: string, secret: string) => const checkEndpoint = (url: string, secret: string) =>
@ -50,13 +50,9 @@ export default () => {
const onEndpointSelect = async (id: string) => { const onEndpointSelect = async (id: string) => {
const endpoint = endpointList().find((e) => e.id === id) const endpoint = endpointList().find((e) => e.id === id)
if (!endpoint) { if (!endpoint) return
return
}
if (!(await checkEndpoint(endpoint.url, endpoint.secret))) { if (!(await checkEndpoint(endpoint.url, endpoint.secret))) return
return
}
onSetupSuccess(id) onSetupSuccess(id)
} }
@ -64,9 +60,7 @@ export default () => {
const onSubmit = async ({ url, secret }: { url: string; secret: string }) => { const onSubmit = async ({ url, secret }: { url: string; secret: string }) => {
const transformedURL = transformEndpointURL(url) const transformedURL = transformEndpointURL(url)
if (!(await checkEndpoint(transformedURL, secret))) { if (!(await checkEndpoint(transformedURL, secret))) return
return
}
const id = uuid() const id = uuid()
const list = endpointList().slice() const list = endpointList().slice()

View File

@ -7,7 +7,8 @@ let seq = 1
const [logs, setLogs] = createSignal<LogWithSeq[]>([]) const [logs, setLogs] = createSignal<LogWithSeq[]>([])
const [paused, setPaused] = createSignal(false) const [paused, setPaused] = createSignal(false)
createEffect( export const useLogs = () => {
createEffect(
on(logLevel, (value, oldValue) => { on(logLevel, (value, oldValue) => {
if (value === oldValue) return if (value === oldValue) return
@ -24,9 +25,8 @@ createEffect(
seq++ seq++
}) })
}), }),
) )
export const useLogs = () => {
return { return {
logs, logs,
paused, paused,

View File

@ -1,9 +0,0 @@
import { fetchBackendVersionAPI } from '~/apis'
export const [backendVersion, setBackendVersion] = createSignal('')
export const isSingBox = createMemo(() => {
return backendVersion().includes('sing-box')
})
export const updateBackendVersion = () => {
fetchBackendVersionAPI().then(setBackendVersion)
}