Accueil Explorer Aide
Connexion
joker
/
frp
miroir de https://github.com/fatedier/frp/
1
0
Fork 0
Fichiers Tickets 0 Wiki
Parcourir la source

show tcpmux proxies on the frps dashboard (#4152)

fatedier il y a 10 mois
Parent
dd7e2e8473
commit
f3a71bc08f
11 fichiers modifiés avec 113 ajouts et 41 suppressions
Vue séparée Afficher les stats Diff
  1. 4 0
      Release.md
  2. 1 1
      assets/frps/static/index-82-40HIG.js
  3. 1 1
      assets/frps/static/index.html
  4. 2 1
      server/dashboard_api.go
  5. 1 0
      web/frps/components.d.ts
  6. 1 0
      web/frps/src/App.vue
  7. 38 0
      web/frps/src/components/ProxiesTCPMux.vue
  8. 34 36
      web/frps/src/components/ProxyViewExpand.vue
  9. 2 2
      web/frps/src/components/ServerOverview.vue
  10. 6 0
      web/frps/src/router/index.ts
  11. 23 0
      web/frps/src/utils/proxy.ts

+ 4 - 0
Release.md
Voir le fichier 

@@ -1,3 +1,7 @@
 
+### Features
 
+
 
+* Show tcpmux proxies on the frps dashboard.
 
+
 
 ### Fixes
 
 
 * When an HTTP proxy request times out, it returns 504 instead of 404 now.

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
assets/frps/static/index-82-40HIG.js


+ 1 - 1
assets/frps/static/index.html
Voir le fichier 

@@ -4,7 +4,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <title>frps dashboard</title>
 
-  <script type="module" crossorigin src="./index-Q42Pu2_S.js"></script>
 
+  <script type="module" crossorigin src="./index-82-40HIG.js"></script>
 
   <link rel="stylesheet" crossorigin href="./index-rzPDshRD.css">
 
 </head>

+ 2 - 1
server/dashboard_api.go
Voir le fichier 

@@ -146,7 +146,8 @@ type TCPOutConf struct {
 
 type TCPMuxOutConf struct {
 
 	BaseOutConf
 
 	v1.DomainConfig
 
-	Multiplexer string `json:"multiplexer"`
 
+	Multiplexer     string `json:"multiplexer"`
 
+	RouteByHTTPUser string `json:"routeByHTTPUser"`
 
 }
 
 
 type UDPOutConf struct {

+ 1 - 0
web/frps/components.d.ts
Voir le fichier 

@@ -31,6 +31,7 @@ declare module 'vue' {
 
     ProxiesSTCP: typeof import('./src/components/ProxiesSTCP.vue')['default']
 
     ProxiesSUDP: typeof import('./src/components/ProxiesSUDP.vue')['default']
 
     ProxiesTCP: typeof import('./src/components/ProxiesTCP.vue')['default']
 
+    ProxiesTCPMux: typeof import('./src/components/ProxiesTCPMux.vue')['default']
 
     ProxiesUDP: typeof import('./src/components/ProxiesUDP.vue')['default']
 
     ProxyView: typeof import('./src/components/ProxyView.vue')['default']
 
     ProxyViewExpand: typeof import('./src/components/ProxyViewExpand.vue')['default']

+ 1 - 0
web/frps/src/App.vue
Voir le fichier 

@@ -39,6 +39,7 @@
 
               <el-menu-item index="/proxies/udp">UDP</el-menu-item>
 
               <el-menu-item index="/proxies/http">HTTP</el-menu-item>
 
               <el-menu-item index="/proxies/https">HTTPS</el-menu-item>
 
+              <el-menu-item index="/proxies/tcpmux">TCPMUX</el-menu-item>
 
               <el-menu-item index="/proxies/stcp">STCP</el-menu-item>
 
               <el-menu-item index="/proxies/sudp">SUDP</el-menu-item>
 
             </el-sub-menu>

+ 38 - 0
web/frps/src/components/ProxiesTCPMux.vue
Voir le fichier 

@@ -0,0 +1,38 @@
 
+<template>
 
+  <ProxyView :proxies="proxies" proxyType="tcpmux" @refresh="fetchData" />
 
+</template>
 
+
 
+<script setup lang="ts">
 
+import { ref } from 'vue'
 
+import { TCPMuxProxy } from '../utils/proxy.js'
 
+import ProxyView from './ProxyView.vue'
 
+
 
+let proxies = ref<TCPMuxProxy[]>([])
 
+
 
+const fetchData = () => {
 
+  let tcpmuxHTTPConnectPort: number
 
+  let subdomainHost: string
 
+  fetch('../api/serverinfo', { credentials: 'include' })
 
+    .then((res) => {
 
+      return res.json()
 
+    })
 
+    .then((json) => {
 
+      tcpmuxHTTPConnectPort = json.tcpmuxHTTPConnectPort
 
+      subdomainHost = json.subdomainHost
 
+
 
+      fetch('../api/proxy/tcpmux', { credentials: 'include' })
 
+        .then((res) => {
 
+          return res.json()
 
+        })
 
+        .then((json) => {
 
+          proxies.value = []
 
+          for (let proxyStats of json.proxies) {
 
+            proxies.value.push(new TCPMuxProxy(proxyStats, tcpmuxHTTPConnectPort, subdomainHost))
 
+          }
 
+        })
 
+    })
 
+}
 
+fetchData()
 
+</script>
 
+
 
+<style></style>

+ 34 - 36
web/frps/src/components/ProxyViewExpand.vue
Voir le fichier 

@@ -1,9 +1,9 @@
 
 <template>
 
   <el-form
 
     label-position="left"
 
+    label-width="auto"
 
     inline
 
     class="proxy-table-expand"
 
-    v-if="proxyType === 'http' || proxyType === 'https'"
 
   >
 
     <el-form-item label="Name">
 
       <span>{{ row.name }}</span>
 
@@ -11,18 +11,6 @@
 
     <el-form-item label="Type">
 
       <span>{{ row.type }}</span>
 
     </el-form-item>
 
-    <el-form-item label="Domains">
 
-      <span>{{ row.customDomains }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="SubDomain">
 
-      <span>{{ row.subdomain }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="locations">
 
-      <span>{{ row.locations }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="HostRewrite">
 
-      <span>{{ row.hostHeaderRewrite }}</span>
 
-    </el-form-item>
 
     <el-form-item label="Encryption">
 
       <span>{{ row.encryption }}</span>
 
     </el-form-item>
 
@@ -35,30 +23,40 @@
 
     <el-form-item label="Last Close">
 
       <span>{{ row.lastCloseTime }}</span>
 
     </el-form-item>
 
-  </el-form>
 
 
-  <el-form label-position="left" inline class="proxy-table-expand" v-else>
 
-    <el-form-item label="Name">
 
-      <span>{{ row.name }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Type">
 
-      <span>{{ row.type }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Addr">
 
-      <span>{{ row.addr }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Encryption">
 
-      <span>{{ row.encryption }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Compression">
 
-      <span>{{ row.compression }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Last Start">
 
-      <span>{{ row.lastStartTime }}</span>
 
-    </el-form-item>
 
-    <el-form-item label="Last Close">
 
-      <span>{{ row.lastCloseTime }}</span>
 
-    </el-form-item>
 
+    <div v-if="proxyType === 'http' || proxyType === 'https'">
 
+      <el-form-item label="Domains">
 
+        <span>{{ row.customDomains }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="SubDomain">
 
+        <span>{{ row.subdomain }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="locations">
 
+        <span>{{ row.locations }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="HostRewrite">
 
+        <span>{{ row.hostHeaderRewrite }}</span>
 
+      </el-form-item>
 
+    </div>
 
+    <div v-else-if="proxyType === 'tcpmux'">
 
+      <el-form-item label="Multiplexer">
 
+        <span>{{ row.multiplexer }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="RouteByHTTPUser">
 
+        <span>{{ row.routeByHTTPUser }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="Domains">
 
+        <span>{{ row.customDomains }}</span>
 
+      </el-form-item>
 
+      <el-form-item label="SubDomain">
 
+        <span>{{ row.subdomain }}</span>
 
+      </el-form-item>
 
+    </div>
 
+    <div v-else>
 
+      <el-form-item label="Addr">
 
+        <span>{{ row.addr }}</span>
 
+      </el-form-item>
 
+    </div>
 
   </el-form>
 
 
   <div v-if="row.annotations && row.annotations.size > 0">

+ 2 - 2
web/frps/src/components/ServerOverview.vue
Voir le fichier 

@@ -20,10 +20,10 @@
 
             <el-form-item label="QUIC Bind Port" v-if="data.quicBindPort != 0">
 
               <span>{{ data.quicBindPort }}</span>
 
             </el-form-item>
 
-            <el-form-item label="Http Port" v-if="data.vhostHTTPPort != 0">
 
+            <el-form-item label="HTTP Port" v-if="data.vhostHTTPPort != 0">
 
               <span>{{ data.vhostHTTPPort }}</span>
 
             </el-form-item>
 
-            <el-form-item label="Https Port" v-if="data.vhostHTTPSPort != 0">
 
+            <el-form-item label="HTTPS Port" v-if="data.vhostHTTPSPort != 0">
 
               <span>{{ data.vhostHTTPSPort }}</span>
 
             </el-form-item>
 
             <el-form-item

+ 6 - 0
web/frps/src/router/index.ts
Voir le fichier 

@@ -4,6 +4,7 @@ import ProxiesTCP from '../components/ProxiesTCP.vue'
 
 import ProxiesUDP from '../components/ProxiesUDP.vue'
 
 import ProxiesHTTP from '../components/ProxiesHTTP.vue'
 
 import ProxiesHTTPS from '../components/ProxiesHTTPS.vue'
 
+import ProxiesTCPMux from '../components/ProxiesTCPMux.vue'
 
 import ProxiesSTCP from '../components/ProxiesSTCP.vue'
 
 import ProxiesSUDP from '../components/ProxiesSUDP.vue'
 
 
@@ -35,6 +36,11 @@ const router = createRouter({
 
       name: 'ProxiesHTTPS',
 
       component: ProxiesHTTPS,
 
     },
 
+    {
 
+      path: '/proxies/tcpmux',
 
+      name: 'ProxiesTCPMux',
 
+      component: ProxiesTCPMux,
 
+    },
 
     {
 
       path: '/proxies/stcp',
 
       name: 'ProxiesSTCP',

+ 23 - 0
web/frps/src/utils/proxy.ts
Voir le fichier 

@@ -110,6 +110,28 @@ class HTTPSProxy extends BaseProxy {
 
   }
 
 }
 
 
+class TCPMuxProxy extends BaseProxy {
 
+  multiplexer: string
 
+  routeByHTTPUser: string
 
+
 
+  constructor(proxyStats: any, port: number, subdomainHost: string) {
 
+    super(proxyStats)
 
+    this.type = 'tcpmux'
 
+    this.port = port
 
+    this.multiplexer = ''
 
+    this.routeByHTTPUser = ''
 
+
 
+    if (proxyStats.conf) {
 
+      this.customDomains = proxyStats.conf.customDomains || this.customDomains
 
+      this.multiplexer = proxyStats.conf.multiplexer
 
+      this.routeByHTTPUser = proxyStats.conf.routeByHTTPUser
 
+      if (proxyStats.conf.subdomain) {
 
+        this.subdomain = `${proxyStats.conf.subdomain}.${subdomainHost}`
 
+      }
 
+    } 
+  }
 
+}
 
+
 
 class STCPProxy extends BaseProxy {
 
   constructor(proxyStats: any) {
 
     super(proxyStats)
 
@@ -128,6 +150,7 @@ export {
 
   BaseProxy,
 
   TCPProxy,
 
   UDPProxy,
 
+  TCPMuxProxy,
 
   HTTPProxy,
 
   HTTPSProxy,
 
   STCPProxy,

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff