fix enum

Author: tacxou

.env.example

@@ -1 +1 @@
-REDIS_URI=redis://localhost:6379/0
+SESAME_REDIS_URI=redis://localhost:6379/0

Makefile

@@ -1,7 +1,7 @@
 include .env
 IMG_NAME = "ghcr.io/libertech-fr/sesame-deamon"
 BASE_NAME = "sesame"
-APP_NAME = "sesame-deamon"
+APP_NAME = "sesame-daemon"
 PLATFORM = "linux/amd64"
 
 .DEFAULT_GOAL := help

backends.example/03dummy/bin/dummy.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-echo "Hello Word"
+echo "{\"status\": 0, \"message\": \"dummy backend\"}"
 exit 0

src/_common/tasks/executor.task.ts

@@ -1,21 +1,59 @@
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { Job } from 'bullmq';
 import { ExecutorResponseInterface } from '../interfaces/executor-response.interface';
 import { ExecutorConfigInterface } from '../interfaces/executor-config.interface';
 import { join } from 'path';
 
-export default function executorTask(
+export async function executorTask(
   command: string,
   job: Job,
   options?: ExecutorConfigInterface,
 ): Promise<ExecutorResponseInterface> {
-  const out = spawnSync(join(command), [], {
+  return new Promise((resolve, reject) => {
+    const child = spawn(join(command), [], {
+      shell: options?.shell ?? true,
+    });
+
+    let output = '';
+    let error = '';
+
+    // Ecoute pour la sortie standard (stdout)
+    child.stdout.on('data', (data) => {
+      console.log(`stdout: ${data}`);
+      output += data;
+    });
+
+    // Ecoute pour la sortie d'erreur (stderr)
+    child.stderr.on('data', (data) => {
+      console.error(`stderr: ${data}`);
+      error += data;
+    });
+
+    // Envoyer les données de job au processus enfant
+    child.stdin.write(JSON.stringify(job.data));
+    child.stdin.end();
+
+    child.on('close', (code) => {
+      console.log(`Le processus enfant s'est terminé avec le code ${code}`);
+      resolve({
+        status: code,
+        output: output,
+        error: error,
+      });
+    });
+
+    child.on('error', (spawnError) => {
+      console.error('Erreur lors du lancement du processus enfant', spawnError);
+      reject(spawnError);
+    });
+  });
+  /**const out = spawnSync(join(command), [], {
     input: JSON.stringify(job.data),
     shell: options?.shell ?? true,
   });
   return Promise.resolve({
     status: out.status,
     output: out.stdout?.toString(),
     error: out.stderr?.toString(),
-  });
+  });**/
 }

src/backend-runner/_dto/backend-config-v1.dto.ts

@@ -1,21 +1,8 @@
 import { Transform, plainToInstance } from 'class-transformer';
 import { IsBoolean, IsEnum, IsNotEmpty, IsString, Validate } from 'class-validator';
 import { IsActionConstraintValidator } from '../_validators/is-action-constraint.validator';
-
-export enum ActionType {
-  LIST_BACKENDS = 'LIST_BACKENDS',
-  PING_TARGET = 'PING_TARGET',
-  IDENTITY_CREATE = 'IDENTITY_CREATE',
-  IDENTITY_UPDATE = 'IDENTITY_UPDATE',
-  IDENTITY_DELETE = 'IDENTITY_DELETE',
-  IDENTITY_PASSWORD_RESET = 'IDENTITY_PASSWORD_RESET',
-  IDENTITY_PASSWORD_CHANGE = 'IDENTITY_PASSWORD_CHANGE',
-}
-
-export enum OnErrorType {
-  CONTINUE = 'continue',
-  STOP = 'stop',
-}
+import { ActionType } from '../_enum/action-type.enum';
+import { OnErrorType } from '../_enum/on-error-type.enum';
 
 export class BackendConfigActionDto {
   @IsString()

src/backend-runner/_enum/action-type.enum.ts

@@ -0,0 +1,9 @@
+export enum ActionType {
+  LIST_BACKENDS = 'LIST_BACKENDS',
+  PING_TARGET = 'PING_TARGET',
+  IDENTITY_CREATE = 'IDENTITY_CREATE',
+  IDENTITY_UPDATE = 'IDENTITY_UPDATE',
+  IDENTITY_DELETE = 'IDENTITY_DELETE',
+  IDENTITY_PASSWORD_RESET = 'IDENTITY_PASSWORD_RESET',
+  IDENTITY_PASSWORD_CHANGE = 'IDENTITY_PASSWORD_CHANGE',
+}

src/backend-runner/_enum/on-error-type.enum.ts

@@ -0,0 +1,4 @@
+export enum OnErrorType {
+  CONTINUE = 'continue',
+  STOP = 'stop',
+}

src/backend-runner/_executors/catch-all.executor.ts

@@ -1,11 +1,11 @@
-import executorTask from '~/_common/tasks/executor.task';
+import { executorTask } from '~/_common/tasks/executor.task';
 import { BackendRunnerService } from '../backend-runner.service';
 import { ExecutorExecuteResponseInterface, ExecutorInterface } from '../executors.interface';
 import { join } from 'path';
 import { Job } from 'bullmq';
 import { BackendConfigV1Dto } from '../_dto/backend-config-v1.dto';
 import { BackendResultInterface } from '../_interfaces/backend-result.interface';
-import { ExecutorConfigInterface } from '~/_common/interfaces/executor-config.interface';
+import { BackendCodesEnum } from '../_interfaces/backend-codes.enum';
 
 export class CatchAllExecutor implements ExecutorInterface {
   public constructor(public service: BackendRunnerService) {}
@@ -39,30 +39,33 @@ export class CatchAllExecutor implements ExecutorInterface {
   }
 
   public async executeBackend(job: Job, backend: BackendConfigV1Dto): Promise<BackendResultInterface> {
-    const process = await executorTask(join(backend.path, 'bin', backend.actions[job.name].exec), job, {
-      ...this.service.config.get<ExecutorConfigInterface>('backendExecutorConfig'),
+    const process = await executorTask(join(backend.path, 'bin', backend.actions[job.name].script), job, {
+      ...this.service.backendExecutorConfig,
     });
 
     try {
       if (process.status !== 0) {
+        this.service.logger.error(`Error executing backend ${backend.name}`);
         return {
           backend: backend.name,
           status: process.status,
           error: JSON.parse(process.output),
         };
       }
 
+      this.service.logger.log(`Backend ${backend.name} executed successfully`);
       return {
         backend: backend.name,
         status: process.status,
         output: JSON.parse(process.output),
       };
     } catch (e) {
+      this.service.logger.error(`Error parsing JSON output from backend ${backend.name}`);
       return {
         backend: backend.name,
-        status: process.status,
+        status: BackendCodesEnum.INVALID_JSON_RESPONSE,
         error: {
-          status: process.status,
+          status: BackendCodesEnum.INVALID_JSON_RESPONSE,
           message: process.error,
         },
       };

src/backend-runner/_interfaces/backend-codes.enum.ts

@@ -13,4 +13,5 @@ export enum BackendCodesEnum {
   CONNECTION_ERROR = 1 << 2,
   INVALID_LOGIN = 1 << 3,
   INVALID_CREDENTIALS = 1 << 4,
+  INVALID_JSON_RESPONSE = 1 << 5,
 }

src/backend-runner/_validators/is-action-constraint.validator.ts

@@ -4,7 +4,8 @@ import {
   ValidationArguments,
   validateOrReject,
 } from 'class-validator';
-import { ActionType, BackendConfigActionDto } from '../_dto/backend-config-v1.dto';
+import { BackendConfigActionDto } from '../_dto/backend-config-v1.dto';
+import { ActionType } from '../_enum/action-type.enum';
 
 @ValidatorConstraint({ async: true })
 export class IsActionConstraintValidator implements ValidatorConstraintInterface {