174

2025-09-26 21:15:57 +08:00 · 2025-04-21 21:40:34 +08:00
parent 1f5f3c45ec
commit dc02eb5147
60 changed files with 646 additions and 621 deletions
--- 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.7.3 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
+        docker manifest create snltty/linker-musl:v1.7.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.7.3 && \
+        docker manifest push snltty/linker-musl:v1.7.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,6 +70,6 @@ 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.7.3 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
+        docker manifest create snltty/linker-debian:v1.7.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.7.3
+        docker manifest push snltty/linker-debian:v1.7.4
--- 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.7.3
-          release_name: v1.7.3.${{ steps.date.outputs.today }}
+          tag_name: v1.7.4
+          release_name: v1.7.4.${{ steps.date.outputs.today }}
          draft: false
          prerelease: false
-          body: "1. 优化自动分配IP\r\n2. 优化网卡，排除不明数据包\r\n3. 虚拟网卡点对网IP映射，用于解决网段冲突\r\n4. 内置应用层SNAT，用于无法使用系统NAT的windows系统"
+          body: "1. 一些优化\r\n2. 内置应用层SNAT，用于无法使用系统NetNat的windows系统\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.7.3/linker-win-x86.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-win-x64.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-win-arm64.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-x64.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-arm.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-arm64.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-musl-x64.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-musl-arm.zip
+          target-path: /downloads/linker/v1.7.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.7.3/linker-linux-musl-arm64.zip
+          target-path: /downloads/linker/v1.7.4/linker-linux-musl-arm64.zip
      - name: upload-linux-musl-arm64
        id: upload-linux-musl-arm64
        uses: actions/upload-release-asset@master
--- 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.7.3/linker-x64.ipk
+          target-path: /downloads/linker/v1.7.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.7.3/linker-arm.ipk
+          target-path: /downloads/linker/v1.7.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.7.3/linker-arm64.ipk
+          target-path: /downloads/linker/v1.7.4/linker-arm64.ipk
      - name: upload-arm64
        id: upload-arm64
        uses: actions/upload-release-asset@master
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -47,6 +47,7 @@ jobs:
        dotnet build ./src/linker.messenger.tuntap -c release
        dotnet build ./src/linker.messenger.updater -c release
        dotnet build ./src/linker.tun -c release
+        dotnet build ./src/linker.snat -c release
        dotnet build ./src/linker.tunnel -c release

    - name: Pack
@@ -77,34 +78,36 @@ jobs:
        dotnet pack ./src/linker.messenger.tuntap -c release
        dotnet pack ./src/linker.messenger.updater -c release
        dotnet pack ./src/linker.tun -c release
+        dotnet pack ./src/linker.snat -c release
        dotnet pack ./src/linker.tunnel -c release
        
    - name: Push
      run: |
-        dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.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.7.4.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols