@webda/core 2.0.0-beta.3 → 2.0.0

package/lib/core.js

@@ -1,37 +1,34 @@
-"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.Core = exports.Route = exports.Bean = exports.WebsiteOriginFilter = exports.OriginFilter = exports.WebdaError = exports.RegistryEntry = void 0;
-const ajv_1 = require("ajv");
-const ajv_formats_1 = require("ajv-formats");
-const validation_error_1 = require("ajv/dist/runtime/validation_error");
-const deepmerge_ts_1 = require("deepmerge-ts");
-const events = require("events");
-const jsonpath = require("jsonpath");
-const node_machine_id_1 = require("node-machine-id");
-const uuid_1 = require("uuid");
-const vm = require("vm");
-const index_1 = require("./index");
-const coremodel_1 = require("./models/coremodel");
-const router_1 = require("./router");
+import Ajv from "ajv";
+import addFormats from "ajv-formats";
+import { deepmerge } from "deepmerge-ts";
+import * as events from "events";
+import jsonpath from "jsonpath";
+import pkg from "node-machine-id";
+import { v4 as uuidv4 } from "uuid";
+import { Context, Logger, Store } from "./index.js";
+import { CoreModel } from "./models/coremodel.js";
+import { Router } from "./router.js";
+const { machineIdSync } = pkg;
+/**
+ * Copy from https://github.com/ajv-validator/ajv/blob/master/lib/runtime/validation_error.ts
+ * It is not exported by ajv
+ */
+export class ValidationError extends Error {
+    constructor(errors) {
+        super("validation failed");
+        this.errors = errors;
+        this.ajv = this.validation = true;
+    }
+}
 /**
  *
  */
