weiai/linker
1
0
Fork 0
mirror of https://github.com/snltty/linker.git synced 2025-12-19 09:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化更新

Browse Source
This commit is contained in:
snltty
2024-09-05 09:20:19 +08:00
parent 3824e514bb
commit f7f3e8bbdd
8 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/dotnet.yml vendored
View File

@@ -33,11 +33,11 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
with:
tag_name: v1.2.9
release_name: v1.2.9.${{ steps.date.outputs.today }}
tag_name: v1.3.0
release_name: v1.3.0.${{ steps.date.outputs.today }}
draft: false
prerelease: false
body: 1. 选择是否自动同步配置文件
body: "1. 选择是否自动同步配置文件\r\n2. 优化中继\r\n3. 客户端配置文件加密\r\n4. 导出无管理权限的客户端节点配置文件\r\n5. 需要更新服务端\r\n6. 测试中，，请稍等再更新"
- name: upload-win-x86-oss
id: upload-win-x86-oss
uses: tvrcgo/oss-action@v0.1.1
@@ -47,7 +47,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-win-x86.zip
target-path: /downloads/linker/v1.2.9/linker-win-x86.zip
target-path: /downloads/linker/v1.3.0/linker-win-x86.zip
- name: upload-win-x86
id: upload-win-x86
uses: actions/upload-release-asset@master
@@ -67,7 +67,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-win-x64.zip
target-path: /downloads/linker/v1.2.9/linker-win-x64.zip
target-path: /downloads/linker/v1.3.0/linker-win-x64.zip
- name: upload-win-x64
id: upload-win-x64
uses: actions/upload-release-asset@master
@@ -87,7 +87,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-win-arm64.zip
target-path: /downloads/linker/v1.2.9/linker-win-arm64.zip
target-path: /downloads/linker/v1.3.0/linker-win-arm64.zip
- name: upload-win-arm64
id: upload-win-arm64
uses: actions/upload-release-asset@master
@@ -107,7 +107,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-x64.zip
target-path: /downloads/linker/v1.2.9/linker-linux-x64.zip
target-path: /downloads/linker/v1.3.0/linker-linux-x64.zip
- name: upload-linux-x64
id: upload-linux-x64
uses: actions/upload-release-asset@master
@@ -127,7 +127,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-arm.zip
target-path: /downloads/linker/v1.2.9/linker-linux-arm.zip
target-path: /downloads/linker/v1.3.0/linker-linux-arm.zip
- name: upload-linux-arm
id: upload-linux-arm
uses: actions/upload-release-asset@master
@@ -147,7 +147,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-arm64.zip
target-path: /downloads/linker/v1.2.9/linker-linux-arm64.zip
target-path: /downloads/linker/v1.3.0/linker-linux-arm64.zip
- name: upload-linux-arm64
id: upload-linux-arm64
uses: actions/upload-release-asset@master
@@ -167,7 +167,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-musl-x64.zip
target-path: /downloads/linker/v1.2.9/linker-linux-musl-x64.zip
target-path: /downloads/linker/v1.3.0/linker-linux-musl-x64.zip
- name: upload-linux-musl-x64
id: upload-linux-musl-x64
uses: actions/upload-release-asset@master
@@ -187,7 +187,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-musl-arm.zip
target-path: /downloads/linker/v1.2.9/linker-linux-musl-arm.zip
target-path: /downloads/linker/v1.3.0/linker-linux-musl-arm.zip
- name: upload-linux-musl-arm
id: upload-linux-musl-arm
uses: actions/upload-release-asset@master
@@ -207,7 +207,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-linux-musl-arm64.zip
target-path: /downloads/linker/v1.2.9/linker-linux-musl-arm64.zip
target-path: /downloads/linker/v1.3.0/linker-linux-musl-arm64.zip
- name: upload-linux-musl-arm64
id: upload-linux-musl-arm64
uses: actions/upload-release-asset@master
@@ -227,7 +227,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-osx-x64.zip
target-path: /downloads/linker/v1.2.9/linker-osx-x64.zip
target-path: /downloads/linker/v1.3.0/linker-osx-x64.zip
- name: upload-osx-x64
id: upload-osx-x64
uses: actions/upload-release-asset@master
@@ -247,7 +247,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-osx-arm64.zip
target-path: /downloads/linker/v1.2.9/linker-osx-arm64.zip
target-path: /downloads/linker/v1.3.0/linker-osx-arm64.zip
- name: upload-osx-arm64
id: upload-osx-arm64
uses: actions/upload-release-asset@master
@@ -277,7 +277,7 @@ jobs:
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
bucket: ide-qbcode
asset-path: ./public/publish-zip/linker-windows-route.zip
target-path: /downloads/linker/v1.2.9/linker-windows-route.zip
target-path: /downloads/linker/v1.3.0/linker-windows-route.zip
- name: upload-windows-route
id: upload-windows-route
uses: actions/upload-release-asset@master

