@webda/core 1.2.1 → 1.6.0-beta.0

package/lib/services/configuration.js

@@ -17,7 +17,7 @@ class ConfigurationServiceParameters extends service_1.ServiceParameters {
     constructor(params) {
         var _a;
         super(params);
-        this.checkInterval = (_a = this.checkInterval) !== null && _a !== void 0 ? _a : 3600;
+        (_a = this.checkInterval) !== null && _a !== void 0 ? _a : (this.checkInterval = 3600);
     }
 }
 exports.ConfigurationServiceParameters = ConfigurationServiceParameters;
@@ -27,12 +27,18 @@ exports.ConfigurationServiceParameters = ConfigurationServiceParameters;
  *
  * Load configuration from another service
  *
+ * If the result contains `webda.services` in his object then webda configuration will
+ * be dynamically reloaded
+ *
  * @category CoreServices
  */
 class ConfigurationService extends service_1.Service {
     constructor() {
         super(...arguments);
-        this.watches = [];
+        /**
+         * Watchs for configuration update
+         */
+        this.watchs = [];
     }
     /**
      * Load parameters
@@ -43,6 +49,9 @@ class ConfigurationService extends service_1.Service {
     loadParameters(params) {
         return new ConfigurationServiceParameters(params);
     }
+    /**
+     * @inheritdoc
+     */
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             // Check interval by default every hour
@@ -50,60 +59,108 @@ class ConfigurationService extends service_1.Service {
                 throw new core_1.WebdaError("CONFIGURATION_SOURCE_MISSING", "Need a source for ConfigurationService");
             }
             let source = this.parameters.source.split(":");
-            this._sourceService = this.getService(source[0]);
-            if (!this._sourceService) {
+            this.sourceService = this.getService(source[0]);
+            if (!this.sourceService) {
                 throw new core_1.WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService:sourceId")');
             }
-            this._sourceId = source[1];
-            if (!this._sourceId) {
+            this.sourceId = source[1];
+            if (!this.sourceId) {
                 throw new core_1.WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid source ("sourceService:sourceId")');
             }
-            if (!this._sourceService.getConfiguration) {
-                throw new core_1.WebdaError("CONFIGURATION_SOURCE_INVALID", `Service ${source[0]} is not implementing ConfigurationProvider interface`);
+            if (!this.sourceService.getConfiguration) {
+                throw new core_1.WebdaError("CONFIGURATION_SOURCE_INVALID", `Service '${source[0]}' is not implementing ConfigurationProvider interface`);
             }
-            this._configuration = JSON.stringify(this.parameters.default);
-            yield this._checkUpdate();
-            if (!this._sourceService.canTriggerConfiguration(this._sourceId, this._checkUpdate.bind(this))) {
-                this._interval = setInterval(this._checkUpdate.bind(this), 1000);
+            this.serializedConfiguration = JSON.stringify(this.parameters.default);
+            yield this.checkUpdate();
+            if (!this.sourceService.canTriggerConfiguration(this.sourceId, this.checkUpdate.bind(this, true))) {
+                this.interval = setInterval(this.checkUpdate.bind(this), 1000);
             }
             // Add webda info
             this.watch("$.webda.services", this._webda.reinit.bind(this._webda));
         });
     }
-    watch(path, callback, defaultValue = undefined) {
-        this.watches.push({ path, callback, defaultValue });
+    /**
+     * Watch a specific configuration modification
+     *
+     * @param jsonPath JSON Path to the object to watch
+     * @param callback Method to call with the updated version
+     * @param defaultValue Default value of the jsonPath if it does not exist
+     */
+    watch(jsonPath, callback, defaultValue = undefined) {
+        this.watchs.push({ path: jsonPath, callback, defaultValue });
     }
+    /**
+     * Clear the check interval if exist
+     */
     stop() {
-        // @ts-ignore
-        clearInterval(this._interval);
+        if (this.interval !== undefined) {
+            // @ts-ignore
+            clearInterval(this.interval);
+        }
     }
+    /**
+     *
+     * @returns current configuration
+     */
     getConfiguration() {
         return this.configuration || {};
     }
+    /**
+     * We cannot reinit the configurationService by itself
+     *
+     * @inheritdoc
+     */
     reinit(config) {
         return __awaiter(this, void 0, void 0, function* () {
             // Need to prevent any reinit
         });
     }
-    _loadConfiguration() {
+    /**
+     * Load the configuration by calling the source service with the source id
+     * @returns
+     */
+    loadConfiguration() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sourceService.getConfiguration(this.sourceId);
+        });
+    }
+    initConfiguration() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._sourceService.getConfiguration(this._sourceId);
+            throw new Error("ConfigurationService with dependencies cannot be used");
         });
     }
