165

.github/workflows/docker.yml

@@ -29,7 +29,7 @@ jobs:
         
     - name: restore projects
       run: 
-        dotnet restore ./linker
+        dotnet restore ./src/linker
         
     - name: docker login
       uses: docker/login-action@v2.1.0

.github/workflows/dotnet.yml

@@ -296,7 +296,7 @@ jobs:
           key-id: ${{ secrets.ALIYUN_OSS_ID }}
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
-          asset-path: ./linker/linker.service
+          asset-path: ./src/linker/linker.service
           target-path: /downloads/linker/linker.service
       - name: upload-install-oss
         id: upload-install-oss
@@ -306,5 +306,5 @@ jobs:
           key-id: ${{ secrets.ALIYUN_OSS_ID }}
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
-          asset-path: ./linker/linker-install.sh
+          asset-path: ./src/linker/linker-install.sh
           target-path: /downloads/linker/linker-install.sh

.github/workflows/nuget.yml

@@ -21,87 +21,87 @@ jobs:
 
     - name: Build
       run: |
-        dotnet build ./linker.libs -c release
-        dotnet build ./linker.messenger -c release
-        dotnet build ./linker.messenger.access -c release
-        dotnet build ./linker.messenger.action -c release
-        dotnet build ./linker.messenger.api -c release
-        dotnet build ./linker.messenger.channel -c release
-        dotnet build ./linker.messenger.decenter -c release
-        dotnet build ./linker.messenger.entry -c release
-        dotnet build ./linker.messenger.exroute -c release
-        dotnet build ./linker.messenger.flow -c release
-        dotnet build ./linker.messenger.forward -c release
-        dotnet build ./linker.messenger.listen -c release
-        dotnet build ./linker.messenger.logger -c release
-        dotnet build ./linker.messenger.pcp -c release
-        dotnet build ./linker.messenger.relay -c release
-        dotnet build ./linker.messenger.serializer.memorypack -c release
-        dotnet build ./linker.messenger.sforward -c release
-        dotnet build ./linker.messenger.signin -c release
-        dotnet build ./linker.messenger.socks5 -c release
-        dotnet build ./linker.messenger.store.file -c release
-        dotnet build ./linker.messenger.sync -c release
-        dotnet build ./linker.messenger.tunnel -c release
-        dotnet build ./linker.messenger.tuntap -c release
-        dotnet build ./linker.messenger.updater -c release
-        dotnet build ./linker.tun -c release
-        dotnet build ./linker.tunnel -c release
+        dotnet build ./src/linker.libs -c release
+        dotnet build ./src/linker.messenger -c release
+        dotnet build ./src/linker.messenger.access -c release
+        dotnet build ./src/linker.messenger.action -c release
+        dotnet build ./src/linker.messenger.api -c release
+        dotnet build ./src/linker.messenger.channel -c release
+        dotnet build ./src/linker.messenger.decenter -c release
+        dotnet build ./src/linker.messenger.entry -c release
+        dotnet build ./src/linker.messenger.exroute -c release
+        dotnet build ./src/linker.messenger.flow -c release
+        dotnet build ./src/linker.messenger.forward -c release
+        dotnet build ./src/linker.messenger.listen -c release
+        dotnet build ./src/linker.messenger.logger -c release
+        dotnet build ./src/linker.messenger.pcp -c release
+        dotnet build ./src/linker.messenger.relay -c release
+        dotnet build ./src/linker.messenger.serializer.memorypack -c release
+        dotnet build ./src/linker.messenger.sforward -c release
+        dotnet build ./src/linker.messenger.signin -c release
+        dotnet build ./src/linker.messenger.socks5 -c release
+        dotnet build ./src/linker.messenger.store.file -c release
+        dotnet build ./src/linker.messenger.sync -c release
+        dotnet build ./src/linker.messenger.tunnel -c release
+        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.tunnel -c release
 
     - name: Pack
       run: |
