fix relayUDP

Author: icymind

src/renderer/components/Manage.vue

@@ -167,6 +167,8 @@ export default {
         // 这些值需要手动维护
         enableTunnelDns: false,
         isTunnelDnsRunning: false,
+        enableRelayUDP: false,
+        isRelayUDPRunning: false,
         enableSs: false,
         isSsRunning: false,
         enableSsr: false,
@@ -235,6 +237,9 @@ export default {
     getProxiesInfo: async function () {
       const proxiesInfo = this.vrouter.config.proxiesInfo
 
+      this.proxiesInfo.enableRelayUDP = this.activedProfile.enableRelayUDP
+      this.proxiesInfo.isRelayUDPRunning = await this.vrouter.isRelayUDPRunning(this.activedProfile.proxies, proxiesInfo)
+
       this.proxiesInfo.enableTunnelDns = this.activedProfile.enableTunnelDns
       this.proxiesInfo.isTunnelDnsRunning = await this.vrouter.isTunnelDnsRunning(this.activedProfile.proxies, proxiesInfo)
 

src/renderer/components/Manage/ProfileEditor/ProxiesForm.vue

@@ -35,6 +35,7 @@
       <input type="text"
         v-model="dnsServer"
         :placeholder="enableTunnelDns.length !== 0 ? '8.8.8.8:53' : '127.0.0.1'"
+        vee-validate="'required'"
       >
       <div class="ui checkbox">
         <input type="checkbox" value="enableTunnelDns" v-model="enableTunnelDns">
@@ -60,9 +61,14 @@
 import SsForm from './ProxiesForm/SsForm'
 import SsrForm from './ProxiesForm/SsrForm'
 import KtForm from './ProxiesForm/KtForm'
+import Vue from 'vue'
+import VeeValidate from 'vee-validate'
+Vue.use(VeeValidate, { inject: false })
+
 export default {
   name: 'proxies-form',
   props: ['editingClone'],
+  inject: ['$validator'],
   components: {
     SsForm,
     SsrForm,

src/renderer/components/Manage/SystemTab.vue

@@ -99,6 +99,11 @@ export default {
               value: this.proxiesInfo.enableTunnelDns ? (this.proxiesInfo.isTunnelDnsRunning ? '运行中' : '已停止') : '未启用',
               icon: this.proxiesInfo.enableTunnelDns ? (this.proxiesInfo.isTunnelDnsRunning ? 'check teal' : 'minus red') : 'toggle off'
             },
+            {
+              label: '转发 UDP 流量',
+              value: this.proxiesInfo.enableRelayUDP ? (this.proxiesInfo.isRelayUDPRunning ? '运行中' : '已停止') : '未启用',
+              icon: this.proxiesInfo.enableRelayUDP ? (this.proxiesInfo.isRelayUDPRunning ? 'check teal' : 'minus red') : 'toggle off'
+            },
             {
               label: 'Shadowsocks 进程',
               value: this.proxiesInfo.enableSs ? (this.proxiesInfo.isSsRunning ? '运行中' : '已停止') : '未启用',

src/renderer/lib/generator.js

@@ -124,7 +124,7 @@ async function getTunnelDnsCfgFrom (profile, proxiesInfo) {
   }
   cfg.local_port = proxiesInfo.tunnelDns.localPort
   cfg.mode = 'udp_only'
-  cfg.tunnel_address = profile.dnsServer
+  cfg.tunnel_address = profile.dnsServer || '8.8.8.8:53'
   return cfg
 }
 async function getKtCfgFrom (profile, proxiesInfo) {

src/renderer/lib/openwrt.js

@@ -247,6 +247,13 @@ class Openwrt {
     return output.trim() !== ''
   }
 
+  async isRelayUDPRunning (proxies, proxiesInfo) {
+    const type = /ssr/ig.test(proxies) ? 'shadowsocksr' : 'shadowsocks'
+    const cmd = `ps -w| grep "${proxiesInfo.relayUDP.binName[type]} -[c] .*${proxiesInfo.relayUDP.cfgName}"`
+    const output = await this.execute(cmd)
+    return output.trim() !== ''
+  }
+
   // kcptun
   async installKt (targzFPath) {
     const src = path.join(os.tmpdir(), path.basename(targzFPath))