-    _checkUpdate() {
+    /**
+     * Checking for configuration updates
+     *
+     * If configuration is updated, it will trigger all the watchs accordingly
+     *
+     * @returns
+     */
+    checkUpdate(dynamic = false) {
         return __awaiter(this, void 0, void 0, function* () {
             // If the ConfigurationProvider cannot trigger we check at interval
-            if (this._interval && this._nextCheck > new Date().getTime())
+            if (!dynamic && this.interval && this.nextCheck > Date.now()) {
                 return;
+            }
             this.log("DEBUG", "Refreshing configuration");
-            let newConfig = (yield this._loadConfiguration()) || this.parameters.default;
-            if (JSON.stringify(newConfig) !== this._configuration) {
+            const newConfig = (yield this.loadConfiguration()) || this.parameters.default;
+            const serializedConfig = JSON.stringify(newConfig);
+            if (serializedConfig !== this.serializedConfiguration) {
                 this.emit("Configuration.Applying");
                 this.log("DEBUG", "Apply new configuration");
-                this._configuration = JSON.stringify(newConfig);
+                this.serializedConfiguration = serializedConfig;
                 this.configuration = newConfig;
+                // Add the webda parameters logical
+                if (this.configuration.webda && this.configuration.webda.services) {
+                    // Merge parameters with each service
+                    for (let i in this.configuration.webda.services) {
+                        if (this.getWebda().getService(i)) {
+                            this.configuration.webda.services[i] = this.getWebda().getServiceParams(i, this.configuration.webda);
+                        }
+                    }
+                }
                 let promises = [];
-                this.watches.forEach(w => {
+                this.watchs.forEach(w => {
                     this.log("TRACE", "Apply new configuration value", jsonpath.query(newConfig, w.path).pop() || w.defaultValue);
                     let p = w.callback(jsonpath.query(newConfig, w.path).pop() || w.defaultValue);
                     if (p) {
@@ -114,14 +171,27 @@ class ConfigurationService extends service_1.Service {
                 this.emit("Configuration.Applied");
             }
             // If the ConfigurationProvider cannot trigger we check at interval
-            if (this._interval) {
-                this._updateNextCheck();
+            if (this.interval) {
+                this.updateNextCheck();
                 this.log("DEBUG", "Next configuration refresh in", this.parameters.checkInterval, "s");
             }
         });
     }
-    _updateNextCheck() {
-        this._nextCheck = new Date().getTime() + this.parameters.checkInterval * 1000;
+    /**
+     * Update the next check time
+     */
+    updateNextCheck() {
+        this.nextCheck = Date.now() + this.parameters.checkInterval * 1000;
+    }
+    /**
+     * Read the file and store it
+     */
+    loadAndStoreConfiguration() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield this.loadConfiguration();
+            this.serializedConfiguration = JSON.stringify(res);
+            return res;
+        });
     }
 }
 exports.default = ConfigurationService;

package/lib/services/configuration.js.map

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

package/lib/services/configuration.spec.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
 const test_1 = require("../test");
+const configuration_1 = require("./configuration");
+const sinon_1 = require("sinon");
 let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.WebdaTest {
     getTestConfiguration() {
         return __dirname + "/../../test/config-reload.json";
@@ -38,6 +40,23 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
             this.webda.getService("ConfigurationService").stop();
         });
     }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let service = new configuration_1.ConfigurationService(this.webda, "name", {});
+            assert.deepStrictEqual(service.getConfiguration(), {});
+            // @ts-ignore
+            service.configuration = { test: "plop" };
+            assert.deepStrictEqual(service.getConfiguration(), { test: "plop" });
+            yield assert.rejects(() => service.init(), /Need a source for ConfigurationService/);
+            service.getParameters().source = "none:plopId";
+            yield assert.rejects(() => service.init(), /Need a valid service for source/);
+            service.getParameters().source = "DefinedMailer";
+            yield assert.rejects(() => service.init(), /Need a valid source/);
+            service.getParameters().source = "DefinedMailer:none";
+            yield assert.rejects(() => service.init(), /Service 'DefinedMailer' is not implementing ConfigurationProvider interface/);
+            yield assert.rejects(() => service.initConfiguration(), /ConfigurationService with dependencies cannot be used/);
+        });
+    }
     initialLoad() {
         return __awaiter(this, void 0, void 0, function* () {
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test");
@@ -46,7 +65,13 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
                 uuid: "test",
                 webda: {
                     services: {
-                        "Authentication.providers.email.text": "Plop"
+                        Authentication: {
+                            providers: {
+                                email: {
+                                    text: "Plop"
+                                }
+                            }
+                        }
                     }
                 }
             };
@@ -57,9 +82,23 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
             }));
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
+            let service = this.webda.getService("ConfigurationService");
+            // @ts-ignore
+            yield service.checkUpdate();
+            let mock = (0, sinon_1.stub)(service, "loadConfiguration").callsFake(() => { });
+            // @ts-ignore
+            service.nextCheck = Date.now() + 86400000;
+            // @ts-ignore
+            service.interval = 1;
+            // @ts-ignore
+            yield service.checkUpdate();
+            assert.strictEqual(mock.callCount, 0);
         });
     }
 };
