@nmshd/transport 1.0.8 → 1.1.3

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.8",
-    build: "11",
-    date: "2021-11-15T06:28:52+00:00",
-    commit: "e46782eb96bb3ebea587713bb3afeb1e83b0b645",
-    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.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.1.1","qs":"^6.10.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.1.3",
+    build: "15",
+    date: "2021-12-28T16:36:51+00:00",
+    commit: "d926ace865b9799f0fdc997dfeefe087f158fa26",
+    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.");
     }
@@ -1478,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();
@@ -2059,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);
@@ -2096,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);
@@ -2607,10 +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, _db, _config) {
+    constructor(_transport, _db, _config, dependencyOverrides = {}) {
         this._transport = _transport;
         this._db = _db;
         this._config = _config;
+        this.dependencyOverrides = dependencyOverrides;
         this._dbClosed = false;
         this.autoSync = true;
         this._authenticator = new Authenticator_1.Authenticator(this);
@@ -2695,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();
@@ -2712,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();
@@ -2723,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() {
@@ -2796,11 +2828,7 @@ class AccountController {
         }
         const identity = await Identity_1.Identity.from({
             address: core_1.CoreAddress.from(deviceResponse.address),
-            createdAt: core_1.CoreDate.from(deviceResponse.createdAt),
-            description: "",
-            name: "",
             realm: realm,
-            type: "unknown" /* UNKNOWN */,
             publicKey: identityKeypair.publicKey
         });
         const deviceId = core_1.CoreId.from(deviceResponse.device.id);
@@ -2815,7 +2843,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)]);
@@ -2901,9 +2930,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;
@@ -2937,18 +2966,6 @@ class IdentityController extends core_1.TransportController {
     get realm() {
         return this._identity.realm;
     }
-    get name() {
-        return this._identity.name;
-    }
-    get description() {
-        return this._identity.description;
-    }
-    get createdAt() {
-        return this._identity.createdAt;
-    }
-    get type() {
-        return this._identity.type;
-    }
     get identity() {
         return this._identity;
     }
@@ -2963,9 +2980,7 @@ class IdentityController extends core_1.TransportController {
     isMe(address) {
         return this.address.equals(address);
     }
-    async update(name, description) {
-        this.identity.name = name;
-        this.identity.description = description;
+    async update() {
         await this.parent.info.set("identity", this.identity);
     }
     async sign(content) {
@@ -3112,7 +3127,13 @@ var Realm;
 })(Realm = exports.Realm || (exports.Realm = {}));
 let Identity = Identity_1 = class Identity extends CoreSerializableAsync_1.CoreSerializableAsync {
     static async from(value) {
-        return await super.fromT(value, Identity_1);
+        const identity = await super.fromT(value, Identity_1);
+        // TODO: Remove these default values once we're sure that nobody is accessing the deprecated properties anymore
+        identity.name = "";
+        identity.description = "";
+        identity.type = "unknown";
+        identity.createdAt = CoreDate_1.CoreDate.from("2020-01-01T00:00:00Z");
+        return identity;
     }
 };
 __decorate([
@@ -3131,22 +3152,26 @@ __decorate([
     __metadata("design:type", String)
 ], Identity.prototype, "realm", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "name", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "description", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", CoreDate_1.CoreDate)
+    __metadata("design:type", CoreDate_1.CoreDate
+    /**
+     * @deprecated
+     */
+    )
 ], Identity.prototype, "createdAt", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "type", void 0);
@@ -4443,10 +4468,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);
@@ -4884,7 +4914,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)];
     }
@@ -4952,6 +4983,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);
@@ -6032,6 +6068,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);
@@ -7042,7 +7086,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();
@@ -7066,7 +7110,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
         });
@@ -9667,7 +9711,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":
@@ -9708,16 +9752,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
         };
     }
 }
@@ -10032,15 +10079,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;
     }
@@ -10069,33 +10127,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({
@@ -10107,7 +10252,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);
@@ -10116,7 +10261,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;
@@ -10155,15 +10300,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) {
@@ -10172,14 +10331,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
         });
