@webda/async 4.0.0-beta.1 → 4.0.0-beta.3

package/lib/services/{localrunner.d.ts → localrunner.service.d.ts}

@@ -1,8 +1,10 @@
-import { ServiceParameters } from "@webda/core";
-import { SpawnOptions } from "child_process";
-import { AsyncAction } from "../models.js";
-import { JobInfo } from "./asyncjobservice.js";
-import { AgentInfo, Runner, RunnerParameters } from "./runner.js";
+import { SpawnOptions } from "node:child_process";
+import type { AsyncAction } from "../asyncaction.model.js";
+import type { JobInfo } from "./asyncjobservice.service.js";
+import { AgentInfo, Runner, RunnerParameters } from "./runner.service.js";
+/**
+ * LocalRunner parameters
+ */
 export declare class LocalRunnerParameters extends RunnerParameters {
     /**
      * Command to launch
@@ -22,7 +24,12 @@ export declare class LocalRunnerParameters extends RunnerParameters {
      * Use the observability of ChildProcess to update status accordingly
      */
     autoStatus?: boolean;
-    constructor(params: any);
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params?: any): this;
 }
 /**
  * Type of action returned by LocalRunner
@@ -38,12 +45,20 @@ export interface ProcessAction {
  */
 export default class LocalRunner<T extends LocalRunnerParameters = LocalRunnerParameters> extends Runner<T> {
     /**
-     * @inheritdoc
+     * Spawn the process
+     * @param command - the command
+     * @param args - the arguments
+     * @param options - the spawn options
+     * @returns the child process
      */
-    loadParameters(params: any): ServiceParameters;
-    spawn(command: string, args: string[], options?: SpawnOptions | undefined): import("child_process").ChildProcess;
+    spawn(command: string, args: string[], options?: SpawnOptions | undefined): import("node:child_process").ChildProcess;
     /**
      * @inheritdoc
+     * @param action - the action to launch
+     * @param info - the job information
+     * @returns the process information
      */
     launchAction(action: AsyncAction, info: JobInfo): Promise<ProcessAction>;
 }
+export { LocalRunner };
+//# sourceMappingURL=localrunner.service.d.ts.map

package/lib/services/localrunner.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"localrunner.service.d.ts","sourceRoot":"","sources":["../../src/services/localrunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACzD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAK3B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,SAAS,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACzG;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,6CAGxE;IAED;;;;;OAKG;IACG,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAkD7E;CACF;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/lib/services/localrunner.service.js

@@ -0,0 +1,87 @@
+import { spawn } from "node:child_process";
+import { Runner, RunnerParameters } from "./runner.service.js";
+/**
+ * LocalRunner parameters
+ */
+export class LocalRunnerParameters extends RunnerParameters {
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params = {}) {
+        var _a;
+        super.load(params);
+        this.options ?? (this.options = {});
+        (_a = this.options).env ?? (_a.env = {});
+        return this;
+    }
+}
+/**
+ * Run a Job locally on the server by spawning a child process
+ *
+ * @WebdaModda
+ */
+export default class LocalRunner extends Runner {
+    /**
+     * Spawn the process
+     * @param command - the command
+     * @param args - the arguments
+     * @param options - the spawn options
+     * @returns the child process
+     */
+    spawn(command, args, options) {
+        /* c8 ignore next 2 */
+        return spawn(command, args, options);
+    }
+    /**
+     * @inheritdoc
+     * @param action - the action to launch
+     * @param info - the job information
+     * @returns the process information
+     */
+    async launchAction(action, info) {
+        const envs = {
+            ...this.parameters.options?.env,
+            ...info
+        };
+        this.log("INFO", "Job", action.uuid, "started with", Object.keys(envs)
+            .map(k => `${k}=${envs[k]}`)
+            .join(" "), this.parameters.command, this.parameters.args ? this.parameters.args.map(a => `'${a}'`).join(" ") : "");
+        const child = this.spawn(this.parameters.command, this.parameters.args || [], {
+            ...this.parameters.options,
+            env: envs,
+            detached: true
+        });
+        // AutoStatus based on process info
+        if (this.parameters.autoStatus && child) {
+            const repository = action.getRepository();
+            // Chain the writes so concurrent output does not lose lines
+            let logs = Promise.resolve();
+            const addLog = data => {
+                logs = logs.then(() => repository.upsertItemToCollection(action.uuid, "logs", data.toString()));
+                return logs;
+            };
+            child.stdout?.on("data", addLog);
+            child.stderr?.on("data", addLog);
+            // As this is local just and mostly used for batch auto status it
+            await repository.patch(action.uuid, { status: "RUNNING" });
+            child.on("exit", async (code) => {
+                if (code !== 0) {
+                    this.log("INFO", "Job", action.uuid, "errored with", code);
+                    await repository.patch(action.uuid, { status: "ERROR" });
+                }
+                else {
+                    this.log("INFO", "Job", action.uuid, "successful");
+                    await repository.patch(action.uuid, { status: "SUCCESS" });
+                }
+            });
+        }
+        return {
+            agent: Runner.getAgentInfo(),
+            pid: child?.pid || -1
+        };
+    }
+}
+export { LocalRunner };
+//# sourceMappingURL=localrunner.service.js.map

