@webda/core 1.2.1 → 1.6.0-beta.0

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

@@ -1 +1 @@
-{"version":3,"file":"filebinary.spec.js","sourceRoot":"","sources":["../../src/services/filebinary.spec.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+CAA2C;AAC3C,iCAAiC;AAEjC,2CAA8C;AAI9C,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,wBAAU;IAErC,gBAAgB;QACd,IAAI,MAAM,GAA2B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,eAAe,CAAC,kEAAkE,CAAC,EAC1F,IAAI,CACL,CAAC;QACF,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,eAAe,CAAC,kEAAkE,CAAC,EAC1F,KAAK,CACN,CAAC;QACF,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,eAAe,CAAC,iEAAiE,CAAC,EACzF,KAAK,CACN,CAAC;QACF,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,eAAe,CAAC,kEAAkE,CAAC,EAC1F,KAAK,CACN,CAAC;IACJ,CAAC;CACF,CAAA;AAnBC;IADC,YAAI;sDAmBJ;AApBG,cAAc;IADnB,aAAK;GACA,cAAc,CAqBnB;AAEQ,wCAAc"}
+{"version":3,"file":"filebinary.spec.js","sourceRoot":"","sources":["../../src/services/filebinary.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/fileconfiguration.d.ts

@@ -3,14 +3,20 @@ import { ModdaDefinition } from "../core";
 /**
  * Allow for dynamic configuration from a file
  */
-export declare class FileConfigurationService<T extends ConfigurationServiceParameters> extends ConfigurationService<T> {
+export declare class FileConfigurationService<T extends ConfigurationServiceParameters = ConfigurationServiceParameters> extends ConfigurationService<T> {
     /** @ignore */
     init(): Promise<void>;
-    stop(): void;
     /**
      * Load the JSON from source defined file
+     * @override
      */
-    _loadConfiguration(): Promise<{
+    protected loadConfiguration(): Promise<{
+        [key: string]: any;
+    }>;
+    /**
+     * Read the file and store it
+     */
+    initConfiguration(): Promise<{
         [key: string]: any;
     }>;
     /**

package/lib/services/fileconfiguration.js

@@ -30,23 +30,30 @@ class FileConfigurationService extends configuration_1.default {
             if (!fs.existsSync(this.parameters.source)) {
                 throw new core_1.WebdaError("FILE_CONFIGURATION_SOURCE_MISSING", "Need a source for FileConfigurationService");
             }
-            fs.watchFile(this.parameters.source, this._checkUpdate.bind(this));
+            fs.watchFile(this.parameters.source, this.checkUpdate.bind(this));
             // Add webda info
             this.watch("$.webda.services", this._webda.reinit.bind(this._webda));
-            yield this._checkUpdate();
+            yield this.checkUpdate();
         });
     }
-    stop() {
-        // Nothing to be done
-    }
     /**
      * Load the JSON from source defined file
+     * @override
      */
-    _loadConfiguration() {
+    loadConfiguration() {
         return __awaiter(this, void 0, void 0, function* () {
             return __1.JSONUtils.loadFile(this.parameters.source);
         });
     }
+    /**
+     * Read the file and store it
+     */
+    initConfiguration() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.parameters.source = this._webda.getAppPath(this.parameters.source);
+            return this.loadAndStoreConfiguration();
+        });
+    }
     /**
      * @inheritdoc
      */

package/lib/services/fileconfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,0BAA+B;AAE/B;;GAEG;AACH,MAAa,wBAAmE,SAAQ,uBAAuB;IAC7G,cAAc;IACR,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,kCAAkC;YAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEnE,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC;KAAA;IAED,IAAI;QACF,qBAAqB;IACvB,CAAC;IAED;;OAEG;IACG,kBAAkB;;YACtB,OAAO,aAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,oBAAoB;YAC3B,WAAW,EAAE,yDAAyD;SACvE,CAAC;IACJ,CAAC;CACF;AA3CD,4DA2CC"}
+{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,0BAA+B;AAE/B;;GAEG;AACH,MAAa,wBAEX,SAAQ,uBAAuB;IAC/B,cAAc;IACR,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,kCAAkC;YAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;;OAGG;IACa,iBAAiB;;YAC/B,OAAO,aAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,oBAAoB;YAC3B,WAAW,EAAE,yDAAyD;SACvE,CAAC;IACJ,CAAC;CACF;AAlDD,4DAkDC"}

package/lib/services/fileconfiguration.spec.js

@@ -19,6 +19,7 @@ const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
 const test_1 = require("../test");
 const fs_1 = require("fs");
+const fileconfiguration_1 = require("./fileconfiguration");
 let FileConfigurationServiceTest = class FileConfigurationServiceTest extends test_1.WebdaTest {
     getTestConfiguration() {
         return __dirname + "/../../test/config-file-reload.json";
@@ -28,10 +29,16 @@ let FileConfigurationServiceTest = class FileConfigurationServiceTest extends te
             before: { get: () => super.before }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            fs_1.writeFileSync(__dirname + "/../../test/my-cnf.json", JSON.stringify({
+            (0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
                 webda: {
                     services: {
-                        "Authentication.providers.email.text": "Test"
+                        Authentication: {
+                            providers: {
+                                email: {
+                                    text: "Test"
+                                }
+                            }
+                        }
                     }
                 }
             }, undefined, 2));
@@ -40,14 +47,35 @@ let FileConfigurationServiceTest = class FileConfigurationServiceTest extends te
     }
     initialLoad() {
         return __awaiter(this, void 0, void 0, function* () {
+            assert.rejects(() => new fileconfiguration_1.FileConfigurationService(this.webda, "except", {}).init(), /Need a source for FileConfigurationService/);
+            assert.rejects(() => new fileconfiguration_1.FileConfigurationService(this.webda, "except", { source: "/plops" }).init(), /Need a source for FileConfigurationService/);
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
             yield new Promise(resolve => {
-                this.webda.getService("FileConfigurationService").on("Configuration.Applied", resolve);
-                fs_1.writeFileSync(__dirname + "/../../test/my-cnf.json", JSON.stringify({
+                let ok = false;
+                this.webda.getService("FileConfigurationService").on("Configuration.Applied", () => {
+                    ok = true;
+                    resolve();
+                });
+                // Github fs watcher seems to have some issue
+                setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                    if (!ok) {
+                        console.log("WARN: Bypass the fs.watch");
+                        // @ts-ignore
+                        yield this.webda.getService("FileConfigurationService").checkUpdate();
+                        resolve();
+                    }
+                }), 30000);
+                (0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
                     webda: {
                         services: {
-                            "Authentication.providers.email.text": "Plop"
+                            Authentication: {
+                                providers: {
+                                    email: {
+                                        text: "Plop"
+                                    }
+                                }
+                            }
                         }
                     }
                 }, undefined, 2));
@@ -63,4 +91,71 @@ __decorate([
 FileConfigurationServiceTest = __decorate([
     mocha_1.suite
 ], FileConfigurationServiceTest);
+let FileConfigurationNoReloadServiceTest = class FileConfigurationNoReloadServiceTest extends test_1.WebdaTest {
+    getTestConfiguration() {
+        return __dirname + "/../../test/config-file-no-reload.json";
+    }
+    before() {
+        const _super = Object.create(null, {
+            before: { get: () => super.before }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
+                webda: {
+                    services: {
+                        Authentication: {
+                            providers: {
+                                email: {
+                                    text: "Test2"
+                                }
+                            }
+                        }
+                    }
+                }
+            }, undefined, 2));
+            yield _super.before.call(this);
+        });
+    }
+    initialLoad() {
+        return __awaiter(this, void 0, void 0, function* () {
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test2");
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], FileConfigurationNoReloadServiceTest.prototype, "initialLoad", null);
+FileConfigurationNoReloadServiceTest = __decorate([
+    mocha_1.suite
+], FileConfigurationNoReloadServiceTest);
+let FileConfigurationNoReloadMissingServiceTest = class FileConfigurationNoReloadMissingServiceTest extends test_1.WebdaTest {
+    getTestConfiguration() {
+        return __dirname + "/../../test/config-file-no-reload.json";
+    }
+    before() {
+        const _super = Object.create(null, {
+            before: { get: () => super.before }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const filename = __dirname + "/../../test/my-cnf.json";
+            if ((0, fs_1.existsSync)(filename)) {
+                (0, fs_1.unlinkSync)(filename);
+            }
+            yield _super.before.call(this);
+        });
+    }
+    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");
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], FileConfigurationNoReloadMissingServiceTest.prototype, "initialLoad", null);
+FileConfigurationNoReloadMissingServiceTest = __decorate([
+    mocha_1.suite
+], FileConfigurationNoReloadMissingServiceTest);
 //# sourceMappingURL=fileconfiguration.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fileconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,2BAAiD;AAGjD,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,gBAAS;IAClD,oBAAoB;QAClB,OAAO,SAAS,GAAG,qCAAqC,CAAC;IAC3D,CAAC;IAEK,MAAM;;;;;YACV,kBAAa,CACX,SAAS,GAAG,yBAAyB,EACrC,IAAI,CAAC,SAAS,CACZ;gBACE,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,qCAAqC,EAAE,MAAM;qBAC9C;iBACF;aACF,EACD,SAAS,EACT,CAAC,CACF,CACF,CAAC;YACF,MAAM,OAAM,MAAM,WAAE,CAAC;QACvB,CAAC;KAAA;IAGK,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,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC1B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;gBACvF,kBAAa,CACX,SAAS,GAAG,yBAAyB,EACrC,IAAI,CAAC,SAAS,CACZ;oBACE,KAAK,EAAE;wBACL,QAAQ,EAAE;4BACR,qCAAqC,EAAE,MAAM;yBAC9C;qBACF;iBACF,EACD,SAAS,EACT,CAAC,CACF,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,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;AAxBC;IADC,YAAI;+DAwBJ;AA/CG,4BAA4B;IADjC,aAAK;GACA,4BAA4B,CAgDjC"}
+{"version":3,"file":"fileconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/kubernetesconfiguration.d.ts

@@ -8,11 +8,17 @@ export declare class KubernetesConfigurationService<T extends ConfigurationServi
      * @ignore
      */
     init(): Promise<void>;
-    stop(): void;
+    /**
+     * Read the file and store it
+     */
+    initConfiguration(): Promise<{
+        [key: string]: any;
+    }>;
     /**
      * Load configuration from a ConfigMap or a Secret
+     * @override
      */
-    _loadConfiguration(): Promise<{
+    loadConfiguration(): Promise<{
         [key: string]: any;
     }>;
     /**

package/lib/services/kubernetesconfiguration.js

@@ -34,22 +34,30 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
             }
             // Add webda info
             this.watch("$.webda.services", this._webda.reinit.bind(this._webda));
-            fs.watchFile(path.join(this.parameters.source, "..data"), this._checkUpdate.bind(this));
-            yield this._checkUpdate();
+            fs.watchFile(path.join(this.parameters.source, "..data"), this.checkUpdate.bind(this));
+            yield this.checkUpdate();
         });
     }
-    stop() {
-        // Nothing to be done
+    /**
+     * Read the file and store it
+     */
+    initConfiguration() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.loadAndStoreConfiguration();
+        });
     }
     /**
      * Load configuration from a ConfigMap or a Secret
+     * @override
      */
-    _loadConfiguration() {
+    loadConfiguration() {
         return __awaiter(this, void 0, void 0, function* () {
             let result = {};
+            let found = 0;
             fs.readdirSync(this.parameters.source)
                 .filter(f => !f.startsWith("."))
                 .forEach(f => {
+                found++;
                 let filePath = path.join(this.parameters.source, f);
                 // Auto parse JSON and YAML
                 if (f.match(/\.(json|ya?ml)$/i)) {
@@ -59,6 +67,9 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
                     result[f] = fs.readFileSync(filePath, "utf-8");
                 }
             });
+            if (found === 0) {
+                return undefined;
+            }
             this.log("TRACE", "loadConfiguration", result);
             return result;
         });

package/lib/services/kubernetesconfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxF,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC;KAAA;IAED,IAAI;QACF,qBAAqB;IACvB,CAAC;IAED;;OAEG;IACG,kBAAkB;;YACtB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;AAvDD,wEAuDC"}
+{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;AAhED,wEAgEC"}

package/lib/services/kubernetesconfiguration.spec.js

@@ -22,6 +22,8 @@ const fs_extra_1 = require("fs-extra");
 const path = require("path");
 const yaml = require("yaml");
 const fs_1 = require("fs");
+const __1 = require("..");
+const sinon_1 = require("sinon");
 class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
     constructor() {
         super(...arguments);
@@ -29,7 +31,14 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
         this.content = {
             "webda.json": JSON.stringify({
                 services: {
-                    "Authentication.providers.email.text": "Plop0"
+                    Authentication: {
+                        providers: {
+                            email: {
+                                text: "Plop1"
+                            }
+                        }
+                    },
+                    "Authentication.providers.email.text2": "Plop6"
                 }
             }, undefined, 2),
             other: "test",
@@ -46,7 +55,7 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
             before: { get: () => super.before }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            fs_extra_1.emptyDirSync(this.folder);
+            (0, fs_extra_1.emptyDirSync)(this.folder);
             // Empty the kube directory
             if (create) {
                 this.createConfigMap();
@@ -56,22 +65,22 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
     }
     createConfigMap() {
         this.dataFolder = `..${Date.now()}`;
-        fs_1.mkdirSync(path.join(this.folder, this.dataFolder));
-        fs_extra_1.ensureSymlinkSync(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
+        (0, fs_1.mkdirSync)(path.join(this.folder, this.dataFolder));
+        (0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
         Object.keys(this.content).forEach(f => {
-            fs_extra_1.outputFileSync(path.join(this.folder, this.dataFolder, f), this.content[f]);
-            fs_extra_1.ensureSymlinkSync(path.join(this.folder, "..data", f), path.join(this.folder, f));
+            (0, fs_extra_1.outputFileSync)(path.join(this.folder, this.dataFolder, f), this.content[f]);
+            (0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, "..data", f), path.join(this.folder, f));
         });
     }
     updateConfigMap(content) {
         this.dataFolder = `..${Date.now()}`;
         this.content = content;
-        fs_1.mkdirSync(path.join(this.folder, this.dataFolder));
+        (0, fs_1.mkdirSync)(path.join(this.folder, this.dataFolder));
         Object.keys(this.content).forEach(f => {
-            fs_extra_1.outputFileSync(path.join(this.folder, this.dataFolder, f), this.content[f]);
+            (0, fs_extra_1.outputFileSync)(path.join(this.folder, this.dataFolder, f), this.content[f]);
         });
-        fs_1.unlinkSync(path.join(this.folder, "..data"));
-        fs_extra_1.ensureSymlinkSync(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
+        (0, fs_1.unlinkSync)(path.join(this.folder, "..data"));
+        (0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
     }
 }
 let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTest extends AbstractKubernetesConfigurationServiceTest {
@@ -83,33 +92,61 @@ let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTes
             yield _super.before.call(this, true);
         });
     }
+    cov() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let serv = new __1.KubernetesConfigurationService(this.webda, "t", {});
+            serv.getParameters().source = undefined;
+            assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
+            serv.getParameters().source = "/notexisting";
+            assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
+            let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").callsFake(() => { });
+            yield serv.initConfiguration();
+            assert.strictEqual(mock.callCount, 1);
+        });
+    }
     updatedConfigMap() {
         return __awaiter(this, void 0, void 0, function* () {
-            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop0");
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop1");
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text2, "Plop6");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
             yield new Promise(resolve => {
                 this.webda.getService("KubernetesConfigurationService").on("Configuration.Applied", resolve);
                 this.updateConfigMap(Object.assign(Object.assign({}, this.content), { "webda.json": JSON.stringify({
                         services: {
-                            "Authentication.providers.email.text": "Plop"
+                            Authentication: {
+                                providers: {
+                                    email: {
+                                        text: "Plop2"
+                                    }
+                                }
+                            }
                         }
                     }) }));
             });
-            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop");
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop2");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
             yield new Promise(resolve => {
                 this.webda.getService("KubernetesConfigurationService").on("Configuration.Applied", resolve);
                 this.updateConfigMap(Object.assign(Object.assign({}, this.content), { "webda.json": JSON.stringify({
                         services: {
-                            "Authentication.providers.email.text": "Plop2"
+                            Authentication: {
+                                providers: {
+                                    email: {
+                                        text: "Plop3"
+                                    }
+                                }
+                            }
                         }
                     }) }));
             });
-            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop2");
+            assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop3");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
         });
     }
 };
+__decorate([
+    mocha_1.test
+], KubernetesConfigurationServiceTest.prototype, "cov", null);
 __decorate([
     mocha_1.test
 ], KubernetesConfigurationServiceTest.prototype, "updatedConfigMap", null);
@@ -119,7 +156,7 @@ KubernetesConfigurationServiceTest = __decorate([
 let EmptyKubernetesConfigurationServiceTest = class EmptyKubernetesConfigurationServiceTest extends AbstractKubernetesConfigurationServiceTest {
     unmountedConfigMap() {
         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.text, "Plop0");
             assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
         });
     }

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

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

package/lib/services/mailer.d.ts

@@ -6,7 +6,7 @@ interface IEmailTemplate {
 interface TemplatesMap {
     [key: string]: IEmailTemplate;
 }
-declare class MailerParameters extends ServiceParameters {
+export declare class MailerParameters extends ServiceParameters {
     /**
      * Specify which foldeer contains templates
      *
@@ -23,6 +23,10 @@ declare class MailerParameters extends ServiceParameters {
      * Define the default sender
      */
     sender: string;
+    /**
+     * @see https://www.npmjs.com/package/email-templates
+     */
+    emailTemplateOptions?: any;
     constructor(params: any);
 }
 /**
@@ -50,7 +54,12 @@ declare class Mailer<T extends MailerParameters = MailerParameters> extends Serv
      * Compute parameters
      */
     computeParameters(): void;
-    init(): Promise<void>;
+    /**
+     * Get a template by name
+     *
+     * @param name
+     * @returns
+     */
     _getTemplate(name: any): IEmailTemplate;
     /**
      *

package/lib/services/mailer.js

@@ -9,19 +9,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Mailer = void 0;
+exports.Mailer = exports.MailerParameters = void 0;
 const Email = require("email-templates");
 const fs = require("fs");
 const nodemailer = require("nodemailer");
+const path = require("path");
 const service_1 = require("./service");
 class MailerParameters extends service_1.ServiceParameters {
     constructor(params) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
+        var _g, _h, _j;
         super(params);
-        (_a = this.templates) !== null && _a !== void 0 ? _a : (this.templates = "templates");
+        (_a = this.templates) !== null && _a !== void 0 ? _a : (this.templates = "./templates");
         (_b = this.templatesEngine) !== null && _b !== void 0 ? _b : (this.templatesEngine = "mustache");
+        (_c = this.emailTemplateOptions) !== null && _c !== void 0 ? _c : (this.emailTemplateOptions = {});
+        (_d = (_g = this.emailTemplateOptions).juiceResources) !== null && _d !== void 0 ? _d : (_g.juiceResources = {});
+        (_e = (_h = this.emailTemplateOptions.juiceResources).webResources) !== null && _e !== void 0 ? _e : (_h.webResources = {});
+        (_f = (_j = this.emailTemplateOptions.juiceResources.webResources).relativeTo) !== null && _f !== void 0 ? _f : (_j.relativeTo = path.resolve(this.templates));
     }
 }
+exports.MailerParameters = MailerParameters;
 /**
  * A basic Mailer based on the nodemailer module
  *
@@ -51,50 +58,37 @@ class Mailer extends service_1.Service {
      * Compute parameters
      */
     computeParameters() {
-        try {
-            let config = {};
-            Object.assign(config, this.parameters);
-            if (config.transport === "ses" && !config.SES) {
-                let aws = require("aws-sdk");
-                aws.config.update(config);
-                config.SES = new aws.SES({
-                    apiVersion: "2010-12-01"
-                });
-            }
-            this._transporter = nodemailer.createTransport(config);
-        }
-        catch (ex) {
-            this._transporter = undefined;
+        let config = {};
+        Object.assign(config, this.parameters);
+        if (config.transport === "ses" && !config.SES) {
+            let aws = require("aws-sdk");
+            aws.config.update(config);
+            config.SES = new aws.SES({
+                apiVersion: "2010-12-01"
+            });
         }
+        this._transporter = nodemailer.createTransport(config);
     }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.parameters.templates = this.parameters.templates || "./templates";
-        });
-    }
+    /**
+     * Get a template by name
+     *
+     * @param name
+     * @returns
+     */
     _getTemplate(name) {
         if (!this._templates[name]) {
             // Load template
             let templateDir = this.parameters.templates + "/";
-            if (!fs.existsSync(templateDir)) {
-                templateDir = __dirname + "/../templates/";
-                if (!fs.existsSync(templateDir)) {
-                    this._webda.log("WARN", "No template found for", name);
-                    return;
-                }
-            }
             if (!fs.existsSync(templateDir + name)) {
                 this._webda.log("WARN", "No template found for", name);
                 return;
             }
-            this._templates[name] = new Email({
-                views: {
+            this._templates[name] = new Email(Object.assign(Object.assign({}, this.parameters.emailTemplateOptions), { views: {
                     root: templateDir,
                     options: {
-                        extension: this.parameters.templatesEngine || "mustache"
+                        extension: this.parameters.templatesEngine
                     }
-                }
-            });
+                } }));
         }
         return this._templates[name];
     }

package/lib/services/mailer.js.map

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