Home Explore Help
Sign In
joker
/
frp
mirror of https://github.com/fatedier/frp/
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

web: support sudp in dashboard (#2385)

fatedier 3 years ago
parent
0d84da91d4
commit
630dad50ed
15 changed files with 164 additions and 42 deletions
Split View Show Diff Stats
  1. 1 1
      assets/frpc/static/index.html
  2. 1 1
      assets/frpc/static/manifest.js
  3. 0 0
      assets/frpc/static/vendor.js
  4. 0 0
      assets/frpc/statik/statik.go
  5. 1 1
      assets/frps/static/index.html
  6. 1 1
      assets/frps/static/manifest.js
  7. 0 0
      assets/frps/static/vendor.js
  8. 0 0
      assets/frps/statik/statik.go
  9. 3 0
      web/frpc/src/components/Overview.vue
  10. 1 0
      web/frps/src/App.vue
  11. 3 0
      web/frps/src/components/Overview.vue
  12. 116 0
      web/frps/src/components/ProxiesSudp.vue
  13. 5 0
      web/frps/src/router/index.js
  14. 24 37
      web/frps/src/utils/chart.js
  15. 8 1
      web/frps/src/utils/proxy.js

+ 1 - 1
assets/frpc/static/index.html
View File 

@@ -1 +1 @@
 
-<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?f30e0e5ff7dbde4611e0"></script><script type="text/javascript" src="vendor.js?a82aed5fb0b844cbdb29"></script></body> </html> 
+<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5a0eb52788515d02ca46"></script><script type="text/javascript" src="vendor.js?3e5221f064f1295497bf"></script></body> </html>

+ 1 - 1
assets/frpc/static/manifest.js
View File 

@@ -1 +1 @@
 
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,u){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=n(n.s=u[l]);return f};var t={},o={1:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var u=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"a82aed5fb0b844cbdb29"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,u.appendChild(i),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
 
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,u,c){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in u)Object.prototype.hasOwnProperty.call(u,i)&&(e[i]=u[i]);for(r&&r(t,u,c);s.length;)s.shift()();if(c)for(l=0;l<c.length;l++)f=n(n.s=c[l]);return f};var t={},o={1:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var u=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=u;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"3e5221f064f1295497bf"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),u},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);

File diff suppressed because it is too large
+ 0 - 0
assets/frpc/static/vendor.js


File diff suppressed because it is too large
+ 0 - 0
assets/frpc/statik/statik.go


+ 1 - 1
assets/frps/static/index.html
View File 

@@ -1 +1 @@
 
-<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frps dashboard</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?782d7b1b910e824ac986"></script><script type="text/javascript" src="vendor.js?7f899297af075fb3b085"></script></body> </html> 
+<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frps dashboard</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?41dbccdbc87e6bcbd79c"></script><script type="text/javascript" src="vendor.js?d7109b07f8f86bab2eeb"></script></body> </html>

+ 1 - 1
assets/frps/static/manifest.js
View File 

@@ -1 +1 @@
 
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,u,c){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in u)Object.prototype.hasOwnProperty.call(u,i)&&(e[i]=u[i]);for(r&&r(t,u,c);s.length;)s.shift()();if(c)for(l=0;l<c.length;l++)f=n(n.s=c[l]);return f};var t={},o={1:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var u=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=u;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"7f899297af075fb3b085"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),u},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
 
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,u,c){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in u)Object.prototype.hasOwnProperty.call(u,i)&&(e[i]=u[i]);for(r&&r(t,u,c);s.length;)s.shift()();if(c)for(l=0;l<c.length;l++)f=n(n.s=c[l]);return f};var t={},o={1:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var u=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=u;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"d7109b07f8f86bab2eeb"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),u},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);

File diff suppressed because it is too large
+ 0 - 0
assets/frps/static/vendor.js


File diff suppressed because it is too large
+ 0 - 0
assets/frps/statik/statik.go


+ 3 - 0
web/frpc/src/components/Overview.vue
View File 

@@ -53,6 +53,9 @@
 
                 for (let s of json.stcp) {
 
                     this.status.push(s)
 
                 }
 
+                for (let s of json.sudp) {
 
+                    this.status.push(s)
 
+                }
 
                 for (let s of json.xtcp) {
 
                     this.status.push(s)
 
                 }

+ 1 - 0
web/frps/src/App.vue
View File 

@@ -17,6 +17,7 @@
 
                             <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/stcp">STCP</el-menu-item>
 
+                            <el-menu-item index="/proxies/sudp">SUDP</el-menu-item>
 
                         </el-submenu>
 
                         <el-menu-item index="">Help</el-menu-item>
 
                     </el-menu>

+ 3 - 0
web/frps/src/components/Overview.vue
View File 

@@ -122,6 +122,9 @@
 
                     if (json.proxy_type_count.stcp != null) {
 
                         this.proxy_counts += json.proxy_type_count.stcp
 
                     }
 
