This commit is contained in:
snltty
2025-06-18 16:23:23 +08:00
parent 6ab2fe1730
commit 56e00cc879
49 changed files with 384 additions and 278 deletions

View File

@@ -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
docker manifest push snltty/linker-kvm:v1.8.4

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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`,

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -28,7 +28,7 @@
<ApplicationId>com.snltty.linker.app</ApplicationId>
<Title>linker.app</Title>
<Version>1.8.3</Version>
<Version>1.8.4</Version>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Copyright>snltty</Copyright>
@@ -38,7 +38,7 @@
<PackageReleaseNotes>linker</PackageReleaseNotes>
<!-- Versions -->
<ApplicationDisplayVersion>1.8.3</ApplicationDisplayVersion>
<ApplicationDisplayVersion>1.8.4</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>

View File

@@ -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)

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.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger api access</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger api action</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger api</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger cdkey</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger channel</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger decenter</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger entry</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger exroute</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger firewall</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger flow</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger forward</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger listen</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger logger</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger pcp</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger plan</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -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;
}
}

View File

@@ -0,0 +1,32 @@
using Microsoft.Win32;
namespace linker.messenger.rapp
{
public sealed class RemoteAppTransfer
{
public List<RemoteAppInfo> Get()
{
List<RemoteAppInfo> result = new List<RemoteAppInfo>();
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;
}
}
}

View File

@@ -0,0 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PublishAot>false</PublishAot>
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
<EnablePreviewFeatures>True</EnablePreviewFeatures>
<Title>linker messenger remote app</Title>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>linker messenger remote app</Description>
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger remote app</PackageReleaseNotes>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
<DebugType>embedded</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
<DebugType>embedded</DebugType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\linker.messenger.api\linker.messenger.api.csproj" />
<ProjectReference Include="..\linker.messenger.signin\linker.messenger.signin.csproj" />
<ProjectReference Include="..\linker.messenger\linker.messenger.csproj" />
</ItemGroup>
</Project>

View File

@@ -18,9 +18,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger relay</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger serializer memorypack</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger sforward</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -17,9 +17,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger signin</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger socks5</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger store file</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -18,9 +18,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger sync</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger tunnel</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -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);
}
/// <summary>
/// 检查网卡设备
/// </summary>
/// <returns></returns>
private async Task CheckDevice()
{
try
@@ -141,19 +146,15 @@ namespace linker.messenger.tuntap
/// <returns></returns>
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);
}
/// <summary>
/// 关闭网卡
/// </summary>
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);
}
/// <summary>
/// 设置应用层NAT
/// 移除映射
/// </summary>
private void SetAppNat()
private void RemoveMaps()
{
tuntapTransfer.RemoveDstMap();
}
/// <summary>
/// 设置NAT
/// </summary>
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<TuntapLanInfo> 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();
}
/// <summary>
/// 移除NAT
/// </summary>
private void RemoveNat()
{
tuntapTransfer.RemoveNat();
}
// <summary>

View File

@@ -54,7 +54,7 @@ namespace linker.messenger.tuntap
/// <summary>
/// 运行网卡
/// </summary>
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
}
});
}
/// <summary>
/// 设置应用层NAT
/// 设置NAT
/// </summary>
/// <param name="items"></param>
public void SetAppNat(LinkerTunAppNatItemInfo[] items)
public void SetNat(LinkerTunAppNatItemInfo[] items)
{
linkerTunDeviceAdapter.SetAppNat(items);
linkerTunDeviceAdapter.SetNat(items);
}
/// <summary>
/// 移除NAT
/// </summary>
public void RemoveNat()
{
linkerTunDeviceAdapter.RemoveNat();
}
/// <summary>
@@ -210,6 +210,10 @@ namespace linker.messenger.tuntap
{
linkerTunDeviceAdapter.SetMap(maps);
}
public void RemoveDstMap()
{
linkerTunDeviceAdapter.RemoveNat();
}
/// <summary>
/// 检查网卡是否可用

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger tuntap</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger updater</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger wakeup</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker messenger</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker snat</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -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
/// <summary>
/// 设置系统层NAT
/// </summary>
public void SetSystemNat()
public void SetNat(LinkerTunAppNatItemInfo[] items)
{
if (linkerTunDevice == null)
{
return;
}
if (linkerTunDevice.Running)
{
linkerTunDevice.SetNat(out natError);
}
/// <summary>
/// 设置应用层NAT仅Windows
/// 目录下
/// 64位放x64的WinDivert.dll和WinDivert64.sys
/// 32位放x86的WinDivert.dll和WinDivert64.sysWinDivert.sys
/// </summary>
/// <param name="items"></param>
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);
}
/// <summary>
/// 移除映射
/// </summary>
public void RemoveMap()
{
lanMap.SetMap([], AppNat == false);
}
public async Task<bool> CheckAvailable(bool order = false)
{

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tun</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -21,18 +21,15 @@
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>1. 一些累计更新
2. 修复socks5解决CPU爆满问题增加本地域名解析支持HTTP代理
3. 优化唤醒模块
4. 优化应用层NAT根据目标IP自动选择网卡
5. 分离cdkey使其可作用于任意模块
6. 去掉托盘程序http自托管统一使用1804</Description>
2. 优化数据同步,可选择同步到指定客户端
3. 增加选项,客户端自动更新到服务器版本</Description>
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker</PackageReleaseNotes>
<Version>1.8.3</Version>
<AssemblyVersion>1.8.3</AssemblyVersion>
<FileVersion>1.8.3</FileVersion>
<Version>1.8.4</Version>
<AssemblyVersion>1.8.4</AssemblyVersion>
<FileVersion>1.8.4</FileVersion>
<DelaySign>False</DelaySign>
</PropertyGroup>

View File

@@ -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
2. 优化数据同步,可选择同步到指定客户端
3. 增加选项,客户端自动更新到服务器版本