v0.1.2

Author: swoiow

.github/scripts/build_cn_bin.py

@@ -0,0 +1,46 @@
+import argparse
+import ipaddress
+import urllib.request
+from pathlib import Path
+
+from build_bin import BinBuilder
+
+
+def _load_cidrs(url: str) -> list[str]:
+    with urllib.request.urlopen(url) as response:
+        content = response.read().decode("utf-8")
+    cidrs = []
+    for line in content.splitlines():
+        line = line.strip()
+        if not line or line.startswith("#"):
+            continue
+        cidrs.append(line)
+    return cidrs
+
+
+def _validate_first(cidr_list: list[str]) -> None:
+    if not cidr_list:
+        raise SystemExit("No CIDR data found")
+    ipaddress.ip_network(cidr_list[0], strict=False)
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Build poptrie CN bin from CIDR list")
+    parser.add_argument("--url", required=True, help="CIDR list URL")
+    parser.add_argument("--output", required=True, help="Output bin path")
+    args = parser.parse_args()
+
+    cidrs = _load_cidrs(args.url)
+    _validate_first(cidrs)
+
+    builder = BinBuilder()
+    for cidr in cidrs:
+        builder.add_cidr(cidr)
+
+    output_path = Path(args.output)
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    builder.save(str(output_path))
+
+
+if __name__ == "__main__":
+    main()

.github/scripts/repack_wheels.py

@@ -0,0 +1,81 @@
+import shutil
+import subprocess
+import sys
+import tempfile
+import zipfile
+from pathlib import Path
+
+
+def _read_version(cargo_toml: Path) -> str:
+    for line in cargo_toml.read_text(encoding="utf-8").splitlines():
+        if line.strip().startswith("version"):
+            return line.split("=", 1)[1].strip().strip('"')
+    raise SystemExit("Version not found in Cargo.toml")
+
+
+def _load_setup_template(template_path: Path, version: str) -> str:
+    template = template_path.read_text(encoding="utf-8")
+    if "__VERSION__" not in template:
+        raise SystemExit("setup.py template missing __VERSION__ placeholder")
+    return template.replace("__VERSION__", version)
+
+
+def main() -> None:
+    repo_root = Path.cwd()
+    dist_dir = repo_root / "dist"
+    cargo_toml = repo_root / "Cargo.toml"
+    build_src = repo_root / "build_bin.py"
+    ipsearcher_src = repo_root / "example_production.py"
+    setup_template = repo_root / ".github" / "scripts" / "setup.py"
+
+    if not cargo_toml.exists():
+        raise SystemExit("Cargo.toml not found")
+    if not build_src.exists():
+        raise SystemExit("build_bin.py not found")
+    if not ipsearcher_src.exists():
+        raise SystemExit("example_production.py not found")
+    if not setup_template.exists():
+        raise SystemExit("setup.py template not found")
+
+    version = _read_version(cargo_toml)
+    setup_py = _load_setup_template(setup_template, version)
+
+    wheels = sorted(dist_dir.glob("*.whl"))
+    if not wheels:
+        raise SystemExit("No wheels found in dist")
+
+    for wheel in wheels:
+        temp_dir = Path(tempfile.mkdtemp())
+        with zipfile.ZipFile(wheel, "r") as zf:
+            zf.extractall(temp_dir)
+        package_dir = temp_dir / "poptrie"
+        if not package_dir.exists():
+            raise SystemExit(f"poptrie package not found in {wheel.name}")
+
+        suffixes = (".so", ".pyd", ".dll", ".dylib")
+        for ext_file in temp_dir.iterdir():
+            if ext_file.is_file() and ext_file.name.startswith("poptrie") and ext_file.suffix in suffixes:
+                target = package_dir / ext_file.name
+                if not target.exists():
+                    shutil.move(str(ext_file), str(target))
+
+        shutil.copy2(build_src, package_dir / "build.py")
+        shutil.copy2(ipsearcher_src, package_dir / "ipsearcher.py")
+        (temp_dir / "setup.py").write_text(setup_py, encoding="utf-8")
+
+        wheel.unlink()
+        subprocess.run(
+            [sys.executable, "setup.py", "bdist_wheel"],
+            cwd=temp_dir,
+            check=True,
+        )
+        built_wheels = sorted((temp_dir / "dist").glob("*.whl"))
+        if not built_wheels:
+            raise SystemExit("bdist_wheel did not produce a wheel")
+        for built_wheel in built_wheels:
+            shutil.copy2(built_wheel, dist_dir / built_wheel.name)
+        shutil.rmtree(temp_dir)
+
+
+if __name__ == "__main__":
+    main()

.github/scripts/setup.py

@@ -0,0 +1,16 @@
+from setuptools import find_packages, setup
+
+
+setup(
+    name="poptrie",
+    version="__VERSION__",
+    description="Fast IP lookup using poptrie",
+    author="HarmonSir",
+    author_email="[email protected]",
+    license="Apache-2.0",
+    packages=find_packages(),
+    include_package_data=True,
+    package_data={
+        "poptrie": ["*.so", "*.pyd", "*.dll", "*.dylib"],
+    },
+)

