@webda/core 2.0.0-beta.2 → 2.0.1

package/lib/services/configuration.js

@@ -1,26 +1,12 @@
-"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.ConfigurationService = exports.ConfigurationServiceParameters = void 0;
-const jsonpath = require("jsonpath");
-const core_1 = require("../core");
-const service_1 = require("./service");
-class ConfigurationServiceParameters extends service_1.ServiceParameters {
+import jsonpath from "jsonpath";
+import { WebdaError } from "../core.js";
+import { Service, ServiceParameters } from "./service.js";
+export class ConfigurationServiceParameters extends ServiceParameters {
     constructor(params) {
-        var _a;
         super(params);
-        (_a = this.checkInterval) !== null && _a !== void 0 ? _a : (this.checkInterval = 3600);
+        this.checkInterval ?? (this.checkInterval = 3600);
     }
 }
-exports.ConfigurationServiceParameters = ConfigurationServiceParameters;
 /**
  * Handle sessionSecret ( rolling between two secrets ) expire every hour
  * Handle longTermSecret ( rolling between two longer secret ) expire every month
@@ -33,7 +19,7 @@ exports.ConfigurationServiceParameters = ConfigurationServiceParameters;
  * @category CoreServices
  * @WebdaModda
  */
-class ConfigurationService extends service_1.Service {
+export default class ConfigurationService extends Service {
     constructor() {
         super(...arguments);
         /**
@@ -53,32 +39,31 @@ class ConfigurationService extends service_1.Service {
     /**
      * @inheritdoc
      */
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Check interval by default every hour
-            if (!this.parameters.source) {
-                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) {
-                throw new core_1.WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService: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`);
-            }
-            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));
-        });
+    async init() {
+        // Check interval by default every hour
+        if (!this.parameters.source) {
+            throw new WebdaError("CONFIGURATION_SOURCE_MISSING", "Need a source for ConfigurationService");
+        }
+        let source = this.parameters.source.split(":");
+        this.sourceService = this.getService(source[0]);
+        if (!this.sourceService) {
+            throw new WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService:sourceId")');
+        }
+        this.sourceId = source[1];
+        if (!this.sourceId) {
+            throw new WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid source ("sourceService:sourceId")');
+        }
+        if (!this.sourceService.getConfiguration) {
+            throw new WebdaError("CONFIGURATION_SOURCE_INVALID", `Service '${source[0]}' is not implementing ConfigurationProvider interface`);
+        }
+        this.serializedConfiguration = JSON.stringify(this.parameters.default);
+        await 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));
+        return this;
     }
     /**
      * Watch a specific configuration modification
@@ -111,24 +96,19 @@ class ConfigurationService extends service_1.Service {
      *
      * @inheritdoc
      */
-    reinit(_config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Need to prevent any reinit
-        });
+    async reinit(_config) {
+        // Need to prevent any reinit
+        return this;
     }
     /**
      * 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);
-        });
+    async loadConfiguration() {
+        return this.sourceService.getConfiguration(this.sourceId);
     }
-    initConfiguration() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("ConfigurationService with dependencies cannot be used");
-        });
+    async initConfiguration() {
+        throw new Error("ConfigurationService with dependencies cannot be used");
     }
     /**
      * Checking for configuration updates
@@ -137,46 +117,44 @@ class ConfigurationService extends service_1.Service {
      *
      * @returns
      */
-    checkUpdate(dynamic = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // If the ConfigurationProvider cannot trigger we check at interval
-            if (!dynamic && this.interval && this.nextCheck > Date.now()) {
-                return;
-            }
-            this.log("DEBUG", "Refreshing configuration");
-            const newConfig = (yield this.loadConfiguration()) || this.parameters.default;
-            const serializedConfig = JSON.stringify(newConfig);
-            if (serializedConfig !== this.serializedConfiguration) {
-                this.emit("Configuration.Applying", undefined);
-                this.log("DEBUG", "Apply new configuration");
-                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);
-                        }
+    async checkUpdate(dynamic = false) {
+        // If the ConfigurationProvider cannot trigger we check at interval
+        if (!dynamic && this.interval && this.nextCheck > Date.now()) {
+            return;
+        }
+        this.log("DEBUG", "Refreshing configuration");
+        const newConfig = (await this.loadConfiguration()) || this.parameters.default;
+        const serializedConfig = JSON.stringify(newConfig);
+        if (serializedConfig !== this.serializedConfiguration) {
+            this.emit("Configuration.Applying", undefined);
+            this.log("DEBUG", "Apply new configuration");
+            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.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) {
-                        promises.push(p);
-                    }
-                });
-                yield Promise.all(promises);
-                this.emit("Configuration.Applied", undefined);
             }
-            // If the ConfigurationProvider cannot trigger we check at interval
-            if (this.interval) {
-                this.updateNextCheck();
-                this.log("DEBUG", "Next configuration refresh in", this.parameters.checkInterval, "s");
-            }
-        });
+            let promises = [];
+            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) {
+                    promises.push(p);
+                }
+            });
+            await Promise.all(promises);
+            this.emit("Configuration.Applied", undefined);
+        }
+        // If the ConfigurationProvider cannot trigger we check at interval
+        if (this.interval) {
+            this.updateNextCheck();
+            this.log("DEBUG", "Next configuration refresh in", this.parameters.checkInterval, "s");
+        }
     }
     /**
      * Update the next check time
@@ -187,14 +165,11 @@ class ConfigurationService extends service_1.Service {
     /**
      * 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;
-        });
+    async loadAndStoreConfiguration() {
+        let res = await this.loadConfiguration();
+        this.serializedConfiguration = JSON.stringify(res);
+        return res;
     }
 }
-exports.default = ConfigurationService;
-exports.ConfigurationService = ConfigurationService;
+export { ConfigurationService };
 //# sourceMappingURL=configuration.js.map

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":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAuBvD,MAAM,OAAO,8BAA+B,SAAQ,iBAAiB;IAanE,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,IAAI,EAAC;IAC9B,CAAC;CACF;AAOD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,OAAO,oBAGnB,SAAQ,OAAa;IAHvB;;QAqBE;;WAEG;QACO,WAAM,GAAU,EAAE,CAAC;IAwK/B,CAAC;IAlKC;;;;;OAKG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,uCAAuC;QAEvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3B,MAAM,IAAI,UAAU,CAAC,8BAA8B,EAAE,wCAAwC,CAAC,CAAC;SAChG;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAoC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;QAClF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,UAAU,CAClB,8BAA8B,EAC9B,4DAA4D,CAC7D,CAAC;SACH;QACD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,UAAU,CAAC,8BAA8B,EAAE,gDAAgD,CAAC,CAAC;SACxG;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE;YACxC,MAAM,IAAI,UAAU,CAClB,8BAA8B,EAC9B,YAAY,MAAM,CAAC,CAAC,CAAC,uDAAuD,CAC7E,CAAC;SACH;QACD,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE;YACjG,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;SAChE;QAED,iBAAiB;QACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,QAAgB,EAAE,QAA+C,EAAE,eAAoB,SAAS;QACpG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,aAAa;YACb,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9B;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,OAAY;QACvB,6BAA6B;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,iBAAiB;QAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,WAAW,CAAC,UAAmB,KAAK;QAClD,mEAAmE;QACnE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE;YAC5D,OAAO;SACR;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAC9E,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,gBAAgB,KAAK,IAAI,CAAC,uBAAuB,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;YAC7C,IAAI,CAAC,uBAAuB,GAAG,gBAAgB,CAAC;YAChD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;YAC/B,mCAAmC;YACnC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACjE,qCAAqC;gBACrC,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE;oBAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;wBACjC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;qBACtG;iBACF;aACF;YACD,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC9G,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC9E,IAAI,CAAC,EAAE;oBACL,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAClB;YACH,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;SAC/C;QACD,mEAAmE;QACnE,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;SACxF;IACH,CAAC;IAED;;OAEG;IACO,eAAe;QACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;IACrE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,yBAAyB;QAC7B,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,OAAO,EAAyB,oBAAoB,EAAE,CAAC"}

package/lib/services/configuration.spec.js

@@ -1,109 +1,89 @@
-"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;
 };
-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 mocha_1 = require("@testdeck/mocha");
-const assert = require("assert");
-const sinon_1 = require("sinon");
-const test_1 = require("../test");
-const configuration_1 = require("./configuration");
-let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.WebdaTest {
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import { stub } from "sinon";
+import { WebdaTest } from "../test.js";
+import { getCommonJS } from "../utils/esm.js";
+import { ConfigurationService } from "./configuration.js";
+const { __filename, __dirname } = getCommonJS(import.meta.url);
+let ConfigurationServiceTest = class ConfigurationServiceTest extends WebdaTest {
     getTestConfiguration() {
         return __dirname + "/../../test/config-reload.json";
     }
-    before() {
-        const _super = Object.create(null, {
-            before: { get: () => super.before }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.before.call(this);
-            yield this.webda.getService("ConfigurationStore").__clean();
-            yield this.webda.init();
-        });
+    async before() {
+        await super.before();
+        await this.webda.getService("ConfigurationStore").__clean();
+        await this.webda.init();
     }
-    after() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.webda.getService("ConfigurationStore").__clean();
-            this.webda.getService("ConfigurationService").stop();
-        });
+    async after() {
+        await this.webda.getService("ConfigurationStore").__clean();
+        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/);
-        });
+    async init() {
+        let service = new ConfigurationService(this.webda, "name", {});
+        assert.deepStrictEqual(service.getConfiguration(), {});
+        // @ts-ignore
+        service.configuration = { test: "plop" };
+        assert.deepStrictEqual(service.getConfiguration(), { test: "plop" });
+        await assert.rejects(() => service.init(), /Need a source for ConfigurationService/);
+        service.getParameters().source = "none:plopId";
+        await assert.rejects(() => service.init(), /Need a valid service for source/);
+        service.getParameters().source = "DefinedMailer";
+        await assert.rejects(() => service.init(), /Need a valid source/);
+        service.getParameters().source = "DefinedMailer:none";
+        await assert.rejects(() => service.init(), /Service 'DefinedMailer' is not implementing ConfigurationProvider interface/);
+        await 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");
-            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
-            let test = {
-                uuid: "test",
-                webda: {
-                    services: {
-                        Authentication: {
-                            providers: {
-                                email: {
-                                    text: "Plop"
-                                }
+    async initialLoad() {
+        assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test");
+        assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
+        let test = {
+            uuid: "test",
+            webda: {
+                services: {
+                    Authentication: {
+                        providers: {
+                            email: {
+                                text: "Plop"
                             }
                         }
                     }
                 }
-            };
-            let store = this.webda.getService("ConfigurationStore");
-            yield new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                this.webda.getService("ConfigurationService").on("Configuration.Applied", resolve);
-                yield store.save(test);
-            }));
-            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();
-            // @ts-ignore
-            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);
+            }
+        };
+        let store = this.webda.getService("ConfigurationStore");
+        await new Promise(async (resolve) => {
+            this.webda.getService("ConfigurationService").on("Configuration.Applied", resolve);
+            await store.save(test);
         });
+        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
+        await service.checkUpdate();
+        // @ts-ignore
+        let mock = stub(service, "loadConfiguration").callsFake(() => { });
+        // @ts-ignore
+        service.nextCheck = Date.now() + 86400000;
+        // @ts-ignore
+        service.interval = 1;
+        // @ts-ignore
+        await service.checkUpdate();
+        assert.strictEqual(mock.callCount, 0);
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], ConfigurationServiceTest.prototype, "init", null);
 __decorate([
-    mocha_1.test
+    test
 ], ConfigurationServiceTest.prototype, "initialLoad", null);
 ConfigurationServiceTest = __decorate([
-    mocha_1.suite
+    suite
 ], ConfigurationServiceTest);
 //# sourceMappingURL=configuration.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}
+{"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 { CancelablePromise } from "..";
-import { Service } from "./service";
+import { CancelablePromise } from "../index.js";
+import { Service } from "./service.js";
 /**
  * Cron item
  */
@@ -50,6 +50,7 @@ declare class CronService extends Service {
         args?: any[];
         cb?: () => void;
     }[];
+    crontabSchedule: any;
     private _scanned;
     static Annotation(cron: string, description?: string, ...args: any[]): (_target: any, property: string, descriptor: PropertyDescriptor) => void;
     static loadAnnotations(services: any): CronDefinition[];

package/lib/services/cron.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CronService = exports.Cron = exports.CronDefinition = void 0;
-const crontab = require("node-cron");
-const __1 = require("..");
-const service_1 = require("./service");
+import { schedule } from "node-cron";
+import { CancelablePromise } from "../index.js";
+import { Service } from "./service.js";
 /**
  * Cron item
  */
-class CronDefinition {
+export class CronDefinition {
     /**
      *
      * @param cron
@@ -27,14 +24,14 @@ class CronDefinition {
         return `${this.cron}: ${this.serviceName}.${this.method}(${this.args.map(a => a.toString()).join(",")})${this.description !== "" ? ` # ${this.description}` : ""}`;
     }
 }
-exports.CronDefinition = CronDefinition;
 /**
  * @WebdaModda
  */
-class CronService extends service_1.Service {
+class CronService extends Service {
     constructor() {
         super(...arguments);
         this.crons = [];
+        this.crontabSchedule = schedule;
         this._scanned = false;
     }
     static Annotation(cron, description = "", ...args) {
@@ -111,11 +108,11 @@ class CronService extends service_1.Service {
         });
         // Remove from memory
         this.crons = [];
-        return new __1.CancelablePromise();
+        return new CancelablePromise();
     }
     schedule(cron, cb, description = "") {
         if (this.enable) {
-            crontab.schedule(cron, cb);
+            this.crontabSchedule(cron, cb);
         }
         else {
             let context;
@@ -131,7 +128,6 @@ class CronService extends service_1.Service {
         }
     }
 }
-exports.CronService = CronService;
 const Cron = CronService.Annotation;
-exports.Cron = Cron;
+export { Cron, CronService };
 //# sourceMappingURL=cron.js.map

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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"}