@webda/async 2.0.0-beta.2 → 2.0.1

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./models";
-export * from "./services/asyncjobservice";
-export * from "./services/runner";
-export * from "./services/localrunner";
+export * from "./models.js";
+export * from "./services/asyncjobservice.js";
+export * from "./services/runner.js";
+export * from "./services/localrunner.js";

package/lib/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./models"), exports);
-__exportStar(require("./services/asyncjobservice"), exports);
-__exportStar(require("./services/runner"), exports);
-__exportStar(require("./services/localrunner"), exports);
+export * from "./models.js";
+export * from "./services/asyncjobservice.js";
+export * from "./services/runner.js";
+export * from "./services/localrunner.js";
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6DAA2C;AAC3C,oDAAkC;AAClC,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC"}

package/lib/models.d.ts

@@ -26,6 +26,10 @@ export interface Job {
  * @WebdaModel
  */
 export default class AsyncAction extends CoreModel {
+    /**
+     * Action uuid
+     */
+    uuid: string;
     /**
      * Current status
      */

package/lib/models.js

@@ -1,19 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncAction = exports.WebdaAsyncAction = void 0;
-const core_1 = require("@webda/core");
+import { CoreModel } from "@webda/core";
 /**
  * Define here a model that can be used along with Store service
  * @WebdaModel
  */
-class AsyncAction extends core_1.CoreModel {
+export default class AsyncAction extends CoreModel {
 }
-exports.default = AsyncAction;
-exports.AsyncAction = AsyncAction;
 /**
  * Define a Webda Async Action
  */
-class WebdaAsyncAction extends AsyncAction {
+export class WebdaAsyncAction extends AsyncAction {
 }
-exports.WebdaAsyncAction = WebdaAsyncAction;
+export { AsyncAction };
 //# sourceMappingURL=models.js.map

package/lib/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":";;;AAAA,sCAAwC;AAyBxC;;;GAGG;AACH,MAAqB,WAAY,SAAQ,gBAAS;CAuDjD;AAvDD,8BAuDC;AAgBQ,kCAAW;AAdpB;;GAEG;AACH,MAAa,gBAAiB,SAAQ,WAAW;CAShD;AATD,4CASC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAyBxC;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;CA2DjD;AAED;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,WAAW;CAShD;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/lib/services/asyncjobservice.d.ts

@@ -1,6 +1,6 @@
 import { CloudBinary, Context, Queue, RequestFilter, Service, ServiceParameters, Store } from "@webda/core";
-import { AsyncAction, AsyncActionQueueItem } from "../models";
-import { Runner } from "./runner";
+import { AsyncAction, AsyncActionQueueItem } from "../models.js";
+import { Runner } from "./runner.js";
 /**
  * Represent a Job information as you will find in env
  */
@@ -90,7 +90,7 @@ export default class AsyncJobService<T extends AsyncJobServiceParameters = Async
     /**
      * @inheritdoc
      */
-    resolve(): void;
+    resolve(): this;
     /**
      * Allow job status report url
      */
@@ -131,8 +131,7 @@ export default class AsyncJobService<T extends AsyncJobServiceParameters = Async
      * @returns
      */
     getHeaders(jobInfo: JobInfo): {
-        "X-Job-Id": string;
-        "X-Job-Time": string;
+        [key: string]: string;
     };
     /**
      * Wrap async job and call the job status hook

package/lib/services/asyncjobservice.js

@@ -1,40 +1,26 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncJobService = exports.AsyncJobServiceParameters = void 0;
-const core_1 = require("@webda/core");
-const axios_1 = require("axios");
-const crypto = require("crypto");
-const uuid_1 = require("uuid");
-const runner_1 = require("./runner");
+import { Service, ServiceParameters } from "@webda/core";
+import axios from "axios";
+import * as crypto from "crypto";
+import { v4 as uuidv4 } from "uuid";
+import { Runner } from "./runner.js";
 /**
  * @inheritdoc
  */
-class AsyncJobServiceParameters extends core_1.ServiceParameters {
+export class AsyncJobServiceParameters extends ServiceParameters {
     constructor(params) {
-        var _a, _b, _c, _d;
         super(params);
-        (_a = this.url) !== null && _a !== void 0 ? _a : (this.url = "/async/jobs");
-        (_b = this.queue) !== null && _b !== void 0 ? _b : (this.queue = "AsyncActionsQueue");
-        (_c = this.store) !== null && _c !== void 0 ? _c : (this.store = "AsyncActions");
-        (_d = this.runners) !== null && _d !== void 0 ? _d : (this.runners = []);
+        this.url ?? (this.url = "/async/jobs");
+        this.queue ?? (this.queue = "AsyncActionsQueue");
+        this.store ?? (this.store = "AsyncActions");
+        this.runners ?? (this.runners = []);
     }
 }
-exports.AsyncJobServiceParameters = AsyncJobServiceParameters;
 /**
  * AsyncService allows you to launch jobs and report status
  *
  * @WebdaModda
  */
-class AsyncJobService extends core_1.Service {
+export default class AsyncJobService extends Service {
     /**
      * @inheritdoc
      */
@@ -86,132 +72,124 @@ class AsyncJobService extends core_1.Service {
             });
         }
         this.getWebda().registerRequestFilter(this);
+        return this;
     }
     /**
      * Allow job status report url
      */
-    checkRequest(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = context.getHttpContext().getRelativeUri();
-            if (url.startsWith(this.parameters.url)) {
-                // Allow status url to be called without other mechanism
-                yield this.verifyJobRequest(context);
-                return true;
-            }
-            return false;
-        });
+    async checkRequest(context) {
+        const url = context.getHttpContext().getRelativeUri();
+        if (url.startsWith(this.parameters.url)) {
+            // Allow status url to be called without other mechanism
+            await this.verifyJobRequest(context);
+            return true;
+        }
+        return false;
     }
     /**
      *
      * @param context
      * @param action
      */
-    verifyJobRequest(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const jobId = context.getHttpContext().getUniqueHeader("X-Job-Id");
-            if (!jobId) {
-                this.log("TRACE", "Require Job Id");
-                throw 404;
-            }
-            const action = yield this.store.get(jobId);
-            if (!action) {
-                this.log("TRACE", `Unknown Job Id '${jobId}'`);
-                throw 404;
-            }
-            const jobTime = context.getHttpContext().getUniqueHeader("X-Job-Time");
-            const jobHash = context.getHttpContext().getUniqueHeader("X-Job-Hash");
-            // Ensure hash mac is correct
-            if (jobHash !== crypto.createHmac(AsyncJobService.HMAC_ALGO, action.__secretKey).update(jobTime).digest("hex")) {
-                this.log("TRACE", "Invalid Job HMAC");
-                throw 403;
-            }
-            // Set the context extension
-            context.setExtension("asyncJob", action);
-            return action;
-        });
+    async verifyJobRequest(context) {
+        const jobId = context.getHttpContext().getUniqueHeader("X-Job-Id");
+        if (!jobId) {
+            this.log("TRACE", "Require Job Id");
+            throw 404;
+        }
+        const action = await this.store.get(jobId);
+        if (!action) {
+            this.log("TRACE", `Unknown Job Id '${jobId}'`);
+            throw 404;
+        }
+        const jobTime = context.getHttpContext().getUniqueHeader("X-Job-Time");
+        const jobHash = context.getHttpContext().getUniqueHeader("X-Job-Hash");
+        // Ensure hash mac is correct
+        if (jobHash !== crypto.createHmac(AsyncJobService.HMAC_ALGO, action.__secretKey).update(jobTime).digest("hex")) {
+            this.log("TRACE", "Invalid Job HMAC");
+            throw 403;
+        }
+        // Set the context extension
+        context.setExtension("asyncJob", action);
+        return action;
     }
     /**
      * Status hook for job report
      *
      * Only updates specific fields: status, errorMessage, statusDetails, results, logs (appending)
      */
-    statusHook(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const action = yield this.verifyJobRequest(context);
-            const body = yield context.getRequestBody();
-            action._lastJobUpdate = Number.parseInt(context.getHttpContext().getUniqueHeader("X-Job-Time")) || 0;
-            if (Date.now() - action._lastJobUpdate > 60) {
-                action._lastJobUpdate = Date.now();
+    async statusHook(context) {
+        const action = await this.verifyJobRequest(context);
+        const body = await context.getRequestBody();
+        action._lastJobUpdate = Number.parseInt(context.getHttpContext().getUniqueHeader("X-Job-Time")) || 0;
+        if (Date.now() - action._lastJobUpdate > 60) {
+            action._lastJobUpdate = Date.now();
+        }
+        if (body.logs && Array.isArray(body.logs)) {
+            action.logs.push(...body.logs);
+            // Prevent having too much logs
+            if (action.logs.length > 100) {
+                action.logs = action.logs.slice(-100);
             }
-            if (body.logs && Array.isArray(body.logs)) {
-                action.logs.push(...body.logs);
-                // Prevent having too much logs
-                if (action.logs.length > 100) {
-                    action.logs = action.logs.slice(-100);
-                }
+        }
+        ["status", "errorMessage", "statusDetails", "results"].forEach(k => {
+            if (body[k] !== undefined) {
+                // @ts-ignore
+                action[k] = body[k];
             }
-            ["status", "errorMessage", "statusDetails", "results"].forEach(k => {
-                if (body[k] !== undefined) {
-                    action[k] = body[k];
-                }
-            });
-            yield this.store.save(action);
-            context.write(Object.assign(Object.assign({}, action), { logs: undefined, statusDetails: undefined }));
         });
+        await this.store.save(action);
+        context.write({ ...action, logs: undefined, statusDetails: undefined });
     }
     /**
      * Worker
      *
      * This will launch actions based on defined runners
      */
-    worker() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.runners.length === 0) {
-                throw new Error(`AsyncJobService.worker requires runners`);
-            }
-            return this.queue.consume(this.handleEvent.bind(this));
-        });
+    async worker() {
+        if (this.runners.length === 0) {
+            throw new Error(`AsyncJobService.worker requires runners`);
+        }
+        return this.queue.consume(this.handleEvent.bind(this));
     }
     /**
      * Handle one event from the queue and launch the job
      * @param event
      */
-    handleEvent(event) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let selectedRunner;
-            // Take first to acknowledge the job
-            for (let runner of this.runners) {
-                if (runner.handleType(event.type)) {
-                    selectedRunner = runner;
-                    break;
-                }
-            }
-            // Fallback if needed
-            if (selectedRunner === undefined && this.parameters.fallbackOnFirst) {
-                selectedRunner = this.runners[0];
-            }
-            if (selectedRunner === undefined) {
-                yield this.store.patch({
-                    uuid: event.uuid,
-                    status: "ERROR",
-                    errorMessage: `No runner found for the job`
-                });
-                return;
+    async handleEvent(event) {
+        let selectedRunner;
+        // Take first to acknowledge the job
+        for (let runner of this.runners) {
+            if (runner.handleType(event.type)) {
+                selectedRunner = runner;
+                break;
             }
-            yield this.store.patch({
+        }
+        // Fallback if needed
+        if (selectedRunner === undefined && this.parameters.fallbackOnFirst) {
+            selectedRunner = this.runners[0];
+        }
+        if (selectedRunner === undefined) {
+            await this.store.patch({
                 uuid: event.uuid,
-                status: "STARTING"
-            });
-            const action = yield this.store.get(event.uuid);
-            const info = {
-                JOB_SECRET_KEY: action.__secretKey,
-                JOB_ID: action.getUuid(),
-                JOB_HOOK: this.getWebda().getApiUrl(this.parameters.url),
-                JOB_ORCHESTRATOR: this.getName()
-            };
-            yield action.update({
-                job: yield selectedRunner.launchAction(action, info)
+                status: "ERROR",
+                errorMessage: `No runner found for the job`
             });
+            return;
+        }
+        await this.store.patch({
+            uuid: event.uuid,
+            status: "STARTING"
+        });
+        const action = await this.store.get(event.uuid);
+        const info = {
+            JOB_SECRET_KEY: action.__secretKey,
+            JOB_ID: action.getUuid(),
+            JOB_HOOK: this.getWebda().getApiUrl(this.parameters.url),
+            JOB_ORCHESTRATOR: this.getName()
+        };
+        await action.patch({
+            job: await selectedRunner.launchAction(action, info)
         });
     }
     /**
@@ -219,17 +197,15 @@ class AsyncJobService extends core_1.Service {
      * @param action
      * @returns
      */
-    launchAction(action) {
-        return __awaiter(this, void 0, void 0, function* () {
-            action.status = "QUEUED";
-            action.type = action.constructor.name;
-            action.__secretKey = (0, uuid_1.v4)();
-            yield this.store.save(action);
-            if (this.parameters.localLaunch) {
-                return this.handleEvent({ uuid: action.getUuid(), __secretKey: action.__secretKey, type: action.type });
-            }
-            return this.queue.sendMessage({ uuid: action.getUuid(), __secretKey: action.__secretKey, type: action.type });
-        });
+    async launchAction(action) {
+        action.status = "QUEUED";
+        action.type = action.constructor.name;
+        action.__secretKey = uuidv4();
+        await this.store.save(action);
+        if (this.parameters.localLaunch) {
+            return this.handleEvent({ uuid: action.getUuid(), __secretKey: action.__secretKey, type: action.type });
+        }
+        return this.queue.sendMessage({ uuid: action.getUuid(), __secretKey: action.__secretKey, type: action.type });
     }
     /**
      * Return headers to request status hook
@@ -251,70 +227,73 @@ class AsyncJobService extends core_1.Service {
     /**
      * Wrap async job and call the job status hook
      */
-    runWebdaAsyncAction(jobInfo = undefined) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Get it from environment
-            if (jobInfo === undefined) {
-                jobInfo = {};
-                Object.keys(process.env)
-                    .filter(k => k.startsWith("JOB_"))
-                    .forEach(k => (jobInfo[k] = process.env[k]));
+    async runWebdaAsyncAction(jobInfo) {
+        // Get it from environment
+        if (jobInfo === undefined) {
+            jobInfo = {};
+            Object.keys(process.env)
+                .filter(k => k.startsWith("JOB_"))
+                // @ts-ignore
+                .forEach((k) => (jobInfo[k] = process.env[k]));
+        }
+        // Ensure correct context
+        if (!jobInfo.JOB_ORCHESTRATOR || !jobInfo.JOB_ID || !jobInfo.JOB_SECRET_KEY || !jobInfo.JOB_HOOK) {
+            throw new Error("Cannot run AsyncAction without context");
+        }
+        // If we are not the target redirect to the right one
+        if (jobInfo.JOB_ORCHESTRATOR !== this.getName()) {
+            return this.getService(jobInfo.JOB_ORCHESTRATOR).runWebdaAsyncAction(jobInfo);
+        }
+        // Get action info by calling the hook
+        let action = (await axios.post(jobInfo.JOB_HOOK, {
+            agent: {
+                ...Runner.getAgentInfo(),
+                nodeVersion: process.version
+            },
+            status: "RUNNING"
+        }, {
+            headers: this.getHeaders(jobInfo)
+        })).data;
+        let results;
+        try {
+            // Check it contains the right info
+            if (!action.method || !action.serviceName) {
+                throw new Error("WebdaAsyncAction must have method and serviceName defined at least");
             }
-            // Ensure correct context
-            if (!jobInfo.JOB_ORCHESTRATOR || !jobInfo.JOB_ID || !jobInfo.JOB_SECRET_KEY || !jobInfo.JOB_HOOK) {
-                throw new Error("Cannot run AsyncAction without context");
+            // Call the service[method](...args)
+            let service = this.getService(action.serviceName);
+            if (!service) {
+                throw new Error(`WebdaAsyncAction Service '${action.serviceName}' not found: mismatch app version`);
             }
-            // If we are not the target redirect to the right one
-            if (jobInfo.JOB_ORCHESTRATOR !== this.getName()) {
-                return this.getService(jobInfo.JOB_ORCHESTRATOR).runWebdaAsyncAction(jobInfo);
+            // @ts-ignore
+            if (!service[action.method]) {
+                throw new Error(`WebdaAsyncAction Method '${action.method}' not found in service ${action.serviceName}: mismatch app version`);
             }
-            // Get action info by calling the hook
-            let action = (yield axios_1.default.post(jobInfo.JOB_HOOK, {
-                agent: Object.assign(Object.assign({}, runner_1.Runner.getAgentInfo()), { nodeVersion: process.version }),
-                status: "RUNNING"
-            }, {
-                headers: this.getHeaders(jobInfo)
-            })).data;
-            let results;
-            try {
-                // Check it contains the right info
-                if (!action.method || !action.serviceName) {
-                    throw new Error("WebdaAsyncAction must have method and serviceName defined at least");
-                }
-                // Call the service[method](...args)
-                let service = this.getService(action.serviceName);
-                if (!service) {
-                    throw new Error(`WebdaAsyncAction Service '${action.serviceName}' not found: mismatch app version`);
-                }
-                if (!service[action.method]) {
-                    throw new Error(`WebdaAsyncAction Method '${action.method}' not found in service ${action.serviceName}: mismatch app version`);
-                }
-                results = yield service[action.method](...action.arguments);
-            }
-            catch (err) {
-                // Job is in error
-                yield axios_1.default.post(jobInfo.JOB_HOOK, {
-                    errorMessage: err.message,
-                    status: "ERROR"
-                }, {
-                    headers: this.getHeaders(jobInfo)
-                });
-                return;
-            }
-            // Update status
-            yield axios_1.default.post(jobInfo.JOB_HOOK, {
-                results,
-                status: "SUCCESS"
+            // @ts-ignore
+            results = await service[action.method](...(action.arguments || []));
+        }
+        catch (err) {
+            // Job is in error
+            await axios.post(jobInfo.JOB_HOOK, {
+                errorMessage: err?.message,
+                status: "ERROR"
             }, {
                 headers: this.getHeaders(jobInfo)
             });
+            return;
+        }
+        // Update status
+        await axios.post(jobInfo.JOB_HOOK, {
+            results,
+            status: "SUCCESS"
+        }, {
+            headers: this.getHeaders(jobInfo)
         });
     }
 }
-exports.default = AsyncJobService;
-exports.AsyncJobService = AsyncJobService;
 /**
  * HMAC Algorithm used for simple auth
  */
 AsyncJobService.HMAC_ALGO = "sha256";
+export { AsyncJobService };
 //# sourceMappingURL=asyncjobservice.js.map

package/lib/services/asyncjobservice.js.map

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

package/lib/services/localrunner.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { ServiceParameters } from "@webda/core";
 import { SpawnOptions } from "child_process";
-import { AsyncAction } from "../models";
-import { JobInfo } from "./asyncjobservice";
-import { AgentInfo, Runner, RunnerParameters } from "./runner";
+import { AsyncAction } from "../models.js";
+import { JobInfo } from "./asyncjobservice.js";
+import { AgentInfo, Runner, RunnerParameters } from "./runner.js";
 export declare class LocalRunnerParameters extends RunnerParameters {
     /**
      * Command to launch
@@ -42,6 +42,7 @@ export default class LocalRunner<T extends LocalRunnerParameters = LocalRunnerPa
      * @inheritdoc
      */
     loadParameters(params: any): ServiceParameters;
+    spawn(command: string, args: string[], options?: SpawnOptions | undefined): import("child_process").ChildProcess;
     /**
      * @inheritdoc
      */

package/lib/services/localrunner.js

@@ -1,76 +1,70 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalRunnerParameters = void 0;
-const child_process_1 = require("child_process");
-const runner_1 = require("./runner");
-class LocalRunnerParameters extends runner_1.RunnerParameters {
+import { spawn } from "child_process";
+import { Runner, RunnerParameters } from "./runner.js";
+export class LocalRunnerParameters extends RunnerParameters {
     constructor(params) {
-        var _a, _b;
-        var _c;
+        var _a;
         super(params);
-        (_a = this.options) !== null && _a !== void 0 ? _a : (this.options = {});
-        (_b = (_c = this.options).env) !== null && _b !== void 0 ? _b : (_c.env = {});
+        this.options ?? (this.options = {});
+        (_a = this.options).env ?? (_a.env = {});
     }
 }
-exports.LocalRunnerParameters = LocalRunnerParameters;
 /**
  * Run a Job locally on the server by spawning a child process
  *
  * @WebdaModda
  */
-class LocalRunner extends runner_1.Runner {
+export default class LocalRunner extends Runner {
     /**
      * @inheritdoc
      */
     loadParameters(params) {
         return new LocalRunnerParameters(params);
     }
+    spawn(command, args, options) {
+        /* c8 ignore next 2 */
+        return spawn(command, args, options);
+    }
     /**
      * @inheritdoc
      */
-    launchAction(action, info) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envs = Object.assign(Object.assign({}, this.parameters.options.env), info);
-            this.log("INFO", "Job", action.getUuid(), "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 = (0, child_process_1.spawn)(this.parameters.command, this.parameters.args, Object.assign(Object.assign({}, this.parameters.options), { env: envs, detached: true }));
-            // AutoStatus based on process info
-            if (this.parameters.autoStatus) {
-                child.stdout.on("data", data => {
-                    action.getStore().upsertItemToCollection(action.getUuid(), "logs", data);
-                });
-                child.stderr.on("data", data => {
-                    action.getStore().upsertItemToCollection(action.getUuid(), "logs", data);
-                });
-                // As this is local just and mostly used for batch auto status it
-                yield action.getStore().patch({ uuid: action.getUuid(), status: "RUNNING" });
-                child.on("exit", (code) => __awaiter(this, void 0, void 0, function* () {
-                    if (code !== 0) {
-                        this.log("INFO", "Job", action.getUuid(), "errored with", code);
-                        yield action.getStore().patch({ uuid: action.getUuid(), status: "ERROR" });
-                    }
-                    else {
-                        this.log("INFO", "Job", action.getUuid(), "successful");
-                        yield action.getStore().patch({ uuid: action.getUuid(), status: "SUCCESS" });
-                    }
-                }));
-            }
-            return {
-                agent: runner_1.Runner.getAgentInfo(),
-                pid: child.pid
-            };
+    async launchAction(action, info) {
+        let envs = {
+            ...this.parameters.options?.env,
+            ...info
+        };
+        this.log("INFO", "Job", action.getUuid(), "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) {
+            child.stdout?.on("data", data => {
+                action.getStore().upsertItemToCollection(action.getUuid(), "logs", data);
+            });
+            child.stderr?.on("data", data => {
+                action.getStore().upsertItemToCollection(action.getUuid(), "logs", data);
+            });
+            // As this is local just and mostly used for batch auto status it
+            await action.getStore().patch({ uuid: action.getUuid(), status: "RUNNING" });
+            child.on("exit", async (code) => {
+                if (code !== 0) {
+                    this.log("INFO", "Job", action.getUuid(), "errored with", code);
+                    await action.getStore().patch({ uuid: action.getUuid(), status: "ERROR" });
+                }
+                else {
+                    this.log("INFO", "Job", action.getUuid(), "successful");
+                    await action.getStore().patch({ uuid: action.getUuid(), status: "SUCCESS" });
+                }
+            });
+        }
+        return {
+            agent: Runner.getAgentInfo(),
+            pid: child?.pid || -1
+        };
     }
 }
-exports.default = LocalRunner;
 //# sourceMappingURL=localrunner.js.map

package/lib/services/localrunner.js.map

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

package/lib/services/runner.d.ts

@@ -1,6 +1,6 @@
-import { ServiceParameters, Service } from "@webda/core";
-import { AsyncAction } from "../models";
-import { JobInfo } from "./asyncjobservice";
+import { Service, ServiceParameters } from "@webda/core";
+import { AsyncAction } from "../models.js";
+import { JobInfo } from "./asyncjobservice.js";
 export declare class RunnerParameters extends ServiceParameters {
     /**
      * Actions managed by the runner

package/lib/services/runner.js

@@ -1,20 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Runner = exports.RunnerParameters = void 0;
-const core_1 = require("@webda/core");
-const os = require("os");
-class RunnerParameters extends core_1.ServiceParameters {
+import { Service, ServiceParameters } from "@webda/core";
+import * as os from "os";
+export class RunnerParameters extends ServiceParameters {
     constructor(params) {
-        var _a;
         super(params);
-        (_a = this.actions) !== null && _a !== void 0 ? _a : (this.actions = []);
+        this.actions ?? (this.actions = []);
     }
 }
-exports.RunnerParameters = RunnerParameters;
 /**
  * Runner take and launch an action
  */
-class Runner extends core_1.Service {
+export class Runner extends Service {
     /**
      * @inheritdoc
      */
@@ -27,7 +22,7 @@ class Runner extends core_1.Service {
      * @returns
      */
     handleType(type) {
-        return this.parameters.actions.includes(type);
+        return this.parameters.actions?.includes(type) ?? false;
     }
     /**
      * Return agent information
@@ -43,5 +38,4 @@ class Runner extends core_1.Service {
         };
     }
 }
-exports.Runner = Runner;
 //# sourceMappingURL=runner.js.map

package/lib/services/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/services/runner.ts"],"names":[],"mappings":";;;AAAA,sCAAyD;AAEzD,yBAAyB;AAGzB,MAAa,gBAAiB,SAAQ,wBAAiB;IAOrD,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;IACtB,CAAC;CACF;AAXD,4CAWC;AAoBD;;GAEG;AACH,MAAsB,MAAsD,SAAQ,cAAU;IAC5F;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IACD;;;;OAIG;IACH,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChD,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,CAAA;IACH,CAAC;CAMF;AAlCD,wBAkCC"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/services/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAIzB,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAOrD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;IACtB,CAAC;CACF;AAoBD;;GAEG;AACH,MAAM,OAAgB,MAAsD,SAAQ,OAAU;IAC5F;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IACD;;;;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;CAMF"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@webda/async",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.1",
   "description": "Async System",
   "main": "lib/index.js",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc-esm",
+    "build:module": "webda build",
     "pretest": "npm run build",
-    "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts",
+    "test": "c8 mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts",
     "run": "node core"
   },
   "keywords": [
@@ -18,22 +19,19 @@
     "package.json"
   ],
   "dependencies": {
-    "@types/node": "^16.4.14",
-    "@webda/core": "^2.0.0-beta.2",
+    "@webda/core": "^2.0.1",
     "axios": "^0.27.2"
   },
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/node": "14.0.0",
+    "@types/node": "14.6.0",
+    "@webda/tsc-esm": "^1.0.0",
     "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
     "sinon": "^14.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.2.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.7.2"
   },
-  "nyc": {
-    "extends": "@istanbuljs/nyc-config-typescript",
+  "c8": {
     "report-dir": "./reports",
     "reporter": [
       "html",
@@ -59,5 +57,9 @@
   "webda": {
     "namespace": "Webda"
   },
-  "gitHead": "4928e6830cd4164166d00195ff2fef0d52bf0ba6"
+  "type": "module",
+  "engines": {
+    "node": ">=14.6.0"
+  },
+  "gitHead": "9b32b64d7cd6dee23eaaeea9cd28a7286cdcac6a"
 }

package/webda.module.json

@@ -3,8 +3,313 @@
     "webda/asyncjobservice": "lib/services/asyncjobservice:default",
     "webda/localrunner": "lib/services/localrunner:default"
   },
+  "beans": {},
   "models": {
     "webda/asyncaction": "lib/models:default"
   },
-  "deployers": {}
-}
+  "deployers": {},
+  "schemas": {
+    "webda/asyncaction": {
+      "type": "object",
+      "properties": {
+        "_creationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Creation date",
+          "readOnly": true
+        },
+        "_lastUpdate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Last update date",
+          "readOnly": true
+        },
+        "uuid": {
+          "type": "string",
+          "description": "Action uuid"
+        },
+        "status": {
+          "type": "string",
+          "enum": [
+            "RUNNING",
+            "SUCCESS",
+            "ERROR",
+            "QUEUED",
+            "STARTING",
+            "TIMEOUT"
+          ],
+          "description": "Current status"
+        },
+        "errorMessage": {
+          "type": "string",
+          "description": "If an error occured it should contain the message"
+        },
+        "job": {
+          "type": "object",
+          "description": "Job information"
+        },
+        "_lastJobUpdate": {
+          "type": "number",
+          "description": "Last time the job was updated",
+          "readOnly": true
+        },
+        "results": {
+          "description": "Results from the job"
+        },
+        "statusDetails": {
+          "description": "Job current status"
+        },
+        "type": {
+          "type": "string"
+        },
+        "arguments": {
+          "type": "array",
+          "items": {}
+        },
+        "logs": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Current logs"
+        },
+        "action": {
+          "type": "string",
+          "description": "Expected action for the job\n\nIt should be a verb"
+        }
+      },
+      "required": [
+        "uuid",
+        "status",
+        "job",
+        "results",
+        "statusDetails",
+        "type",
+        "logs"
+      ],
+      "description": "Define here a model that can be used along with Store service",
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AsyncAction"
+    },
+    "webda/asyncjobservice": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Type of the service"
+        },
+        "url": {
+          "type": "string",
+          "description": "URL to expose job status report hook",
+          "default": "/async/jobs"
+        },
+        "store": {
+          "type": "string",
+          "description": "Store name to use for async actions",
+          "default": "AsyncActions"
+        },
+        "binaryStore": {
+          "type": "string",
+          "description": "If we want to expose a way to upload/download binary for the job\n\nIt will expose a /download and /upload additional url"
+        },
+        "localLaunch": {
+          "type": "boolean",
+          "description": "If set runner will be called without queue",
+          "default": false
+        },
+        "queue": {
+          "type": "string",
+          "description": "Queue to post execution to",
+          "default": "AsyncActionsQueue"
+        },
+        "fallbackOnFirst": {
+          "type": "boolean",
+          "description": "Fallback on first runner if none match",
+          "default": false
+        },
+        "runners": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Runners to use"
+        },
+        "concurrencyLimit": {
+          "type": "number",
+          "description": "Limit the maximum number of jobs running in //"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
+        }
+      },
+      "required": [
+        "fallbackOnFirst",
+        "queue",
+        "runners",
+        "store",
+        "type",
+        "url"
+      ],
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AsyncJobService"
+    },
+    "webda/localrunner": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Type of the service"
+        },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
+        "actions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Actions managed by the runner",
+          "default": []
+        },
+        "command": {
+          "type": "string",
+          "description": "Command to launch"
+        },
+        "args": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Args"
+        },
+        "options": {
+          "type": "object",
+          "properties": {
+            "serialization": {
+              "$ref": "#/definitions/SerializationType",
+              "description": "Specify the kind of serialization used for sending messages between processes.",
+              "default": "json"
+            },
+            "uid": {
+              "type": "number"
+            },
+            "gid": {
+              "type": "number"
+            },
+            "cwd": {
+              "type": "string"
+            },
+            "env": {
+              "type": "object",
+              "properties": {}
+            },
+            "windowsHide": {
+              "type": "boolean",
+              "default": true
+            },
+            "timeout": {
+              "type": "number",
+              "default": 0
+            },
+            "argv0": {
+              "type": "string"
+            },
+            "stdio": {
+              "$ref": "#/definitions/StdioOptions"
+            },
+            "shell": {
+              "type": [
+                "boolean",
+                "string"
+              ]
+            },
+            "windowsVerbatimArguments": {
+              "type": "boolean"
+            },
+            "detached": {
+              "type": "boolean"
+            }
+          },
+          "description": "Options\n\nBased on https://nodejs.org/api/child_process.html#child_process_child_process_spawn_command_args_options"
+        },
+        "autoStatus": {
+          "type": "boolean",
+          "description": "Use the observability of ChildProcess to update status accordingly"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
+        }
+      },
+      "required": [
+        "command",
+        "type"
+      ],
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "definitions": {
+        "SerializationType": {
+          "type": "string",
+          "enum": [
+            "json",
+            "advanced"
+          ]
+        },
+        "StdioOptions": {
+          "anyOf": [
+            {
+              "type": "string",
+              "const": "pipe"
+            },
+            {
+              "type": "string",
+              "const": "ignore"
+            },
+            {
+              "type": "string",
+              "const": "inherit"
+            },
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "const": "pipe"
+                  },
+                  {
+                    "type": "string",
+                    "const": "ipc"
+                  },
+                  {
+                    "type": "string",
+                    "const": "ignore"
+                  },
+                  {
+                    "type": "string",
+                    "const": "inherit"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {}
+                  },
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "null"
+                  },
+                  {
+                    "not": {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      },
+      "title": "LocalRunner"
+    }
+  }
+}