feat(api): support v6

.github/workflows/ci.yaml

@@ -41,5 +41,4 @@ jobs:
     - name: Upload coverage reports to Codecov
       uses: codecov/codecov-action@v5
       with:
-        fail_ci_if_error: true
         token: ${{ secrets.CODECOV_TOKEN }}

analysis_options.yaml

@@ -27,3 +27,6 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+analyzer:
+  errors:
+    invalid_annotation_target: ignore

docker-compose.yaml

@@ -22,3 +22,27 @@ services:
     environment:
       TZ: 'Asia/Tokyo'
       FTLCONF_webserver_api_password: 'test123'
+
+  piholeV52:
+    container_name: piholeV52
+    image: pihole/pihole:latest
+    ports:
+      - "56:53/tcp"
+      - "56:53/udp"
+      - "8082:80/tcp"
+      - "1446:443/tcp"
+    environment:
+      TZ: 'Asia/Tokyo'
+      WEBPASSWORD: 'test456'
+
+  piholeV62:
+    container_name: piholeV62
+    image: pihole/pihole:development
+    ports:
+      - "57:53/tcp"
+      - "57:53/udp"
+      - "8083:80/tcp"
+      - "1447:443/tcp"
+    environment:
+      TZ: 'Asia/Tokyo'
+      FTLCONF_webserver_api_password: 'test456'

lib/constants/query_types.dart

@@ -0,0 +1,252 @@
+import 'package:flutter/material.dart';
+import 'package:pi_hole_client/models/query_status.dart';
+
+final List<QueryStatus> queryStatusesV5 = [
+  QueryStatus(
+    index: 1,
+    key: "1",
+    text: "Blocked (gravity)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 2,
+    key: "2",
+    text: "OK (forwarded)",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 3,
+    key: "3",
+    text: "OK (cache)",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 4,
+    key: "4",
+    text: "Blocked (regex blacklist)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 5,
+    key: "5",
+    text: "Blocked (exact blacklist)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 6,
+    key: "6",
+    text: "Blocked (external, IP)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 7,
+    key: "7",
+    text: "Blocked (external, NULL)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 8,
+    key: "8",
+    text: "Blocked (external, NXRA)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 9,
+    key: "9",
+    text: "Blocked (gravity, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 10,
+    key: "10",
+    text: "Blocked (regex blacklist, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 11,
+    key: "11",
+    text: "Blocked (exact blacklist, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 12,
+    key: "12",
+    text: "Retried",
+    color: Colors.blue,
+    icon: Icons.refresh_rounded,
+  ),
+  QueryStatus(
+    index: 13,
+    key: "13",
+    text: "Retried (ignored)",
+    color: Colors.blue,
+    icon: Icons.refresh_rounded,
+  ),
+  QueryStatus(
+    index: 14,
+    key: "14",
+    text: "OK (already forwarded)",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 15,
+    key: "15",
+    text: "Database is busy",
+    color: Colors.orange,
+    icon: Icons.storage_rounded,
+    isShown: false,
+  ),
+];
+
+final List<QueryStatus> queryStatusesV6 = [
+  QueryStatus(
+    index: 1,
+    key: "UNKNOWN",
+    text: "UNKNOWN",
+    color: Colors.grey,
+    icon: Icons.question_mark_rounded,
+    isShown: false,
+  ),
+  QueryStatus(
+    index: 2,
+    key: "GRAVITY",
+    text: "Blocked (gravity)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 3,
+    key: "FORWARDED",
+    text: "Forwarded",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 4,
+    key: "CACHE",
+    text: "Served from cache",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 5,
+    key: "REGEX",
+    text: "Blocked (regex)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 6,
+    key: "DENYLIST",
+    text: "Blocked (exact)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 7,
+    key: "EXTERNAL_BLOCKED_IP",
+    text: "Blocked (external, IP)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 8,
+    key: "EXTERNAL_BLOCKED_NULL",
+    text: "Blocked (external, NULL)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 9,
+    key: "EXTERNAL_BLOCKED_NXRA",
+    text: "Blocked (external, NXRA)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 10,
+    key: "GRAVITY_CNAME",
+    text: "Blocked (gravity, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 11,
+    key: "REGEX_CNAME",
+    text: "Blocked (regex denied, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 12,
+    key: "DENYLIST_CNAME",
+    text: "Blocked (exact denied, CNAME)",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+  ),
+  QueryStatus(
+    index: 13,
+    key: "RETRIED",
+    text: "Retried",
+    color: Colors.blue,
+    icon: Icons.refresh_rounded,
+  ),
+  QueryStatus(
+    index: 14,
+    key: "RETRIED_DNSSEC",
+    text: "Retried (ignored)",
+    color: Colors.blue,
+    icon: Icons.refresh_rounded,
+  ),
+  QueryStatus(
+    index: 15,
+    key: "IN_PROGRESS",
+    text: "Already forwarded, awaiting reply",
+    color: Colors.green,
+    icon: Icons.verified_user_rounded,
+  ),
+  QueryStatus(
+    index: 16,
+    key: "DBBUSY",
+    text: "DBBUSY",
+    color: Colors.orange,
+    icon: Icons.storage_rounded,
+    isShown: false,
+  ),
+  QueryStatus(
+    index: 17,
+    key: "SPECIAL_DOMAIN",
+    text: "SPECIAL_DOMAIN",
+    color: Colors.red,
+    icon: Icons.gpp_bad_rounded,
+    isShown: false,
+  ),
+  QueryStatus(
+    index: 18,
+    key: "CACHE_STALE",
+    text: "Served by cache optimizer",
+    color: Colors.blue,
+    icon: Icons.cached_rounded,
+    isShown: false,
+  ),
+  QueryStatus(
+    index: 19,
+    key: "EXTERNAL_BLOCKED_EDE15",
+    text: "EXTERNAL_BLOCKED_EDE15",
+    color: Colors.orange,
+    icon: Icons.question_mark_rounded,
+    isShown: false,
+  ),
+];

lib/gateways/api_gateway_factory.dart

@@ -1,6 +1,6 @@
 import 'package:pi_hole_client/gateways/api_gateway_interface.dart';
 import 'package:pi_hole_client/gateways/v5/api_gateway_v5.dart';
-// import 'package:pi_hole_client/gateways/v5/api_gateway_v6.dart';
+import 'package:pi_hole_client/gateways/v6/api_gateway_v6.dart';
 import 'package:pi_hole_client/models/server.dart';
 
 class ApiGatewayFactory {
@@ -9,8 +9,7 @@ class ApiGatewayFactory {
     if (version == 'v5') {
       return ApiGatewayV5(server);
     } else if (version == 'v6') {
-      // return ApiGatewayV6(server);
-      throw Exception('Not implemented yet');
+      return ApiGatewayV6(server);
     } else {
       throw Exception('Unsupported server version: $version');
     }

lib/gateways/v5/api_gateway_v5.dart

@@ -152,13 +152,13 @@ class ApiGatewayV5 implements ApiGateway {
             } else {
               final enableOrDisableParsed = jsonDecode(enableOrDisable.body);
               if (enableOrDisableParsed.runtimeType != List) {
-                final phpSessId = enableOrDisable.headers['set-cookie']!
+                final sid = enableOrDisable.headers['set-cookie']!
                     .split(';')[0]
                     .split('=')[1];
                 return LoginQueryResponse(
                     result: APiResponseType.success,
                     status: statusParsed['status'],
-                    phpSessId: phpSessId);
+                    sid: sid);
               } else {
                 return LoginQueryResponse(
                     result: APiResponseType.authError,