@nmshd/transport 1.0.6 → 1.1.1

package/lib-web/nmshd.transport.js

@@ -15,11 +15,11 @@ exports.buildInformation = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 exports.buildInformation = {
-    version: "1.0.6",
-    build: "9",
-    date: "2021-10-11T06:04:50+00:00",
-    commit: "ee6b38d8aa591a8581846d8e660f75ec5eccdbb4",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.0.1","axios":"^0.22.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.0.2","qs":"^6.10.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.1.1",
+    build: "13",
+    date: "2021-12-16T08:03:23+00:00",
+    commit: "1ae50acab4b20e3bddc97b95c5505feebd54669e",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.1.1","axios":"^0.24.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.2.0","qs":"^6.10.2","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -572,6 +572,19 @@ var DbCollectionName;
 
 /***/ }),
 
+/***/ "./dist/core/DependencyOverrides.js":
+/*!******************************************!*\
+  !*** ./dist/core/DependencyOverrides.js ***!
+  \******************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=DependencyOverrides.js.map
+
+/***/ }),
+
 /***/ "./dist/core/Transport.js":
 /*!********************************!*\
   !*** ./dist/core/Transport.js ***!
@@ -595,30 +608,8 @@ const TransportLoggerFactory_1 = __webpack_require__(/*! ./TransportLoggerFactor
 let log;
 class Transport {
     constructor(databaseConnection, customConfig, loggerFactory = new simple_logger_1.SimpleLoggerFactory()) {
-        this.defaultConfig = {
-            debug: false,
-            platformClientId: "",
-            platformClientSecret: "",
-            platformTimeout: 60000,
-            platformMaxRedirects: 10,
-            platformMaxUnencryptedFileSize: 10 * 1024 * 1024,
-            baseUrl: "",
-            useGateway: true,
-            realm: Identity_1.Realm.Prod,
-            datawalletEnabled: false,
-            httpAgent: {
-                keepAlive: true,
-                maxSockets: 5,
-                maxFreeSockets: 2
-            },
-            httpsAgent: {
-                keepAlive: true,
-                maxSockets: 5,
-                maxFreeSockets: 2
-            }
-        };
         this.databaseConnection = databaseConnection;
-        this._config = lodash_1.default.defaultsDeep({}, customConfig, this.defaultConfig);
+        this._config = lodash_1.default.defaultsDeep({}, customConfig, Transport.defaultConfig);
         TransportLoggerFactory_1.TransportLoggerFactory.init(loggerFactory);
         log = TransportLoggerFactory_1.TransportLoggerFactory.getLogger(Transport);
         if (!this._config.platformClientId) {
@@ -630,6 +621,9 @@ class Transport {
         if (!this._config.baseUrl) {
             throw TransportErrors_1.TransportErrors.general.baseUrlNotSet().logWith(log);
         }
+        if (this._config.supportedDatawalletVersion < 1) {
+            throw TransportErrors_1.TransportErrors.general.invalidDatawalletVersion().logWith(log);
+        }
     }
     get config() {
         return this._config;
@@ -649,6 +643,28 @@ class Transport {
     }
 }
 exports.Transport = Transport;
+Transport.defaultConfig = {
+    supportedDatawalletVersion: 1,
+    debug: false,
+    platformClientId: "",
+    platformClientSecret: "",
+    platformTimeout: 60000,
+    platformMaxRedirects: 10,
+    platformMaxUnencryptedFileSize: 10 * 1024 * 1024,
+    baseUrl: "",
+    realm: Identity_1.Realm.Prod,
+    datawalletEnabled: false,
+    httpAgent: {
+        keepAlive: true,
+        maxSockets: 5,
+        maxFreeSockets: 2
+    },
+    httpsAgent: {
+        keepAlive: true,
+        maxSockets: 5,
+        maxFreeSockets: 2
+    }
+};
 //# sourceMappingURL=Transport.js.map
 
 /***/ }),
@@ -990,6 +1006,15 @@ class Datawallet {
                 throw new Error(`Given type '${type}' is not supported.`);
         }
     }
