@twin.org/node-core 0.0.3-next.65 → 0.0.3-next.67

package/dist/es/builders/engineEnvBuilder.js

@@ -77,7 +77,7 @@ async function configureEntityStorage(coreConfig, envVars) {
             type: EntityStorageConnectorType.Memory,
             options: {
                 config: {
-                    mutexTimeoutMs: Coerce.integer(envVars.entityStorageMemoryMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.entityStorageMemoryMutexTimeout)
                 }
             }
         });
@@ -88,7 +88,7 @@ async function configureEntityStorage(coreConfig, envVars) {
             options: {
                 config: {
                     directory: envVars.storageFileRoot ?? "",
-                    mutexTimeoutMs: Coerce.integer(envVars.entityStorageFileMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.entityStorageFileMutexTimeout)
                 },
                 folderPrefix: envVars.entityStorageTablePrefix
             }
@@ -104,7 +104,7 @@ async function configureEntityStorage(coreConfig, envVars) {
                     accessKeyId: envVars.awsDynamodbAccessKeyId,
                     secretAccessKey: envVars.awsDynamodbSecretAccessKey,
                     endpoint: envVars.awsDynamodbEndpoint,
-                    connectionTimeoutMs: Coerce.integer(envVars.awsDynamodbConnectionTimeoutMs)
+                    connectionTimeoutMs: Coerce.integer(envVars.awsDynamodbConnectionTimeout)
                 },
                 tablePrefix: envVars.entityStorageTablePrefix
             }
@@ -341,8 +341,8 @@ async function configureLogging(coreConfig, envVars) {
                 options: {
                     config: {
                         batchSize: Coerce.integer(envVars.loggingBatchSize),
-                        batchIntervalMs: (Coerce.integer(envVars.loggingBatchFlushIntervalSeconds) ?? 5) * 1000,
-                        mutexTimeoutMs: Coerce.integer(envVars.loggingMutexTimeoutMs)
+                        batchIntervalMs: (Coerce.integer(envVars.loggingBatchFlushInterval) ?? 5) * 1000,
+                        mutexTimeoutMs: Coerce.integer(envVars.loggingMutexTimeout)
                     }
                 }
             });
@@ -482,7 +482,7 @@ async function configureTelemetry(coreConfig, envVars) {
  */
 async function configureMetricsCollector(coreConfig, envVars) {
     if (isTelemetryRequired(envVars)) {
-        const intervalSec = Coerce.integer(envVars.telemetryMetricsCollectorIntervalSeconds) ?? 60;
+        const intervalSec = Coerce.integer(envVars.telemetryMetricsCollectorInterval) ?? 60;
         coreConfig.types.metricsCollectorComponent ??= [];
         coreConfig.types.metricsCollectorComponent.push({
             type: MetricsCollectorComponentType.Service,
@@ -537,8 +537,8 @@ async function configureHealth(coreConfig, envVars) {
             type: HealthComponentType.Service,
             options: {
                 config: {
-                    healthCheckInterval: (Coerce.integer(envVars.healthIntervalSeconds) ?? 60) * 1000,
-                    initialInterval: (Coerce.integer(envVars.healthStartupIntervalSeconds) ?? 2) * 1000
+                    healthCheckInterval: (Coerce.integer(envVars.healthInterval) ?? 60) * 1000,
+                    initialInterval: (Coerce.integer(envVars.healthStartupInterval) ?? 2) * 1000
                 }
             }
         });
@@ -944,7 +944,7 @@ async function configureAuditableItemGraph(coreConfig, envVars) {
             type: AuditableItemGraphComponentType.Service,
             options: {
                 config: {
-                    mutexTimeoutMs: Coerce.integer(envVars.auditableItemGraphMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.auditableItemGraphMutexTimeout)
                 }
             }
         });
@@ -963,7 +963,7 @@ async function configureAuditableItemStream(coreConfig, envVars) {
             type: AuditableItemStreamComponentType.Service,
             options: {
                 config: {
-                    mutexTimeoutMs: Coerce.integer(envVars.auditableItemStreamMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.auditableItemStreamMutexTimeout)
                 }
             }
         });
@@ -1008,7 +1008,7 @@ async function configureDocumentManagement(coreConfig, envVars) {
             type: DocumentManagementComponentType.Service,
             options: {
                 config: {
-                    mutexTimeoutMs: Coerce.integer(envVars.documentManagementMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.documentManagementMutexTimeout)
                 }
             }
         });
@@ -1034,7 +1034,7 @@ async function configureTrust(coreConfig, envVars) {
                 options: {
                     config: {
                         verificationMethodId: envVars.trustVerificationMethodId ?? "",
-                        tokenTtlInSeconds: Coerce.integer(envVars.trustJwtTtlSeconds)
+                        tokenTtlInSeconds: Coerce.integer(envVars.trustJwtTtl)
                     }
                 }
             });
