@twin.org/synchronised-storage-service 0.0.1-next.6 → 0.0.1-next.7

package/dist/cjs/index.cjs

@@ -6,7 +6,6 @@ var web = require('@twin.org/web');
 var blobStorageModels = require('@twin.org/blob-storage-models');
 var entityStorageModels = require('@twin.org/entity-storage-models');
 var identityModels = require('@twin.org/identity-models');
-var loggingModels = require('@twin.org/logging-models');
 var standardsW3cDid = require('@twin.org/standards-w3c-did');
 var synchronisedStorageModels = require('@twin.org/synchronised-storage-models');
 var vaultModels = require('@twin.org/vault-models');
@@ -297,10 +296,10 @@ class BlobStorageHelper {
      */
     CLASS_NAME = "BlobStorageHelper";
     /**
-     * The logging connector to use for logging.
+     * The logging component to use for logging.
      * @internal
      */
-    _logging;
+    _loggingComponent;
     /**
      * The vault connector.
      * @internal
@@ -323,14 +322,14 @@ class BlobStorageHelper {
     _isTrustedNode;
     /**
      * Create a new instance of BlobStorageHelper.
-     * @param logging The logging connector to use for logging.
+     * @param loggingComponent The logging connector to use for logging.
      * @param vaultConnector The vault connector to use for for the encryption key.
      * @param blobStorageConnector The blob storage component to use.
      * @param blobStorageEncryptionKeyId The id of the vault key to use for encrypting/decrypting blobs.
      * @param isTrustedNode Is this a trusted node.
      */
-    constructor(logging, vaultConnector, blobStorageConnector, blobStorageEncryptionKeyId, isTrustedNode) {
-        this._logging = logging;
+    constructor(loggingComponent, vaultConnector, blobStorageConnector, blobStorageEncryptionKeyId, isTrustedNode) {
+        this._loggingComponent = loggingComponent;
         this._vaultConnector = vaultConnector;
         this._blobStorageConnector = blobStorageConnector;
         this._blobStorageEncryptionKeyId = blobStorageEncryptionKeyId;
@@ -342,7 +341,7 @@ class BlobStorageHelper {
      * @returns The blob.
      */
     async loadBlob(blobId) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "loadBlob",
@@ -365,7 +364,7 @@ class BlobStorageHelper {
                     compressedBlob = rsa.decrypt(encryptedBlob);
                 }
                 const decompressedBlob = await core.Compression.decompress(compressedBlob, core.CompressionType.Gzip);
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "loadedBlob",
@@ -377,7 +376,7 @@ class BlobStorageHelper {
             }
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "loadBlobFailed",
@@ -387,7 +386,7 @@ class BlobStorageHelper {
                 error: core.BaseError.fromError(error)
             });
         }
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "loadBlobEmpty",
@@ -402,7 +401,7 @@ class BlobStorageHelper {
      * @returns The id of the blob.
      */
     async saveBlob(blob) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "saveBlob"
@@ -414,7 +413,7 @@ class BlobStorageHelper {
         const encryptedBlob = await this._vaultConnector.encrypt(this._blobStorageEncryptionKeyId, vaultModels.VaultEncryptionType.Rsa2048, compressedBlob);
         try {
             const blobId = await this._blobStorageConnector.set(encryptedBlob);
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "savedBlob",
@@ -425,7 +424,7 @@ class BlobStorageHelper {
             return blobId;
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "saveBlobFailed",
@@ -440,7 +439,7 @@ class BlobStorageHelper {
      * @returns Nothing.
      */
     async removeBlob(blobId) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "removeBlob",
@@ -450,7 +449,7 @@ class BlobStorageHelper {
         });
         try {
             await this._blobStorageConnector.remove(blobId);
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "removedBlob",
@@ -460,7 +459,7 @@ class BlobStorageHelper {
             });
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "removeBlobFailed",
@@ -470,7 +469,7 @@ class BlobStorageHelper {
                 error: core.BaseError.fromError(error)
             });
         }
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "removeBlobEmpty",
@@ -492,10 +491,10 @@ class ChangeSetHelper {
      */
     CLASS_NAME = "ChangeSetHelper";
     /**
-     * The logging connector to use for logging.
+     * The logging component to use for logging.
      * @internal
      */
-    _logging;
+    _loggingComponent;
     /**
      * The event bus component.
      * @internal
@@ -523,14 +522,14 @@ class ChangeSetHelper {
     _nodeIdentity;
     /**
      * Create a new instance of ChangeSetHelper.
-     * @param logging The logging connector to use for logging.
+     * @param loggingComponent The logging connector to use for logging.
      * @param eventBusComponent The event bus component to use for events.
      * @param identityConnector The identity connector to use for signing/verifying changesets.
      * @param blobStorageHelper The blob storage component to use for remote sync states.
      * @param decentralisedStorageMethodId The id of the identity method to use when signing/verifying changesets.
      */
-    constructor(logging, eventBusComponent, identityConnector, blobStorageHelper, decentralisedStorageMethodId) {
-        this._logging = logging;
+    constructor(loggingComponent, eventBusComponent, identityConnector, blobStorageHelper, decentralisedStorageMethodId) {
+        this._loggingComponent = loggingComponent;
         this._eventBusComponent = eventBusComponent;
         this._decentralisedStorageMethodId = decentralisedStorageMethodId;
         this._blobStorageHelper = blobStorageHelper;
@@ -549,7 +548,7 @@ class ChangeSetHelper {
      * @returns The changeset if it was verified.
      */
     async getAndVerifyChangeset(changeSetStorageId) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "getChangeSet",
@@ -565,7 +564,7 @@ class ChangeSetHelper {
             }
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "warn",
                 source: this.CLASS_NAME,
                 message: "getChangeSetError",
@@ -575,7 +574,7 @@ class ChangeSetHelper {
                 error: core.BaseError.fromError(error)
             });
         }
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "getChangeSetEmpty",
@@ -606,7 +605,7 @@ class ChangeSetHelper {
     async applyChangeset(syncChangeset) {
         if (core.Is.arrayValue(syncChangeset.changes)) {
             for (const change of syncChangeset.changes) {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "changeSetApplyingChange",
@@ -652,7 +651,7 @@ class ChangeSetHelper {
      * @returns The id of the change set.
      */
     async storeChangeSet(syncChangeSet) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "changeSetStoring",
@@ -669,7 +668,7 @@ class ChangeSetHelper {
      */
     async verifyChangesetProof(syncChangeset) {
         if (core.Is.empty(syncChangeset.proof)) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "verifyChangeSetProofMissing",
@@ -682,7 +681,7 @@ class ChangeSetHelper {
         // If the proof or verification method is missing, the proof is invalid
         const verificationMethod = syncChangeset.proof?.verificationMethod;
         if (!core.Is.stringValue(verificationMethod)) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "verifyChangeSetProofMissing",
@@ -696,7 +695,7 @@ class ChangeSetHelper {
         // otherwise you could sign a changeset for another node
         const changeSetNodeIdentity = identityModels.DocumentHelper.parseId(verificationMethod ?? "");
         if (changeSetNodeIdentity.id !== syncChangeset.nodeIdentity) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "verifyChangeSetProofNodeIdentityMismatch",
@@ -709,7 +708,7 @@ class ChangeSetHelper {
         delete changeSetWithoutProof.proof;
         const isValid = await this._identityConnector.verifyProof(changeSetWithoutProof, syncChangeset.proof);
         if (!isValid) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "verifyChangeSetProofInvalid",
@@ -719,7 +718,7 @@ class ChangeSetHelper {
             });
         }
         else {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "verifyChangeSetProofValid",
@@ -740,7 +739,7 @@ class ChangeSetHelper {
         const changeSetWithoutProof = core.ObjectHelper.clone(syncChangeset);
         delete changeSetWithoutProof.proof;
         const proof = await this._identityConnector.createProof(this._nodeIdentity, identityModels.DocumentHelper.joinId(this._nodeIdentity, this._decentralisedStorageMethodId), standardsW3cDid.ProofTypes.DataIntegrityProof, changeSetWithoutProof);
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "createdChangeSetProof",
@@ -760,7 +759,7 @@ class ChangeSetHelper {
         if (core.Is.stringValue(this._nodeIdentity)) {
             const verified = await this.verifyChangesetProof(syncChangeSet);
             if (verified) {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "copyChangeSet",
@@ -789,7 +788,7 @@ class ChangeSetHelper {
     async reset(storageKey, resetMode) {
         // If we are applying a consolidation we need to reset the local db
         // but keep any entries from the local node, as they might have been updated
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "storageReset",
@@ -821,10 +820,10 @@ class LocalSyncStateHelper {
      */
     CLASS_NAME = "LocalSyncStateHelper";
     /**
-     * The logging connector to use for logging.
+     * The logging component to use for logging.
      * @internal
      */
-    _logging;
+    _loggingComponent;
     /**
      * The storage connector for the sync snapshot entries.
      * @internal
@@ -837,12 +836,12 @@ class LocalSyncStateHelper {
     _changeSetHelper;
     /**
      * Create a new instance of LocalSyncStateHelper.
-     * @param logging The logging connector to use for logging.
+     * @param loggingComponent The logging connector to use for logging.
      * @param snapshotEntryEntityStorage The storage connector for the sync snapshot entries.
      * @param changeSetHelper The change set helper to use for applying changesets.
      */
-    constructor(logging, snapshotEntryEntityStorage, changeSetHelper) {
-        this._logging = logging;
+    constructor(loggingComponent, snapshotEntryEntityStorage, changeSetHelper) {
+        this._loggingComponent = loggingComponent;
         this._snapshotEntryEntityStorage = snapshotEntryEntityStorage;
         this._changeSetHelper = changeSetHelper;
     }
@@ -854,7 +853,7 @@ class LocalSyncStateHelper {
      * @returns Nothing.
      */
     async addLocalChange(storageKey, operation, id) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "addLocalChange",
@@ -892,7 +891,7 @@ class LocalSyncStateHelper {
      * @returns The local snapshot entry.
      */
     async getSnapshots(storageKey, isLocal) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "getSnapshots",
@@ -915,7 +914,7 @@ class LocalSyncStateHelper {
             ]
         });
         if (queryResult.entities.length > 0) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "getSnapshotsExists",
@@ -925,7 +924,7 @@ class LocalSyncStateHelper {
             });
             return queryResult.entities;
         }
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "getSnapshotsDoesNotExist",
@@ -954,7 +953,7 @@ class LocalSyncStateHelper {
      * @returns Nothing.
      */
     async setLocalChangeSnapshot(localChangeSnapshot) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "setLocalChangeSnapshot",
@@ -970,7 +969,7 @@ class LocalSyncStateHelper {
      * @returns Nothing.
      */
     async removeLocalChangeSnapshot(localChangeSnapshot) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "removeLocalChangeSnapshot",
@@ -987,7 +986,7 @@ class LocalSyncStateHelper {
      * @returns Nothing.
      */
     async applySyncState(storageKey, syncState) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "applySyncState",
@@ -1012,7 +1011,7 @@ class LocalSyncStateHelper {
         // If we have an epoch gap or no existing snapshots then we need to apply
         // a full sync from a consolidation
         if (!existingSnapshots.some(s => s.isConsolidated) || hasEpochGap) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "applySnapshotNoExisting",
@@ -1023,7 +1022,7 @@ class LocalSyncStateHelper {
             const mostRecentConsolidation = syncStateSnapshots.findIndex(snapshot => snapshot.isConsolidated);
             if (mostRecentConsolidation !== -1) {
                 // We found the most recent consolidated snapshot, we can use it
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "applySnapshotFoundConsolidated",
@@ -1051,7 +1050,7 @@ class LocalSyncStateHelper {
                 }
             }
             else {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "applySnapshotNoConsolidated",
@@ -1076,7 +1075,7 @@ class LocalSyncStateHelper {
             const referencedExistingSnapshots = Object.keys(existingSnapshotsMap);
             let completedProcessing = false;
             for (const snapshot of syncStateSnapshots) {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "applySnapshot",
@@ -1137,7 +1136,7 @@ class LocalSyncStateHelper {
      */
     async processModifiedSnapshots(modifiedSnapshots) {
         for (const modifiedSnapshot of modifiedSnapshots) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "processModifiedSnapshot",
@@ -1170,7 +1169,7 @@ class LocalSyncStateHelper {
      */
     async processNewSnapshots(newSnapshots) {
         for (const newSnapshot of newSnapshots) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "processNewSnapshot",
@@ -1201,10 +1200,10 @@ class RemoteSyncStateHelper {
      */
     CLASS_NAME = "RemoteSyncStateHelper";
     /**
-     * The logging connector to use for logging.
+     * The logging component to use for logging.
      * @internal
      */
-    _logging;
+    _loggingComponent;
     /**
      * The event bus component.
      * @internal
@@ -1257,7 +1256,7 @@ class RemoteSyncStateHelper {
     _maxConsolidations;
     /**
      * Create a new instance of DecentralisedEntityStorageConnector.
-     * @param logging The logging connector to use for logging.
+     * @param loggingComponent The logging component to use for logging.
      * @param eventBusComponent The event bus component to use for events.
      * @param verifiableSyncPointerStorageConnector The verifiable storage connector to use for storing sync pointers.
      * @param blobStorageHelper The blob storage helper to use for remote sync states.
@@ -1265,8 +1264,8 @@ class RemoteSyncStateHelper {
      * @param isTrustedNode Whether the node is trusted or not.
      * @param maxConsolidations The maximum number of consolidations to keep in storage.
      */
-    constructor(logging, eventBusComponent, verifiableSyncPointerStorageConnector, blobStorageHelper, changeSetHelper, isTrustedNode, maxConsolidations) {
-        this._logging = logging;
+    constructor(loggingComponent, eventBusComponent, verifiableSyncPointerStorageConnector, blobStorageHelper, changeSetHelper, isTrustedNode, maxConsolidations) {
+        this._loggingComponent = loggingComponent;
         this._eventBusComponent = eventBusComponent;
         this._verifiableSyncPointerStorageConnector = verifiableSyncPointerStorageConnector;
         this._changeSetHelper = changeSetHelper;
@@ -1304,7 +1303,7 @@ class RemoteSyncStateHelper {
      * @returns The storage id of the change set if created.
      */
     async buildChangeSet(storageKey, changes, completeCallback) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "buildingChangeSet",
@@ -1330,7 +1329,7 @@ class RemoteSyncStateHelper {
             // Once all the requests are handled the callback will be called
             for (const change of setChanges) {
                 // Create a request for each change to populate the full details
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "createChangeSetRequestingItem",
@@ -1353,7 +1352,7 @@ class RemoteSyncStateHelper {
      * @returns Nothing.
      */
     async finaliseFullChanges(storageKey, completeCallback) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "finalisingSyncChanges",
@@ -1394,7 +1393,7 @@ class RemoteSyncStateHelper {
                 await completeCallback(syncChangeSet, changeSetStorageId);
             }
             catch (err) {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "error",
                     source: this.CLASS_NAME,
                     message: "finalisingSyncChangesFailed",
@@ -1417,7 +1416,7 @@ class RemoteSyncStateHelper {
      * @returns Nothing.
      */
     async addChangeSetToSyncState(storageKey, changeSetStorageId) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "addChangeSetToSyncState",
@@ -1474,7 +1473,7 @@ class RemoteSyncStateHelper {
      * @returns Nothing.
      */
     async consolidationStart(storageKey, batchSize) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "consolidationStarting"
@@ -1489,7 +1488,7 @@ class RemoteSyncStateHelper {
     async getVerifiableSyncPointerStore() {
         if (core.Is.stringValue(this._synchronisedStorageKey)) {
             try {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "verifiableSyncPointerStoreRetrieving",
@@ -1500,7 +1499,7 @@ class RemoteSyncStateHelper {
                 const syncPointerStore = await this._verifiableSyncPointerStorageConnector.get(this._synchronisedStorageKey, { includeData: true });
                 if (core.Is.uint8Array(syncPointerStore.data)) {
                     const syncPointer = core.ObjectHelper.fromBytes(syncPointerStore.data);
-                    await this._logging?.log({
+                    await this._loggingComponent?.log({
                         level: "info",
                         source: this.CLASS_NAME,
                         message: "verifiableSyncPointerStoreRetrieved",
@@ -1516,7 +1515,7 @@ class RemoteSyncStateHelper {
                     throw err;
                 }
             }
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "verifiableSyncPointerStoreNotFound",
@@ -1538,7 +1537,7 @@ class RemoteSyncStateHelper {
      */
     async storeVerifiableSyncPointerStore(syncPointerStore) {
         if (core.Is.stringValue(this._nodeIdentity) && core.Is.stringValue(this._synchronisedStorageKey)) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "verifiableSyncPointerStoreStoring",
@@ -1556,7 +1555,7 @@ class RemoteSyncStateHelper {
      * @returns The id of the sync state.
      */
     async storeRemoteSyncState(syncState) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "syncStateStoring",
@@ -1599,7 +1598,7 @@ class RemoteSyncStateHelper {
      */
     async getSyncState(syncPointerId) {
         try {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "syncStateRetrieving",
@@ -1609,7 +1608,7 @@ class RemoteSyncStateHelper {
             });
             const syncState = await this._blobStorageHelper.loadBlob(syncPointerId);
             if (core.Is.object(syncState)) {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "syncStateRetrieved",
@@ -1622,7 +1621,7 @@ class RemoteSyncStateHelper {
             }
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "warn",
                 source: this.CLASS_NAME,
                 message: "getSyncStateError",
@@ -1632,7 +1631,7 @@ class RemoteSyncStateHelper {
                 error: core.BaseError.fromError(error)
             });
         }
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "syncStateNotFound",
@@ -1704,7 +1703,7 @@ class RemoteSyncStateHelper {
                 // Remove the batch response storage ids for the storage key
                 // as we have consolidated the changes
                 delete this._batchResponseStorageIds[response.storageKey];
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "consolidationCompleted"
@@ -1717,7 +1716,7 @@ class RemoteSyncStateHelper {
      * @param response The item response to handle.
      */
     async handleLocalItemResponse(response) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "createChangeSetRespondingItem",
@@ -1771,10 +1770,10 @@ class SynchronisedStorageService {
      */
     CLASS_NAME = "SynchronisedStorageService";
     /**
-     * The logging connector to use for logging.
+     * The logging component to use for logging.
      * @internal
      */
-    _logging;
+    _loggingComponent;
     /**
      * The event bus component.
      * @internal
@@ -1868,7 +1867,7 @@ class SynchronisedStorageService {
         core.Guards.object(this.CLASS_NAME, "options", options);
         core.Guards.object(this.CLASS_NAME, "options.config", options.config);
         this._eventBusComponent = core.ComponentFactory.get(options.eventBusComponentType ?? "event-bus");
-        this._logging = loggingModels.LoggingConnectorFactory.getIfExists(options.loggingConnectorType ?? "logging");
+        this._loggingComponent = core.ComponentFactory.getIfExists(options.loggingComponentType ?? "logging");
         this._vaultConnector = vaultModels.VaultConnectorFactory.get(options.vaultConnectorType ?? "vault");
         this._localSyncSnapshotEntryEntityStorage = entityStorageModels.EntityStorageConnectorFactory.get(options.syncSnapshotStorageConnectorType ?? "sync-snapshot-entry");
         this._verifiableSyncPointerStorageConnector = verifiableStorageModels.VerifiableStorageConnectorFactory.get(options.verifiableStorageConnectorType ?? "verifiable-storage");
@@ -1897,10 +1896,10 @@ class SynchronisedStorageService {
             this._trustedSynchronisedStorageComponent =
                 core.ComponentFactory.get(options.trustedSynchronisedStorageComponentType);
         }
-        this._blobStorageHelper = new BlobStorageHelper(this._logging, this._vaultConnector, this._blobStorageConnector, this._config.blobStorageEncryptionKeyId, this._config.isTrustedNode);
-        this._changeSetHelper = new ChangeSetHelper(this._logging, this._eventBusComponent, this._identityConnector, this._blobStorageHelper, this._config.synchronisedStorageMethodId);
-        this._localSyncStateHelper = new LocalSyncStateHelper(this._logging, this._localSyncSnapshotEntryEntityStorage, this._changeSetHelper);
-        this._remoteSyncStateHelper = new RemoteSyncStateHelper(this._logging, this._eventBusComponent, this._verifiableSyncPointerStorageConnector, this._blobStorageHelper, this._changeSetHelper, this._config.isTrustedNode, this._config.maxConsolidations);
+        this._blobStorageHelper = new BlobStorageHelper(this._loggingComponent, this._vaultConnector, this._blobStorageConnector, this._config.blobStorageEncryptionKeyId, this._config.isTrustedNode);
+        this._changeSetHelper = new ChangeSetHelper(this._loggingComponent, this._eventBusComponent, this._identityConnector, this._blobStorageHelper, this._config.synchronisedStorageMethodId);
+        this._localSyncStateHelper = new LocalSyncStateHelper(this._loggingComponent, this._localSyncSnapshotEntryEntityStorage, this._changeSetHelper);
+        this._remoteSyncStateHelper = new RemoteSyncStateHelper(this._loggingComponent, this._eventBusComponent, this._verifiableSyncPointerStorageConnector, this._blobStorageHelper, this._changeSetHelper, this._config.isTrustedNode, this._config.maxConsolidations);
         this._serviceStarted = false;
         this._activeStorageKeys = {};
         this._eventBusComponent.subscribe(synchronisedStorageModels.SynchronisedStorageTopics.RegisterStorageKey, async (event) => this.registerStorageKey(event.data));
@@ -1985,7 +1984,7 @@ class SynchronisedStorageService {
             throw new core.GeneralError(this.CLASS_NAME, "notTrustedNode");
         }
         core.Guards.object(this.CLASS_NAME, "syncChangeSet", syncChangeSet);
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "syncChangeSetForRemoteNode",
@@ -2014,7 +2013,7 @@ class SynchronisedStorageService {
      */
     async startEntitySync(storageKey) {
         try {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "startEntitySync",
@@ -2028,7 +2027,7 @@ class SynchronisedStorageService {
             await this.updateFromLocalSyncState(storageKey);
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "entitySyncFailed",
@@ -2043,7 +2042,7 @@ class SynchronisedStorageService {
      * @internal
      */
     async updateFromRemoteSyncState(storageKey) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "updateFromRemoteSyncState",
@@ -2069,7 +2068,7 @@ class SynchronisedStorageService {
      * @internal
      */
     async updateFromLocalSyncState(storageKey) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "updateFromLocalSyncState",
@@ -2083,7 +2082,7 @@ class SynchronisedStorageService {
             if (core.Is.arrayValue(localChangeSnapshot.changes)) {
                 await this._remoteSyncStateHelper.buildChangeSet(storageKey, localChangeSnapshot.changes, async (syncChangeSet, changeSetStorageId) => {
                     if (core.Is.empty(syncChangeSet) && core.Is.empty(changeSetStorageId)) {
-                        await this._logging?.log({
+                        await this._loggingComponent?.log({
                             level: "info",
                             source: this.CLASS_NAME,
                             message: "builtStorageChangeSetNone",
@@ -2093,7 +2092,7 @@ class SynchronisedStorageService {
                         });
                     }
                     else {
-                        await this._logging?.log({
+                        await this._loggingComponent?.log({
                             level: "info",
                             source: this.CLASS_NAME,
                             message: "builtStorageChangeSet",
@@ -2113,7 +2112,7 @@ class SynchronisedStorageService {
                             core.Is.object(syncChangeSet)) {
                             // If we are not a trusted node, we need to send the changes to the trusted node
                             // and then remove the local change snapshot
-                            await this._logging?.log({
+                            await this._loggingComponent?.log({
                                 level: "info",
                                 source: this.CLASS_NAME,
                                 message: "sendingChangeSetToTrustedNode",
@@ -2129,7 +2128,7 @@ class SynchronisedStorageService {
                 });
             }
             else {
-                await this._logging?.log({
+                await this._loggingComponent?.log({
                     level: "info",
                     source: this.CLASS_NAME,
                     message: "updateFromLocalSyncStateNoChanges",
@@ -2158,7 +2157,7 @@ class SynchronisedStorageService {
                 SynchronisedStorageService._DEFAULT_CONSOLIDATION_BATCH_SIZE);
         }
         catch (error) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "error",
                 source: this.CLASS_NAME,
                 message: "consolidationSyncFailed",
@@ -2172,7 +2171,7 @@ class SynchronisedStorageService {
      * @internal
      */
     async registerStorageKey(syncRegisterStorageKey) {
-        await this._logging?.log({
+        await this._loggingComponent?.log({
             level: "info",
             source: this.CLASS_NAME,
             message: "registerStorageKey",
@@ -2194,7 +2193,7 @@ class SynchronisedStorageService {
      */
     async activateStorageKey(storageKey) {
         if (!core.Is.empty(this._activeStorageKeys[storageKey]) && !this._activeStorageKeys[storageKey]) {
-            await this._logging?.log({
+            await this._loggingComponent?.log({
                 level: "info",
                 source: this.CLASS_NAME,
                 message: "activateStorageKey",