chore: add reconcicler

Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>

Author: shikanime

apps/server-nestjs/src/cpin-module/infrastructure/reconcile/reconcile.decorator.ts

@@ -0,0 +1,139 @@
+import { setTimeout } from 'node:timers/promises'
+import { Logger } from '@nestjs/common'
+
+export interface RequeueResult {
+  requeueAfterMs?: number
+  reason?: string
+}
+
+export type ReconcileResult = undefined | RequeueResult
+
+export function requeue(options: RequeueResult = {}): RequeueResult {
+  return options
+}
+
+export interface ReconcileOptions {
+  maxRetries?: number
+  initialDelayMs?: number
+  maxDelayMs?: number
+  factor?: number
+  jitter?: number
+  shouldRetry?: (error: unknown) => boolean
+  onError?: (error: unknown) => void
+}
+
+export async function reconcile<T>(handler: () => Promise<T> | T, options: ReconcileOptions = {}): Promise<T> {
+  const {
+    maxRetries = 5,
+    initialDelayMs = 1000,
+    maxDelayMs = 60_000,
+    factor = 2,
+    jitter = 0.2,
+    shouldRetry,
+    onError,
+  } = options
+
+  const run = async (attempt: number): Promise<T> => {
+    try {
+      const result = await handler()
+      const requeueResult = toRequeueResult(result)
+
+      if (requeueResult) {
+        if (attempt >= maxRetries) return result
+        const delayMs = Math.max(0, requeueResult.requeueAfterMs ?? computeBackoffDelayMs({
+          attempt,
+          initialDelayMs,
+          maxDelayMs,
+          factor,
+          jitter,
+        }))
+        await setTimeout(delayMs)
+        return await run(attempt + 1)
+      }
+
+      return result
+    } catch (error) {
+      onError?.(error)
+      const canRetry = attempt < maxRetries && (shouldRetry?.(error) ?? true)
+      if (!canRetry) throw error
+
+      const delayMs = computeBackoffDelayMs({
+        attempt,
+        initialDelayMs,
+        maxDelayMs,
+        factor,
+        jitter,
+      })
+      await setTimeout(delayMs)
+      return await run(attempt + 1)
+    }
+  }
+
+  return await run(0)
+}
+
+export type TypedMethodDecorator = <T extends (this: any, ...args: any[]) => any>(
+  target: object,
+  propertyKey: string | symbol,
+  descriptor: TypedPropertyDescriptor<T>,
+) => void
+
+export function Reconcile(options: ReconcileOptions = {}): TypedMethodDecorator {
+  return <T extends (this: any, ...args: any[]) => any>(
+    _target: object,
+    propertyKey: string | symbol,
+    descriptor: TypedPropertyDescriptor<T>,
+  ): void => {
+    const original = descriptor.value
+    if (!original) return
+
+    descriptor.value = (async function (this: ThisParameterType<T>, ...args: Parameters<T>): Promise<Awaited<ReturnType<T>>> {
+      const logger: Logger = this?.logger instanceof Logger
+        ? this.logger
+        : new Logger(this?.constructor?.name ?? 'Reconcile')
+
+      try {
+        return await reconcile(
+          () => original.apply(this, args),
+          options,
+        ) as Awaited<ReturnType<T>>
+      } catch (error) {
+        logger.error(
+          `Handler ${String(propertyKey)} failed permanently`,
+          error instanceof Error ? error.stack : undefined,
+        )
+        throw error
+      }
+    }) as T
+  }
+}
+
+function toRequeueResult(value: unknown): RequeueResult | undefined {
+  if (!value || typeof value !== 'object') return undefined
+  const keys = Object.keys(value)
+  if (keys.length === 0) return undefined
+
+  for (const key of keys) {
+    if (key !== 'requeueAfterMs' && key !== 'reason') return undefined
+  }
+
+  const requeueAfterMs = (value as any).requeueAfterMs
+  const reason = (value as any).reason
+
+  if (requeueAfterMs !== undefined && typeof requeueAfterMs !== 'number') return undefined
+  if (reason !== undefined && typeof reason !== 'string') return undefined
+
+  return { requeueAfterMs, reason }
+}
+
+function computeBackoffDelayMs(options: {
+  attempt: number
+  initialDelayMs: number
+  maxDelayMs: number
+  factor: number
+  jitter: number
+}): number {
+  const base = Math.min(options.maxDelayMs, options.initialDelayMs * (options.factor ** options.attempt))
+  const jitter = options.jitter <= 0 ? 0 : (Math.random() * 2 - 1) * options.jitter
+  return Math.max(0, Math.round(base * (1 + jitter)))
+}

apps/server-nestjs/src/modules/argocd/argocd-controller.service.ts

@@ -9,7 +9,11 @@ import { trace } from '@opentelemetry/api'
 import { stringify } from 'yaml'
 
 import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
+import { Reconcile } from '../../cpin-module/infrastructure/reconcile/reconcile.decorator'
 import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
