feat: https proxy compatible old rtty

Signed-off-by: Jianhui Zhao <[email protected]>
tandatle · Sep 25, 2022 · 58c29ec · 58c29ec
1 parent 1193295
commit 58c29ec
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/api.go b/api.go
@@ -219,6 +219,7 @@ func apiStart(br *broker) {
 			Description string `json:"description"`
 			Bound       bool   `json:"bound"`
 			Online      bool   `json:"online"`
+			Proto       uint8  `json:"proto"`
 		}
 
 		db, err := instanceDB(cfg.DB)
@@ -274,6 +275,7 @@ func apiStart(br *broker) {
 				di.Connected = uint32(time.Now().Unix() - dev.timestamp)
 				di.Uptime = dev.uptime
 				di.Online = true
+				di.Proto = dev.proto
 			}
 
 			devs = append(devs, di)

diff --git a/http.go b/http.go
@@ -78,22 +78,27 @@ type HttpProxyWriter struct {
 	srcAddr           []byte
 	hostHeaderRewrite string
 	br                *broker
-	devid             string
+	dev               *device
 	https             bool
 }
 
 func (rw *HttpProxyWriter) Write(p []byte) (n int, err error) {
-	msg := []byte{0}
+	msg := []byte{}
+	dev := rw.dev
 
-	if rw.https {
-		msg[0] = 1
+	if dev.proto > 3 {
+		if rw.https {
+			msg = append(msg, 1)
+		} else {
+			msg = append(msg, 0)
+		}
 	}
 
 	msg = append(msg, rw.srcAddr...)
 	msg = append(msg, rw.destAddr...)
 	msg = append(msg, p...)
 
-	rw.br.httpReq <- &httpReq{rw.devid, msg}
+	rw.br.httpReq <- &httpReq{dev.id, msg}
 
 	return len(p), nil
 }
@@ -119,7 +124,7 @@ func doHttpProxy(brk *broker, c net.Conn) {
 	}
 	devid := cookie.Value
 
-	_, ok := brk.devices[devid]
+	dev, ok := brk.devices[devid]
 	if !ok {
 		return
 	}
@@ -170,7 +175,7 @@ func doHttpProxy(brk *broker, c net.Conn) {
 		return
 	}
 
-	hpw := &HttpProxyWriter{destAddr, srcAddr, hostHeaderRewrite, brk, devid, https}
+	hpw := &HttpProxyWriter{destAddr, srcAddr, hostHeaderRewrite, brk, dev.(*device), https}
 
 	req.Host = hostHeaderRewrite
 	hpw.WriteRequest(req)

diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
@@ -68,5 +68,6 @@
   "There are no offline devices in selected devices": "There are no offline devices in selected devices",
   "Invalid address": "Invalid address",
   "Already copied to clipboard": "Already copied to clipboard",
-  "Please use shortcut \"Shift+Insert\"": "Please use shortcut \"Shift+Insert\""
+  "Please use shortcut \"Shift+Insert\"": "Please use shortcut \"Shift+Insert\"",
+  "Your device's rtty does not support https proxy, please upgrade it.": "Your device's rtty does not support https proxy, please upgrade it."
 }
diff --git a/ui/src/locales/zh-CN.json b/ui/src/locales/zh-CN.json
@@ -69,5 +69,6 @@
   "There are no offline devices in selected devices": "所选设备中无离线设备",
   "Invalid address": "无效的地址",
   "Already copied to clipboard": "已复制到剪切板",
-  "Please use shortcut \"Shift+Insert\"": "请使用快捷键 \"Shift+Insert\""
+  "Please use shortcut \"Shift+Insert\"": "请使用快捷键 \"Shift+Insert\"",
+  "Your device's rtty does not support https proxy, please upgrade it.": "你的设备的 rtty 不支持 https 代理，请升级"
 }
diff --git a/ui/src/views/Home.vue b/ui/src/views/Home.vue
@@ -32,7 +32,7 @@
           <i class="iconfont icon-shell" style="font-size: 40px; color: black; cursor:pointer;" @click="connectDevice(row.id)"/>
         </Tooltip>
         <Tooltip v-if="row.online" placement="top" :content="$t('Access your devices\'s Web')">
-          <i class="iconfont icon-web" style="font-size: 40px; color: #409EFF; cursor:pointer;" @click="connectDeviceWeb(row.id)"/>
+          <i class="iconfont icon-web" style="font-size: 40px; color: #409EFF; cursor:pointer;" @click="connectDeviceWeb(row)"/>
         </Tooltip>
         <span v-if="!row.online" style="margin-left: 10px; color: red">{{ $t('Device offline') }}</span>
       </template>
@@ -343,7 +343,7 @@ export default {
     connectDevice(devid) {
       window.open('/rtty/' + devid);
     },
-    connectDeviceWeb(devid) {
+    connectDeviceWeb(dev) {
       let addr = '127.0.0.1';
 
       this.$Modal.confirm({
@@ -377,6 +377,11 @@ export default {
             proto = 'https';
           }
 
+          if (dev.proto < 4 && proto === 'https') {
+            this.$Message.error(this.$t('Your device\'s rtty does not support https proxy, please upgrade it.'));
+            return;
+          }
+
           let [addrs, ...path] = addr.split('/');
 
           path = '/' + path.join('/');
@@ -406,7 +411,7 @@ export default {
           }
 
           addr = encodeURIComponent(`${ip}:${port}${path}`);
-          window.open(`/web/${devid}/${proto}/${addr}`);
+          window.open(`/web/${dev.id}/${proto}/${addr}`);
         }
       });
     },