@contember/engine-server 1.1.0-beta.3 → 1.2.0-alpha.1

package/dist/src/MasterContainer.d.ts

@@ -4,21 +4,18 @@ import { SystemContainerFactory } from '@contember/engine-system-api';
 import { TenantContainerFactory } from '@contember/engine-tenant-api';
 import { Builder } from '@contember/dic';
 import { ServerConfig } from './config/config';
-import { ProcessType } from './utils';
 import { ModificationHandlerFactory } from '@contember/schema-migrations';
 import { Initializer } from './bootstrap';
 import { Plugin } from '@contember/engine-plugins';
-import { ContentApiMiddlewareFactory, ContentGraphQLContextFactory, ContentQueryHandlerFactory, ErrorMiddlewareFactory, Koa, NotModifiedChecker, ProjectGroupResolver, Providers, SystemApiMiddlewareFactory, SystemGraphQLContextFactory, SystemGraphQLHandlerFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
-import prom from 'prom-client';
+import { ContentApiMiddlewareFactory, ContentGraphQLContextFactory, ContentQueryHandlerFactory, ErrorMiddlewareFactory, Koa, NotModifiedChecker, Providers, SystemApiMiddlewareFactory, SystemGraphQLContextFactory, SystemGraphQLHandlerFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
 import { ProjectContainerFactoryFactory } from './project';
 import { ProjectConfigResolver } from './config/projectConfigResolver';
 import { TenantConfigResolver } from './config/tenantConfigResolver';
-import { ProjectGroupContainerResolver } from './projectGroup/ProjectGroupContainerResolver';
 import { ProjectGroupContainerFactory } from './projectGroup/ProjectGroupContainer';
+import { ProjectGroupContainer, ProjectGroupResolver as ProjectGroupResolverInterface } from '@contember/engine-http';
 export interface MasterContainer {
     initializer: Initializer;
     koa: Koa;
-    monitoringKoa: Koa;
     providers: Providers;
 }
 export interface MasterContainerArgs {
@@ -27,35 +24,27 @@ export interface MasterContainerArgs {
     projectConfigResolver: ProjectConfigResolver;
     tenantConfigResolver: TenantConfigResolver;
     plugins: Plugin[];
-    processType: ProcessType;
     version?: string;
 }
 export declare class MasterContainerFactory {
-    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, processType, version, }: MasterContainerArgs): Builder<{
+    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, }: MasterContainerArgs): Builder<{
         serverConfig: {
             readonly port: number;
-            readonly monitoringPort: number;
             readonly http: {
                 readonly requestBodySize?: string | undefined;
             };
-            readonly logging: {} | {
+            readonly logging: {
+                sentry?: {
+                    dsn: string;
+                } | undefined;
+            } | {
                 readonly sentry?: {
                     readonly dsn: string;
                 } | undefined;
             };
-        } & {
-            readonly workerCount?: string | number | undefined;
-            readonly projectGroup?: ({
-                readonly domainMapping: string;
-            } & {
-                readonly configHeader?: string | undefined;
-                readonly configEncryptionKey?: string | undefined;
-            }) | undefined;
         };
     } & {
         debugMode: boolean;
-    } & {
-        processType: ProcessType;
     } & {
         version: string | undefined;
     } & {
@@ -88,13 +77,11 @@ export declare class MasterContainerFactory {
     } & {
         projectGroupContainerFactory: ProjectGroupContainerFactory;
     } & {
-        projectGroupContainerResolver: ProjectGroupContainerResolver;
-    } & {
-        promRegistry: prom.Registry;
+        projectGroupContainer: ProjectGroupContainer;
     } & {
         httpErrorMiddlewareFactory: ErrorMiddlewareFactory;
     } & {
-        projectGroupResolver: ProjectGroupResolver;
+        projectGroupResolver: ProjectGroupResolverInterface;
     } & {
         notModifiedChecker: NotModifiedChecker;
     } & {
@@ -112,9 +99,9 @@ export declare class MasterContainerFactory {
     } & {
         systemApiMiddlewareFactory: SystemApiMiddlewareFactory;
     } & {
-        koa: Koa<Koa.DefaultState, Koa.DefaultContext>;
+        koaMiddlewares: import("@contember/engine-http").KoaMiddleware<any>;
     } & {
-        monitoringKoa: Koa<Koa.DefaultState, Koa.DefaultContext>;
+        koa: Koa<Koa.DefaultState, Koa.DefaultContext>;
     } & {
         initializer: Initializer;
     }>;

package/dist/src/MasterContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAA4C,WAAW,EAAE,MAAM,SAAS,CAAA;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAElD,OAAO,EAEN,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAQ1B,sBAAsB,EACtB,GAAG,EACH,kBAAkB,EAClB,oBAAoB,EACpB,SAAS,EACF,0BAA0B,EAAE,2BAA2B,EAC9D,2BAA2B,EAAE,0BAA0B,EAAE,2BAA2B,EACpF,2BAA2B,EAC3B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAI1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAA;AAC5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAA;AAGnF,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,SAAS,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,aAAa,CAAC,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EACpB,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoJtB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe;CAIlD"}
+{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAEN,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAO1B,sBAAsB,EACtB,GAAG,EACH,kBAAkB,EAClB,SAAS,EAET,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,EAC3B,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,EAC3B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAG1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAA;AAGnF,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,IAAI,6BAA6B,EAAE,MAAM,wBAAwB,CAAA;AAErH,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,aAAa,CAAC,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EACpB,OAAO,GACP,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmGtB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe;CAIlD"}

package/dist/src/MasterContainer.js

@@ -10,22 +10,18 @@ const dic_1 = require("@contember/dic");
 const utils_1 = require("./utils");
 const schema_migrations_1 = require("@contember/schema-migrations");
 const bootstrap_1 = require("./bootstrap");
-const http_1 = require("./http");
 const engine_http_1 = require("@contember/engine-http");
-const prom_client_1 = __importDefault(require("prom-client"));
 const project_1 = require("./project");
-const crypto_1 = require("crypto");
 const koa_compress_1 = __importDefault(require("koa-compress"));
 const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
-const ProjectGroupContainerResolver_1 = require("./projectGroup/ProjectGroupContainerResolver");
 const ProjectGroupContainer_1 = require("./projectGroup/ProjectGroupContainer");
 const cors_1 = __importDefault(require("@koa/cors"));
+const ProjectGroupResolver_1 = require("./projectGroup/ProjectGroupResolver");
 class MasterContainerFactory {
-    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, processType, version, }) {
+    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, }) {
         return new dic_1.Builder({})
             .addService('serverConfig', () => serverConfig)
             .addService('debugMode', () => debugMode)
-            .addService('processType', () => processType)
             .addService('version', () => version)
             .addService('projectConfigResolver', () => projectConfigResolver)
             .addService('tenantConfigResolver', () => tenantConfigResolver)
@@ -37,94 +33,54 @@ class MasterContainerFactory {
             .addService('projectContainerFactoryFactory', ({ debugMode, plugins, providers }) => new project_1.ProjectContainerFactoryFactory(debugMode, plugins, providers))
             .addService('tenantGraphQLHandlerFactory', () => new engine_http_1.TenantGraphQLHandlerFactory(utils_1.logSentryError))
             .addService('systemGraphQLHandlerFactory', ({ debugMode }) => new engine_http_1.SystemGraphQLHandlerFactory(utils_1.logSentryError, debugMode))
-            .addService('projectGroupContainerFactory', ({ providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory }) => new ProjectGroupContainer_1.ProjectGroupContainerFactory(providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory))
-            .addService('projectGroupContainerResolver', ({ tenantConfigResolver, projectGroupContainerFactory }) => new ProjectGroupContainerResolver_1.ProjectGroupContainerResolver(tenantConfigResolver, projectGroupContainerFactory))
-            .addService('promRegistry', ({ processType, projectGroupContainerResolver }) => {
-            if (processType === utils_1.ProcessType.clusterMaster) {
-                const register = new prom_client_1.default.AggregatorRegistry();
-                prom_client_1.default.collectDefaultMetrics({ register });
-                return register;
-            }
-            const register = prom_client_1.default.register;
-            prom_client_1.default.collectDefaultMetrics({ register });
-            const registrar = (0, utils_1.createDbMetricsRegistrar)(register);
-            projectGroupContainerResolver.onCreate.push((groupContainer, slug) => {
-                groupContainer.projectContainerResolver.onCreate.push(projectContainer => registrar({
-                    connection: projectContainer.connection,
-                    labels: {
-                        contember_module: 'content',
-                        contember_project: projectContainer.project.slug,
-                        contember_project_group: slug !== null && slug !== void 0 ? slug : 'unknown',
-                    },
-                }));
-                return registrar({
-                    connection: groupContainer.tenantContainer.connection,
-                    labels: {
-                        contember_module: 'tenant',
-                        contember_project_group: slug !== null && slug !== void 0 ? slug : 'unknown',
-                        contember_project: 'unknown',
-                    },
-                });
-            });
-            return register;
-        })
+            .addService('projectGroupContainerFactory', ({ debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory }) => new ProjectGroupContainer_1.ProjectGroupContainerFactory(debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory))
+            .addService('projectGroupContainer', ({ tenantConfigResolver, projectGroupContainerFactory }) => projectGroupContainerFactory.create({ slug: undefined, config: tenantConfigResolver(undefined, {}) }))
             .addService('httpErrorMiddlewareFactory', ({ debugMode }) => new engine_http_1.ErrorMiddlewareFactory(debugMode))
-            .addService('projectGroupResolver', ({ projectGroupContainerResolver, serverConfig }) => {
-            var _a, _b, _c, _d, _e;
-            const encryptionKey = ((_a = serverConfig.projectGroup) === null || _a === void 0 ? void 0 : _a.configEncryptionKey)
-                ? (0, crypto_1.createSecretKey)(Buffer.from((_b = serverConfig.projectGroup) === null || _b === void 0 ? void 0 : _b.configEncryptionKey, 'hex'))
-                : undefined;
-            return new engine_http_1.ProjectGroupResolver((_c = serverConfig.projectGroup) === null || _c === void 0 ? void 0 : _c.domainMapping, (_d = serverConfig.projectGroup) === null || _d === void 0 ? void 0 : _d.configHeader, ((_e = serverConfig.projectGroup) === null || _e === void 0 ? void 0 : _e.configEncryptionKey) ? new engine_http_1.CryptoWrapper(encryptionKey) : undefined, projectGroupContainerResolver);
-        })
+            .addService('projectGroupResolver', ({ projectGroupContainer }) => new ProjectGroupResolver_1.ProjectGroupResolver(projectGroupContainer))
             .addService('notModifiedChecker', () => new engine_http_1.NotModifiedChecker())
             .addService('contentGraphqlContextFactory', ({ providers }) => new engine_http_1.ContentGraphQLContextFactory(providers))
             .addService('contentQueryHandlerFactory', ({ debugMode }) => new engine_http_1.ContentQueryHandlerFactory(debugMode, utils_1.logSentryError))
-            .addService('contentApiMiddlewareFactory', ({ debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) => new engine_http_1.ContentApiMiddlewareFactory(debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
+            .addService('contentApiMiddlewareFactory', ({ projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) => new engine_http_1.ContentApiMiddlewareFactory(projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
             .addService('tenantGraphQLContextFactory', () => new engine_http_1.TenantGraphQLContextFactory())
             .addService('tenantApiMiddlewareFactory', ({ debugMode, projectGroupResolver, tenantGraphQLContextFactory }) => new engine_http_1.TenantApiMiddlewareFactory(debugMode, projectGroupResolver, tenantGraphQLContextFactory))
             .addService('systemGraphQLContextFactory', () => new engine_http_1.SystemGraphQLContextFactory())
             .addService('systemApiMiddlewareFactory', ({ debugMode, projectGroupResolver, systemGraphQLContextFactory }) => new engine_http_1.SystemApiMiddlewareFactory(debugMode, projectGroupResolver, systemGraphQLContextFactory))
-            .addService('koa', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, httpErrorMiddlewareFactory, promRegistry, debugMode, version, serverConfig }) => {
-            const app = new engine_http_1.Koa();
-            app.use((0, engine_http_1.compose)([
-                (0, koa_compress_1.default)({
-                    br: false,
-                }),
-                (0, koa_bodyparser_1.default)({
-                    jsonLimit: serverConfig.http.requestBodySize || '1mb',
-                }),
-                (0, engine_http_1.createPoweredByHeaderMiddleware)(debugMode, version !== null && version !== void 0 ? version : 'unknown'),
-                httpErrorMiddlewareFactory.create(),
-                (0, http_1.createColllectHttpMetricsMiddleware)(promRegistry),
-                (0, engine_http_1.createTimerMiddleware)(),
-                (0, engine_http_1.route)('/playground$', (0, engine_http_1.createPlaygroundMiddleware)()),
-                (0, engine_http_1.createHomepageMiddleware)(),
-                (0, cors_1.default)(),
-                (0, engine_http_1.route)('/content/:projectSlug/:stageSlug$', (0, engine_http_1.compose)([
-                    (0, engine_http_1.createModuleInfoMiddleware)('content'),
-                    contentApiMiddlewareFactory.create(),
-                ])),
-                (0, engine_http_1.route)('/tenant$', (0, engine_http_1.compose)([
-                    (0, engine_http_1.createModuleInfoMiddleware)('tenant'),
-                    tenantApiMiddlewareFactory.create(),
-                ])),
-                (0, engine_http_1.route)('/system/:projectSlug$', (0, engine_http_1.compose)([
-                    (0, engine_http_1.createModuleInfoMiddleware)('system'),
-                    systemApiMiddlewareFactory.create(),
-                ])),
-            ]));
-            return app;
-        })
-            .addService('monitoringKoa', ({ promRegistry }) => {
+            .addService('koaMiddlewares', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, httpErrorMiddlewareFactory, debugMode, version, serverConfig }) => (0, engine_http_1.compose)([
+            (0, koa_compress_1.default)({
+                br: false,
+            }),
+            (0, koa_bodyparser_1.default)({
+                jsonLimit: serverConfig.http.requestBodySize || '1mb',
+            }),
+            (0, engine_http_1.createPoweredByHeaderMiddleware)(debugMode, version !== null && version !== void 0 ? version : 'unknown'),
+            httpErrorMiddlewareFactory.create(),
+            (0, engine_http_1.createTimerMiddleware)(),
+            (0, engine_http_1.route)('/playground$', (0, engine_http_1.createPlaygroundMiddleware)()),
+            (0, engine_http_1.createHomepageMiddleware)(),
+            (0, cors_1.default)(),
+            (0, engine_http_1.route)('/content/:projectSlug/:stageSlug$', (0, engine_http_1.compose)([
+                (0, engine_http_1.createModuleInfoMiddleware)('content'),
+                contentApiMiddlewareFactory.create(),
+            ])),
+            (0, engine_http_1.route)('/tenant$', (0, engine_http_1.compose)([
+                (0, engine_http_1.createModuleInfoMiddleware)('tenant'),
+                tenantApiMiddlewareFactory.create(),
+            ])),
+            (0, engine_http_1.route)('/system/:projectSlug$', (0, engine_http_1.compose)([
+                (0, engine_http_1.createModuleInfoMiddleware)('system'),
+                systemApiMiddlewareFactory.create(),
+            ])),
+        ]))
+            .addService('koa', ({ koaMiddlewares }) => {
             const app = new engine_http_1.Koa();
-            app.use((0, http_1.createShowMetricsMiddleware)(promRegistry));
+            app.use(koaMiddlewares);
             return app;
         })
-            .addService('initializer', ({ projectGroupContainerResolver }) => new bootstrap_1.Initializer(projectGroupContainerResolver));
+            .addService('initializer', ({ projectGroupContainer }) => new bootstrap_1.Initializer(projectGroupContainer));
     }
     create(args) {
         const container = this.createBuilder(args).build();
-        return container.pick('initializer', 'koa', 'monitoringKoa', 'providers');
+        return container.pick('initializer', 'koa', 'providers');
     }
 }
 exports.MasterContainerFactory = MasterContainerFactory;

package/dist/src/MasterContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"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"}

package/dist/src/bootstrap/Initializer.d.ts

@@ -1,7 +1,7 @@
-import { ProjectGroupContainerResolver } from '../projectGroup/ProjectGroupContainerResolver';
+import { ProjectGroupContainer } from '@contember/engine-http';
 export declare class Initializer {
-    private readonly projectGroupContainerResolver;
-    constructor(projectGroupContainerResolver: ProjectGroupContainerResolver);
+    private readonly projectGroupContainer;
+    constructor(projectGroupContainer: ProjectGroupContainer);
     initialize(): Promise<string[]>;
 }
 //# sourceMappingURL=Initializer.d.ts.map

package/dist/src/bootstrap/Initializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAA;AAE7F,qBAAa,WAAW;IAEtB,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAA7B,6BAA6B,EAAE,6BAA6B;IAGjE,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAuB5C"}
+{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,qBAAa,WAAW;IAEtB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,qBAAqB;IAGjD,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAiC5C"}

package/dist/src/bootstrap/Initializer.js

@@ -3,23 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Initializer = void 0;
 const engine_common_1 = require("@contember/engine-common");
 class Initializer {
-    constructor(projectGroupContainerResolver) {
-        this.projectGroupContainerResolver = projectGroupContainerResolver;
+    constructor(projectGroupContainer) {
+        this.projectGroupContainer = projectGroupContainer;
     }
     async initialize() {
         // eslint-disable-next-line no-console
         const logger = new engine_common_1.Logger(console.log);
         logger.group('\nInitializing tenant database');
         // todo
-        const groupContainer = await this.projectGroupContainerResolver.getProjectGroupContainer(undefined);
-        await groupContainer.tenantContainer.migrationsRunner.run(logger.write.bind(logger));
+        const groupContainer = await this.projectGroupContainer;
+        const tenantContainer = groupContainer.tenantContainer;
+        await tenantContainer.migrationsRunner.run(logger.write.bind(logger));
         logger.groupEnd();
         const systemContainer = groupContainer.systemContainer;
         const projects = [];
-        for (const projectContainer of await groupContainer.projectContainerResolver.getAllProjectContainers()) {
+        const tenantProjects = await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext);
+        for (const { slug: projectSlug } of tenantProjects) {
+            logger.group(`\nUpdating project ${projectSlug}`);
+            const projectContainer = await groupContainer.projectContainerResolver.getProjectContainer(projectSlug, {
+                alias: false,
+                logger,
+            });
+            if (!projectContainer) {
+                throw new Error();
+            }
             const project = projectContainer.project;
             projects.push(project.slug);
-            logger.group(`\nUpdating project ${project.slug}`);
             await systemContainer.projectInitializer.initialize(projectContainer.systemDatabaseContextFactory, project, logger);
             logger.groupEnd();
         }

package/dist/src/bootstrap/Initializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;AAAA,4DAAiD;AAGjD,MAAa,WAAW;IACvB,YACkB,6BAA4D;QAA5D,kCAA6B,GAA7B,6BAA6B,CAA+B;IAC3E,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,OAAO;QACP,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAA;QAEnG,MAAM,cAAc,CAAC,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACpF,MAAM,CAAC,QAAQ,EAAE,CAAA;QAEjB,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;QACtD,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,gBAAgB,IAAI,MAAM,cAAc,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,EAAE;YACvG,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;YACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YAClD,MAAM,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,gBAAgB,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACnH,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AA5BD,kCA4BC"}
+{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;AAAA,4DAAiD;AAGjD,MAAa,WAAW;IACvB,YACkB,qBAA4C;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;IAC3D,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,OAAO;QACP,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAA;QAEvD,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;QACtD,MAAM,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACrE,MAAM,CAAC,QAAQ,EAAE,CAAA;QAEjB,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;QACtD,MAAM,QAAQ,GAAa,EAAE,CAAA;QAE7B,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;QACxG,KAAK,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,cAAc,EAAE;YACnD,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,EAAE,CAAC,CAAA;YACjD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBACvG,KAAK,EAAE,KAAK;gBACZ,MAAM;aACN,CAAC,CAAA;YACF,IAAI,CAAC,gBAAgB,EAAE;gBACtB,MAAM,IAAI,KAAK,EAAE,CAAA;aACjB;YACD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;YACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,gBAAgB,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACnH,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AAtCD,kCAsCC"}

package/dist/src/config/config.d.ts

@@ -1,15 +1,16 @@
 import { ConfigProcessor } from '@contember/engine-plugins';
-import { serverConfigSchema, tenantConfigSchema } from './configSchema';
+import { serverConfigSchema as defaultServerConfigSchema, tenantConfigSchema } from './configSchema';
 import { ProjectConfigResolver } from './projectConfigResolver';
 import { TenantConfigResolver } from './tenantConfigResolver';
-export declare type ServerConfig = ReturnType<typeof serverConfigSchema>;
+import { Type } from '@contember/typesafe';
+export declare type ServerConfig = ReturnType<typeof defaultServerConfigSchema>;
 export declare type TenantConfig = ReturnType<typeof tenantConfigSchema>;
 export declare type ConfigSource = {
     data: string;
     type: 'file' | 'json' | 'yaml';
 };
-export declare function readConfig(configSources: ConfigSource[], configProcessors?: ConfigProcessor[]): Promise<{
-    serverConfig: ServerConfig;
+export declare function readConfig<T extends ServerConfig>(configSources?: ConfigSource[], configProcessors?: ConfigProcessor[], serverConfigSchema?: Type<T>): Promise<{
+    serverConfig: T;
     projectConfigResolver: ProjectConfigResolver;
     tenantConfigResolver: TenantConfigResolver;
 }>;

package/dist/src/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEvE,OAAO,EAA+B,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC5F,OAAO,EAA8B,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAEzF,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAChE,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAEhE,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAI3E,wBAAsB,UAAU,CAC/B,aAAa,EAAE,YAAY,EAAE,EAC7B,gBAAgB,GAAE,eAAe,EAAO,GACtC,OAAO,CAAC;IACV,YAAY,EAAE,YAAY,CAAA;IAC1B,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;CAC1C,CAAC,CA4BD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEpG,OAAO,EAA+B,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC5F,OAAO,EAA8B,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AACzF,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAA;AACvE,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAEhE,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAI3E,wBAAsB,UAAU,CAAC,CAAC,SAAS,YAAY,EACtD,aAAa,GAAE,YAAY,EAAO,EAClC,gBAAgB,GAAE,eAAe,EAAO,EACxC,kBAAkB,GAAE,IAAI,CAAC,CAAC,CAAwC,GAChE,OAAO,CAAC;IACV,YAAY,EAAE,CAAC,CAAA;IACf,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;CAC1C,CAAC,CA4BD"}

package/dist/src/config/config.js

@@ -6,7 +6,7 @@ const configSchema_1 = require("./configSchema");
 const configTemplate_1 = require("./configTemplate");
 const projectConfigResolver_1 = require("./projectConfigResolver");
 const tenantConfigResolver_1 = require("./tenantConfigResolver");
-async function readConfig(configSources, configProcessors = []) {
+async function readConfig(configSources = [], configProcessors = [], serverConfigSchema = configSchema_1.serverConfigSchema) {
     const loader = new config_loader_1.ConfigLoader();
     const configs = await Promise.all(configSources.map(it => (it.type === 'file' ? loader.load(it.data) : loader.loadString(it.data, it.type))));
     const env = {
@@ -19,7 +19,7 @@ async function readConfig(configSources, configProcessors = []) {
     const rawConfig = config_loader_1.Merger.merge(template, ...configs);
     const parametersResolver = (0, config_loader_1.createObjectParametersResolver)({ env });
     const config = (0, config_loader_1.resolveParameters)(rawConfig.server, parametersResolver);
-    const serverConfig = (0, configSchema_1.serverConfigSchema)(config);
+    const serverConfig = serverConfigSchema(config);
     return {
         serverConfig,
         projectConfigResolver: (0, projectConfigResolver_1.createProjectConfigResolver)(env, rawConfig, configProcessors),

package/dist/src/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":";;;AAAA,4DAAkH;AAElH,iDAAuE;AACvE,qDAAiD;AACjD,mEAA4F;AAC5F,iEAAyF;AASlF,KAAK,UAAU,UAAU,CAC/B,aAA6B,EAC7B,mBAAsC,EAAE;IAMxC,MAAM,MAAM,GAAG,IAAI,4BAAY,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1G,CAAA;IACD,MAAM,GAAG,GAAQ;QAChB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,WAAC,OAAA,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,oDAAI,KAAI,EAAE,CAAC,EAAE,CAAC,CAAA,EAAA,EAAE;YAC1F,eAAe,EAAE,MAAM;SACvB,CAAC;QACF,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAA0B,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;KAC9G,CAAA;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,SAAS,CAAC,qBAAqB,0DAAG,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,KAAI,GAAG,CAAA,EAAA,EAC1E,+BAAc,CACd,CAAA;IAED,MAAM,SAAS,GAAG,sBAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAA;IAEpD,MAAM,kBAAkB,GAAG,IAAA,8CAA8B,EAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IAClE,MAAM,MAAM,GAAG,IAAA,iCAAiB,EAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAEtE,MAAM,YAAY,GAAG,IAAA,iCAAkB,EAAC,MAAM,CAAC,CAAA;IAC/C,OAAO;QACN,YAAY;QACZ,qBAAqB,EAAE,IAAA,mDAA2B,EAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC;QACpF,oBAAoB,EAAE,IAAA,iDAA0B,EAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC;KACvE,CAAA;AACF,CAAC;AAnCD,gCAmCC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":";;;AAAA,4DAAkH;AAElH,iDAAoG;AACpG,qDAAiD;AACjD,mEAA4F;AAC5F,iEAAyF;AAUlF,KAAK,UAAU,UAAU,CAC/B,gBAAgC,EAAE,EAClC,mBAAsC,EAAE,EACxC,qBAA8B,iCAAoC;IAMlE,MAAM,MAAM,GAAG,IAAI,4BAAY,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1G,CAAA;IACD,MAAM,GAAG,GAAQ;QAChB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,WAAC,OAAA,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,oDAAI,KAAI,EAAE,CAAC,EAAE,CAAC,CAAA,EAAA,EAAE;YAC1F,eAAe,EAAE,MAAM;SACvB,CAAC;QACF,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAA0B,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;KAC9G,CAAA;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,SAAS,CAAC,qBAAqB,0DAAG,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,KAAI,GAAG,CAAA,EAAA,EAC1E,+BAAc,CACd,CAAA;IAED,MAAM,SAAS,GAAG,sBAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAA;IAEpD,MAAM,kBAAkB,GAAG,IAAA,8CAA8B,EAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IAClE,MAAM,MAAM,GAAG,IAAA,iCAAiB,EAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAEtE,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC/C,OAAO;QACN,YAAY;QACZ,qBAAqB,EAAE,IAAA,mDAA2B,EAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC;QACpF,oBAAoB,EAAE,IAAA,iDAA0B,EAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC;KACvE,CAAA;AACF,CAAC;AApCD,gCAoCC"}

package/dist/src/config/configSchema.d.ts

@@ -1,6 +1,6 @@
 import * as Typesafe from '@contember/typesafe';
 import { MailerOptions } from '@contember/engine-tenant-api';
-export declare const dbCredentialsSchema: Typesafe.Type<{
+export declare const dbConfigSchema: Typesafe.Type<{
     readonly host: string;
     readonly port: number;
     readonly user: string;
@@ -8,6 +8,19 @@ export declare const dbCredentialsSchema: Typesafe.Type<{
     readonly database: string;
 } & {
     readonly ssl?: boolean | undefined;
+    readonly queryTimeoutMs?: number | undefined;
+    readonly statementTimeoutMs?: number | undefined;
+    readonly connectionTimeoutMs?: number | undefined;
+    readonly pool?: {
+        readonly maxConnections?: number | undefined;
+        readonly maxConnecting?: number | undefined;
+        readonly maxIdle?: number | undefined;
+        readonly reconnectIntervalMs?: number | undefined;
+        readonly idleTimeoutMs?: number | undefined;
+        readonly acquireTimeoutMs?: number | undefined;
+        readonly maxUses?: number | undefined;
+        readonly maxAgeMs?: number | undefined;
+    } | undefined;
 }>;
 export declare const tenantConfigSchema: Typesafe.Type<{
     readonly db: {
@@ -18,6 +31,19 @@ export declare const tenantConfigSchema: Typesafe.Type<{
         readonly database: string;
     } & {
         readonly ssl?: boolean | undefined;
+        readonly queryTimeoutMs?: number | undefined;
+        readonly statementTimeoutMs?: number | undefined;
+        readonly connectionTimeoutMs?: number | undefined;
+        readonly pool?: {
+            readonly maxConnections?: number | undefined;
+            readonly maxConnecting?: number | undefined;
+            readonly maxIdle?: number | undefined;
+            readonly reconnectIntervalMs?: number | undefined;
+            readonly idleTimeoutMs?: number | undefined;
+            readonly acquireTimeoutMs?: number | undefined;
+            readonly maxUses?: number | undefined;
+            readonly maxAgeMs?: number | undefined;
+        } | undefined;
     };
     readonly mailer: MailerOptions & Typesafe.JsonObject;
     readonly credentials: {
@@ -34,23 +60,18 @@ export declare const tenantConfigSchema: Typesafe.Type<{
 }>;
 export declare const serverConfigSchema: Typesafe.Type<{
     readonly port: number;
-    readonly monitoringPort: number;
     readonly http: {
         readonly requestBodySize?: string | undefined;
     };
-    readonly logging: {} | {
+    readonly logging: {
+        sentry?: {
+            dsn: string;
+        } | undefined;
+    } | {
         readonly sentry?: {
             readonly dsn: string;
         } | undefined;
     };
-} & {
-    readonly workerCount?: string | number | undefined;
-    readonly projectGroup?: ({
-        readonly domainMapping: string;
-    } & {
-        readonly configHeader?: string | undefined;
-        readonly configEncryptionKey?: string | undefined;
-    }) | undefined;
 }>;
 export declare const stageConfig: Typesafe.Type<{
     readonly [x: string]: {
@@ -77,6 +98,19 @@ export declare const projectConfigSchema: Typesafe.Type<{
         readonly database: string;
     } & {
         readonly ssl?: boolean | undefined;
+        readonly queryTimeoutMs?: number | undefined;
+        readonly statementTimeoutMs?: number | undefined;
+        readonly connectionTimeoutMs?: number | undefined;
+        readonly pool?: {
+            readonly maxConnections?: number | undefined;
+            readonly maxConnecting?: number | undefined;
+            readonly maxIdle?: number | undefined;
+            readonly reconnectIntervalMs?: number | undefined;
+            readonly idleTimeoutMs?: number | undefined;
+            readonly acquireTimeoutMs?: number | undefined;
+            readonly maxUses?: number | undefined;
+            readonly maxAgeMs?: number | undefined;
+        } | undefined;
     }) | {
         readonly useTenantDb: true;
     }) & {

package/dist/src/config/configSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAI5D,eAAO,MAAM,mBAAmB;;;;;;;;EAW/B,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;EA6B9B,CAAA;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;EA8B9B,CAAA;AAED,eAAO,MAAM,WAAW;;;;;;;EAcvB,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;EAkB9B,CAAA"}
+{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAI5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;EAwB1B,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6B9B,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;iBAMJ,MAAM;;;;;;;EAO/B,CAAA;AAEF,eAAO,MAAM,WAAW;;;;;;;EAcvB,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkB9B,CAAA"}

package/dist/src/config/configSchema.js

@@ -23,10 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectConfigSchema = exports.stageConfig = exports.serverConfigSchema = exports.tenantConfigSchema = exports.dbCredentialsSchema = void 0;
+exports.projectConfigSchema = exports.stageConfig = exports.serverConfigSchema = exports.tenantConfigSchema = exports.dbConfigSchema = void 0;
 const Typesafe = __importStar(require("@contember/typesafe"));
 const utils_1 = require("../utils");
-exports.dbCredentialsSchema = Typesafe.intersection(Typesafe.object({
+exports.dbConfigSchema = Typesafe.intersection(Typesafe.object({
     host: Typesafe.string,
     port: Typesafe.number,
     user: Typesafe.string,
@@ -34,9 +34,22 @@ exports.dbCredentialsSchema = Typesafe.intersection(Typesafe.object({
     database: Typesafe.string,
 }), Typesafe.partial({
     ssl: Typesafe.boolean,
+    queryTimeoutMs: Typesafe.number,
+    statementTimeoutMs: Typesafe.number,
+    connectionTimeoutMs: Typesafe.number,
+    pool: Typesafe.partial({
+        maxConnections: Typesafe.number,
+        maxConnecting: Typesafe.number,
+        maxIdle: Typesafe.number,
+        reconnectIntervalMs: Typesafe.number,
+        idleTimeoutMs: Typesafe.number,
+        acquireTimeoutMs: Typesafe.number,
+        maxUses: Typesafe.number,
+        maxAgeMs: Typesafe.number,
+    }),
 }));
 exports.tenantConfigSchema = Typesafe.intersection(Typesafe.object({
-    db: exports.dbCredentialsSchema,
+    db: exports.dbConfigSchema,
     mailer: Typesafe.transform(Typesafe.partial({
         from: Typesafe.string,
         host: Typesafe.string,
@@ -62,28 +75,17 @@ exports.tenantConfigSchema = Typesafe.intersection(Typesafe.object({
         encryptionKey: Typesafe.string,
     }),
 }));
-exports.serverConfigSchema = Typesafe.intersection(Typesafe.object({
+exports.serverConfigSchema = Typesafe.object({
     port: Typesafe.number,
-    monitoringPort: Typesafe.number,
     http: Typesafe.partial({
         requestBodySize: Typesafe.string,
     }),
-    logging: Typesafe.union(val => Typesafe.valueAt(val, ['sentry', 'dsn']) === undefined ? {} : Typesafe.fail([]), Typesafe.partial({
+    logging: Typesafe.union((val) => Typesafe.valueAt(val, ['sentry', 'dsn']) === undefined ? {} : Typesafe.fail([]), Typesafe.partial({
         sentry: Typesafe.object({
             dsn: Typesafe.string,
         }),
     })),
-}), Typesafe.partial({
-    workerCount: Typesafe.union(Typesafe.number, Typesafe.string),
-    projectGroup: (val, path = []) => Typesafe.valueAt(val, ['domainMapping']) === undefined
-        ? undefined
-        : Typesafe.intersection(Typesafe.object({
-            domainMapping: Typesafe.string,
-        }), Typesafe.partial({
-            configHeader: Typesafe.string,
-            configEncryptionKey: Typesafe.string,
-        }))(val, path),
-}));
+});
 exports.stageConfig = Typesafe.record(Typesafe.string, Typesafe.intersection(Typesafe.object({
     name: Typesafe.union(Typesafe.string, (_, path = []) => (0, utils_1.upperCaseFirst)(String(path[path.length - 2]))),
     slug: (_, path = []) => String(path[path.length - 2]),
@@ -96,7 +98,7 @@ exports.projectConfigSchema = Typesafe.object({
     stages: (input, path = []) => Object.values((0, exports.stageConfig)(input, path)),
     db: Typesafe.intersection(Typesafe.union(Typesafe.object({
         useTenantDb: Typesafe.literal(true),
-    }), exports.dbCredentialsSchema), Typesafe.partial({
+    }), exports.dbConfigSchema), Typesafe.partial({
         systemSchema: Typesafe.string,
     })),
 });

package/dist/src/config/configSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"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"}