@twin.org/node-core 0.0.3-next.3 → 0.0.3-next.30

package/README.md

@@ -1,6 +1,8 @@
 # TWIN Node Core
 
-Core components for running TWIN nodes with dynamic extension loading and protocol-based module resolution.
+This package provides the shared runtime foundation for hosting service workloads in a Node.js environment. It brings together reusable server capabilities, command tooling support, and integration patterns that help teams run API driven workloads with consistent behaviour.
+
+By centralising this functionality, the package reduces duplication across applications and creates a stable base for extension as platform needs evolve. It is designed to support reliable day to day operation while keeping implementation concerns clear and maintainable.
 
 ## Installation
 

package/dist/es/builders/engineEnvBuilder.js

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0.
 import path from "node:path";
 import { Coerce, Is } from "@twin.org/core";
-import { AttestationComponentType, AttestationConnectorType, AuditableItemGraphComponentType, AuditableItemStreamComponentType, AuthenticationGeneratorComponentType, BackgroundTaskConnectorType, BlobStorageComponentType, BlobStorageConnectorType, ContextIdHandlerComponentType, DataConverterConnectorType, DataExtractorConnectorType, DataProcessingComponentType, DataSpaceConnectorComponentType, DltConfigType, DocumentManagementComponentType, EngineTypeHelper, EntityStorageConnectorType, EventBusComponentType, EventBusConnectorType, FaucetConnectorType, FederatedCatalogueComponentType, IdentityComponentType, IdentityConnectorType, IdentityProfileComponentType, IdentityProfileConnectorType, IdentityResolverComponentType, IdentityResolverConnectorType, ImmutableProofComponentType, LoggingComponentType, LoggingConnectorType, MessagingAdminComponentType, MessagingComponentType, MessagingEmailConnectorType, MessagingPushNotificationConnectorType, MessagingSmsConnectorType, NftComponentType, NftConnectorType, RightsManagementDapComponentType, RightsManagementDarpComponentType, RightsManagementPapComponentType, RightsManagementPdpComponentType, RightsManagementPepComponentType, RightsManagementPipComponentType, RightsManagementPmpComponentType, RightsManagementPnapComponentType, RightsManagementPnpComponentType, RightsManagementPxpComponentType, SynchronisedStorageComponentType, TaskSchedulerComponentType, TelemetryComponentType, TelemetryConnectorType, TenantAdminComponentType, VaultConnectorType, VerifiableStorageComponentType, VerifiableStorageConnectorType, WalletConnectorType } from "@twin.org/engine-types";
-import { DataAccessPointRestClient, PolicyNegotiationPointRestClient } from "@twin.org/rights-management-rest-client";
-import { ATTESTATION_VERIFICATION_METHOD_ID, BLOB_STORAGE_ENCRYPTION_KEY_ID, CONTEXT_ID_HANDLER_FEATURE_DID, CONTEXT_ID_HANDLER_FEATURE_TENANT, IMMUTABLE_PROOF_VERIFICATION_METHOD_ID, SYNCHRONISED_STORAGE_BLOB_STORAGE_ENCRYPTION_KEY_ID, VC_AUTHENTICATION_VERIFICATION_METHOD_ID } from "../defaults.js";
+import { AttestationComponentType, AttestationConnectorType, AuditableItemGraphComponentType, AuditableItemStreamComponentType, BackgroundTaskComponentType, BlobStorageComponentType, BlobStorageConnectorType, ContextIdHandlerComponentType, DataProcessingComponentType, DataspaceControlPlaneComponentType, DataspaceDataPlaneComponentType, DltConfigType, DocumentManagementComponentType, EngineTypeHelper, EntityStorageConnectorType, EventBusComponentType, EventBusConnectorType, FaucetConnectorType, FederatedCatalogueComponentType, IdentityComponentType, IdentityConnectorType, IdentityProfileComponentType, IdentityProfileConnectorType, IdentityResolverComponentType, IdentityResolverConnectorType, ImmutableProofComponentType, LoggingComponentType, LoggingConnectorType, MessagingAdminComponentType, MessagingComponentType, MessagingEmailConnectorType, MessagingPushNotificationConnectorType, MessagingSmsConnectorType, NftComponentType, NftConnectorType, RightsManagementPapComponentType, RightsManagementPdpComponentType, RightsManagementPepComponentType, RightsManagementPipComponentType, RightsManagementPmpComponentType, RightsManagementPnapComponentType, RightsManagementPnpComponentType, RightsManagementPxpComponentType, SynchronisedStorageComponentType, TaskSchedulerComponentType, TelemetryComponentType, TelemetryConnectorType, TenantAdminComponentType, TrustComponentType, VaultConnectorType, VerifiableStorageComponentType, VerifiableStorageConnectorType, WalletConnectorType } from "@twin.org/engine-types";
+import { CONTEXT_ID_HANDLER_FEATURE_DID, CONTEXT_ID_HANDLER_FEATURE_TENANT } from "../defaults.js";
 /**
  * Build the engine core configuration from environment variables.
  * @param envVars The environment variables.
@@ -19,6 +18,7 @@ export async function buildEngineConfiguration(envVars, contextIdKeys) {
     }
     const coreConfig = {
         debug: Coerce.boolean(envVars.debug) ?? false,
+        silent: Coerce.boolean(envVars.silent) ?? false,
         types: {}
     };
     await configureTenant(coreConfig, envVars);
@@ -45,11 +45,11 @@ export async function buildEngineConfiguration(envVars, contextIdKeys) {
     await configureAuditableItemGraph(coreConfig, envVars);
     await configureAuditableItemStream(coreConfig, envVars);
     await configureDocumentManagement(coreConfig, envVars);
-    await configureVerifiableCredentialAuthentication(coreConfig, envVars);
+    await configureTrust(coreConfig, envVars);
     await configureRightsManagement(coreConfig, envVars);
     await configureSynchronisedStorage(coreConfig, envVars);
     await configureFederatedCatalogue(coreConfig, envVars);
-    await configureDataSpaceConnector(coreConfig, envVars);
+    await configureDataspace(coreConfig, envVars);
     return coreConfig;
 }
 /**
@@ -60,7 +60,7 @@ export async function buildEngineConfiguration(envVars, contextIdKeys) {
 async function configureEntityStorage(coreConfig, envVars) {
     coreConfig.types ??= {};
     coreConfig.types.entityStorageConnector ??= [];
-    const entityStorageConnectorTypes = envVars.entityStorageConnectorType?.split(",") ?? [];
+    const entityStorageConnectorTypes = commaSeparatedListToArray(envVars.entityStorageConnectorType);
     if (entityStorageConnectorTypes.includes(EntityStorageConnectorType.Memory)) {
         coreConfig.types.entityStorageConnector.push({
             type: EntityStorageConnectorType.Memory
@@ -84,7 +84,8 @@ async function configureEntityStorage(coreConfig, envVars) {
                     authMode: envVars.awsDynamodbAuthMode,
                     accessKeyId: envVars.awsDynamodbAccessKeyId,
                     secretAccessKey: envVars.awsDynamodbSecretAccessKey,
-                    endpoint: envVars.awsDynamodbEndpoint
+                    endpoint: envVars.awsDynamodbEndpoint,
+                    connectionTimeoutMs: Coerce.integer(envVars.awsDynamodbConnectionTimeoutMs)
                 },
                 tablePrefix: envVars.entityStorageTablePrefix
             }
@@ -124,7 +125,7 @@ async function configureEntityStorage(coreConfig, envVars) {
             type: EntityStorageConnectorType.ScyllaDb,
             options: {
                 config: {
-                    hosts: envVars.scylladbHosts?.split(",") ?? [],
+                    hosts: commaSeparatedListToArray(envVars.scylladbHosts),
                     localDataCenter: envVars.scylladbLocalDataCenter ?? "",
                     keyspace: envVars.scylladbKeyspace ?? "",
                     port: Coerce.integer(envVars.scylladbPort)
@@ -179,15 +180,6 @@ async function configureEntityStorage(coreConfig, envVars) {
         });
     }
     const defaultEntityStorageConnectorType = envVars.entityStorageConnectorDefault ?? entityStorageConnectorTypes[0];
-    if (entityStorageConnectorTypes.includes(EntityStorageConnectorType.Synchronised)) {
-        // For synchronised storage we use the default connector as the one we wrap for real DB operations
-        coreConfig.types.entityStorageConnector.push({
-            type: EntityStorageConnectorType.Synchronised,
-            options: {
-                entityStorageConnectorType: defaultEntityStorageConnectorType
-            }
-        });
-    }
     if (Is.arrayValue(entityStorageConnectorTypes)) {
         for (const config of coreConfig.types.entityStorageConnector) {
             if (config.type === defaultEntityStorageConnectorType) {
@@ -204,7 +196,7 @@ async function configureEntityStorage(coreConfig, envVars) {
  */
 async function configureBlobStorage(coreConfig, envVars) {
     coreConfig.types.blobStorageConnector ??= [];
-    const blobStorageConnectorTypes = envVars.blobStorageConnectorType?.split(",") ?? [];
+    const blobStorageConnectorTypes = commaSeparatedListToArray(envVars.blobStorageConnectorType);
     if (blobStorageConnectorTypes.includes(BlobStorageConnectorType.Memory)) {
         coreConfig.types.blobStorageConnector.push({
             type: BlobStorageConnectorType.Memory
@@ -301,7 +293,7 @@ async function configureBlobStorage(coreConfig, envVars) {
             options: {
                 config: {
                     vaultKeyId: (envVars.blobStorageEnableEncryption ?? false)
-                        ? (envVars.blobStorageEncryptionKeyId ?? BLOB_STORAGE_ENCRYPTION_KEY_ID)
+                        ? envVars.blobStorageEncryptionKeyId
                         : undefined
                 }
             }
@@ -315,7 +307,7 @@ async function configureBlobStorage(coreConfig, envVars) {
  */
 async function configureLogging(coreConfig, envVars) {
     coreConfig.types.loggingConnector ??= [];
-    const loggingConnectorTypes = (envVars.loggingConnector ?? "").split(",");
+    const loggingConnectorTypes = commaSeparatedListToArray(envVars.loggingConnector);
     let additionalConnectorCount = 0;
     for (const loggingConnector of loggingConnectorTypes) {
         if (loggingConnector === LoggingConnectorType.Console) {
@@ -369,7 +361,12 @@ async function configureVault(coreConfig, envVars) {
     coreConfig.types.vaultConnector ??= [];
     if (envVars.vaultConnector === VaultConnectorType.EntityStorage) {
         coreConfig.types.vaultConnector.push({
-            type: VaultConnectorType.EntityStorage
+            type: VaultConnectorType.EntityStorage,
+            options: {
+                config: {
+                    prefix: envVars.vaultPrefix
+                }
+            }
         });
     }
     else if (envVars.vaultConnector === VaultConnectorType.Hashicorp) {
@@ -378,7 +375,8 @@ async function configureVault(coreConfig, envVars) {
             options: {
                 config: {
                     endpoint: envVars.hashicorpVaultEndpoint ?? "",
-                    token: envVars.hashicorpVaultToken ?? ""
+                    token: envVars.hashicorpVaultToken ?? "",
+                    prefix: envVars.vaultPrefix
                 }
             }
         });
@@ -390,10 +388,10 @@ async function configureVault(coreConfig, envVars) {
  * @param envVars The environment variables.
  */
 async function configureBackgroundTask(coreConfig, envVars) {
-    coreConfig.types.backgroundTaskConnector ??= [];
-    if (envVars.backgroundTaskConnector === BackgroundTaskConnectorType.EntityStorage) {
-        coreConfig.types.backgroundTaskConnector.push({
-            type: BackgroundTaskConnectorType.EntityStorage
+    coreConfig.types.backgroundTaskComponent ??= [];
+    if (Coerce.boolean(envVars.backgroundTasksEnabled) ?? false) {
+        coreConfig.types.backgroundTaskComponent.push({
+            type: BackgroundTaskComponentType.Service
         });
     }
 }
@@ -528,7 +526,7 @@ async function configureMessaging(coreConfig, envVars) {
                         accessKeyId: envVars.awsSesAccessKeyId,
                         secretAccessKey: envVars.awsSesSecretAccessKey,
                         endpoint: envVars.awsSesEndpoint,
-                        applicationsSettings: Is.json(envVars.awsMessagingPushNotificationApplications)
+                        applicationsSettings: Is.array(envVars.awsMessagingPushNotificationApplications)
                             ? JSON.parse(envVars.awsMessagingPushNotificationApplications)
                             : []
                     }
@@ -648,7 +646,7 @@ async function configureVerifiableStorage(coreConfig, envVars) {
             type: ImmutableProofComponentType.Service,
             options: {
                 config: {
-                    verificationMethodId: envVars.immutableProofVerificationMethodId ?? IMMUTABLE_PROOF_VERIFICATION_METHOD_ID
+                    verificationMethodId: envVars.immutableProofVerificationMethodId
                 }
             }
         });
@@ -671,7 +669,10 @@ async function configureIdentity(coreConfig, envVars) {
         coreConfig.types.identityConnector.push({
             type: IdentityConnectorType.Iota,
             options: {
-                config: dltConfig?.options?.config ?? {}
+                config: {
+                    ...(dltConfig?.options?.config ?? {}),
+                    walletAddressIndex: Coerce.integer(envVars.identityWalletAddressIndex) ?? 0
+                }
             }
         });
     }
@@ -753,7 +754,7 @@ async function configureAttestation(coreConfig, envVars) {
             type: AttestationComponentType.Service,
             options: {
                 config: {
-                    verificationMethodId: envVars.attestationVerificationMethodId ?? ATTESTATION_VERIFICATION_METHOD_ID
+                    verificationMethodId: envVars.attestationVerificationMethodId
                 }
             }
         });
@@ -795,27 +796,18 @@ async function configureDataProcessing(coreConfig, envVars) {
         coreConfig.types.dataProcessingComponent ??= [];
         coreConfig.types.dataProcessingComponent.push({ type: DataProcessingComponentType.Service });
         coreConfig.types.dataConverterConnector ??= [];
-        const converterConnectors = envVars.dataConverterConnectors?.split(",") ?? [];
+        const converterConnectors = commaSeparatedListToArray(envVars.dataConverterConnectors);
         for (const converterConnector of converterConnectors) {
-            if (converterConnector === DataConverterConnectorType.Json) {
-                coreConfig.types.dataConverterConnector.push({
-                    type: DataConverterConnectorType.Json
-                });
-            }
-            else if (converterConnector === DataConverterConnectorType.Xml) {
-                coreConfig.types.dataConverterConnector.push({
-                    type: DataConverterConnectorType.Xml
-                });
-            }
+            coreConfig.types.dataConverterConnector.push({
+                type: converterConnector
+            });
         }
         coreConfig.types.dataExtractorConnector ??= [];
-        const extractorConnectors = envVars.dataExtractorConnectors?.split(",") ?? [];
+        const extractorConnectors = commaSeparatedListToArray(envVars.dataExtractorConnectors);
         for (const extractorConnector of extractorConnectors) {
-            if (extractorConnector === DataExtractorConnectorType.JsonPath) {
-                coreConfig.types.dataExtractorConnector.push({
-                    type: DataExtractorConnectorType.JsonPath
-                });
-            }
+            coreConfig.types.dataExtractorConnector.push({
+                type: extractorConnector
+            });
         }
     }
 }
@@ -833,23 +825,36 @@ async function configureDocumentManagement(coreConfig, envVars) {
     }
 }
 /**
- * Configures the verifiable credential authentication.
+ * Configures the trust components.
  * @param coreConfig The core config.
  * @param envVars The environment variables.
  */
-async function configureVerifiableCredentialAuthentication(coreConfig, envVars) {
-    if (Coerce.boolean(envVars.vcAuthenticationEnabled) ?? false) {
-        // Can only perform VC authentication if identity component is available
-        coreConfig.types.authenticationGeneratorComponent ??= [];
-        coreConfig.types.authenticationGeneratorComponent.push({
-            type: AuthenticationGeneratorComponentType.VerifiableCredential,
-            options: {
-                config: {
-                    verificationMethodId: envVars.vcAuthenticationVerificationMethodId ?? VC_AUTHENTICATION_VERIFICATION_METHOD_ID
+async function configureTrust(coreConfig, envVars) {
+    if (Coerce.boolean(envVars.trustEnabled) ?? false) {
+        coreConfig.types.trustComponent ??= [];
+        coreConfig.types.trustComponent.push({
+            type: TrustComponentType.Service
+        });
+        coreConfig.types.trustGeneratorComponent ??= [];
+        const trustGeneratorTypes = commaSeparatedListToArray(envVars.trustGenerators);
+        for (const trustGeneratorType of trustGeneratorTypes) {
+            coreConfig.types.trustGeneratorComponent.push({
+                type: trustGeneratorType,
+                options: {
+                    config: {
+                        verificationMethodId: envVars.trustVerificationMethodId ?? "",
+                        tokenTtlInSeconds: Coerce.integer(envVars.trustJwtTtlSeconds)
+                    }
                 }
-            },
-            features: ["verifiable-credential"]
-        });
+            });
+        }
+        coreConfig.types.trustVerifierComponent ??= [];
+        const trustVerifierTypes = commaSeparatedListToArray(envVars.trustVerifiers);
+        for (const trustVerifierType of trustVerifierTypes) {
+            coreConfig.types.trustVerifierComponent.push({
+                type: trustVerifierType
+            });
+        }
     }
 }
 /**
@@ -869,76 +874,97 @@ async function configureRightsManagement(coreConfig, envVars) {
         });
         coreConfig.types.rightsManagementPipComponent ??= [];
         coreConfig.types.rightsManagementPipComponent.push({
-            type: RightsManagementPipComponentType.Service,
-            options: {
-                informationModulesConfig: Is.arrayValue(envVars.rightsManagementInformationSources)
-                    ? envVars.rightsManagementInformationSources
-                    : undefined
-            }
+            type: RightsManagementPipComponentType.Service
         });
         coreConfig.types.rightsManagementPxpComponent ??= [];
         coreConfig.types.rightsManagementPxpComponent.push({
-            type: RightsManagementPxpComponentType.Service,
-            options: {
-                actionModulesConfig: Is.arrayValue(envVars.rightsManagementExecutionActions)
-                    ? envVars.rightsManagementExecutionActions
-                    : undefined
-            }
+            type: RightsManagementPxpComponentType.Service
         });
         coreConfig.types.rightsManagementPdpComponent ??= [];
         coreConfig.types.rightsManagementPdpComponent.push({
-            type: RightsManagementPdpComponentType.Service,
-            options: {
-                arbiterModulesConfig: Is.arrayValue(envVars.rightsManagementArbiters)
-                    ? envVars.rightsManagementArbiters
-                    : undefined
-            }
+            type: RightsManagementPdpComponentType.Service
         });
         coreConfig.types.rightsManagementPepComponent ??= [];
         coreConfig.types.rightsManagementPepComponent.push({
-            type: RightsManagementPepComponentType.Service,
-            options: {
-                processorModulesConfig: Is.arrayValue(envVars.rightsManagementEnforcementProcessors)
-                    ? envVars.rightsManagementEnforcementProcessors
-                    : undefined
-            }
+            type: RightsManagementPepComponentType.Service
         });
         coreConfig.types.rightsManagementPnpComponent ??= [];
+        // We add a multi instance REST client for the remote negotiations
+        // use a dummy endpoint for now as the actual endpoint will be provided in the config
+        // of the policy negotiator when it is used for remote negotiations
+        // We must add it before the service as the service needs to be able to request
+        // the REST client type from the engine core to be able to support remote negotiations
+        coreConfig.types.rightsManagementPnpComponent.push({
+            type: RightsManagementPnpComponentType.RestClient,
+            options: {
+                endpoint: "http://localhost"
+            },
+            isMultiInstance: true,
+            features: ["remote"]
+        });
         coreConfig.types.rightsManagementPnpComponent.push({
             type: RightsManagementPnpComponentType.Service,
             options: {
-                negotiatorModulesConfig: Is.arrayValue(envVars.rightsManagementNegotiators)
-                    ? envVars.rightsManagementNegotiators
-                    : undefined,
-                requesterModulesConfig: Is.arrayValue(envVars.rightsManagementRequesters)
-                    ? envVars.rightsManagementRequesters
-                    : undefined,
                 config: {
-                    baseCallbackUrl: envVars.rightsManagementBaseCallbackUrl ?? "",
-                    offers: Is.arrayValue(envVars.rightsManagementOffers)
-                        ? envVars.rightsManagementOffers
-                        : [],
-                    negotiationComponentCreator: async (url) => new PolicyNegotiationPointRestClient({ endpoint: url })
+                    callbackPath: envVars.rightsManagementCallbackPath ?? "",
+                    includeErrorDetails: coreConfig.debug ?? false
                 }
-            }
+            },
+            isDefault: true
         });
         coreConfig.types.rightsManagementPnapComponent ??= [];
         coreConfig.types.rightsManagementPnapComponent.push({
             type: RightsManagementPnapComponentType.Service
         });
-        coreConfig.types.rightsManagementDapComponent ??= [];
-        coreConfig.types.rightsManagementDapComponent.push({
-            type: RightsManagementDapComponentType.Service
-        });
-        coreConfig.types.rightsManagementDarpComponent ??= [];
-        coreConfig.types.rightsManagementDarpComponent.push({
-            type: RightsManagementDarpComponentType.Service,
-            options: {
-                config: {
-                    dataAccessComponentCreator: async (url) => new DataAccessPointRestClient({ endpoint: url })
-                }
-            }
-        });
+        coreConfig.types.rightsManagementPolicyArbiterComponent ??= [];
+        const policyArbiterTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyArbiters);
+        for (const policyArbiterType of policyArbiterTypes) {
+            coreConfig.types.rightsManagementPolicyArbiterComponent.push({
+                type: policyArbiterType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyObligationEnforcerComponent ??= [];
+        const policyObligationEnforcerTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyObligationEnforcers);
+        for (const policyObligationEnforcerType of policyObligationEnforcerTypes) {
+            coreConfig.types.rightsManagementPolicyObligationEnforcerComponent.push({
+                type: policyObligationEnforcerType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyEnforcementProcessorComponent ??= [];
+        const policyEnforcementProcessTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyEnforcementProcessors);
+        for (const policyEnforcementProcessorType of policyEnforcementProcessTypes) {
+            coreConfig.types.rightsManagementPolicyEnforcementProcessorComponent.push({
+                type: policyEnforcementProcessorType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyExecutionActionComponent ??= [];
+        const policyExecutionActionTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyExecutionActions);
+        for (const policyExecutionActionType of policyExecutionActionTypes) {
+            coreConfig.types.rightsManagementPolicyExecutionActionComponent.push({
+                type: policyExecutionActionType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyInformationSourceComponent ??= [];
+        const policyInformationSourceTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyInformationSources);
+        for (const policyInformationSourceType of policyInformationSourceTypes) {
+            coreConfig.types.rightsManagementPolicyInformationSourceComponent.push({
+                type: policyInformationSourceType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyRequesterComponent ??= [];
+        const policyRequesterTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyRequesters);
+        for (const policyRequesterType of policyRequesterTypes) {
+            coreConfig.types.rightsManagementPolicyRequesterComponent.push({
+                type: policyRequesterType
+            });
+        }
+        coreConfig.types.rightsManagementPolicyNegotiatorComponent ??= [];
+        const policyNegotiatorTypes = commaSeparatedListToArray(envVars.rightsManagementPolicyNegotiators);
+        for (const policyNegotiatorType of policyNegotiatorTypes) {
+            coreConfig.types.rightsManagementPolicyNegotiatorComponent.push({
+                type: policyNegotiatorType
+            });
+        }
     }
 }
 /**
@@ -974,8 +1000,7 @@ async function configureSynchronisedStorage(coreConfig, envVars) {
             options: {
                 config: {
                     verifiableStorageKeyId: verifiableStorageKeyId ?? "",
-                    blobStorageEncryptionKeyId: envVars.synchronisedStorageBlobStorageEncryptionKeyId ??
-                        SYNCHRONISED_STORAGE_BLOB_STORAGE_ENCRYPTION_KEY_ID,
+                    blobStorageEncryptionKeyId: envVars.synchronisedStorageBlobStorageEncryptionKeyId,
                     entityUpdateIntervalMinutes: Coerce.number(envVars.synchronisedStorageEntityUpdateIntervalMinutes),
                     consolidationIntervalMinutes: Coerce.number(envVars.synchronisedStorageConsolidationIntervalMinutes),
                     consolidationBatchSize: Coerce.number(envVars.synchronisedStorageConsolidationBatchSize),
@@ -1004,32 +1029,67 @@ async function configureSynchronisedStorage(coreConfig, envVars) {
  */
 async function configureFederatedCatalogue(coreConfig, envVars) {
     if (Coerce.boolean(envVars.federatedCatalogueEnabled) ?? false) {
+        // If synchronised storage is enabled, then we need to add an entity storage connector
+        // using synchronised storage for the federated catalogue component
+        // as it relies on the synchronised storage to sync the data between the different instances of the federated catalogue
+        let overrideEntityStorageType;
+        if ((Coerce.boolean(envVars.synchronisedStorageEnabled) ?? false) &&
+            Is.arrayValue(coreConfig.types.entityStorageConnector)) {
+            let defaultConnector = coreConfig.types.entityStorageConnector.find(connector => connector.isDefault);
+            if (Is.empty(defaultConnector)) {
+                // If there is no default connector, we set the first one as the default one
+                defaultConnector = coreConfig.types.entityStorageConnector[0];
+            }
+            overrideEntityStorageType = "federated-catalogue-dataset";
+            coreConfig.types.entityStorageConnector ??= [];
+            coreConfig.types.entityStorageConnector.push({
+                type: EntityStorageConnectorType.Synchronised,
+                overrideInstanceType: overrideEntityStorageType,
+                options: {
+                    entityStorageConnectorType: defaultConnector.type
+                }
+            });
+        }
         coreConfig.types.federatedCatalogueComponent ??= [];
         coreConfig.types.federatedCatalogueComponent.push({
             type: FederatedCatalogueComponentType.Service,
             options: {
-                config: {
-                    subResourceCacheTtlMs: Coerce.number(envVars.federatedCatalogueCacheTtlMs),
-                    clearingHouseApproverList: Coerce.object(envVars.federatedCatalogueClearingHouseApproverList) ?? []
-                }
+                datasetEntityStorageType: overrideEntityStorageType
             }
         });
+        coreConfig.types.federatedCatalogueFilterComponent ??= [];
+        const filters = commaSeparatedListToArray(envVars.federatedCatalogueFilters);
+        for (const filter of filters) {
+            coreConfig.types.federatedCatalogueFilterComponent.push({
+                type: filter,
+                options: {}
+            });
+        }
     }
 }
 /**
- * Configures the data space connector.
+ * Configures the dataspace control plane and data plane.
  * @param coreConfig The core config.
  * @param envVars The environment variables.
  */
-async function configureDataSpaceConnector(coreConfig, envVars) {
-    if (Coerce.boolean(envVars.dataSpaceConnectorEnabled) ?? false) {
-        coreConfig.types.dataSpaceConnectorComponent ??= [];
-        coreConfig.types.dataSpaceConnectorComponent.push({
-            type: DataSpaceConnectorComponentType.Service,
+async function configureDataspace(coreConfig, envVars) {
+    if (Coerce.boolean(envVars.dataspaceEnabled) ?? false) {
+        coreConfig.types.dataspaceControlPlaneComponent ??= [];
+        coreConfig.types.dataspaceControlPlaneComponent.push({
+            type: DataspaceControlPlaneComponentType.Service,
+            options: {
+                config: {
+                    dataPlanePath: envVars.dataspaceDataPlanePath
+                }
+            }
+        });
+        coreConfig.types.dataspaceDataPlaneComponent ??= [];
+        coreConfig.types.dataspaceDataPlaneComponent.push({
+            type: DataspaceDataPlaneComponentType.Service,
             options: {
                 config: {
-                    retainActivityLogsFor: Coerce.number(envVars.dataSpaceConnectorRetainActivityLogsFor),
-                    activityLogsCleanUpInterval: Coerce.number(envVars.dataSpaceConnectorActivityLogsCleanUpInterval)
+                    retainActivityLogsFor: Coerce.number(envVars.dataspaceRetainActivityLogsFor),
+                    activityLogsCleanUpInterval: Coerce.number(envVars.dataspaceActivityLogsCleanUpInterval)
                 }
             }
         });
@@ -1067,4 +1127,15 @@ async function configureDlt(coreConfig, envVars) {
         });
     }
 }
+/**
+ * Converts a comma separated list to an array.
+ * @param value The comma separated list.
+ * @returns The array.
+ */
+function commaSeparatedListToArray(value) {
+    return (value ?? "")
+        .split(",")
+        .map(item => item.trim())
+        .filter(item => item.length > 0);
+}
 //# sourceMappingURL=engineEnvBuilder.js.map