@nmshd/runtime 1.3.5 → 2.0.0-alpha.1

package/lib-web/nmshd.runtime.js

@@ -160,9 +160,6 @@ class Runtime {
         typescript_ioc_1.Container.bind(consumption_1.RelationshipInfoController)
             .factory(() => this.getConsumptionController().relationshipInfo)
             .scope(typescript_ioc_1.Scope.Request);
-        typescript_ioc_1.Container.bind(consumption_1.RequestsController)
-            .factory(() => this.getConsumptionController().requests)
-            .scope(typescript_ioc_1.Scope.Request);
         typescript_ioc_1.Container.bind(consumption_1.SettingsController)
             .factory(() => this.getConsumptionController().settings)
             .scope(typescript_ioc_1.Scope.Request);
@@ -184,7 +181,7 @@ class Runtime {
             const moduleConfiguration = this.runtimeConfig.modules[moduleName];
             moduleConfiguration.name = moduleName;
             if (!moduleConfiguration.enabled) {
-                this.logger.info(`Skip loading module '${this.getModuleName(moduleConfiguration)}' because it is not enabled.`);
+                this.logger.debug(`Skip loading module '${this.getModuleName(moduleConfiguration)}' because it is not enabled.`);
                 continue;
             }
             if (!moduleConfiguration.location) {
@@ -329,11 +326,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "1.3.5",
-    build: "42",
-    date: "2022-03-07T13:33:00+00:00",
-    commit: "7a1d5dd76b14400cc424e8f35eeb4a0b956e9472",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.14","@nmshd/content":"1.1.5","@nmshd/crypto":"1.0.8","@nmshd/transport":"1.1.10","ajv":"^8.10.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.3.1","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-alpha.1",
+    build: "46",
+    date: "2022-04-25T10:08:06+00:00",
+    commit: "0474534cfade1d0850bede8b45b1fc266c34616e",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"2.0.0-alpha.2","@nmshd/content":"2.0.0-alpha.8","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.1","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.3.2","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -403,7 +400,7 @@ let DataViewExpander = class DataViewExpander {
                     return await this.expandMessageDTOs(content);
                 }
                 return await this.expandMessageDTO(content);
-            case "Request":
+            case "AttributesRequest":
                 if (content instanceof Array) {
                     return await this.expandUnknownRequests(content);
                 }
@@ -2480,11 +2477,11 @@ let AccountFacade = class AccountFacade {
     async registerPushNotificationToken(request) {
         return await this.registerPushNotificationTokenUseCase.execute(request);
     }
-    async syncDatawallet() {
-        return await this.syncDatawalletUseCase.execute();
+    async syncDatawallet(request = {}) {
+        return await this.syncDatawalletUseCase.execute(request);
     }
-    async syncEverything() {
-        return await this.syncEverythingUseCase.execute();
+    async syncEverything(request = {}) {
+        return await this.syncEverythingUseCase.execute(request);
     }
     async getSyncInfo() {
         return await this.getSyncInfoUseCase.execute();
@@ -3248,13 +3245,13 @@ class MessageModule extends RuntimeModule_1.RuntimeModule {
         let event;
         switch (type) {
             case "Mail":
-                const mail = await content_1.Mail.from(message.content);
+                const mail = content_1.Mail.from(message.content);
                 event = new MailReceivedEvent_1.MailReceivedEvent(messageReceivedEvent.eventTargetAddress, mail, message);
                 this.runtime.eventBus.publish(event);
                 this.logger.trace(`Published MailReceivedEvent for ${message.id}`);
                 break;
             case "RequestMail":
-                const requestMail = await content_1.RequestMail.from(message.content);
+                const requestMail = content_1.RequestMail.from(message.content);
                 event = new RequestMailReceivedEvent_1.RequestMailReceivedEvent(messageReceivedEvent.eventTargetAddress, requestMail, message);
                 this.runtime.eventBus.publish(event);
                 this.logger.trace(`Published RequestMailReceivedEvent for ${message.id}`);
@@ -3771,9 +3768,9 @@ let LoadPeerTokenAnonymousByIdAndKeyUseCase = class LoadPeerTokenAnonymousByIdAn
         this.anonymousTokenController = anonymousTokenController;
     }
     async executeInternal(request) {
-        const key = await crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
+        const key = crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
         const createdToken = await this.anonymousTokenController.loadPeerToken(transport_1.CoreId.from(request.id), key);
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(createdToken, true));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(createdToken, true));
     }
 };
 LoadPeerTokenAnonymousByIdAndKeyUseCase = __decorate([
@@ -3826,7 +3823,7 @@ let LoadPeerTokenAnonymousByTruncatedReferenceUseCase = class LoadPeerTokenAnony
     }
     async executeInternal(request) {
         const createdToken = await this.anonymousTokenController.loadPeerTokenByTruncated(request.reference);
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(createdToken, true));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(createdToken, true));
     }
 };
 LoadPeerTokenAnonymousByTruncatedReferenceUseCase = __decorate([
@@ -4239,8 +4236,8 @@ exports.JsonSchema = JsonSchema;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.DownloadAttachmentRequest = exports.DownloadFileRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.GetAttributesByNamesRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
-exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = exports.LoadPeerFileRequest = exports.LoadPeerFileViaReferenceRequest = exports.LoadPeerFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = void 0;
+exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.DownloadFileRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.GetAttributesByNamesRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
+exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = exports.LoadPeerFileRequest = exports.LoadPeerFileViaReferenceRequest = exports.LoadPeerFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = void 0;
 exports.LoadPeerTokenAnonymousByIdAndKeyRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/LoadPeerTokenAnonymousByIdAndKeyRequest",
@@ -4705,7 +4702,10 @@ exports.CreateRelationshipInfoRequest = {
                 "@type": {
                     "type": "string"
                 },
-                "@schema": {
+                "@context": {
+                    "type": "string"
+                },
+                "@version": {
                     "type": "string"
                 },
                 "name": {
@@ -4891,7 +4891,10 @@ exports.UpdateRelationshipInfoRequest = {
                 "@type": {
                     "type": "string"
                 },
-                "@schema": {
+                "@context": {
+                    "type": "string"
+                },
+                "@version": {
                     "type": "string"
                 },
                 "name": {
@@ -5252,6 +5255,16 @@ exports.RegisterPushNotificationTokenRequest = {
         }
     }
 };
+exports.SyncDatawalletRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/SyncDatawalletRequest",
+    "definitions": {
+        "SyncDatawalletRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.DownloadFileRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/DownloadFileRequest",
@@ -5293,6 +5306,16 @@ exports.DownloadAttachmentRequest = {
         }
     }
 };
+exports.SyncEverythingRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/SyncEverythingRequest",
+    "definitions": {
+        "SyncEverythingRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.CreateRelationshipChallengeRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/CreateRelationshipChallengeRequest",
@@ -6377,7 +6400,7 @@ class UseCase {
         if (error instanceof ts_serval_1.ParsingError || error instanceof ts_serval_1.ValidationError) {
             runtimeError = RuntimeErrors_1.RuntimeErrors.serval.requestDeserialization(error.message);
         }
-        else if (error.message.match(/Type '.+' was not found within reflection classes. You might have to install a module first./)) {
+        else if (error.message.match(/Type '.+' with version [0-9]+ was not found within reflection classes. You might have to install a module first./)) {
             runtimeError = RuntimeErrors_1.RuntimeErrors.serval.unknownType(error.message);
         }
         else {
@@ -7636,7 +7659,7 @@ let UpdateDraftUseCase = class UpdateDraftUseCase extends common_1.UseCase {
         if (!draft) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(consumption_1.Draft));
         }
-        draft.content = await ts_serval_1.SerializableAsync.fromUnknown(request.content);
+        draft.content = ts_serval_1.Serializable.fromUnknown(request.content);
         await this.draftController.updateDraft(draft);
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(DraftMapper_1.DraftMapper.toDraftDTO(draft));
@@ -7775,8 +7798,8 @@ let CreateRelationshipInfoUseCase = class CreateRelationshipInfoUseCase extends
                 sharedItem: transport_1.CoreId.from(a.sharedItem)
             });
         }));
-        const theme = request.theme === undefined ? undefined : await consumption_1.RelationshipTheme.from(request.theme);
-        const parameters = await consumption_1.RelationshipInfo.from({
+        const theme = request.theme === undefined ? undefined : consumption_1.RelationshipTheme.from(request.theme);
+        const parameters = consumption_1.RelationshipInfo.from({
             id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
             relationshipId: relationshipId,
             attributes: attributes,
@@ -8204,7 +8227,7 @@ let UpdateRelationshipInfoUseCase = class UpdateRelationshipInfoUseCase extends
         relationshipInfo.description = request.description === undefined ? relationshipInfo.description : request.description;
         relationshipInfo.userTitle = request.userTitle === undefined ? relationshipInfo.userTitle : request.userTitle;
         relationshipInfo.userDescription = request.userDescription === undefined ? relationshipInfo.userDescription : request.userDescription;
-        relationshipInfo.theme = request.theme === undefined ? relationshipInfo.theme : await consumption_1.RelationshipTheme.from(request.theme);
+        relationshipInfo.theme = request.theme === undefined ? relationshipInfo.theme : consumption_1.RelationshipTheme.from(request.theme);
         await this.relationshipInfoController.updateRelationshipInfo(relationshipInfo);
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(RelationshipInfoMapper_1.RelationshipInfoMapper.toRelationshipInfoDTO(relationshipInfo));
@@ -8592,7 +8615,7 @@ let UpdateSettingUseCase = class UpdateSettingUseCase extends common_1.UseCase {
         if (!setting) {
             return ts_utils_1.Result.fail(__1.RuntimeErrors.general.recordNotFound(consumption_1.Setting));
         }
-        setting.value = await ts_serval_1.SerializableAsync.from(request.value);
+        setting.value = ts_serval_1.Serializable.fromUnknown(request.value);
         await this.settingController.updateSetting(setting);
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(SettingMapper_1.SettingMapper.toSettingDTO(setting));
@@ -8695,7 +8718,7 @@ let CreateSharedItemUseCase = class CreateSharedItemUseCase extends common_1.Use
         this.accountController = accountController;
     }
     async executeInternal(request) {
-        const sharedItem = await consumption_1.SharedItem.from({
+        const sharedItem = consumption_1.SharedItem.from({
             id: await consumption_1.ConsumptionIds.sharedItem.generate(),
             tags: request.tags,
             sharedBy: transport_1.CoreAddress.from(request.sharedBy),
@@ -9638,8 +9661,8 @@ let SyncDatawalletUseCase = class SyncDatawalletUseCase extends common_1.UseCase
         super();
         this.accountController = accountController;
     }
-    async executeInternal() {
-        await this.accountController.syncDatawallet(true);
+    async executeInternal(request) {
+        await this.accountController.syncDatawallet(true, request.callback);
         return ts_utils_1.Result.ok(undefined);
     }
 };
@@ -9690,11 +9713,11 @@ let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase
         this.eventBus = eventBus;
         this.logger = loggerFactory.getLogger(SyncEverythingUseCase);
     }
-    async executeInternal() {
+    async executeInternal(request) {
         if (this.currentSync) {
             return await this.currentSync;
         }
-        this.currentSync = this._executeInternal();
+        this.currentSync = this._executeInternal(request);
         try {
             return await this.currentSync;
         }
@@ -9702,8 +9725,8 @@ let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase
             this.currentSync = undefined;
         }
     }
-    async _executeInternal() {
-        const changedItems = await this.accountController.syncEverything();
+    async _executeInternal(request) {
+        const changedItems = await this.accountController.syncEverything(request.callback);
         const messageDTOs = changedItems.messages.map((m) => MessageMapper_1.MessageMapper.toMessageDTO(m));
         const relationshipDTOs = changedItems.relationships.map((r) => RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(r));
         const eventTargetAddress = this.identityController.identity.address.toString();
@@ -9965,28 +9988,28 @@ let Validator = class Validator extends common_1.SchemaValidator {
         const validationResult = await super.validate(value);
         if (validationResult.isInvalid())
             return validationResult;
-        const signatureValidationResult = await this.validateSignature(value.signature);
+        const signatureValidationResult = this.validateSignature(value.signature);
         if (signatureValidationResult.isError) {
             validationResult.addFailures([new fluent_ts_validator_1.ValidationFailure(undefined, "signature", undefined, undefined, signatureValidationResult.error.message)]);
         }
-        const challengeValidationResult = await this.validateChallenge(value.challengeString);
+        const challengeValidationResult = this.validateChallenge(value.challengeString);
         if (challengeValidationResult.isError) {
             validationResult.addFailures([new fluent_ts_validator_1.ValidationFailure(undefined, "challenge", undefined, undefined, challengeValidationResult.error.message)]);
         }
         return validationResult;
     }
-    async validateSignature(signature) {
+    validateSignature(signature) {
         try {
-            await crypto_1.CryptoSignature.fromBase64(signature);
+            crypto_1.CryptoSignature.fromBase64(signature);
             return ts_utils_1.Result.ok(undefined);
         }
         catch {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.challenges.invalidSignature());
         }
     }
-    async validateChallenge(challenge) {
+    validateChallenge(challenge) {
         try {
-            await transport_1.Challenge.deserialize(challenge);
+            transport_1.Challenge.deserialize(challenge);
             return ts_utils_1.Result.ok(undefined);
         }
         catch {
@@ -10004,8 +10027,8 @@ let ValidateChallengeUseCase = class ValidateChallengeUseCase extends common_1.U
         this.challengeController = challengeController;
     }
     async executeInternal(request) {
-        const signature = await crypto_1.CryptoSignature.fromBase64(request.signature);
-        const signedChallenge = await transport_1.ChallengeSigned.from({
+        const signature = crypto_1.CryptoSignature.fromBase64(request.signature);
+        const signedChallenge = transport_1.ChallengeSigned.from({
             challenge: request.challengeString,
             signature: signature
         });
@@ -10169,13 +10192,13 @@ let CreateDeviceOnboardingTokenUseCase = class CreateDeviceOnboardingTokenUseCas
     async executeInternal(request) {
         const sharedSecret = await this.devicesController.getSharedSecret(transport_1.CoreId.from(request.id));
         const expiresAt = request.expiresAt ? transport_1.CoreDate.from(request.expiresAt) : transport_1.CoreDate.utc().add({ minutes: 5 });
-        const tokenContent = await transport_1.TokenContentDeviceSharedSecret.from({ sharedSecret: sharedSecret });
+        const tokenContent = transport_1.TokenContentDeviceSharedSecret.from({ sharedSecret: sharedSecret });
         const token = await this.tokenController.sendToken({
             content: tokenContent,
             expiresAt: expiresAt,
             ephemeral: true
         });
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(token, true));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(token, true));
     }
 };
 CreateDeviceOnboardingTokenUseCase = __decorate([
@@ -10301,20 +10324,20 @@ class DeviceMapper {
             username: deviceSharedSecret.username
         };
     }
-    static async toDeviceSharedSecret(deviceOnboardingDTO) {
-        const sharedSecret = await transport_1.DeviceSharedSecret.from({
+    static toDeviceSharedSecret(deviceOnboardingDTO) {
+        const sharedSecret = transport_1.DeviceSharedSecret.from({
             id: transport_1.CoreId.from(deviceOnboardingDTO.id),
             createdAt: transport_1.CoreDate.from(deviceOnboardingDTO.createdAt),
             createdByDevice: transport_1.CoreId.from(deviceOnboardingDTO.createdByDevice),
             name: deviceOnboardingDTO.name,
             description: deviceOnboardingDTO.description,
-            secretBaseKey: await crypto_1.CryptoSecretKey.fromBase64(deviceOnboardingDTO.secretBaseKey),
+            secretBaseKey: crypto_1.CryptoSecretKey.fromBase64(deviceOnboardingDTO.secretBaseKey),
             deviceIndex: deviceOnboardingDTO.deviceIndex,
-            synchronizationKey: await crypto_1.CryptoSecretKey.fromBase64(deviceOnboardingDTO.synchronizationKey),
-            identityPrivateKey: deviceOnboardingDTO.identityPrivateKey ? await crypto_1.CryptoSignaturePrivateKey.deserialize(deviceOnboardingDTO.identityPrivateKey) : undefined,
+            synchronizationKey: crypto_1.CryptoSecretKey.fromBase64(deviceOnboardingDTO.synchronizationKey),
+            identityPrivateKey: deviceOnboardingDTO.identityPrivateKey ? crypto_1.CryptoSignaturePrivateKey.deserialize(deviceOnboardingDTO.identityPrivateKey) : undefined,
             identity: {
                 address: transport_1.CoreAddress.from(deviceOnboardingDTO.identity.address),
-                publicKey: await crypto_1.CryptoSignaturePublicKey.deserialize(deviceOnboardingDTO.identity.publicKey),
+                publicKey: crypto_1.CryptoSignaturePublicKey.deserialize(deviceOnboardingDTO.identity.publicKey),
                 realm: deviceOnboardingDTO.identity.realm
             },
             password: deviceOnboardingDTO.password,
@@ -10628,7 +10651,7 @@ let CreateTokenForFileUseCase = class CreateTokenForFileUseCase extends common_1
         if (!file) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(transport_1.File));
         }
-        const tokenContent = await transport_1.TokenContentFile.from({
+        const tokenContent = transport_1.TokenContentFile.from({
             fileId: file.id,
             secretKey: file.secretKey
         });
@@ -10643,7 +10666,7 @@ let CreateTokenForFileUseCase = class CreateTokenForFileUseCase extends common_1
         if (!ephemeral) {
             await this.accountController.syncDatawallet();
         }
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(token, ephemeral));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(token, ephemeral));
     }
 };
 CreateTokenForFileUseCase = __decorate([
@@ -10708,7 +10731,7 @@ let CreateTokenQrCodeForFileUseCase = class CreateTokenQrCodeForFileUseCase exte
         if (!file) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(transport_1.File));
         }
-        const tokenContent = await transport_1.TokenContentFile.from({
+        const tokenContent = transport_1.TokenContentFile.from({
             fileId: file.id,
             secretKey: file.secretKey
         });
@@ -10719,7 +10742,7 @@ let CreateTokenQrCodeForFileUseCase = class CreateTokenQrCodeForFileUseCase exte
             expiresAt: tokenExpiry,
             ephemeral: true
         });
-        const qrCode = await common_1.QRCode.from(await token.truncate());
+        const qrCode = await common_1.QRCode.from(token.truncate());
         return ts_utils_1.Result.ok({ qrCodeBytes: qrCode.asBase64() });
     }
 };
@@ -11068,7 +11091,7 @@ let LoadPeerFileUseCase = class LoadPeerFileUseCase extends common_1.UseCase {
     async executeInternal(request) {
         let createdFile;
         if (isLoadPeerFileViaSecret(request)) {
-            const key = await crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
+            const key = crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
             createdFile = await this.loadFile(transport_1.CoreId.from(request.id), key);
         }
         else if (isLoadPeerFileViaReference(request)) {
@@ -12035,7 +12058,7 @@ let CreateTokenForOwnTemplateUseCase = class CreateTokenForOwnTemplateUseCase ex
         if (!template.isOwn) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.relationshipTemplates.cannotCreateTokenForPeerTemplate());
         }
-        const tokenContent = await transport_1.TokenContentRelationshipTemplate.from({
+        const tokenContent = transport_1.TokenContentRelationshipTemplate.from({
             templateId: template.id,
             secretKey: template.secretKey
         });
@@ -12050,7 +12073,7 @@ let CreateTokenForOwnTemplateUseCase = class CreateTokenForOwnTemplateUseCase ex
         if (!ephemeral) {
             await this.accountController.syncDatawallet();
         }
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(token, ephemeral));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(token, ephemeral));
     }
 };
 CreateTokenForOwnTemplateUseCase = __decorate([
@@ -12116,7 +12139,7 @@ let CreateTokenQrCodeForOwnTemplateUseCase = class CreateTokenQrCodeForOwnTempla
         if (!template.isOwn) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.relationshipTemplates.cannotCreateTokenForPeerTemplate());
         }
-        const tokenContent = await transport_1.TokenContentRelationshipTemplate.from({
+        const tokenContent = transport_1.TokenContentRelationshipTemplate.from({
             templateId: template.id,
             secretKey: template.secretKey
         });
@@ -12127,7 +12150,7 @@ let CreateTokenQrCodeForOwnTemplateUseCase = class CreateTokenQrCodeForOwnTempla
             expiresAt: tokenExpiry,
             ephemeral: true
         });
-        const qrCode = await common_1.QRCode.from(await token.truncate());
+        const qrCode = await common_1.QRCode.from(token.truncate());
         return ts_utils_1.Result.ok({ qrCodeBytes: qrCode.asBase64() });
     }
 };
@@ -12339,7 +12362,7 @@ let LoadPeerRelationshipTemplateUseCase = class LoadPeerRelationshipTemplateUseC
     async executeInternal(request) {
         let createdTemplate;
         if (request.id && request.secretKey) {
-            const key = await crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
+            const key = crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
             createdTemplate = await this.loadTemplate(transport_1.CoreId.from(request.id), key);
         }
         else if (request.reference) {
@@ -13164,7 +13187,7 @@ let CreateOwnTokenUseCase = class CreateOwnTokenUseCase extends common_1.UseCase
     async executeInternal(request) {
         let tokenContent;
         try {
-            tokenContent = await ts_serval_1.SerializableAsync.from(request.content);
+            tokenContent = ts_serval_1.Serializable.fromUnknown(request.content);
         }
         catch {
             throw common_1.RuntimeErrors.general.invalidTokenContent();
@@ -13177,7 +13200,7 @@ let CreateOwnTokenUseCase = class CreateOwnTokenUseCase extends common_1.UseCase
         if (!request.ephemeral) {
             await this.accountController.syncDatawallet();
         }
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(response, request.ephemeral));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(response, request.ephemeral));
     }
 };
 CreateOwnTokenUseCase = __decorate([
@@ -13235,7 +13258,7 @@ let GetQRCodeForTokenUseCase = class GetQRCodeForTokenUseCase extends common_1.U
         if (!token) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(transport_1.Token));
         }
-        const qrCode = await common_1.QRCode.from(await token.truncate());
+        const qrCode = await common_1.QRCode.from(token.truncate());
         return ts_utils_1.Result.ok({ qrCodeBytes: qrCode.asBase64() });
     }
 };
@@ -13292,7 +13315,7 @@ let GetTokenUseCase = class GetTokenUseCase extends common_1.UseCase {
         if (!token) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound("Token"));
         }
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(token, false));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(token, false));
     }
 };
 GetTokenUseCase = __decorate([
@@ -13345,7 +13368,7 @@ let GetTokensUseCase = class GetTokensUseCase extends common_1.UseCase {
             query[(0, ts_simple_nameof_1.nameof)((t) => t.isOwn)] = request.ownerRestriction === common_1.OwnerRestriction.Own;
         }
         const tokens = await this.tokenController.getTokens(query);
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTOList(tokens, false));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTOList(tokens, false));
     }
 };
 GetTokensUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator({
@@ -13440,7 +13463,7 @@ let LoadPeerTokenUseCase = class LoadPeerTokenUseCase extends common_1.UseCase {
     async executeInternal(request) {
         let createdToken;
         if (request.id && request.secretKey) {
-            const key = await crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
+            const key = crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
             createdToken = await this.tokenController.loadPeerToken(transport_1.CoreId.from(request.id), key, request.ephemeral);
         }
         else if (request.reference) {
@@ -13452,7 +13475,7 @@ let LoadPeerTokenUseCase = class LoadPeerTokenUseCase extends common_1.UseCase {
         if (!request.ephemeral) {
             await this.accountController.syncDatawallet();
         }
-        return ts_utils_1.Result.ok(await TokenMapper_1.TokenMapper.toTokenDTO(createdToken, request.ephemeral));
+        return ts_utils_1.Result.ok(TokenMapper_1.TokenMapper.toTokenDTO(createdToken, request.ephemeral));
     }
 };
 LoadPeerTokenUseCase = __decorate([
@@ -13481,11 +13504,11 @@ exports.TokenMapper = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
 class TokenMapper {
-    static async toTokenDTO(token, ephemeral) {
+    static toTokenDTO(token, ephemeral) {
         if (!token.cache) {
             throw common_1.RuntimeErrors.general.cacheEmpty(transport_1.Token, token.id.toString());
         }
-        const reference = await token.toTokenReference();
+        const reference = token.toTokenReference();
         return {
             id: token.id.toString(),
             createdBy: token.cache.createdBy.toString(),
@@ -13498,8 +13521,8 @@ class TokenMapper {
             isEphemeral: ephemeral
         };
     }
-    static async toTokenDTOList(tokens, ephemeral) {
-        return await Promise.all(tokens.map((t) => TokenMapper.toTokenDTO(t, ephemeral)));
+    static toTokenDTOList(tokens, ephemeral) {
+        return tokens.map((t) => TokenMapper.toTokenDTO(t, ephemeral));
     }
 }
 exports.TokenMapper = TokenMapper;
@@ -19962,7 +19985,7 @@ const def = {
             for (let i = 0; i < oneOf.length; i++) {
                 let sch = oneOf[i];
                 if ((sch === null || sch === void 0 ? void 0 : sch.$ref) && !(0, util_1.schemaHasRulesButRef)(sch, it.self.RULES)) {
-                    sch = compile_1.resolveRef.call(it.self, it.schemaEnv, it.baseId, sch === null || sch === void 0 ? void 0 : sch.$ref);
+                    sch = compile_1.resolveRef.call(it.self, it.schemaEnv.root, it.baseId, sch === null || sch === void 0 ? void 0 : sch.$ref);
                     if (sch instanceof compile_1.SchemaEnv)
                         sch = sch.schema;
                 }
@@ -20259,7 +20282,8 @@ const def = {
         if (!$data && schema.length === 0)
             throw new Error("enum must have non-empty array");
         const useLoop = schema.length >= it.opts.loopEnum;
-        const eql = (0, util_1.useFunc)(gen, equal_1.default);
+        let eql;
+        const getEql = () => (eql !== null && eql !== void 0 ? eql : (eql = (0, util_1.useFunc)(gen, equal_1.default)));
         let valid;
         if (useLoop || $data) {
             valid = gen.let("valid");
@@ -20275,12 +20299,12 @@ const def = {
         cxt.pass(valid);
         function loopEnum() {
             gen.assign(valid, false);
-            gen.forOf("v", schemaCode, (v) => gen.if((0, codegen_1._) `${eql}(${data}, ${v})`, () => gen.assign(valid, true).break()));
+            gen.forOf("v", schemaCode, (v) => gen.if((0, codegen_1._) `${getEql()}(${data}, ${v})`, () => gen.assign(valid, true).break()));
         }
         function equalCode(vSchema, i) {
             const sch = schema[i];
             return typeof sch === "object" && sch !== null
-                ? (0, codegen_1._) `${eql}(${data}, ${vSchema}[${i}])`
+                ? (0, codegen_1._) `${getEql()}(${data}, ${vSchema}[${i}])`
                 : (0, codegen_1._) `${data} === ${sch}`;
         }
     },
@@ -20454,7 +20478,7 @@ const codegen_1 = __webpack_require__(/*! ../../compile/codegen */ "./node_modul
 const error = {
     message({ keyword, schemaCode }) {
         const comp = keyword === "maxProperties" ? "more" : "fewer";
-        return (0, codegen_1.str) `must NOT have ${comp} than ${schemaCode} items`;
+        return (0, codegen_1.str) `must NOT have ${comp} than ${schemaCode} properties`;
     },
     params: ({ schemaCode }) => (0, codegen_1._) `{limit: ${schemaCode}}`,
 };
@@ -29023,6 +29047,9 @@ var Formatter = /*#__PURE__*/function () {
         case "d":
           return "day";
 
+        case "w":
+          return "week";
+
         case "M":
           return "month";
 
@@ -29272,7 +29299,6 @@ var SystemZone = /*#__PURE__*/function (_Zone) {
   return SystemZone;
 }(Zone);
 
-RegExp("^" + ianaRegex.source + "$");
 var dtfCache = {};
 
 function makeDTF(zone) {
@@ -29285,7 +29311,8 @@ function makeDTF(zone) {
       day: "2-digit",
       hour: "2-digit",
       minute: "2-digit",
-      second: "2-digit"
+      second: "2-digit",
+      era: "short"
     });
   }
 
@@ -29296,34 +29323,38 @@ var typeToPos = {
   year: 0,
   month: 1,
   day: 2,
-  hour: 3,
-  minute: 4,
-  second: 5
+  era: 3,
+  hour: 4,
+  minute: 5,
+  second: 6
 };
 
 function hackyOffset(dtf, date) {
   var formatted = dtf.format(date).replace(/\u200E/g, ""),
-      parsed = /(\d+)\/(\d+)\/(\d+),? (\d+):(\d+):(\d+)/.exec(formatted),
+      parsed = /(\d+)\/(\d+)\/(\d+) (AD|BC),? (\d+):(\d+):(\d+)/.exec(formatted),
       fMonth = parsed[1],
       fDay = parsed[2],
       fYear = parsed[3],
-      fHour = parsed[4],
-      fMinute = parsed[5],
-      fSecond = parsed[6];
-  return [fYear, fMonth, fDay, fHour, fMinute, fSecond];
+      fadOrBc = parsed[4],
+      fHour = parsed[5],
+      fMinute = parsed[6],
+      fSecond = parsed[7];
+  return [fYear, fMonth, fDay, fadOrBc, fHour, fMinute, fSecond];
 }
 
 function partsOffset(dtf, date) {
-  var formatted = dtf.formatToParts(date),
-      filled = [];
+  var formatted = dtf.formatToParts(date);
+  var filled = [];
 
   for (var i = 0; i < formatted.length; i++) {
     var _formatted$i = formatted[i],
         type = _formatted$i.type,
-        value = _formatted$i.value,
-        pos = typeToPos[type];
+        value = _formatted$i.value;
+    var pos = typeToPos[type];
 
-    if (!isUndefined(pos)) {
+    if (type === "era") {
+      filled[pos] = value;
+    } else if (!isUndefined(pos)) {
       filled[pos] = parseInt(value, 10);
     }
   }
@@ -29366,7 +29397,7 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
    * @param {string} s - The string to check validity on
    * @example IANAZone.isValidSpecifier("America/New_York") //=> true
    * @example IANAZone.isValidSpecifier("Sport~~blorp") //=> false
-   * @deprecated This method returns false some valid IANA names. Use isValidZone instead
+   * @deprecated This method returns false for some valid IANA names. Use isValidZone instead.
    * @return {boolean}
    */
   ;
@@ -29434,15 +29465,20 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
   _proto.offset = function offset(ts) {
     var date = new Date(ts);
     if (isNaN(date)) return NaN;
+    var dtf = makeDTF(this.name);
 
-    var dtf = makeDTF(this.name),
-        _ref2 = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date),
+    var _ref2 = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date),
         year = _ref2[0],
         month = _ref2[1],
         day = _ref2[2],
-        hour = _ref2[3],
-        minute = _ref2[4],
-        second = _ref2[5]; // because we're using hour12 and https://bugs.chromium.org/p/chromium/issues/detail?id=1025564&can=2&q=%2224%3A00%22%20datetimeformat
+        adOrBc = _ref2[3],
+        hour = _ref2[4],
+        minute = _ref2[5],
+        second = _ref2[6];
+
+    if (adOrBc === "BC") {
+      year = -Math.abs(year) + 1;
+    } // because we're using hour12 and https://bugs.chromium.org/p/chromium/issues/detail?id=1025564&can=2&q=%2224%3A00%22%20datetimeformat
 
 
     var adjustedHour = hour === 24 ? 0 : hour;
@@ -31159,6 +31195,7 @@ var Duration = /*#__PURE__*/function () {
    * * `m` for minutes
    * * `h` for hours
    * * `d` for days
+   * * `w` for weeks
    * * `M` for months
    * * `y` for years
    * Notes:
@@ -31185,8 +31222,9 @@ var Duration = /*#__PURE__*/function () {
     return this.isValid ? Formatter.create(this.loc, fmtOpts).formatDurationFromString(this, fmt) : INVALID$2;
   }
   /**
-   * Returns a string representation of a Duration with all units included
-   * To modify its behavior use the `listStyle` and any Intl.NumberFormat option, though `unitDisplay` is especially relevant. See {@link Intl.NumberFormat}.
+   * Returns a string representation of a Duration with all units included.
+   * To modify its behavior use the `listStyle` and any Intl.NumberFormat option, though `unitDisplay` is especially relevant.
+   * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat
    * @param opts - On option object to override the formatting. Accepts the same keys as the options parameter of the native `Int.NumberFormat` constructor, as well as `listStyle`.
    * @example
    * ```js
@@ -33459,7 +33497,13 @@ function unitOutOfRange(unit, value) {
 }
 
 function dayOfWeek(year, month, day) {
-  var js = new Date(Date.UTC(year, month - 1, day)).getUTCDay();
+  var d = new Date(Date.UTC(year, month - 1, day));
+
+  if (year < 100 && year >= 0) {
+    d.setUTCFullYear(d.getUTCFullYear() - 1900);
+  }
+
+  var js = d.getUTCDay();
   return js === 0 ? 7 : js;
 }
 
@@ -33887,9 +33931,6 @@ function normalizeUnit(unit) {
 } // this is a dumbed down version of fromObject() that runs about 60% faster
 // but doesn't do any validation, makes a bunch of assumptions about what units
 // are present, and so on.
-// this is a dumbed down version of fromObject() that runs about 60% faster
-// but doesn't do any validation, makes a bunch of assumptions about what units
-// are present, and so on.
 
 
 function quickDT(obj, opts) {
@@ -34591,7 +34632,7 @@ var DateTime = /*#__PURE__*/function () {
     }
   }
   /**
-   * Check if an object is a DateTime. Works across context boundaries
+   * Check if an object is an instance of DateTime. Works across context boundaries
    * @param {object} o
    * @return {boolean}
    */
@@ -36189,7 +36230,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.3.1";
+var VERSION = "2.3.2";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;