mirror of
https://github.com/fatedier/frp.git
synced 2026-07-28 23:59:18 +08:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa3bcca2b0 | ||
|
|
7b6e01f04f | ||
|
|
8dd26c6961 | ||
|
|
c8c1e5116c | ||
|
|
4ec8de973f | ||
|
|
5bfcea3d0c | ||
|
|
0a1b4ab21f | ||
|
|
5f575b8442 | ||
|
|
a1348cdf00 | ||
|
|
2f5e1f7945 | ||
|
|
22ae8166d3 | ||
|
|
af6bc6369d |
@@ -7,15 +7,14 @@ jobs:
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
name: Test and build web assets
|
||||
command: make web-ci
|
||||
name: Build web assets (frps)
|
||||
command: make install build
|
||||
working_directory: web/frps
|
||||
- run:
|
||||
name: Check Go formatting and build binaries
|
||||
command: |
|
||||
set -e
|
||||
make env fmt
|
||||
git diff --exit-code
|
||||
make build
|
||||
name: Build web assets (frpc)
|
||||
command: make install build
|
||||
working_directory: web/frpc
|
||||
- run: make
|
||||
- run: make alltest
|
||||
|
||||
workflows:
|
||||
|
||||
8
.github/workflows/golangci-lint.yml
vendored
8
.github/workflows/golangci-lint.yml
vendored
@@ -22,8 +22,12 @@ jobs:
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: '22'
|
||||
- name: Test and build web assets
|
||||
run: make web-ci
|
||||
- name: Build web assets (frps)
|
||||
run: make build
|
||||
working-directory: web/frps
|
||||
- name: Build web assets (frpc)
|
||||
run: make build
|
||||
working-directory: web/frpc
|
||||
- name: golangci-lint
|
||||
uses: golangci/golangci-lint-action@v9
|
||||
with:
|
||||
|
||||
5
Makefile
5
Makefile
@@ -5,7 +5,7 @@ NOWEB_TAG = $(shell [ ! -d web/frps/dist ] || [ ! -d web/frpc/dist ] && echo ',n
|
||||
FRP_COMPAT_BASELINE_COUNT ?= 8
|
||||
FRP_COMPAT_FLOOR_VERSION ?= 0.61.0
|
||||
|
||||
.PHONY: web web-ci frps-web frpc-web frps frpc e2e-compatibility-smoke e2e-compatibility e2e-compatibility-floor
|
||||
.PHONY: web frps-web frpc-web frps frpc e2e-compatibility-smoke e2e-compatibility e2e-compatibility-floor
|
||||
|
||||
all: env fmt web build
|
||||
|
||||
@@ -16,9 +16,6 @@ env:
|
||||
|
||||
web: frps-web frpc-web
|
||||
|
||||
web-ci:
|
||||
cd web && npm ci && npm run lint:check --workspace frps && npm run lint:check --workspace frpc && npm run test:unit && npm run build --workspace frps && npm run build --workspace frpc
|
||||
|
||||
frps-web:
|
||||
$(MAKE) -C web/frps build
|
||||
|
||||
|
||||
1
web/frpc/auto-imports.d.ts
vendored
1
web/frpc/auto-imports.d.ts
vendored
@@ -3,7 +3,6 @@
|
||||
// @ts-nocheck
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
// Generated by unplugin-auto-import
|
||||
// biome-ignore lint: disable
|
||||
export {}
|
||||
declare global {
|
||||
|
||||
|
||||
9
web/frpc/components.d.ts
vendored
9
web/frpc/components.d.ts
vendored
@@ -1,14 +1,10 @@
|
||||
/* eslint-disable */
|
||||
/* prettier-ignore */
|
||||
// @ts-nocheck
|
||||
// biome-ignore lint: disable
|
||||
// oxlint-disable
|
||||
// ------
|
||||
// Generated by unplugin-vue-components
|
||||
// Read more: https://github.com/vuejs/core/pull/3399
|
||||
|
||||
export {}
|
||||
|
||||
/* prettier-ignore */
|
||||
declare module 'vue' {
|
||||
export interface GlobalComponents {
|
||||
ConfigField: typeof import('./src/components/ConfigField.vue')['default']
|
||||
@@ -42,11 +38,10 @@ declare module 'vue' {
|
||||
VisitorBaseSection: typeof import('./src/components/visitor-form/VisitorBaseSection.vue')['default']
|
||||
VisitorConnectionSection: typeof import('./src/components/visitor-form/VisitorConnectionSection.vue')['default']
|
||||
VisitorFormLayout: typeof import('./src/components/visitor-form/VisitorFormLayout.vue')['default']
|
||||
VisitorPluginSection: typeof import('./src/components/visitor-form/VisitorPluginSection.vue')['default']
|
||||
VisitorTransportSection: typeof import('./src/components/visitor-form/VisitorTransportSection.vue')['default']
|
||||
VisitorXtcpSection: typeof import('./src/components/visitor-form/VisitorXtcpSection.vue')['default']
|
||||
}
|
||||
export interface GlobalDirectives {
|
||||
export interface ComponentCustomProperties {
|
||||
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,14 +9,13 @@
|
||||
"preview": "vite preview",
|
||||
"build-only": "vite build",
|
||||
"type-check": "vue-tsc --noEmit",
|
||||
"lint": "eslint . --fix",
|
||||
"lint:check": "eslint ."
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"element-plus": "^2.14.3",
|
||||
"element-plus": "^2.13.0",
|
||||
"pinia": "^3.0.4",
|
||||
"vue": "^3.5.40",
|
||||
"vue-router": "^5.2.0"
|
||||
"vue": "^3.5.26",
|
||||
"vue-router": "^4.6.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "24",
|
||||
@@ -24,19 +23,19 @@
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.7.0",
|
||||
"@vue/tsconfig": "^0.8.1",
|
||||
"@vueuse/core": "^14.3.0",
|
||||
"eslint": "^10.8.0",
|
||||
"eslint-plugin-vue": "^10.10.0",
|
||||
"@vueuse/core": "^14.1.0",
|
||||
"eslint": "^9.39.0",
|
||||
"eslint-plugin-vue": "^9.33.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^3.9.6",
|
||||
"sass": "^1.102.0",
|
||||
"terser": "^5.49.0",
|
||||
"prettier": "^3.7.4",
|
||||
"sass": "^1.97.2",
|
||||
"terser": "^5.44.1",
|
||||
"typescript": "^5.9.3",
|
||||
"unplugin-auto-import": "^21.0.0",
|
||||
"unplugin-auto-import": "^0.17.5",
|
||||
"unplugin-element-plus": "^0.11.2",
|
||||
"unplugin-vue-components": "^32.1.0",
|
||||
"unplugin-vue-components": "^0.26.0",
|
||||
"vite": "^7.3.0",
|
||||
"vite-svg-loader": "^5.1.0",
|
||||
"vue-tsc": "^3.3.8"
|
||||
"vue-tsc": "^3.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<!-- number -->
|
||||
<el-input
|
||||
v-else-if="type === 'number'"
|
||||
:model-value="numberDraft"
|
||||
:model-value="modelValue != null ? String(modelValue) : ''"
|
||||
:placeholder="placeholder"
|
||||
:disabled="disabled"
|
||||
@update:model-value="handleNumberInput($event)"
|
||||
@@ -112,7 +112,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { computed } from 'vue'
|
||||
import KeyValueEditor from './KeyValueEditor.vue'
|
||||
import StringListEditor from './StringListEditor.vue'
|
||||
import PopoverMenu from '@shared/components/PopoverMenu.vue'
|
||||
@@ -154,42 +154,16 @@ const emit = defineEmits<{
|
||||
'update:modelValue': [value: any]
|
||||
}>()
|
||||
|
||||
const numberDraft = ref(
|
||||
props.modelValue != null ? String(props.modelValue) : '',
|
||||
)
|
||||
const preserveNumberDraft = ref(false)
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(value) => {
|
||||
if (preserveNumberDraft.value && value == null) {
|
||||
preserveNumberDraft.value = false
|
||||
return
|
||||
}
|
||||
preserveNumberDraft.value = false
|
||||
numberDraft.value = value != null ? String(value) : ''
|
||||
},
|
||||
)
|
||||
|
||||
const handleNumberInput = (val: string) => {
|
||||
numberDraft.value = val
|
||||
if (val === '') {
|
||||
emit('update:modelValue', undefined)
|
||||
return
|
||||
}
|
||||
// Keep a leading sign as an editing state so negative values can be typed
|
||||
// naturally. The form value is updated once the input becomes a number.
|
||||
if (val === '-' || val === '+') {
|
||||
preserveNumberDraft.value = true
|
||||
emit('update:modelValue', undefined)
|
||||
return
|
||||
}
|
||||
const num = Number(val)
|
||||
if (!isNaN(num)) {
|
||||
let clamped = num
|
||||
if (props.min != null && clamped < props.min) clamped = props.min
|
||||
if (props.max != null && clamped > props.max) clamped = props.max
|
||||
numberDraft.value = String(clamped)
|
||||
emit('update:modelValue', clamped)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
<ConfigField label="Bind Address" type="text" v-model="form.bindAddr"
|
||||
placeholder="127.0.0.1" :readonly="readonly" />
|
||||
<ConfigField label="Bind Port" type="number" v-model="form.bindPort"
|
||||
:min="bindPortMin" :max="65535" prop="bindPort" :readonly="readonly"
|
||||
:tip="bindPortTip" />
|
||||
:min="bindPortMin" :max="65535" prop="bindPort" :readonly="readonly" />
|
||||
</div>
|
||||
</ConfigSection>
|
||||
</template>
|
||||
@@ -37,9 +36,6 @@ const form = computed({
|
||||
})
|
||||
|
||||
const bindPortMin = computed(() => (form.value.type === 'sudp' ? 1 : undefined))
|
||||
const bindPortTip = computed(() => form.value.type === 'sudp'
|
||||
? ''
|
||||
: 'Use -1 to skip the local listener when connections come from another visitor or plugin.')
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
<VisitorBaseSection v-model="form" :readonly="readonly" :editing="editing" />
|
||||
</ConfigSection>
|
||||
<VisitorConnectionSection v-model="form" :readonly="readonly" />
|
||||
<VisitorPluginSection
|
||||
v-if="form.type === 'stcp' || form.type === 'xtcp'"
|
||||
v-model="form"
|
||||
:readonly="readonly"
|
||||
/>
|
||||
<VisitorTransportSection v-model="form" :readonly="readonly" />
|
||||
<VisitorXtcpSection v-if="form.type === 'xtcp'" v-model="form" :readonly="readonly" />
|
||||
</div>
|
||||
@@ -20,7 +15,6 @@ import type { VisitorFormData } from '../../types'
|
||||
import ConfigSection from '../ConfigSection.vue'
|
||||
import VisitorBaseSection from './VisitorBaseSection.vue'
|
||||
import VisitorConnectionSection from './VisitorConnectionSection.vue'
|
||||
import VisitorPluginSection from './VisitorPluginSection.vue'
|
||||
import VisitorTransportSection from './VisitorTransportSection.vue'
|
||||
import VisitorXtcpSection from './VisitorXtcpSection.vue'
|
||||
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
<template>
|
||||
<ConfigSection title="Plugin" :readonly="readonly">
|
||||
<div class="field-row two-col">
|
||||
<ConfigField
|
||||
label="Plugin Type"
|
||||
type="select"
|
||||
v-model="form.pluginType"
|
||||
:options="pluginOptions"
|
||||
placeholder="None"
|
||||
:readonly="readonly"
|
||||
/>
|
||||
<ConfigField
|
||||
v-if="form.pluginType === 'virtual_net'"
|
||||
label="Destination IP"
|
||||
type="text"
|
||||
v-model="form.pluginDestinationIP"
|
||||
prop="pluginDestinationIP"
|
||||
placeholder="10.10.10.10"
|
||||
tip="Destination address in the frp virtual network."
|
||||
:readonly="readonly"
|
||||
/>
|
||||
</div>
|
||||
</ConfigSection>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import type { VisitorFormData } from '../../types'
|
||||
import ConfigField from '../ConfigField.vue'
|
||||
import ConfigSection from '../ConfigSection.vue'
|
||||
|
||||
const pluginOptions = [
|
||||
{ label: 'None', value: '' },
|
||||
{ label: 'virtual_net', value: 'virtual_net' },
|
||||
]
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: VisitorFormData
|
||||
readonly?: boolean
|
||||
}>(), { readonly: false })
|
||||
|
||||
const emit = defineEmits<{ 'update:modelValue': [value: VisitorFormData] }>()
|
||||
|
||||
const form = computed({
|
||||
get: () => props.modelValue,
|
||||
set: (val) => emit('update:modelValue', val),
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@use '@/assets/css/form-layout';
|
||||
</style>
|
||||
@@ -190,16 +190,6 @@ export function formToStoreVisitor(form: VisitorFormData): VisitorDefinition {
|
||||
block.bindPort = form.bindPort
|
||||
}
|
||||
|
||||
if (
|
||||
form.pluginType === 'virtual_net' &&
|
||||
(form.type === 'stcp' || form.type === 'xtcp')
|
||||
) {
|
||||
block.plugin = {
|
||||
type: 'virtual_net',
|
||||
destinationIP: form.pluginDestinationIP.trim(),
|
||||
}
|
||||
}
|
||||
|
||||
if (form.type === 'xtcp') {
|
||||
if (form.protocol && form.protocol !== 'quic') {
|
||||
block.protocol = form.protocol
|
||||
@@ -458,15 +448,6 @@ export function storeVisitorToForm(
|
||||
form.bindAddr = c.bindAddr || '127.0.0.1'
|
||||
form.bindPort = c.bindPort
|
||||
|
||||
// Visitor plugin (only supported by stcp/xtcp; sudp runtime never uses it)
|
||||
if (
|
||||
c.plugin?.type === 'virtual_net' &&
|
||||
(form.type === 'stcp' || form.type === 'xtcp')
|
||||
) {
|
||||
form.pluginType = 'virtual_net'
|
||||
form.pluginDestinationIP = c.plugin.destinationIP || ''
|
||||
}
|
||||
|
||||
// XTCP specific
|
||||
form.protocol = c.protocol || 'quic'
|
||||
form.keepTunnelOpen = c.keepTunnelOpen || false
|
||||
|
||||
@@ -79,10 +79,6 @@ export interface VisitorFormData {
|
||||
bindAddr: string
|
||||
bindPort: number | undefined
|
||||
|
||||
// Visitor plugin
|
||||
pluginType: '' | 'virtual_net'
|
||||
pluginDestinationIP: string
|
||||
|
||||
// XTCP specific (XTCPVisitorConfig)
|
||||
protocol: string
|
||||
keepTunnelOpen: boolean
|
||||
@@ -160,9 +156,6 @@ export function createDefaultVisitorForm(): VisitorFormData {
|
||||
bindAddr: '127.0.0.1',
|
||||
bindPort: undefined,
|
||||
|
||||
pluginType: '',
|
||||
pluginDestinationIP: '',
|
||||
|
||||
protocol: 'quic',
|
||||
keepTunnelOpen: false,
|
||||
maxRetriesAnHour: undefined,
|
||||
|
||||
@@ -107,22 +107,6 @@ const formRules: FormRules = {
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
pluginDestinationIP: [
|
||||
{
|
||||
validator: (_rule, value, callback) => {
|
||||
if (
|
||||
form.value.pluginType === 'virtual_net' &&
|
||||
(form.value.type === 'stcp' || form.value.type === 'xtcp') &&
|
||||
!value?.trim()
|
||||
) {
|
||||
callback(new Error('Destination IP is required for virtual_net'))
|
||||
return
|
||||
}
|
||||
callback()
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
const goBack = () => {
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
import { defineComponent } from 'vue'
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { mount } from '@vue/test-utils'
|
||||
import ConfigField from '../src/components/ConfigField.vue'
|
||||
|
||||
const InputStub = defineComponent({
|
||||
props: ['modelValue', 'disabled', 'placeholder', 'type'],
|
||||
emits: ['update:modelValue'],
|
||||
template:
|
||||
'<input :value="modelValue ?? \'\'" :disabled="disabled" :placeholder="placeholder" :type="type === \'password\' ? \'password\' : \'text\'" @input="$emit(\'update:modelValue\', $event.target.value)" />',
|
||||
})
|
||||
|
||||
const FormItemStub = defineComponent({
|
||||
template: '<div class="form-item-stub"><slot /></div>',
|
||||
})
|
||||
|
||||
const stubs = {
|
||||
'el-form-item': FormItemStub,
|
||||
'el-input': InputStub,
|
||||
'el-switch': defineComponent({
|
||||
props: ['modelValue', 'disabled'],
|
||||
emits: ['update:modelValue'],
|
||||
template: '<button :disabled="disabled" @click="$emit(\'update:modelValue\', !modelValue)">switch</button>',
|
||||
}),
|
||||
KeyValueEditor: defineComponent({ template: '<div class="key-value-stub" />' }),
|
||||
StringListEditor: defineComponent({ template: '<div class="string-list-stub" />' }),
|
||||
PopoverMenu: defineComponent({ template: '<div class="popover-stub"><slot /></div>' }),
|
||||
PopoverMenuItem: defineComponent({ template: '<div><slot /></div>' }),
|
||||
}
|
||||
|
||||
describe('ConfigField', () => {
|
||||
it('clamps numeric input and emits the public model update', async () => {
|
||||
const wrapper = mount(ConfigField, {
|
||||
props: { label: 'Port', type: 'number', modelValue: 100, min: 1, max: 65535 },
|
||||
global: { stubs },
|
||||
})
|
||||
|
||||
const input = wrapper.find('input')
|
||||
await input.setValue('70000')
|
||||
|
||||
expect(wrapper.emitted('update:modelValue')).toContainEqual([65535])
|
||||
expect((input.element as HTMLInputElement).value).toBe('65535')
|
||||
})
|
||||
|
||||
it('keeps a leading sign as an editable draft until it becomes numeric', async () => {
|
||||
const wrapper = mount(ConfigField, {
|
||||
props: { label: 'Port', type: 'number', modelValue: 100 },
|
||||
global: { stubs },
|
||||
})
|
||||
|
||||
const input = wrapper.find('input')
|
||||
await wrapper.setProps({ modelValue: 200 })
|
||||
expect((input.element as HTMLInputElement).value).toBe('200')
|
||||
|
||||
await input.setValue('-')
|
||||
|
||||
expect(wrapper.emitted('update:modelValue')).toContainEqual([undefined])
|
||||
await wrapper.setProps({ modelValue: undefined })
|
||||
expect((input.element as HTMLInputElement).value).toBe('-')
|
||||
})
|
||||
|
||||
it('renders an empty readonly field as a disabled placeholder', () => {
|
||||
const wrapper = mount(ConfigField, {
|
||||
props: { label: 'Secret', readonly: true, modelValue: '' },
|
||||
global: { stubs },
|
||||
})
|
||||
|
||||
const input = wrapper.find('input').element as HTMLInputElement
|
||||
expect(wrapper.find('.config-field-label').text()).toBe('Secret')
|
||||
expect(input.disabled).toBe(true)
|
||||
expect(input.value).toBe('—')
|
||||
})
|
||||
})
|
||||
@@ -1,96 +0,0 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import {
|
||||
createDefaultProxyForm,
|
||||
createDefaultVisitorForm,
|
||||
} from '../src/types/proxy-form'
|
||||
import {
|
||||
formToStoreProxy,
|
||||
formToStoreVisitor,
|
||||
storeProxyToForm,
|
||||
} from '../src/types/proxy-converters'
|
||||
|
||||
describe('proxy converters', () => {
|
||||
it('serializes only configured proxy fields into the typed store block', () => {
|
||||
const form = createDefaultProxyForm()
|
||||
Object.assign(form, {
|
||||
name: 'web',
|
||||
type: 'http',
|
||||
enabled: false,
|
||||
localIP: '10.0.0.8',
|
||||
localPort: 8080,
|
||||
useEncryption: true,
|
||||
customDomains: ['example.com', ''],
|
||||
locations: ['/api', ''],
|
||||
metadatas: [{ key: 'team', value: 'edge' }],
|
||||
})
|
||||
|
||||
expect(formToStoreProxy(form)).toEqual({
|
||||
name: 'web',
|
||||
type: 'http',
|
||||
http: {
|
||||
enabled: false,
|
||||
localIP: '10.0.0.8',
|
||||
localPort: 8080,
|
||||
transport: { useEncryption: true },
|
||||
metadatas: { team: 'edge' },
|
||||
customDomains: ['example.com'],
|
||||
locations: ['/api'],
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
it('round-trips store values while applying form defaults', () => {
|
||||
const form = storeProxyToForm({
|
||||
name: 'tcp-proxy',
|
||||
type: 'tcp',
|
||||
tcp: {
|
||||
localPort: 9000,
|
||||
customDomains: 'unused-for-tcp',
|
||||
enabled: false,
|
||||
metadatas: { owner: 'platform' },
|
||||
},
|
||||
})
|
||||
|
||||
expect(form).toMatchObject({
|
||||
name: 'tcp-proxy',
|
||||
type: 'tcp',
|
||||
enabled: false,
|
||||
localIP: '127.0.0.1',
|
||||
localPort: 9000,
|
||||
metadatas: [{ key: 'owner', value: 'platform' }],
|
||||
multiplexer: 'httpconnect',
|
||||
})
|
||||
})
|
||||
|
||||
it.each(['stcp', 'xtcp'] as const)(
|
||||
'serializes virtual_net for %s visitors',
|
||||
(type) => {
|
||||
const form = createDefaultVisitorForm()
|
||||
Object.assign(form, {
|
||||
name: 'visitor',
|
||||
type,
|
||||
pluginType: 'virtual_net',
|
||||
pluginDestinationIP: ' 192.0.2.10 ',
|
||||
bindPort: 6000,
|
||||
})
|
||||
|
||||
expect(formToStoreVisitor(form)[type]).toMatchObject({
|
||||
plugin: { type: 'virtual_net', destinationIP: '192.0.2.10' },
|
||||
bindPort: 6000,
|
||||
})
|
||||
},
|
||||
)
|
||||
|
||||
it('does not serialize virtual_net for SUDP visitors', () => {
|
||||
const form = createDefaultVisitorForm()
|
||||
Object.assign(form, {
|
||||
name: 'visitor',
|
||||
type: 'sudp',
|
||||
pluginType: 'virtual_net',
|
||||
pluginDestinationIP: '192.0.2.10',
|
||||
bindPort: 6000,
|
||||
})
|
||||
|
||||
expect(formToStoreVisitor(form).sudp).toEqual({ bindPort: 6000 })
|
||||
})
|
||||
})
|
||||
@@ -6,5 +6,5 @@
|
||||
"moduleResolution": "bundler",
|
||||
"allowSyntheticDefaultImports": true
|
||||
},
|
||||
"include": ["vite.config.mts"]
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
|
||||
@@ -28,10 +28,15 @@ export default defineConfig({
|
||||
'@shared': fileURLToPath(new URL('../shared', import.meta.url)),
|
||||
},
|
||||
dedupe: ['vue', 'element-plus', '@element-plus/icons-vue'],
|
||||
modules: [
|
||||
fileURLToPath(new URL('../node_modules', import.meta.url)),
|
||||
'node_modules',
|
||||
],
|
||||
},
|
||||
css: {
|
||||
preprocessorOptions: {
|
||||
scss: {
|
||||
api: 'modern',
|
||||
additionalData: `@use "@shared/css/_index.scss" as *;`,
|
||||
},
|
||||
},
|
||||
|
||||
1
web/frps/auto-imports.d.ts
vendored
1
web/frps/auto-imports.d.ts
vendored
@@ -3,7 +3,6 @@
|
||||
// @ts-nocheck
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
// Generated by unplugin-auto-import
|
||||
// biome-ignore lint: disable
|
||||
export {}
|
||||
declare global {
|
||||
|
||||
|
||||
8
web/frps/components.d.ts
vendored
8
web/frps/components.d.ts
vendored
@@ -1,14 +1,10 @@
|
||||
/* eslint-disable */
|
||||
/* prettier-ignore */
|
||||
// @ts-nocheck
|
||||
// biome-ignore lint: disable
|
||||
// oxlint-disable
|
||||
// ------
|
||||
// Generated by unplugin-vue-components
|
||||
// Read more: https://github.com/vuejs/core/pull/3399
|
||||
|
||||
export {}
|
||||
|
||||
/* prettier-ignore */
|
||||
declare module 'vue' {
|
||||
export interface GlobalComponents {
|
||||
ClientCard: typeof import('./src/components/ClientCard.vue')['default']
|
||||
@@ -29,7 +25,7 @@ declare module 'vue' {
|
||||
StatCard: typeof import('./src/components/StatCard.vue')['default']
|
||||
Traffic: typeof import('./src/components/Traffic.vue')['default']
|
||||
}
|
||||
export interface GlobalDirectives {
|
||||
export interface ComponentCustomProperties {
|
||||
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,13 +9,12 @@
|
||||
"preview": "vite preview",
|
||||
"build-only": "vite build",
|
||||
"type-check": "vue-tsc --noEmit",
|
||||
"lint": "eslint . --fix",
|
||||
"lint:check": "eslint ."
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"element-plus": "^2.14.3",
|
||||
"vue": "^3.5.40",
|
||||
"vue-router": "^5.2.0"
|
||||
"element-plus": "^2.13.0",
|
||||
"vue": "^3.5.26",
|
||||
"vue-router": "^4.6.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "24",
|
||||
@@ -23,19 +22,19 @@
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.7.0",
|
||||
"@vue/tsconfig": "^0.8.1",
|
||||
"@vueuse/core": "^14.3.0",
|
||||
"eslint": "^10.8.0",
|
||||
"eslint-plugin-vue": "^10.10.0",
|
||||
"@vueuse/core": "^14.1.0",
|
||||
"eslint": "^9.39.0",
|
||||
"eslint-plugin-vue": "^9.33.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^3.9.6",
|
||||
"sass": "^1.102.0",
|
||||
"terser": "^5.49.0",
|
||||
"prettier": "^3.7.4",
|
||||
"sass": "^1.97.2",
|
||||
"terser": "^5.44.1",
|
||||
"typescript": "^5.9.3",
|
||||
"unplugin-auto-import": "^21.0.0",
|
||||
"unplugin-auto-import": "^0.17.5",
|
||||
"unplugin-element-plus": "^0.11.2",
|
||||
"unplugin-vue-components": "^32.1.0",
|
||||
"unplugin-vue-components": "^0.26.0",
|
||||
"vite": "^7.3.0",
|
||||
"vite-svg-loader": "^5.1.0",
|
||||
"vue-tsc": "^3.3.8"
|
||||
"vue-tsc": "^3.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
import { defineComponent } from 'vue'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import { mount } from '@vue/test-utils'
|
||||
|
||||
const router = vi.hoisted(() => ({ push: vi.fn() }))
|
||||
vi.mock('vue-router', () => ({ useRouter: () => router }))
|
||||
|
||||
import StatCard from '../src/components/StatCard.vue'
|
||||
|
||||
const stubs = {
|
||||
'el-card': defineComponent({
|
||||
template: '<div class="el-card-stub" @click="$emit(\'click\', $event)"><slot /></div>',
|
||||
emits: ['click'],
|
||||
}),
|
||||
'el-icon': defineComponent({ template: '<span class="el-icon-stub"><slot /></span>' }),
|
||||
}
|
||||
|
||||
describe('StatCard', () => {
|
||||
it('shows its content and does not navigate without a destination', async () => {
|
||||
router.push.mockClear()
|
||||
const wrapper = mount(StatCard, {
|
||||
props: { label: 'Clients', value: 3, subtitle: 'active' },
|
||||
global: { stubs },
|
||||
})
|
||||
|
||||
expect(wrapper.find('.stat-value').text()).toBe('3')
|
||||
expect(wrapper.find('.stat-label').text()).toBe('Clients')
|
||||
expect(wrapper.find('.stat-subtitle').text()).toBe('active')
|
||||
expect(wrapper.find('.arrow-icon').exists()).toBe(false)
|
||||
|
||||
await wrapper.find('.stat-card').trigger('click')
|
||||
|
||||
expect(router.push).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('navigates only when a destination is provided', async () => {
|
||||
router.push.mockClear()
|
||||
const wrapper = mount(StatCard, {
|
||||
props: { label: 'Proxies', value: '12', type: 'proxies', to: '/proxies' },
|
||||
global: { stubs },
|
||||
})
|
||||
|
||||
await wrapper.find('.stat-card').trigger('click')
|
||||
|
||||
expect(router.push).toHaveBeenCalledWith('/proxies')
|
||||
expect(wrapper.find('.arrow-icon').exists()).toBe(true)
|
||||
})
|
||||
})
|
||||
@@ -6,5 +6,5 @@
|
||||
"moduleResolution": "bundler",
|
||||
"allowSyntheticDefaultImports": true
|
||||
},
|
||||
"include": ["vite.config.mts"]
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
|
||||
@@ -28,10 +28,15 @@ export default defineConfig({
|
||||
'@shared': fileURLToPath(new URL('../shared', import.meta.url)),
|
||||
},
|
||||
dedupe: ['vue', 'element-plus', '@element-plus/icons-vue'],
|
||||
modules: [
|
||||
fileURLToPath(new URL('../node_modules', import.meta.url)),
|
||||
'node_modules',
|
||||
],
|
||||
},
|
||||
css: {
|
||||
preprocessorOptions: {
|
||||
scss: {
|
||||
api: 'modern',
|
||||
additionalData: `@use "@shared/css/_index.scss" as *;`,
|
||||
},
|
||||
},
|
||||
|
||||
3312
web/package-lock.json
generated
3312
web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,15 +1,5 @@
|
||||
{
|
||||
"name": "frp-web",
|
||||
"private": true,
|
||||
"workspaces": ["shared", "frpc", "frps"],
|
||||
"scripts": {
|
||||
"test:unit": "vitest run",
|
||||
"test:unit:watch": "vitest"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/test-utils": "2.4.11",
|
||||
"jsdom": "29.1.1",
|
||||
"vitest": "4.1.10",
|
||||
"vue": "^3.5.40"
|
||||
}
|
||||
"workspaces": ["shared", "frpc", "frps"]
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { mount } from '@vue/test-utils'
|
||||
import ActionButton from '../components/ActionButton.vue'
|
||||
|
||||
describe('ActionButton', () => {
|
||||
it('emits click events for an enabled button', async () => {
|
||||
const wrapper = mount(ActionButton, { slots: { default: 'Save' } })
|
||||
|
||||
await wrapper.trigger('click')
|
||||
|
||||
expect(wrapper.emitted('click')).toHaveLength(1)
|
||||
expect(wrapper.text()).toBe('Save')
|
||||
})
|
||||
|
||||
it('disables itself and shows loading text while loading', async () => {
|
||||
const wrapper = mount(ActionButton, {
|
||||
props: { loading: true, loadingText: 'Saving...' },
|
||||
slots: { default: 'Save' },
|
||||
})
|
||||
|
||||
await wrapper.trigger('click')
|
||||
|
||||
expect((wrapper.element as HTMLButtonElement).disabled).toBe(true)
|
||||
expect(wrapper.classes()).toContain('is-loading')
|
||||
expect(wrapper.find('.spinner').exists()).toBe(true)
|
||||
expect(wrapper.text()).toBe('Saving...')
|
||||
expect(wrapper.emitted('click')).toBeUndefined()
|
||||
})
|
||||
})
|
||||
@@ -1,25 +0,0 @@
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const capturedFetch = globalThis.fetch
|
||||
|
||||
describe('unit-test environment', () => {
|
||||
it('blocks real network requests before test modules are evaluated', async () => {
|
||||
await expect(capturedFetch('https://example.invalid/')).rejects.toThrow(
|
||||
'Real network requests are disabled in unit tests',
|
||||
)
|
||||
})
|
||||
|
||||
it('allows a test to replace fetch explicitly', async () => {
|
||||
const replacement = vi.fn(async () => new Response('ok'))
|
||||
vi.stubGlobal('fetch', replacement)
|
||||
|
||||
await expect(fetch('/test-endpoint')).resolves.toBeInstanceOf(Response)
|
||||
expect(replacement).toHaveBeenCalledWith('/test-endpoint')
|
||||
})
|
||||
|
||||
it('restores the network guard after a test replacement', async () => {
|
||||
await expect(fetch('/must-remain-isolated')).rejects.toThrow(
|
||||
'Real network requests are disabled in unit tests',
|
||||
)
|
||||
})
|
||||
})
|
||||
@@ -1,25 +0,0 @@
|
||||
import { enableAutoUnmount } from '@vue/test-utils'
|
||||
import { afterAll, afterEach, vi } from 'vitest'
|
||||
|
||||
const originalFetch = globalThis.fetch
|
||||
const blockedFetch = vi.fn(async () => {
|
||||
throw new Error('Real network requests are disabled in unit tests')
|
||||
})
|
||||
|
||||
globalThis.fetch = blockedFetch as typeof fetch
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
vi.unstubAllGlobals()
|
||||
vi.clearAllMocks()
|
||||
globalThis.fetch = blockedFetch as typeof fetch
|
||||
document.body.innerHTML = ''
|
||||
})
|
||||
|
||||
// Vitest runs afterEach hooks in reverse registration order, so wrappers are
|
||||
// unmounted before the cleanup hook above clears the DOM.
|
||||
enableAutoUnmount(afterEach)
|
||||
|
||||
afterAll(() => {
|
||||
globalThis.fetch = originalFetch
|
||||
})
|
||||
@@ -1,40 +0,0 @@
|
||||
import { defineConfig } from 'vitest/config'
|
||||
|
||||
export default defineConfig({
|
||||
test: {
|
||||
projects: [
|
||||
{
|
||||
extends: './frpc/vite.config.mts',
|
||||
root: './frpc',
|
||||
test: {
|
||||
name: 'frpc',
|
||||
environment: 'jsdom',
|
||||
css: true,
|
||||
server: {
|
||||
deps: { inline: ['element-plus', '@element-plus/icons-vue'] },
|
||||
},
|
||||
setupFiles: ['../test/setup.ts'],
|
||||
include: [
|
||||
'../test/**/*.test.ts',
|
||||
'test/**/*.test.ts',
|
||||
'../shared/**/*.test.ts',
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
extends: './frps/vite.config.mts',
|
||||
root: './frps',
|
||||
test: {
|
||||
name: 'frps',
|
||||
environment: 'jsdom',
|
||||
css: true,
|
||||
server: {
|
||||
deps: { inline: ['element-plus', '@element-plus/icons-vue'] },
|
||||
},
|
||||
setupFiles: ['../test/setup.ts'],
|
||||
include: ['test/**/*.test.ts'],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
})
|
||||
Reference in New Issue
Block a user