diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 22ba253f..85362de8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -57,9 +57,9 @@ jobs: docker tag snltty/linker-musl-x64:latest snltty/linker-musl:amd64 && \ docker push snltty/linker-musl:amd64 && \ docker manifest create snltty/linker-musl:latest snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \ - docker manifest create snltty/linker-musl:v1.8.3 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \ + docker manifest create snltty/linker-musl:v1.8.4 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \ docker manifest push snltty/linker-musl:latest && \ - docker manifest push snltty/linker-musl:v1.8.3 && \ + docker manifest push snltty/linker-musl:v1.8.4 && \ docker pull --platform linux/arm/v7 snltty/linker-debian-arm:latest && \ docker tag snltty/linker-debian-arm:latest snltty/linker-debian:arm && \ docker push snltty/linker-debian:arm && \ @@ -70,9 +70,9 @@ jobs: docker tag snltty/linker-debian-x64:latest snltty/linker-debian:amd64 && \ docker push snltty/linker-debian:amd64 && \ docker manifest create snltty/linker-debian:latest snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \ - docker manifest create snltty/linker-debian:v1.8.3 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \ + docker manifest create snltty/linker-debian:v1.8.4 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \ docker manifest push snltty/linker-debian:latest && \ - docker manifest push snltty/linker-debian:v1.8.3 && \ + docker manifest push snltty/linker-debian:v1.8.4 && \ docker pull --platform linux/arm/v7 snltty/linker-kvm-arm:latest && \ docker tag snltty/linker-kvm-arm:latest snltty/linker-kvm:arm && \ docker push snltty/linker-kvm:arm && \ @@ -83,6 +83,6 @@ jobs: docker tag snltty/linker-kvm-x64:latest snltty/linker-kvm:amd64 && \ docker push snltty/linker-kvm:amd64 && \ docker manifest create snltty/linker-kvm:latest snltty/linker-kvm:amd64 snltty/linker-kvm:arm64 snltty/linker-kvm:arm && \ - docker manifest create snltty/linker-kvm:v1.8.3 snltty/linker-kvm:amd64 snltty/linker-kvm:arm64 snltty/linker-kvm:arm && \ + docker manifest create snltty/linker-kvm:v1.8.4 snltty/linker-kvm:amd64 snltty/linker-kvm:arm64 snltty/linker-kvm:arm && \ docker manifest push snltty/linker-kvm:latest && \ - docker manifest push snltty/linker-kvm:v1.8.3 \ No newline at end of file + docker manifest push snltty/linker-kvm:v1.8.4 \ No newline at end of file diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a7960fbf..69f48255 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -33,11 +33,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }} with: - tag_name: v1.8.3 - release_name: v1.8.3.${{ steps.date.outputs.today }} + tag_name: v1.8.4 + release_name: v1.8.4.${{ steps.date.outputs.today }} draft: false prerelease: false - body: "1. 一些累计更新\r\n2. 修复socks5，解决CPU爆满问题，增加本地域名解析，支持HTTP代理\r\n3. 优化唤醒模块\r\n4. 优化应用层NAT，根据目标IP自动选择网卡\r\n5. 分离cdkey，使其可作用于任意模块\r\n6. 去掉托盘程序http自托管，统一使用1804" + body: "1. 一些累计更新\r\n2. 优化数据同步，可选择同步到指定客户端\r\n3. 增加选项，客户端自动更新到服务器版本" - name: publish projects run: ./publish.bat "C:\\Android\\android-sdk" - name: upload-win-x86-oss @@ -49,7 +49,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.8.3/linker-win-x86.zip + target-path: /downloads/linker/v1.8.4/linker-win-x86.zip - name: upload-win-x86 id: upload-win-x86 uses: actions/upload-release-asset@master @@ -69,7 +69,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.8.3/linker-win-x64.zip + target-path: /downloads/linker/v1.8.4/linker-win-x64.zip - name: upload-win-x64 id: upload-win-x64 uses: actions/upload-release-asset@master @@ -89,7 +89,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.8.3/linker-win-arm64.zip + target-path: /downloads/linker/v1.8.4/linker-win-arm64.zip - name: upload-win-arm64 id: upload-win-arm64 uses: actions/upload-release-asset@master @@ -109,7 +109,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.8.3/linker-linux-x64.zip + target-path: /downloads/linker/v1.8.4/linker-linux-x64.zip - name: upload-linux-x64 id: upload-linux-x64 uses: actions/upload-release-asset@master @@ -129,7 +129,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.8.3/linker-linux-arm.zip + target-path: /downloads/linker/v1.8.4/linker-linux-arm.zip - name: upload-linux-arm id: upload-linux-arm uses: actions/upload-release-asset@master @@ -149,7 +149,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.8.3/linker-linux-arm64.zip + target-path: /downloads/linker/v1.8.4/linker-linux-arm64.zip - name: upload-linux-arm64 id: upload-linux-arm64 uses: actions/upload-release-asset@master @@ -169,7 +169,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.8.3/linker-linux-musl-x64.zip + target-path: /downloads/linker/v1.8.4/linker-linux-musl-x64.zip - name: upload-linux-musl-x64 id: upload-linux-musl-x64 uses: actions/upload-release-asset@master @@ -189,7 +189,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.8.3/linker-linux-musl-arm.zip + target-path: /downloads/linker/v1.8.4/linker-linux-musl-arm.zip - name: upload-linux-musl-arm id: upload-linux-musl-arm uses: actions/upload-release-asset@master @@ -209,7 +209,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.8.3/linker-linux-musl-arm64.zip + target-path: /downloads/linker/v1.8.4/linker-linux-musl-arm64.zip - name: upload-linux-musl-arm64 id: upload-linux-musl-arm64 uses: actions/upload-release-asset@master @@ -220,16 +220,6 @@ jobs: asset_path: ./public/publish-zip/linker-linux-musl-arm64.zip asset_name: linker-linux-musl-arm64.zip asset_content_type: application/zip - - name: upload-version-oss - id: upload-version-oss - uses: tvrcgo/oss-action@v0.1.1 - with: - region: oss-cn-shenzhen - key-id: ${{ secrets.ALIYUN_OSS_ID }} - key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} - bucket: ide-qbcode - asset-path: ./public/version.txt - target-path: /downloads/linker/version.txt - name: upload-install-service-oss id: upload-install-service-oss uses: tvrcgo/oss-action@v0.1.1 @@ -259,7 +249,7 @@ jobs: key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} bucket: ide-qbcode asset-path: ./public/publish-zip/linker.apk - target-path: /downloads/linker/v1.8.3/linker.apk + target-path: /downloads/linker/v1.8.4/linker.apk - name: upload-apk id: upload-apk uses: actions/upload-release-asset@master diff --git a/.github/workflows/ipk.yml b/.github/workflows/ipk.yml index 800e04b0..d0eb92e8 100644 --- a/.github/workflows/ipk.yml +++ b/.github/workflows/ipk.yml @@ -44,7 +44,7 @@ jobs: key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} bucket: ide-qbcode asset-path: ./public/publish-ipk/x64/linker-x64.ipk - target-path: /downloads/linker/v1.8.3/linker-x64.ipk + target-path: /downloads/linker/v1.8.4/linker-x64.ipk - name: upload-x64 id: upload-x64 uses: actions/upload-release-asset@master @@ -64,7 +64,7 @@ jobs: key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} bucket: ide-qbcode asset-path: ./public/publish-ipk/arm/linker-arm.ipk - target-path: /downloads/linker/v1.8.3/linker-arm.ipk + target-path: /downloads/linker/v1.8.4/linker-arm.ipk - name: upload-arm id: upload-arm uses: actions/upload-release-asset@master @@ -84,7 +84,7 @@ jobs: key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} bucket: ide-qbcode asset-path: ./public/publish-ipk/arm64/linker-arm64.ipk - target-path: /downloads/linker/v1.8.3/linker-arm64.ipk + target-path: /downloads/linker/v1.8.4/linker-arm64.ipk - name: upload-arm64 id: upload-arm64 uses: actions/upload-release-asset@master diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index e64e9a03..ed7488c5 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -89,34 +89,34 @@ jobs: - name: Push run: | - dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.plan/bin/release/linker.messenger.plan.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.cdkey/bin/release/linker.messenger.cdkey.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.firewall/bin/release/linker.messenger.firewall.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.messenger.wakeup/bin/release/linker.messenger.wakeup.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.snat/bin/release/linker.snat.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols - dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.8.3.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.plan/bin/release/linker.messenger.plan.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.cdkey/bin/release/linker.messenger.cdkey.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.firewall/bin/release/linker.messenger.firewall.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.messenger.wakeup/bin/release/linker.messenger.wakeup.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.snat/bin/release/linker.snat.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols + dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.8.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols diff --git a/gen/index.js b/gen/index.js index 4171f0ad..df075d4c 100644 --- a/gen/index.js +++ b/gen/index.js @@ -86,6 +86,7 @@ function writeUpload(data, tagName) { }); }; } +/* data.jobs.build.steps.push({ name: `upload-version-oss`, id: `upload-version-oss`, @@ -99,7 +100,7 @@ function writeUpload(data, tagName) { 'target-path': `/downloads/linker/version.txt` } }); - + */ data.jobs.build.steps.push({ name: `upload-install-service-oss`, id: `upload-install-service-oss`, diff --git a/linker.sln b/linker.sln index f41d15c6..f0024134 100644 --- a/linker.sln +++ b/linker.sln @@ -69,7 +69,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.firewall", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.wakeup", "src\linker.messenger.wakeup\linker.messenger.wakeup.csproj", "{FF0F6D11-6FD5-4CB1-9121-14623B226319}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "linker.messenger.cdkey", "src\linker.messenger.cdkey\linker.messenger.cdkey.csproj", "{B03C0E46-1C0F-46C2-B026-8F02F5C643D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.cdkey", "src\linker.messenger.cdkey\linker.messenger.cdkey.csproj", "{B03C0E46-1C0F-46C2-B026-8F02F5C643D4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "linker.messenger.rapp", "src\linker.messenger.rapp\linker.messenger.rapp.csproj", "{B895C1DC-9C75-407D-98CE-5DB873F32278}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -495,6 +497,18 @@ Global {B03C0E46-1C0F-46C2-B026-8F02F5C643D4}.Release|x64.Build.0 = Release|Any CPU {B03C0E46-1C0F-46C2-B026-8F02F5C643D4}.Release|x86.ActiveCfg = Release|Any CPU {B03C0E46-1C0F-46C2-B026-8F02F5C643D4}.Release|x86.Build.0 = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|x64.ActiveCfg = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|x64.Build.0 = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|x86.ActiveCfg = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Debug|x86.Build.0 = Debug|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|Any CPU.Build.0 = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|x64.ActiveCfg = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|x64.Build.0 = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|x86.ActiveCfg = Release|Any CPU + {B895C1DC-9C75-407D-98CE-5DB873F32278}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/publish-docker.sh b/publish-docker.sh index b4e6e02e..f89e8175 100644 --- a/publish-docker.sh +++ b/publish-docker.sh @@ -41,16 +41,16 @@ do fi done cd public/publish/docker/linux-${p}-x64/${f} - docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.8.3" . --push + docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.8.4" . --push cd ../../../../../ cd public/publish/docker/linux-${p}-arm64/${f} - docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.8.3" . --push + docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.8.4" . --push cd ../../../../../ cd public/publish/docker/linux-${p}-arm/${f} - docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.8.3" . --push + docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.8.4" . --push cd ../../../../../ done done \ No newline at end of file diff --git a/publish-ipk.sh b/publish-ipk.sh index 27fe9f19..106d73b7 100644 --- a/publish-ipk.sh +++ b/publish-ipk.sh @@ -22,7 +22,7 @@ do mkdir -p public/publish-ipk/${r}/data/usr/bin/linker cp -rf public/publish/${r}/* public/publish-ipk/${r}/data/usr/bin/linker/ - sed -i "s|{version}|1.8.3|g" public/publish-ipk/${r}/control/control + sed -i "s|{version}|1.8.4|g" public/publish-ipk/${r}/control/control sed -i 's/\r$//' public/publish-ipk/${r}/data/etc/init.d/linker sed -i 's/\r$//' public/publish-ipk/${r}/control/control sed -i 's/\r$//' public/publish-ipk/${r}/control/postinst diff --git a/src/linker.app/linker.app.csproj b/src/linker.app/linker.app.csproj index a79c944f..dc83580c 100644 --- a/src/linker.app/linker.app.csproj +++ b/src/linker.app/linker.app.csproj @@ -28,7 +28,7 @@ com.snltty.linker.app linker.app - 1.8.3 + 1.8.4 snltty snltty snltty @@ -38,7 +38,7 @@ linker - 1.8.3 + 1.8.4 1 11.0 diff --git a/src/linker.libs/FireWallHelper.cs b/src/linker.libs/FireWallHelper.cs index 62a9fa97..ece56dde 100644 --- a/src/linker.libs/FireWallHelper.cs +++ b/src/linker.libs/FireWallHelper.cs @@ -19,6 +19,7 @@ namespace linker.libs private static void Linux(string fileName) { + /* fileName = Path.GetFileNameWithoutExtension(fileName); CommandHelper.Linux(string.Empty, new string[] { $"firewall-cmd --permanent --new-service={fileName}", @@ -30,6 +31,7 @@ namespace linker.libs $"firewall-cmd --permanent --add-service={fileName}", $"firewall-cmd --reload", }); + */ } private static void Windows(string fileName) diff --git a/src/linker.libs/linker.libs.csproj b/src/linker.libs/linker.libs.csproj index 34d895ea..ac64ef26 100644 --- a/src/linker.libs/linker.libs.csproj +++ b/src/linker.libs/linker.libs.csproj @@ -14,9 +14,9 @@ snltty https://github.com/snltty/linker https://github.com/snltty/linker - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 full diff --git a/src/linker.messenger.access/linker.messenger.access.csproj b/src/linker.messenger.access/linker.messenger.access.csproj index d94b2cbc..b88949c0 100644 --- a/src/linker.messenger.access/linker.messenger.access.csproj +++ b/src/linker.messenger.access/linker.messenger.access.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger api access - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.action/linker.messenger.action.csproj b/src/linker.messenger.action/linker.messenger.action.csproj index 724f127d..14c70869 100644 --- a/src/linker.messenger.action/linker.messenger.action.csproj +++ b/src/linker.messenger.action/linker.messenger.action.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger api action - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.api/linker.messenger.api.csproj b/src/linker.messenger.api/linker.messenger.api.csproj index 61ac5e50..20361997 100644 --- a/src/linker.messenger.api/linker.messenger.api.csproj +++ b/src/linker.messenger.api/linker.messenger.api.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger api - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.cdkey/linker.messenger.cdkey.csproj b/src/linker.messenger.cdkey/linker.messenger.cdkey.csproj index 069f4ecb..a0327c79 100644 --- a/src/linker.messenger.cdkey/linker.messenger.cdkey.csproj +++ b/src/linker.messenger.cdkey/linker.messenger.cdkey.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger cdkey - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.channel/linker.messenger.channel.csproj b/src/linker.messenger.channel/linker.messenger.channel.csproj index c9a64e39..5148f5e1 100644 --- a/src/linker.messenger.channel/linker.messenger.channel.csproj +++ b/src/linker.messenger.channel/linker.messenger.channel.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger channel - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.decenter/linker.messenger.decenter.csproj b/src/linker.messenger.decenter/linker.messenger.decenter.csproj index b22c6225..178f6297 100644 --- a/src/linker.messenger.decenter/linker.messenger.decenter.csproj +++ b/src/linker.messenger.decenter/linker.messenger.decenter.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger decenter - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.entry/linker.messenger.entry.csproj b/src/linker.messenger.entry/linker.messenger.entry.csproj index f475336b..084d3f08 100644 --- a/src/linker.messenger.entry/linker.messenger.entry.csproj +++ b/src/linker.messenger.entry/linker.messenger.entry.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger entry - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.exroute/linker.messenger.exroute.csproj b/src/linker.messenger.exroute/linker.messenger.exroute.csproj index 09fd7a9a..8dbac985 100644 --- a/src/linker.messenger.exroute/linker.messenger.exroute.csproj +++ b/src/linker.messenger.exroute/linker.messenger.exroute.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger exroute - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.firewall/linker.messenger.firewall.csproj b/src/linker.messenger.firewall/linker.messenger.firewall.csproj index d22de408..5d3fdebc 100644 --- a/src/linker.messenger.firewall/linker.messenger.firewall.csproj +++ b/src/linker.messenger.firewall/linker.messenger.firewall.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger firewall - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.flow/linker.messenger.flow.csproj b/src/linker.messenger.flow/linker.messenger.flow.csproj index 4dd91875..ced15493 100644 --- a/src/linker.messenger.flow/linker.messenger.flow.csproj +++ b/src/linker.messenger.flow/linker.messenger.flow.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger flow - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.forward/linker.messenger.forward.csproj b/src/linker.messenger.forward/linker.messenger.forward.csproj index 25d46b73..458b5b8b 100644 --- a/src/linker.messenger.forward/linker.messenger.forward.csproj +++ b/src/linker.messenger.forward/linker.messenger.forward.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger forward - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.listen/linker.messenger.listen.csproj b/src/linker.messenger.listen/linker.messenger.listen.csproj index 140b4210..c7ffbd97 100644 --- a/src/linker.messenger.listen/linker.messenger.listen.csproj +++ b/src/linker.messenger.listen/linker.messenger.listen.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger listen - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.logger/linker.messenger.logger.csproj b/src/linker.messenger.logger/linker.messenger.logger.csproj index 66fddd3d..bf8f6958 100644 --- a/src/linker.messenger.logger/linker.messenger.logger.csproj +++ b/src/linker.messenger.logger/linker.messenger.logger.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger logger - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.pcp/linker.messenger.pcp.csproj b/src/linker.messenger.pcp/linker.messenger.pcp.csproj index d0b2b3a4..e750fcdf 100644 --- a/src/linker.messenger.pcp/linker.messenger.pcp.csproj +++ b/src/linker.messenger.pcp/linker.messenger.pcp.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger pcp - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.plan/linker.messenger.plan.csproj b/src/linker.messenger.plan/linker.messenger.plan.csproj index 0ac0cf37..311e354a 100644 --- a/src/linker.messenger.plan/linker.messenger.plan.csproj +++ b/src/linker.messenger.plan/linker.messenger.plan.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger plan - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.rapp/RemoteAppInfo.cs b/src/linker.messenger.rapp/RemoteAppInfo.cs new file mode 100644 index 00000000..d1e1387c --- /dev/null +++ b/src/linker.messenger.rapp/RemoteAppInfo.cs @@ -0,0 +1,13 @@ +namespace linker.messenger.rapp +{ + public sealed class RemoteAppInfo + { + public string Name { get; set; } + public string Path { get; set; } + public string IconPath { get; set; } + public byte IconIndex { get; set; } + public string VPath { get; set; } + public byte ShowInTSWA { get; set; } = 1; + public byte CommandLineSetting { get; set; } = 1; + } +} diff --git a/src/linker.messenger.rapp/RemoteAppTransfer.cs b/src/linker.messenger.rapp/RemoteAppTransfer.cs new file mode 100644 index 00000000..63b3e078 --- /dev/null +++ b/src/linker.messenger.rapp/RemoteAppTransfer.cs @@ -0,0 +1,32 @@ +using Microsoft.Win32; +namespace linker.messenger.rapp +{ + public sealed class RemoteAppTransfer + { + public List Get() + { + List result = new List(); + + using RegistryKey registryKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Terminal Server\\TSAppAllowList\\Applications"); + if (registryKey == null) + { + return result; + } + foreach (string appName in registryKey.GetSubKeyNames()) + { + using RegistryKey app = registryKey.OpenSubKey(appName); + result.Add(new RemoteAppInfo + { + Name = app.GetValue("Name")?.ToString() ?? appName, + Path = app.GetValue("Path")?.ToString() ?? string.Empty, + IconPath = app.GetValue("IconPath")?.ToString() ?? string.Empty, + IconIndex = (byte)(app.GetValue("IconIndex") ?? 0), + CommandLineSetting = (byte)(app.GetValue("CommandLineSetting") ?? 1), + ShowInTSWA = (byte)(app.GetValue("ShowInTSWA") ?? 1), + VPath = app.GetValue("VPath")?.ToString() ?? string.Empty + }); + } + return result; + } + } +} diff --git a/src/linker.messenger.rapp/linker.messenger.rapp.csproj b/src/linker.messenger.rapp/linker.messenger.rapp.csproj new file mode 100644 index 00000000..0f3e3ce7 --- /dev/null +++ b/src/linker.messenger.rapp/linker.messenger.rapp.csproj @@ -0,0 +1,45 @@ + + + + net8.0 + enable + disable + true + false + true + True + linker messenger remote app + snltty + snltty + linker messenger remote app + snltty + https://github.com/snltty/linker + https://github.com/snltty/linker + linker messenger remote app + 1.8.4 + 1.8.4 + 1.8.4 + + + + full + true + + + full + true + True + + + embedded + + + embedded + + + + + + + + diff --git a/src/linker.messenger.relay/linker.messenger.relay.csproj b/src/linker.messenger.relay/linker.messenger.relay.csproj index 547558e9..d6d51522 100644 --- a/src/linker.messenger.relay/linker.messenger.relay.csproj +++ b/src/linker.messenger.relay/linker.messenger.relay.csproj @@ -18,9 +18,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger relay - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj b/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj index ebf3dd6e..f4f99545 100644 --- a/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj +++ b/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger serializer memorypack - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.sforward/linker.messenger.sforward.csproj b/src/linker.messenger.sforward/linker.messenger.sforward.csproj index 4c304a40..d25d36b5 100644 --- a/src/linker.messenger.sforward/linker.messenger.sforward.csproj +++ b/src/linker.messenger.sforward/linker.messenger.sforward.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger sforward - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.signin/linker.messenger.signin.csproj b/src/linker.messenger.signin/linker.messenger.signin.csproj index 19139408..8a5ffc1b 100644 --- a/src/linker.messenger.signin/linker.messenger.signin.csproj +++ b/src/linker.messenger.signin/linker.messenger.signin.csproj @@ -17,9 +17,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger signin - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.socks5/linker.messenger.socks5.csproj b/src/linker.messenger.socks5/linker.messenger.socks5.csproj index 7924b875..b89089a6 100644 --- a/src/linker.messenger.socks5/linker.messenger.socks5.csproj +++ b/src/linker.messenger.socks5/linker.messenger.socks5.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger socks5 - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.store.file/linker.messenger.store.file.csproj b/src/linker.messenger.store.file/linker.messenger.store.file.csproj index f2349e18..517988d6 100644 --- a/src/linker.messenger.store.file/linker.messenger.store.file.csproj +++ b/src/linker.messenger.store.file/linker.messenger.store.file.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger store file - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.sync/linker.messenger.sync.csproj b/src/linker.messenger.sync/linker.messenger.sync.csproj index 5ed4f704..8e1c4c2a 100644 --- a/src/linker.messenger.sync/linker.messenger.sync.csproj +++ b/src/linker.messenger.sync/linker.messenger.sync.csproj @@ -18,9 +18,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger sync - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj b/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj index 39e0e82f..2851356d 100644 --- a/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj +++ b/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger tunnel - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.tuntap/TuntapAdapter.cs b/src/linker.messenger.tuntap/TuntapAdapter.cs index 80071d00..d27e6661 100644 --- a/src/linker.messenger.tuntap/TuntapAdapter.cs +++ b/src/linker.messenger.tuntap/TuntapAdapter.cs @@ -24,8 +24,7 @@ namespace linker.messenger.tuntap private readonly ISignInClientStore signInClientStore; private readonly ExRouteTransfer exRouteTransfer; - public TuntapAdapter(TuntapTransfer tuntapTransfer, TuntapConfigTransfer tuntapConfigTransfer, TuntapDecenter tuntapDecenter, TuntapProxy tuntapProxy, - SignInClientState signInClientState, ISignInClientStore signInClientStore, ExRouteTransfer exRouteTransfer) + public TuntapAdapter(TuntapTransfer tuntapTransfer, TuntapConfigTransfer tuntapConfigTransfer, TuntapDecenter tuntapDecenter, TuntapProxy tuntapProxy, SignInClientState signInClientState, ISignInClientStore signInClientStore, ExRouteTransfer exRouteTransfer) { this.tuntapTransfer = tuntapTransfer; this.tuntapConfigTransfer = tuntapConfigTransfer; @@ -34,61 +33,67 @@ namespace linker.messenger.tuntap this.signInClientStore = signInClientStore; this.exRouteTransfer = exRouteTransfer; - //与服务器连接，刷新一下IP - signInClientState.OnSignInSuccess += (times) => - { - _ = CheckDevice(); - }; - //初始化网卡 tuntapTransfer.Initialize(this); - //网卡状态发生变化，同步一下信息 - tuntapTransfer.OnSetupBefore += () => - { - tuntapConfigTransfer.SetRunning(true); - tuntapDecenter.Refresh(); - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning("tuntap setup before"); - }; - tuntapTransfer.OnSetupAfter += () => - { - tuntapDecenter.Refresh(); - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning("tuntap setup after"); - }; - tuntapTransfer.OnSetupSuccess += () => - { - SetAppNat(); - SetMaps(); - AddForward(); - }; - tuntapTransfer.OnShutdownBefore += () => - { - tuntapDecenter.Refresh(); - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning("tuntap shutdown before"); - }; - tuntapTransfer.OnShutdownAfter += () => - { - tuntapDecenter.Refresh(); DeleteForward(); - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning("tuntap shutdown after"); - }; + //与服务器连接，刷新一下IP + signInClientState.OnSignInSuccess += SignInSuccess; + + //网卡状态发生变化，同步一下信息 + tuntapTransfer.OnSetupBefore += SetupBefore; + tuntapTransfer.OnSetupAfter += SetupAfter; + tuntapTransfer.OnSetupSuccess += SetupSuccess; + tuntapTransfer.OnShutdownBefore += ShutdownBefore; + tuntapTransfer.OnShutdownAfter += ShutdownAfter; //配置有更新，去同步一下 - tuntapConfigTransfer.OnUpdate += () => - { - tuntapDecenter.Refresh(); - SetAppNat(); - SetMaps(); - AddForward(); - _ = CheckDevice(); - }; + tuntapConfigTransfer.OnUpdate += Update; //隧道回调 tuntapProxy.Callback = this; - CheckDeviceTask(); + TimerHelper.SetIntervalLong(CheckDevice, 30000); } + + private void SignInSuccess(int times) + { + _ = CheckDevice(); + } + private void Update() + { + SetNat(); + SetMaps(); + AddForward(); + tuntapDecenter.Refresh(); + _ = CheckDevice(); + } + + private void SetupBefore() + { + tuntapConfigTransfer.SetRunning(true); + tuntapDecenter.Refresh(); + } + private void SetupAfter() + { + tuntapDecenter.Refresh(); + } + private void SetupSuccess() + { + SetNat(); + SetMaps(); + AddForward(); + } + private void ShutdownBefore() + { + tuntapDecenter.Refresh(); + } + private void ShutdownAfter() + { + RemoveNat(); + RemoveMaps(); + DeleteForward(); + tuntapDecenter.Refresh(); + } + + public async Task Callback(LinkerTunDevicPacket packet) { await tuntapProxy.InputPacket(packet).ConfigureAwait(false); @@ -105,10 +110,10 @@ namespace linker.messenger.tuntap private OperatingManager checking = new OperatingManager(); - private void CheckDeviceTask() - { - TimerHelper.SetIntervalLong(CheckDevice, 30000); - } + /// + /// 检查网卡设备 + /// + /// private async Task CheckDevice() { try @@ -141,19 +146,15 @@ namespace linker.messenger.tuntap /// public async Task RetstartDevice() { - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning($"restart, stop device"); tuntapTransfer.Shutdown(); await tuntapConfigTransfer.RefreshIPAsync().ConfigureAwait(false); - tuntapTransfer.Setup(tuntapConfigTransfer.Name, tuntapConfigTransfer.Info.IP, tuntapConfigTransfer.Info.PrefixLength, tuntapConfigTransfer.Info.DisableNat == false); + tuntapTransfer.Setup(tuntapConfigTransfer.Name, tuntapConfigTransfer.Info.IP, tuntapConfigTransfer.Info.PrefixLength); } /// /// 关闭网卡 /// public void StopDevice() { - if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) - LoggerHelper.Instance.Warning($"stop device"); if (tuntapTransfer.Shutdown()) { tuntapConfigTransfer.SetRunning(false); @@ -171,21 +172,40 @@ namespace linker.messenger.tuntap tuntapTransfer.SetDstMap(maps); } /// - /// 设置应用层NAT + /// 移除映射 /// - private void SetAppNat() + private void RemoveMaps() + { + tuntapTransfer.RemoveDstMap(); + } + + /// + /// 设置NAT + /// + private void SetNat() { if (tuntapConfigTransfer.Info.DisableNat == false) { - var nats = tuntapConfigTransfer.Info.Lans - .Where(c => c.IP != null && c.IP.Equals(IPAddress.Any) == false && c.MapIP != null && c.Disabled == false) - .Select(c => new LinkerTunAppNatItemInfo - { - IP = c.MapIP.Equals(IPAddress.Any) ? c.IP : c.MapIP, - PrefixLength = c.MapIP.Equals(IPAddress.Any) ? c.PrefixLength : c.MapPrefixLength, - }).ToArray(); - tuntapTransfer.SetAppNat(nats); + List lans = tuntapConfigTransfer.Info.Lans.Where(c => c.IP != null && c.IP.Equals(IPAddress.Any) == false && c.MapIP != null && c.Disabled == false).ToList(); + + if (lans.Count != 0) + { + tuntapTransfer.SetNat(lans.Select(c => new LinkerTunAppNatItemInfo + { + IP = c.MapIP.Equals(IPAddress.Any) ? c.IP : c.MapIP, + PrefixLength = c.MapIP.Equals(IPAddress.Any) ? c.PrefixLength : c.MapPrefixLength, + }).ToArray()); + return; + } } + RemoveNat(); + } + /// + /// 移除NAT + /// + private void RemoveNat() + { + tuntapTransfer.RemoveNat(); } // diff --git a/src/linker.messenger.tuntap/TuntapTransfer.cs b/src/linker.messenger.tuntap/TuntapTransfer.cs index 588fdb7f..09add12b 100644 --- a/src/linker.messenger.tuntap/TuntapTransfer.cs +++ b/src/linker.messenger.tuntap/TuntapTransfer.cs @@ -54,7 +54,7 @@ namespace linker.messenger.tuntap /// /// 运行网卡 /// - public void Setup(string name, IPAddress ip, byte prefixLength, bool nat = true) + public void Setup(string name, IPAddress ip, byte prefixLength) { if (operatingManager.StartOperation() == false) { @@ -75,14 +75,6 @@ namespace linker.messenger.tuntap LoggerHelper.Instance.Error(linkerTunDeviceAdapter.SetupError); return; } - if (nat) - { - linkerTunDeviceAdapter.SetSystemNat(); - if (string.IsNullOrWhiteSpace(linkerTunDeviceAdapter.NatError) == false) - { - LoggerHelper.Instance.Error(linkerTunDeviceAdapter.NatError); - } - } OnSetupSuccess(); } @@ -159,13 +151,21 @@ namespace linker.messenger.tuntap } }); } + /// - /// 设置应用层NAT + /// 设置NAT /// /// - public void SetAppNat(LinkerTunAppNatItemInfo[] items) + public void SetNat(LinkerTunAppNatItemInfo[] items) { - linkerTunDeviceAdapter.SetAppNat(items); + linkerTunDeviceAdapter.SetNat(items); + } + /// + /// 移除NAT + /// + public void RemoveNat() + { + linkerTunDeviceAdapter.RemoveNat(); } /// @@ -210,6 +210,10 @@ namespace linker.messenger.tuntap { linkerTunDeviceAdapter.SetMap(maps); } + public void RemoveDstMap() + { + linkerTunDeviceAdapter.RemoveNat(); + } /// /// 检查网卡是否可用 diff --git a/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj b/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj index 3e01c9ee..d5cab2a6 100644 --- a/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj +++ b/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger tuntap - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.updater/linker.messenger.updater.csproj b/src/linker.messenger.updater/linker.messenger.updater.csproj index f10676ad..9c1e89df 100644 --- a/src/linker.messenger.updater/linker.messenger.updater.csproj +++ b/src/linker.messenger.updater/linker.messenger.updater.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger updater - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger.wakeup/linker.messenger.wakeup.csproj b/src/linker.messenger.wakeup/linker.messenger.wakeup.csproj index 08fb6069..0a11b711 100644 --- a/src/linker.messenger.wakeup/linker.messenger.wakeup.csproj +++ b/src/linker.messenger.wakeup/linker.messenger.wakeup.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger wakeup - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.messenger/linker.messenger.csproj b/src/linker.messenger/linker.messenger.csproj index bcbcb72e..d7a61e00 100644 --- a/src/linker.messenger/linker.messenger.csproj +++ b/src/linker.messenger/linker.messenger.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker messenger - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.snat/linker.snat.csproj b/src/linker.snat/linker.snat.csproj index fe551573..b00db2b4 100644 --- a/src/linker.snat/linker.snat.csproj +++ b/src/linker.snat/linker.snat.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker snat - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.tun/LinkerTunDeviceAdapter.cs b/src/linker.tun/LinkerTunDeviceAdapter.cs index 2cffd437..3157e103 100644 --- a/src/linker.tun/LinkerTunDeviceAdapter.cs +++ b/src/linker.tun/LinkerTunDeviceAdapter.cs @@ -155,8 +155,6 @@ namespace linker.tun { cancellationTokenSource?.Cancel(); linkerTunDevice.Shutdown(); - linkerTunDevice.RemoveNat(out string error); - lanSnat.Shutdown(); } catch (Exception) { @@ -183,30 +181,15 @@ namespace linker.tun /// /// 设置系统层NAT /// - public void SetSystemNat() + public void SetNat(LinkerTunAppNatItemInfo[] items) { if (linkerTunDevice == null) { return; } if (linkerTunDevice.Running) + { linkerTunDevice.SetNat(out natError); - } - /// - /// 设置应用层NAT，仅Windows， - /// 目录下 - /// 64位，放x64的WinDivert.dll和WinDivert64.sys - /// 32位，放x86的WinDivert.dll和WinDivert64.sys，WinDivert.sys - /// - /// - public void SetAppNat(LinkerTunAppNatItemInfo[] items) - { - if (linkerTunDevice == null) - { - return; - } - if (linkerTunDevice.Running) - { lanSnat.Setup(address, prefixLength, items, ref natError); } } @@ -219,6 +202,7 @@ namespace linker.tun { return; } + natError = string.Empty; linkerTunDevice.RemoveNat(out string error); lanSnat.Shutdown(); } @@ -360,6 +344,13 @@ namespace linker.tun { lanMap.SetMap(maps, AppNat == false); } + /// + /// 移除映射 + /// + public void RemoveMap() + { + lanMap.SetMap([], AppNat == false); + } public async Task CheckAvailable(bool order = false) { diff --git a/src/linker.tun/linker.tun.csproj b/src/linker.tun/linker.tun.csproj index 76ac9ba0..5ff5b4d9 100644 --- a/src/linker.tun/linker.tun.csproj +++ b/src/linker.tun/linker.tun.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker tun - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker.tunnel/linker.tunnel.csproj b/src/linker.tunnel/linker.tunnel.csproj index 3d657b94..61b6fa57 100644 --- a/src/linker.tunnel/linker.tunnel.csproj +++ b/src/linker.tunnel/linker.tunnel.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker tunnel - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 diff --git a/src/linker/linker.csproj b/src/linker/linker.csproj index a8b3d8a4..3631ad21 100644 --- a/src/linker/linker.csproj +++ b/src/linker/linker.csproj @@ -21,18 +21,15 @@ snltty snltty 1. 一些累计更新 -2. 修复socks5，解决CPU爆满问题，增加本地域名解析，支持HTTP代理 -3. 优化唤醒模块 -4. 优化应用层NAT，根据目标IP自动选择网卡 -5. 分离cdkey，使其可作用于任意模块 -6. 去掉托盘程序http自托管，统一使用1804 +2. 优化数据同步，可选择同步到指定客户端 +3. 增加选项，客户端自动更新到服务器版本 snltty https://github.com/snltty/linker https://github.com/snltty/linker linker - 1.8.3 - 1.8.3 - 1.8.3 + 1.8.4 + 1.8.4 + 1.8.4 False diff --git a/version.txt b/version.txt index 3e274e9c..8a966c72 100644 --- a/version.txt +++ b/version.txt @@ -1,8 +1,5 @@ -v1.8.3 -2025-06-17 17:33:47 +v1.8.4 +2025-06-18 16:23:22 1. 一些累计更新 -2. 修复socks5，解决CPU爆满问题，增加本地域名解析，支持HTTP代理 -3. 优化唤醒模块 -4. 优化应用层NAT，根据目标IP自动选择网卡 -5. 分离cdkey，使其可作用于任意模块 -6. 去掉托盘程序http自托管，统一使用1804 \ No newline at end of file +2. 优化数据同步，可选择同步到指定客户端 +3. 增加选项，客户端自动更新到服务器版本 \ No newline at end of file