package/lib/services/localrunner.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"localrunner.service.js","sourceRoot":"","sources":["../../src/services/localrunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,oBAAoB,CAAC;AAGzD,OAAO,EAAa,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,gBAAgB;IAoBzD;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAQ,EAAE;;QACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;QACpB,MAAA,IAAI,CAAC,OAAO,EAAC,GAAG,QAAH,GAAG,GAAK,EAAE,EAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAUD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,WAAqE,SAAQ,MAAS;IACzG;;;;;;OAMG;IACH,KAAK,CAAC,OAAe,EAAE,IAAc,EAAE,OAAkC;QACvE,sBAAsB;QACtB,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CAAC,MAAmB,EAAE,IAAa;QACnD,MAAM,IAAI,GAA8B;YACtC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG;YAC/B,GAAG,IAAI;SACR,CAAC;QACF,IAAI,CAAC,GAAG,CACN,MAAM,EACN,KAAK,EACL,MAAM,CAAC,IAAI,EACX,cAAc,EACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3B,IAAI,CAAC,GAAG,CAAC,EACZ,IAAI,CAAC,UAAU,CAAC,OAAO,EACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAC9E,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE;YAC5E,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO;YAC1B,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,mCAAmC;QACnC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1C,4DAA4D;YAC5D,IAAI,IAAI,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChG,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;YACF,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjC,iEAAiE;YACjE,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBAC5B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;oBAC3D,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;oBACnD,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE;YAC5B,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;SACtB,CAAC;IACJ,CAAC;CACF;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/lib/services/{runner.d.ts → runner.service.d.ts}

@@ -1,13 +1,21 @@
 import { Service, ServiceParameters } from "@webda/core";
-import { AsyncAction } from "../models.js";
-import { JobInfo } from "./asyncjobservice.js";
+import type { AsyncAction } from "../asyncaction.model.js";
+import type { JobInfo } from "./asyncjobservice.service.js";
+/**
+ * Runner parameters
+ */
 export declare class RunnerParameters extends ServiceParameters {
     /**
      * Actions managed by the runner
      * @default []
      */
     actions?: string[];
-    constructor(params: any);
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params?: any): this;
 }
 /**
  * Agent Information
@@ -29,24 +37,22 @@ export interface NodeAgentInfo extends AgentInfo {
  * Runner take and launch an action
  */
 export declare abstract class Runner<T extends RunnerParameters = RunnerParameters> extends Service<T> {
-    /**
-     * @inheritdoc
-     */
-    loadParameters(params: any): ServiceParameters;
     /**
      * Handle this type of action
-     * @param type
-     * @returns
+     * @param type - the action type
+     * @returns true if the runner handles it
      */
     handleType(type: string): boolean;
     /**
      * Return agent information
-     * @returns
+     * @returns the agent information
      */
     static getAgentInfo(): AgentInfo;
     /**
      * Launch the action
-     * @param action
+     * @param action - the action to launch
+     * @param info - the job information
      */
     abstract launchAction(action: AsyncAction, info: JobInfo): Promise<any>;
 }
+//# sourceMappingURL=runner.service.d.ts.map

package/lib/services/runner.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.service.d.ts","sourceRoot":"","sources":["../../src/services/runner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAI3B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,8BAAsB,MAAM,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC5F;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,IAAI,SAAS,CAQ/B;IACD;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACzE"}

package/lib/services/{runner.js → runner.service.js}

@@ -1,32 +1,35 @@
 import { Service, ServiceParameters } from "@webda/core";
