feat: update github ci,update source info handle logic

messica · messica · commit 2272ee8c13e0 · 2026-02-26T23:19:14.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,83 @@
+# Verify all release targets build (no packaging). Run on push to main and on pull_request.
+name: Build (all targets)
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+env:
+  BINARY_NAME: proxy-convert
+  RUST_BACKTRACE: 1
+
+jobs:
+  build:
+    name: Build ${{ matrix.target }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+          - os: macos-14
+            target: x86_64-apple-darwin
+          - os: macos-14
+            target: aarch64-apple-darwin
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+          - os: windows-latest
+            target: aarch64-pc-windows-msvc
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+
+      - name: Cache cargo
+        uses: Swatinem/rust-cache@2
+        with:
+          key: ${{ matrix.target }}
+
+      - name: Install Linux deps (glibc cross)
+        if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
+
+      - name: Set env for Linux aarch64 cross
+        if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'
+        run: |
+          echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+          echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
+          echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
+
+      - name: Install musl (x86_64)
+        if: matrix.os == 'ubuntu-latest' && matrix.target == 'x86_64-unknown-linux-musl'
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
+
+      - name: Build
+        run: cargo build --release --target ${{ matrix.target }} --verbose
+
+      - name: Test binary
+        shell: bash
+        run: |
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}.exe"
+          else
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}"
+          fi
+          if [ -f "$exe" ]; then
+            "$exe" --version
+          else
+            echo "Binary not found: $exe"
+            exit 1
+          fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,105 +5,109 @@ on:
     tags:
       - 'v*'
 
+env:
+  BINARY_NAME: proxy-convert
+  RUST_BACKTRACE: 1
+
 jobs:
   build:
-    name: Build on ${{ matrix.os }} - ${{ matrix.target }}
+    name: Build ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
+          # Linux glibc + musl static
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-          # - os: ubuntu-latest
-          #   target: aarch64-unknown-linux-gnu
-          - os: macos-latest
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+          # macOS
+          - os: macos-14
             target: x86_64-apple-darwin
-          - os: macos-latest
+          - os: macos-14
             target: aarch64-apple-darwin
+          # Windows
           - os: windows-latest
             target: x86_64-pc-windows-msvc
+          - os: windows-latest
+            target: aarch64-pc-windows-msvc
 
     steps:
-      - name: Checkout code
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install system dependencies (Ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential
-          sudo apt-get install -y libssl-dev
-          if [ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]; then
-            sudo apt-get install -y gcc-aarch64-linux-gnu
-            sudo apt-get install -y g++-aarch64-linux-gnu
-            sudo apt-get install -y libc6-dev-arm64-cross
-          fi
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+
+      - name: Cache cargo
+        uses: Swatinem/rust-cache@2
+        with:
+          key: ${{ matrix.target }}
+          shared-key: release
 
-      - name: Set up Rust
+      - name: Install Linux deps (glibc cross)
+        if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'
         run: |
-          rustup update stable
-          rustup target add ${{ matrix.target }}
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
 
-      - name: Set environment variables for ARM cross-compilation (Ubuntu only)
+      - name: Set env for Linux aarch64 cross (glibc)
         if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'
         run: |
           echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
           echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
           echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
-          echo "RANLIB_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ranlib" >> $GITHUB_ENV
-          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
-          echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV
 
-      - name: Build project
+      - name: Install musl (Linux static, x86_64 only)
+        if: matrix.os == 'ubuntu-latest' && matrix.target == 'x86_64-unknown-linux-musl'
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
+
+      - name: Build
         run: cargo build --release --target ${{ matrix.target }} --verbose
 
       - name: Test binary
+        shell: bash
         run: |
-          if [ "${{ matrix.os }}" == "windows-latest" ]; then
-            binary_path=$(find target/${{ matrix.target }}/release -maxdepth 1 -type f -name "*.exe" | head -n 1)
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}.exe"
           else