.github/workflows/cron-release-bin.yml

@@ -0,0 +1,79 @@
+name: Cron CN Bin Release
+
+on:
+  schedule:
+    - cron: "0 1 */14 * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: cron-bin
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Create venv
+        run: |
+          python -m venv .venv
+          echo "PYTHON_EXEC=$PWD/.venv/bin/python" >> $GITHUB_ENV
+
+      - name: Install build deps
+        run: $PYTHON_EXEC -m pip install --upgrade pip
+
+      - name: Build CN bin
+        run: |
+          export PYTHONPATH="$GITHUB_WORKSPACE"
+          $PYTHON_EXEC .github/scripts/build_cn_bin.py \
+            --url "https://github.com/Loyalsoldier/geoip/raw/refs/heads/release/text/cn.txt" \
+            --output dist/china-ip.bin
+
+      - name: Set release tag
+        run: echo "CRON_TAG=cron-$(date -u +%Y%m%d)" >> $GITHUB_ENV
+
+      - name: Publish cron release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.CRON_TAG }}
+          name: ${{ env.CRON_TAG }}
+          files: dist/china-ip.bin
+
+      - name: Cleanup old cron releases
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 100,
+            });
+            const cronReleases = releases
+              .filter((release) => release.tag_name.startsWith("cron-"))
+              .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+            const toDelete = cronReleases.slice(3);
+            for (const release of toDelete) {
+              await github.rest.repos.deleteRelease({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: release.id,
+              });
+              await github.rest.git.deleteRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: `tags/${release.tag_name}`,
+              });
+            }

.github/workflows/release.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
@@ -56,10 +60,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -81,15 +85,21 @@ jobs:
           echo "PYTHON_EXEC=$(pwd)/.venv/Scripts/python.exe" >> $GITHUB_ENV
 
       - name: Install maturin
-        run: $PYTHON_EXEC -m pip install --upgrade pip maturin
+        run: $PYTHON_EXEC -m pip install --upgrade pip maturin setuptools wheel
 
       - name: Build wheels
         run: $PYTHON_EXEC -m maturin build --release --out dist
 
+      - name: Repack wheels
+        run: |
+          $PYTHON_EXEC .github/scripts/repack_wheels.py
+
       - name: Install wheel
         run: $PYTHON_EXEC -m pip install dist/*.whl
 
       - name: Run Tests
+        env:
+          POPTRIE_TEST_GEOIP_URL: "https://github.com/Loyalsoldier/geoip/raw/refs/heads/release/text/cn.txt"
         run: |
           $PYTHON_EXEC -m unittest discover tests
 
@@ -106,6 +116,22 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+
+      - name: Create venv
+        run: |
+          python -m venv .venv
+          echo "PYTHON_EXEC=$PWD/.venv/bin/python" >> $GITHUB_ENV
+
+      - name: Install build deps
+        run: $PYTHON_EXEC -m pip install --upgrade pip
+
       - name: Cleanup latest release assets
         uses: actions/github-script@v7
         with:
@@ -129,13 +155,45 @@ jobs:
                 throw error;
               }
             }
+      - name: Remove latest release
+        uses: actions/github-script@v7
+        with:
+          script: |
+            try {
+              const release = await github.rest.repos.getReleaseByTag({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                tag: "latest",
+              });
+              await github.rest.repos.deleteRelease({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: release.data.id,
+              });
+              await github.rest.git.deleteRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: "tags/latest",
+              });
+            } catch (error) {
+              if (error.status !== 404) {
+                throw error;
+              }
+            }
 
       - name: Download wheels
         uses: actions/download-artifact@v4
         with:
           path: dist
           merge-multiple: true
 
+      - name: Build CN bin
+        run: |
+          export PYTHONPATH="$GITHUB_WORKSPACE"
+          $PYTHON_EXEC .github/scripts/build_cn_bin.py \
+            --url "https://github.com/Loyalsoldier/geoip/raw/refs/heads/release/text/cn.txt" \
+            --output dist/china-ip.bin
+
       - name: Publish latest release
         uses: softprops/action-gh-release@v2
         with:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "poptrie"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 [lib]

build_bin.py

@@ -125,11 +125,12 @@ def save(self, output_path):
         print(f"构建完成！压缩后大小: {len(final_data) / 1024:.2f} KB")
 
 
-# --- 使用方式 ---
-builder = BinBuilder()
-# 这里放入你收集的中国 IP CIDR 列表
-china_cidrs = ["1.0.1.0/24", "110.16.0.0/12", "240e::/18"]
-for c in china_cidrs:
-    builder.add_cidr(c)
-
-builder.save("china_ip.bin")
+if __name__ == '__main__':
+    # --- 使用方式 ---
+    builder = BinBuilder()
+    # 这里放入你收集的中国 IP CIDR 列表
+    china_cidrs = ["1.0.1.0/24", "110.16.0.0/12", "240e::/18"]
+    for c in china_cidrs:
+        builder.add_cidr(c)
+
+    builder.save("china_ip.bin")