+import { GitlabService } from '../gitlab/gitlab.service'
+import { VaultService } from '../vault/vault.service'
+import { ArgoCDDatastoreService } from './argocd-datastore.service'
 
 @Injectable()
 export class ArgoCDControllerService {
@@ -25,6 +29,7 @@ export class ArgoCDControllerService {
   }
 
   @OnEvent('project.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsert(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -34,6 +39,7 @@ export class ArgoCDControllerService {
   }
 
   @OnEvent('project.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDelete(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()

apps/server-nestjs/src/modules/gitlab/gitlab-controller.service.ts

@@ -17,9 +17,6 @@ import { INFRA_APPS_REPO_NAME, TOPIC_PLUGIN_MANAGED } from './gitlab.constants'
 import { DEFAULT_PROJECT_DEVELOPER_GROUP_PATH_SUFFIX, DEFAULT_PROJECT_MAINTAINER_GROUP_PATH_SUFFIX, DEFAULT_PROJECT_REPORTER_GROUP_PATH_SUFFIX } from './gitlab.constants.js'
 import { GitlabService } from './gitlab.service'
 
-import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
-import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
-import { getAll } from '../../utils/iterable'
 const ownedUserRegex = /group_\d+_bot/u
 
 @Injectable()
@@ -36,6 +33,7 @@ export class GitlabControllerService {
   }
 
   @OnEvent('project.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsert(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -45,6 +43,7 @@ export class GitlabControllerService {
   }
 
   @OnEvent('project.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDelete(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()

apps/server-nestjs/src/modules/keycloak/keycloak-controller.service.ts

@@ -7,6 +7,7 @@ import { OnEvent } from '@nestjs/event-emitter'
 import { Cron, CronExpression } from '@nestjs/schedule'
 import { trace } from '@opentelemetry/api'
 import z from 'zod'
+import { Reconcile } from '../../cpin-module/infrastructure/reconcile/reconcile.decorator'
 import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
 import { KeycloakClientService } from './keycloak-client.service'
 import { KeycloakDatastoreService } from './keycloak-datastore.service'
@@ -24,6 +25,7 @@ export class KeycloakControllerService {
   }
 
   @OnEvent('project.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsert(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -33,6 +35,7 @@ export class KeycloakControllerService {
   }
 
   @OnEvent('project.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDelete(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()

apps/server-nestjs/src/modules/nexus/nexus-controller.service.ts

@@ -1,8 +1,10 @@
-import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
+import type { ProjectWithDetails } from './nexus-datastore.service'
+import { specificallyEnabled } from '@cpn-console/hooks'
 import { Inject, Injectable, Logger } from '@nestjs/common'
 import { OnEvent } from '@nestjs/event-emitter'
 import { Cron, CronExpression } from '@nestjs/schedule'
 import { trace } from '@opentelemetry/api'
+
 import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
 import { Reconcile } from '../../cpin-module/infrastructure/reconcile/reconcile.decorator'
 import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
@@ -12,7 +14,6 @@ import { NexusClientService } from './nexus-client.service'
 import { NexusDatastoreService } from './nexus-datastore.service'
 import { NEXUS_CONFIG_KEYS } from './nexus.constants'
 import { generateMavenGroupPrivilegeName, generateMavenGroupRepoName, generateMavenHostedPrivilegeName, generateMavenHostedRepoName, generateNpmGroupPrivilegeName, generateNpmGroupRepoName, generateNpmHostedPrivilegeName, generateNpmHostedRepoName, generateRandomPassword, getPluginConfig, getProjectVaultPath } from './nexus.utils'
-import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
 
 @Injectable()
 export class NexusControllerService {
@@ -28,6 +29,7 @@ export class NexusControllerService {
   }
 
   @OnEvent('project.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsert(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -37,6 +39,7 @@ export class NexusControllerService {
   }
 
   @OnEvent('project.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDelete(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()

apps/server-nestjs/src/modules/vault/vault-controller.service.ts

@@ -3,9 +3,11 @@ import { Inject, Injectable, Logger } from '@nestjs/common'
 import { OnEvent } from '@nestjs/event-emitter'
 import { Cron, CronExpression } from '@nestjs/schedule'
 import { trace } from '@opentelemetry/api'
+import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
+import { Reconcile } from '../../cpin-module/infrastructure/reconcile/reconcile.decorator'
 import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator'
 import { VaultClientService, VaultError } from './vault-client.service'
-import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service'
+import { VaultDatastoreService } from './vault-datastore.service'
 import { generateProjectPath } from './vault.utils'
 
 @Injectable()
@@ -21,6 +23,7 @@ export class VaultControllerService {
   }
 
   @OnEvent('project.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsert(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -30,6 +33,7 @@ export class VaultControllerService {
   }
 
   @OnEvent('project.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDelete(project: ProjectWithDetails) {
     const span = trace.getActiveSpan()
@@ -42,6 +46,7 @@ export class VaultControllerService {
   }
 
   @OnEvent('zone.upsert')
+  @Reconcile()
   @StartActiveSpan()
   async handleUpsertZone(zone: ZoneWithDetails) {
     const span = trace.getActiveSpan()
@@ -51,6 +56,7 @@ export class VaultControllerService {
   }
 
   @OnEvent('zone.delete')
+  @Reconcile()
   @StartActiveSpan()
   async handleDeleteZone(zone: ZoneWithDetails) {
     const span = trace.getActiveSpan()