+                    if (json.proxy_type_count.sudp != null) {
 
+                        this.proxy_counts += json.proxy_type_count.sudp
 
+                    }
 
                     if (json.proxy_type_count.xtcp != null) {
 
                         this.proxy_counts += json.proxy_type_count.xtcp
 
                     }

+ 116 - 0
web/frps/src/components/ProxiesSudp.vue
View File 

@@ -0,0 +1,116 @@
 
+<template>
 
+  <div>
 
+    <el-table :data="proxies" :default-sort="{prop: 'name', order: 'ascending'}" style="width: 100%">
 
+      <el-table-column type="expand">
 
+        <template slot-scope="props">
 
+          <el-popover
 
+            ref="popover4"
 
+            placement="right"
 
+            width="600"
 
+  		  style="margin-left:0px"
 
+            trigger="click">
 
+            <my-traffic-chart :proxy_name="props.row.name"></my-traffic-chart>
 
+          </el-popover>
 
+  
+          <el-button v-popover:popover4 type="primary" size="small" icon="view" :name="props.row.name" style="margin-bottom:10px" @click="fetchData2">Traffic Statistics</el-button>
 
+  
+          <el-form label-position="left" inline class="demo-table-expand">
 
+            <el-form-item label="Name">
 
+              <span>{{ props.row.name }}</span>
 
+            </el-form-item>
 
+            <el-form-item label="Type">
 
+              <span>{{ props.row.type }}</span>
 
+            </el-form-item>
 
+            <el-form-item label="Encryption">
 
+              <span>{{ props.row.encryption }}</span>
 
+            </el-form-item>
 
+            <el-form-item label="Compression">
 
+              <span>{{ props.row.compression }}</span>
 
+            </el-form-item>
 
+            <el-form-item label="Last Start">
 
+              <span>{{ props.row.last_start_time }}</span>
 
+            </el-form-item>
 
+            <el-form-item label="Last Close">
 
+              <span>{{ props.row.last_close_time }}</span>
 
+            </el-form-item>
 
+        </el-form>
 
+        </template>
 
+    </el-table-column>
 
+    <el-table-column
 
+      label="Name"
 
+      prop="name"
 
+      sortable>
 
+    </el-table-column>
 
+    <el-table-column
 
+      label="Connections"
 
+      prop="conns"
 
+      sortable>
 
+    </el-table-column>
 
+    <el-table-column
 
+      label="Traffic In"
 
+      prop="traffic_in"
 
+      :formatter="formatTrafficIn"
 
+      sortable>
 
+    </el-table-column>
 
+    <el-table-column
 
+      label="Traffic Out"
 
+      prop="traffic_out"
 
+      :formatter="formatTrafficOut"
 
+      sortable>
 
+    </el-table-column>
 
+    <el-table-column
 
+      label="status"
 
+      prop="status"
 
+      sortable>
 
+      <template slot-scope="scope">
 
+        <el-tag type="success" v-if="scope.row.status === 'online'">{{ scope.row.status }}</el-tag>
 
+        <el-tag type="danger" v-else>{{ scope.row.status }}</el-tag>
 
+      </template>
 
+    </el-table-column>
 
+  </el-table>
 
+</div>
 
+</template>
 
+
 
+<script>
 
+  import Humanize from 'humanize-plus'
 
+  import Traffic from './Traffic.vue'
 
+  import { SudpProxy } from '../utils/proxy.js'
 
+  export default {
 
+    data() {
 
+      return {
 
+        proxies: null
 
+      }
 
+    },
 
+    created() {
 
+      this.fetchData()
 
+    },
 
+    watch: {
 
+      '$route': 'fetchData'
 
+    },
 
+    methods: {
 
+      formatTrafficIn(row, column) {
 
+        return Humanize.fileSize(row.traffic_in)
 
+      },
 
+      formatTrafficOut(row, column) {
 
+        return Humanize.fileSize(row.traffic_out)
 
+      },
 
+      fetchData() {
 
+        fetch('../api/proxy/sudp', {credentials: 'include'})
 
+          .then(res => {
 
+            return res.json()
 
+          }).then(json => {
 
+            this.proxies = new Array()
 
+            for (let proxyStats of json.proxies) {
 
+              this.proxies.push(new SudpProxy(proxyStats))
 
+            }
 
+          })
 
+      }
 
+    },
 
+    components: {
 
+        'my-traffic-chart': Traffic
 
+    }
 
+  }
 
+</script>
 
+
 
+<style>
 
+</style>

+ 5 - 0
web/frps/src/router/index.js
View File 

@@ -6,6 +6,7 @@ import ProxiesUdp from '../components/ProxiesUdp.vue'
 
 import ProxiesHttp from '../components/ProxiesHttp.vue'
 
 import ProxiesHttps from '../components/ProxiesHttps.vue'
 
 import ProxiesStcp from '../components/ProxiesStcp.vue'
 