-        dotnet pack ./linker.libs -c release
-        dotnet pack ./linker.messenger -c release
-        dotnet pack ./linker.messenger.access -c release
-        dotnet pack ./linker.messenger.action -c release
-        dotnet pack ./linker.messenger.api -c release
-        dotnet pack ./linker.messenger.channel -c release
-        dotnet pack ./linker.messenger.decenter -c release
-        dotnet pack ./linker.messenger.entry -c release
-        dotnet pack ./linker.messenger.exroute -c release
-        dotnet pack ./linker.messenger.flow -c release
-        dotnet pack ./linker.messenger.forward -c release
-        dotnet pack ./linker.messenger.listen -c release
-        dotnet pack ./linker.messenger.logger -c release
-        dotnet pack ./linker.messenger.pcp -c release
-        dotnet pack ./linker.messenger.relay -c release
-        dotnet pack ./linker.messenger.serializer.memorypack -c release
-        dotnet pack ./linker.messenger.sforward -c release
-        dotnet pack ./linker.messenger.signin -c release
-        dotnet pack ./linker.messenger.socks5 -c release
-        dotnet pack ./linker.messenger.store.file -c release
-        dotnet pack ./linker.messenger.sync -c release
-        dotnet pack ./linker.messenger.tunnel -c release
-        dotnet pack ./linker.messenger.tuntap -c release
-        dotnet pack ./linker.messenger.updater -c release
-        dotnet pack ./linker.tun -c release
-        dotnet pack ./linker.tunnel -c release
+        dotnet pack ./src/linker.libs -c release
+        dotnet pack ./src/linker.messenger -c release
+        dotnet pack ./src/linker.messenger.access -c release
+        dotnet pack ./src/linker.messenger.action -c release
+        dotnet pack ./src/linker.messenger.api -c release
+        dotnet pack ./src/linker.messenger.channel -c release
+        dotnet pack ./src/linker.messenger.decenter -c release
+        dotnet pack ./src/linker.messenger.entry -c release
+        dotnet pack ./src/linker.messenger.exroute -c release
+        dotnet pack ./src/linker.messenger.flow -c release
+        dotnet pack ./src/linker.messenger.forward -c release
+        dotnet pack ./src/linker.messenger.listen -c release
+        dotnet pack ./src/linker.messenger.logger -c release
+        dotnet pack ./src/linker.messenger.pcp -c release
+        dotnet pack ./src/linker.messenger.relay -c release
+        dotnet pack ./src/linker.messenger.serializer.memorypack -c release
+        dotnet pack ./src/linker.messenger.sforward -c release
+        dotnet pack ./src/linker.messenger.signin -c release
+        dotnet pack ./src/linker.messenger.socks5 -c release
+        dotnet pack ./src/linker.messenger.store.file -c release
+        dotnet pack ./src/linker.messenger.sync -c release
+        dotnet pack ./src/linker.messenger.tunnel -c release
+        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.tunnel -c release
         
     - name: Push
       run: |
-        dotnet nuget push ./linker.libs/bin/release/linker.libs.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger/bin/release/linker.messenger.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.access/bin/release/linker.messenger.access.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.action/bin/release/linker.messenger.action.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.api/bin/release/linker.messenger.api.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.channel/bin/release/linker.messenger.channel.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.decenter/bin/release/linker.messenger.decenter.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.entry/bin/release/linker.messenger.entry.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.exroute/bin/release/linker.messenger.exroute.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.flow/bin/release/linker.messenger.flow.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.forward/bin/release/linker.messenger.forward.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.listen/bin/release/linker.messenger.listen.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.logger/bin/release/linker.messenger.logger.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.pcp/bin/release/linker.messenger.pcp.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.relay/bin/release/linker.messenger.relay.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.sforward/bin/release/linker.messenger.sforward.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.signin/bin/release/linker.messenger.signin.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.socks5/bin/release/linker.messenger.socks5.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.store.file/bin/release/linker.messenger.store.file.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.sync/bin/release/linker.messenger.sync.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.messenger.updater/bin/release/linker.messenger.updater.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.tun/bin/release/linker.tun.1.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
-        dotnet nuget push ./linker.tunnel/bin/release/linker.tunnel.1.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.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.6.5.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols

gen/index.js

