删除穿透异常

README.md

@@ -39,6 +39,7 @@
 - [x] 流量统计，统计服务器`信标`、`中继`、`内网穿透` 的流量情况
 - [x] 网络配置，主客户端设置网络，所有客户端自动分配IP
 - [ ] 分布式，中继，内网穿透分布式，可实现负载均衡
+- [x] socks5代理，端口转发需要指定端口，而socks5代理可以代理所有端口
 
 
 ## 界面预览

linker.doc.web/docs/1、首页.md

@@ -21,6 +21,7 @@ sidebar_position: 1
 - [x] 流量统计，统计服务器`信标`、`中继`、`内网穿透` 的流量情况
 - [x] 网络配置，主客户端设置网络，所有客户端自动分配IP
 - [ ] 分布式，中继，内网穿透分布式，可实现负载均衡
+- [x] socks5代理，端口转发需要指定端口，而socks5代理可以代理所有端口
 
 
 #### 1.2、加入组织

linker.doc.web/docs/4、通信功能/3.2、端口转发.md

@@ -13,7 +13,7 @@ sidebar_position: 6
 ## 1、配置端口转发
 
 :::tip[说明]
-1. 在 **非本机** 设备上配置
+1. 当你拥有配置权限时，你可以配置任意一台设备的端口转发
 2. 关闭状态时，可双击栏目修改
 3. 当 **监听端口** 为 **0** 时，启动，会随机本地端口
 3. **目标服务**为目标设备上的服务，可以是目标设备本机的服务，也可以是目标设备局域网内的服务

linker.doc.web/docs/4、通信功能/3.3、socks5代理.md

@@ -0,0 +1,22 @@
+---
+sidebar_position: 7
+---
+
+# 3.3、socks5代理
+
+:::tip[说明]
+
+1. 相比于端口转发，socks5代理不需要指定端口，但是需要指定IP
+2. socks5代理仅支持 TCP+UDP
+:::
+
+## 1、配置IP
+
+:::tip[说明]
+1. 访问端启动socks5，被访问端配置IP(被访问端可以不启动socks5)
+2. 配置IP与虚拟网卡相似，目标端配置被访问的IP，让linker知道，当从socks5访问某个IP时，应该通过隧道转发到那个客户端
+3. 配置好后，你可以使用编程的方式通过socks5 去连接对端的`192.168.1.35/24`设备，或者配置系统代理
+
+![Docusaurus Plushie](./img/socks51.png)
+![Docusaurus Plushie](./img/socks52.png)
+:::

linker.doc.web/docs/4、通信功能/3.4、服务器穿透.md

@@ -1,8 +1,8 @@
 ---
-sidebar_position: 7
+sidebar_position: 8
 ---
 
-# 3.3、服务器穿透
+# 3.4、服务器穿透
 
 :::tip[说明]
 
@@ -23,7 +23,7 @@ sidebar_position: 7
 
 ## 2、配置端口转发
 :::tip[说明]
-1. 在`本机`，`端口转发`上配置
+1. 当你拥有管理权限时，你可以管理任意一台设备的内网穿透映射
 2. 使用`WebPort`时，需要使用域名，比如我使用了`aaa.linker.snltty.com`，我已经将`*.linker.snltty.com`泛解析到我的服务器，那么通过`aaa.linker.snltty.com:8080`即可访问到我本机的`127.0.0.1:80`
 3. 使用`TunnelPortRange`时，需要使用端口，比如我使用了`12345`，那么通过`服务器域名:12345`或者`服务器IP:12345`都可以访问到我本机的`127.0.0.1:80`
 

linker.tray.win/default.aproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="linker.tray.win" libEmbed="true" icon="..\linker\favicon.ico" ui="win" output="linker.tray.win.exe" CompanyName="snltty" FileDescription="linker.tray.win" LegalCopyright="Copyright (C) snltty 2024" ProductName="linker.tray.win" InternalName="linker.install.win" FileVersion="0.0.0.145" ProductVersion="0.0.0.145" publishDir="/dist/" dstrip="false" local="false" ignored="false">
+<project ver="10" name="linker.tray.win" libEmbed="true" icon="..\linker\favicon.ico" ui="win" output="linker.tray.win.exe" CompanyName="snltty" FileDescription="linker.tray.win" LegalCopyright="Copyright (C) snltty 2024" ProductName="linker.tray.win" InternalName="linker.install.win" FileVersion="0.0.0.146" ProductVersion="0.0.0.146" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
 	<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
 		<file name="favicon.ico" path="res\favicon.ico" comment="res\favicon.ico"/>

linker.tray.win/web/css/330.b95319de.css

@@ -1 +1 @@
-.dropdown[data-v-3647de7a]{border:1px solid #ddd;padding:.4rem;font-size:1.3rem;border-radius:.4rem;position:relative}.dropdown .el-icon[data-v-3647de7a]{vertical-align:middle}.dropdown .badge[data-v-3647de7a]{position:absolute;right:-1rem;top:-50%;border-radius:10px;background-color:#f1ae05;color:#fff;padding:.2rem .6rem;font-size:1.2rem}a[data-v-7f8b7c63]{color:#666;text-decoration:underline}a.green[data-v-7f8b7c63]{color:green;font-weight:700}a.download[data-v-7f8b7c63]{margin-left:.6rem}a.download .el-icon[data-v-7f8b7c63]{vertical-align:middle;font-weight:700;margin-left:.3rem}a.download .el-icon.loading[data-v-7f8b7c63]{animation:loading-7f8b7c63 1s linear infinite}@keyframes loading-7f8b7c63{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-fb198804]{color:#666;text-decoration:underline}a.green[data-v-fb198804]{color:green;font-weight:700}img.system[data-v-fb198804]{height:1.6rem;vertical-align:middle;margin-right:.4rem}.ipaddress span[data-v-75cf840d]{vertical-align:middle}.el-input[data-v-75cf840d]{width:12rem;margin-right:.6rem}.el-col[data-v-5d52ca48]{text-align:left}.el-icon.loading[data-v-60496016],a.loading[data-v-60496016]{vertical-align:middle;font-weight:700;animation:loading-60496016 1s linear infinite}.el-switch.is-disabled[data-v-60496016]{opacity:1}.el-input[data-v-60496016]{width:8rem}.gateway[data-v-60496016]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-60496016]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.delay[data-v-60496016]{position:absolute;right:0;bottom:0;line-height:normal}.switch-btn[data-v-60496016]{font-size:1.5rem}@keyframes loading-60496016{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-switch.is-disabled[data-v-50a6970e]{opacity:1}.upgrade-wrap[data-v-50a6970e]{border:1px solid #ddd;margin-bottom:2rem;padding:0 0 1rem 0}.el-switch.is-disabled[data-v-60d5fe5c]{opacity:1}.el-icon.loading[data-v-07cd655e],a.loading[data-v-07cd655e]{vertical-align:middle;font-weight:700;animation:loading-07cd655e 1s linear infinite}.el-switch.is-disabled[data-v-07cd655e]{opacity:1}.el-input[data-v-07cd655e]{width:8rem}.gateway[data-v-07cd655e]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-07cd655e]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.switch-btn[data-v-07cd655e]{font-size:1.5rem}@keyframes loading-07cd655e{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-switch.is-disabled[data-v-5abfef9c]{opacity:1}.upgrade-wrap[data-v-5abfef9c]{border:1px solid #ddd;margin-bottom:2rem;padding:1rem 0 1rem 0}.lan-item[data-v-5abfef9c]{margin-bottom:0}.el-switch.is-disabled[data-v-d457c416]{opacity:1}.green[data-v-d457c416]{font-weight:700}.el-switch.is-disabled[data-v-1f7f67a4]{opacity:1}a[data-v-2977b9ac]{text-decoration:underline;font-weight:700}a+a[data-v-2977b9ac]{margin-left:1rem}.gateway[data-v-2977b9ac]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-2977b9ac]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.head[data-v-15b05a01]{padding-bottom:1rem}.green[data-v-15b05a01]{color:green;font-weight:700}.error[data-v-15b05a01]{font-weight:700}.error .el-icon[data-v-15b05a01]{vertical-align:text-bottom}.head[data-v-583e3c84]{padding-bottom:1rem}.error[data-v-583e3c84]{font-weight:700}.error .el-icon[data-v-583e3c84]{vertical-align:text-bottom}.head[data-v-56e79745]{padding-bottom:1rem}.table-sort.el-table th.el-table__cell.is-leaf{border-bottom:0}.table-sort.el-table .el-table__inner-wrapper:before{height:0}.table-sort th[data-v-8ac55320]{border-bottom:0}.home-list-wrap[data-v-8ac55320]{padding:1rem}.home-list-wrap .page[data-v-8ac55320]{padding-top:1rem}.home-list-wrap .page-wrap[data-v-8ac55320]{display:inline-block}
+.dropdown[data-v-3647de7a]{border:1px solid #ddd;padding:.4rem;font-size:1.3rem;border-radius:.4rem;position:relative}.dropdown .el-icon[data-v-3647de7a]{vertical-align:middle}.dropdown .badge[data-v-3647de7a]{position:absolute;right:-1rem;top:-50%;border-radius:10px;background-color:#f1ae05;color:#fff;padding:.2rem .6rem;font-size:1.2rem}a[data-v-7f8b7c63]{color:#666;text-decoration:underline}a.green[data-v-7f8b7c63]{color:green;font-weight:700}a.download[data-v-7f8b7c63]{margin-left:.6rem}a.download .el-icon[data-v-7f8b7c63]{vertical-align:middle;font-weight:700;margin-left:.3rem}a.download .el-icon.loading[data-v-7f8b7c63]{animation:loading-7f8b7c63 1s linear infinite}@keyframes loading-7f8b7c63{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-fb198804]{color:#666;text-decoration:underline}a.green[data-v-fb198804]{color:green;font-weight:700}img.system[data-v-fb198804]{height:1.6rem;vertical-align:middle;margin-right:.4rem}.ipaddress span[data-v-75cf840d]{vertical-align:middle}.el-input[data-v-75cf840d]{width:12rem;margin-right:.6rem}.el-col[data-v-5d52ca48]{text-align:left}.el-icon.loading[data-v-60496016],a.loading[data-v-60496016]{vertical-align:middle;font-weight:700;animation:loading-60496016 1s linear infinite}.el-switch.is-disabled[data-v-60496016]{opacity:1}.el-input[data-v-60496016]{width:8rem}.gateway[data-v-60496016]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-60496016]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.delay[data-v-60496016]{position:absolute;right:0;bottom:0;line-height:normal}.switch-btn[data-v-60496016]{font-size:1.5rem}@keyframes loading-60496016{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-switch.is-disabled[data-v-50a6970e]{opacity:1}.upgrade-wrap[data-v-50a6970e]{border:1px solid #ddd;margin-bottom:2rem;padding:0 0 1rem 0}.el-switch.is-disabled[data-v-60d5fe5c]{opacity:1}.el-icon.loading[data-v-07cd655e],a.loading[data-v-07cd655e]{vertical-align:middle;font-weight:700;animation:loading-07cd655e 1s linear infinite}.el-switch.is-disabled[data-v-07cd655e]{opacity:1}.el-input[data-v-07cd655e]{width:8rem}.gateway[data-v-07cd655e]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-07cd655e]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.switch-btn[data-v-07cd655e]{font-size:1.5rem}@keyframes loading-07cd655e{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-switch.is-disabled[data-v-5abfef9c]{opacity:1}.upgrade-wrap[data-v-5abfef9c]{border:1px solid #ddd;margin-bottom:2rem;padding:1rem 0 1rem 0}.lan-item[data-v-5abfef9c]{margin-bottom:0}.el-switch.is-disabled[data-v-d457c416]{opacity:1}.green[data-v-d457c416]{font-weight:700}.el-switch.is-disabled[data-v-1f7f67a4]{opacity:1}a[data-v-2977b9ac]{text-decoration:underline;font-weight:700}a+a[data-v-2977b9ac]{margin-left:1rem}.gateway[data-v-2977b9ac]{background:linear-gradient(90deg,#c5b260,#858585,#c5b260,#858585);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.gateway.green[data-v-2977b9ac]{background:linear-gradient(90deg,#e4bb10,green,#e4bb10,green);-webkit-background-clip:text;-webkit-text-fill-color:hsla(0,0%,100%,0)}.head[data-v-15b05a01]{padding-bottom:1rem}.green[data-v-15b05a01]{color:green;font-weight:700}.error[data-v-15b05a01]{font-weight:700}.error .el-icon[data-v-15b05a01]{vertical-align:text-bottom}.head[data-v-219c690c]{padding-bottom:1rem}.error[data-v-219c690c]{font-weight:700}.error .el-icon[data-v-219c690c]{vertical-align:text-bottom}.head[data-v-56e79745]{padding-bottom:1rem}.table-sort.el-table th.el-table__cell.is-leaf{border-bottom:0}.table-sort.el-table .el-table__inner-wrapper:before{height:0}.table-sort th[data-v-8ac55320]{border-bottom:0}.home-list-wrap[data-v-8ac55320]{padding:1rem}.home-list-wrap .page[data-v-8ac55320]{padding-top:1rem}.home-list-wrap .page-wrap[data-v-8ac55320]{display:inline-block}

linker.tray.win/web/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>linker.web</title><script defer="defer" src="/js/chunk-vendors.73d25b9a.js"></script><script defer="defer" src="/js/app.d832742c.js"></script><link href="/css/chunk-vendors.d8267b33.css" rel="stylesheet"><link href="/css/app.acc92c6f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but linker.web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>linker.web</title><script defer="defer" src="/js/chunk-vendors.73d25b9a.js"></script><script defer="defer" src="/js/app.e32612a2.js"></script><link href="/css/chunk-vendors.d8267b33.css" rel="stylesheet"><link href="/css/app.acc92c6f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but linker.web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

linker.web/src/views/full/devices/SForwardEdit.vue

@@ -170,7 +170,7 @@ export default {
             saveRow(row);
         }
         const handleDel = (id) => {
-            removeSForwardInfo(id).then(() => {
+            removeSForwardInfo({machineid:sforward.value.machineid,id:id}).then(() => {
                 _getSForwardInfo();
             })
         }

version.txt

@@ -1,5 +1,5 @@
 v1.5.1
-2024-10-29 09:22:13
+2024-10-29 10:26:21
 1. 优化点对网和网对网的局域网IP，包括禁用IP，和冲突检测
 2. 一些UI优化
 3. 新增socks5代理