+    insufficientSupportedDatawalletVersion(supportedVersion, requiredVersion) {
+        return new CoreError_1.CoreError("error.transport.datawallet.insufficientSupportedDatawalletVersion", `The SupportedDatawalletVersion '${supportedVersion}' is too low. A minimum version of '${requiredVersion}' is required.`);
+    }
+    currentBiggerThanTarget(current, target) {
+        return new CoreError_1.CoreError("error.transport.datawallet.currentBiggerThanTarget", `The current datawallet version '${current}' is bigger than the target version '${target}'.`);
+    }
+    noMigrationAvailable(version) {
+        return new CoreError_1.CoreError("error.core.datawallet.noMigrationAvailable", `There is no migration available for the datawallet version '${version}'.`);
+    }
 }
 class Files {
     plaintextHashMismatch() {
@@ -1020,6 +1045,9 @@ class Tokens {
     }
 }
 class General {
+    invalidDatawalletVersion() {
+        return new CoreError_1.CoreError("error.transport.general.invalidDatawalletVersion", "The given identity version is invalid. The value must be 0 or higher.");
+    }
     baseUrlNotSet() {
         return new CoreError_1.CoreError("error.transport.general.baseUrlNotSet", "The baseUrl was not set.");
     }
@@ -1282,7 +1310,6 @@ class BackboneIds {
 exports.BackboneIds = BackboneIds;
 BackboneIds.file = new CoreIdHelper_1.CoreIdHelper("FIL", true);
 BackboneIds.relationship = new CoreIdHelper_1.CoreIdHelper("REL", true);
-BackboneIds.relationshipRequest = new CoreIdHelper_1.CoreIdHelper("RRQ", true);
 BackboneIds.message = new CoreIdHelper_1.CoreIdHelper("MSG", true);
 BackboneIds.relationshipTemplate = new CoreIdHelper_1.CoreIdHelper("RLT", true);
 BackboneIds.token = new CoreIdHelper_1.CoreIdHelper("TOK", true);
@@ -1479,7 +1506,7 @@ class RESTClient {
             }
         };
         if (this.config.platformAdditionalHeaders) {
-            defaults.headers = this.config.platformAdditionalHeaders;
+            defaults.headers = lodash_1.default.defaultsDeep({}, defaults.headers, this.config.platformAdditionalHeaders);
         }
         if (typeof http_1.Agent !== "undefined" && typeof https_1.Agent !== "undefined") {
             defaults.httpAgent = this.createHTTPAgent();
@@ -2060,6 +2087,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./Authenticator */ "./dist/core/backbone/Authenticator.js"), exports);
 __exportStar(__webpack_require__(/*! ./BackboneIds */ "./dist/core/backbone/BackboneIds.js"), exports);
 __exportStar(__webpack_require__(/*! ./ClientResult */ "./dist/core/backbone/ClientResult.js"), exports);
 __exportStar(__webpack_require__(/*! ./Paginator */ "./dist/core/backbone/Paginator.js"), exports);
@@ -2097,6 +2125,7 @@ __exportStar(__webpack_require__(/*! ./CoreSerializable */ "./dist/core/CoreSeri
 __exportStar(__webpack_require__(/*! ./CoreSerializableAsync */ "./dist/core/CoreSerializableAsync.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreSynchronizable */ "./dist/core/CoreSynchronizable.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreUtil */ "./dist/core/CoreUtil.js"), exports);
+__exportStar(__webpack_require__(/*! ./DependencyOverrides */ "./dist/core/DependencyOverrides.js"), exports);
 __exportStar(__webpack_require__(/*! ./Transport */ "./dist/core/Transport.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportContext */ "./dist/core/TransportContext.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportController */ "./dist/core/TransportController.js"), exports);
@@ -2608,11 +2637,11 @@ const Identity_1 = __webpack_require__(/*! ./data/Identity */ "./dist/modules/ac
 const IdentityController_1 = __webpack_require__(/*! ./IdentityController */ "./dist/modules/accounts/IdentityController.js");
 const IdentityUtil_1 = __webpack_require__(/*! ./IdentityUtil */ "./dist/modules/accounts/IdentityUtil.js");
 class AccountController {
-    constructor(_transport, _realm, _db, _config) {
+    constructor(_transport, _db, _config, dependencyOverrides = {}) {
         this._transport = _transport;
-        this._realm = _realm;
         this._db = _db;
         this._config = _config;
+        this.dependencyOverrides = dependencyOverrides;
         this._dbClosed = false;
         this.autoSync = true;
         this._authenticator = new Authenticator_1.Authenticator(this);
@@ -2663,7 +2692,7 @@ class AccountController {
             if (!deviceSharedSecret) {
                 // Identity creation
                 this._log.trace("No account information found. Creating new account...");
-                const result = await this.createIdentityAndDevice(this._realm);
+                const result = await this.createIdentityAndDevice(this.config.realm);
                 identityCreated = true;
                 device = result.device;
                 this.deviceAuthClient = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.authenticator);
@@ -2697,6 +2726,7 @@ class AccountController {
         await this.initControllers();
         if (identityCreated) {
             await this.devices.addExistingDevice(device);
+            await this.synchronization.setInititalDatawalletVersion(this._config.supportedDatawalletVersion);
         }
         else if (deviceUpdated) {
             await this.syncDatawallet();
@@ -2714,7 +2744,6 @@ class AccountController {
     }
     async initControllers() {
         this._log.trace("Initializing controllers...");
-        this.synchronization = await new SyncController_1.SyncController(this, this.unpushedDatawalletModifications, this.config.datawalletEnabled).init();
         this.relationshipSecrets = await new RelationshipSecretController_1.RelationshipSecretController(this).init();
         this.devices = await new DevicesController_1.DevicesController(this).init();
         this.certificates = await new CertificateController_1.CertificateController(this).init();
@@ -2725,6 +2754,7 @@ class AccountController {
         this.relationshipTemplates = await new RelationshipTemplateController_1.RelationshipTemplateController(this, this.relationshipSecrets).init();
         this.messages = await new MessageController_1.MessageController(this).init();
         this.tokens = await new TokenController_1.TokenController(this).init();
+        this.synchronization = await new SyncController_1.SyncController(this, this.dependencyOverrides, this.unpushedDatawalletModifications, this.config.datawalletEnabled).init();
         this._log.trace("Initialization of controllers finished.");
     }
     disableAutoSync() {
@@ -2817,7 +2847,8 @@ class AccountController {
             publicKey: deviceKeypair.publicKey,
             type: deviceInfo.type,
             certificate: "",
-            username: deviceResponse.device.username
+            username: deviceResponse.device.username,
+            datawalletVersion: this._config.supportedDatawalletVersion
         });
         // Initialize required controllers
         await Promise.all([this.identity.init(identity), this.activeDevice.init(privBaseDevice, device)]);
@@ -2903,9 +2934,9 @@ class AccountController {
     async getSynchronizedCollection(collectionName) {
         const collection = await this.db.getCollection(collectionName);
         if (!this.config.datawalletEnabled) {
-            return new SynchronizedCollection_1.SynchronizedCollection(collection);
+            return new SynchronizedCollection_1.SynchronizedCollection(collection, this.config.supportedDatawalletVersion);
         }
-        return new SynchronizedCollection_1.SynchronizedCollection(collection, this.unpushedDatawalletModifications);
+        return new SynchronizedCollection_1.SynchronizedCollection(collection, this.config.supportedDatawalletVersion, this.unpushedDatawalletModifications);
     }
 }
 exports.AccountController = AccountController;
@@ -4445,10 +4476,15 @@ class DeviceController extends core_1.TransportController {
             throw e;
         }
     }
-    async update(name, description) {
-        this.device.name = name;
-        this.device.description = description;
-        await this.parent.info.set("device", this.device);
+    async update(update) {
+        if (update.name)
+            this.device.name = update.name;
+        if (update.description)
+            this.device.description = update.description;
+        if (update.datawalletVersion)
+            this.device.datawalletVersion = update.datawalletVersion;
+        await this.parent.devices.update(this.device);
+        await this.parent.info.set("device", this.device.toJSON());
     }
     async sign(content) {
         const privateKeyContainer = await this.secrets.loadSecret(DeviceSecretController_1.DeviceSecretType.DeviceSignature);
@@ -4886,7 +4922,8 @@ let Device = Device_1 = class Device extends core_1.CoreSynchronizable {
             (0, ts_simple_nameof_1.nameof)((d) => d.createdByDevice),
             (0, ts_simple_nameof_1.nameof)((d) => d.lastLoginAt),
             (0, ts_simple_nameof_1.nameof)((d) => d.username),
-            (0, ts_simple_nameof_1.nameof)((d) => d.initialPassword)
+            (0, ts_simple_nameof_1.nameof)((d) => d.initialPassword),
+            (0, ts_simple_nameof_1.nameof)((d) => d.datawalletVersion)
         ];
         this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((d) => d.name), (0, ts_simple_nameof_1.nameof)((d) => d.description)];
     }
@@ -4954,6 +4991,11 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Boolean)
 ], Device.prototype, "isAdmin", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], Device.prototype, "datawalletVersion", void 0);
 Device = Device_1 = __decorate([
     (0, ts_serval_1.type)("Device")
 ], Device);
@@ -6034,6 +6076,14 @@ __exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/Relati
 __exportStar(__webpack_require__(/*! ./secrets/data/SecretContainerCipher */ "./dist/modules/secrets/data/SecretContainerCipher.js"), exports);
 __exportStar(__webpack_require__(/*! ./secrets/data/SecretContainerPlain */ "./dist/modules/secrets/data/SecretContainerPlain.js"), exports);
 __exportStar(__webpack_require__(/*! ./secrets/SecretController */ "./dist/modules/secrets/SecretController.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/BackboneDatawalletModification */ "./dist/modules/sync/backbone/BackboneDatawalletModification.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/BackboneExternalEvent */ "./dist/modules/sync/backbone/BackboneExternalEvent.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/CreateDatawalletModifications */ "./dist/modules/sync/backbone/CreateDatawalletModifications.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/FinalizeSyncRun */ "./dist/modules/sync/backbone/FinalizeSyncRun.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/GetDatawallet */ "./dist/modules/sync/backbone/GetDatawallet.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/GetDatawalletModifications */ "./dist/modules/sync/backbone/GetDatawalletModifications.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/StartSyncRun */ "./dist/modules/sync/backbone/StartSyncRun.js"), exports);
+__exportStar(__webpack_require__(/*! ./sync/backbone/SyncClient */ "./dist/modules/sync/backbone/SyncClient.js"), exports);
 __exportStar(__webpack_require__(/*! ./sync/ChangedItems */ "./dist/modules/sync/ChangedItems.js"), exports);
 __exportStar(__webpack_require__(/*! ./sync/DatawalletModificationsProcessor */ "./dist/modules/sync/DatawalletModificationsProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./sync/ExternalEventsProcessor */ "./dist/modules/sync/ExternalEventsProcessor.js"), exports);
@@ -7044,7 +7094,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         const templateKey = await this.secrets.createTemplateKey();
         const templateContent = await RelationshipTemplateContent_1.RelationshipTemplateContent.from({
             content: parameters.content,
-            identity: this.parent.identity,
+            identity: this.parent.identity.identity,
             templateKey: templateKey
         });
         const secretKey = await core_1.CoreCrypto.generateSecretKey();
@@ -7068,7 +7118,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
             createdBy: this.parent.identity.address,
             createdByDevice: this.parent.activeDevice.id,
             expiresAt: parameters.expiresAt,
-            identity: this.parent.identity,
+            identity: this.parent.identity.identity,
             maxNumberOfRelationships: (_a = parameters.maxNumberOfRelationships) !== null && _a !== void 0 ? _a : undefined,
             templateKey: templateKey
         });
@@ -9669,7 +9719,7 @@ exports.DatawalletModificationMapper = void 0;
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DatawalletModification_1 = __webpack_require__(/*! ./local/DatawalletModification */ "./dist/modules/sync/local/DatawalletModification.js");
 class DatawalletModificationMapper {
-    static async fromBackboneDatawalletModification(backboneDatawalletModification, decryptedPayload) {
+    static async fromBackboneDatawalletModification(backboneDatawalletModification, decryptedPayload, datawalletVersion) {
         let type;
         switch (backboneDatawalletModification.type) {
             case "Create":
@@ -9710,16 +9760,19 @@ class DatawalletModificationMapper {
             payloadCategory: payloadCategory,
             collection: backboneDatawalletModification.collection,
             type: type,
-            payload: decryptedPayload
+            payload: decryptedPayload,
+            datawalletVersion: datawalletVersion
         });
     }
     static toCreateDatawalletModificationsRequestItem(datawalletModification, encryptedPayload) {
+        var _a;
         return {
             objectIdentifier: datawalletModification.objectIdentifier.toString(),
             payloadCategory: datawalletModification.payloadCategory,
             collection: datawalletModification.collection,
             type: datawalletModification.type,
-            encryptedPayload: encryptedPayload
+            encryptedPayload: encryptedPayload,
+            datawalletVersion: (_a = datawalletModification.datawalletVersion) !== null && _a !== void 0 ? _a : 0
         };
     }
 }
@@ -10034,15 +10087,26 @@ const DatawalletModificationMapper_1 = __webpack_require__(/*! ./DatawalletModif
 const DatawalletModificationsProcessor_1 = __webpack_require__(/*! ./DatawalletModificationsProcessor */ "./dist/modules/sync/DatawalletModificationsProcessor.js");
 const ExternalEventsProcessor_1 = __webpack_require__(/*! ./ExternalEventsProcessor */ "./dist/modules/sync/ExternalEventsProcessor.js");
 const DatawalletModification_1 = __webpack_require__(/*! ./local/DatawalletModification */ "./dist/modules/sync/local/DatawalletModification.js");
+const DeviceMigrations_1 = __webpack_require__(/*! ./migrations/DeviceMigrations */ "./dist/modules/sync/migrations/DeviceMigrations.js");
+const IdentityMigrations_1 = __webpack_require__(/*! ./migrations/IdentityMigrations */ "./dist/modules/sync/migrations/IdentityMigrations.js");
 class SyncController extends core_1.TransportController {
-    constructor(parent, unpushedDatawalletModifications, datawalletEnabled) {
+    constructor(parent, dependencyOverrides, unpushedDatawalletModifications, datawalletEnabled) {
+        var _a;
         super(core_1.ControllerName.Sync, parent);
         this.unpushedDatawalletModifications = unpushedDatawalletModifications;
         this.datawalletEnabled = datawalletEnabled;
+        this.client = (_a = dependencyOverrides.syncClient) !== null && _a !== void 0 ? _a : new SyncClient_1.SyncClient(this.config, this.parent.authenticator);
+        this.identityMigrations = new IdentityMigrations_1.IdentityMigrations(this.parent);
+        this.deviceMigrations = new DeviceMigrations_1.DeviceMigrations(this.parent);
+    }
+    get cacheFetcher() {
+        if (!this._cacheFetcher) {
+            this._cacheFetcher = new DatawalletModificationsProcessor_1.CacheFetcher(this.parent.files, this.parent.messages, this.parent.relationshipTemplates, this.parent.relationships, this.parent.tokens);
+        }
+        return this._cacheFetcher;
     }
     async init() {
         await super.init();
-        this.client = new SyncClient_1.SyncClient(this.config, this.parent.authenticator);
         this.syncInfo = await this.db.getMap("SyncInfo");
         return this;
     }
@@ -10071,33 +10135,120 @@ class SyncController extends core_1.TransportController {
         if (whatToSync === "OnlyDatawallet") {
             return await this.syncDatawallet();
         }
-        const syncRunWasStarted = await this.startSyncRun();
-        if (!syncRunWasStarted) {
-            await this.syncDatawallet();
-            await this.setLastCompletedSyncTime();
-            return new ChangedItems_1.ChangedItems();
-        }
-        await this.applyIncomingDatawalletModifications();
-        const result = await this.applyIncomingExternalEvents();
-        await this.finalizeSyncRun(result.results);
+        const externalEventSyncResult = await this.syncExternalEvents();
         await this.setLastCompletedSyncTime();
-        if (result.results.some((r) => r.errorCode !== undefined)) {
-            throw new core_1.CoreError("error.transport.errorWhileApplyingExternalEvents", result.results
+        if (externalEventSyncResult.externalEventResults.some((r) => r.errorCode !== undefined)) {
+            throw new core_1.CoreError("error.transport.errorWhileApplyingExternalEvents", externalEventSyncResult.externalEventResults
                 .filter((r) => r.errorCode !== undefined)
                 .map((r) => r.errorCode)
                 .join(" | ")).logWith(this.log);
         }
-        return result.changedItems;
+        return externalEventSyncResult.changedItems;
+    }
+    async syncExternalEvents() {
+        const syncRunWasStarted = await this.startExternalEventsSyncRun();
+        if (!syncRunWasStarted) {
+            await this.syncDatawallet();
+            return {
+                changedItems: new ChangedItems_1.ChangedItems(),
+                externalEventResults: []
+            };
+        }
+        await this.applyIncomingDatawalletModifications();
+        const result = await this.applyIncomingExternalEvents();
+        await this.finalizeExternalEventsSyncRun(result.externalEventResults);
+        return result;
     }
     async syncDatawallet() {
         if (!this.datawalletEnabled) {
             return;
         }
+        const identityDatawalletVersion = await this.getIdentityDatawalletVersion();
+        if (this.config.supportedDatawalletVersion < identityDatawalletVersion) {
+            // This means that the datawallet of the identity was upgraded by another device with a higher version.
+            // It is necesssary to update the current device.
+            throw core_1.TransportErrors.datawallet
+                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
+                .logWith(this.log);
+        }
         this.log.trace("Synchronization of Datawallet events started...");
-        await this.applyIncomingDatawalletModifications();
-        await this.pushLocalDatawalletModifications();
-        await this.setLastCompletedDatawalletSyncTime();
+        try {
+            await this.applyIncomingDatawalletModifications();
+            await this.pushLocalDatawalletModifications();
+            await this.setLastCompletedDatawalletSyncTime();
+        }
+        catch (e) {
+            const outdatedErrorCode = "error.platform.validation.datawallet.insufficientSupportedDatawalletVersion";
+            if (!(e instanceof core_1.RequestError) || e.code !== outdatedErrorCode)
+                throw e;
+            throw core_1.TransportErrors.datawallet
+                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
+                .logWith(this.log);
+        }
         this.log.trace("Synchronization of Datawallet events ended...");
+        await this.checkDatawalletVersion(identityDatawalletVersion);
+    }
+    async checkDatawalletVersion(identityDatawalletVersion) {
+        var _a;
+        if (this.config.supportedDatawalletVersion < identityDatawalletVersion) {
+            throw core_1.TransportErrors.datawallet
+                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
+                .logWith(this.log);
+        }
+        if (this.config.supportedDatawalletVersion > identityDatawalletVersion) {
+            await this.upgradeIdentityDatawalletVersion(identityDatawalletVersion, this.config.supportedDatawalletVersion);
+        }
+        const deviceDatawalletVersion = (_a = this.parent.activeDevice.device.datawalletVersion) !== null && _a !== void 0 ? _a : 0;
+        if (deviceDatawalletVersion < identityDatawalletVersion) {
+            await this.upgradeDeviceDatawalletVersion(deviceDatawalletVersion, this.config.supportedDatawalletVersion);
+        }
+    }
+    async upgradeIdentityDatawalletVersion(identityDatawalletVersion, targetDatawalletVersion) {
+        if (identityDatawalletVersion === targetDatawalletVersion)
+            return;
+        if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
+            throw core_1.TransportErrors.datawallet
+                .insufficientSupportedDatawalletVersion(targetDatawalletVersion, identityDatawalletVersion)
+                .logWith(this.log);
+        }
+        if (identityDatawalletVersion > targetDatawalletVersion) {
+            throw core_1.TransportErrors.datawallet
+                .currentBiggerThanTarget(identityDatawalletVersion, targetDatawalletVersion)
+                .logWith(this.log);
+        }
+        while (identityDatawalletVersion < targetDatawalletVersion) {
+            identityDatawalletVersion++;
+            await this.startDatawalletVersionUpgradeSyncRun();
+            const migrationFunction = this.identityMigrations[`v${identityDatawalletVersion}`];
+            if (!migrationFunction) {
+                throw core_1.TransportErrors.datawallet.noMigrationAvailable(identityDatawalletVersion).logWith(this.log);
+            }
+            await migrationFunction.call(this.identityMigrations);
+            await this.finalizeDatawalletVersionUpgradeSyncRun(identityDatawalletVersion);
+        }
+    }
+    async upgradeDeviceDatawalletVersion(deviceDatawalletVersion, targetDatawalletVersion) {
+        if (deviceDatawalletVersion === targetDatawalletVersion)
+            return;
+        if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
+            throw core_1.TransportErrors.datawallet
+                .insufficientSupportedDatawalletVersion(targetDatawalletVersion, deviceDatawalletVersion)
+                .logWith(this.log);
+        }
+        if (deviceDatawalletVersion > targetDatawalletVersion) {
+            throw core_1.TransportErrors.datawallet
+                .currentBiggerThanTarget(deviceDatawalletVersion, targetDatawalletVersion)
+                .logWith(this.log);
+        }
+        while (deviceDatawalletVersion < targetDatawalletVersion) {
+            deviceDatawalletVersion++;
+            const migrationFunction = this.deviceMigrations[`v${deviceDatawalletVersion}`];
+            if (!migrationFunction) {
+                throw core_1.TransportErrors.datawallet.noMigrationAvailable(deviceDatawalletVersion).logWith(this.log);
+            }
+            await migrationFunction.call(this.deviceMigrations);
+            await this.parent.activeDevice.update({ datawalletVersion: deviceDatawalletVersion });
+        }
     }
     async applyIncomingDatawalletModifications() {
         const getDatawalletModificationsResult = await this.client.getDatawalletModifications({
@@ -10109,7 +10260,7 @@ class SyncController extends core_1.TransportController {
         }
         const incomingModifications = await this.decryptDatawalletModifications(encryptedIncomingModifications);
         this.log.trace(`${incomingModifications.length} incoming modifications found`);
-        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(incomingModifications, new DatawalletModificationsProcessor_1.CacheFetcher(this.parent.files, this.parent.messages, this.parent.relationshipTemplates, this.parent.relationships, this.parent.tokens), this._db, core_1.TransportLoggerFactory.getLogger(DatawalletModificationsProcessor_1.DatawalletModificationsProcessor));
+        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(incomingModifications, this.cacheFetcher, this._db, core_1.TransportLoggerFactory.getLogger(DatawalletModificationsProcessor_1.DatawalletModificationsProcessor));
         await datawalletModificationsProcessor.execute();
         this.log.trace(`${incomingModifications.length} incoming modifications executed`, incomingModifications);
         await this.updateLocalDatawalletModificationIndex(encryptedIncomingModifications.sort(descending)[0].index);
@@ -10118,7 +10269,7 @@ class SyncController extends core_1.TransportController {
         const decryptedModifications = [];
         for (const encryptedModification of encryptedModifications) {
             const decryptedPayload = await this.parent.activeDevice.secrets.decryptDatawalletModificationPayload(encryptedModification.encryptedPayload, encryptedModification.index);
-            const decryptedModification = await DatawalletModificationMapper_1.DatawalletModificationMapper.fromBackboneDatawalletModification(encryptedModification, decryptedPayload);
+            const decryptedModification = await DatawalletModificationMapper_1.DatawalletModificationMapper.fromBackboneDatawalletModification(encryptedModification, decryptedPayload, this.config.supportedDatawalletVersion);
             decryptedModifications.push(decryptedModification);
         }
         return decryptedModifications;
@@ -10157,15 +10308,29 @@ class SyncController extends core_1.TransportController {
             await this.unpushedDatawalletModifications.delete({ localId: localModificationId.toString() });
         }
     }
-    async startSyncRun() {
+    async setInititalDatawalletVersion(version) {
+        await this.startDatawalletVersionUpgradeSyncRun();
+        await this.finalizeDatawalletVersionUpgradeSyncRun(version);
+    }
+    async getIdentityDatawalletVersion() {
+        const datawalletInfo = (await this.client.getDatawallet()).value;
+        return datawalletInfo.version;
+    }
+    async startExternalEventsSyncRun() {
         var _a;
-        const result = await this.client.startSyncRun();
+        const result = await this.client.startSyncRun({ type: StartSyncRun_1.SyncRunType.ExternalEventSync });
         if (result.value.status === StartSyncRun_1.StartSyncRunStatus.NoNewEvents) {
             return false;
         }
         this.currentSyncRun = (_a = result.value.syncRun) !== null && _a !== void 0 ? _a : undefined;
         return this.currentSyncRun !== undefined;
     }
+    async startDatawalletVersionUpgradeSyncRun() {
+        var _a;
+        const result = await this.client.startSyncRun({ type: StartSyncRun_1.SyncRunType.DatawalletVersionUpgrade });
+        this.currentSyncRun = (_a = result.value.syncRun) !== null && _a !== void 0 ? _a : undefined;
+        return this.currentSyncRun !== undefined;
+    }
     async applyIncomingExternalEvents() {
         const getExternalEventsResult = await this.client.getExternalEventsOfSyncRun(this.currentSyncRun.id.toString());
         if (getExternalEventsResult.isError) {
@@ -10174,14 +10339,17 @@ class SyncController extends core_1.TransportController {
         const externalEvents = await getExternalEventsResult.value.collect();
         const externalEventProcessor = new ExternalEventsProcessor_1.ExternalEventsProcessor(this.parent.messages, this.parent.relationships, externalEvents);
         await externalEventProcessor.execute();
-        return { results: externalEventProcessor.results, changedItems: externalEventProcessor.changedItems };
+        return {
+            externalEventResults: externalEventProcessor.results,
+            changedItems: externalEventProcessor.changedItems
+        };
     }
-    async finalizeSyncRun(externalEventResults) {
+    async finalizeExternalEventsSyncRun(externalEventResults) {
         if (!this.currentSyncRun) {
             throw new Error("There is no active sync run to finalize");
         }
         const { backboneModifications, localModificationIds } = await this.prepareLocalDatawalletModificationsForPush();
-        await this.client.finalizeSyncRun(this.currentSyncRun.id.toString(), {
+        await this.client.finalizeExternalEventSync(this.currentSyncRun.id.toString(), {
             datawalletModifications: backboneModifications,
             externalEventResults: externalEventResults
         });
@@ -10191,6 +10359,21 @@ class SyncController extends core_1.TransportController {
         await this.updateLocalDatawalletModificationIndex(newDatawalletModificationIndex);
         this.currentSyncRun = undefined;
     }
+    async finalizeDatawalletVersionUpgradeSyncRun(newDatawalletVersion) {
+        if (!this.currentSyncRun) {
+            throw new Error("There is no active sync run to finalize");
+        }
+        const { backboneModifications, localModificationIds } = await this.prepareLocalDatawalletModificationsForPush();
+        await this.client.finalizeDatawalletVersionUpgrade(this.currentSyncRun.id.toString(), {
+            newDatawalletVersion,
+            datawalletModifications: backboneModifications
+        });
+        await this.deleteUnpushedDatawalletModifications(localModificationIds);
+        const oldDatawalletModificationIndex = await this.getLocalDatawalletModificationIndex();
+        const newDatawalletModificationIndex = (oldDatawalletModificationIndex || -1) + backboneModifications.length;
+        await this.updateLocalDatawalletModificationIndex(newDatawalletModificationIndex);
+        this.currentSyncRun = undefined;
+    }
     async getLocalDatawalletModificationIndex() {
         const index = await this.syncInfo.get("localDatawalletModificationIndex");
         return index;
@@ -10260,8 +10443,9 @@ const CoreSerializableAsync_1 = __webpack_require__(/*! ../../core/CoreSerializa
 const TransportIds_1 = __webpack_require__(/*! ../../core/TransportIds */ "./dist/core/TransportIds.js");
 const DatawalletModification_1 = __webpack_require__(/*! ../sync/local/DatawalletModification */ "./dist/modules/sync/local/DatawalletModification.js");
 class SynchronizedCollection {
-    constructor(parent, datawalletModifications) {
+    constructor(parent, datawalletVersion, datawalletModifications) {
         this.parent = parent;
+        this.datawalletVersion = datawalletVersion;
         this.datawalletModifications = datawalletModifications;
         this.name = parent.name;
         this.databaseType = parent.databaseType;
@@ -10282,7 +10466,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.TechnicalData,
-                payload: technicalModificationPayload
+                payload: technicalModificationPayload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (Object.getOwnPropertyNames(metadataModificationPayload).length !== 0) {
@@ -10292,7 +10477,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Metadata,
-                payload: metadataModificationPayload
+                payload: metadataModificationPayload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (Object.getOwnPropertyNames(userdataModificationPayload).length !== 0) {
@@ -10302,7 +10488,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Userdata,
-                payload: userdataModificationPayload
+                payload: userdataModificationPayload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         await this.parent.create(newObject);
@@ -10336,7 +10523,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.TechnicalData,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (haveMetadataPropertiesChanged) {
@@ -10347,7 +10535,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Metadata,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (haveUserdataPropertiesChanged) {
@@ -10358,7 +10547,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Userdata,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (hasCacheChanged) {
@@ -10366,7 +10556,8 @@ class SynchronizedCollection {
                 localId: await TransportIds_1.TransportIds.datawalletModification.generate(),
                 type: DatawalletModification_1.DatawalletModificationType.CacheChanged,
                 collection: this.name,
-                objectIdentifier: objectIdentifier
+                objectIdentifier: objectIdentifier,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         return await this.parent.update(oldDoc, newObject);
@@ -10379,7 +10570,8 @@ class SynchronizedCollection {
             localId: await TransportIds_1.TransportIds.datawalletModification.generate(),
             type: DatawalletModification_1.DatawalletModificationType.Delete,
             collection: this.name,
-            objectIdentifier: object.id
+            objectIdentifier: object.id,
+            datawalletVersion: this.datawalletVersion
         }));
         return await this.parent.delete({ id: object.id.toString() });
     }
@@ -10404,6 +10596,84 @@ exports.SynchronizedCollection = SynchronizedCollection;
 
 /***/ }),
 
+/***/ "./dist/modules/sync/backbone/BackboneDatawalletModification.js":
+/*!**********************************************************************!*\
+  !*** ./dist/modules/sync/backbone/BackboneDatawalletModification.js ***!
+  \**********************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=BackboneDatawalletModification.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/backbone/BackboneExternalEvent.js":
+/*!*************************************************************!*\
+  !*** ./dist/modules/sync/backbone/BackboneExternalEvent.js ***!
+  \*************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=BackboneExternalEvent.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/backbone/CreateDatawalletModifications.js":
+/*!*********************************************************************!*\
+  !*** ./dist/modules/sync/backbone/CreateDatawalletModifications.js ***!
+  \*********************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=CreateDatawalletModifications.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/backbone/FinalizeSyncRun.js":
+/*!*******************************************************!*\
+  !*** ./dist/modules/sync/backbone/FinalizeSyncRun.js ***!
+  \*******************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=FinalizeSyncRun.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/backbone/GetDatawallet.js":
+/*!*****************************************************!*\
+  !*** ./dist/modules/sync/backbone/GetDatawallet.js ***!
+  \*****************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=GetDatawallet.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/backbone/GetDatawalletModifications.js":
+/*!******************************************************************!*\
+  !*** ./dist/modules/sync/backbone/GetDatawalletModifications.js ***!
+  \******************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=GetDatawalletModifications.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/sync/backbone/StartSyncRun.js":
 /*!****************************************************!*\
   !*** ./dist/modules/sync/backbone/StartSyncRun.js ***!
@@ -10413,7 +10683,12 @@ exports.SynchronizedCollection = SynchronizedCollection;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.StartSyncRunStatus = void 0;
+exports.StartSyncRunStatus = exports.SyncRunType = void 0;
+var SyncRunType;
+(function (SyncRunType) {
+    SyncRunType["ExternalEventSync"] = "ExternalEventSync";
+    SyncRunType["DatawalletVersionUpgrade"] = "DatawalletVersionUpgrade";
+})(SyncRunType = exports.SyncRunType || (exports.SyncRunType = {}));
 var StartSyncRunStatus;
 (function (StartSyncRunStatus) {
     StartSyncRunStatus["Created"] = "Created";
@@ -10435,20 +10710,33 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SyncClient = void 0;
 const core_1 = __webpack_require__(/*! ../../../core */ "./dist/core/index.js");
 class SyncClient extends core_1.RESTClientAuthenticate {
-    async startSyncRun() {
-        return await this.post("/api/v1/SyncRuns", {});
+    constructor(config, authenticator) {
+        super(config, authenticator, {
+            headers: {
+                "x-supported-datawallet-version": config.supportedDatawalletVersion.toString()
+            }
+        });
     }
-    async finalizeSyncRun(id, request) {
-        return await this.put(`/api/v1/SyncRuns/${id}/Finalize`, request);
+    async startSyncRun(request) {
+        return await this.post("/api/v1/SyncRuns", request);
+    }
+    async finalizeExternalEventSync(id, request) {
+        return await this.put(`/api/v1/SyncRuns/${id}/FinalizeExternalEventSync`, request);
+    }
+    async finalizeDatawalletVersionUpgrade(id, request) {
+        return await this.put(`/api/v1/SyncRuns/${id}/FinalizeDatawalletVersionUpgrade`, request);
     }
     async getExternalEventsOfSyncRun(syncRunId) {
         return await this.getPaged(`/api/v1/SyncRuns/${syncRunId}/ExternalEvents`, {});
     }
+    async getDatawallet() {
+        return await this.get("/api/v1/Datawallet");
+    }
     async getDatawalletModifications(request) {
-        return await this.getPaged("/api/v1/DatawalletModifications", request);
+        return await this.getPaged("/api/v1/Datawallet/Modifications", request);
     }
     async createDatawalletModifications(request) {
-        return await this.post("/api/v1/DatawalletModifications", request);
+        return await this.post("/api/v1/Datawallet/Modifications", request);
     }
 }
 exports.SyncClient = SyncClient;
@@ -10529,6 +10817,11 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Object)
 ], DatawalletModification.prototype, "payload", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], DatawalletModification.prototype, "datawalletVersion", void 0);
 DatawalletModification = DatawalletModification_1 = __decorate([
     (0, ts_serval_1.type)("DatawalletModification")
 ], DatawalletModification);
@@ -10537,6 +10830,64 @@ exports.DatawalletModification = DatawalletModification;
 
 /***/ }),
 
+/***/ "./dist/modules/sync/migrations/DeviceMigrations.js":
+/*!**********************************************************!*\
+  !*** ./dist/modules/sync/migrations/DeviceMigrations.js ***!
+  \**********************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DeviceMigrations = void 0;
+class DeviceMigrations {
+    constructor(accountController) {
+        this.accountController = accountController;
+    }
+    async v1() {
+        const query = { cache: { $exists: false } };
+        const synchronizableToId = (c) => c.id.toString();
+        const files = await this.accountController.files.getFiles(query);
+        await this.accountController.files.updateCache(files.map(synchronizableToId));
+        const messages = await this.accountController.messages.getMessages(query);
+        await this.accountController.messages.updateCache(messages.map(synchronizableToId));
+        const relationships = await this.accountController.relationships.getRelationships(query);
+        await this.accountController.relationships.updateCache(relationships.map(synchronizableToId));
+        const templates = await this.accountController.relationshipTemplates.getRelationshipTemplates(query);
+        await this.accountController.relationshipTemplates.updateCache(templates.map(synchronizableToId));
+        const tokens = await this.accountController.tokens.getTokens(query);
+        await this.accountController.tokens.updateCache(tokens.map(synchronizableToId));
+    }
+}
+exports.DeviceMigrations = DeviceMigrations;
+//# sourceMappingURL=DeviceMigrations.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/sync/migrations/IdentityMigrations.js":
+/*!************************************************************!*\
+  !*** ./dist/modules/sync/migrations/IdentityMigrations.js ***!
+  \************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.IdentityMigrations = void 0;
+class IdentityMigrations {
+    constructor(accountController) {
+        this.accountController = accountController;
+    }
+    v1() {
+        // no upgrade steps necessary for v1
+        return Promise.resolve();
+    }
+}
+exports.IdentityMigrations = IdentityMigrations;
+//# sourceMappingURL=IdentityMigrations.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/tokens/AnonymousTokenController.js":
 /*!*********************************************************!*\
   !*** ./dist/modules/tokens/AnonymousTokenController.js ***!
@@ -11748,95 +12099,33 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /*!******************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js ***!
   \******************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.EventBus = void 0;
-__webpack_require__(/*! reflect-metadata */ "./node_modules/reflect-metadata/Reflect.js");
-const eventemitter2_1 = __webpack_require__(/*! eventemitter2 */ "./node_modules/eventemitter2/lib/eventemitter2.js");
-const Reflection_1 = __webpack_require__(/*! ./reflection/Reflection */ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Reflection.js");
-const SubscriptionTargetInfo_1 = __webpack_require__(/*! ./SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
+exports.getEventNamespaceFromObject = exports.EventBus = void 0;
 class EventBus {
-    emitter;
-    constructor() {
-        this.emitter = new eventemitter2_1.EventEmitter2({ wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
-    }
-    subscribe(subscriptionTarget, handler) {
-        this.registerHandler(subscriptionTarget, handler);
-    }
-    subscribeOnce(subscriptionTarget, handler) {
-        this.registerHandler(subscriptionTarget, handler, true);
-    }
-    registerHandler(subscriptionTarget, handler, isOneTimeHandler = false) {
-        const subscriptionTargetInfo = SubscriptionTargetInfo_1.SubscriptionTargetInfo.from(subscriptionTarget);
-        const handlerWrapper = (event) => {
-            if (!subscriptionTargetInfo.isCompatibleWith(event)) {
-                return;
-            }
-            handler(event);
-            if (isOneTimeHandler) {
-                this.emitter.off(subscriptionTargetInfo.namespace, handlerWrapper);
-            }
-        };
-        this.emitter.on(subscriptionTargetInfo.namespace, handlerWrapper);
-    }
-    async publish(event) {
-        let namespace = getEventNamespaceFromObject(event);
-        if (!namespace) {
-            throw Error("The event needs a namespace. Use the EventNamespaceDecorator in order to define a namespace for a event.");
-        }
-        this.emitter.emit(namespace, event);
-    }
 }
 exports.EventBus = EventBus;
 function getEventNamespaceFromObject(targetObject) {
-    var namespaceDecorator = (0, Reflection_1.getCustomClassDecoratorValue)("namespace", targetObject.constructor);
-    if (!namespaceDecorator) {
-        throw new Error("Event Type is not defined");
-    }
-    return namespaceDecorator;
+    return targetObject.namespace;
 }
+exports.getEventNamespaceFromObject = getEventNamespaceFromObject;
 //# sourceMappingURL=EventBus.js.map
 
 /***/ }),
 
-/***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventNamespaceDecorator.js":
-/*!*********************************************************************************!*\
-  !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/EventNamespaceDecorator.js ***!
-  \*********************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.EventNamespace = void 0;
-const Constants_1 = __webpack_require__(/*! ./reflection/Constants */ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Constants.js");
-function EventNamespace(name) {
-    return (target) => {
-        if (!name) {
-            name = target.name;
-        }
-        Reflect.defineMetadata(`${Constants_1.CUSTOM_METADATA_NAMESPACE}:namespace`, name, target);
-    };
-}
-exports.EventNamespace = EventNamespace;
-//# sourceMappingURL=EventNamespaceDecorator.js.map
-
-/***/ }),
-
 /***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js":
 /*!********************************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js ***!
   \********************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SubscriptionTargetInfo = void 0;
-const Reflection_1 = __webpack_require__(/*! ./reflection/Reflection */ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Reflection.js");
 class SubscriptionTargetInfo {
     namespace;
     constructor(namespace) {
@@ -11846,9 +12135,7 @@ class SubscriptionTargetInfo {
         if (target instanceof Function) {
             return new ConstructorSubscriptionTargetInfo(target);
         }
-        else {
-            return new NamespaceSubscriptionTargetInfo(target);
-        }
+        return new NamespaceSubscriptionTargetInfo(target);
     }
 }
 exports.SubscriptionTargetInfo = SubscriptionTargetInfo;
@@ -11866,21 +12153,86 @@ class NamespaceSubscriptionTargetInfo extends SubscriptionTargetInfo {
     constructor(namespace) {
         super(namespace);
     }
-    isCompatibleWith(event) {
+    isCompatibleWith(_event) {
         return true;
     }
 }
 function getEventNamespaceFromClass(targetClass) {
-    var namespaceDecorator = (0, Reflection_1.getCustomClassDecoratorValue)("namespace", targetClass);
-    if (!namespaceDecorator) {
-        throw new Error("Event Type is not defined");
-    }
-    return namespaceDecorator;
+    return targetClass.namespace;
 }
 //# sourceMappingURL=SubscriptionTargetInfo.js.map
 
 /***/ }),
 
+/***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/eventEmitter2/EventEmitter2EventBus.js":
+/*!*********************************************************************************************!*\
+  !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/eventEmitter2/EventEmitter2EventBus.js ***!
+  \*********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.EventEmitter2EventBus = void 0;
+const eventemitter2_1 = __webpack_require__(/*! eventemitter2 */ "./node_modules/eventemitter2/lib/eventemitter2.js");
+__webpack_require__(/*! reflect-metadata */ "./node_modules/reflect-metadata/Reflect.js");
+const EventBus_1 = __webpack_require__(/*! ../EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js");
+const SubscriptionTargetInfo_1 = __webpack_require__(/*! ../SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
+class EventEmitter2EventBus {
+    emitter;
+    wrappers = new Map();
+    nextId = 0;
+    constructor() {
+        this.emitter = new eventemitter2_1.EventEmitter2({ wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
+    }
+    subscribe(subscriptionTarget, handler) {
+        return this.registerHandler(subscriptionTarget, handler);
+    }
+    subscribeOnce(subscriptionTarget, handler) {
+        return this.registerHandler(subscriptionTarget, handler, true);
+    }
+    unsubscribe(subscriptionTarget, subscriptionId) {
+        return this.unregisterHandler(subscriptionTarget, subscriptionId);
+    }
+    registerHandler(subscriptionTarget, handler, isOneTimeHandler = false) {
+        const subscriptionTargetInfo = SubscriptionTargetInfo_1.SubscriptionTargetInfo.from(subscriptionTarget);
+        const handlerId = this.nextId++;
+        const handlerWrapper = (event) => {
+            if (!subscriptionTargetInfo.isCompatibleWith(event)) {
+                return;
+            }
+            handler(event);
+            if (isOneTimeHandler) {
+                this.unsubscribe(subscriptionTarget, handlerId);
+            }
+        };
+        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) {
+            return false;
+        }
+        this.emitter.off(subscriptionTargetInfo.namespace, handlerWrapper);
+        this.wrappers.delete(handlerId);
+        return true;
+    }
+    publish(event) {
+        const namespace = (0, EventBus_1.getEventNamespaceFromObject)(event);
+        if (!namespace) {
+            throw Error("The event needs a namespace. Use the EventNamespace-decorator in order to define a namespace for a event.");
+        }
+        this.emitter.emit(namespace, event);
+    }
+}
+exports.EventEmitter2EventBus = EventEmitter2EventBus;
+//# sourceMappingURL=EventEmitter2EventBus.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/index.js":
 /*!***************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/index.js ***!
@@ -11901,52 +12253,77 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js"), exports);
-__exportStar(__webpack_require__(/*! ./EventNamespaceDecorator */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventNamespaceDecorator.js"), exports);
+__exportStar(__webpack_require__(/*! ./eventEmitter2/EventEmitter2EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/eventEmitter2/EventEmitter2EventBus.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
 
-/***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Constants.js":
-/*!******************************************************************************!*\
-  !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Constants.js ***!
-  \******************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ "./node_modules/@js-soft/ts-utils/dist/events/DataEvent.js":
+/*!*****************************************************************!*\
+  !*** ./node_modules/@js-soft/ts-utils/dist/events/DataEvent.js ***!
+  \*****************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CUSTOM_METADATA_NAMESPACE = void 0;
-exports.CUSTOM_METADATA_NAMESPACE = "custom:annotations";
-//# sourceMappingURL=Constants.js.map
+exports.DataEvent = void 0;
+const Event_1 = __webpack_require__(/*! ./Event */ "./node_modules/@js-soft/ts-utils/dist/events/Event.js");
+class DataEvent extends Event_1.Event {
+    data;
+    constructor(namespace, data) {
+        super(namespace);
+        this.data = data;
+    }
+}
+exports.DataEvent = DataEvent;
+//# sourceMappingURL=DataEvent.js.map
 
 /***/ }),
 
-/***/ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Reflection.js":
-/*!*******************************************************************************!*\
-  !*** ./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Reflection.js ***!
-  \*******************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ "./node_modules/@js-soft/ts-utils/dist/events/Event.js":
+/*!*************************************************************!*\
+  !*** ./node_modules/@js-soft/ts-utils/dist/events/Event.js ***!
+  \*************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCustomClassDecorators = exports.getCustomClassDecoratorValue = void 0;
-const Constants_1 = __webpack_require__(/*! ./Constants */ "./node_modules/@js-soft/ts-utils/dist/eventBus/reflection/Constants.js");
-function getCustomClassDecoratorValue(decoratorKey, targetClass) {
-    var decorators = getCustomClassDecorators(targetClass);
-    var decorator = decorators.find(d => d.key.endsWith(decoratorKey));
-    return decorator ? decorator.value : undefined;
-}
-exports.getCustomClassDecoratorValue = getCustomClassDecoratorValue;
-function getCustomClassDecorators(targetClass) {
-    const keys = Reflect.getMetadataKeys(targetClass);
-    let decorators = keys
-        .filter(key => key.toString().startsWith(Constants_1.CUSTOM_METADATA_NAMESPACE))
-        .map(key => { return { key: key, value: Reflect.getMetadata(key, targetClass) }; });
-    return decorators;
+exports.Event = void 0;
+class Event {
+    namespace;
+    constructor(namespace) {
+        this.namespace = namespace;
+    }
 }
-exports.getCustomClassDecorators = getCustomClassDecorators;
-//# sourceMappingURL=Reflection.js.map
+exports.Event = Event;
+//# sourceMappingURL=Event.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@js-soft/ts-utils/dist/events/index.js":
+/*!*************************************************************!*\
+  !*** ./node_modules/@js-soft/ts-utils/dist/events/index.js ***!
+  \*************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./DataEvent */ "./node_modules/@js-soft/ts-utils/dist/events/DataEvent.js"), exports);
+__exportStar(__webpack_require__(/*! ./Event */ "./node_modules/@js-soft/ts-utils/dist/events/Event.js"), exports);
+//# sourceMappingURL=index.js.map
 
 /***/ }),
 
@@ -11970,11 +12347,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./eventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/index.js"), exports);
-__exportStar(__webpack_require__(/*! ./result */ "./node_modules/@js-soft/ts-utils/dist/result/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./events */ "./node_modules/@js-soft/ts-utils/dist/events/index.js"), exports);
 __exportStar(__webpack_require__(/*! ./logDecorator */ "./node_modules/@js-soft/ts-utils/dist/logDecorator.js"), exports);
 __exportStar(__webpack_require__(/*! ./measureExcecutionTime */ "./node_modules/@js-soft/ts-utils/dist/measureExcecutionTime.js"), exports);
 __exportStar(__webpack_require__(/*! ./randomString */ "./node_modules/@js-soft/ts-utils/dist/randomString.js"), exports);
 __exportStar(__webpack_require__(/*! ./Range */ "./node_modules/@js-soft/ts-utils/dist/Range.js"), exports);
+__exportStar(__webpack_require__(/*! ./result */ "./node_modules/@js-soft/ts-utils/dist/result/index.js"), exports);
 __exportStar(__webpack_require__(/*! ./sleep */ "./node_modules/@js-soft/ts-utils/dist/sleep.js"), exports);
 //# sourceMappingURL=index.js.map
 
@@ -11990,10 +12368,11 @@ __exportStar(__webpack_require__(/*! ./sleep */ "./node_modules/@js-soft/ts-util
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.log = void 0;
-function log(target, propertyName, propertyDesciptor) {
+/* eslint-disable no-console */
+function log(_target, propertyName, propertyDesciptor) {
     const method = propertyDesciptor.value;
     propertyDesciptor.value = function (...args) {
-        const params = args.map(a => JSON.stringify(a)).join();
+        const params = args.map((a) => JSON.stringify(a)).join();
         try {
             const result = method.apply(this, args);
             const r = JSON.stringify(result);
@@ -12008,7 +12387,6 @@ function log(target, propertyName, propertyDesciptor) {
     return propertyDesciptor;
 }
 exports.log = log;
-;
 //# sourceMappingURL=logDecorator.js.map
 
 /***/ }),
@@ -12023,7 +12401,8 @@ exports.log = log;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.measureExcecutionTime = void 0;
-function measureExcecutionTime(target, propertyName, propertyDesciptor) {
+/* eslint-disable no-console */
+function measureExcecutionTime(_target, _propertyName, propertyDesciptor) {
     const method = propertyDesciptor.value;
     propertyDesciptor.value = async function (...args) {
         const t0 = Date.now();
@@ -12035,7 +12414,6 @@ function measureExcecutionTime(target, propertyName, propertyDesciptor) {
     return propertyDesciptor;
 }
 exports.measureExcecutionTime = measureExcecutionTime;
-;
 //# sourceMappingURL=measureExcecutionTime.js.map
 
 /***/ }),
@@ -12053,13 +12431,12 @@ exports.randomString = void 0;
 function randomString(length, characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") {
     let result = "";
     const charactersLength = characters.length;
-    for (var i = 0; i < length; i++) {
+    for (let i = 0; i < length; i++) {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
     }
     return result;
 }
 exports.randomString = randomString;
-;
 //# sourceMappingURL=randomString.js.map
 
 /***/ }),
@@ -12332,7 +12709,7 @@ module.exports = function xhrAdapter(config) {
 
     // Handle timeout
     request.ontimeout = function handleTimeout() {
-      var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
+      var timeoutErrorMessage = config.timeout ? 'timeout of ' + config.timeout + 'ms exceeded' : 'timeout exceeded';
       var transitional = config.transitional || defaults.transitional;
       if (config.timeoutErrorMessage) {
         timeoutErrorMessage = config.timeoutErrorMessage;
@@ -12473,7 +12850,7 @@ axios.Axios = Axios;
 axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js");
 axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/axios/lib/cancel/CancelToken.js");
 axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js");
-axios.VERSION = __webpack_require__(/*! ./env/data */ "./node_modules/axios/lib/env/data.js").version;
+axios.VERSION = (__webpack_require__(/*! ./env/data */ "./node_modules/axios/lib/env/data.js").version);
 
 // Expose all/spread
 axios.all = function all(promises) {
@@ -13435,7 +13812,7 @@ module.exports = defaults;
 /***/ ((module) => {
 
 module.exports = {
-  "version": "0.22.0"
+  "version": "0.24.0"
 };
 
 /***/ }),
@@ -13892,7 +14269,7 @@ module.exports = function spread(callback) {
 "use strict";
 
 
-var VERSION = __webpack_require__(/*! ../env/data */ "./node_modules/axios/lib/env/data.js").version;
+var VERSION = (__webpack_require__(/*! ../env/data */ "./node_modules/axios/lib/env/data.js").version);
 
 var validators = {};
 
@@ -15127,83 +15504,87 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*!
     var listeners= null, branch, xTree, xxTree, isolatedBranch, endReached, currentType = type[i],
         nextType = type[i + 1], branches, _listeners;
 
-    if (i === typeLength && tree._listeners) {
+    if (i === typeLength) {
       //
       // If at the end of the event(s) list and the tree has listeners
       // invoke those listeners.
       //
-      if (typeof tree._listeners === 'function') {
-        handlers && handlers.push(tree._listeners);
-        return [tree];
-      } else {
-        handlers && handlers.push.apply(handlers, tree._listeners);
-        return [tree];
+
+      if(tree._listeners) {
+        if (typeof tree._listeners === 'function') {
+          handlers && handlers.push(tree._listeners);
+          listeners = [tree];
+        } else {
+          handlers && handlers.push.apply(handlers, tree._listeners);
+          listeners = [tree];
+        }
       }
-    }
+    } else {
 
-    if (currentType === '*') {
-      //
-      // If the event emitted is '*' at this part
-      // or there is a concrete match at this patch
-      //
-      branches= ownKeys(tree);
-      n= branches.length;
-      while(n-->0){
-        branch= branches[n];
-        if (branch !== '_listeners') {
-          _listeners = searchListenerTree(handlers, type, tree[branch], i + 1, typeLength);
-          if(_listeners){
-            if(listeners){
-              listeners.push.apply(listeners, _listeners);
-            }else{
-              listeners = _listeners;
+      if (currentType === '*') {
+        //
+        // If the event emitted is '*' at this part
+        // or there is a concrete match at this patch
+        //
+        branches = ownKeys(tree);
+        n = branches.length;
+        while (n-- > 0) {
+          branch = branches[n];
+          if (branch !== '_listeners') {
+            _listeners = searchListenerTree(handlers, type, tree[branch], i + 1, typeLength);
+            if (_listeners) {
+              if (listeners) {
+                listeners.push.apply(listeners, _listeners);
+              } else {
+                listeners = _listeners;
+              }
             }
           }
         }
-      }
-      return listeners;
-    } else if (currentType === '**') {
-      endReached = (i + 1 === typeLength || (i + 2 === typeLength && nextType === '*'));
-      if (endReached && tree._listeners) {
-        // The next element has a _listeners, add it to the handlers.
-        listeners = searchListenerTree(handlers, type, tree, typeLength, typeLength);
-      }
-
-      branches= ownKeys(tree);
-      n= branches.length;
-      while(n-->0){
-        branch= branches[n];
-        if (branch !== '_listeners') {
-          if (branch === '*' || branch === '**') {
-            if (tree[branch]._listeners && !endReached) {
-              _listeners = searchListenerTree(handlers, type, tree[branch], typeLength, typeLength);
-              if(_listeners){
-                if(listeners){
-                  listeners.push.apply(listeners, _listeners);
-                }else{
-                  listeners = _listeners;
+        return listeners;
+      } else if (currentType === '**') {
+        endReached = (i + 1 === typeLength || (i + 2 === typeLength && nextType === '*'));
+        if (endReached && tree._listeners) {
+          // The next element has a _listeners, add it to the handlers.
+          listeners = searchListenerTree(handlers, type, tree, typeLength, typeLength);
+        }
+
+        branches = ownKeys(tree);
+        n = branches.length;
+        while (n-- > 0) {
+          branch = branches[n];
+          if (branch !== '_listeners') {
+            if (branch === '*' || branch === '**') {
+              if (tree[branch]._listeners && !endReached) {
+                _listeners = searchListenerTree(handlers, type, tree[branch], typeLength, typeLength);
+                if (_listeners) {
+                  if (listeners) {
+                    listeners.push.apply(listeners, _listeners);
+                  } else {
+                    listeners = _listeners;
+                  }
                 }
               }
+              _listeners = searchListenerTree(handlers, type, tree[branch], i, typeLength);
+            } else if (branch === nextType) {
+              _listeners = searchListenerTree(handlers, type, tree[branch], i + 2, typeLength);
+            } else {
+              // No match on this one, shift into the tree but not in the type array.
+              _listeners = searchListenerTree(handlers, type, tree[branch], i, typeLength);
             }
-            _listeners = searchListenerTree(handlers, type, tree[branch], i, typeLength);
-          } else if (branch === nextType) {
-            _listeners = searchListenerTree(handlers, type, tree[branch], i + 2, typeLength);
-          } else {
-            // No match on this one, shift into the tree but not in the type array.
-            _listeners = searchListenerTree(handlers, type, tree[branch], i, typeLength);
-          }
-          if(_listeners){
-            if(listeners){
-              listeners.push.apply(listeners, _listeners);
-            }else{
-              listeners = _listeners;
+            if (_listeners) {
+              if (listeners) {
+                listeners.push.apply(listeners, _listeners);
+              } else {
+                listeners = _listeners;
+              }
             }
           }
         }
+        return listeners;
+      } else if (tree[currentType]) {
+        listeners = searchListenerTree(handlers, type, tree[currentType], i + 1, typeLength);
       }
-      return listeners;
-    }else if (tree[currentType]) {
-      listeners= searchListenerTree(handlers, type, tree[currentType], i + 1, typeLength);
     }
 
       xTree = tree['*'];
@@ -34588,6 +34969,13 @@ function parseInteger(string) {
     return parseInt(string, 10);
   }
 }
+function parseFloating(string) {
+  if (isUndefined(string) || string === null || string === "") {
+    return undefined;
+  } else {
+    return parseFloat(string);
+  }
+}
 function parseMillis(fraction) {
   // Return undefined (instead of 0) in these cases, where fraction is not set
   if (isUndefined(fraction) || fraction === null || fraction === "") {
@@ -34727,7 +35115,7 @@ function formatOffset(offset, format) {
 function timeObject(obj) {
   return pick(obj, ["hour", "minute", "second", "millisecond"]);
 }
-var ianaRegex = /[A-Za-z_+-]{1,256}(:?\/[A-Za-z_+-]{1,256}(\/[A-Za-z_+-]{1,256})?)?/;
+var ianaRegex = /[A-Za-z_+-]{1,256}(:?\/[A-Za-z0-9_+-]{1,256}(\/[A-Za-z0-9_+-]{1,256})?)?/;
 
 /**
  * @private
@@ -35090,6 +35478,13 @@ var Formatter = /*#__PURE__*/function () {
 
         case "ss":
           return _this.num(dt.second, 2);
+        // fractional seconds
+
+        case "uu":
+          return _this.num(Math.floor(dt.millisecond / 10), 2);
+
+        case "uuu":
+          return _this.num(Math.floor(dt.millisecond / 100));
         // minutes
 
         case "m":
@@ -35605,7 +36000,7 @@ var dtfCache = {};
 function makeDTF(zone) {
   if (!dtfCache[zone]) {
     dtfCache[zone] = new Intl.DateTimeFormat("en-US", {
-      hourCycle: "h23",
+      hour12: false,
       timeZone: zone,
       year: "numeric",
       month: "2-digit",
@@ -35712,6 +36107,10 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
   ;
 
   IANAZone.isValidZone = function isValidZone(zone) {
+    if (!zone) {
+      return false;
+    }
+
     try {
       new Intl.DateTimeFormat("en-US", {
         timeZone: zone
@@ -35720,21 +36119,6 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
     } catch (e) {
       return false;
     }
-  } // Etc/GMT+8 -> -480
-
-  /** @ignore */
-  ;
-
-  IANAZone.parseGMTOffset = function parseGMTOffset(specifier) {
-    if (specifier) {
-      var match = specifier.match(/^Etc\/GMT(0|[+-]\d{1,2})$/i);
-
-      if (match) {
-        return -60 * parseInt(match[1]);
-      }
-    }
-
-    return null;
   };
 
   function IANAZone(name) {
@@ -35780,13 +36164,15 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
         day = _ref2[2],
         hour = _ref2[3],
         minute = _ref2[4],
-        second = _ref2[5];
+        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
+
 
+    var adjustedHour = hour === 24 ? 0 : hour;
     var asUTC = objToLocalTS({
       year: year,
       month: month,
       day: day,
-      hour: hour,
+      hour: adjustedHour,
       minute: minute,
       second: second,
       millisecond: 0
@@ -36034,7 +36420,6 @@ var InvalidZone = /*#__PURE__*/function (_Zone) {
  * @private
  */
 function normalizeZone(input, defaultZone) {
-  var offset;
 
   if (isUndefined(input) || input === null) {
     return defaultZone;
@@ -36042,10 +36427,7 @@ function normalizeZone(input, defaultZone) {
     return input;
   } else if (isString(input)) {
     var lowered = input.toLowerCase();
-    if (lowered === "local" || lowered === "system") return defaultZone;else if (lowered === "utc" || lowered === "gmt") return FixedOffsetZone.utcInstance;else if ((offset = IANAZone.parseGMTOffset(input)) != null) {
-      // handle Etc/GMT-4, which V8 chokes on
-      return FixedOffsetZone.instance(offset);
-    } else if (IANAZone.isValidSpecifier(lowered)) return IANAZone.create(input);else return FixedOffsetZone.parseSpecifier(lowered) || new InvalidZone(input);
+    if (lowered === "local" || lowered === "system") return defaultZone;else if (lowered === "utc" || lowered === "gmt") return FixedOffsetZone.utcInstance;else if (IANAZone.isValidSpecifier(lowered)) return IANAZone.create(input);else return FixedOffsetZone.parseSpecifier(lowered) || new InvalidZone(input);
   } else if (isNumber(input)) {
     return FixedOffsetZone.instance(input);
   } else if (typeof input === "object" && input.offset && typeof input.offset === "number") {
@@ -36413,9 +36795,8 @@ var PolyDateFormatter = /*#__PURE__*/function () {
       //    - < Etc/GMT-14, > Etc/GMT+12, and 30-minute or 45-minute offsets are not part of tzdata
       var gmtOffset = -1 * (dt.offset / 60);
       var offsetZ = gmtOffset >= 0 ? "Etc/GMT+" + gmtOffset : "Etc/GMT" + gmtOffset;
-      var isOffsetZoneSupported = IANAZone.isValidZone(offsetZ);
 
-      if (dt.offset !== 0 && isOffsetZoneSupported) {
+      if (dt.offset !== 0 && IANAZone.create(offsetZ).valid) {
         z = offsetZ;
         this.dt = dt;
       } else {
@@ -36906,7 +37287,7 @@ function extractIANAZone(match, cursor) {
 
 var isoTimeOnly = RegExp("^T?" + isoTimeBaseRegex.source + "$"); // ISO duration parsing
 
-var isoDuration = /^-?P(?:(?:(-?\d{1,9})Y)?(?:(-?\d{1,9})M)?(?:(-?\d{1,9})W)?(?:(-?\d{1,9})D)?(?:T(?:(-?\d{1,9})H)?(?:(-?\d{1,9})M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,9}))?S)?)?)$/;
+var isoDuration = /^-?P(?:(?:(-?\d{1,9}(?:\.\d{1,9})?)Y)?(?:(-?\d{1,9}(?:\.\d{1,9})?)M)?(?:(-?\d{1,9}(?:\.\d{1,9})?)W)?(?:(-?\d{1,9}(?:\.\d{1,9})?)D)?(?:T(?:(-?\d{1,9}(?:\.\d{1,9})?)H)?(?:(-?\d{1,9}(?:\.\d{1,9})?)M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,9}))?S)?)?)$/;
 
 function extractISODuration(match) {
   var s = match[0],
@@ -36930,13 +37311,13 @@ function extractISODuration(match) {
   };
 
   return [{
-    years: maybeNegate(parseInteger(yearStr)),
-    months: maybeNegate(parseInteger(monthStr)),
-    weeks: maybeNegate(parseInteger(weekStr)),
-    days: maybeNegate(parseInteger(dayStr)),
-    hours: maybeNegate(parseInteger(hourStr)),
-    minutes: maybeNegate(parseInteger(minuteStr)),
-    seconds: maybeNegate(parseInteger(secondStr), secondStr === "-0"),
+    years: maybeNegate(parseFloating(yearStr)),
+    months: maybeNegate(parseFloating(monthStr)),
+    weeks: maybeNegate(parseFloating(weekStr)),
+    days: maybeNegate(parseFloating(dayStr)),
+    hours: maybeNegate(parseFloating(hourStr)),
+    minutes: maybeNegate(parseFloating(minuteStr)),
+    seconds: maybeNegate(parseFloating(secondStr), secondStr === "-0"),
     milliseconds: maybeNegate(parseMillis(millisecondsStr), negativeSeconds)
   }];
 } // These are a little braindead. EDT *should* tell us that we're in, say, America/New_York
@@ -37162,7 +37543,6 @@ var lowOrderMatrix = {
   }
 }, lowOrderMatrix); // units ordered by size
 
-
 var orderedUnits$1 = ["years", "quarters", "months", "weeks", "days", "hours", "minutes", "seconds", "milliseconds"];
 var reverseUnits = orderedUnits$1.slice(0).reverse(); // clone really means "create another instance just like this one, but with these changes"
 
@@ -37210,11 +37590,11 @@ function normalizeValues(matrix, vals) {
   }, null);
 }
 /**
- * A Duration object represents a period of time, like "2 months" or "1 day, 1 hour". Conceptually, it's just a map of units to their quantities, accompanied by some additional configuration and methods for creating, parsing, interrogating, transforming, and formatting them. They can be used on their own or in conjunction with other Luxon types; for example, you can use {@link DateTime.plus} to add a Duration object to a DateTime, producing another DateTime.
+ * A Duration object represents a period of time, like "2 months" or "1 day, 1 hour". Conceptually, it's just a map of units to their quantities, accompanied by some additional configuration and methods for creating, parsing, interrogating, transforming, and formatting them. They can be used on their own or in conjunction with other Luxon types; for example, you can use {@link DateTime#plus} to add a Duration object to a DateTime, producing another DateTime.
  *
  * Here is a brief overview of commonly used methods and getters in Duration:
  *
- * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}.
+ * * **Creation** To create a Duration, use {@link Duration#fromMillis}, {@link Duration#fromObject}, or {@link Duration#fromISO}.
  * * **Unit values** See the {@link Duration#years}, {@link Duration.months}, {@link Duration#weeks}, {@link Duration#days}, {@link Duration#hours}, {@link Duration#minutes}, {@link Duration#seconds}, {@link Duration#milliseconds} accessors.
  * * **Configuration** See  {@link Duration#locale} and {@link Duration#numberingSystem} accessors.
  * * **Transformation** To create new Durations out of old ones use {@link Duration#plus}, {@link Duration#minus}, {@link Duration#normalize}, {@link Duration#set}, {@link Duration#reconfigure}, {@link Duration#shiftTo}, and {@link Duration#negate}.
@@ -37313,6 +37693,29 @@ var Duration = /*#__PURE__*/function () {
       conversionAccuracy: opts.conversionAccuracy
     });
   }
+  /**
+   * Create a Duration from DurationLike.
+   *
+   * @param {Object | number | Duration} durationLike
+   * One of:
+   * - object with keys like 'years' and 'hours'.
+   * - number representing milliseconds
+   * - Duration instance
+   * @return {Duration}
+   */
+  ;
+
+  Duration.fromDurationLike = function fromDurationLike(durationLike) {
+    if (isNumber(durationLike)) {
+      return Duration.fromMillis(durationLike);
+    } else if (Duration.isDuration(durationLike)) {
+      return durationLike;
+    } else if (typeof durationLike === "object") {
+      return Duration.fromObject(durationLike);
+    } else {
+      throw new InvalidArgumentError("Unknown duration argument " + durationLike + " of type " + typeof durationLike);
+    }
+  }
   /**
    * Create a Duration from an ISO 8601 duration string.
    * @param {string} text - text to parse
@@ -37450,7 +37853,7 @@ var Duration = /*#__PURE__*/function () {
    * * `y` for years
    * Notes:
    * * Add padding by repeating the token, e.g. "yy" pads the years to two digits, "hhhh" pads the hours out to four digits
-   * * The duration will be converted to the set of units in the format string using {@link Duration.shiftTo} and the Durations's conversion accuracy setting.
+   * * The duration will be converted to the set of units in the format string using {@link Duration#shiftTo} and the Durations's conversion accuracy setting.
    * @param {string} fmt - the format string
    * @param {Object} opts - options
    * @param {boolean} [opts.floor=true] - floor numerical values
@@ -37607,7 +38010,7 @@ var Duration = /*#__PURE__*/function () {
 
   _proto.plus = function plus(duration) {
     if (!this.isValid) return this;
-    var dur = friendlyDuration(duration),
+    var dur = Duration.fromDurationLike(duration),
         result = {};
 
     for (var _iterator = _createForOfIteratorHelperLoose(orderedUnits$1), _step; !(_step = _iterator()).done;) {
@@ -37631,7 +38034,7 @@ var Duration = /*#__PURE__*/function () {
 
   _proto.minus = function minus(duration) {
     if (!this.isValid) return this;
-    var dur = friendlyDuration(duration);
+    var dur = Duration.fromDurationLike(duration);
     return this.plus(dur.negate());
   }
   /**
@@ -37788,8 +38191,7 @@ var Duration = /*#__PURE__*/function () {
 
         var i = Math.trunc(own);
         built[k] = i;
-        accumulated[k] = own - i; // we'd like to absorb these fractions in another unit
-        // plus anything further down the chain that should be rolled up in to this
+        accumulated[k] = (own * 1000 - i * 1000) / 1000; // plus anything further down the chain that should be rolled up in to this
 
         for (var down in vals) {
           if (orderedUnits$1.indexOf(down) > orderedUnits$1.indexOf(k)) {
@@ -38008,17 +38410,6 @@ var Duration = /*#__PURE__*/function () {
 
   return Duration;
 }();
-function friendlyDuration(durationish) {
-  if (isNumber(durationish)) {
-    return Duration.fromMillis(durationish);
-  } else if (Duration.isDuration(durationish)) {
-    return durationish;
-  } else if (typeof durationish === "object") {
-    return Duration.fromObject(durationish);
-  } else {
-    throw new InvalidArgumentError("Unknown duration argument " + durationish + " of type " + typeof durationish);
-  }
-}
 
 var INVALID$1 = "Invalid Interval"; // checks if the start is equal to or before the end
 
@@ -38038,7 +38429,7 @@ function validateStartEnd(start, end) {
  *
  * Here is a brief overview of the most commonly used methods and getters in Interval:
  *
- * * **Creation** To create an Interval, use {@link Interval.fromDateTimes}, {@link Interval.after}, {@link Interval.before}, or {@link Interval.fromISO}.
+ * * **Creation** To create an Interval, use {@link Interval#fromDateTimes}, {@link Interval#after}, {@link Interval#before}, or {@link Interval#fromISO}.
  * * **Accessors** Use {@link Interval#start} and {@link Interval#end} to get the start and end.
  * * **Interrogation** To analyze the Interval, use {@link Interval#count}, {@link Interval#length}, {@link Interval#hasSame}, {@link Interval#contains}, {@link Interval#isAfter}, or {@link Interval#isBefore}.
  * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval#merge}, {@link Interval#xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
@@ -38130,7 +38521,7 @@ var Interval = /*#__PURE__*/function () {
   ;
 
   Interval.after = function after(start, duration) {
-    var dur = friendlyDuration(duration),
+    var dur = Duration.fromDurationLike(duration),
         dt = friendlyDateTime(start);
     return Interval.fromDateTimes(dt, dt.plus(dur));
   }
@@ -38143,7 +38534,7 @@ var Interval = /*#__PURE__*/function () {
   ;
 
   Interval.before = function before(end, duration) {
-    var dur = friendlyDuration(duration),
+    var dur = Duration.fromDurationLike(duration),
         dt = friendlyDateTime(end);
     return Interval.fromDateTimes(dt.minus(dur), dt);
   }
@@ -38151,7 +38542,7 @@ var Interval = /*#__PURE__*/function () {
    * Create an Interval from an ISO 8601 string.
    * Accepts `<start>/<end>`, `<start>/<duration>`, and `<duration>/<end>` formats.
    * @param {string} text - the ISO string to parse
-   * @param {Object} [opts] - options to pass {@link DateTime.fromISO} and optionally {@link Duration.fromISO}
+   * @param {Object} [opts] - options to pass {@link DateTime#fromISO} and optionally {@link Duration#fromISO}
    * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals
    * @return {Interval}
    */
@@ -38362,7 +38753,7 @@ var Interval = /*#__PURE__*/function () {
   ;
 
   _proto.splitBy = function splitBy(duration) {
-    var dur = friendlyDuration(duration);
+    var dur = Duration.fromDurationLike(duration);
 
     if (!this.isValid || !dur.isValid || dur.as("milliseconds") === 0) {
       return [];
@@ -38622,7 +39013,7 @@ var Interval = /*#__PURE__*/function () {
    * Returns an ISO 8601-compliant string representation of time of this Interval.
    * The date components are ignored.
    * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals
-   * @param {Object} opts - The same options as {@link DateTime.toISO}
+   * @param {Object} opts - The same options as {@link DateTime#toISO}
    * @return {string}
    */
   ;
@@ -38633,7 +39024,7 @@ var Interval = /*#__PURE__*/function () {
   }
   /**
    * Returns a string representation of this Interval formatted according to the specified format string.
-   * @param {string} dateFormat - the format string. This string formats the start and end time. See {@link DateTime.toFormat} for details.
+   * @param {string} dateFormat - the format string. This string formats the start and end time. See {@link DateTime#toFormat} for details.
    * @param {Object} opts - options
    * @param {string} [opts.separator =  ' – '] - a separator to place between the start and end representations
    * @return {string}
@@ -38773,7 +39164,7 @@ var Info = /*#__PURE__*/function () {
    * * If `input` is a string containing a valid time zone name, a Zone instance
    *   with that name is returned.
    * * If `input` is a string that doesn't refer to a known time zone, a Zone
-   *   instance with {@link Zone.isValid} == false is returned.
+   *   instance with {@link Zone#isValid} == false is returned.
    * * If `input is a number, a Zone instance with the specified fixed offset
    *   in minutes is returned.
    * * If `input` is `null` or `undefined`, the default zone is returned.
@@ -38955,10 +39346,10 @@ var Info = /*#__PURE__*/function () {
   }
   /**
    * Return the set of available features in this environment.
-   * Some features of Luxon are not available in all environments. For example, on older browsers, timezone support is not available. Use this function to figure out if that's the case.
+   * Some features of Luxon are not available in all environments. For example, on older browsers, relative time formatting support is not available. Use this function to figure out if that's the case.
    * Keys:
    * * `relative`: whether this environment supports relative time formatting
-   * @example Info.features() //=> { intl: true, intlTokens: false, zones: true, relative: false }
+   * @example Info.features() //=> { relative: false }
    * @return {Object}
    */
   ;
@@ -39349,6 +39740,12 @@ function unitForToken(token, loc) {
 
       case "u":
         return simple(oneToNine);
+
+      case "uu":
+        return simple(oneOrTwo);
+
+      case "uuu":
+        return intUnit(one);
       // meridiem
 
       case "a":
@@ -39555,14 +39952,19 @@ function dateTimeFromMatches(matches) {
     }
   };
 
-  var zone;
+  var zone = null;
+  var specificOffset;
 
-  if (!isUndefined(matches.Z)) {
-    zone = new FixedOffsetZone(matches.Z);
-  } else if (!isUndefined(matches.z)) {
+  if (!isUndefined(matches.z)) {
     zone = IANAZone.create(matches.z);
-  } else {
-    zone = null;
+  }
+
+  if (!isUndefined(matches.Z)) {
+    if (!zone) {
+      zone = new FixedOffsetZone(matches.Z);
+    }
+
+    specificOffset = matches.Z;
   }
 
   if (!isUndefined(matches.q)) {
@@ -39594,7 +39996,7 @@ function dateTimeFromMatches(matches) {
 
     return r;
   }, {});
-  return [vals, zone];
+  return [vals, zone, specificOffset];
 }
 
 var dummyDateTimeCache = null;
@@ -39666,9 +40068,10 @@ function explainFromTokens(locale, input, format) {
         _match = match(input, regex, handlers),
         rawMatches = _match[0],
         matches = _match[1],
-        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null],
+        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null, undefined],
         result = _ref6[0],
-        zone = _ref6[1];
+        zone = _ref6[1],
+        specificOffset = _ref6[2];
 
     if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
       throw new ConflictingSpecificationError("Can't include meridiem when specifying 24-hour format");
@@ -39681,7 +40084,8 @@ function explainFromTokens(locale, input, format) {
       rawMatches: rawMatches,
       matches: matches,
       result: result,
-      zone: zone
+      zone: zone,
+      specificOffset: specificOffset
     };
   }
 }
@@ -39689,9 +40093,10 @@ function parseFromTokens(locale, input, format) {
   var _explainFromTokens = explainFromTokens(locale, input, format),
       result = _explainFromTokens.result,
       zone = _explainFromTokens.zone,
+      specificOffset = _explainFromTokens.specificOffset,
       invalidReason = _explainFromTokens.invalidReason;
 
-  return [result, zone, invalidReason];
+  return [result, zone, specificOffset, invalidReason];
 }
 
 var nonLeapLadder = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334],
@@ -39979,14 +40384,15 @@ function adjustTime(inst, dur) {
 // by handling the zone options
 
 
-function parseDataToDateTime(parsed, parsedZone, opts, format, text) {
+function parseDataToDateTime(parsed, parsedZone, opts, format, text, specificOffset) {
   var setZone = opts.setZone,
       zone = opts.zone;
 
   if (parsed && Object.keys(parsed).length !== 0) {
     var interpretationZone = parsedZone || zone,
         inst = DateTime.fromObject(parsed, _extends({}, opts, {
-      zone: interpretationZone
+      zone: interpretationZone,
+      specificOffset: specificOffset
     }));
     return setZone ? inst : inst.setZone(zone);
   } else {
@@ -40213,7 +40619,7 @@ function lastOpts(argList) {
  *
  * Here is a brief overview of the most commonly used functionality it provides:
  *
- * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime.local}, {@link DateTime.utc}, and (most flexibly) {@link DateTime.fromObject}. To create one from a standard string format, use {@link DateTime.fromISO}, {@link DateTime.fromHTTP}, and {@link DateTime.fromRFC2822}. To create one from a custom string format, use {@link DateTime.fromFormat}. To create one from a native JS date, use {@link DateTime.fromJSDate}.
+ * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime#local}, {@link DateTime#utc}, and (most flexibly) {@link DateTime#fromObject}. To create one from a standard string format, use {@link DateTime#fromISO}, {@link DateTime#fromHTTP}, and {@link DateTime#fromRFC2822}. To create one from a custom string format, use {@link DateTime#fromFormat}. To create one from a native JS date, use {@link DateTime#fromJSDate}.
  * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link DateTime#toObject}), use the {@link DateTime#year}, {@link DateTime#month},
  * {@link DateTime#day}, {@link DateTime#hour}, {@link DateTime#minute}, {@link DateTime#second}, {@link DateTime#millisecond} accessors.
  * * **Week calendar**: For ISO week calendar attributes, see the {@link DateTime#weekYear}, {@link DateTime#weekNumber}, and {@link DateTime#weekday} accessors.
@@ -40531,7 +40937,7 @@ var DateTime = /*#__PURE__*/function () {
     }
 
     var tsNow = Settings.now(),
-        offsetProvis = zoneToUse.offset(tsNow),
+        offsetProvis = !isUndefined(opts.specificOffset) ? opts.specificOffset : zoneToUse.offset(tsNow),
         normalized = normalizeObject(obj, normalizeUnit),
         containsOrdinal = !isUndefined(normalized.ordinal),
         containsGregorYear = !isUndefined(normalized.year),
@@ -40735,12 +41141,13 @@ var DateTime = /*#__PURE__*/function () {
         _parseFromTokens = parseFromTokens(localeToUse, text, fmt),
         vals = _parseFromTokens[0],
         parsedZone = _parseFromTokens[1],
-        invalid = _parseFromTokens[2];
+        specificOffset = _parseFromTokens[2],
+        invalid = _parseFromTokens[3];
 
     if (invalid) {
       return DateTime.invalid(invalid);
     } else {
-      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text);
+      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text, specificOffset);
     }
   }
   /**
@@ -40874,7 +41281,7 @@ var DateTime = /*#__PURE__*/function () {
   /**
    * "Set" the DateTime's zone to UTC. Returns a newly-constructed DateTime.
    *
-   * Equivalent to {@link DateTime.setZone}('utc')
+   * Equivalent to {@link DateTime#setZone}('utc')
    * @param {number} [offset=0] - optionally, an offset from UTC in minutes
    * @param {Object} [opts={}] - options to pass to `setZone()`
    * @return {DateTime}
@@ -40906,8 +41313,8 @@ var DateTime = /*#__PURE__*/function () {
   /**
    * "Set" the DateTime's zone to specified zone. Returns a newly-constructed DateTime.
    *
-   * By default, the setter keeps the underlying time the same (as in, the same timestamp), but the new instance will report different local times and consider DSTs when making computations, as with {@link DateTime.plus}. You may wish to use {@link DateTime.toLocal} and {@link DateTime.toUTC} which provide simple convenience wrappers for commonly used zones.
-   * @param {string|Zone} [zone='local'] - a zone identifier. As a string, that can be any IANA zone supported by the host environment, or a fixed-offset name of the form 'UTC+3', or the strings 'local' or 'utc'. You may also supply an instance of a {@link DateTime.Zone} class.
+   * By default, the setter keeps the underlying time the same (as in, the same timestamp), but the new instance will report different local times and consider DSTs when making computations, as with {@link DateTime#plus}. You may wish to use {@link DateTime#toLocal} and {@link DateTime#toUTC} which provide simple convenience wrappers for commonly used zones.
+   * @param {string|Zone} [zone='local'] - a zone identifier. As a string, that can be any IANA zone supported by the host environment, or a fixed-offset name of the form 'UTC+3', or the strings 'local' or 'utc'. You may also supply an instance of a {@link DateTime#Zone} class.
    * @param {Object} opts - options
    * @param {boolean} [opts.keepLocalTime=false] - If true, adjust the underlying time so that the local time stays the same, but in the target zone. You should rarely need this.
    * @return {DateTime}
@@ -40983,7 +41390,7 @@ var DateTime = /*#__PURE__*/function () {
   }
   /**
    * "Set" the values of specified units. Returns a newly-constructed DateTime.
-   * You can only set units with this method; for "setting" metadata, see {@link DateTime.reconfigure} and {@link DateTime.setZone}.
+   * You can only set units with this method; for "setting" metadata, see {@link DateTime#reconfigure} and {@link DateTime#setZone}.
    * @param {Object} values - a mapping of units to numbers
    * @example dt.set({ year: 2017 })
    * @example dt.set({ hour: 8, minute: 30 })
@@ -41052,12 +41459,12 @@ var DateTime = /*#__PURE__*/function () {
 
   _proto.plus = function plus(duration) {
     if (!this.isValid) return this;
-    var dur = friendlyDuration(duration);
+    var dur = Duration.fromDurationLike(duration);
     return clone(this, adjustTime(this, dur));
   }
   /**
    * Subtract a period of time to this DateTime and return the resulting DateTime
-   * See {@link DateTime.plus}
+   * See {@link DateTime#plus}
    * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()
    @return {DateTime}
   */
@@ -41065,7 +41472,7 @@ var DateTime = /*#__PURE__*/function () {
 
   _proto.minus = function minus(duration) {
     if (!this.isValid) return this;
-    var dur = friendlyDuration(duration).negate();
+    var dur = Duration.fromDurationLike(duration).negate();
     return clone(this, adjustTime(this, dur));
   }
   /**
@@ -41145,7 +41552,7 @@ var DateTime = /*#__PURE__*/function () {
 
   /**
    * Returns a string representation of this DateTime formatted according to the specified format string.
-   * **You may not want this.** See {@link DateTime.toLocaleString} for a more flexible formatting tool. For a table of tokens and their interpretations, see [here](https://moment.github.io/luxon/#/formatting?id=table-of-tokens).
+   * **You may not want this.** See {@link DateTime#toLocaleString} for a more flexible formatting tool. For a table of tokens and their interpretations, see [here](https://moment.github.io/luxon/#/formatting?id=table-of-tokens).
    * Defaults to en-US if no locale has been specified, regardless of the system's locale.
    * @param {string} fmt - the format string
    * @param {Object} opts - opts to override the configuration options on this DateTime
@@ -41408,7 +41815,7 @@ var DateTime = /*#__PURE__*/function () {
     return this.isValid ? this.toISO() : INVALID;
   }
   /**
-   * Returns the epoch milliseconds of this DateTime. Alias of {@link DateTime.toMillis}
+   * Returns the epoch milliseconds of this DateTime. Alias of {@link DateTime#toMillis}
    * @return {number}
    */
   ;
@@ -41533,7 +41940,7 @@ var DateTime = /*#__PURE__*/function () {
   }
   /**
    * Return the difference between this DateTime and right now.
-   * See {@link DateTime.diff}
+   * See {@link DateTime#diff}
    * @param {string|string[]} [unit=['milliseconds']] - the unit or units units (such as 'hours' or 'days') to include in the duration
    * @param {Object} opts - options that affect the creation of the Duration
    * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
@@ -41565,7 +41972,7 @@ var DateTime = /*#__PURE__*/function () {
   /**
    * Return whether this DateTime is in the same unit of time as another DateTime.
    * Higher-order units must also be identical for this function to return `true`.
-   * Note that time zones are **ignored** in this comparison, which compares the **local** calendar time. Use {@link DateTime.setZone} to convert one of the dates if needed.
+   * Note that time zones are **ignored** in this comparison, which compares the **local** calendar time. Use {@link DateTime#setZone} to convert one of the dates if needed.
    * @param {DateTime} otherDateTime - the other DateTime
    * @param {string} unit - the unit of time to check sameness on
    * @example DateTime.now().hasSame(otherDT, 'day'); //~> true if otherDT is in the same current calendar day
@@ -41747,7 +42154,7 @@ var DateTime = /*#__PURE__*/function () {
   } // FORMAT PRESETS
 
   /**
-   * {@link DateTime.toLocaleString} format like 10/14/1983
+   * {@link DateTime#toLocaleString} format like 10/14/1983
    * @type {Object}
    */
   ;
@@ -42153,7 +42560,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATE_SHORT;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Oct 14, 1983'
+     * {@link DateTime#toLocaleString} format like 'Oct 14, 1983'
      * @type {Object}
      */
 
@@ -42163,7 +42570,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATE_MED;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Fri, Oct 14, 1983'
+     * {@link DateTime#toLocaleString} format like 'Fri, Oct 14, 1983'
      * @type {Object}
      */
 
@@ -42173,7 +42580,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATE_MED_WITH_WEEKDAY;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'October 14, 1983'
+     * {@link DateTime#toLocaleString} format like 'October 14, 1983'
      * @type {Object}
      */
 
@@ -42183,7 +42590,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATE_FULL;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Tuesday, October 14, 1983'
+     * {@link DateTime#toLocaleString} format like 'Tuesday, October 14, 1983'
      * @type {Object}
      */
 
@@ -42193,7 +42600,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATE_HUGE;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '09:30 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42203,7 +42610,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_SIMPLE;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '09:30:23 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42213,7 +42620,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_WITH_SECONDS;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23 AM EDT'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '09:30:23 AM EDT'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42223,7 +42630,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_WITH_SHORT_OFFSET;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23 AM Eastern Daylight Time'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '09:30:23 AM Eastern Daylight Time'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42233,7 +42640,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_WITH_LONG_OFFSET;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30', always 24-hour.
+     * {@link DateTime#toLocaleString} format like '09:30', always 24-hour.
      * @type {Object}
      */
 
@@ -42243,7 +42650,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_24_SIMPLE;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23', always 24-hour.
+     * {@link DateTime#toLocaleString} format like '09:30:23', always 24-hour.
      * @type {Object}
      */
 
@@ -42253,7 +42660,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_24_WITH_SECONDS;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23 EDT', always 24-hour.
+     * {@link DateTime#toLocaleString} format like '09:30:23 EDT', always 24-hour.
      * @type {Object}
      */
 
@@ -42263,7 +42670,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_24_WITH_SHORT_OFFSET;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '09:30:23 Eastern Daylight Time', always 24-hour.
+     * {@link DateTime#toLocaleString} format like '09:30:23 Eastern Daylight Time', always 24-hour.
      * @type {Object}
      */
 
@@ -42273,7 +42680,7 @@ var DateTime = /*#__PURE__*/function () {
       return TIME_24_WITH_LONG_OFFSET;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42283,7 +42690,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_SHORT;
     }
     /**
-     * {@link DateTime.toLocaleString} format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42293,7 +42700,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_SHORT_WITH_SECONDS;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Oct 14, 1983, 9:30 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'Oct 14, 1983, 9:30 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42303,7 +42710,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_MED;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Oct 14, 1983, 9:30:33 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'Oct 14, 1983, 9:30:33 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42313,7 +42720,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_MED_WITH_SECONDS;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Fri, 14 Oct 1983, 9:30 AM'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'Fri, 14 Oct 1983, 9:30 AM'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42323,7 +42730,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_MED_WITH_WEEKDAY;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'October 14, 1983, 9:30 AM EDT'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'October 14, 1983, 9:30 AM EDT'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42333,7 +42740,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_FULL;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'October 14, 1983, 9:30:33 AM EDT'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'October 14, 1983, 9:30:33 AM EDT'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42343,7 +42750,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_FULL_WITH_SECONDS;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Friday, October 14, 1983, 9:30 AM Eastern Daylight Time'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'Friday, October 14, 1983, 9:30 AM Eastern Daylight Time'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42353,7 +42760,7 @@ var DateTime = /*#__PURE__*/function () {
       return DATETIME_HUGE;
     }
     /**
-     * {@link DateTime.toLocaleString} format like 'Friday, October 14, 1983, 9:30:33 AM Eastern Daylight Time'. Only 12-hour if the locale is.
+     * {@link DateTime#toLocaleString} format like 'Friday, October 14, 1983, 9:30:33 AM Eastern Daylight Time'. Only 12-hour if the locale is.
      * @type {Object}
      */
 
@@ -42378,7 +42785,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.0.2";
+var VERSION = "2.2.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;
@@ -42434,7 +42841,7 @@ var gPO = (typeof Reflect === 'function' ? Reflect.getPrototypeOf : Object.getPr
         : null
 );
 
-var inspectCustom = __webpack_require__(/*! ./util.inspect */ "?4f7e").custom;
+var inspectCustom = (__webpack_require__(/*! ./util.inspect */ "?4f7e").custom);
 var inspectSymbol = inspectCustom && isSymbol(inspectCustom) ? inspectCustom : null;
 var toStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag !== 'undefined' ? Symbol.toStringTag : null;
 
@@ -43232,6 +43639,7 @@ var arrayPrefixGenerators = {
 };
 
 var isArray = Array.isArray;
+var split = String.prototype.split;
 var push = Array.prototype.push;
 var pushToArray = function (arr, valueOrArray) {
     push.apply(arr, isArray(valueOrArray) ? valueOrArray : [valueOrArray]);
@@ -43268,6 +43676,8 @@ var isNonNullishPrimitive = function isNonNullishPrimitive(v) {
         || typeof v === 'bigint';
 };
 
+var sentinel = {};
+
 var stringify = function stringify(
     object,
     prefix,
@@ -43287,8 +43697,23 @@ var stringify = function stringify(
 ) {
     var obj = object;
 
-    if (sideChannel.has(object)) {
-        throw new RangeError('Cyclic object value');
+    var tmpSc = sideChannel;
+    var step = 0;
+    var findFlag = false;
+    while ((tmpSc = tmpSc.get(sentinel)) !== undefined && !findFlag) {
+        // Where object last appeared in the ref tree
+        var pos = tmpSc.get(object);
+        step += 1;
+        if (typeof pos !== 'undefined') {
+            if (pos === step) {
+                throw new RangeError('Cyclic object value');
+            } else {
+                findFlag = true; // Break while
+            }
+        }
+        if (typeof tmpSc.get(sentinel) === 'undefined') {
+            step = 0;
+        }
     }
 
     if (typeof filter === 'function') {
@@ -43315,6 +43740,14 @@ var stringify = function stringify(
     if (isNonNullishPrimitive(obj) || utils.isBuffer(obj)) {
         if (encoder) {
             var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder, charset, 'key', format);
+            if (generateArrayPrefix === 'comma' && encodeValuesOnly) {
+                var valuesArray = split.call(String(obj), ',');
+                var valuesJoined = '';
+                for (var i = 0; i < valuesArray.length; ++i) {
+                    valuesJoined += (i === 0 ? '' : ',') + formatter(encoder(valuesArray[i], defaults.encoder, charset, 'value', format));
+                }
+                return [formatter(keyValue) + '=' + valuesJoined];
+            }
             return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder, charset, 'value', format))];
         }
         return [formatter(prefix) + '=' + formatter(String(obj))];
@@ -43337,8 +43770,8 @@ var stringify = function stringify(
         objKeys = sort ? keys.sort(sort) : keys;
     }
 
-    for (var i = 0; i < objKeys.length; ++i) {
-        var key = objKeys[i];
+    for (var j = 0; j < objKeys.length; ++j) {
+        var key = objKeys[j];
         var value = typeof key === 'object' && key.value !== undefined ? key.value : obj[key];
 
         if (skipNulls && value === null) {
@@ -43349,8 +43782,9 @@ var stringify = function stringify(
             ? typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix
             : prefix + (allowDots ? '.' + key : '[' + key + ']');
 
-        sideChannel.set(object, true);
+        sideChannel.set(object, step);
         var valueSideChannel = getSideChannel();
+        valueSideChannel.set(sentinel, sideChannel);
         pushToArray(values, stringify(
             value,
             keyPrefix,
@@ -43691,6 +44125,7 @@ var encode = function encode(str, defaultEncoder, charset, kind, format) {
 
         i += 1;
         c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
+        /* eslint operator-linebreak: [2, "before"] */
         out += hexTable[0xF0 | (c >> 18)]
             + hexTable[0x80 | ((c >> 12) & 0x3F)]
             + hexTable[0x80 | ((c >> 6) & 0x3F)]
@@ -46055,9 +46490,9 @@ exports.quickSort = function (ary, comparator) {
 
 var util = __webpack_require__(/*! ./util */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/util.js");
 var binarySearch = __webpack_require__(/*! ./binary-search */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/binary-search.js");
-var ArraySet = __webpack_require__(/*! ./array-set */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/array-set.js").ArraySet;
+var ArraySet = (__webpack_require__(/*! ./array-set */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/array-set.js").ArraySet);
 var base64VLQ = __webpack_require__(/*! ./base64-vlq */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/base64-vlq.js");
-var quickSort = __webpack_require__(/*! ./quick-sort */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/quick-sort.js").quickSort;
+var quickSort = (__webpack_require__(/*! ./quick-sort */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/quick-sort.js").quickSort);
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -47147,8 +47582,8 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 var base64VLQ = __webpack_require__(/*! ./base64-vlq */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/base64-vlq.js");
 var util = __webpack_require__(/*! ./util */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/util.js");
-var ArraySet = __webpack_require__(/*! ./array-set */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/array-set.js").ArraySet;
-var MappingList = __webpack_require__(/*! ./mapping-list */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/mapping-list.js").MappingList;
+var ArraySet = (__webpack_require__(/*! ./array-set */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/array-set.js").ArraySet);
+var MappingList = (__webpack_require__(/*! ./mapping-list */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/mapping-list.js").MappingList);
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -47559,7 +47994,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(/*! ./source-map-generator */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/source-map-generator.js").SourceMapGenerator;
+var SourceMapGenerator = (__webpack_require__(/*! ./source-map-generator */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/source-map-generator.js").SourceMapGenerator);
 var util = __webpack_require__(/*! ./util */ "./node_modules/stacktrace-gps/node_modules/source-map/lib/util.js");
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other