+import ProxiesSudp from '../components/ProxiesSudp.vue'
 
 
 Vue.use(Router)
 
 
@@ -34,5 +35,9 @@ export default new Router({
 
         path: '/proxies/stcp',
 
         name: 'ProxiesStcp',
 
         component: ProxiesStcp
 
+    }, {
 
+        path: '/proxies/sudp',
 
+        name: 'ProxiesSudp',
 
+        component: ProxiesSudp
 
     }]
 
 })

+ 24 - 37
web/frps/src/utils/chart.js
View File 

@@ -48,24 +48,6 @@ function DrawTrafficChart(elementId, trafficIn, trafficOut) {
 
 }
 
 
 function DrawProxyChart(elementId, serverInfo) {
 
-    if (serverInfo.proxy_type_count.tcp == null) {
 
-        serverInfo.proxy_type_count.tcp = 0
 
-    }
 
-    if (serverInfo.proxy_type_count.udp == null) {
 
-        serverInfo.proxy_type_count.udp = 0
 
-    }
 
-    if (serverInfo.proxy_type_count.http == null) {
 
-        serverInfo.proxy_type_count.http = 0
 
-    }
 
-    if (serverInfo.proxy_type_count.https == null) {
 
-        serverInfo.proxy_type_count.https = 0
 
-    }
 
-    if (serverInfo.proxy_type_count.stcp == null) {
 
-        serverInfo.proxy_type_count.stcp = 0
 
-    }
 
-    if (serverInfo.proxy_type_count.xtcp == null) {
 
-        serverInfo.proxy_type_count.xtcp = 0
 
-    }
 
     let myChart = echarts.init(document.getElementById(elementId), 'macarons')
 
     myChart.showLoading()
 
 
@@ -85,25 +67,7 @@ function DrawProxyChart(elementId, serverInfo) {
 
             type: 'pie',
 
             radius: '55%',
 
             center: ['50%', '60%'],
 
-            data: [{
 
-                value: serverInfo.proxy_type_count.tcp,
 
-                name: 'TCP'
 
-            }, {
 
-                value: serverInfo.proxy_type_count.udp,
 
-                name: 'UDP'
 
-            }, {
 
-                value: serverInfo.proxy_type_count.http,
 
-                name: 'HTTP'
 
-            }, {
 
-                value: serverInfo.proxy_type_count.https,
 
-                name: 'HTTPS'
 
-            }, {
 
-                value: serverInfo.proxy_type_count.stcp,
 
-                name: 'STCP'
 
-            }, {
 
-                value: serverInfo.proxy_type_count.xtcp,
 
-                name: 'XTCP'
 
-            }],
 
+            data: [],
 
             itemStyle: {
 
                 emphasis: {
 
                     shadowBlur: 10,
 
@@ -113,6 +77,29 @@ function DrawProxyChart(elementId, serverInfo) {
 
             }
 
         }]
 
     };
 
+
 
+    if (serverInfo.proxy_type_count.tcp != null && serverInfo.proxy_type_count.tcp != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.tcp, name: 'TCP'})
 
+    }
 
+    if (serverInfo.proxy_type_count.udp != null && serverInfo.proxy_type_count.udp != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.udp, name: 'UDP'})
 
+    }
 
+    if (serverInfo.proxy_type_count.http != null && serverInfo.proxy_type_count.http != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.http, name: 'HTTP'})
 
+    }
 
+    if (serverInfo.proxy_type_count.https != null && serverInfo.proxy_type_count.https != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.https, name: 'HTTPS'})
 
+    }
 
+    if (serverInfo.proxy_type_count.stcp != null && serverInfo.proxy_type_count.stcp != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.stcp, name: 'STCP'})
 
+    }
 
+    if (serverInfo.proxy_type_count.sudp != null && serverInfo.proxy_type_count.sudp != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.sudp, name: 'SUDP'})
 
+    }
 
+    if (serverInfo.proxy_type_count.xtcp != null && serverInfo.proxy_type_count.xtcp != 0) {
 
+        option.series[0].data.push({value: serverInfo.proxy_type_count.xtcp, name: 'XTCP'})
 
+    }
 
+
 
     myChart.setOption(option);
 
     myChart.hideLoading()
 
 }

+ 8 - 1
web/frps/src/utils/proxy.js
View File 

@@ -94,4 +94,11 @@ class StcpProxy extends BaseProxy {
 
     }
 
 }
 
 
-export {BaseProxy, TcpProxy, UdpProxy, HttpProxy, HttpsProxy, StcpProxy}
 
+class SudpProxy extends BaseProxy {
 
+    constructor(proxyStats) {
 
+        super(proxyStats)
 
+        this.type = "sudp"
 
+    }
 
+}
 
+
 
+export {BaseProxy, TcpProxy, UdpProxy, HttpProxy, HttpsProxy, StcpProxy, SudpProxy}

Some files were not shown because too many files changed in this diff