-class RegistryEntry extends coremodel_1.CoreModel {
+export class RegistryEntry extends CoreModel {
 }
-exports.RegistryEntry = RegistryEntry;
 /**
  * Error with a code
  */
-class WebdaError extends Error {
+export class WebdaError extends Error {
     /**
      *
      * @param code
@@ -48,13 +45,12 @@ class WebdaError extends Error {
         return this.code;
     }
 }
-exports.WebdaError = WebdaError;
 /**
  * Filter request based on their origin
  *
  * @category CoreFeatures
  */
-class OriginFilter {
+export class OriginFilter {
     constructor(origins) {
         this.regexs = origins.map(origin => {
             if (!origin.endsWith("$")) {
@@ -71,26 +67,23 @@ class OriginFilter {
      * @param context
      * @returns
      */
-    checkRequest(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let httpContext = context.getHttpContext();
-            for (let regexp of this.regexs) {
-                if (httpContext.hostname.match(regexp)) {
-                    return true;
-                }
-                if (httpContext.origin.match(regexp)) {
-                    return true;
-                }
+    async checkRequest(context) {
+        let httpContext = context.getHttpContext();
+        for (let regexp of this.regexs) {
+            if (httpContext.hostname.match(regexp)) {
+                return true;
             }
-            return false;
-        });
+            if (httpContext.origin.match(regexp)) {
+                return true;
+            }
+        }
+        return false;
     }
 }
-exports.OriginFilter = OriginFilter;
 /**
  * Authorize requests based on the website
  */
-class WebsiteOriginFilter {
+export class WebsiteOriginFilter {
     constructor(website) {
         this.websites = [];
         if (!Array.isArray(website)) {
@@ -105,58 +98,35 @@ class WebsiteOriginFilter {
             this.websites = [...website];
         }
     }
-    checkRequest(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let httpContext = context.getHttpContext();
-            if (this.websites.indexOf(httpContext.origin) >= 0 ||
-                this.websites.indexOf(httpContext.host) >= 0 ||
-                this.websites.indexOf("*") >= 0) {
-                return true;
-            }
-            return false;
-        });
+    async checkRequest(context) {
+        let httpContext = context.getHttpContext();
+        if (this.websites.indexOf(httpContext.origin) >= 0 ||
+            this.websites.indexOf(httpContext.host) >= 0 ||
+            this.websites.indexOf("*") >= 0) {
+            return true;
+        }
+        return false;
     }
 }
-exports.WebsiteOriginFilter = WebsiteOriginFilter;
 const beans = {};
 // @Bean to declare as a Singleton service
-function Bean(constructor) {
+export function Bean(constructor) {
     let name = constructor.name.toLowerCase();
     beans[name] = beans[name] || { constructor };
-    beans[name] = Object.assign(Object.assign({}, beans[name]), { bean: true });
+    beans[name] = { ...beans[name], bean: true };
 }
-exports.Bean = Bean;
-// @Route to declare route on Bean
-function Route(route, methods = ["GET"], allowPath = false, openapi = {}) {
-    return function (target, executor) {
-        let targetName = target.constructor.name.toLowerCase();
-        beans[targetName] = beans[targetName] || {
-            constructor: target.constructor
-        };
-        beans[targetName].routes = beans[targetName].routes || {};
-        beans[targetName].routes[route] = beans[targetName].routes[route] || [];
-        beans[targetName].routes[route].push({
-            methods: Array.isArray(methods) ? methods : [methods],
-            executor,
-            allowPath,
-            openapi
-        });
-    };
-}
-exports.Route = Route;
 /**
  * This is the main class of the framework, it handles the routing, the services initialization and resolution
  *
  * @class Core
  * @category CoreFeatures
  */
-class Core extends events.EventEmitter {
+export class Core extends events.EventEmitter {
     /**
      * @params {Object} config - The configuration Object, if undefined will load the configuration file
      */
     constructor(application) {
         var _a, _b, _c;
-        var _d, _e, _f;
         /** @ignore */
         super();
         /**
@@ -167,7 +137,7 @@ class Core extends events.EventEmitter {
         /**
          * Router that will route http request in
          */
-        this.router = new router_1.Router(this);
+        this.router = new Router(this);
         /**
          * If Core is already initiated
          */
@@ -191,21 +161,21 @@ class Core extends events.EventEmitter {
          */
         this._requestCORSFilters = [];
         this.workerOutput = application.getWorkerOutput();
-        this.logger = new index_1.Logger(this.workerOutput, "@webda/core/lib/core.js");
+        this.logger = new Logger(this.workerOutput, "@webda/core/lib/core.js");
         this.application = application;
         this._initTime = new Date().getTime();
         // Schema validations
-        this._ajv = new ajv_1.default();
-        (0, ajv_formats_1.default)(this._ajv);
+        this._ajv = new Ajv();
+        addFormats(this._ajv);
         this._ajvSchemas = {};
         // Load the configuration and migrate
         this.configuration = this.application.getCurrentConfiguration();
         // Set the global context
-        index_1.Context.setGlobalContext(new (this.getModel(this.parameter("contextModel") || "Webda/Context"))(this));
+        Context.setGlobalContext(new (this.getModel(this.parameter("contextModel") || "Webda/Context"))(this));
         // Init default values for configuration
-        (_a = (_d = this.configuration).parameters) !== null && _a !== void 0 ? _a : (_d.parameters = {});
-        (_b = (_e = this.configuration.parameters).apiUrl) !== null && _b !== void 0 ? _b : (_e.apiUrl = "http://localhost:18080");
-        (_c = (_f = this.configuration).services) !== null && _c !== void 0 ? _c : (_f.services = {});
+        (_a = this.configuration).parameters ?? (_a.parameters = {});
+        (_b = this.configuration.parameters).apiUrl ?? (_b.apiUrl = "http://localhost:18080");
+        (_c = this.configuration).services ?? (_c.services = {});
         // Add CSRF origins filtering
         if (this.configuration.parameters.csrfOrigins) {
             this.registerCORSFilter(new OriginFilter(this.configuration.parameters.csrfOrigins));
@@ -221,8 +191,7 @@ class Core extends events.EventEmitter {
      * It is a random generated string
      */
     getInstanceId() {
-        var _a;
-        (_a = this.instanceId) !== null && _a !== void 0 ? _a : (this.instanceId = this.getUuid());
+        this.instanceId ?? (this.instanceId = this.getUuid());
         return this.instanceId;
     }
     /**
@@ -246,21 +215,6 @@ class Core extends events.EventEmitter {
     getAppPath(subpath = "") {
         return this.application.getAppPath(subpath);
     }
-    /**
-     * Reinit the @Route
-     */
-    reinitResolvedRoutes() {
-        for (let i in beans) {
-            if (beans[i].routes) {
-                for (let j in beans[i].routes) {
-                    beans[i].routes[j].forEach(r => {
-                        r.resolved = false;
-                        this.router.removeRoute(j, r.info);
-                    });
-                }
-            }
-        }
-    }
     /**
      * Retrieve all detected modules definition
      */
@@ -283,109 +237,83 @@ class Core extends events.EventEmitter {
      * Init one service
      * @param service
      */
-    initService(service) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // TODO Define parralel initialization
-                this.log("TRACE", "Initializing service", service);
-                this.initBeanRoutes(this.services[service]);
-                this.services[service]._initTime = Date.now();
-                yield this.services[service].init();
-            }
-            catch (err) {
-                this.services[service]._initException = err;
-                this.failedServices[service] = { _initException: err };
-                this.log("ERROR", "Init service " + service + " failed: " + err.message);
-                this.log("TRACE", err.stack);
-            }
-        });
+    async initService(service) {
+        try {
+            // TODO Define parralel initialization
+            this.log("TRACE", "Initializing service", service);
+            this.services[service]._initTime = Date.now();
+            await this.services[service].init();
+        }
+        catch (err) {
+            this.services[service]._initException = err;
+            this.failedServices[service] = { _initException: err };
+            this.log("ERROR", "Init service " + service + " failed: " + err.message);
+            this.log("TRACE", err.stack);
+        }
     }
     /**
      * Get an object from the application based on its full uuid
      * @param fullUuid
      * @param partials
      */
-    getModelObject(fullUuid, partials) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return coremodel_1.CoreModel.fromFullUuid(this, fullUuid, partials);
-        });
+    async getModelObject(fullUuid, partials) {
+        return CoreModel.fromFullUuid(this, fullUuid, partials);
     }
     /**
      * Init Webda
      *
      * It will resolve Services init method and autolink
      */
-    init() {
-        var _a, _b, _c, _d, _e;
-        var _f, _g, _h, _j, _k;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._init) {
-                return this._init;
-            }
-            if (this.configuration.parameters.configurationService) {
-                try {
-                    this.log("INFO", "Create and init ConfigurationService", this.configuration.parameters.configurationService);
-                    // Create the configuration service
-                    this.createService(this.configuration.services, this.configuration.parameters.configurationService);
-                    let cfg = yield this.getService(this.configuration.parameters.configurationService).initConfiguration();
-                    if (cfg.webda) {
-                        (_a = (_f = cfg.webda).parameters) !== null && _a !== void 0 ? _a : (_f.parameters = {});
-                        (_b = (_g = cfg.webda).services) !== null && _b !== void 0 ? _b : (_g.services = {});
-                        this.configuration.parameters = Object.assign(Object.assign({}, this.configuration.parameters), cfg.webda.parameters);
-                        for (let i in this.configuration.services) {
-                            this.configuration.services[i] = Object.assign(Object.assign({}, (0, deepmerge_ts_1.deepmerge)(this.configuration.services[i], cfg.webda.services[i] || {})), { type: this.configuration.services[i].type });
-                        }
+    async init() {
+        var _a, _b;
+        if (this._init) {
+            return this._init;
+        }
+        if (this.configuration.parameters.configurationService) {
+            try {
+                this.log("INFO", "Create and init ConfigurationService", this.configuration.parameters.configurationService);
+                // Create the configuration service
+                this.createService(this.configuration.services, this.configuration.parameters.configurationService);
+                let cfg = await this.getService(this.configuration.parameters.configurationService).initConfiguration();
+                if (cfg.webda) {
+                    (_a = cfg.webda).parameters ?? (_a.parameters = {});
+                    (_b = cfg.webda).services ?? (_b.services = {});
+                    this.configuration.parameters = { ...this.configuration.parameters, ...cfg.webda.parameters };
+                    for (let i in this.configuration.services) {
+                        this.configuration.services[i] = {
+                            ...deepmerge(this.configuration.services[i], cfg.webda.services[i] || {}),
+                            type: this.configuration.services[i].type
+                        };
                     }
-                    yield this.getService(this.configuration.parameters.configurationService).init();
-                }
-                catch (err) {
-                    this.log("ERROR", "Cannot use ConfigurationService", this.configuration.parameters.configurationService, err);
-                    this.services = {};
                 }
+                await this.getService(this.configuration.parameters.configurationService).init();
             }
-            // Init the registry
-            const autoRegistry = this.configuration.services["Registry"] === undefined;
-            (_c = (_h = this.configuration.services)["Registry"]) !== null && _c !== void 0 ? _c : (_h["Registry"] = {
-                type: "webda/memorystore",
-                persistence: {
-                    path: ".registry",
-                    key: (0, node_machine_id_1.machineIdSync)()
-                }
-            });
-            this.createService(this.configuration.services, "Registry");
-            this.registry = yield this.getService("Registry").resolve().init();
-            // Init the key service
-            (_d = (_j = this.configuration.services)["CryptoService"]) !== null && _d !== void 0 ? _d : (_j["CryptoService"] = {
-                type: "webda/cryptoservice",
-                autoRotate: autoRegistry ? 86400 : undefined
-            });
-            this.createService(this.configuration.services, "CryptoService");
-            this.cryptoService = yield this.getService("CryptoService").resolve().init();
-            // Session Manager
-            (_e = (_k = this.configuration.services)["SessionManager"]) !== null && _e !== void 0 ? _e : (_k["SessionManager"] = {
-                type: "webda/cookiesessionmanager"
-            });
-            // Init the other services
-            this.initStatics();
-            this.reinitResolvedRoutes();
-            this.log("TRACE", "Create Webda init promise");
-            this._init = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                // Init services
-                let service;
-                let inits = [];
-                for (service in this.services) {
-                    if (this.services[service].init !== undefined &&
-                        !this.services[service]._createException &&
-                        !this.services[service]._initTime) {
-                        inits.push(this.initService(service));
-                    }
+            catch (err) {
+                this.log("ERROR", "Cannot use ConfigurationService", this.configuration.parameters.configurationService, err);
+                this.services = {};
+            }
+        }
+        // Init the other services
+        this.initStatics();
+        this.log("TRACE", "Create Webda init promise");
+        this._init = new Promise(async (resolve) => {
+            await this.initService("registry");
+            await this.initService("cryptoservice");
+            // Init services
+            let service;
+            let inits = [];
+            for (service in this.services) {
+                if (this.services[service].init !== undefined &&
+                    !this.services[service]._createException &&
+                    !this.services[service]._initTime) {
+                    inits.push(this.initService(service));
                 }
-                yield Promise.all(inits);
-                yield this.emitSync("Webda.Init.Services", this.services);
-                resolve();
-            }));
-            return this._init;
+            }
+            await Promise.all(inits);
+            await this.emitSync("Webda.Init.Services", this.services);
+            resolve();
         });
+        return this._init;
     }
     /**
      * Register a request filtering
@@ -405,23 +333,6 @@ class Core extends events.EventEmitter {
     registerCORSFilter(filter) {
         this._requestCORSFilters.push(filter);
     }
-    /**
-     *
-     * @param {Object} executor The executor to expose as executor
-     * @param {String} code to execute
-     */
-    sandbox(code, context) {
-        context !== null && context !== void 0 ? context : (context = {
-            require: () => {
-                throw Error("not allowed");
-            }
-        });
-        context.module = {
-            exports: {}
-        };
-        vm.runInNewContext(code, context);
-        return context.module.exports();
-    }
     /**
      * Validate the object with schema
      *
@@ -444,7 +355,7 @@ class Core extends events.EventEmitter {
         if (this._ajv.validate(name, object)) {
             return true;
         }
-        throw new validation_error_1.default(this._ajv.errors);
+        throw new ValidationError(this._ajv.errors);
     }
     /**
      * Return webda current version
@@ -481,7 +392,7 @@ class Core extends events.EventEmitter {
                 }
             }
         }
-        return new index_1.Logger(this.workerOutput, className);
+        return new Logger(this.workerOutput, className);
     }
     /**
      * Add a route dynamicaly
@@ -545,7 +456,7 @@ class Core extends events.EventEmitter {
      * @returns {{}}
      */
     getStores() {
-        return this.getServicesOfType(index_1.Store);
+        return this.getServicesOfType(Store);
     }
     /**
      * Return a map of defined models
@@ -568,11 +479,11 @@ class Core extends events.EventEmitter {
     updateContextWithRoute(ctx) {
         let http = ctx.getHttpContext();
         // Check mapping
-        var route = this.router.getRouteFromUrl(ctx, http.getMethod(), http.getRelativeUri());
+        let route = this.router.getRouteFromUrl(ctx, http.getMethod(), http.getRelativeUri());
         if (route === undefined) {
             return false;
         }
-        ctx.setRoute(Object.assign(Object.assign({}, this.configuration), route));
+        ctx.setRoute({ ...this.configuration, ...route });
         ctx.setExecutor(this.getService(route.executor));
         return true;
     }
@@ -608,41 +519,37 @@ class Core extends events.EventEmitter {
      * Reinit one service
      * @param service
      */
-    reinitService(service) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.log("TRACE", "Re-Initializing service", service);
-                let serviceBean = this.services[service];
-                yield serviceBean.reinit(this.getServiceParams(serviceBean.getName()));
-            }
-            catch (err) {
-                this.log("ERROR", "Re-Init service " + service + " failed", err);
-                this.log("TRACE", err.stack);
-            }
-        });
+    async reinitService(service) {
+        try {
+            this.log("TRACE", "Re-Initializing service", service);
+            let serviceBean = this.services[service];
+            await serviceBean.reinit(this.getServiceParams(serviceBean.getName()));
+        }
+        catch (err) {
+            this.log("ERROR", "Re-Init service " + service + " failed", err);
+            this.log("TRACE", err.stack);
+        }
     }
     /**
      * Reinit all services with updated parameters
      * @param updates
      * @returns
      */
-    reinit(updates) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let configuration = JSON.parse(JSON.stringify(this.configuration.services));
-            for (let service in updates) {
-                jsonpath.value(configuration, service, updates[service]);
-            }
-            if (JSON.stringify(Object.keys(configuration)) !== JSON.stringify(Object.keys(this.configuration.services))) {
-                this.log("ERROR", "Configuration update cannot modify services");
-                throw new WebdaError("REINIT_SERVICE_INJECTION", "Configuration is not designed to add dynamically services");
-            }
-            this.configuration.services = configuration;
-            let inits = [];
-            for (let service in this.services) {
-                inits.push(this.reinitService(service));
-            }
-            yield Promise.all(inits);
-        });
+    async reinit(updates) {
+        let configuration = JSON.parse(JSON.stringify(this.configuration.services));
+        for (let service in updates) {
+            jsonpath.value(configuration, service, updates[service]);
+        }
+        if (JSON.stringify(Object.keys(configuration)) !== JSON.stringify(Object.keys(this.configuration.services))) {
+            this.log("ERROR", "Configuration update cannot modify services");
+            throw new WebdaError("REINIT_SERVICE_INJECTION", "Configuration is not designed to add dynamically services");
+        }
+        this.configuration.services = configuration;
+        let inits = [];
+        for (let service in this.services) {
+            inits.push(this.reinitService(service));
+        }
+        await Promise.all(inits);
     }
     /**
      * Get a full resolved service parameter
@@ -652,21 +559,20 @@ class Core extends events.EventEmitter {
      * @returns
      */
     getServiceParams(service, configuration = { parameters: {}, services: {} }) {
-        var _a, _b, _c;
-        var _d;
-        (_a = configuration.parameters) !== null && _a !== void 0 ? _a : (configuration.parameters = {});
-        (_b = configuration.services) !== null && _b !== void 0 ? _b : (configuration.services = {});
-        (_c = (_d = configuration.services)[service]) !== null && _c !== void 0 ? _c : (_d[service] = {});
-        const params = (0, deepmerge_ts_1.deepmerge)(this.configuration.parameters || {}, configuration.parameters || {}, this.configuration.services[service] || {}, configuration.services[service] || {});
+        var _a;
+        configuration.parameters ?? (configuration.parameters = {});
+        configuration.services ?? (configuration.services = {});
+        (_a = configuration.services)[service] ?? (_a[service] = {});
+        const params = deepmerge(this.configuration.parameters || {}, configuration.parameters || {}, this.configuration.services[service] || {}, configuration.services[service] || {});
         delete params.require;
         return params;
     }
     createService(services, service) {
-        var type = services[service].type;
+        let type = services[service].type;
         if (type === undefined) {
             type = service;
         }
-        var serviceConstructor = undefined;
+        let serviceConstructor = undefined;
         try {
             serviceConstructor = this.application.getModda(type);
         }
@@ -693,9 +599,6 @@ class Core extends events.EventEmitter {
         const services = this.configuration.services;
         this.log("DEBUG", beans);
         for (let i in beans) {
-            if (!beans[i].bean) {
-                this.log("DEBUG", "Implicit @Bean due to a @Route", beans[i].constructor.name);
-            }
             let name = beans[i].constructor.name;
             if (!services[name]) {
                 services[name] = {};
@@ -732,7 +635,7 @@ class Core extends events.EventEmitter {
      * @returns
      */
     getRegistry() {
-        return this.getService("Registry");
+        return this.registry;
     }
     /**
      * Return the crypto service
@@ -777,39 +680,42 @@ class Core extends events.EventEmitter {
      * Init services and Beans along with Routes
      */
     initStatics() {
+        var _a, _b, _c;
+        // Init the registry
+        const autoRegistry = this.configuration.services["Registry"] === undefined;
+        (_a = this.configuration.services)["Registry"] ?? (_a["Registry"] = {
+            type: "webda/memorystore",
+            persistence: {
+                path: ".registry",
+                key: machineIdSync()
+            }
+        });
+        this.createService(this.configuration.services, "Registry");
+        this.registry = this.getService("Registry").resolve();
+        // Init the key service
+        (_b = this.configuration.services)["CryptoService"] ?? (_b["CryptoService"] = {
+            type: "webda/cryptoservice",
+            autoRotate: autoRegistry ? 30 : undefined,
+            autoCreate: true
+        });
+        this.createService(this.configuration.services, "CryptoService");
+        this.cryptoService = this.getService("CryptoService").resolve();
+        // Session Manager
+        (_c = this.configuration.services)["SessionManager"] ?? (_c["SessionManager"] = {
+            type: "webda/cookiesessionmanager"
+        });
         if (this.configuration.services !== undefined) {
+            let excludes = ["registry", "cryptoservice"];
+            if (this.configuration.parameters.configurationService) {
+                excludes.push(this.configuration.parameters.configurationService.toLowerCase());
+            }
             // Do not recreate the configuration services
-            this.createServices(Object.keys(this.services).filter(k => k !== this.configuration.parameters.configurationService && k !== "registry" && k !== "keyservice"));
+            this.createServices(excludes);
         }
         this.router.remapRoutes();
         this._initiated = true;
         this.emit("Webda.Init", this.configuration);
     }
-    /**
-     * Init Routes declare by @Route annotation
-     */
-    initBeanRoutes(serviceBean) {
-        let service = serviceBean.getName().toLowerCase();
-        if (beans[service] !== undefined && beans[service].routes) {
-            for (let j in beans[service].routes) {
-                this.log("TRACE", "Adding route", j, "for bean", service);
-                beans[service].routes[j].forEach(route => {
-                    if (route.resolved) {
-                        return;
-                    }
-                    route.info = {
-                        methods: route.methods,
-                        _method: this.services[service][route.executor],
-                        allowPath: route.allowPath || false,
-                        openapi: route.openapi,
-                        executor: beans[service].constructor.name // Name of the service
-                    };
-                    this.addRoute(j, route.info);
-                    route.resolved = true;
-                });
-            }
-        }
-    }
     /**
      * Create a new context for a request
      *
@@ -818,15 +724,13 @@ class Core extends events.EventEmitter {
      * @param stream - The request output stream if any
      * @return A new context object to pass along
      */
-    newContext(httpContext, stream = undefined, noInit = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let res = (new (this.getModel(this.parameter("contextModel") || "Webda/Context"))(this, httpContext, stream));
-            if (!noInit) {
-                yield res.init();
-            }
-            yield this.emitSync("Webda.NewContext", res);
-            return res;
-        });
+    async newContext(httpContext, stream = undefined, noInit = false) {
+        let res = (new (this.getModel(this.parameter("contextModel") || "Webda/Context"))(this, httpContext, stream));
+        if (!noInit) {
+            await res.init();
+        }
+        await this.emitSync("Webda.NewContext", res);
+        return res;
     }
     /**
      * Convert an object to JSON using the Webda json filter
@@ -846,10 +750,10 @@ class Core extends events.EventEmitter {
      */
     getUuid(format = "uuid") {
         if (format === "uuid") {
-            return (0, uuid_1.v4)().toString();
+            return uuidv4().toString();
         }
         let buffer = Buffer.alloc(16);
-        (0, uuid_1.v4)(undefined, buffer);
+        uuidv4(undefined, buffer);
         if (format === "base64") {
             // Remove useless = we won't transfer back to original value or could just add ==
             // https://datatracker.ietf.org/doc/html/rfc4648#page-7
@@ -867,9 +771,9 @@ class Core extends events.EventEmitter {
      * Emit the event with data and wait for Promise to finish if listener returned a Promise
      */
     emitSync(eventType, event, ...data) {
-        var result;
-        var promises = [];
-        var listeners = this.listeners(eventType);
+        let result;
+        let promises = [];
+        let listeners = this.listeners(eventType);
         for (let listener of listeners) {
             result = listener(event, ...data);
             if (result instanceof Promise) {
@@ -908,28 +812,23 @@ class Core extends events.EventEmitter {
      *
      * @param context Context of the request
      */
-    checkRequest(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Do not need to filter on OPTIONS as CORS is for that
-            if (ctx.getHttpContext().getMethod() === "OPTIONS") {
-                return true;
-            }
-            return (yield Promise.all(this._requestFilters.map(filter => filter.checkRequest(ctx)))).some(v => v);
-        });
+    async checkRequest(ctx) {
+        // Do not need to filter on OPTIONS as CORS is for that
+        if (ctx.getHttpContext().getMethod() === "OPTIONS") {
+            return true;
+        }
+        return (await Promise.all(this._requestFilters.map(filter => filter.checkRequest(ctx)))).some(v => v);
     }
     /**
      * Verify if an origin is allowed to do request on the API
      *
      * @param context Context of the request
      */
-    checkCORSRequest(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield Promise.all(this._requestCORSFilters.map(filter => filter.checkRequest(ctx)))).some(v => v);
-        });
+    async checkCORSRequest(ctx) {
+        return (await Promise.all(this._requestCORSFilters.map(filter => filter.checkRequest(ctx)))).some(v => v);
     }
     exportOpenAPI(skipHidden = true) {
         var _a;
-        var _b;
         let packageInfo = this.application.getPackageDescription();
         let contact;
         if (typeof packageInfo.author === "string") {
@@ -949,7 +848,7 @@ class Core extends events.EventEmitter {
         else if (packageInfo.license) {
             license = packageInfo.license;
         }
-        let openapi = (0, deepmerge_ts_1.deepmerge)({
+        let openapi = deepmerge({
             openapi: "3.0.3",
             info: {
                 description: packageInfo.description,
@@ -959,11 +858,11 @@ class Core extends events.EventEmitter {
                 contact,
                 license
             },
-            schemes: ["https"],
-            basePath: "/",
-            definitions: {
-                Object: {
-                    type: "object"
+            components: {
+                schemas: {
+                    Object: {
+                        type: "object"
+                    }
                 }
             },
             paths: {},
@@ -976,21 +875,30 @@ class Core extends events.EventEmitter {
                 type: "object"
             };
             let modelDescription = this.getModel(i);
+            let modelName = model.name || i.split("/").pop();
             // Only export CoreModel info
-            if (!this.application.extends(modelDescription, coremodel_1.CoreModel)) {
+            if (!this.application.extends(modelDescription, CoreModel)) {
                 continue;
             }
             let schema = this.application.getSchema(i);
             if (schema) {
                 for (let j in schema.definitions) {
                     // @ts-ignore
-                    (_a = (_b = openapi.definitions)[j]) !== null && _a !== void 0 ? _a : (_b[j] = schema.definitions[j]);
+                    (_a = openapi.components.schemas)[j] ?? (_a[j] = schema.definitions[j]);
                 }
                 delete schema.definitions;
                 desc = schema;
             }
-            // @ts-ignore
-            openapi.definitions[model.name.split("/").pop()] = desc;
+            // Remove empty required as openapi does not like that
+            // Our compiler is not generating this anymore but it is additional protection
+            /* c8 ignore next 3 */
+            if (desc.required && desc.required.length === 0) {
+                delete desc.required;
+            }
+            // Remove $schema
+            delete desc.$schema;
+            // Rename all #/definitions/ by #/components/schemas/
+            openapi.components.schemas[modelName] = JSON.parse(JSON.stringify(desc).replace(/#\/definitions\//g, "#/components/schemas/"));
         }
         this.router.completeOpenAPI(openapi, skipHidden);
         openapi.tags.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
@@ -1002,5 +910,4 @@ class Core extends events.EventEmitter {
         return openapi;
     }
 }
-exports.Core = Core;
 //# sourceMappingURL=core.js.map