@@ -7,7 +7,7 @@ const parser = new xml2js.Parser();
 
 function readVersionDesc() {
     return new Promise((resolve, reject) => {
-        const fileContents = fs.readFileSync('../linker/linker.csproj', 'utf8');
+        const fileContents = fs.readFileSync('../src/linker/linker.csproj', 'utf8');
         parser.parseString(fileContents, (error, result) => {
             resolve(
                 { desc: result.Project.PropertyGroup[0].Description[0], version: result.Project.PropertyGroup[0].FileVersion[0] }
@@ -139,7 +139,7 @@ function writeUpload(data) {
             'key-id': '${{ secrets.ALIYUN_OSS_ID }}',
             'key-secret': '${{ secrets.ALIYUN_OSS_SECRET }}',
             'bucket': 'ide-qbcode',
-            'asset-path': `./linker/linker.service`,
+            'asset-path': `./src/linker/linker.service`,
             'target-path': `/downloads/linker/linker.service`
         }
     });
@@ -152,7 +152,7 @@ function writeUpload(data) {
             'key-id': '${{ secrets.ALIYUN_OSS_ID }}',
             'key-secret': '${{ secrets.ALIYUN_OSS_SECRET }}',
             'bucket': 'ide-qbcode',
-            'asset-path': `./linker/linker-install.sh`,
+            'asset-path': `./src/linker/linker-install.sh`,
             'target-path': `/downloads/linker/linker-install.sh`
         }
     });

linker.sln

@@ -3,59 +3,59 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33110.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker", "linker\linker.csproj", "{267DE8BE-F91C-4CCB-9D58-D33FDA661126}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker", "src\linker\linker.csproj", "{267DE8BE-F91C-4CCB-9D58-D33FDA661126}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.libs", "linker.libs\linker.libs.csproj", "{00EECF97-99EB-4B12-AAEF-ED2363914275}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.libs", "src\linker.libs\linker.libs.csproj", "{00EECF97-99EB-4B12-AAEF-ED2363914275}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.tunnel", "linker.tunnel\linker.tunnel.csproj", "{AFADE8D6-AB00-456B-9F43-53BC95B7B608}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.tunnel", "src\linker.tunnel\linker.tunnel.csproj", "{AFADE8D6-AB00-456B-9F43-53BC95B7B608}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.tun", "linker.tun\linker.tun.csproj", "{0DE134E0-7CD8-4DCF-8D2A-325CEBE5895F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.tun", "src\linker.tun\linker.tun.csproj", "{0DE134E0-7CD8-4DCF-8D2A-325CEBE5895F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger", "linker.messenger\linker.messenger.csproj", "{2B0BFDBB-8C5F-4E47-8309-2A764C2567C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger", "src\linker.messenger\linker.messenger.csproj", "{2B0BFDBB-8C5F-4E47-8309-2A764C2567C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.signin", "linker.messenger.signin\linker.messenger.signin.csproj", "{5B1F4754-D1B6-426B-B310-8C21F26879D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.signin", "src\linker.messenger.signin\linker.messenger.signin.csproj", "{5B1F4754-D1B6-426B-B310-8C21F26879D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.tunnel", "linker.messenger.tunnel\linker.messenger.tunnel.csproj", "{92582A55-8BBF-4B82-892D-75CEC8969EAF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.tunnel", "src\linker.messenger.tunnel\linker.messenger.tunnel.csproj", "{92582A55-8BBF-4B82-892D-75CEC8969EAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.relay", "linker.messenger.relay\linker.messenger.relay.csproj", "{90E99334-FBF6-423F-A636-89B1E71D8FEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.relay", "src\linker.messenger.relay\linker.messenger.relay.csproj", "{90E99334-FBF6-423F-A636-89B1E71D8FEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.decenter", "linker.messenger.decenter\linker.messenger.decenter.csproj", "{5FDD5CF7-6B10-4F3C-A2E2-D9E8F2A4E271}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.decenter", "src\linker.messenger.decenter\linker.messenger.decenter.csproj", "{5FDD5CF7-6B10-4F3C-A2E2-D9E8F2A4E271}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.entry", "linker.messenger.entry\linker.messenger.entry.csproj", "{AE6579B4-886A-4460-B058-516E67D84FBB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.entry", "src\linker.messenger.entry\linker.messenger.entry.csproj", "{AE6579B4-886A-4460-B058-516E67D84FBB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.api", "linker.messenger.api\linker.messenger.api.csproj", "{2678852B-FBAD-4D4F-941E-D90458D9398C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.api", "src\linker.messenger.api\linker.messenger.api.csproj", "{2678852B-FBAD-4D4F-941E-D90458D9398C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.sync", "linker.messenger.sync\linker.messenger.sync.csproj", "{4881D7B1-06A5-4845-8395-BC5530ABD7C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.sync", "src\linker.messenger.sync\linker.messenger.sync.csproj", "{4881D7B1-06A5-4845-8395-BC5530ABD7C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.serializer.memorypack", "linker.messenger.serializer.memorypack\linker.messenger.serializer.memorypack.csproj", "{E99412D2-71DF-4A95-9CA1-EE1F0F26EBE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.serializer.memorypack", "src\linker.messenger.serializer.memorypack\linker.messenger.serializer.memorypack.csproj", "{E99412D2-71DF-4A95-9CA1-EE1F0F26EBE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.updater", "linker.messenger.updater\linker.messenger.updater.csproj", "{6DE82860-4C90-488F-9721-FB6CA3E5176B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.updater", "src\linker.messenger.updater\linker.messenger.updater.csproj", "{6DE82860-4C90-488F-9721-FB6CA3E5176B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.socks5", "linker.messenger.socks5\linker.messenger.socks5.csproj", "{668C9465-CAF9-4B4A-91C2-C221B5B04AD2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.socks5", "src\linker.messenger.socks5\linker.messenger.socks5.csproj", "{668C9465-CAF9-4B4A-91C2-C221B5B04AD2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.access", "linker.messenger.access\linker.messenger.access.csproj", "{2C076344-B58C-474C-96BF-2ECA63EB90FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.access", "src\linker.messenger.access\linker.messenger.access.csproj", "{2C076344-B58C-474C-96BF-2ECA63EB90FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.store.file", "linker.messenger.store.file\linker.messenger.store.file.csproj", "{B314CF79-2DFF-4A7F-AE86-326ECFD02BB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.store.file", "src\linker.messenger.store.file\linker.messenger.store.file.csproj", "{B314CF79-2DFF-4A7F-AE86-326ECFD02BB6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.exroute", "linker.messenger.exroute\linker.messenger.exroute.csproj", "{091C723F-47AD-49AB-9373-9E49E1DD46C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.exroute", "src\linker.messenger.exroute\linker.messenger.exroute.csproj", "{091C723F-47AD-49AB-9373-9E49E1DD46C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.channel", "linker.messenger.channel\linker.messenger.channel.csproj", "{9F0DC900-7B27-4C33-8B58-C09DDAF67802}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.channel", "src\linker.messenger.channel\linker.messenger.channel.csproj", "{9F0DC900-7B27-4C33-8B58-C09DDAF67802}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.action", "linker.messenger.action\linker.messenger.action.csproj", "{8B16725E-645D-41C8-BD04-C3D9F453BEF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.action", "src\linker.messenger.action\linker.messenger.action.csproj", "{8B16725E-645D-41C8-BD04-C3D9F453BEF6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.listen", "linker.messenger.listen\linker.messenger.listen.csproj", "{4BD30072-9DFC-4D65-B6FB-DB9DDE3EFB30}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.listen", "src\linker.messenger.listen\linker.messenger.listen.csproj", "{4BD30072-9DFC-4D65-B6FB-DB9DDE3EFB30}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.pcp", "linker.messenger.pcp\linker.messenger.pcp.csproj", "{A73BB5AD-C3CA-41A2-B5F9-C06DE6F5CD5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.pcp", "src\linker.messenger.pcp\linker.messenger.pcp.csproj", "{A73BB5AD-C3CA-41A2-B5F9-C06DE6F5CD5C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.sforward", "linker.messenger.sforward\linker.messenger.sforward.csproj", "{A108DE37-47F2-4BF6-AAA4-ADC014214943}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.sforward", "src\linker.messenger.sforward\linker.messenger.sforward.csproj", "{A108DE37-47F2-4BF6-AAA4-ADC014214943}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.logger", "linker.messenger.logger\linker.messenger.logger.csproj", "{765B5313-FFDB-41FF-A6B1-500C4017FD05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.logger", "src\linker.messenger.logger\linker.messenger.logger.csproj", "{765B5313-FFDB-41FF-A6B1-500C4017FD05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.forward", "linker.messenger.forward\linker.messenger.forward.csproj", "{87417384-655C-400F-895A-CD5BF6B866FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.forward", "src\linker.messenger.forward\linker.messenger.forward.csproj", "{87417384-655C-400F-895A-CD5BF6B866FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.flow", "linker.messenger.flow\linker.messenger.flow.csproj", "{9F40C7A2-15AC-4A2F-B2CD-15737BF9DB8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.flow", "src\linker.messenger.flow\linker.messenger.flow.csproj", "{9F40C7A2-15AC-4A2F-B2CD-15737BF9DB8C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.tuntap", "linker.messenger.tuntap\linker.messenger.tuntap.csproj", "{172C6E79-B47C-49E0-9731-6C12CCA071F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.tuntap", "src\linker.messenger.tuntap\linker.messenger.tuntap.csproj", "{172C6E79-B47C-49E0-9731-6C12CCA071F7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

publish-docker.sh

@@ -6,10 +6,10 @@ fs=('linker')
 ps=('musl' 'debian')
 rs=('x64' 'arm64' 'arm')
 
-cd linker.web 
+cd src/linker.web 
 npm install &&
 npm run build &&
-cd ../
+cd ../../
 
 for f in ${fs[@]} 
 do
@@ -22,14 +22,14 @@ do
             then
                 rr=linux-${r}
             fi
-			dotnet publish ./${f} -c release -f net8.0 -o ./public/publish/docker/linux-${p}-${r}/${f} -r ${rr}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
-			cp -rf linker/Dockerfile-${p} public/publish/docker/linux-${p}-${r}/${f}/Dockerfile-${p}
+			dotnet publish ./src/${f} -c release -f net8.0 -o ./public/publish/docker/linux-${p}-${r}/${f} -r ${rr}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
+			cp -rf src/linker/Dockerfile-${p} public/publish/docker/linux-${p}-${r}/${f}/Dockerfile-${p}
 			cp -rf public/extends/any/web public/publish/docker/linux-${p}-${r}/${f}/web
             mkdir -p public/publish/docker/linux-${p}-${r}/${f}/configs
             mkdir -p public/publish/docker/linux-${p}-${r}/${f}/logs
             if [ $p = "musl" ]
             then
-                cp -rf linker/libmsquic-musl-${r}.so public/publish/docker/linux-${p}-${r}/${f}/libmsquic.so
+                cp -rf src/linker/libmsquic-musl-${r}.so public/publish/docker/linux-${p}-${r}/${f}/libmsquic.so
             fi
 		done
 		cd public/publish/docker/linux-${p}-x64/${f}

publish.bat

@@ -6,26 +6,26 @@ rd /s /q public\\publish-zip
 mkdir public\\publish-zip
 
 
-cd linker.web
+cd src/linker.web
 call npm install
 call npm run build 
-cd ../
+cd ../../
 
 echo F|xcopy "version.txt" "public\\version.txt" /f /h /y
 
 for %%r in (win-x86,win-x64,win-arm64) do (
-	echo F|xcopy "linker.tray.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*"  /s /f /h /y
-	echo F|xcopy "linker.route.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*"  /s /f /h /y
-	echo F|xcopy "linker\\msquic.dll" "public\\extends\\%%r\\linker-%%r\\msquic.dll"  /s /f /h /y
-	echo F|xcopy "linker\\msquic-%%r.dll" "public\\extends\\%%r\\linker-%%r\\msquic.dll"  /s /f /h /y
-	echo F|xcopy "linker\\msquic-openssl3-%%r.dll" "public\\extends\\%%r\\linker-%%r\\msquic-openssl.dll"  /s /f /h /y
-	echo F|xcopy "linker\\wintun-%%r.dll" "public\\extends\\%%r\\linker-%%r\\wintun.dll"  /s /f /h /y
+	echo F|xcopy "src\\linker.tray.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*"  /s /f /h /y
+	echo F|xcopy "src\\linker.route.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*"  /s /f /h /y
+	echo F|xcopy "src\\linker\\msquic.dll" "public\\extends\\%%r\\linker-%%r\\msquic.dll"  /s /f /h /y
+	echo F|xcopy "src\\linker\\msquic-%%r.dll" "public\\extends\\%%r\\linker-%%r\\msquic.dll"  /s /f /h /y
+	echo F|xcopy "src\\linker\\msquic-openssl3-%%r.dll" "public\\extends\\%%r\\linker-%%r\\msquic-openssl.dll"  /s /f /h /y
+	echo F|xcopy "src\\linker\\wintun-%%r.dll" "public\\extends\\%%r\\linker-%%r\\wintun.dll"  /s /f /h /y
 )
-7z a -tzip ./public/publish-zip/linker-windows-route.zip ./linker.route.win/dist/*
+7z a -tzip ./public/publish-zip/linker-windows-route.zip ./src/linker.route.win/dist/*
 
 for %%r in (win-x86,win-x64,win-arm64,linux-x64,linux-arm,linux-arm64,linux-musl-x64,linux-musl-arm,linux-musl-arm64,osx-x64,osx-arm64) do (
 	
-	dotnet publish ./linker -c release -f net8.0 -o ./public/publish/%%r/linker-%%r  -r %%r  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
+	dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish/%%r/linker-%%r  -r %%r  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
     echo F|xcopy "public\\extends\\%%r\\linker-%%r\\*" "public\\publish\\%%r\\linker-%%r\\*"  /s /f /h /y
 
 	echo F|xcopy "public\\extends\\any\\*" "public\\publish\\%%r\\linker-%%r\\*"  /s /f /h /y

push-dev.bat

@@ -2,7 +2,7 @@
 
 SET comment=%1
 
-cd linker.updater.gen
+cd gen
 node index.js
 cd ../