fix(core): enhance reload UI

Author: maksimkurb

CMakeLists.txt

@@ -258,6 +258,7 @@ set(SOURCES
   src/runtime/resolver_coordinator.cpp
   src/runtime/runtime_state_machine.cpp
   src/runtime/operation_coordinator.cpp
+  src/runtime/lifecycle_operation.cpp
   src/firewall/firewall_reconciler.cpp
   src/lists/ipset.cpp
   src/lists/kernel_set_tester.cpp

docs/openapi.yaml

@@ -34,12 +34,14 @@ paths:
         stopping the API process.
       operationId: postServiceStart
       responses:
-        "200":
-          description: Service start requested successfully
+        "202":
+          description: Lifecycle operation accepted
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ReloadResponse"
+                $ref: "#/components/schemas/LifecycleOperationAcceptedResponse"
+        "409":
+          description: Another lifecycle operation is active
 
   /api/service/stop:
     post:
@@ -50,12 +52,14 @@ paths:
         API process running.
       operationId: postServiceStop
       responses:
-        "200":
-          description: Service stop requested successfully
+        "202":
+          description: Lifecycle operation accepted
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ReloadResponse"
+                $ref: "#/components/schemas/LifecycleOperationAcceptedResponse"
+        "409":
+          description: Another lifecycle operation is active
 
   /api/service/restart:
     post:
@@ -65,12 +69,14 @@ paths:
         registration hooks for the managed resolver config.
       operationId: postServiceRestart
       responses:
-        "200":
-          description: Service restart requested successfully
+        "202":
+          description: Lifecycle operation accepted
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ReloadResponse"
+                $ref: "#/components/schemas/LifecycleOperationAcceptedResponse"
+        "409":
+          description: Another lifecycle operation is active
 
   /api/lists/refresh:
     post:
@@ -174,12 +180,14 @@ paths:
         it to the routing runtime.
       operationId: postConfigSave
       responses:
-        "200":
-          description: Config saved and applied successfully
+        "202":
+          description: Lifecycle operation accepted
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ConfigUpdateResponse"
+                $ref: "#/components/schemas/LifecycleOperationAcceptedResponse"
+        "409":
+          description: Another lifecycle operation is active
         "400":
           description: No staged config or validation/dry-run failure
           content:
@@ -455,6 +463,11 @@ components:
           minimum: 1
           default: 30
           description: Deadline for privileged helper and hook processes.
+        resolver_ready_timeout_seconds:
+          type: integer
+          minimum: 1
+          default: 120
+          description: Deadline for dnsmasq process stabilization and DNS readiness after a helper completes.
         exec_kill_grace_seconds:
           type: integer
           minimum: 0
@@ -1293,6 +1306,58 @@ components:
             Whether a newer configuration has been staged in memory but not yet
             persisted and applied.
           example: false
+        lifecycle_operation:
+          $ref: "#/components/schemas/LifecycleOperation"
+
+    LifecycleOperationAcceptedResponse:
+      type: object
+      required: [operation_id, status]
+      properties:
+        operation_id:
+          type: string
+          example: "lifecycle-42"
+        status:
+          type: string
+          enum: [accepted]
+
+    LifecycleOperation:
+      type: object
+      required: [id, type, status, started_at, stages]
+      properties:
+        id:
+          type: string
+        type:
+          type: string
+          enum: [apply_config, start, stop, restart]
+        status:
+          type: string
+          enum: [running, succeeded, failed]
+        started_at:
+          type: integer
+          format: int64
+        finished_at:
+          type: integer
+          format: int64
+        error:
+          type: string
+        stages:
+          type: array
+          items:
+            $ref: "#/components/schemas/LifecycleOperationStage"
+
+    LifecycleOperationStage:
+      type: object
+      required: [id, title, status]
+      properties:
+        id:
+          type: string
+        title:
+          type: string
+        status:
+          type: string
+          enum: [pending, running, succeeded, failed, skipped]
+        detail:
+          type: string
 
     ResolverConfigSyncState:
       type: string

frontend/src/api/generated/keen-api.ts

@@ -30,9 +30,9 @@ import type {
   ConfigUpdateResponse,
   ErrorResponse,
   HealthResponse,
+  LifecycleOperationAcceptedResponse,
   ListRefreshRequest,
   ListRefreshResponse,
-  ReloadResponse,
   RoutingHealthErrorResponse,
   RoutingHealthResponse,
   RoutingTestRequest,
@@ -166,17 +166,24 @@ export function useGetHealthService<TData = Awaited<ReturnType<typeof getHealthS
 
  * @summary Start routing runtime
  */
-export type postServiceStartResponse200 = {
-  data: ReloadResponse
-  status: 200
+export type postServiceStartResponse202 = {
+  data: LifecycleOperationAcceptedResponse
+  status: 202
+}
+
+export type postServiceStartResponse409 = {
+  data: void
+  status: 409
 }
 
-export type postServiceStartResponseSuccess = (postServiceStartResponse200) & {
+export type postServiceStartResponseSuccess = (postServiceStartResponse202) & {
+  headers: Headers;
+};
+export type postServiceStartResponseError = (postServiceStartResponse409) & {
   headers: Headers;
 };
-;
 
-export type postServiceStartResponse = (postServiceStartResponseSuccess)
+export type postServiceStartResponse = (postServiceStartResponseSuccess | postServiceStartResponseError)
 
 export const getPostServiceStartUrl = () => {
 
@@ -200,7 +207,7 @@ export const postServiceStart = async ( options?: RequestInit): Promise<postServ
 
 
 
-export const getPostServiceStartMutationOptions = <TError = unknown,
+export const getPostServiceStartMutationOptions = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceStart>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
 ): UseMutationOptions<Awaited<ReturnType<typeof postServiceStart>>, TError,void, TContext> => {
 
@@ -229,12 +236,12 @@ const {mutation: mutationOptions, request: requestOptions} = options ?
 
     export type PostServiceStartMutationResult = NonNullable<Awaited<ReturnType<typeof postServiceStart>>>
 
-    export type PostServiceStartMutationError = unknown
+    export type PostServiceStartMutationError = void
 
     /**
  * @summary Start routing runtime
  */
-export const usePostServiceStart = <TError = unknown,
+export const usePostServiceStart = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceStart>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
  , queryClient?: QueryClient): UseMutationResult<
         Awaited<ReturnType<typeof postServiceStart>>,
@@ -250,17 +257,24 @@ export const usePostServiceStart = <TError = unknown,
 
  * @summary Stop routing runtime
  */
-export type postServiceStopResponse200 = {
-  data: ReloadResponse
-  status: 200
+export type postServiceStopResponse202 = {
+  data: LifecycleOperationAcceptedResponse
+  status: 202
+}
+
+export type postServiceStopResponse409 = {
+  data: void
+  status: 409
 }
 
-export type postServiceStopResponseSuccess = (postServiceStopResponse200) & {
+export type postServiceStopResponseSuccess = (postServiceStopResponse202) & {
+  headers: Headers;
+};
+export type postServiceStopResponseError = (postServiceStopResponse409) & {
   headers: Headers;
 };
-;
 
-export type postServiceStopResponse = (postServiceStopResponseSuccess)
+export type postServiceStopResponse = (postServiceStopResponseSuccess | postServiceStopResponseError)
 
 export const getPostServiceStopUrl = () => {
 
@@ -284,7 +298,7 @@ export const postServiceStop = async ( options?: RequestInit): Promise<postServi
 
 
 
-export const getPostServiceStopMutationOptions = <TError = unknown,
+export const getPostServiceStopMutationOptions = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceStop>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
 ): UseMutationOptions<Awaited<ReturnType<typeof postServiceStop>>, TError,void, TContext> => {
 
@@ -313,12 +327,12 @@ const {mutation: mutationOptions, request: requestOptions} = options ?
 
     export type PostServiceStopMutationResult = NonNullable<Awaited<ReturnType<typeof postServiceStop>>>
 
-    export type PostServiceStopMutationError = unknown
+    export type PostServiceStopMutationError = void
 
     /**
  * @summary Stop routing runtime
  */
-export const usePostServiceStop = <TError = unknown,
+export const usePostServiceStop = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceStop>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
  , queryClient?: QueryClient): UseMutationResult<
         Awaited<ReturnType<typeof postServiceStop>>,
@@ -334,17 +348,24 @@ export const usePostServiceStop = <TError = unknown,
 
  * @summary Restart routing runtime
  */
-export type postServiceRestartResponse200 = {
-  data: ReloadResponse
-  status: 200
+export type postServiceRestartResponse202 = {
+  data: LifecycleOperationAcceptedResponse
+  status: 202
 }
 
-export type postServiceRestartResponseSuccess = (postServiceRestartResponse200) & {
+export type postServiceRestartResponse409 = {
+  data: void
+  status: 409
+}
+
+export type postServiceRestartResponseSuccess = (postServiceRestartResponse202) & {
+  headers: Headers;
+};
+export type postServiceRestartResponseError = (postServiceRestartResponse409) & {
   headers: Headers;
 };
-;
 
-export type postServiceRestartResponse = (postServiceRestartResponseSuccess)
+export type postServiceRestartResponse = (postServiceRestartResponseSuccess | postServiceRestartResponseError)
 
 export const getPostServiceRestartUrl = () => {
 
@@ -368,7 +389,7 @@ export const postServiceRestart = async ( options?: RequestInit): Promise<postSe
 
 
 
-export const getPostServiceRestartMutationOptions = <TError = unknown,
+export const getPostServiceRestartMutationOptions = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceRestart>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
 ): UseMutationOptions<Awaited<ReturnType<typeof postServiceRestart>>, TError,void, TContext> => {
 
@@ -397,12 +418,12 @@ const {mutation: mutationOptions, request: requestOptions} = options ?
 
     export type PostServiceRestartMutationResult = NonNullable<Awaited<ReturnType<typeof postServiceRestart>>>
 
-    export type PostServiceRestartMutationError = unknown
+    export type PostServiceRestartMutationError = void
 
     /**
  * @summary Restart routing runtime
  */
-export const usePostServiceRestart = <TError = unknown,
+export const usePostServiceRestart = <TError = void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postServiceRestart>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
  , queryClient?: QueryClient): UseMutationResult<
         Awaited<ReturnType<typeof postServiceRestart>>,
@@ -737,25 +758,30 @@ export const usePostConfig = <TError = ErrorResponse,
 
  * @summary Apply staged config
  */
-export type postConfigSaveResponse200 = {
-  data: ConfigUpdateResponse
-  status: 200
+export type postConfigSaveResponse202 = {
+  data: LifecycleOperationAcceptedResponse
+  status: 202
 }
 
 export type postConfigSaveResponse400 = {
   data: ErrorResponse
   status: 400
 }
 
+export type postConfigSaveResponse409 = {
+  data: void
+  status: 409
+}
+
 export type postConfigSaveResponse500 = {
   data: ErrorResponse
   status: 500
 }
 
-export type postConfigSaveResponseSuccess = (postConfigSaveResponse200) & {
+export type postConfigSaveResponseSuccess = (postConfigSaveResponse202) & {
   headers: Headers;
 };
-export type postConfigSaveResponseError = (postConfigSaveResponse400 | postConfigSaveResponse500) & {
+export type postConfigSaveResponseError = (postConfigSaveResponse400 | postConfigSaveResponse409 | postConfigSaveResponse500) & {
   headers: Headers;
 };
 
@@ -783,7 +809,7 @@ export const postConfigSave = async ( options?: RequestInit): Promise<postConfig
 
 
 
-export const getPostConfigSaveMutationOptions = <TError = ErrorResponse,
+export const getPostConfigSaveMutationOptions = <TError = ErrorResponse | void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postConfigSave>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
 ): UseMutationOptions<Awaited<ReturnType<typeof postConfigSave>>, TError,void, TContext> => {
 
@@ -812,12 +838,12 @@ const {mutation: mutationOptions, request: requestOptions} = options ?
 
     export type PostConfigSaveMutationResult = NonNullable<Awaited<ReturnType<typeof postConfigSave>>>
 
-    export type PostConfigSaveMutationError = ErrorResponse
+    export type PostConfigSaveMutationError = ErrorResponse | void
 
     /**
  * @summary Apply staged config
  */
-export const usePostConfigSave = <TError = ErrorResponse,
+export const usePostConfigSave = <TError = ErrorResponse | void,
     TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postConfigSave>>, TError,void, TContext>, request?: SecondParameter<typeof apiFetch>}
  , queryClient?: QueryClient): UseMutationResult<
         Awaited<ReturnType<typeof postConfigSave>>,

frontend/src/api/generated/model/daemonConfig.ts

@@ -42,6 +42,11 @@ export interface DaemonConfig {
      * @minimum 1
      */
   exec_timeout_seconds?: number;
+  /**
+     * Deadline for dnsmasq process stabilization and DNS readiness after a helper completes.
+     * @minimum 1
+     */
+  resolver_ready_timeout_seconds?: number;
   /**
      * Grace period after SIGTERM before a timed-out helper receives SIGKILL.
      * @minimum 0