-import * as os from "os";
+import * as os from "node:os";
+/**
+ * Runner parameters
+ */
 export class RunnerParameters extends ServiceParameters {
-    constructor(params) {
-        super(params);
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params = {}) {
+        super.load(params);
         this.actions ?? (this.actions = []);
+        return this;
     }
 }
 /**
  * Runner take and launch an action
  */
 export class Runner extends Service {
-    /**
-     * @inheritdoc
-     */
-    loadParameters(params) {
-        return new RunnerParameters(params);
-    }
     /**
      * Handle this type of action
-     * @param type
-     * @returns
+     * @param type - the action type
+     * @returns true if the runner handles it
      */
     handleType(type) {
         return this.parameters.actions?.includes(type) ?? false;
     }
     /**
      * Return agent information
-     * @returns
+     * @returns the agent information
      */
     static getAgentInfo() {
         return {
@@ -38,4 +41,4 @@ export class Runner extends Service {
         };
     }
 }
-//# sourceMappingURL=runner.js.map
+//# sourceMappingURL=runner.service.js.map

package/lib/services/runner.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.service.js","sourceRoot":"","sources":["../../src/services/runner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAI9B;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAOrD;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAQ,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAoBD;;GAEG;AACH,MAAM,OAAgB,MAAsD,SAAQ,OAAU;IAC5F;;;;OAIG;IACH,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY;QACjB,OAAO;YACL,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;YACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;YACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;YACrB,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE;YACrB,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;SAChB,CAAC;IACJ,CAAC;CAOF"}

package/lib/services/servicerunner.service.d.ts

@@ -0,0 +1,105 @@
+import { OperationContext } from "@webda/core";
+import { MemoryLogger, WorkerLogLevel, WorkerMessage, WorkerOutput } from "@webda/workout";
+import { AsyncAction } from "../asyncaction.model.js";
+import type { JobInfo } from "./asyncjobservice.service.js";
+import { AgentInfo, Runner, RunnerParameters } from "./runner.service.js";
+/**
+ * Type of action returned by LocalRunner
+ */
+export interface ServiceAction {
+    /**
+     * Info on the server running it
+     */
+    agent: AgentInfo;
+    /**
+     * Promise of the implementation
+     *
+     * Useful for unit test
+     */
+    promise: Promise<void>;
+}
+/**
+ * Object receiving the captured logs
+ */
+export type ActionLogTarget = {
+    patch(data: {
+        logs: string[];
+    }): Promise<any>;
+};
+/**
+ * Keep log in memory and save it to the action object every 5s
+ */
+export declare class ActionMemoryLogger extends MemoryLogger {
+    protected action: ActionLogTarget;
+    logSaveDelay: number;
+    format?: string;
+    protected timeout: NodeJS.Timeout;
+    /**
+     * @param output - the worker output to listen to
+     * @param level - the log level
+     * @param limit - the maximum number of logs
+     * @param action - the action to save logs to
+     * @param logSaveDelay - delay before saving logs
+     * @param format - the log format
+     */
+    constructor(output: WorkerOutput, level: WorkerLogLevel, limit: number, action: ActionLogTarget, logSaveDelay: number, format?: string);
+    /**
+     * Schedule a save on each message
+     * @param msg - the message
+     */
+    onMessage(msg: WorkerMessage): void;
+    /**
+     * Save the logs to the action
+     */
+    save(): Promise<void>;
+    /**
+     * Close the logger and save the logs
+     * @returns the save promise
+     */
+    saveAndClose(): Promise<void>;
+}
+/**
+ * Add the log format to capture
+ */
+export declare class ServiceRunnerParameters extends RunnerParameters {
+    /**
+     * Define the log format
+     *
+     * @default ConsoleLoggerDefaultFormat
+     */
+    logFormat?: string;
+    /**
+     * How long before saving logs (in ms)
+     *
+     * @default 5000
+     */
+    logSaveDelay?: number;
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params?: any): this;
+}
+/**
+ * Run a Job locally on the server by spawning a child process
+ *
+ * @WebdaModda
+ */
+export default class ServiceRunner<T extends ServiceRunnerParameters = ServiceRunnerParameters> extends Runner<T> {
+    /**
+     * Rebuild an operation context if the action was loaded from a store
+     * @param context - the stored context
+     * @returns an operation context
+     */
+    protected getOperationContext(context: any): OperationContext;
+    /**
+     * @inheritdoc
+     * @param action - the action to launch
+     * @param info - the job information
+     * @returns the service action
+     */
+    launchAction(action: AsyncAction, info: JobInfo): Promise<ServiceAction>;
+}
+export { ServiceRunner };
+//# sourceMappingURL=servicerunner.service.d.ts.map

