feat: Vultr/DO/Cloudflare适配器分页处理（避免多VPS/域名同步遗漏）+ 分页测试

2026-08-02 17:59:51 +00:00
parent 8ba58caaa8
commit 3ef84180b4
4 changed files with 135 additions and 68 deletions
@@ -52,38 +52,50 @@ class DigitalOceanAdapter(BaseAdapter):
            return None

    def list_vps(self) -> list:
-        data = self._get("/droplets")
        result = []
-        for d in data.get("droplets", []):
-            image = d.get("image", {})
-            os_name = f"{image.get('distribution', '')} {image.get('name', '')}".strip()
-            mem_mb = d.get("memory") or 0
-            region = d.get("region", {})
-            result.append(
-                NormalizedVPS(
-                    external_id=str(d.get("id")),
-                    name=d.get("name"),
-                    ip_address=self._main_ip(d),
-                    region=region.get("slug") or region.get("name"),
-                    os=os_name or None,
-                    cpu_cores=d.get("vcpus"),
-                    memory_gb=round(mem_mb / 1024, 1) if mem_mb else None,
-                    disk_gb=d.get("disk"),
-                    status="active" if d.get("status") == "active" else (d.get("status") or "unknown"),
-                    currency="USD",
-                    raw=d,
+        page = 1
+        while True:
+            data = self._get(f"/droplets?per_page=100&page={page}")
+            for d in data.get("droplets", []):
+                image = d.get("image", {})
+                os_name = f"{image.get('distribution', '')} {image.get('name', '')}".strip()
+                mem_mb = d.get("memory") or 0
+                region = d.get("region", {})
+                result.append(
+                    NormalizedVPS(
+                        external_id=str(d.get("id")),
+                        name=d.get("name"),
+                        ip_address=self._main_ip(d),
+                        region=region.get("slug") or region.get("name"),
+                        os=os_name or None,
+                        cpu_cores=d.get("vcpus"),
+                        memory_gb=round(mem_mb / 1024, 1) if mem_mb else None,
+                        disk_gb=d.get("disk"),
+                        status="active" if d.get("status") == "active" else (d.get("status") or "unknown"),
+                        currency="USD",
+                        raw=d,
+                    )
                )
-            )
+            if not data.get("links", {}).get("pages", {}).get("next"):
+                break
+            page += 1
        return result

    def list_domains(self) -> list:
-        data = self._get("/domains")
-        return [
-            NormalizedDomain(
-                external_id=d.get("name"),
-                domain_name=d.get("name"),
-                registrar="digitalocean",
-                raw=d,
-            )
-            for d in data.get("domains", [])
-        ]
+        result = []
+        page = 1
+        while True:
+            data = self._get(f"/domains?per_page=100&page={page}")
+            for d in data.get("domains", []):
+                result.append(
+                    NormalizedDomain(
+                        external_id=d.get("name"),
+                        domain_name=d.get("name"),
+                        registrar="digitalocean",
+                        raw=d,
+                    )
+                )
+            if not data.get("links", {}).get("pages", {}).get("next"):
+                break
+            page += 1
+        return result