never-primp 2.4.0__tar.gz → 2.4.2__tar.gz

{never_primp-2.4.0 → never_primp-2.4.2}/.github/workflows/build.yml

@@ -26,6 +26,7 @@ permissions:
 
 jobs:
   # ==================== Linux 平台构建 ====================
+  # 覆盖目标：glibc (manylinux) x86_64/aarch64 + musl x86_64/aarch64
   build-linux:
     name: Build Linux ${{ matrix.target }}
     runs-on: ubuntu-latest
@@ -35,38 +36,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64        # Linux x64 (最常用)
-#          - aarch64       # Linux ARM64 (服务器)
+        include:
+          # glibc 2.28+：兼容主流 Linux 发行版（Ubuntu 18.04+, Debian 10+, CentOS 8+）
+          - target: x86_64
+            manylinux: '2_28'
+          # musl x86_64：Alpine Linux / Docker scratch / 静态链接二进制
+          - target: x86_64-unknown-linux-musl
+            manylinux: 'musllinux_1_2'
+
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Configure git to use GitHub token
         run: |
           git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libclang-dev \
-            clang \
-            cmake \
-            build-essential \
-            pkg-config \
-            gcc-multilib \
-            libssl-dev
-
-      - name: Find and set libclang path
-        run: |
-          # 查找 libclang.so 并设置环境变量
-          LIBCLANG_PATH=$(find /usr/lib -name "libclang.so*" | head -1 | xargs dirname)
-          echo "LIBCLANG_PATH=$LIBCLANG_PATH" >> $GITHUB_ENV
-          echo "Found libclang at: $LIBCLANG_PATH"
-          ls -la $LIBCLANG_PATH/libclang.so* || true
+          python-version: '3.11'
 
       - name: Build wheels
         env:
@@ -76,29 +64,44 @@ jobs:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
           sccache: 'true'
-          manylinux: ${{ matrix.target == 'x86_64' && '2_28' || '2_28' }}
+          manylinux: ${{ matrix.manylinux }}
           before-script-linux: |
             git config --global url."https://x-access-token:$MATURIN_GIT_TOKEN@github.com/".insteadOf "https://github.com/"
