@nmshd/app-runtime 2.0.0-alpha.5 → 2.0.0-alpha.6

package/dist/buildInformation.js

@@ -8,11 +8,11 @@ const crypto_1 = require("@nmshd/crypto");
 const runtime_1 = require("@nmshd/runtime");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-alpha.5",
-    build: "16",
-    date: "2022-07-11T11:59:52+00:00",
-    commit: "7c2976509bc9518385664f993cbf3b87173b17c2",
-    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.1.0","@nmshd/runtime":"2.0.0-alpha.30","lodash":"^4.17.21"},
+    version: "2.0.0-alpha.6",
+    build: "17",
+    date: "2022-07-19T13:27:53+00:00",
+    commit: "6fac45e109bc1f82f4cb7010552b612291f3c297",
+    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.2.0","@nmshd/runtime":"2.0.0-alpha.37","lodash":"^4.17.21"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,

package/dist/modules/AppRuntimeModule.d.ts

@@ -8,7 +8,7 @@ export interface IAppRuntimeModuleConstructor {
 export interface AppRuntimeModuleConfiguration extends ModuleConfiguration {
 }
 export declare abstract class AppRuntimeModule<TConfig extends AppRuntimeModuleConfiguration = AppRuntimeModuleConfiguration> extends RuntimeModule<TConfig, AppRuntime> {
-    private readonly registeredNativeEventSubscriptions;
+    private readonly nativeEventSubscriptionIds;
     protected subscribeToNativeEvent<TEvent>(event: Event, handler: EventHandler<TEvent>): void;
     protected unsubscribeFromAllEvents(): void;
 }

package/dist/modules/AppRuntimeModule.js

@@ -5,7 +5,7 @@ const runtime_1 = require("@nmshd/runtime");
 class AppRuntimeModule extends runtime_1.RuntimeModule {
     constructor() {
         super(...arguments);
-        this.registeredNativeEventSubscriptions = [];
+        this.nativeEventSubscriptionIds = [];
     }
     subscribeToNativeEvent(event, handler) {
         const subscriptionResult = this.runtime.nativeEnvironment.eventBus.subscribe(event, handler);
@@ -13,14 +13,12 @@ class AppRuntimeModule extends runtime_1.RuntimeModule {
             this.logger.error(subscriptionResult.error);
             throw subscriptionResult.error;
         }
-        this.registeredNativeEventSubscriptions.push({ id: subscriptionResult.value, target: event });
+        this.nativeEventSubscriptionIds.push(subscriptionResult.value);
     }
     unsubscribeFromAllEvents() {
         super.unsubscribeFromAllEvents();
-        for (const subscription of this.registeredNativeEventSubscriptions) {
-            this.runtime.nativeEnvironment.eventBus.unsubscribe(subscription.target, subscription.id);
-        }
-        this.registeredNativeEventSubscriptions.splice(0);
+        this.nativeEventSubscriptionIds.forEach((id) => this.runtime.nativeEnvironment.eventBus.unsubscribe(id));
+        this.nativeEventSubscriptionIds.splice(0);
     }
 }
 exports.AppRuntimeModule = AppRuntimeModule;

package/dist/modules/AppRuntimeModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppRuntimeModule.js","sourceRoot":"","sources":["../../src/modules/AppRuntimeModule.ts"],"names":[],"mappings":";;;AAEA,4CAAmE;AASnE,MAAsB,gBAEpB,SAAQ,uBAAkC;IAF5C;;QAGqB,uCAAkC,GAAoC,EAAE,CAAA;IAqB7F,CAAC;IAnBa,sBAAsB,CAAS,KAAY,EAAE,OAA6B;QAChF,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC5F,IAAI,kBAAkB,CAAC,OAAO,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YAC3C,MAAM,kBAAkB,CAAC,KAAK,CAAA;SACjC;QAED,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IACjG,CAAC;IAEkB,wBAAwB;QACvC,KAAK,CAAC,wBAAwB,EAAE,CAAA;QAEhC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,kCAAkC,EAAE;YAChE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,CAAA;SAC5F;QAED,IAAI,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACrD,CAAC;CACJ;AAxBD,4CAwBC"}
+{"version":3,"file":"AppRuntimeModule.js","sourceRoot":"","sources":["../../src/modules/AppRuntimeModule.ts"],"names":[],"mappings":";;;AAEA,4CAAmE;AASnE,MAAsB,gBAEpB,SAAQ,uBAAkC;IAF5C;;QAGqB,+BAA0B,GAAa,EAAE,CAAA;IAkB9D,CAAC;IAhBa,sBAAsB,CAAS,KAAY,EAAE,OAA6B;QAChF,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC5F,IAAI,kBAAkB,CAAC,OAAO,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YAC3C,MAAM,kBAAkB,CAAC,KAAK,CAAA;SACjC;QAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAClE,CAAC;IAEkB,wBAAwB;QACvC,KAAK,CAAC,wBAAwB,EAAE,CAAA;QAEhC,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;QACxG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7C,CAAC;CACJ;AArBD,4CAqBC"}

package/lib-web/nmshd.app-runtime.js

@@ -558,11 +558,11 @@ const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const runtime_1 = __webpack_require__(/*! @nmshd/runtime */ "@nmshd/runtime");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-alpha.5",
-    build: "16",
-    date: "2022-07-11T11:59:52+00:00",
-    commit: "7c2976509bc9518385664f993cbf3b87173b17c2",
-    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.1.0","@nmshd/runtime":"2.0.0-alpha.30","lodash":"^4.17.21"},
+    version: "2.0.0-alpha.6",
+    build: "17",
+    date: "2022-07-19T13:27:53+00:00",
+    commit: "6fac45e109bc1f82f4cb7010552b612291f3c297",
+    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.2.0","@nmshd/runtime":"2.0.0-alpha.37","lodash":"^4.17.21"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -1143,7 +1143,7 @@ const runtime_1 = __webpack_require__(/*! @nmshd/runtime */ "@nmshd/runtime");
 class AppRuntimeModule extends runtime_1.RuntimeModule {
     constructor() {
         super(...arguments);
-        this.registeredNativeEventSubscriptions = [];
+        this.nativeEventSubscriptionIds = [];
     }
     subscribeToNativeEvent(event, handler) {
         const subscriptionResult = this.runtime.nativeEnvironment.eventBus.subscribe(event, handler);
@@ -1151,14 +1151,12 @@ class AppRuntimeModule extends runtime_1.RuntimeModule {
             this.logger.error(subscriptionResult.error);
             throw subscriptionResult.error;
         }
-        this.registeredNativeEventSubscriptions.push({ id: subscriptionResult.value, target: event });
+        this.nativeEventSubscriptionIds.push(subscriptionResult.value);
     }
     unsubscribeFromAllEvents() {
         super.unsubscribeFromAllEvents();
-        for (const subscription of this.registeredNativeEventSubscriptions) {
-            this.runtime.nativeEnvironment.eventBus.unsubscribe(subscription.target, subscription.id);
-        }
-        this.registeredNativeEventSubscriptions.splice(0);
+        this.nativeEventSubscriptionIds.forEach((id) => this.runtime.nativeEnvironment.eventBus.unsubscribe(id));
+        this.nativeEventSubscriptionIds.splice(0);
     }
 }
 exports.AppRuntimeModule = AppRuntimeModule;
@@ -3218,10 +3216,11 @@ const EventBus_1 = __webpack_require__(/*! ../EventBus */ "./node_modules/@js-so
 const SubscriptionTargetInfo_1 = __webpack_require__(/*! ../SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
 class EventEmitter2EventBus {
     emitter;
-    wrappers = new Map();
+    listeners = new Map();
     nextId = 0;
-    constructor() {
-        this.emitter = new eventemitter2_1.EventEmitter2({ wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
+    invocationPromises = [];
+    constructor(options) {
+        this.emitter = new eventemitter2_1.EventEmitter2({ ...options, wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
     }
     subscribe(subscriptionTarget, handler) {
         return this.registerHandler(subscriptionTarget, handler);
@@ -3229,33 +3228,39 @@ class EventEmitter2EventBus {
     subscribeOnce(subscriptionTarget, handler) {
         return this.registerHandler(subscriptionTarget, handler, true);
     }
-    unsubscribe(subscriptionTarget, subscriptionId) {
-        return this.unregisterHandler(subscriptionTarget, subscriptionId);
+    unsubscribe(subscriptionId) {
+        return this.unregisterHandler(subscriptionId);
     }
     registerHandler(subscriptionTarget, handler, isOneTimeHandler = false) {
         const subscriptionTargetInfo = SubscriptionTargetInfo_1.SubscriptionTargetInfo.from(subscriptionTarget);
-        const handlerId = this.nextId++;
-        const handlerWrapper = (event) => {
+        const listenerId = this.nextId++;
+        const handlerWrapper = async (event) => {
             if (!subscriptionTargetInfo.isCompatibleWith(event)) {
                 return;
             }
-            handler(event);
-            if (isOneTimeHandler) {
-                this.unsubscribe(subscriptionTarget, handlerId);
-            }
+            const invocationPromise = (async () => await handler(event))();
+            this.invocationPromises.push(invocationPromise);
+            await invocationPromise;
+            this.invocationPromises = this.invocationPromises.filter((p) => p !== invocationPromise);
+            if (isOneTimeHandler)
+                this.listeners.delete(listenerId);
         };
-        this.wrappers.set(handlerId, handlerWrapper);
-        this.emitter.on(subscriptionTargetInfo.namespace, handlerWrapper);
-        return handlerId;
-    }
-    unregisterHandler(subscriptionTarget, handlerId) {
-        const subscriptionTargetInfo = SubscriptionTargetInfo_1.SubscriptionTargetInfo.from(subscriptionTarget);
-        const handlerWrapper = this.wrappers.get(handlerId);
-        if (!handlerWrapper) {
+        if (isOneTimeHandler) {
+            const listener = this.emitter.once(subscriptionTargetInfo.namespace, handlerWrapper, { objectify: true });
+            this.listeners.set(listenerId, listener);
+            return listenerId;
+        }
+        const listener = this.emitter.on(subscriptionTargetInfo.namespace, handlerWrapper, { objectify: true });
+        this.listeners.set(listenerId, listener);
+        return listenerId;
+    }
+    unregisterHandler(listenerId) {
+        const listener = this.listeners.get(listenerId);
+        if (!listener) {
             return false;
         }
-        this.emitter.off(subscriptionTargetInfo.namespace, handlerWrapper);
-        this.wrappers.delete(handlerId);
+        listener.off();
+        this.listeners.delete(listenerId);
         return true;
     }
     publish(event) {
@@ -3265,6 +3270,24 @@ class EventEmitter2EventBus {
         }
         this.emitter.emit(namespace, event);
     }
+    async close(timeout) {
+        this.emitter.removeAllListeners();
+        const waitForInvocations = Promise.all(this.invocationPromises).catch(() => {
+            /* ignore errors */
+        });
+        if (!timeout) {
+            await waitForInvocations;
+            return;
+        }
+        let timeoutId;
+        const timeoutPromise = new Promise((_, reject) => {
+            timeoutId = setTimeout(() => {
+                reject(new Error("timeout exceeded while waiting for events to process"));
+            }, timeout);
+        });
+        await Promise.race([waitForInvocations, timeoutPromise]);
+        clearTimeout(timeoutId);
+    }
 }
 exports.EventEmitter2EventBus = EventEmitter2EventBus;
 //# sourceMappingURL=EventEmitter2EventBus.js.map