@@ -934,6 +934,57 @@ const getSwarmServiceContainerId = async (
934934 }
935935} ;
936936
937+ export class ServiceConvergenceError extends Error { }
938+
939+ export const waitForSwarmServiceConvergence = async (
940+ appName : string ,
941+ serverId ?: string | null ,
942+ options ?: { timeoutMs ?: number ; intervalMs ?: number } ,
943+ ) : Promise < void > => {
944+ const timeoutMs = options ?. timeoutMs ?? 45_000 ;
945+ const intervalMs = options ?. intervalMs ?? 2_000 ;
946+ const remoteDocker = await getRemoteDocker ( serverId ) ;
947+ const service = remoteDocker . getService ( appName ) ;
948+ const deadline = Date . now ( ) + timeoutMs ;
949+
950+ let lastState = "unknown" ;
951+ while ( true ) {
952+ const info = await service . inspect ( ) ;
953+ const desiredTasksCount = info . Spec ?. Mode ?. Replicated ?. Replicas ?? 1 ;
954+
955+ const tasks = await remoteDocker . listTasks ( {
956+ filters : JSON . stringify ( { service : [ appName ] } ) ,
957+ } ) ;
958+ const currentTasks = tasks . filter (
959+ ( task ) => task . DesiredState === "running" ,
960+ ) ;
961+ const runningTasksCount = currentTasks . filter (
962+ ( task ) => task . Status ?. State === "running" ,
963+ ) . length ;
964+
965+ if ( runningTasksCount >= desiredTasksCount ) {
966+ return ;
967+ }
968+
969+ const failedTask = currentTasks . find ( ( task ) =>
970+ [ "failed" , "rejected" ] . includes ( task . Status ?. State ?? "" ) ,
971+ ) ;
972+ lastState =
973+ failedTask ?. Status ?. Err ??
974+ failedTask ?. Status ?. State ??
975+ currentTasks [ 0 ] ?. Status ?. State ??
976+ lastState ;
977+
978+ if ( Date . now ( ) >= deadline ) {
979+ throw new ServiceConvergenceError (
980+ `Service ${ appName } did not converge within ${ timeoutMs } ms: ${ runningTasksCount } /${ desiredTasksCount } tasks running (last state: ${ lastState } )` ,
981+ ) ;
982+ }
983+
984+ await new Promise ( ( resolve ) => setTimeout ( resolve , intervalMs ) ) ;
985+ }
986+ } ;
987+
937988export const checkPostgresHealth = async ( ) : Promise < ServiceHealthStatus > => {
938989 const serviceCheck = await checkSwarmServiceRunning ( "dokploy-postgres" ) ;
939990 if ( serviceCheck . status === "unhealthy" ) {
0 commit comments