-            binary_path=$(find target/${{ matrix.target }}/release -maxdepth 1 -type f \( -perm -u=x -o -perm -g=x -o -perm -o=x \) | head -n 1)
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}"
           fi
-          if [ -n "$binary_path" ]; then
-            $binary_path --version
+          if [ -f "$exe" ]; then
+            "$exe" --version
           else
-            echo "No executable binary found."
+            echo "Binary not found: $exe"
             exit 1
           fi
-        shell: bash
-        env:
-          RUST_BACKTRACE: 1
 
-      - name: Package binary
+      - name: Package
         shell: bash
         run: |
-          if [ "${{ matrix.os }}" == "windows-latest" ]; then
-            binary_path=$(find target/${{ matrix.target }}/release -maxdepth 1 -type f -name "*.exe" | head -n 1)
-            binary_name=$(basename "$binary_path")
-          else
-            binary_path=$(find target/${{ matrix.target }}/release -maxdepth 1 -type f \( -perm -u=x -o -perm -g=x -o -perm -o=x \) | head -n 1)
-            binary_name=$(basename "$binary_path")
-          fi
-          mkdir -p ./release
-          cp "$binary_path" release/"$binary_name"
-          cd release
-          if [ "${{ matrix.os }}" == "windows-latest" ]; then
-            7z a "$binary_name-${{ matrix.target }}.zip" "$binary_name"
-            echo "Packaged file: ./release/$binary_name-${{ matrix.target }}.zip"
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}.exe"
+            out="${{ env.BINARY_NAME }}-${{ matrix.target }}.zip"
+            mkdir -p release
+            cp "$exe" release/
+            (cd release && 7z a "$out" "${{ env.BINARY_NAME }}.exe")
           else
-            tar czvf "$binary_name-${{ matrix.target }}.tar.gz" "$binary_name"
-            echo "Packaged file: ./release/$binary_name-${{ matrix.target }}.tar.gz"
+            exe="target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}"
+            out="${{ env.BINARY_NAME }}-${{ matrix.target }}.tar.gz"
+            mkdir -p release
+            cp "$exe" release/
+            (cd release && tar czvf "$out" "${{ env.BINARY_NAME }}")
           fi
-          cd ..
-      
+          echo "PACKAGE_PATH=release/$out" >> $GITHUB_ENV
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}
-          path: |
-            release/*.zip
-            release/*.tar.gz
-          if-no-files-found: error
+          path: ${{ env.PACKAGE_PATH }}
 
   release:
     name: Create Release
@@ -113,13 +117,12 @@ jobs:
       contents: write
 
     steps:
-      - name: Download all artifacts
+      - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
           path: artifacts
 
       - name: Create Release
-        id: create_release
         uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -129,5 +132,5 @@ jobs:
           draft: false
           prerelease: false
           files: |
-            artifacts/**/*.zip
-            artifacts/**/*.tar.gz  
+            artifacts/*/*.tar.gz
+            artifacts/*/*.zip
diff --git a/src/commands/convert.rs b/src/commands/convert.rs
@@ -183,7 +183,7 @@ impl ConvertCommand {
                 raw
             ))
         })?;
-        let (base, query_str) = raw.split_at(pos);
+        let (_base, query_str) = raw.split_at(pos);
         let query_str = query_str.trim_start_matches('?');
         let mut name: Option<String> = None;
         let mut type_param: Option<String> = None;
@@ -207,15 +207,11 @@ impl ConvertCommand {
                 source_type_str
             ))
         })?;
-        let source = if base.starts_with("http://") || base.starts_with("https://") {
-            raw.to_string()
-        } else {
-            base.to_string()
-        };
+        // Keep full string (path|url + all query params); type/name/flag are parsed out but remain in source
         Ok(SourceMeta {
             name: name.filter(|s| !s.is_empty()),
             source_type,
-            source,
+            source: raw.to_string(),
             format: None,
             flag,
         })