@@ -10189,6 +10351,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;
@@ -10258,8 +10435,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;
@@ -10280,7 +10458,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) {
@@ -10290,7 +10469,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) {
@@ -10300,7 +10480,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);
@@ -10334,7 +10515,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.TechnicalData,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (haveMetadataPropertiesChanged) {
@@ -10345,7 +10527,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Metadata,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (haveUserdataPropertiesChanged) {
@@ -10356,7 +10539,8 @@ class SynchronizedCollection {
                 collection: this.name,
                 objectIdentifier: objectIdentifier,
                 payloadCategory: DatawalletModification_1.DatawalletModificationCategory.Userdata,
-                payload: payload
+                payload: payload,
+                datawalletVersion: this.datawalletVersion
             }));
         }
         if (hasCacheChanged) {
@@ -10364,7 +10548,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);
@@ -10377,7 +10562,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() });
     }
@@ -10402,6 +10588,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 ***!
@@ -10411,7 +10675,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";
@@ -10433,20 +10702,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;
@@ -10527,6 +10809,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);
@@ -10535,6 +10822,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 ***!
@@ -11746,95 +12091,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) {
@@ -11844,9 +12127,7 @@ class SubscriptionTargetInfo {
         if (target instanceof Function) {
             return new ConstructorSubscriptionTargetInfo(target);
         }
-        else {
-            return new NamespaceSubscriptionTargetInfo(target);
-        }
+        return new NamespaceSubscriptionTargetInfo(target);
     }
 }
 exports.SubscriptionTargetInfo = SubscriptionTargetInfo;
@@ -11864,21 +12145,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 ***!
@@ -11899,52 +12245,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
 
 /***/ }),
 
@@ -11968,11 +12339,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
 
@@ -11988,10 +12360,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);
@@ -12006,7 +12379,6 @@ function log(target, propertyName, propertyDesciptor) {
     return propertyDesciptor;
 }
 exports.log = log;
-;
 //# sourceMappingURL=logDecorator.js.map
 
 /***/ }),
@@ -12021,7 +12393,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();
@@ -12033,7 +12406,6 @@ function measureExcecutionTime(target, propertyName, propertyDesciptor) {
     return propertyDesciptor;
 }
 exports.measureExcecutionTime = measureExcecutionTime;
-;
 //# sourceMappingURL=measureExcecutionTime.js.map
 
 /***/ }),
@@ -12051,13 +12423,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
 
 /***/ }),
@@ -37812,8 +38183,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)) {
@@ -39574,14 +39944,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)) {
@@ -39613,7 +39988,7 @@ function dateTimeFromMatches(matches) {
 
     return r;
   }, {});
-  return [vals, zone];
+  return [vals, zone, specificOffset];
 }
 
 var dummyDateTimeCache = null;
@@ -39685,9 +40060,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");
@@ -39700,7 +40076,8 @@ function explainFromTokens(locale, input, format) {
       rawMatches: rawMatches,
       matches: matches,
       result: result,
-      zone: zone
+      zone: zone,
+      specificOffset: specificOffset
     };
   }
 }
@@ -39708,9 +40085,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],
@@ -39998,14 +40376,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 {
@@ -40550,7 +40929,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),
@@ -40754,12 +41133,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);
     }
   }
   /**
@@ -42397,7 +42777,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.1.1";
+var VERSION = "2.2.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;
@@ -43251,6 +43631,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]);
@@ -43287,6 +43668,8 @@ var isNonNullishPrimitive = function isNonNullishPrimitive(v) {
         || typeof v === 'bigint';
 };
 
+var sentinel = {};
+
 var stringify = function stringify(
     object,
     prefix,
@@ -43306,8 +43689,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') {
@@ -43334,6 +43732,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))];
@@ -43356,8 +43762,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) {
@@ -43368,8 +43774,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,
@@ -43710,6 +44117,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)]