+__decorate([
+    mocha_1.test
+], ConfigurationServiceTest.prototype, "init", null);
 __decorate([
     mocha_1.test
 ], ConfigurationServiceTest.prototype, "initialLoad", null);

package/lib/services/configuration.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAG9C,kCAAoC;AAIpC,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,gBAAS;IAC9C,oBAAoB;QAClB,OAAO,SAAS,GAAG,gCAAgC,CAAC;IACtD,CAAC;IACK,MAAM;;;;;YACV,MAAM,OAAM,MAAM,WAAE,CAAC;YACrB,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5D,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,CAAC;KAAA;IACK,KAAK;;YACT,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAAE,CAAC,IAAI,EAAE,CAAC;QAC/E,CAAC;KAAA;IAEK,WAAW;;YACf,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;YAClH,IAAI,IAAI,GAAG;gBACT,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,qCAAqC,EAAE,MAAM;qBAC9C;iBACF;aACF,CAAC;YACF,IAAI,KAAK,GAAuC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;YAC5F,MAAM,IAAI,OAAO,CAAC,CAAM,OAAO,EAAC,EAAE;gBAChC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;gBACnF,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,CAAA,CAAC,CAAC;YACH,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACpH,CAAC;KAAA;CACF,CAAA;AAnBC;IADC,YAAI;2DAmBJ;AAhCG,wBAAwB;IAD7B,aAAK;GACA,wBAAwB,CAiC7B"}
+{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/cron.d.ts

@@ -1,5 +1,5 @@
 import { Service } from "./service";
-import { ModdaDefinition } from "..";
+import { ModdaDefinition, CancelablePromise } from "..";
 /**
  * Cron item
  */
@@ -33,7 +33,7 @@ export declare class CronDefinition {
      * @param method
      * @param description
      */
-    constructor(cron: string, args: any[], serviceName?: string, method?: string, description?: string);
+    constructor(cron: string, args?: any[], serviceName?: string, method?: string, description?: string);
     toString(): string;
 }
 declare class CronService extends Service {
@@ -60,8 +60,8 @@ declare class CronService extends Service {
         args?: any[];
         cb?: () => void;
     }[];
-    work(annotations?: string): Promise<void>;
-    run(annotations?: boolean): Promise<unknown>;
+    work(annotations?: string): CancelablePromise;
+    run(annotations?: boolean): CancelablePromise;
     schedule(cron: string, cb: () => any, description?: string): void;
     /**
      * @inheritdoc

package/lib/services/cron.js

@@ -1,17 +1,9 @@
 "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.CronService = exports.Cron = exports.CronDefinition = void 0;
 const crontab = require("node-cron");
 const service_1 = require("./service");
+const __1 = require("..");
 /**
  * Cron item
  */
@@ -24,7 +16,7 @@ class CronDefinition {
      * @param method
      * @param description
      */
-    constructor(cron, args, serviceName = "", method = "", description = "") {
+    constructor(cron, args = [], serviceName = "", method = "", description = "") {
         this.cron = cron;
         this.serviceName = serviceName;
         this.method = method;
@@ -79,50 +71,44 @@ class CronService extends service_1.Service {
         return this.crons;
     }
     work(annotations = "true") {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.run(annotations === "true");
-        });
+        return this.run(annotations === "true");
     }
     run(annotations = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.log("INFO", "Running crontab with" + (annotations ? "" : "out"), "annotations");
-            // Load all annotations
-            if (annotations) {
-                this.addAnnotations();
+        this.log("INFO", "Running crontab with" + (annotations ? "" : "out"), "annotations");
+        // Load all annotations
+        if (annotations) {
+            this.addAnnotations();
+        }
+        this.enable = true;
+        // Run schedule
+        this.crons.forEach(i => {
+            if (i.cb) {
+                this.schedule(i.cron, i.cb);
+            }
+            else {
+                this.schedule(i.cron, () => {
+                    this.getService(i.serviceName)[i.method](...i.args);
+                });
+            }
+        });
+        let msgs = [];
+        // Display before
+        this.crons.forEach(c => {
+            if (c.cb) {
+                msgs.push(`[NativeCode:${c.context || ""}]`);
+            }
+            else {
+                msgs.push(`${c.serviceName}.${c.method}(${c.args.length ? "..." + c.args : ""})`);
             }
-            this.enable = true;
-            // Run schedule
-            this.crons.forEach(i => {
-                if (i.cb) {
-                    this.schedule(i.cron, i.cb);
-                }
-                else {
-                    this.schedule(i.cron, () => {
-                        this.getService(i.serviceName)[i.method](...i.args);
-                    });
-                }
-            });
-            let msgs = [];
-            // Display before
-            this.crons.forEach(c => {
-                if (c.cb) {
-                    msgs.push(`[NativeCode:${c.context || ""}]`);
-                }
-                else {
-                    msgs.push(`${c.serviceName}.${c.method}(${c.args.length ? "..." + c.args : ""})`);
-                }
-            });
-            let cronPad = Math.max(...this.crons.map(c => c.cron.length));
-            let servicePad = Math.max(...msgs.map(c => c.length));
-            this.crons.forEach((c, i) => {
-                this.log("INFO", `${c.cron.padEnd(cronPad)} : ${msgs[i].padEnd(servicePad)}${c.description ? "  # " + c.description : ""}`);
-            });
-            // Remove from memory
-            this.crons = [];
-            return new Promise(resolve => {
-                // Never ending promise
-            });
         });
+        let cronPad = Math.max(...this.crons.map(c => c.cron.length));
+        let servicePad = Math.max(...msgs.map(c => c.length));
+        this.crons.forEach((c, i) => {
+            this.log("INFO", `${c.cron.padEnd(cronPad)} : ${msgs[i].padEnd(servicePad)}${c.description ? "  # " + c.description : ""}`);
+        });
+        // Remove from memory
+        this.crons = [];
+        return new __1.CancelablePromise();
     }
     schedule(cron, cb, description = "") {
         if (this.enable) {
@@ -136,9 +122,7 @@ class CronService extends service_1.Service {
             catch (err) {
                 // Based on stack trace (not super clean)
                 let info = err.stack.split("\n")[2].match(/\((.*)\)/);
-                if (info) {
-                    context = info[1].replace(process.cwd() + "/", "");
-                }
+                context = info[1].replace(process.cwd() + "/", "");
             }
             this.crons.push({ cron, cb, description, context });
         }

package/lib/services/cron.js.map

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

package/lib/services/cron.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/services/cron.spec.js

@@ -0,0 +1,76 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = require("assert");
+const mocha_1 = require("@testdeck/mocha");
+const test_1 = require("../test");
+const __1 = require("..");
+const crontab = require("node-cron");
+const sinon = require("sinon");
+class MyService extends __1.Service {
+    test() {
+        // Empty one
+    }
+    test2(myArg) { }
+}
+__decorate([
+    (0, __1.Cron)("0/15 * * * *", "plop")
+], MyService.prototype, "test", null);
+__decorate([
+    (0, __1.Cron)("0/25 * * * *", undefined, "myArg")
+], MyService.prototype, "test2", null);
+let CronServiceTest = class CronServiceTest extends test_1.WebdaTest {
+    annotations() {
+        this.registerService("myService", new MyService(this.webda, "myService", {}));
+        let def = new __1.CronDefinition("0/15 * * * *", [], "myService", "test", "plop");
+        let service = new __1.CronService(this.webda, "cron", {});
+        service.schedule("* * * * *", () => { }, "mine");
+        assert.deepStrictEqual(service.getCrontab()[1], def);
+        // for cov
+        assert.deepStrictEqual(service.getCrontab()[1], def);
+        __1.CronService.getModda();
+        const cron = sinon.stub(crontab, "schedule").callsFake((cron, cb) => {
+            try {
+                cb();
+            }
+            catch (err) { }
+        });
+        try {
+            let promise = service.work();
+            promise.cancel();
+            service.enable = false;
+            service.schedule("* * * * *", () => { }, "mine");
+            service.crons[0].context = undefined;
+            promise = service.run();
+            promise.cancel();
+            promise = service.run(false);
+            promise.cancel();
+        }
+        finally {
+        }
+    }
+};
+__decorate([
+    mocha_1.test
+], CronServiceTest.prototype, "annotations", null);
+CronServiceTest = __decorate([
+    mocha_1.suite
+], CronServiceTest);
+let CronDefinitionTest = class CronDefinitionTest {
+    testString() {
+        assert.strictEqual(new __1.CronDefinition("* * * * *").toString(), "* * * * *: .()");
+        assert.strictEqual(new __1.CronDefinition("* * * * *", [{}, {}], "plop", "method", "desc").toString(), "* * * * *: plop.method([object Object],[object Object]) # desc");
+    }
+};
+__decorate([
+    mocha_1.test
+], CronDefinitionTest.prototype, "testString", null);
+CronDefinitionTest = __decorate([
+    mocha_1.suite
+], CronDefinitionTest);
+//# sourceMappingURL=cron.spec.js.map

package/lib/services/cron.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,0BAAgE;AAChE,qCAAqC;AACrC,+BAA+B;AAE/B,MAAM,SAAU,SAAQ,WAAO;IAE7B,IAAI;QACF,YAAY;IACd,CAAC;IAGD,KAAK,CAAC,KAAa,IAAG,CAAC;CACxB;AANC;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,MAAM,CAAC;qCAG5B;AAGD;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;sCAClB;AAGzB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAErC,WAAW;QACT,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,GAAG,GAAG,IAAI,kBAAc,CAAC,cAAc,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9E,IAAI,OAAO,GAAG,IAAI,eAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,UAAU;QACV,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,eAAW,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAClE,IAAI;gBACF,EAAE,EAAE,CAAC;aACN;YAAC,OAAO,GAAG,EAAE,GAAE;QAClB,CAAC,CAAC,CAAC;QACH,IAAI;YACF,IAAI,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;YACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;YACrC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACxB,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;SAClB;gBAAS;SACT;IACH,CAAC;CACF,CAAA;AA3BC;IADC,YAAI;kDA2BJ;AA5BG,eAAe;IADpB,aAAK;GACA,eAAe,CA6BpB;AAGD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEtB,UAAU;QACR,MAAM,CAAC,WAAW,CAAC,IAAI,kBAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACjF,MAAM,CAAC,WAAW,CAChB,IAAI,kBAAc,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAC9E,gEAAgE,CACjE,CAAC;IACJ,CAAC;CACF,CAAA;AAPC;IADC,YAAI;oDAOJ;AARG,kBAAkB;IADvB,aAAK;GACA,kBAAkB,CASvB"}

package/lib/services/debugmailer.spec.js

@@ -5,6 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+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 });
 const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
@@ -12,10 +21,15 @@ const test_1 = require("../test");
 const debugmailer_1 = require("./debugmailer");
 let DebugMailerTest = class DebugMailerTest extends test_1.WebdaTest {
     testSend() {
-        let mailer = new debugmailer_1.DebugMailer(this.webda, "test", {});
-        mailer.send({ option1: "test" });
-        assert.strictEqual(mailer.sent.length, 1);
-        assert.strictEqual(mailer.sent[0].option1, "test");
+        return __awaiter(this, void 0, void 0, function* () {
+            let mailer = new debugmailer_1.DebugMailer(this.webda, "test", {});
+            mailer.send({ option1: "test" });
+            assert.strictEqual(mailer.sent.length, 1);
+            assert.strictEqual(mailer.sent[0].option1, "test");
+            yield mailer.async();
+            assert.throws(() => mailer.error(), /FakeError/);
+            yield assert.rejects(() => mailer.errorAsync(), /FakeError/);
+        });
     }
 };
 __decorate([

package/lib/services/debugmailer.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"debugmailer.spec.js","sourceRoot":"","sources":["../../src/services/debugmailer.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,+CAA4C;AAG5C,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAErC,QAAQ;QACN,IAAI,MAAM,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AANC;IADC,YAAI;+CAMJ;AAPG,eAAe;IADpB,aAAK;GACA,eAAe,CAQpB"}
+{"version":3,"file":"debugmailer.spec.js","sourceRoot":"","sources":["../../src/services/debugmailer.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,+CAA4C;AAG5C,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAE/B,QAAQ;;YACZ,IAAI,MAAM,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACjC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,CAAC,CAAC;YACjD,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,CAAC;QAC/D,CAAC;KAAA;CACF,CAAA;AATC;IADC,YAAI;+CASJ;AAVG,eAAe;IADpB,aAAK;GACA,eAAe,CAWpB"}