@webda/core 2.0.0-beta.2 → 2.0.1

package/lib/router.spec.js

@@ -1,25 +1,14 @@
-"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 assert = require("assert");
-const mocha_1 = require("@testdeck/mocha");
-const test_1 = require("./test");
-const httpcontext_1 = require("./utils/httpcontext");
-let RouterTest = class RouterTest extends test_1.WebdaTest {
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import { WebdaTest } from "./test.js";
+import { HttpContext } from "./utils/httpcontext.js";
+let RouterTest = class RouterTest extends WebdaTest {
     testGetRouteMethodsFromUrl() {
         const info = { methods: ["GET"], executor: "DefinedMailer" };
         this.webda.addRoute("/plop", info);
@@ -39,47 +28,39 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
         // Should be skipped
         this.webda.addRoute("/plop", info);
     }
-    testRouterWithPrefix() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
-            this.webda.getGlobalParams().routePrefix = "/reprefix";
-            assert.strictEqual(this.webda.getRouter().getFinalUrl("/test/plop"), "/reprefix/test/plop");
-            assert.strictEqual(this.webda.getRouter().getFinalUrl("/reprefix/test/plop"), "/reprefix/test/plop");
-            this.webda.getRouter().remapRoutes();
-        });
+    async testRouterWithPrefix() {
+        this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
+        this.webda.getGlobalParams().routePrefix = "/reprefix";
+        assert.strictEqual(this.webda.getRouter().getFinalUrl("/test/plop"), "/reprefix/test/plop");
+        assert.strictEqual(this.webda.getRouter().getFinalUrl("/reprefix/test/plop"), "/reprefix/test/plop");
+        this.webda.getRouter().remapRoutes();
     }
-    testRouteWithPrefix() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
-            let httpContext = new httpcontext_1.HttpContext("test.webda.io", "GET", "/prefix/test/plop", "https");
-            httpContext.setPrefix("/prefix");
-            let ctx = yield this.webda.newContext(httpContext);
-            this.webda.updateContextWithRoute(ctx);
-            assert.strictEqual(ctx.getPathParameters().uuid, "plop");
-        });
+    async testRouteWithPrefix() {
+        this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
+        let httpContext = new HttpContext("test.webda.io", "GET", "/prefix/test/plop", "https");
+        httpContext.setPrefix("/prefix");
+        let ctx = await this.webda.newContext(httpContext);
+        this.webda.updateContextWithRoute(ctx);
+        assert.strictEqual(ctx.getPathParameters().uuid, "plop");
     }
-    testRouteWithOverlap() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
-            this.webda.addRoute("/test/{id}", { methods: ["GET"], executor: "DefinedMailer" });
-            let httpContext = new httpcontext_1.HttpContext("test.webda.io", "GET", "/test/plop", "https");
-            let ctx = yield this.webda.newContext(httpContext);
-            this.webda.updateContextWithRoute(ctx);
-            assert.deepStrictEqual(this.webda.getRouter().getRouteMethodsFromUrl("/test/plop"), ["GET"]);
-        });
+    async testRouteWithOverlap() {
+        this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
+        this.webda.addRoute("/test/{id}", { methods: ["GET"], executor: "DefinedMailer" });
+        let httpContext = new HttpContext("test.webda.io", "GET", "/test/plop", "https");
+        let ctx = await this.webda.newContext(httpContext);
+        this.webda.updateContextWithRoute(ctx);
+        assert.deepStrictEqual(this.webda.getRouter().getRouteMethodsFromUrl("/test/plop"), ["GET"]);
     }