@@ -1105,6 +1105,8 @@ async function configureRightsManagement(coreConfig, envVars) {
         coreConfig.types.rightsManagementPnpComponent.push({
             type: RightsManagementPnpComponentType.RestClient,
             options: {
+                // The endpoint is required in config, but as this is multi-instance
+                // the actual endpoint will be provided in the config when it is constructed
                 endpoint: "http://localhost",
                 pathPrefix: rightsManagementPath
             },
@@ -1117,7 +1119,7 @@ async function configureRightsManagement(coreConfig, envVars) {
                 config: {
                     callbackPath: rightsManagementPath,
                     includeErrorDetails: coreConfig.debug ?? false,
-                    mutexTimeoutMs: Coerce.integer(envVars.rightsManagementMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.rightsManagementMutexTimeout)
                 }
             },
             isDefault: true
@@ -1127,7 +1129,7 @@ async function configureRightsManagement(coreConfig, envVars) {
             type: RightsManagementPnapComponentType.Service,
             options: {
                 config: {
-                    mutexTimeoutMs: Coerce.integer(envVars.rightsManagementMutexTimeoutMs)
+                    mutexTimeoutMs: Coerce.integer(envVars.rightsManagementMutexTimeout)
                 }
             }
         });
@@ -1218,7 +1220,7 @@ async function configureFederatedCatalogue(coreConfig, envVars) {
                 type: FederatedCatalogueComponentType.Service,
                 options: {
                     config: {
-                        mutexTimeoutMs: Coerce.integer(envVars.federatedCatalogueMutexTimeoutMs)
+                        mutexTimeoutMs: Coerce.integer(envVars.federatedCatalogueMutexTimeout)
                     }
                 }
             });
@@ -1263,10 +1265,10 @@ async function configureDataspace(coreConfig, envVars) {
                     dataPlanePath: envVars.dataspaceDataPlanePath,
                     autoStartTransfers: Coerce.boolean(envVars.dataspaceAutoStartTransfers),
                     stalledNegotiationTimeoutMs: !Is.empty(stalledNegotiationTimeout)
-                        ? stalledNegotiationTimeout * 60000
+                        ? stalledNegotiationTimeout * 1000
                         : undefined,
                     stalledTransferTimeoutMs: !Is.empty(stalledTransferTimeout)
-                        ? stalledTransferTimeout * 60000
+                        ? stalledTransferTimeout * 1000
                         : undefined
                 }
             },
@@ -1280,10 +1282,10 @@ async function configureDataspace(coreConfig, envVars) {
             options: {
                 config: {
                     retainActivityLogsForMs: !Is.empty(retainActivityLogsFor)
-                        ? retainActivityLogsFor * 60000
+                        ? retainActivityLogsFor * 1000
                         : undefined,
                     activityLogsCleanUpIntervalMs: !Is.empty(activityLogsCleanUpInterval)
-                        ? activityLogsCleanUpInterval * 60000
+                        ? activityLogsCleanUpInterval * 1000
                         : undefined
                 }
             }