@twin.org/dataspace-control-plane-service 0.0.3-next.48 → 0.0.3-next.49

package/dist/es/dataspaceControlPlaneService.js

@@ -4,12 +4,13 @@ import { HttpContextIdKeys, HttpUrlHelper } from "@twin.org/api-models";
 import { ContextIdHelper, ContextIdKeys, ContextIdStore } from "@twin.org/context";
 import { AlreadyExistsError, ArrayHelper, BaseError, ComponentFactory, Converter, GeneralError, Guards, Is, NotFoundError, ObjectHelper, RandomHelper, StringHelper, UnauthorizedError, Url, Urn, ValidationError } from "@twin.org/core";
 import { JsonLdHelper } from "@twin.org/data-json-ld";
-import { DataspaceAppFactory, DataspaceTransferFormat, TransferProcessRole, getJsonLdId, getJsonLdType } from "@twin.org/dataspace-models";
+import { DataspaceControlPlaneMetricIds, DataspaceControlPlaneMetrics, DataspaceTransferFormat, TransferProcessRole, getJsonLdId, getJsonLdType } from "@twin.org/dataspace-models";
 import { EngineCoreFactory } from "@twin.org/engine-models";
 import { ComparisonOperator } from "@twin.org/entity";
 import { EntityStorageConnectorFactory } from "@twin.org/entity-storage-models";
 import { OdrlPolicyHelper, PolicyRequesterFactory } from "@twin.org/rights-management-models";
 import { DataspaceProtocolContexts, DataspaceProtocolContractNegotiationTypes, DataspaceProtocolEndpointType, DataspaceProtocolHelper, DataspaceProtocolTransferProcessStateType, DataspaceProtocolTransferProcessTypes } from "@twin.org/standards-dataspace-protocol";
+import { MetricHelper } from "@twin.org/telemetry-models";
 import { TrustHelper } from "@twin.org/trust-models";
 import { DataspaceControlPlanePolicyRequester } from "./dataspaceControlPlanePolicyRequester.js";
 import { EndpointProperties } from "./models/endpointProperties.js";
@@ -120,6 +121,11 @@ export class DataspaceControlPlaneService {
      * @internal
      */
     _platformComponent;
+    /**
+     * The optional telemetry component for metrics.
+     * @internal
+     */
+    _telemetryComponent;
     /**
      * Registered negotiation callbacks from upstream callers, keyed by registration key.
      * @internal
@@ -169,6 +175,7 @@ export class DataspaceControlPlaneService {
             : undefined;
         this._taskScheduler = ComponentFactory.getIfExists(options?.taskSchedulerComponentType ?? "task-scheduler");
         this._platformComponent = ComponentFactory.getIfExists(options?.platformComponentType ?? "platform");
+        this._telemetryComponent = ComponentFactory.getIfExists(options?.telemetryComponentType);
         // Data plane component is optional and resolved lazily. The control plane is initialised
         // BEFORE the data plane in engine startup order, so `getRegisteredInstanceTypeOptional`
         // returns undefined when the engine constructs us — the wiring override can't fire here.
@@ -235,6 +242,7 @@ export class DataspaceControlPlaneService {
      * @returns A promise that resolves when the federated catalogue is populated and the cleanup task is scheduled.
      */
     async start(nodeLoggingComponentType) {
+        await MetricHelper.createMetrics(this._telemetryComponent, DataspaceControlPlaneMetrics);
         const engine = EngineCoreFactory.getIfExists("engine");
         // Skip if no engine exists OR if this is a clone instance
         if (Is.empty(engine) || engine.isClone()) {
@@ -344,7 +352,7 @@ export class DataspaceControlPlaneService {
      * @param options Request options.
      * @param options.autoStart When true, the provider immediately starts the requested transfer (scheduled
      * on the next tick); when omitted/false the provider start must be triggered explicitly.
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Process (DSP compliant) with state REQUESTED, or TransferError if the operation fails.
      *
      * Role Performed: Provider
@@ -377,14 +385,10 @@ export class DataspaceControlPlaneService {
                     ts: Date.now(),
                     message: "agreementNotFound",
                     data: {
-                        agreementId: request.agreementId,
-                        hint: "Agreement must exist before transfer. Use contract negotiation to create agreement first."
+                        notFoundId: request.agreementId
                     }
                 });
-                throw new NotFoundError(DataspaceControlPlaneService.CLASS_NAME, "agreementNotFound", request.agreementId, {
-                    agreementId: request.agreementId,
-                    hint: "Perform contract negotiation first to create an agreement"
-                });
+                throw new NotFoundError(DataspaceControlPlaneService.CLASS_NAME, "agreementNotFound", request.agreementId);
             }
             const assigneeIdentity = OdrlPolicyHelper.extractAssigneeIdentity(agreement);
             const assigneeIds = ArrayHelper.fromObjectOrArray(assigneeIdentity);
@@ -453,6 +457,7 @@ export class DataspaceControlPlaneService {
                 await this.runProviderStart(consumerPid, contextIds?.[HttpContextIdKeys.PublicOrigin]);
             }, 0);
         }
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersRequested);
         return {
             "@context": [DataspaceProtocolContexts.Context],
             "@type": DataspaceProtocolTransferProcessTypes.TransferProcess,
@@ -601,6 +606,7 @@ export class DataspaceControlPlaneService {
                 format
             }
         });
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersPrepared);
         return { consumerPid };
     }
     // ----------------------------------------------------------------------------