@@ -319,19 +315,23 @@ pub async fn handle_convert(
         .or_else(|| config.template.clone());
 
     tracing::info!("Starting conversion");
-    tracing::info!(
-        "Input sources: {}",
-        final_sources
-            .iter()
-            .map(|m| format!(
-                "{}@{:?}@{}",
-                m.name.as_deref().unwrap_or(""),
-                m.source_type,
-                m.source
-            ))
-            .collect::<Vec<_>>()
-            .join(", ")
-    );
+    for (i, m) in final_sources.iter().enumerate() {
+        let type_str = match &m.source_type {
+            SourceProtocol::Clash => "clash",
+            SourceProtocol::SingBox => "singbox",
+            SourceProtocol::V2Ray => "v2ray",
+        };
+        let name_str = m.name.as_deref().unwrap_or("(none)");
+        let flag_str = m.flag.as_deref().unwrap_or("(default)");
+        tracing::info!(
+            "Input source [{}]: {}  type={} name={} flag={}",
+            i + 1,
+            m.source,
+            type_str,
+            name_str,
+            flag_str
+        );
+    }
     tracing::info!(
         "Template: {}",
         final_template.as_deref().unwrap_or("(default)")
@@ -372,11 +372,11 @@ mod tests {
 
     #[test]
     fn test_parse_source_string_url_format() {
-        // Path + type only
+        // Path + type only; source keeps full string (all params)
         let m = ConvertCommand::parse_source_string("./config.yaml?type=clash").unwrap();
         assert_eq!(m.name, None);
         assert!(matches!(m.source_type, SourceProtocol::Clash));
-        assert_eq!(m.source, "./config.yaml");
+        assert_eq!(m.source, "./config.yaml?type=clash");
         assert_eq!(m.flag, None);
 
         // URL + type, name, flag
@@ -392,16 +392,17 @@ mod tests {
         );
         assert_eq!(m.flag.as_deref(), Some("sing-box"));
 
-        // File path with space (Eternal Network style)
+        // File path with space (Eternal Network style); source keeps full string
         let m = ConvertCommand::parse_source_string("examples/sources/Eternal Network?type=singbox")
             .unwrap();
         assert_eq!(m.name, None);
         assert!(matches!(m.source_type, SourceProtocol::SingBox));
-        assert_eq!(m.source, "examples/sources/Eternal Network");
+        assert_eq!(m.source, "examples/sources/Eternal Network?type=singbox");
 
-        // Empty name filtered out
+        // Empty name filtered out; source keeps full string including other params
         let m = ConvertCommand::parse_source_string("./x?type=clash&name=").unwrap();
         assert_eq!(m.name, None);
+        assert_eq!(m.source, "./x?type=clash&name=");
     }
 
     #[test]
diff --git a/src/utils/source/loader.rs b/src/utils/source/loader.rs
@@ -49,7 +49,9 @@ impl SourceLoader {
                 Self::append_flag_to_url(source, &source_meta.source_type, source_meta.flag.as_deref());
             Self::load_from_url(&url_with_flag, config).await
         } else {
-            Self::load_from_file(source)
+            // File path: use only the part before ? (query params are kept in source string for reference)
+            let path = source.find('?').map(|i| &source[..i]).unwrap_or(source.as_str());
+            Self::load_from_file(path)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ impl SourceLoader {`
`49`	`49`	`Self::append_flag_to_url(source, &source_meta.source_type, source_meta.flag.as_deref());`
`50`	`50`	`Self::load_from_url(&url_with_flag, config).await`
`51`	`51`	`} else {`
`52`		`- Self::load_from_file(source)`
	`52`	`+ // File path: use only the part before ? (query params are kept in source string for reference)`
	`53`	`+ let path = source.find('?').map(\|i\| &source[..i]).unwrap_or(source.as_str());`
	`54`	`+ Self::load_from_file(path)`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`