-    testRouteWithQueryParam() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.webda.addRoute("/test/plop{?uuid}", { methods: ["GET"], executor: "DefinedMailer" });
-            let httpContext = new httpcontext_1.HttpContext("test.webda.io", "GET", "/test/plop", "http");
-            let ctx = yield this.webda.newContext(httpContext);
-            assert.strictEqual(this.webda.updateContextWithRoute(ctx), true);
-            assert.strictEqual(ctx.getPathParameters().uuid, undefined);
-            httpContext = new httpcontext_1.HttpContext("test.webda.io", "GET", "/test/plop?uuid=bouzouf", "http");
-            ctx = yield this.webda.newContext(httpContext);
-            assert.strictEqual(this.webda.updateContextWithRoute(ctx), true);
-            assert.strictEqual(ctx.getPathParameters().uuid, "bouzouf");
-        });
+    async testRouteWithQueryParam() {
+        this.webda.addRoute("/test/plop{?uuid}", { methods: ["GET"], executor: "DefinedMailer" });
+        let httpContext = new HttpContext("test.webda.io", "GET", "/test/plop", "http");
+        let ctx = await this.webda.newContext(httpContext);
+        assert.strictEqual(this.webda.updateContextWithRoute(ctx), true);
+        assert.strictEqual(ctx.getPathParameters().uuid, undefined);
+        httpContext = new HttpContext("test.webda.io", "GET", "/test/plop?uuid=bouzouf", "http");
+        ctx = await this.webda.newContext(httpContext);
+        assert.strictEqual(this.webda.updateContextWithRoute(ctx), true);
+        assert.strictEqual(ctx.getPathParameters().uuid, "bouzouf");
     }
     completeOpenApi() {
         let api = { paths: {}, info: { title: "Plop", version: "1.0" }, openapi: "", tags: [{ name: "test" }] };
@@ -105,26 +86,48 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
         assert.deepStrictEqual(api.paths["/plop"].get.tags, ["plop", "test"]);
         assert.ok(api.tags.filter(f => f.name === "plop").length === 1);
     }
+    cov() {
+        const info = {
+            methods: ["GET"],
+            executor: "DefinedMailer",
+            openapi: {
+                tags: ["plop", "test"],
+                hidden: true,
+                get: {
+                    schemas: {
+                        output: "test"
+                    }
+                }
+            }
+        };
+        this.webda.addRoute("/cov", info);
+        this.webda.addRoute("/cov", info);
+        this.webda.addRoute("/cov", { ...info, methods: ["PUT"] });
+        this.webda.getRouter().removeRoute("/cov", info);
+    }
 };
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "testGetRouteMethodsFromUrl", null);
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "testRouterWithPrefix", null);
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "testRouteWithPrefix", null);
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "testRouteWithOverlap", null);
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "testRouteWithQueryParam", null);
 __decorate([
-    mocha_1.test
+    test
 ], RouterTest.prototype, "completeOpenApi", null);
+__decorate([
+    test
+], RouterTest.prototype, "cov", null);
 RouterTest = __decorate([
-    mocha_1.suite
+    suite
 ], RouterTest);
 //# sourceMappingURL=router.spec.js.map

package/lib/router.spec.js.map

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

package/lib/services/asyncevents.d.ts

@@ -1,5 +1,5 @@
-import { Queue } from "../queues/queueservice";
-import { Service, ServiceParameters } from "./service";
+import { Queue } from "../queues/queueservice.js";
+import { Service, ServiceParameters } from "./service.js";
 /**
  * AsyncEvent representation
  */

package/lib/services/asyncevents.js

@@ -1,20 +1,8 @@
-"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.EventService = exports.EventServiceParameters = exports.AsyncEvent = void 0;
-const service_1 = require("./service");
+import { Service, ServiceParameters } from "./service.js";
 /**
  * AsyncEvent representation
  */
