From c748ce7b8d123f09762f5a492583f4e6d1462dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Fri, 17 Jan 2025 15:16:28 +0100 Subject: [PATCH] refactor: move infrastructure --- .../connector/src/AbstractConnectorRuntime.ts | 5 ++-- .../connector/src}/ConnectorLoggerFactory.ts | 0 .../connector/src}/DocumentationLink.ts | 0 packages/connector/src/index.ts | 2 ++ .../infrastructure/ConnectorInfrastructure.ts | 6 ++--- .../ConnectorInfrastructureRegistry.ts | 5 ++-- .../infrastructure/httpServer/HttpMethod.ts | 0 .../infrastructure/httpServer/HttpServer.ts | 19 ++++++++++++--- .../httpServer/RequestTracker.ts | 0 .../httpServer/common/Envelope.ts | 2 +- .../httpServer/common/HttpError.ts | 0 .../httpServer/common/HttpErrors.ts | 0 .../infrastructure/httpServer/common/index.ts | 0 .../src}/infrastructure/httpServer/index.ts | 0 .../middlewares/csrfErrorHandler.ts | 0 .../middlewares/genericErrorHandler.ts | 4 ++-- .../httpServer/middlewares/requestLogger.ts | 0 .../middlewares/setResponseDurationHeader.ts | 0 .../middlewares/setResponseTimeHeader.ts | 0 .../connector/src/infrastructure/index.ts | 3 +++ src/ConnectorRuntime.ts | 24 ++++++++++++++----- src/ConnectorRuntimeConfig.ts | 3 +-- src/infrastructure/index.ts | 1 - src/modules/coreHttpApi/CoreHttpApiModule.ts | 3 +-- .../coreHttpApi/common/BaseController.ts | 2 +- .../controllers/AccountController.ts | 2 +- .../controllers/AttributesController.ts | 2 +- .../controllers/ChallengesController.ts | 2 +- .../controllers/FilesController.ts | 2 +- .../controllers/IdentityMetadataController.ts | 2 +- .../controllers/IncomingRequestsController.ts | 2 +- .../controllers/MessagesController.ts | 2 +- .../controllers/OutgoingRequestsController.ts | 2 +- .../RelationshipTemplatesController.ts | 2 +- .../controllers/RelationshipsController.ts | 2 +- .../controllers/TokensController.ts | 2 +- .../IdentityDeletionProcessController.ts | 2 +- tsconfig.json | 2 +- 38 files changed, 65 insertions(+), 40 deletions(-) rename {src/logging => packages/connector/src}/ConnectorLoggerFactory.ts (100%) rename {src => packages/connector/src}/DocumentationLink.ts (100%) rename src/infrastructure/ConnectorInfastructure.ts => packages/connector/src/infrastructure/ConnectorInfrastructure.ts (79%) rename {src => packages/connector/src}/infrastructure/ConnectorInfrastructureRegistry.ts (86%) rename {src => packages/connector/src}/infrastructure/httpServer/HttpMethod.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/HttpServer.ts (94%) rename {src => packages/connector/src}/infrastructure/httpServer/RequestTracker.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/common/Envelope.ts (91%) rename {src => packages/connector/src}/infrastructure/httpServer/common/HttpError.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/common/HttpErrors.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/common/index.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/index.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/middlewares/csrfErrorHandler.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/middlewares/genericErrorHandler.ts (97%) rename {src => packages/connector/src}/infrastructure/httpServer/middlewares/requestLogger.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/middlewares/setResponseDurationHeader.ts (100%) rename {src => packages/connector/src}/infrastructure/httpServer/middlewares/setResponseTimeHeader.ts (100%) create mode 100644 packages/connector/src/infrastructure/index.ts delete mode 100644 src/infrastructure/index.ts diff --git a/packages/connector/src/AbstractConnectorRuntime.ts b/packages/connector/src/AbstractConnectorRuntime.ts index 8674905d..3c9782f4 100644 --- a/packages/connector/src/AbstractConnectorRuntime.ts +++ b/packages/connector/src/AbstractConnectorRuntime.ts @@ -1,9 +1,8 @@ import { Runtime, RuntimeConfig, RuntimeServices } from "@nmshd/runtime"; - -export interface IInfrastructureRegistry {} +import { ConnectorInfrastructureRegistry } from "./infrastructure/ConnectorInfrastructureRegistry"; export abstract class AbstractConnectorRuntime extends Runtime { public abstract override getServices(): RuntimeServices; public abstract getBackboneAuthenticationToken(): Promise; - public abstract readonly infrastructure: IInfrastructureRegistry; + public abstract readonly infrastructure: ConnectorInfrastructureRegistry; } diff --git a/src/logging/ConnectorLoggerFactory.ts b/packages/connector/src/ConnectorLoggerFactory.ts similarity index 100% rename from src/logging/ConnectorLoggerFactory.ts rename to packages/connector/src/ConnectorLoggerFactory.ts diff --git a/src/DocumentationLink.ts b/packages/connector/src/DocumentationLink.ts similarity index 100% rename from src/DocumentationLink.ts rename to packages/connector/src/DocumentationLink.ts diff --git a/packages/connector/src/index.ts b/packages/connector/src/index.ts index 444e6ae7..b9313357 100644 --- a/packages/connector/src/index.ts +++ b/packages/connector/src/index.ts @@ -1,3 +1,5 @@ export * from "./AbstractConnectorRuntime"; +export * from "./ConnectorLoggerFactory"; export * from "./ConnectorMode"; export * from "./ConnectorRuntimeModule"; +export * from "./infrastructure"; diff --git a/src/infrastructure/ConnectorInfastructure.ts b/packages/connector/src/infrastructure/ConnectorInfrastructure.ts similarity index 79% rename from src/infrastructure/ConnectorInfastructure.ts rename to packages/connector/src/infrastructure/ConnectorInfrastructure.ts index 06bb2b46..3d83aeae 100644 --- a/src/infrastructure/ConnectorInfastructure.ts +++ b/packages/connector/src/infrastructure/ConnectorInfrastructure.ts @@ -1,6 +1,6 @@ import { ILogger } from "@js-soft/logging-abstractions"; -import { ConnectorMode } from "@nmshd/connector"; -import { ConnectorRuntime } from "../ConnectorRuntime"; +import { AbstractConnectorRuntime } from "../AbstractConnectorRuntime"; +import { ConnectorMode } from "../ConnectorMode"; export interface InfrastructureConfiguration { enabled: boolean; @@ -8,7 +8,7 @@ export interface InfrastructureConfiguration { export abstract class ConnectorInfrastructure { public constructor( - protected runtime: ConnectorRuntime, + protected runtime: AbstractConnectorRuntime, protected configuration: TConfig, protected logger: ILogger, public readonly name: string, diff --git a/src/infrastructure/ConnectorInfrastructureRegistry.ts b/packages/connector/src/infrastructure/ConnectorInfrastructureRegistry.ts similarity index 86% rename from src/infrastructure/ConnectorInfrastructureRegistry.ts rename to packages/connector/src/infrastructure/ConnectorInfrastructureRegistry.ts index c399c3fb..206f4f19 100644 --- a/src/infrastructure/ConnectorInfrastructureRegistry.ts +++ b/packages/connector/src/infrastructure/ConnectorInfrastructureRegistry.ts @@ -1,9 +1,8 @@ -import { IInfrastructureRegistry } from "@nmshd/connector"; import { DocumentationLink } from "../DocumentationLink"; -import { ConnectorInfrastructure } from "./ConnectorInfastructure"; +import { ConnectorInfrastructure } from "./ConnectorInfrastructure"; import { HttpServer } from "./httpServer"; -export class ConnectorInfrastructureRegistry implements IInfrastructureRegistry { +export class ConnectorInfrastructureRegistry { private readonly infrastructure: Record = {}; public get httpServer(): HttpServer { diff --git a/src/infrastructure/httpServer/HttpMethod.ts b/packages/connector/src/infrastructure/httpServer/HttpMethod.ts similarity index 100% rename from src/infrastructure/httpServer/HttpMethod.ts rename to packages/connector/src/infrastructure/httpServer/HttpMethod.ts diff --git a/src/infrastructure/httpServer/HttpServer.ts b/packages/connector/src/infrastructure/httpServer/HttpServer.ts similarity index 94% rename from src/infrastructure/httpServer/HttpServer.ts rename to packages/connector/src/infrastructure/httpServer/HttpServer.ts index 469ed938..0ca1a1a0 100644 --- a/src/infrastructure/httpServer/HttpServer.ts +++ b/packages/connector/src/infrastructure/httpServer/HttpServer.ts @@ -1,3 +1,4 @@ +import { ILogger } from "@js-soft/logging-abstractions"; import { sleep } from "@js-soft/ts-utils"; import { Container } from "@nmshd/typescript-ioc"; import { Server } from "@nmshd/typescript-rest"; @@ -7,8 +8,9 @@ import cors, { CorsOptions } from "cors"; import express, { Application, RequestHandler } from "express"; import helmet, { HelmetOptions } from "helmet"; import http from "http"; -import { buildInformation } from "../../buildInformation"; -import { ConnectorInfrastructure, InfrastructureConfiguration } from "../ConnectorInfastructure"; +import { AbstractConnectorRuntime } from "../../AbstractConnectorRuntime"; +import { ConnectorMode } from "../../ConnectorMode"; +import { ConnectorInfrastructure, InfrastructureConfiguration } from "../ConnectorInfrastructure"; import { HttpMethod } from "./HttpMethod"; import { RequestTracker } from "./RequestTracker"; import { Envelope, HttpErrors } from "./common"; @@ -52,6 +54,17 @@ export class HttpServer extends ConnectorInfrastructure private readonly requestTracker = new RequestTracker(); + public constructor( + runtime: AbstractConnectorRuntime, + configuration: HttpServerConfiguration, + logger: ILogger, + name: string, + connectorMode: ConnectorMode, + private readonly buildInformation: unknown + ) { + super(runtime, configuration, logger, name, connectorMode); + } + public init(): void { this.app = express(); } @@ -228,7 +241,7 @@ export class HttpServer extends ConnectorInfrastructure private useVersionEndpoint() { this.app.get("/Monitoring/Version", (_req: any, res: any) => { - res.status(200).json(buildInformation); + res.status(200).json(this.buildInformation); }); } diff --git a/src/infrastructure/httpServer/RequestTracker.ts b/packages/connector/src/infrastructure/httpServer/RequestTracker.ts similarity index 100% rename from src/infrastructure/httpServer/RequestTracker.ts rename to packages/connector/src/infrastructure/httpServer/RequestTracker.ts diff --git a/src/infrastructure/httpServer/common/Envelope.ts b/packages/connector/src/infrastructure/httpServer/common/Envelope.ts similarity index 91% rename from src/infrastructure/httpServer/common/Envelope.ts rename to packages/connector/src/infrastructure/httpServer/common/Envelope.ts index f58ad467..7f792201 100644 --- a/src/infrastructure/httpServer/common/Envelope.ts +++ b/packages/connector/src/infrastructure/httpServer/common/Envelope.ts @@ -1,4 +1,4 @@ -import { ConnectorMode } from "@nmshd/connector"; +import { ConnectorMode } from "../../../ConnectorMode"; import { HttpError, HttpErrorJSON } from "./HttpError"; export class Envelope { diff --git a/src/infrastructure/httpServer/common/HttpError.ts b/packages/connector/src/infrastructure/httpServer/common/HttpError.ts similarity index 100% rename from src/infrastructure/httpServer/common/HttpError.ts rename to packages/connector/src/infrastructure/httpServer/common/HttpError.ts diff --git a/src/infrastructure/httpServer/common/HttpErrors.ts b/packages/connector/src/infrastructure/httpServer/common/HttpErrors.ts similarity index 100% rename from src/infrastructure/httpServer/common/HttpErrors.ts rename to packages/connector/src/infrastructure/httpServer/common/HttpErrors.ts diff --git a/src/infrastructure/httpServer/common/index.ts b/packages/connector/src/infrastructure/httpServer/common/index.ts similarity index 100% rename from src/infrastructure/httpServer/common/index.ts rename to packages/connector/src/infrastructure/httpServer/common/index.ts diff --git a/src/infrastructure/httpServer/index.ts b/packages/connector/src/infrastructure/httpServer/index.ts similarity index 100% rename from src/infrastructure/httpServer/index.ts rename to packages/connector/src/infrastructure/httpServer/index.ts diff --git a/src/infrastructure/httpServer/middlewares/csrfErrorHandler.ts b/packages/connector/src/infrastructure/httpServer/middlewares/csrfErrorHandler.ts similarity index 100% rename from src/infrastructure/httpServer/middlewares/csrfErrorHandler.ts rename to packages/connector/src/infrastructure/httpServer/middlewares/csrfErrorHandler.ts diff --git a/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts b/packages/connector/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts similarity index 97% rename from src/infrastructure/httpServer/middlewares/genericErrorHandler.ts rename to packages/connector/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts index 7fa58ec0..0e4b50dd 100644 --- a/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts +++ b/packages/connector/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts @@ -1,11 +1,11 @@ import { ApplicationError } from "@js-soft/ts-utils"; -import { ConnectorMode } from "@nmshd/connector"; import { RuntimeErrors } from "@nmshd/runtime"; import { RequestError, TransportCoreErrors } from "@nmshd/transport"; import { Errors } from "@nmshd/typescript-rest"; import express from "express"; import stringify from "json-stringify-safe"; -import { ConnectorLoggerFactory } from "../../../logging/ConnectorLoggerFactory"; +import { ConnectorLoggerFactory } from "../../../ConnectorLoggerFactory"; +import { ConnectorMode } from "../../../ConnectorMode"; import { Envelope, HttpError, HttpErrors } from "../common"; export class RouteNotFoundError extends Error {} diff --git a/src/infrastructure/httpServer/middlewares/requestLogger.ts b/packages/connector/src/infrastructure/httpServer/middlewares/requestLogger.ts similarity index 100% rename from src/infrastructure/httpServer/middlewares/requestLogger.ts rename to packages/connector/src/infrastructure/httpServer/middlewares/requestLogger.ts diff --git a/src/infrastructure/httpServer/middlewares/setResponseDurationHeader.ts b/packages/connector/src/infrastructure/httpServer/middlewares/setResponseDurationHeader.ts similarity index 100% rename from src/infrastructure/httpServer/middlewares/setResponseDurationHeader.ts rename to packages/connector/src/infrastructure/httpServer/middlewares/setResponseDurationHeader.ts diff --git a/src/infrastructure/httpServer/middlewares/setResponseTimeHeader.ts b/packages/connector/src/infrastructure/httpServer/middlewares/setResponseTimeHeader.ts similarity index 100% rename from src/infrastructure/httpServer/middlewares/setResponseTimeHeader.ts rename to packages/connector/src/infrastructure/httpServer/middlewares/setResponseTimeHeader.ts diff --git a/packages/connector/src/infrastructure/index.ts b/packages/connector/src/infrastructure/index.ts new file mode 100644 index 00000000..1a8c001f --- /dev/null +++ b/packages/connector/src/infrastructure/index.ts @@ -0,0 +1,3 @@ +export * from "./ConnectorInfrastructure"; +export * from "./ConnectorInfrastructureRegistry"; +export * from "./httpServer"; diff --git a/src/ConnectorRuntime.ts b/src/ConnectorRuntime.ts index 96375a53..659375dd 100644 --- a/src/ConnectorRuntime.ts +++ b/src/ConnectorRuntime.ts @@ -4,7 +4,16 @@ import { MongoDbConnection } from "@js-soft/docdb-access-mongo"; import { ILogger } from "@js-soft/logging-abstractions"; import { NodeLoggerFactory } from "@js-soft/node-logger"; import { ApplicationError } from "@js-soft/ts-utils"; -import { AbstractConnectorRuntime, ConnectorMode, ConnectorRuntimeModule, ConnectorRuntimeModuleConfiguration } from "@nmshd/connector"; +import { + AbstractConnectorRuntime, + ConnectorInfrastructureRegistry, + ConnectorLoggerFactory, + ConnectorMode, + ConnectorRuntimeModule, + ConnectorRuntimeModuleConfiguration, + HttpServer +} from "@nmshd/connector"; +import { DocumentationLink } from "@nmshd/connector/src/DocumentationLink"; import { ConsumptionController } from "@nmshd/consumption"; import { ConsumptionServices, DataViewExpander, GetIdentityInfoResponse, ModuleConfiguration, RuntimeHealth, RuntimeServices, TransportServices } from "@nmshd/runtime"; import { AccountController, TransportCoreErrors } from "@nmshd/transport"; @@ -14,12 +23,8 @@ import { HttpsProxyAgent } from "https-proxy-agent"; import path from "path"; import { checkServerIdentity, PeerCertificate } from "tls"; import { ConnectorRuntimeConfig } from "./ConnectorRuntimeConfig"; -import { DocumentationLink } from "./DocumentationLink"; import { HealthChecker } from "./HealthChecker"; import { buildInformation } from "./buildInformation"; -import { HttpServer } from "./infrastructure"; -import { ConnectorInfrastructureRegistry } from "./infrastructure/ConnectorInfrastructureRegistry"; -import { ConnectorLoggerFactory } from "./logging/ConnectorLoggerFactory"; interface SupportInformation { health: RuntimeHealth; @@ -325,7 +330,14 @@ export class ConnectorRuntime extends AbstractConnectorRuntime { if (this.runtimeConfig.infrastructure.httpServer.enabled) { - const httpServer = new HttpServer(this, this.runtimeConfig.infrastructure.httpServer, this.loggerFactory.getLogger(HttpServer), "httpServer", this.connectorMode); + const httpServer = new HttpServer( + this, + this.runtimeConfig.infrastructure.httpServer, + this.loggerFactory.getLogger(HttpServer), + "httpServer", + this.connectorMode, + buildInformation + ); this.infrastructure.add(httpServer); } diff --git a/src/ConnectorRuntimeConfig.ts b/src/ConnectorRuntimeConfig.ts index edeb64e2..2974dfba 100644 --- a/src/ConnectorRuntimeConfig.ts +++ b/src/ConnectorRuntimeConfig.ts @@ -1,7 +1,6 @@ -import { ConnectorRuntimeModuleConfiguration } from "@nmshd/connector"; +import { ConnectorRuntimeModuleConfiguration, HttpServerConfiguration } from "@nmshd/connector"; import { DeciderModuleConfiguration, RuntimeConfig } from "@nmshd/runtime"; import * as log4js from "log4js"; -import { HttpServerConfiguration } from "./infrastructure"; export interface MongoDBSettings { driver: "mongodb"; diff --git a/src/infrastructure/index.ts b/src/infrastructure/index.ts deleted file mode 100644 index 20ffad53..00000000 --- a/src/infrastructure/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./httpServer"; diff --git a/src/modules/coreHttpApi/CoreHttpApiModule.ts b/src/modules/coreHttpApi/CoreHttpApiModule.ts index da64fc26..ae4103aa 100644 --- a/src/modules/coreHttpApi/CoreHttpApiModule.ts +++ b/src/modules/coreHttpApi/CoreHttpApiModule.ts @@ -1,8 +1,7 @@ +import { ConnectorRuntimeModule, ConnectorRuntimeModuleConfiguration, HttpMethod } from "@nmshd/connector"; import path from "path"; import swaggerUi, { SwaggerUiOptions } from "swagger-ui-express"; import yamlJs from "yamljs"; -import { ConnectorRuntimeModule, ConnectorRuntimeModuleConfiguration } from "../../ConnectorRuntimeModule"; -import { HttpMethod } from "../../infrastructure"; export interface CoreHttpApiModuleConfiguration extends ConnectorRuntimeModuleConfiguration { docs: { diff --git a/src/modules/coreHttpApi/common/BaseController.ts b/src/modules/coreHttpApi/common/BaseController.ts index 1fd370a5..1095554e 100644 --- a/src/modules/coreHttpApi/common/BaseController.ts +++ b/src/modules/coreHttpApi/common/BaseController.ts @@ -1,7 +1,7 @@ import { Result } from "@js-soft/ts-utils"; +import { Envelope } from "@nmshd/connector"; import { Return } from "@nmshd/typescript-rest"; import express from "express"; -import { Envelope } from "../../../infrastructure"; export abstract class BaseController { protected created(result: Result): Return.NewResource { diff --git a/src/modules/coreHttpApi/controllers/AccountController.ts b/src/modules/coreHttpApi/controllers/AccountController.ts index 68bd1dd0..04d882e3 100644 --- a/src/modules/coreHttpApi/controllers/AccountController.ts +++ b/src/modules/coreHttpApi/controllers/AccountController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, GET, Path, POST } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Account") diff --git a/src/modules/coreHttpApi/controllers/AttributesController.ts b/src/modules/coreHttpApi/controllers/AttributesController.ts index b364d91d..524deda0 100644 --- a/src/modules/coreHttpApi/controllers/AttributesController.ts +++ b/src/modules/coreHttpApi/controllers/AttributesController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { ConsumptionServices, RuntimeErrors, TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, DELETE, GET, POST, Path, PathParam, QueryParam, Return, ServiceContext } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Attributes") diff --git a/src/modules/coreHttpApi/controllers/ChallengesController.ts b/src/modules/coreHttpApi/controllers/ChallengesController.ts index 41ad56eb..6b7aad6a 100644 --- a/src/modules/coreHttpApi/controllers/ChallengesController.ts +++ b/src/modules/coreHttpApi/controllers/ChallengesController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Path, POST, Return } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Challenges") diff --git a/src/modules/coreHttpApi/controllers/FilesController.ts b/src/modules/coreHttpApi/controllers/FilesController.ts index 136dc9fa..82183808 100644 --- a/src/modules/coreHttpApi/controllers/FilesController.ts +++ b/src/modules/coreHttpApi/controllers/FilesController.ts @@ -1,9 +1,9 @@ +import { Envelope } from "@nmshd/connector"; import { OwnerRestriction, TransportServices } from "@nmshd/runtime"; import { Reference } from "@nmshd/transport"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, ContextAccept, ContextResponse, Errors, FileParam, FormParam, GET, POST, Path, PathParam, Return, ServiceContext } from "@nmshd/typescript-rest"; import express from "express"; -import { Envelope } from "../../../infrastructure"; import { BaseController, Mimetype } from "../common/BaseController"; @Path("/api/v2/Files") diff --git a/src/modules/coreHttpApi/controllers/IdentityMetadataController.ts b/src/modules/coreHttpApi/controllers/IdentityMetadataController.ts index 11e75f4c..37c53159 100644 --- a/src/modules/coreHttpApi/controllers/IdentityMetadataController.ts +++ b/src/modules/coreHttpApi/controllers/IdentityMetadataController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { ConsumptionServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, DELETE, GET, PUT, Path, QueryParam } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/IdentityMetadata") diff --git a/src/modules/coreHttpApi/controllers/IncomingRequestsController.ts b/src/modules/coreHttpApi/controllers/IncomingRequestsController.ts index 13112970..a0898950 100644 --- a/src/modules/coreHttpApi/controllers/IncomingRequestsController.ts +++ b/src/modules/coreHttpApi/controllers/IncomingRequestsController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { ConsumptionServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, GET, Path, PathParam, PUT, ServiceContext } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Requests/Incoming") diff --git a/src/modules/coreHttpApi/controllers/MessagesController.ts b/src/modules/coreHttpApi/controllers/MessagesController.ts index bae32704..9117a452 100644 --- a/src/modules/coreHttpApi/controllers/MessagesController.ts +++ b/src/modules/coreHttpApi/controllers/MessagesController.ts @@ -1,8 +1,8 @@ +import { Envelope } from "@nmshd/connector"; import { TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, ContextResponse, GET, Path, PathParam, POST, Return, ServiceContext } from "@nmshd/typescript-rest"; import express from "express"; -import { Envelope } from "../../../infrastructure"; import { BaseController, Mimetype } from "../common/BaseController"; @Path("/api/v2/Messages") diff --git a/src/modules/coreHttpApi/controllers/OutgoingRequestsController.ts b/src/modules/coreHttpApi/controllers/OutgoingRequestsController.ts index 3ec92f42..83fa4222 100644 --- a/src/modules/coreHttpApi/controllers/OutgoingRequestsController.ts +++ b/src/modules/coreHttpApi/controllers/OutgoingRequestsController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { ConsumptionServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, GET, Path, PathParam, POST, Return, ServiceContext } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Requests/Outgoing") diff --git a/src/modules/coreHttpApi/controllers/RelationshipTemplatesController.ts b/src/modules/coreHttpApi/controllers/RelationshipTemplatesController.ts index 686adfd0..ec568feb 100644 --- a/src/modules/coreHttpApi/controllers/RelationshipTemplatesController.ts +++ b/src/modules/coreHttpApi/controllers/RelationshipTemplatesController.ts @@ -1,8 +1,8 @@ +import { Envelope } from "@nmshd/connector"; import { OwnerRestriction, TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, ContextAccept, ContextResponse, Errors, GET, POST, Path, PathParam, Return, ServiceContext } from "@nmshd/typescript-rest"; import express from "express"; -import { Envelope } from "../../../infrastructure"; import { BaseController, Mimetype } from "../common/BaseController"; @Path("/api/v2/RelationshipTemplates") diff --git a/src/modules/coreHttpApi/controllers/RelationshipsController.ts b/src/modules/coreHttpApi/controllers/RelationshipsController.ts index 579fec22..9f57981c 100644 --- a/src/modules/coreHttpApi/controllers/RelationshipsController.ts +++ b/src/modules/coreHttpApi/controllers/RelationshipsController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, DELETE, GET, Path, PathParam, POST, PUT, Return, ServiceContext } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/Relationships") diff --git a/src/modules/coreHttpApi/controllers/TokensController.ts b/src/modules/coreHttpApi/controllers/TokensController.ts index 1f994aff..86a5b285 100644 --- a/src/modules/coreHttpApi/controllers/TokensController.ts +++ b/src/modules/coreHttpApi/controllers/TokensController.ts @@ -1,8 +1,8 @@ +import { Envelope } from "@nmshd/connector"; import { OwnerRestriction, TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, Context, ContextAccept, ContextResponse, Errors, GET, Path, PathParam, POST, Return, ServiceContext } from "@nmshd/typescript-rest"; import express from "express"; -import { Envelope } from "../../../infrastructure"; import { BaseController, Mimetype } from "../common/BaseController"; @Path("/api/v2/Tokens") diff --git a/src/modules/coreHttpApi/debug-controllers/IdentityDeletionProcessController.ts b/src/modules/coreHttpApi/debug-controllers/IdentityDeletionProcessController.ts index 280205bc..fcda0d43 100644 --- a/src/modules/coreHttpApi/debug-controllers/IdentityDeletionProcessController.ts +++ b/src/modules/coreHttpApi/debug-controllers/IdentityDeletionProcessController.ts @@ -1,7 +1,7 @@ +import { Envelope } from "@nmshd/connector"; import { TransportServices } from "@nmshd/runtime"; import { Inject } from "@nmshd/typescript-ioc"; import { Accept, DELETE, GET, Path, POST, QueryParam } from "@nmshd/typescript-rest"; -import { Envelope } from "../../../infrastructure"; import { BaseController } from "../common/BaseController"; @Path("/api/v2/IdentityDeletionProcess") diff --git a/tsconfig.json b/tsconfig.json index 8b0bd29b..6e5d9eca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,5 +21,5 @@ "lib": ["es2021", "dom"], "typeRoots": ["./node_modules/@types"] }, - "include": ["src/**/*"] + "include": ["src/**/*", "packages/connector/src/DocumentationLink.ts"] }