@@ -610,7 +616,7 @@ export class DataspaceControlPlaneService {
      * Start a Transfer Process.
      * Transitions Transfer Process from REQUESTED to STARTED state or resumes from SUSPENDED state.
      * @param message Transfer start message (DSP compliant).
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Start Message (DSP compliant) with dataAddress for PULL transfers, or TransferError if the operation fails.
      *
      * Role Performed: Provider / Consumer
@@ -668,6 +674,7 @@ export class DataspaceControlPlaneService {
                 });
                 await this._internalTransferCallback.onStateChanged(entity.consumerPid, DataspaceProtocolTransferProcessStateType.STARTED);
                 await this._internalTransferCallback.onStarted(entity.consumerPid, message);
+                await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersStarted);
                 return message;
             }
             // PROVIDER-ACT (role === Provider): build the dataAddress, transition to STARTED, deliver below.
@@ -890,6 +897,7 @@ export class DataspaceControlPlaneService {
             // Notify the consumer by POSTing the TransferStart (with its dataAddress) to the callback.
             // Best-effort: a delivery failure must not roll back the STARTED transition.
             await this.deliverToConsumerCallback(entity, "start", async (remoteControlPlane, token) => remoteControlPlane.startTransfer(response, token));
+            await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersStarted);
             return response;
         }
         catch (error) {
@@ -945,7 +953,7 @@ export class DataspaceControlPlaneService {
     /**
      * Complete a Transfer Process.
      * @param message Transfer completion message (DSP compliant).
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Process (DSP compliant) with state COMPLETED, or TransferError if the operation fails.
      */
     async completeTransfer(message, trustPayload) {
@@ -1025,6 +1033,7 @@ export class DataspaceControlPlaneService {
                 await this._internalTransferCallback.onStateChanged(entity.consumerPid, DataspaceProtocolTransferProcessStateType.COMPLETED);
                 await this._internalTransferCallback.onCompleted(entity.consumerPid);
             }
+            await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersCompleted);
             return {
                 "@context": [DataspaceProtocolContexts.Context],
                 "@type": DataspaceProtocolTransferProcessTypes.TransferProcess,
@@ -1040,7 +1049,7 @@ export class DataspaceControlPlaneService {
     /**
      * Suspend a Transfer Process.
      * @param message Transfer suspension message (DSP compliant).
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Process (DSP compliant) with state SUSPENDED, or TransferError if the operation fails.
      */
     async suspendTransfer(message, trustPayload) {
@@ -1127,6 +1136,7 @@ export class DataspaceControlPlaneService {
                 // PROVIDER-ACT: forward the suspension (with its reason) to the consumer callback.
                 await this.deliverToConsumerCallback(entity, "suspension", async (remoteControlPlane, token) => remoteControlPlane.suspendTransfer(message, token));
             }
+            await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersSuspended);
             return {
                 "@context": [DataspaceProtocolContexts.Context],
                 "@type": DataspaceProtocolTransferProcessTypes.TransferProcess,
@@ -1142,7 +1152,7 @@ export class DataspaceControlPlaneService {
     /**
      * Terminate a Transfer Process.
      * @param message Transfer termination message (DSP compliant).
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Process (DSP compliant) with state TERMINATED, or TransferError if the operation fails.
      */
     async terminateTransfer(message, trustPayload) {
@@ -1223,6 +1233,7 @@ export class DataspaceControlPlaneService {
                 // PROVIDER-ACT: forward the termination (with its reason) to the consumer callback.
                 await this.deliverToConsumerCallback(entity, "termination", async (remoteControlPlane, token) => remoteControlPlane.terminateTransfer(message, token));
             }
+            await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.TransfersTerminated);
             return {
                 "@context": [DataspaceProtocolContexts.Context],
                 "@type": DataspaceProtocolTransferProcessTypes.TransferProcess,
@@ -1238,7 +1249,7 @@ export class DataspaceControlPlaneService {
     /**
      * Get Transfer Process state.
      * @param pid Process ID (consumerPid or providerPid).
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Process (DSP compliant) with current state, or TransferError if the operation fails.
      */
     async getTransferProcess(pid, trustPayload) {
@@ -1372,6 +1383,7 @@ export class DataspaceControlPlaneService {
             });
         }
         this._policyRequester.trackNegotiation(negotiationId);
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.NegotiationsInitiated);
         await this._loggingComponent?.log({
             level: "info",
             source: DataspaceControlPlaneService.CLASS_NAME,
@@ -1464,7 +1476,7 @@ export class DataspaceControlPlaneService {
     /**
      * Resolve consumerPid to Transfer Context.
      * @param consumerPid Consumer Process ID.
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Context with Agreement, datasetId, and Transfer Process metadata.
      */
     async resolveConsumerPid(consumerPid, trustPayload) {
@@ -1521,7 +1533,7 @@ export class DataspaceControlPlaneService {
     /**
      * Resolve providerPid to Transfer Context.
      * @param providerPid Provider Process ID.
-     * @param trustPayload Trust payload containing authorization information (Base64-encoded token).
+     * @param trustPayload Trust payload containing authorization information.
      * @returns Transfer Context with Agreement, datasetId, and Transfer Process metadata.
      */
     async resolveProviderPid(providerPid, trustPayload) {
@@ -1631,6 +1643,7 @@ export class DataspaceControlPlaneService {
         // Side effect first, primary storage last
         await this.publishAppDataset(entity);
         await this._dataspaceAppDatasetStorage.set(entity);
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.AppDatasetsCreated);
         return resolvedId;
     }
     /**
@@ -1709,6 +1722,7 @@ export class DataspaceControlPlaneService {
         // Side effect first, primary storage last
         await this.publishAppDataset(updated);
         await this._dataspaceAppDatasetStorage.set(updated);
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.AppDatasetsUpdated);
     }
     /**
      * Delete a dataspace app dataset owned by the calling organization.
@@ -1735,6 +1749,7 @@ export class DataspaceControlPlaneService {
             });
         }
         await this._dataspaceAppDatasetStorage.remove(id);
+        await MetricHelper.metricIncrement(this._telemetryComponent, DataspaceControlPlaneMetricIds.AppDatasetsDeleted);
     }
     // ============================================================================
     // PRIVATE HELPER METHODS
@@ -2438,12 +2453,8 @@ export class DataspaceControlPlaneService {
         const contextIds = await ContextIdStore.getContextIds();
         const tenantContextIds = { ...contextIds, [ContextIdKeys.Tenant]: appDataset.tenantId };
         await ContextIdStore.run(tenantContextIds, async () => {
-            const app = DataspaceAppFactory.get(appDataset.appId);
             const datasetPayload = this.restampDatasetId(appDataset.dataset, appDataset.id);
-            const overrideHandler = app.datasetsHandled?.bind(app);
-            const rawDatasets = overrideHandler
-                ? await overrideHandler(datasetPayload)
-                : [datasetPayload];
+            const rawDatasets = [datasetPayload];
             const datasets = await Promise.all(rawDatasets.map(async (d) => this.populateDefaults(d)));
             for (const dataset of datasets) {
                 const publishResult = await this._federatedCatalogueComponent.set(dataset, localTrustPayload);