-            # 检测包管理器并安装依赖
-            if command -v yum &> /dev/null; then
-              echo "Using yum (manylinux container)"
-              yum install -y clang llvm-devel cmake glibc-devel glibc-headers kernel-headers
-
-              # 设置 bindgen 的 clang 参数，确保能找到系统头文件
-              ARCH=$(uname -m)
-              export BINDGEN_EXTRA_CLANG_ARGS="-I/usr/include -I/usr/include/$ARCH-linux-gnu"
-              echo "BINDGEN_EXTRA_CLANG_ARGS=$BINDGEN_EXTRA_CLANG_ARGS"
-
-              # 查找并设置 libclang
-              export LIBCLANG_PATH="${LIBCLANG_PATH:-$(find /usr/lib* -name "libclang.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || echo "/usr/lib64")}"
-              echo "Using LIBCLANG_PATH=$LIBCLANG_PATH"
+
+            ARCH=$(uname -m)
+            LIBCLANG_PATH=""
+            BINDGEN_EXTRA_CLANG_ARGS=""
+
+            if command -v apk &> /dev/null; then
+              # ── musl/Alpine 容器 ──────────────────────────────────────
+              echo "Detected Alpine (musl) container"
+              apk add --no-cache clang llvm-dev cmake make musl-dev perl
+
+              LIBCLANG_PATH=$(find /usr/lib/llvm*/lib -name "libclang.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || true)
+              LIBCLANG_PATH="${LIBCLANG_PATH:-/usr/lib}"
+              BINDGEN_EXTRA_CLANG_ARGS="-I/usr/include"
+
+            elif command -v yum &> /dev/null; then
+              # ── manylinux 容器（CentOS/RHEL 基底） ───────────────────
+              echo "Detected manylinux container (yum)"
+              yum install -y clang llvm-devel cmake perl-core glibc-devel glibc-headers kernel-headers
+
+              LIBCLANG_PATH=$(find /usr/lib* -name "libclang.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || true)
+              LIBCLANG_PATH="${LIBCLANG_PATH:-/usr/lib64}"
+              BINDGEN_EXTRA_CLANG_ARGS="-I/usr/include -I/usr/include/$ARCH-linux-gnu"
+
             else
-              echo "Not in manylinux container, using host dependencies"
+              echo "Unknown container environment, using system defaults"
+              LIBCLANG_PATH=$(find /usr/lib* -name "libclang.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || true)
+              LIBCLANG_PATH="${LIBCLANG_PATH:-/usr/lib}"
             fi
 
-            # 验证
-            ls -la $LIBCLANG_PATH/libclang* 2>/dev/null || echo "libclang not found, relying on system defaults"
-            clang --version 2>/dev/null || echo "clang not in PATH"
+            export LIBCLANG_PATH
+            export BINDGEN_EXTRA_CLANG_ARGS
+
+            echo "LIBCLANG_PATH=$LIBCLANG_PATH"
+            echo "BINDGEN_EXTRA_CLANG_ARGS=$BINDGEN_EXTRA_CLANG_ARGS"
+            clang --version 2>/dev/null || echo "clang not found in PATH"
 
       - name: List built wheels
         run: ls -lh dist/
@@ -119,18 +122,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [x64]
+        target:
+          - x64     # Windows x86_64（主流桌面/服务器）
+          - x86     # Windows x86（32 位兼容）
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Configure git to use GitHub token
         shell: bash
         run: |
           git config --global url."https://x-access-token:$GITHUB_TOKEN@github.com/".insteadOf "https://github.com/"
         env:
           GITHUB_TOKEN: ${{ secrets.DD_TOKEN }}
+
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.11'
           architecture: ${{ matrix.target }}
 
       - name: Build wheels
@@ -145,15 +153,6 @@ jobs:
       - name: List built wheels
         run: dir dist
 
-      - name: Debug wheel contents
-        shell: powershell
-        run: |
-          $wheel = Get-ChildItem dist\*.whl | Select-Object -First 1
-          Write-Host "=== Wheel contents ==="
-          python -m zipfile -l $wheel
-          Write-Host "`n=== Looking for never_primp files ==="
-          python -m zipfile -l $wheel | Select-String "never_primp"
-
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -171,16 +170,19 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - x86_64        # Intel Mac
-          - aarch64       # Apple Silicon (M1/M2/M3)
+          - x86_64   # Intel Mac（macOS 10.12+）
+          - aarch64  # Apple Silicon M1/M2/M3/M4
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Configure git to use GitHub token
         run: |
           git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Build wheels
         env:
@@ -209,9 +211,11 @@ jobs:
       MATURIN_GIT_TOKEN: ${{ secrets.DD_TOKEN }}
     steps:
       - uses: actions/checkout@v4
+
       - name: Configure git to use GitHub token
         run: |
           git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
@@ -228,9 +232,11 @@ jobs:
           path: dist
 
   # ==================== 发布到 PyPI ====================
+  # 仅在 tag 推送（v*.*.*）或手动指定 publish_to_pypi=true 时执行
   publish-to-pypi:
     name: Publish to PyPI
     runs-on: ubuntu-latest
+
     needs: [build-linux, build-windows, build-macos, build-sdist]
 
     steps:
@@ -244,17 +250,14 @@ jobs:
       - name: List all packages
         run: |
           echo "========================================="
-          echo "📦 准备发布的所有包："
+          echo "准备发布的所有包："
           echo "========================================="
           ls -lh dist/
           echo ""
-          echo "========================================="
-          echo "📋 包列表："
-          echo "========================================="
+          echo "包列表（共 $(ls dist/ | wc -l) 个）："
           for file in dist/*; do
-            echo "  ✓ $(basename $file)"
+            echo "  $(basename $file)"
           done
-          echo ""
           echo "========================================="
 
       - name: Publish to PyPI
@@ -268,11 +271,8 @@ jobs:
       - name: Success message
         run: |
           echo "========================================="
-          echo "✅ 发布成功！"
+          echo "发布成功！"
+          echo "========================================="
+          echo "pip install never_primp"
+          echo "https://pypi.org/project/never_primp/"
           echo "========================================="
-          echo "用户现在可以通过以下命令安装："
-          echo "  pip install never_primp"
-          echo ""
-          echo "查看项目："
-          echo "  https://pypi.org/project/never_primp/"
-          echo "========================================="

{never_primp-2.4.0 → never_primp-2.4.2}/Cargo.lock

@@ -44,15 +44,6 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
-[[package]]
-name = "arc-swap"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.4.41"
@@ -71,12 +62,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -124,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "btls"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5395615506d423c716eb9d578c6cce87c583a9756e4dc46ffe59ac19dd6fe5f9"
+checksum = "0225e25af0fffc06c67ec4b965a4aeccc6fd01bfdb7660b6b6d437318fafd39f"
 dependencies = [
  "bitflags",
  "btls-sys",
@@ -137,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "btls-sys"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbf6abde429d7f18aa7e8461d67d5da2b9b8545483dc580cc16f582702bb871"
+checksum = "6c5faf2e4ba808c04831a4bd77ac9a26256b25efdf3bc59e846b77e083a86cef"
 dependencies = [
  "bindgen",
  "cmake",
@@ -280,22 +265,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -450,28 +419,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "html2text"
-version = "0.16.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d23156ea4dbe6b37ad48fab2da56ff27b0f6192fb5db210c44eb07bfe6e787"
-dependencies = [
- "html5ever",
- "tendril",
- "thiserror 2.0.18",
- "unicode-width",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
-dependencies = [
- "log",
- "markup5ever",
-]
-
 [[package]]
 name = "http"
 version = "1.4.0"
@@ -508,7 +455,7 @@ dependencies = [
 [[package]]
 name = "http2"
 version = "0.5.12"
-source = "git+https://github.com/neverl805/http2#96c3c028b5ff75c2232d7fbb6683bda668810d26"
+source = "git+https://github.com/neverl805/http2#8d10bd499fece86e15739f878e25e7aa9f0947b5"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -686,9 +633,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "libloading"
@@ -715,12 +662,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-
 [[package]]
 name = "lru"
 version = "0.16.3"
@@ -730,17 +671,6 @@ dependencies = [
  "hashbrown",
 ]
 
-[[package]]
-name = "markup5ever"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
-dependencies = [
- "log",
- "tendril",
- "web_atoms",
-]
-
 [[package]]
 name = "memchr"
 version = "2.8.0"
@@ -792,38 +722,23 @@ dependencies = [
 
 [[package]]
 name = "never_primp"
-version = "2.4.0"
+version = "2.4.2"
 dependencies = [
  "anyhow",
  "cookie",
  "encoding_rs",
  "foldhash",
- "html2text",
  "http",
- "http-body-util",
  "indexmap",
  "mime",
- "pem",
  "pyo3",
- "pyo3-log",
  "pythonize",
  "serde_json",
- "serde_urlencoded",
- "thiserror 2.0.18",
  "tokio",
- "tokio-util",
- "tracing",
- "urlencoding",
  "wreq",
  "wreq-util",
 ]
 
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -880,61 +795,12 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64",
- "serde_core",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "phf"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
-dependencies = [
- "phf_shared",
- "serde",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
-dependencies = [
- "fastrand",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -968,12 +834,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -1019,17 +879,6 @@ dependencies = [
  "pyo3-build-config",
 ]
 
-[[package]]
-name = "pyo3-log"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c2ec80932c5c3b2d4fbc578c9b56b2d4502098587edb8bef5b6bfcad43682e"
-dependencies = [
- "arc-swap",
- "log",
- "pyo3",
-]
-
 [[package]]
 name = "pyo3-macros"
 version = "0.28.2"
@@ -1209,28 +1058,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
-dependencies = [
- "errno",
- "libc",
-]
-
 [[package]]
 name = "simd-adler32"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
-[[package]]
-name = "siphasher"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
-
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -1259,30 +1092,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
-[[package]]
-name = "string_cache"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
-dependencies = [
- "new_debug_unreachable",
- "parking_lot",
- "phf_shared",
- "precomputed-hash",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "strum"
 version = "0.27.2"
@@ -1338,32 +1147,13 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
-[[package]]
-name = "tendril"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24"
-dependencies = [
- "new_debug_unreachable",
- "utf-8",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
-dependencies = [
- "thiserror-impl 2.0.18",
+ "thiserror-impl",
 ]
 
 [[package]]
@@ -1377,17 +1167,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "thiserror-impl"
-version = "2.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "time"
 version = "0.3.47"
@@ -1438,35 +1217,21 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2",
- "tokio-macros",
  "windows-sys",
 ]
 
 [[package]]
 name = "tokio-btls"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d38dab03d8724de19c5efede757125f7f5f3c68261066f6e28323751f7dc313"
+checksum = "9ee6a3cf11812d7bd88a33dfbe4b2de192269bd967697afc99e7cd899a162a15"
 dependencies = [
  "btls",
  "tokio",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tokio-socks"
 version = "0.5.2"
@@ -1475,7 +1240,7 @@ checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
  "futures-util",
- "thiserror 1.0.69",
+ "thiserror",
  "tokio",
 ]
 
@@ -1539,38 +1304,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
-[[package]]
-name = "tracing"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -1609,12 +1342,6 @@ version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
-[[package]]
-name = "unicode-width"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-
 [[package]]
 name = "url"
 version = "2.5.8"
@@ -1627,18 +1354,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -1675,18 +1390,6 @@ dependencies = [
  "wit-bindgen",
 ]
 
-[[package]]
-name = "web_atoms"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576"
-dependencies = [
- "phf",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
-]
-
 [[package]]
 name = "webpki-root-certs"
 version = "1.0.6"
@@ -1742,7 +1445,7 @@ checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 [[package]]
 name = "wreq"
 version = "6.0.0-rc.28"
-source = "git+https://github.com/neverl805/wreq#fa881593d1a85912a4a0327cf03254d38139c9b5"
+source = "git+https://github.com/neverl805/wreq#7f260cc1aefef20bb3d118fe68d9141bf6e4f985"
 dependencies = [
  "brotli",
  "btls",

never_primp-2.4.2/Cargo.toml

@@ -0,0 +1,58 @@
+[package]
+name = "never_primp"
+version = "2.4.2"
+edition = "2024"
+description = "基于原primp 用rust重构优化的python高效请求库"
+authors = ["Neverland"]
+readme = "README.md"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "never_primp"
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39", "indexmap", "anyhow", "multiple-pymethods"] }
+anyhow = "1.0.98"
+
+# CI/Release: git 版本（构建时通过 MATURIN_GIT_TOKEN 鉴权）
+wreq = { git = "https://github.com/neverl805/wreq", features = [
+#wreq = { path = "/Users/jiarongxu/PyCharmMiscProject/my_github/wreq", features = [
+    "json",
+    "cookies",
+    "socks",
+    "gzip",
+    "brotli",
+    "zstd",
+    "deflate",
+    "multipart",
+    "stream",
+    "query",      # For query() method
+    "form",       # For form() method
+] }
+#wreq-util = { path = "/Users/jiarongxu/PyCharmMiscProject/my_github/wreq-util", features = ["emulation-serde", "emulation-rand"] }
+wreq-util = { git = "https://github.com/neverl805/wreq-util", features = ["emulation-serde", "emulation-rand"] }
+
+encoding_rs = { version = "0.8.35" }
+foldhash = "0.2.0"
+indexmap = { version = "2.9.0", features = ["serde"] }
+# 仅保留库实际使用的 tokio 特性，移除 "full" 以减小编译体积
+# rt-multi-thread: runtime.rs 中 Builder::new_multi_thread()
+# fs: client.rs 中 tokio::fs::read()（multipart 文件上传）
+tokio = { version = "1.44.2", features = ["rt-multi-thread", "fs"] }
+
+pythonize = "0.28.0"
+serde_json = "1.0.140"
+
+http = "1.4.0"
+cookie = "0.18"
+mime = "0.3.17"
+
+[profile.release]
+codegen-units = 1        # 单编译单元，最大化 LTO 跨模块优化
+lto = "fat"              # 全程序链接时优化，消除跨 crate 的死代码
+opt-level = 3            # 最高优化级别
+panic = "abort"          # panic 直接 abort，消除 unwinding 代码
+strip = "symbols"        # 剥离符号表，减小二进制体积
+debug = false            # 不生成调试信息
+overflow-checks = false  # 关闭整数溢出检查（release 下约 5% 性能提升）

{never_primp-2.4.0 → never_primp-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: never_primp
-Version: 2.4.0
+Version: 2.4.2
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{never_primp-2.4.0 → never_primp-2.4.2}/example/basic_usage.py

@@ -48,8 +48,9 @@ cookies = {
     'sdfas':'ddd',
     'swqrttwe':'ddd'
 }
-session = never_primp.Client(impersonate='chrome_143',impersonate_os='windows')
-# res = session.get('https://tls.peet.ws/api/all',verify=False,headers=safari_headers,cookies=cookies)
+session = never_primp.Client(impersonate='chrome_143',impersonate_os='windows',proxy='http://127.0.0.1:9000')
+session.set_cookies('https://tls.peet.ws',cookies)
+res = session.get('https://tls.peet.ws/api/all',verify=False,headers=chrome_headers)
 
 
 # res = session.get('https://47.113.101.23:4442/')
@@ -57,7 +58,7 @@ session = never_primp.Client(impersonate='chrome_143',impersonate_os='windows')
 
 # res = session.get('https://fanpa.weneedstudy.cn:8443/complexTest')
 # res = session.get('https://tls.browserleaks.com/')
-res = session.get('https://tls.tsvmp.com:38080/cbbiyhh',verify=False,headers=chrome_headers,cookies=cookies)
+# res = session.get('https://tls.tsvmp.com:38080/cbbiyhh',verify=False,headers=chrome_headers,cookies=cookies)
 # res = session.get('https://tls.jsvmp.top:38080',split_cookie=True)
 
 

never_primp-2.4.2/example/tls_check.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+import never_primp
+
+def test_concurrent_requests():
+
+    session = never_primp.Client(impersonate='chrome_145')
+
+    chrome_headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+        "Accept-Encoding": "gzip, deflate, br, zstd",
+        "sec-ch-ua": "\"Chromium\";v=\"142\", \"Google Chrome\";v=\"142\", \"Not_A Brand\";v=\"99\"",
+        "sec-ch-ua-mobile": "?0",
+        "sec-ch-ua-platform": "\"Windows\"",
+        "upgrade-insecure-requests": "1",
+        "sec-fetch-site": "cross-site",
+        "sec-fetch-mode": "navigate",
+        "sec-fetch-user": "?1",
+        "sec-fetch-dest": "document",
+        "accept-language": "en,zh-CN;q=0.9,zh;q=0.8,zh-HK;q=0.7",
+        "priority": "u=0, i"
+    }
+    try:
+        response = session.get(f"https://www.ma2e.top:4445/", headers=chrome_headers)
+        print(response)
+        print(response.status_code)
+        print(response.text)
+    except :
+        print('========================')
+
+    response = session.get(f"https://www.ma2e.top:4445/", headers=chrome_headers, verify=False)
+    print(response)
+    print(response.status_code)
+    print(response.text)
+
+
+if __name__ == "__main__":
+    test_concurrent_requests()

{never_primp-2.4.0 → never_primp-2.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "never_primp"
-version = "2.4.0"
+version = "2.4.2"
 description = "基于原primp 用rust重构调整的python请求库 - The fastest python HTTP client that can impersonate web browsers"
 readme = "README.md"
 requires-python = ">=3.9"

{never_primp-2.4.0 → never_primp-2.4.2}/src/client.rs

@@ -164,8 +164,12 @@ impl RClient {
         }
 
         // Cookie store - create Jar and pass to client
+        // compressed=true  → single merged "Cookie: a=1; b=2" header (HTTP/1.1 style)
+        // compressed=false → separate "cookie: a=1" / "cookie: b=2" headers (HTTP/2 style)
+        // When split_cookies=true, use uncompressed so session-level cookies are also split.
         let cookie_jar = if cookie_store.unwrap_or(true) {
-            let jar = Arc::new(wreq::cookie::Jar::new(true)); // compressed by default
+            let compressed = !split_cookies.unwrap_or(false);
+            let jar = Arc::new(wreq::cookie::Jar::new(compressed));
             client_builder = client_builder.cookie_provider(jar.clone());
             Some(jar)
         } else {
@@ -739,7 +743,7 @@ impl RClient {
             // Using OrigHeaderMap for precise header ordering (anti-detection)
             // Using HeaderMap for efficient header storage with insert (override) behavior
 
-            use wreq::header::{HeaderMap, HeaderValue, OrigHeaderMap};
+            use wreq::header::{HeaderMap, HeaderValue, OrigHeaderMap, OrigHeaderName};
 
             // Step 1: Collect all user headers into a HeaderMap (insert = override, not append)
             let mut user_headermap = HeaderMap::new();
@@ -787,9 +791,39 @@ impl RClient {
                 }
             }
 
-            // Add cookie at the end if present
-            if cookies.is_some() {
-                orig_headers.insert("cookie".to_string());
+            // Add "cookie" to orig_headers for correct position control.
+            // Also include session-level split cookies (auto-injected by jar) so sort_headers
+            // can position them correctly even when no explicit cookies are passed.
+            let needs_cookie_in_orig = cookies.is_some() || effective_split_cookies == Some(true);
+            if needs_cookie_in_orig {
+                // Browser behavior (HTTP/2): split cookie headers appear *before* the
+                // "priority" header. If priority is currently last, rebuild orig_headers
+                // with cookie inserted immediately before it.
+                let last_is_priority = effective_split_cookies == Some(true)
+                    && orig_headers
+                        .iter()
+                        .last()
+                        .map(|(name, _)| name.as_str().eq_ignore_ascii_case("priority"))
+                        .unwrap_or(false);
+
+                if last_is_priority {
+                    // Collect all OrigHeaderName values preserving original casing
+                    let all_orig: Vec<OrigHeaderName> = orig_headers
+                        .iter()
+                        .map(|(_, orig_name)| orig_name.clone())
+                        .collect();
+                    orig_headers = OrigHeaderMap::new();
+                    // Re-insert all except the last (priority)
+                    for orig_name in all_orig[..all_orig.len() - 1].iter() {
+                        orig_headers.insert(orig_name.clone());
+                    }
+                    // Insert cookie before priority
+                    orig_headers.insert("cookie".to_string());
+                    // Re-insert priority (preserving original casing)
+                    orig_headers.insert(all_orig.last().unwrap().clone());
+                } else {
+                    orig_headers.insert("cookie".to_string());
+                }
             }
 
             // Step 4: Apply all user headers at once using insert (override) behavior

never_primp-2.4.0/Cargo.toml

@@ -1,62 +0,0 @@
-[package]
-name = "never_primp"
-version = "2.4.0"
-edition = "2024"
-description = "基于原primp 用rust重构优化的python高效请求库"
-authors = ["Neverland"]
-readme = "README.md"
-
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[lib]
-name = "never_primp"
-crate-type = ["cdylib"]
-
-[dependencies]
-pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py38", "indexmap", "anyhow", "multiple-pymethods"] }
-anyhow = "1.0.98"
-thiserror = "2.0.9"
-pem = "3.0.4"
-tracing = { version = "0.1.41", features = ["log-always"] }
-pyo3-log = "0.13.3"
-
-# Local development path for wreq 6.0.0-rc.25+
-# cmake --build . --config Release
-#wreq = { path = "G:/myself_rust_p/wreq", features = [
-wreq = { git = "https://github.com/neverl805/wreq", features = [
-    "json",
-    "cookies",
-    "socks",
-    "gzip",
-    "brotli",
-    "zstd",
-    "deflate",
-    "multipart",
-    "stream",
-    "query",      # For query() method
-    "form",       # For form() method
-] }
-# Use git version of wreq-util temporarily until local version is updated
-wreq-util = { git = "https://github.com/neverl805/wreq-util", features = ["emulation-serde", "emulation-rand"] }
-#wreq-util = { path = "G:/myself_rust_p/wreq-util", features = ["emulation-serde", "emulation-rand"] }
-encoding_rs = { version = "0.8.35" }
-foldhash = "0.2.0"
-indexmap = { version = "2.9.0", features = ["serde"] }
-tokio = { version = "1.44.2", features = ["full"] }
-tokio-util = { version = "0.7.14", features = ["codec"] }  # for multipart
-html2text = "0.16.0"
-pythonize = "0.28.0"
-serde_json = "1.0.140"
-serde_urlencoded = "0.7.1"
-urlencoding = "2.1.3"
-http-body-util = "0.1.3"
-http = "1.4.0"
-cookie = "0.18"
-mime = "0.3.17"
-
-[profile.release]
-codegen-units = 1
-lto = "fat"
-opt-level = 3
-panic = "abort"
-strip = "symbols"