package/lib/services/servicerunner.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"servicerunner.service.d.ts","sourceRoot":"","sources":["../../src/services/servicerunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAIjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,YAAY,EAEZ,cAAc,EACd,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAA0C,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAmB,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,KAAK,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAEhF;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;IAehD,SAAS,CAAC,MAAM,EAAE,eAAe;IAC1B,YAAY,EAAE,MAAM;IACpB,MAAM,CAAC,EAAE,MAAM;IAhBxB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;IAElC;;;;;;;OAOG;IACH,YACE,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,MAAM,EACH,MAAM,EAAE,eAAe,EAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,MAAM,EAGvB;IAED;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,aAAa,QAK3B;IAED;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAM1B;IAED;;;OAGG;IACG,YAAY,kBAGjB;CACF;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAI3B;CACF;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAC/G;;;;OAIG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,CAQ5D;IAED;;;;;OAKG;IACG,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CA6C7E;CACF;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/lib/services/servicerunner.service.js

@@ -0,0 +1,131 @@
+import { callOperation, OperationContext, SimpleOperationContext, useApplication, useDynamicService } from "@webda/core";
+import { ConsoleLogger, MemoryLogger, useWorkerOutput } from "@webda/workout";
+import { AsyncOperationAction, AsyncWebdaAction } from "../asyncaction.model.js";
+import { Runner, RunnerParameters } from "./runner.service.js";
+/**
+ * Keep log in memory and save it to the action object every 5s
+ */
+export class ActionMemoryLogger extends MemoryLogger {
+    /**
+     * @param output - the worker output to listen to
+     * @param level - the log level
+     * @param limit - the maximum number of logs
+     * @param action - the action to save logs to
+     * @param logSaveDelay - delay before saving logs
+     * @param format - the log format
+     */
+    constructor(output, level, limit, action, logSaveDelay, format) {
+        super(output, level, limit);
+        this.action = action;
+        this.logSaveDelay = logSaveDelay;
+        this.format = format;
+    }
+    /**
+     * Schedule a save on each message
+     * @param msg - the message
+     */
+    onMessage(msg) {
+        super.onMessage(msg);
+        if (!this.timeout) {
+            this.timeout = setTimeout(() => this.save(), this.logSaveDelay);
+        }
+    }
+    /**
+     * Save the logs to the action
+     */
+    async save() {
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
+        }
+        await this.action.patch({ logs: this.getLogs().map(msg => ConsoleLogger.format(msg, this.format)) });
+    }
+    /**
+     * Close the logger and save the logs
+     * @returns the save promise
+     */
+    async saveAndClose() {
+        this.close();
+        return this.save();
+    }
+}
+/**
+ * Add the log format to capture
+ */
+export class ServiceRunnerParameters extends RunnerParameters {
+    /**
+     * @override
+     * @param params - the input parameters
+     * @returns this
+     */
+    load(params = {}) {
+        super.load(params);
+        this.logSaveDelay ?? (this.logSaveDelay = 5000);
+        return this;
+    }
+}
+/**
+ * Run a Job locally on the server by spawning a child process
+ *
+ * @WebdaModda
+ */
+export default class ServiceRunner extends Runner {
+    /**
+     * Rebuild an operation context if the action was loaded from a store
+     * @param context - the stored context
+     * @returns an operation context
+     */
+    getOperationContext(context) {
+        if (context instanceof OperationContext) {
+            return context;
+        }
+        const input = context?.input;
+        return new SimpleOperationContext().setInput(Buffer.isBuffer(input) ? input : input?.type === "Buffer" ? Buffer.from(input.data) : Buffer.from("{}"));
+    }
+    /**
+     * @inheritdoc
+     * @param action - the action to launch
+     * @param info - the job information
+     * @returns the service action
+     */
+    async launchAction(action, info) {
+        if (!(action instanceof AsyncWebdaAction || action instanceof AsyncOperationAction)) {
+            this.log("ERROR", "Can only handle AsyncWebdaAction or AsyncOperationAction got", action.constructor.name);
+            throw new Error("Can only handle AsyncWebdaAction or AsyncOperationAction got " + action.constructor.name);
+        }
+        // Launch within current process
+        const promise = (async (action) => {
+            let logger;
+            try {
+                await action.patch({ status: "RUNNING" });
+                this.log("INFO", "Job", action.uuid, "started");
+                // Inject a MemoryLogger to capture and report any logs
+                logger = new ActionMemoryLogger(useApplication()?.getWorkerOutput() || useWorkerOutput(), action.logLevel, useDynamicService(info.JOB_ORCHESTRATOR)?.getParameters().logsLimit || 5000, action, this.parameters.logSaveDelay, this.parameters.logFormat);
+                if (action instanceof AsyncWebdaAction) {
+                    await useDynamicService(action.serviceName)[action.method](...(action.arguments || []));
+                }
+                else {
+                    await callOperation(this.getOperationContext(action.context), action.operationId);
+                }
+                await logger.saveAndClose();
+                await action.patch({ status: "SUCCESS" });
+                this.log("INFO", "Job", action.uuid, "finished");
+            }
+            catch (err) {
+                await logger?.saveAndClose();
+                await action.patch({
+                    status: "ERROR",
+                    errorMessage: err.message,
+                    errorName: err.name
+                });
+                this.log("ERROR", "Job", action.uuid, "errored", err);
+            }
+        })(action);
+        return {
+            agent: Runner.getAgentInfo(),
+            promise
+        };
+    }
+}
+export { ServiceRunner };
+//# sourceMappingURL=servicerunner.service.js.map

