refactor: move infrastructure

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<TConfig extends RuntimeConfig = RuntimeConfig> extends Runtime<TConfig> {
     public abstract override getServices(): RuntimeServices;
     public abstract getBackboneAuthenticationToken(): Promise<string>;
-    public abstract readonly infrastructure: IInfrastructureRegistry;
+    public abstract readonly infrastructure: ConnectorInfrastructureRegistry;
 }

packages/connector/src/index.ts

@@ -1,3 +1,5 @@
 export * from "./AbstractConnectorRuntime";
+export * from "./ConnectorLoggerFactory";
 export * from "./ConnectorMode";
 export * from "./ConnectorRuntimeModule";
+export * from "./infrastructure";

src/infrastructure/ConnectorInfastructure.ts → packages/connector/src/infrastructure/ConnectorInfrastructure.ts

@@ -1,14 +1,14 @@
 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;
 }
 
 export abstract class ConnectorInfrastructure<TConfig extends InfrastructureConfiguration = InfrastructureConfiguration> {
     public constructor(
-        protected runtime: ConnectorRuntime,
+        protected runtime: AbstractConnectorRuntime,
         protected configuration: TConfig,
         protected logger: ILogger,
         public readonly name: string,

src/infrastructure/ConnectorInfrastructureRegistry.ts → 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<string, ConnectorInfrastructure | undefined> = {};
 
     public get httpServer(): HttpServer {

src/infrastructure/httpServer/HttpServer.ts → 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<HttpServerConfiguration>
 
     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<HttpServerConfiguration>
 
     private useVersionEndpoint() {
         this.app.get("/Monitoring/Version", (_req: any, res: any) => {
-            res.status(200).json(buildInformation);
+            res.status(200).json(this.buildInformation);
         });
     }
 

src/infrastructure/httpServer/common/Envelope.ts → 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 {

src/infrastructure/httpServer/middlewares/genericErrorHandler.ts → 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 {}

packages/connector/src/infrastructure/index.ts

@@ -0,0 +1,3 @@
+export * from "./ConnectorInfrastructure";
+export * from "./ConnectorInfrastructureRegistry";
+export * from "./httpServer";

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<ConnectorRuntimeC
 
     protected async initInfrastructure(): Promise<void> {
         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);
         }
 

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";

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: {

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<T>(result: Result<T>): Return.NewResource<Envelope> {

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")

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")

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")

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")

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")

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")

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")

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")

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")

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")

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")

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")

tsconfig.json

@@ -21,5 +21,5 @@
         "lib": ["es2021", "dom"],
         "typeRoots": ["./node_modules/@types"]
     },
-    "include": ["src/**/*"]
+    "include": ["src/**/*", "packages/connector/src/DocumentationLink.ts"]
 }