6
linker.libs/linker.libs.csproj
View File

@@ -14,9 +14,9 @@
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<Version>1.2.9</Version>
<AssemblyVersion>1.2.9</AssemblyVersion>
<FileVersion>1.2.9</FileVersion>
<Version>1.3.0</Version>
<AssemblyVersion>1.3.0</AssemblyVersion>
<FileVersion>1.3.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>

6
linker.tun/linker.tun.csproj
View File

@@ -9,7 +9,7 @@
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<Title>linker tun</Title>
<Version>1.2.9</Version>
<Version>1.3.0</Version>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>linker tun</Description>
@@ -17,8 +17,8 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tun</PackageReleaseNotes>
<AssemblyVersion>1.2.9</AssemblyVersion>
<FileVersion>1.2.9</FileVersion>
<AssemblyVersion>1.3.0</AssemblyVersion>
<FileVersion>1.3.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

6
linker.tunnel/linker.tunnel.csproj
View File

@@ -9,7 +9,7 @@
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<Title>linker tunnel</Title>
<Version>1.2.9</Version>
<Version>1.3.0</Version>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>linker tunnel</Description>
@@ -17,8 +17,8 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
<AssemblyVersion>1.2.9</AssemblyVersion>
<FileVersion>1.2.9</FileVersion>
<AssemblyVersion>1.3.0</AssemblyVersion>
<FileVersion>1.3.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

13
linker/linker.csproj
View File

@@ -17,16 +17,21 @@
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<ServerGarbageCollection>false</ServerGarbageCollection>
<Title>linker</Title>
<Version>1.2.9</Version>
<Version>1.3.0</Version>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>1. 选择是否自动同步配置文件</Description>
<Description>1. 选择是否自动同步配置文件
2. 优化中继
3. 客户端配置文件加密
4. 导出无管理权限的客户端节点配置文件
5. 需要更新服务端
6. 测试中，，请稍等再更新</Description>
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker</PackageReleaseNotes>
<AssemblyVersion>1.2.9</AssemblyVersion>
<FileVersion>1.2.9</FileVersion>
<AssemblyVersion>1.3.0</AssemblyVersion>
<FileVersion>1.3.0</FileVersion>
</PropertyGroup>

31
linker/plugins/relay/RelayTransfer.cs
View File

@@ -181,8 +181,9 @@ namespace linker.plugins.relay
SecretKey = item.SecretKey,
Server = server,
TransactionId = transactionId,
TransportName = $"{transport.Name}|{item.Name}",
SSL = item.SSL
TransportName = transport.Name,
SSL = item.SSL,
ServerName = item.Name
};
LoggerHelper.Instance.Info($"relay to {relayInfo.RemoteMachineId}->{relayInfo.RemoteMachineName} {relayInfo.ToJson()}");
@@ -224,7 +225,9 @@ namespace linker.plugins.relay
try
{
await TestServer(relayInfo);
RelayServerInfo server = running.Data.Relay.Servers.FirstOrDefault(c => c.Name == relayInfo.ServerName) ?? running.Data.Relay.Servers.FirstOrDefault();
relayInfo.Server = NetworkHelper.GetEndPoint(server.Host, 3478);
ITransport _transports = transports.FirstOrDefault(c => c.Name == relayInfo.TransportName);
if (_transports != null)
{
@@ -257,28 +260,6 @@ namespace linker.plugins.relay
}
return false;
}
private async Task TestServer(RelayInfo relayInfo)
{
string[] arr = relayInfo.TransportName.Split('|');
relayInfo.TransportName = arr[0];
try
{
Socket socket = new Socket(relayInfo.Server.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(relayInfo.Server).WaitAsync(TimeSpan.FromMilliseconds(500)).ConfigureAwait(false);
socket.SafeClose();
}
catch (Exception)
{
RelayServerInfo server = null;
if (arr.Length > 1)
{
server = running.Data.Relay.Servers.FirstOrDefault(c => c.Name == arr[1]);
}
server ??= running.Data.Relay.Servers.FirstOrDefault();
relayInfo.Server = NetworkHelper.GetEndPoint(server.Host, 3478);
}
}
/// <summary>
/// 回调

5
linker/plugins/relay/transport/ITransport.cs
View File

@@ -117,5 +117,10 @@ namespace linker.plugins.relay.transport
/// 是否ssl
/// </summary>
public bool SSL { get; set; } = true;
/// <summary>
/// 服务器名
/// </summary>
public string ServerName { get; set; }
}
}

11
version.txt
View File

@@ -1,3 +1,8 @@
v1.2.9
2024-09-04 17:41:53
1. 选择是否自动同步配置文件
v1.3.0
2024-09-05 09:20:19
1. 选择是否自动同步配置文件
2. 优化中继
3. 客户端配置文件加密
4. 导出无管理权限的客户端节点配置文件
5. 需要更新服务端
6. 测试中，，请稍等再更新