-class AsyncEvent {
+export class AsyncEvent {
     constructor(service, type, payload = {}) {
         this.service = service;
         this.type = type;
@@ -29,12 +17,15 @@ class AsyncEvent {
      * @returns
      */
     toJSON() {
-        return Object.assign(Object.assign({}, this), { payload: JSON.stringify(this.payload, (_key, value) => {
-                if (value instanceof service_1.Service) {
+        return {
+            ...this,
+            payload: JSON.stringify(this.payload, (_key, value) => {
+                if (value instanceof Service) {
                     return `${AsyncEvent.ServiceTag}${value.getName()}`;
                 }
                 return value;
-            }) });
+            })
+        };
     }
     /**
      * Deserialize from the queue, reviving any detected service
@@ -61,7 +52,6 @@ class AsyncEvent {
         return this.service + "_" + this.type;
     }
 }
-exports.AsyncEvent = AsyncEvent;
 /**
  * Used when serializing a service
  */
@@ -69,23 +59,21 @@ AsyncEvent.ServiceTag = "#Webda:Service:";
 /**
  * @inheritdoc
  */
-class EventServiceParameters extends service_1.ServiceParameters {
+export class EventServiceParameters extends ServiceParameters {
     /**
      * @inheritdoc
      */
     constructor(params) {
-        var _a, _b;
         super(params);
-        (_a = this.queues) !== null && _a !== void 0 ? _a : (this.queues = {});
-        (_b = this.sync) !== null && _b !== void 0 ? _b : (this.sync = false);
+        this.queues ?? (this.queues = {});
+        this.sync ?? (this.sync = false);
     }
 }
-exports.EventServiceParameters = EventServiceParameters;
 /**
  * @category CoreServices
  * @WebdaModda AsyncEvents
  */
-class EventService extends service_1.Service {
+class EventService extends Service {
     constructor() {
         super(...arguments);
         this._callbacks = {};
@@ -105,22 +93,20 @@ class EventService extends service_1.Service {
      * @ignore
      * Setup the default routes
      */
-    computeParameters() {
-        return __awaiter(this, void 0, void 0, function* () {
-            Object.keys(this.parameters.queues).forEach(key => {
-                // Define default as first queue
-                if (!this._defaultQueue) {
-                    this._defaultQueue = key;
-                }
-                this._queues[key] = this.getService(this.parameters.queues[key]);
-            });
-            this._async = !this.parameters.sync;
-            // Check we have at least one queue to handle asynchronous
-            if (this._async && Object.keys(this._queues).length < 1) {
-                this._webda.log("ERROR", "Need at least one queue for async to be ready", this.parameters);
-                throw Error("Need at least one queue for async to be ready");
+    async computeParameters() {
+        Object.keys(this.parameters.queues).forEach(key => {
+            // Define default as first queue
+            if (!this._defaultQueue) {
+                this._defaultQueue = key;
             }
+            this._queues[key] = this.getService(this.parameters.queues[key]);
         });
+        this._async = !this.parameters.sync;
+        // Check we have at least one queue to handle asynchronous
+        if (this._async && Object.keys(this._queues).length < 1) {
+            this._webda.log("ERROR", "Need at least one queue for async to be ready", this.parameters);
+            throw Error("Need at least one queue for async to be ready");
+        }
     }
     /**
      * Bind a asynchronous event
@@ -169,16 +155,14 @@ class EventService extends service_1.Service {
      * @param payload
      * @returns
      */
-    pushEvent(service, type, queue, payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let event = new AsyncEvent(service.getName(), type, payload);
-            if (this._async) {
-                return this._queues[queue].sendMessage(event);
-            }
-            else {
-                return this.handleEvent(event);
-            }
-        });
+    async pushEvent(service, type, queue, payload) {
+        let event = new AsyncEvent(service.getName(), type, payload);
+        if (this._async) {
+            return this._queues[queue].sendMessage(event);
+        }
+        else {
+            return this.handleEvent(event);
+        }
     }
     /**
      * Process one event
@@ -186,28 +170,24 @@ class EventService extends service_1.Service {
      * @param event
      * @returns
      */
-    handleEvent(event) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._callbacks[event.getMapper()]) {
-                return Promise.reject("Callbacks should not be empty, possible application version mismatch between emitter and worker");
-            }
-            let promises = [];
-            this._callbacks[event.getMapper()].map(executor => {
-                promises.push(executor(event.payload, event));
-            });
-            // Need to handle the failure
-            yield Promise.all(promises);
+    async handleEvent(event) {
+        if (!this._callbacks[event.getMapper()]) {
+            return Promise.reject("Callbacks should not be empty, possible application version mismatch between emitter and worker");
+        }
+        let promises = [];
+        this._callbacks[event.getMapper()].map(executor => {
+            promises.push(executor(event.payload, event));
         });
+        // Need to handle the failure
+        await Promise.all(promises);
     }
     /**
      *
      * @param eventBody serialized event
      * @returns
      */
-    handleRawEvent(event) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.handleEvent(AsyncEvent.fromQueue(event, this));
-        });
+    async handleRawEvent(event) {
+        return this.handleEvent(AsyncEvent.fromQueue(event, this));
     }
     /**
      * Process asynchronous event on queue
@@ -220,5 +200,5 @@ class EventService extends service_1.Service {
         return this._queues[queue].consume(this.handleRawEvent.bind(this));
     }
 }
-exports.EventService = EventService;
+export { EventService };
 //# sourceMappingURL=asyncevents.js.map

package/lib/services/asyncevents.js.map

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

package/lib/services/asyncevents.spec.js

@@ -1,79 +1,66 @@
-"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 = require("sinon");
-const test_1 = require("../test");
-const asyncevents_1 = require("./asyncevents");
-let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
-    simple() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var users = this.webda.getService("users");
-            var eventsCount = 0;
-            var priorityEventsCount = 0;
-            var defaultQueue = this.webda.getService("EventQueue");
-            var priorityQueue = this.webda.getService("PriorityEventQueue");
-            var eventService = this.webda.getService("AsyncEvents");
-            users.onAsync("Store.Saved", () => {
-                eventsCount++;
-            });
-            users.onAsync("Store.Deleted", () => {
-                priorityEventsCount++;
-            }, "priority");
-            yield users.save({
-                uuid: "test",
-                type: 1
-            });
-            let size = yield defaultQueue.size();
-            assert.strictEqual(size, 1);
-            size = yield priorityQueue.size();
-            assert.strictEqual(size, 0);
-            yield users.delete("test");
-            size = yield priorityQueue.size();
-            assert.strictEqual(size, 1);
-            size = yield defaultQueue.size();
-            assert.strictEqual(size, 1);
-            // Now that we have queued all messages see if they unqueue correctly
-            // We need to emulate the worker as it wont stop pulling from the queue
-            assert.strictEqual(eventsCount, 0);
-            assert.strictEqual(priorityEventsCount, 0);
-            let evts = yield defaultQueue.receiveMessage();
-            // @ts-ignore
-            yield eventService.handleRawEvent(evts[0].Message);
-            assert.strictEqual(eventsCount, 1);
-            assert.strictEqual(priorityEventsCount, 0);
-            evts = yield priorityQueue.receiveMessage();
-            // @ts-ignore
-            yield eventService.handleRawEvent(evts[0].Message);
-            assert.strictEqual(eventsCount, 1);
-            assert.strictEqual(priorityEventsCount, 1);
-            // Disable async and verify that it directly update now
-            eventService._async = false;
-            yield users.save({
-                uuid: "test",
-                type: 1
-            });
-            assert.strictEqual(eventsCount, 2);
-            assert.strictEqual(priorityEventsCount, 1);
-            yield users.delete("test");
-            assert.strictEqual(eventsCount, 2);
-            assert.strictEqual(priorityEventsCount, 2);
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import * as sinon from "sinon";
+import { WebdaTest } from "../test.js";
+import { EventService } from "./asyncevents.js";
+let AsyncEventsTest = class AsyncEventsTest extends WebdaTest {
+    async simple() {
+        var users = this.webda.getService("users");
+        var eventsCount = 0;
+        var priorityEventsCount = 0;
+        var defaultQueue = this.webda.getService("EventQueue");
+        var priorityQueue = this.webda.getService("PriorityEventQueue");
+        var eventService = this.webda.getService("AsyncEvents");
+        users.onAsync("Store.Saved", () => {
+            eventsCount++;
+        });
+        users.onAsync("Store.Deleted", () => {
+            priorityEventsCount++;
+        }, "priority");
+        await users.save({
+            uuid: "test",
+            type: 1
         });
+        let size = await defaultQueue.size();
+        assert.strictEqual(size, 1);
+        size = await priorityQueue.size();
+        assert.strictEqual(size, 0);
+        await users.delete("test");
+        size = await priorityQueue.size();
+        assert.strictEqual(size, 1);
+        size = await defaultQueue.size();
+        assert.strictEqual(size, 1);
+        // Now that we have queued all messages see if they unqueue correctly
+        // We need to emulate the worker as it wont stop pulling from the queue
+        assert.strictEqual(eventsCount, 0);
+        assert.strictEqual(priorityEventsCount, 0);
+        let evts = await defaultQueue.receiveMessage();
+        // @ts-ignore
+        await eventService.handleRawEvent(evts[0].Message);
+        assert.strictEqual(eventsCount, 1);
+        assert.strictEqual(priorityEventsCount, 0);
+        evts = await priorityQueue.receiveMessage();
+        // @ts-ignore
+        await eventService.handleRawEvent(evts[0].Message);
+        assert.strictEqual(eventsCount, 1);
+        assert.strictEqual(priorityEventsCount, 1);
+        // Disable async and verify that it directly update now
+        eventService._async = false;
+        await users.save({
+            uuid: "test",
+            type: 1
+        });
+        assert.strictEqual(eventsCount, 2);
+        assert.strictEqual(priorityEventsCount, 1);
+        await users.delete("test");
+        assert.strictEqual(eventsCount, 2);
+        assert.strictEqual(priorityEventsCount, 2);
     }
     worker() {
         let eventService = this.webda.getService("AsyncEvents");
@@ -90,46 +77,42 @@ let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
         assert.strictEqual(eventService.worker("plop"), "ploper");
         assert.strictEqual(eventService.worker(), "default");
     }
-    computeParameters() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let evt = new asyncevents_1.EventService(this.webda, "none", { sync: false });
-            yield assert.rejects(() => evt.computeParameters(), /Need at least one queue for async to be ready/);
-        });
+    async computeParameters() {
+        let evt = new EventService(this.webda, "none", { sync: false });
+        await assert.rejects(() => evt.computeParameters(), /Need at least one queue for async to be ready/);
     }
-    cov() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let evt = new asyncevents_1.EventService(this.webda, "none", { sync: true });
-            assert.throws(() => evt.bindAsyncListener(evt, "plop", undefined, "plop"), /EventService is not configured for asynchronous/);
-            yield assert.rejects(
-            // @ts-ignore
-            () => evt.handleEvent({ getMapper: () => "plop" }), /Callbacks should not be empty, possible application version mismatch between emitter and worker/);
-            evt._async = true;
-            let stub = sinon.spy(this.webda.getService("users"), "on");
-            try {
-                evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
-                evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
-                // Should call 'on' only once
-                assert.strictEqual(stub.callCount, 1);
-            }
-            finally {
-                stub.restore();
-            }
-        });
+    async cov() {
+        let evt = new EventService(this.webda, "none", { sync: true });
+        assert.throws(() => evt.bindAsyncListener(evt, "plop", undefined, "plop"), /EventService is not configured for asynchronous/);
+        await assert.rejects(
+        // @ts-ignore
+        () => evt.handleEvent({ getMapper: () => "plop" }), /Callbacks should not be empty, possible application version mismatch between emitter and worker/);
+        evt._async = true;
+        let stub = sinon.spy(this.webda.getService("users"), "on");
+        try {
+            evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
+            evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
+            // Should call 'on' only once
+            assert.strictEqual(stub.callCount, 1);
+        }
+        finally {
+            stub.restore();
+        }
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], AsyncEventsTest.prototype, "simple", null);
 __decorate([
-    mocha_1.test
+    test
 ], AsyncEventsTest.prototype, "worker", null);
 __decorate([
-    mocha_1.test
+    test
 ], AsyncEventsTest.prototype, "computeParameters", null);
 __decorate([
-    mocha_1.test
+    test
 ], AsyncEventsTest.prototype, "cov", null);
 AsyncEventsTest = __decorate([
-    mocha_1.suite
+    suite
 ], AsyncEventsTest);
 //# sourceMappingURL=asyncevents.spec.js.map