package/lib/services/servicerunner.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"servicerunner.service.js","sourceRoot":"","sources":["../../src/services/servicerunner.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,8 @@
 {
   "name": "@webda/async",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.3",
   "description": "Async System",
   "main": "lib/index.js",
-  "scripts": {
-    "build": "tsc-esm",
-    "build:module": "webda build",
-    "build:watch": "webda build --watch",
-    "pretest": "npm run build",
-    "test": "c8 mocha -r ../../node_modules/ts-node/register",
-    "test:debug": "mocha --recursive --exit --no-timeouts 'src/**/*.spec.ts'",
-    "run": "node core"
-  },
   "keywords": [
     "webda-module"
   ],
@@ -21,33 +12,26 @@
     "package.json"
   ],
   "dependencies": {
-    "@webda/core": "^4.0.0-beta.1",
-    "@webda/workout": "^4.0.0-beta.1",
-    "axios": "^1.1.3",
+    "axios": "^1.14.0",
     "json-schema": "^0.4.0",
-    "node-cron": "^3.0.2"
+    "node-cron": "^4.2.1",
+    "@webda/core": "4.0.0-beta.3",
+    "@webda/ql": "4.0.0-beta.3",
+    "@webda/utils": "4.0.0-beta.3",
+    "@webda/workout": "4.0.0-beta.3"
   },
   "devDependencies": {
-    "@testdeck/mocha": "^0.3.3",
-    "@types/node": "18.11.13",
-    "@webda/tsc-esm": "^4.0.0-beta.1",
-    "mocha": "^10.0.0",
-    "sinon": "^18.0.0",
-    "source-map-support": "^0.5.19",
-    "ts-node": "^10.2.0",
-    "typescript": "~5.5.3"
-  },
-  "c8": {
-    "report-dir": "./reports",
-    "reporter": [
-      "html",
-      "lcov",
-      "json",
-      "text"
-    ],
-    "exclude": [
-      "**/*.spec.ts"
-    ]
+    "@types/json-schema": "^7.0.15",
+    "@types/node": "25.5.0",
+    "@vitest/coverage-v8": "^4.1.2",
+    "jscodeshift": "^17.3.0",
+    "sinon": "^21.0.3",
+    "skott": "^0.35.8",
+    "typescript": "7.1.0-dev.20260929.1",
+    "vite": "^6.0.0",
+    "vitest": "^4.1.2",
+    "@webda/test": "4.0.0-beta.3",
+    "@webda/compiler": "^4.0.0-beta.3"
   },
   "bugs": {
     "url": "https://github.com/loopingz/webda.io/issues"
@@ -65,7 +49,7 @@
   },
   "type": "module",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "nx": {
     "implicitDependencies": [
@@ -73,5 +57,17 @@
       "@webda/tsc-esm"
     ]
   },
-  "gitHead": "9f0c12d5e43b3484794b2a49c5701b8b9675c4a8"
-}
+  "license": "LGPL-3.0-only",
+  "scripts": {
+    "build": "webdac build",
+    "build:watch": "webdac build --watch",
+    "pretest": "npm run build",
+    "test": "vitest run",
+    "format": "prettier --check src/**/*",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "format:fix": "prettier --write src/**/*",
+    "deps:graph": "skott --showCircularDependencies --no-trackTypeOnlyDependencies --displayMode=raw -e .ts",
+    "codemod": "jscodeshift --parser=ts --extensions=tsx,ts -t ../codemod/current.mjs src"
+  }
+}