@contember/engine-server 1.1.2 → 1.2.0-alpha.11

package/esbuild.js

@@ -1,14 +1,7 @@
-const esbuild = require('esbuild')
-const { resolvePlugin } = require('../../scripts/esbuild/esbuild')
-esbuild.build({
-	entryPoints: ['./packages/engine-server/src/start.ts'],
-	bundle: true,
-	platform: 'node',
-	sourcemap: 'external',
-	outfile: './server/server.js',
-	plugins: [resolvePlugin],
-	external: ['pg-native', 'mock-aws-s3', 'aws-sdk', 'nock', 'bcrypt', 'heapdump'],
-}).catch(e => {
-	console.error(e)
-	process.exit(1)
-})
+const buildServer = require('../../scripts/esbuild/esbuild').buildServer
+
+buildServer('./packages/engine-server/src/start.ts')
+	.catch(e => {
+		console.error(e)
+		process.exit(1)
+	})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-server",
-  "version": "1.1.2",
+  "version": "1.2.0-alpha.11",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -8,27 +8,27 @@
     "test-e2e": "vitest --no-threads tests/e2e"
   },
   "dependencies": {
-    "@contember/authorization": "^1.1.2",
-    "@contember/config-loader": "^1.1.2",
-    "@contember/database": "^1.1.2",
-    "@contember/database-migrations": "^1.1.2",
-    "@contember/dic": "^1.1.2",
-    "@contember/typesafe": "^1.1.2",
-    "@contember/engine-content-api": "^1.1.2",
-    "@contember/engine-http": "^1.1.2",
-    "@contember/engine-plugins": "^1.1.2",
-    "@contember/engine-s3-plugin": "^1.1.2",
-    "@contember/engine-system-api": "^1.1.2",
-    "@contember/engine-tenant-api": "^1.1.2",
-    "@contember/engine-vimeo-plugin": "^1.1.2",
-    "@contember/queryable": "^1.1.2",
-    "@contember/schema": "^1.1.2",
-    "@contember/schema-definition": "^1.1.2",
-    "@contember/schema-migrations": "^1.1.2",
-    "@contember/schema-utils": "^1.1.2",
+    "@contember/authorization": "^1.2.0-alpha.11",
+    "@contember/config-loader": "^1.2.0-alpha.11",
+    "@contember/database": "^1.2.0-alpha.11",
+    "@contember/database-migrations": "^1.2.0-alpha.11",
+    "@contember/dic": "^1.2.0-alpha.11",
+    "@contember/typesafe": "^1.2.0-alpha.11",
+    "@contember/engine-content-api": "^1.2.0-alpha.11",
+    "@contember/engine-http": "^1.2.0-alpha.11",
+    "@contember/engine-plugins": "^1.2.0-alpha.11",
+    "@contember/engine-s3-plugin": "^1.2.0-alpha.11",
+    "@contember/engine-system-api": "^1.2.0-alpha.11",
+    "@contember/engine-tenant-api": "^1.2.0-alpha.11",
+    "@contember/engine-vimeo-plugin": "^1.2.0-alpha.11",
+    "@contember/queryable": "^1.2.0-alpha.11",
+    "@contember/schema": "^1.2.0-alpha.11",
+    "@contember/schema-definition": "^1.2.0-alpha.11",
+    "@contember/schema-migrations": "^1.2.0-alpha.11",
+    "@contember/schema-utils": "^1.2.0-alpha.11",
     "@koa/cors": "^3.1.0",
-    "@sentry/node": "^6.8.0",
-    "graphql": "^15.4.0",
+    "@sentry/node": "^7.1.1",
+    "graphql": "^16.5.0",
     "heapdump": "^0.3.15",
     "koa-bodyparser": "^4.3.0",
     "koa-compress": "^5.0.1",
@@ -37,9 +37,9 @@
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^1.1.2",
+    "@contember/engine-api-tester": "^1.2.0-alpha.11",
     "@types/koa-compress": "^4.0.1",
-    "@types/node": "^17.0.5",
+    "@types/node": "^18",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.0.1"
   }

package/src/MasterContainer.ts

@@ -2,47 +2,53 @@ 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 { createDbMetricsRegistrar, logSentryError, ProcessType } from './utils'
+import { logSentryError } from './utils'
 import { ModificationHandlerFactory } from '@contember/schema-migrations'
 import { Initializer } from './bootstrap'
 import { Plugin } from '@contember/engine-plugins'
-import { createColllectHttpMetricsMiddleware, createShowMetricsMiddleware } from './http'
 import {
 	compose,
 	ContentApiMiddlewareFactory,
 	ContentGraphQLContextFactory,
 	ContentQueryHandlerFactory,
+	ContentSchemaTransferMappingFactory,
 	createHomepageMiddleware,
 	createModuleInfoMiddleware,
 	createPlaygroundMiddleware,
 	createPoweredByHeaderMiddleware,
 	createProviders,
 	createTimerMiddleware,
-	CryptoWrapper,
 	ErrorMiddlewareFactory,
+	ExportApiMiddlewareFactory,
+	ExportExecutor,
+	ImportApiMiddlewareFactory,
+	ImportExecutor,
 	Koa,
 	NotModifiedChecker,
-	ProjectGroupResolver,
 	Providers,
-	route, SystemApiMiddlewareFactory, SystemGraphQLContextFactory,
-	SystemGraphQLHandlerFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory,
+	route,
+	SystemApiMiddlewareFactory,
+	SystemGraphQLContextFactory,
+	SystemGraphQLHandlerFactory,
+	SystemSchemaTransferMappingFactory,
+	TenantApiMiddlewareFactory,
+	TenantGraphQLContextFactory,
 	TenantGraphQLHandlerFactory,
 } from '@contember/engine-http'
-import prom from 'prom-client'
 import { ProjectContainerFactoryFactory } from './project'
-import { createSecretKey } from 'crypto'
 import koaCompress from 'koa-compress'
 import bodyParser from 'koa-bodyparser'
 import { ProjectConfigResolver } from './config/projectConfigResolver'
 import { TenantConfigResolver } from './config/tenantConfigResolver'
-import { ProjectGroupContainerResolver } from './projectGroup/ProjectGroupContainerResolver'
 import { ProjectGroupContainerFactory } from './projectGroup/ProjectGroupContainer'
 import corsMiddleware from '@koa/cors'
+import { ProjectGroupResolver } from './projectGroup/ProjectGroupResolver'
+import { ProjectGroupResolver as ProjectGroupResolverInterface } from '@contember/engine-http'
+import { Logger } from '@contember/engine-common'
 
 export interface MasterContainer {
 	initializer: Initializer
 	koa: Koa
-	monitoringKoa: Koa
 	providers: Providers
 }
 
@@ -52,7 +58,6 @@ export interface MasterContainerArgs {
 	projectConfigResolver: ProjectConfigResolver
 	tenantConfigResolver: TenantConfigResolver
 	plugins: Plugin[]
-	processType: ProcessType
 	version?: string
 }
 
@@ -63,7 +68,6 @@ export class MasterContainerFactory {
 		plugins,
 		projectConfigResolver,
 		tenantConfigResolver,
-		processType,
 		version,
 	}: MasterContainerArgs) {
 		return new Builder({})
@@ -71,8 +75,6 @@ export class MasterContainerFactory {
 				serverConfig)
 			.addService('debugMode', () =>
 				debugMode)
-			.addService('processType', () =>
-				processType)
 			.addService('version', () =>
 				version)
 			.addService('projectConfigResolver', () =>
@@ -95,62 +97,22 @@ export class MasterContainerFactory {
 				new TenantGraphQLHandlerFactory(logSentryError))
 			.addService('systemGraphQLHandlerFactory', ({ debugMode }) =>
 				new SystemGraphQLHandlerFactory(logSentryError, debugMode))
-			.addService('projectGroupContainerFactory', ({ providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory }) =>
-				new ProjectGroupContainerFactory(providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory))
-			.addService('projectGroupContainerResolver', ({ tenantConfigResolver, projectGroupContainerFactory }) =>
-				new ProjectGroupContainerResolver(tenantConfigResolver, projectGroupContainerFactory))
-			.addService('promRegistry', ({ processType, projectGroupContainerResolver }) => {
-				if (processType === ProcessType.clusterMaster) {
-					const register = new prom.AggregatorRegistry()
-					prom.collectDefaultMetrics({ register })
-					return register
-				}
-				const register = prom.register
-				prom.collectDefaultMetrics({ register })
-				const registrar = 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 ?? 'unknown',
-							},
-						}),
-					)
-					return registrar({
-						connection: groupContainer.tenantContainer.connection,
-						labels: {
-							contember_module: 'tenant',
-							contember_project_group: slug ?? 'unknown',
-							contember_project: 'unknown',
-						},
-					})
-				})
-				return register
-			})
+			.addService('projectGroupContainerFactory', ({ debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory }) =>
+				new ProjectGroupContainerFactory(debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory))
+			.addService('projectGroupContainer', ({ tenantConfigResolver, projectGroupContainerFactory }) =>
+				projectGroupContainerFactory.create({ slug: undefined, config: tenantConfigResolver(undefined, {}) }))
 			.addService('httpErrorMiddlewareFactory', ({ debugMode }) =>
 				new ErrorMiddlewareFactory(debugMode))
-			.addService('projectGroupResolver', ({ projectGroupContainerResolver, serverConfig }) => {
-				const encryptionKey = serverConfig.projectGroup?.configEncryptionKey
-					? createSecretKey(Buffer.from(serverConfig.projectGroup?.configEncryptionKey, 'hex'))
-					: undefined
-				return new ProjectGroupResolver(
-					serverConfig.projectGroup?.domainMapping,
-					serverConfig.projectGroup?.configHeader,
-					serverConfig.projectGroup?.configEncryptionKey ? new CryptoWrapper(encryptionKey) : undefined,
-					projectGroupContainerResolver,
-				)
-			})
+			.addService('projectGroupResolver', ({ projectGroupContainer }): ProjectGroupResolverInterface =>
+				new ProjectGroupResolver(projectGroupContainer))
 			.addService('notModifiedChecker', () =>
 				new NotModifiedChecker())
 			.addService('contentGraphqlContextFactory', ({ providers }) =>
 				new ContentGraphQLContextFactory(providers))
 			.addService('contentQueryHandlerFactory', ({ debugMode }) =>
 				new ContentQueryHandlerFactory(debugMode, logSentryError))
-			.addService('contentApiMiddlewareFactory', ({ debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) =>
-				new ContentApiMiddlewareFactory(debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
+			.addService('contentApiMiddlewareFactory', ({ projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) =>
+				new ContentApiMiddlewareFactory(projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
 			.addService('tenantGraphQLContextFactory', () =>
 				new TenantGraphQLContextFactory())
 			.addService('tenantApiMiddlewareFactory', ({ debugMode, projectGroupResolver, tenantGraphQLContextFactory }) =>
@@ -159,62 +121,84 @@ export class MasterContainerFactory {
 				new SystemGraphQLContextFactory())
 			.addService('systemApiMiddlewareFactory', ({ debugMode, projectGroupResolver, systemGraphQLContextFactory }) =>
 				new SystemApiMiddlewareFactory(debugMode, projectGroupResolver, systemGraphQLContextFactory))
-			.addService('koa', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, httpErrorMiddlewareFactory, promRegistry, debugMode, version, serverConfig }) => {
-				const app = new Koa()
-				app.use(
-					compose([
-						koaCompress({
-							br: false,
-						}),
-						bodyParser({
-							jsonLimit: serverConfig.http.requestBodySize || '1mb',
-						}),
-						createPoweredByHeaderMiddleware(debugMode, version ?? 'unknown'),
-						httpErrorMiddlewareFactory.create(),
-						createColllectHttpMetricsMiddleware(promRegistry),
-						createTimerMiddleware(),
-						route('/playground$', createPlaygroundMiddleware()),
-						createHomepageMiddleware(),
-						corsMiddleware(),
-						route(
-							'/content/:projectSlug/:stageSlug$',
-							compose([
-								createModuleInfoMiddleware('content'),
-								contentApiMiddlewareFactory.create(),
-							]),
-						),
-						route(
-							'/tenant$',
-							compose([
-								createModuleInfoMiddleware('tenant'),
-								tenantApiMiddlewareFactory.create(),
-							]),
-						),
-						route(
-							'/system/:projectSlug$',
-							compose([
-								createModuleInfoMiddleware('system'),
-								systemApiMiddlewareFactory.create(),
-							]),
-						),
-					]),
-				)
-
-				return app
-			})
-			.addService('monitoringKoa', ({ promRegistry }) => {
+			.addService('logger', () =>
+				// eslint-disable-next-line no-console
+				new Logger(console.log))
+			.addService('contentSchemaTransferMappingFactory', () =>
+				new ContentSchemaTransferMappingFactory())
+			.addService('systemSchemaTransferMappingFactory', () =>
+				new SystemSchemaTransferMappingFactory())
+			.addService('importExecutor', ({ contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory, logger }) =>
+				new ImportExecutor(contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory, logger))
+			.addService('exportExecutor', ({ contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory }) =>
+				new ExportExecutor(contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory))
+			.addService('importApiMiddlewareFactory', ({ projectGroupResolver, importExecutor }) =>
+				new ImportApiMiddlewareFactory(projectGroupResolver, importExecutor))
+			.addService('exportApiMiddlewareFactory', ({ projectGroupResolver, exportExecutor }) =>
+				new ExportApiMiddlewareFactory(projectGroupResolver, exportExecutor))
+			.addService('koaMiddlewares', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, importApiMiddlewareFactory, exportApiMiddlewareFactory, httpErrorMiddlewareFactory, debugMode, version, serverConfig }) =>
+				compose([
+					koaCompress({
+						br: false,
+					}),
+					bodyParser({
+						jsonLimit: serverConfig.http.requestBodySize || '1mb',
+					}),
+					createPoweredByHeaderMiddleware(debugMode, version ?? 'unknown'),
+					createTimerMiddleware(),
+					httpErrorMiddlewareFactory.create(),
+					route('/playground$', createPlaygroundMiddleware()),
+					createHomepageMiddleware(),
+					corsMiddleware(),
+					route(
+						'/content/:projectSlug/:stageSlug$',
+						compose([
+							createModuleInfoMiddleware('content'),
+							contentApiMiddlewareFactory.create(),
+						]),
+					),
+					route(
+						'/tenant$',
+						compose([
+							createModuleInfoMiddleware('tenant'),
+							tenantApiMiddlewareFactory.create(),
+						]),
+					),
+					route(
+						'/system/:projectSlug$',
+						compose([
+							createModuleInfoMiddleware('system'),
+							systemApiMiddlewareFactory.create(),
+						]),
+					),
+					route(
+						'/import$',
+						compose([
+							createModuleInfoMiddleware('transfer'),
+							importApiMiddlewareFactory.create(),
+						]),
+					),
+					route(
+						'/export$',
+						compose([
+							createModuleInfoMiddleware('transfer'),
+							exportApiMiddlewareFactory.create(),
+						]),
+					),
+				]))
+			.addService('koa', ({ koaMiddlewares }) => {
 				const app = new Koa()
-				app.use(createShowMetricsMiddleware(promRegistry))
+				app.use(koaMiddlewares)
 
 				return app
 			})
-			.addService('initializer', ({ projectGroupContainerResolver }) =>
-				new Initializer(projectGroupContainerResolver))
+			.addService('initializer', ({ projectGroupContainer }) =>
+				new Initializer(projectGroupContainer))
 
 	}
 
 	create(args: MasterContainerArgs): MasterContainer {
 		const container = this.createBuilder(args).build()
-		return container.pick('initializer', 'koa', 'monitoringKoa', 'providers')
+		return container.pick('initializer', 'koa', 'providers')
 	}
 }

package/src/bootstrap/Initializer.ts

@@ -1,9 +1,9 @@
 import { Logger } from '@contember/engine-common'
-import { ProjectGroupContainerResolver } from '../projectGroup/ProjectGroupContainerResolver'
+import { ProjectGroupContainer } from '@contember/engine-http'
 
 export class Initializer {
 	constructor(
-		private readonly projectGroupContainerResolver: ProjectGroupContainerResolver,
+		private readonly projectGroupContainer: ProjectGroupContainer,
 	) {}
 
 	public async initialize(): Promise<string[]> {
@@ -11,18 +11,26 @@ export class Initializer {
 		const logger = new Logger(console.log)
 		logger.group('\nInitializing tenant database')
 		// todo
-		const groupContainer = await this.projectGroupContainerResolver.getProjectGroupContainer(undefined)
+		const groupContainer = await this.projectGroupContainer
 
-		await groupContainer.tenantContainer.migrationsRunner.run(logger.write.bind(logger))
+		const tenantContainer = groupContainer.tenantContainer
+		await tenantContainer.migrationsRunner.run(logger.write.bind(logger))
 		logger.groupEnd()
 
-		const systemContainer = groupContainer.systemContainer
 		const projects: string[] = []
-		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()
 		}
 		// eslint-disable-next-line no-console

package/src/config/config.ts

@@ -1,22 +1,24 @@
 import { ConfigLoader, createObjectParametersResolver, Merger, resolveParameters } from '@contember/config-loader'
 import { ConfigProcessor } from '@contember/engine-plugins'
-import { serverConfigSchema, tenantConfigSchema } from './configSchema'
+import { serverConfigSchema as defaultServerConfigSchema, tenantConfigSchema } from './configSchema'
 import { configTemplate } from './configTemplate'
 import { createProjectConfigResolver, ProjectConfigResolver } from './projectConfigResolver'
 import { createTenantConfigResolver, TenantConfigResolver } from './tenantConfigResolver'
+import { Type } from '@contember/typesafe'
 
-export type ServerConfig = ReturnType<typeof serverConfigSchema>
+export type ServerConfig = ReturnType<typeof defaultServerConfigSchema>
 export type TenantConfig = ReturnType<typeof tenantConfigSchema>
 
 export type ConfigSource = { data: string; type: 'file' | 'json' | 'yaml' }
 
 type Env = Record<string, string>
 
-export async function readConfig(
-	configSources: ConfigSource[],
+export async function readConfig<T extends ServerConfig>(
+	configSources: ConfigSource[] = [],
 	configProcessors: ConfigProcessor[] = [],
+	serverConfigSchema: Type<T> = defaultServerConfigSchema as Type<T>,
 ): Promise<{
-	serverConfig: ServerConfig
+	serverConfig: T
 	projectConfigResolver: ProjectConfigResolver
 	tenantConfigResolver: TenantConfigResolver
 }> {

package/src/config/configSchema.ts

@@ -3,7 +3,7 @@ import { MailerOptions } from '@contember/engine-tenant-api'
 import { upperCaseFirst } from '../utils'
 
 
-export const dbCredentialsSchema = Typesafe.intersection(
+export const dbConfigSchema = Typesafe.intersection(
 	Typesafe.object({
 		host: Typesafe.string,
 		port: Typesafe.number,
@@ -13,12 +13,25 @@ export const dbCredentialsSchema = Typesafe.intersection(
 	}),
 	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,
+		}),
 	}),
 )
 
 export const tenantConfigSchema = Typesafe.intersection(
 	Typesafe.object({
-		db: dbCredentialsSchema,
+		db: dbConfigSchema,
 		mailer: Typesafe.transform(Typesafe.partial({
 			from: Typesafe.string,
 			host: Typesafe.string,
@@ -46,37 +59,21 @@ export const tenantConfigSchema = Typesafe.intersection(
 		}),
 	}),
 )
-export const serverConfigSchema = Typesafe.intersection(
-	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({
-				sentry: Typesafe.object({
-					dsn: Typesafe.string,
-				}),
-			}),
-		),
-	}),
-	Typesafe.partial({
-		workerCount: Typesafe.union(Typesafe.number, Typesafe.string),
-		projectGroup: (val: unknown, path: PropertyKey[] = []) => Typesafe.valueAt(val, ['domainMapping']) === undefined
-			? undefined
-			: Typesafe.intersection(
-				Typesafe.object({
-					domainMapping: Typesafe.string,
-				}),
-				Typesafe.partial({
-					configHeader: Typesafe.string,
-					configEncryptionKey: Typesafe.string,
-				}),
-			)(val, path),
+
+export const serverConfigSchema = Typesafe.object({
+	port: Typesafe.number,
+	http: Typesafe.partial({
+		requestBodySize: Typesafe.string,
 	}),
-)
+	logging: Typesafe.union(
+		(val): { sentry?: { dsn: string } } => Typesafe.valueAt(val, ['sentry', 'dsn']) === undefined ? {} : Typesafe.fail([]),
+		Typesafe.partial({
+			sentry: Typesafe.object({
+				dsn: Typesafe.string,
+			}),
+		}),
+	),
+})
 
 export const stageConfig = Typesafe.record(
 	Typesafe.string,
@@ -106,7 +103,7 @@ export const projectConfigSchema = Typesafe.object({
 			Typesafe.object({
 				useTenantDb: Typesafe.literal(true),
 			}),
-			dbCredentialsSchema,
+			dbConfigSchema,
 		),
 		Typesafe.partial({
 			systemSchema: Typesafe.string,

package/src/config/configTemplate.ts

@@ -7,6 +7,19 @@ export const configTemplate: any = {
 			password: `%tenant.env.DB_PASSWORD%`,
 			database: `%tenant.env.DB_NAME%`,
 			ssl: `%?tenant.env.DB_SSL::bool%`,
+			queryTimeoutMs: '%?tenant.env.DB_QUERY_TIMEOUT_MS::number%',
+			statementTimeoutMs: '%?tenant.env.DB_STATEMENT_TIMEOUT_MS::number%',
+			connectionTimeoutMs: '%?tenant.env.DB_CONNECTION_TIMEOUT_MS::number%',
+			pool: {
+				maxConnections: '%?tenant.env.DB_POOL_MAX_CONNECTIONS::number%',
+				maxConnecting: '%?tenant.env.DB_POOL_MAX_CONNECTING::number%',
+				maxIdle: '%?tenant.env.DB_POOL_MAX_IDLE::number%',
+				reconnectIntervalMs: '%?tenant.env.DB_POOL_RECONNECT_INTERVAL_MS::number%',
+				idleTimeoutMs: '%?tenant.env.DB_POOL_IDLE_TIMEOUT_MS::number%',
+				acquireTimeoutMs: '%?tenant.env.DB_POOL_ACQUIRE_TIMEOUT_MS::number%',
+				maxUses: '%?tenant.env.DB_POOL_MAX_USES::number%',
+				maxAgeMs: '%?tenant.env.DB_POOL_MAX_AGE_MS::number%',
+			},
 		},
 		mailer: {
 			from: '%?tenant.env.MAILER_FROM%',
@@ -35,6 +48,16 @@ export const configTemplate: any = {
 			password: `%?project.secret.db.password||project.env.DB_PASSWORD%`,
 			database: `%?project.env.DB_NAME||project.slug%`,
 			ssl: `%?project.env.DB_SSL::bool%`,
+			pool: {
+				maxConnections: '%?project.env.DB_POOL_MAX_CONNECTIONS%',
+				maxConnecting: '%?project.env.DB_POOL_MAX_CONNECTING%',
+				maxIdle: '%?project.env.DB_POOL_MAX_IDLE%',
+				reconnectIntervalMs: '%?project.env.DB_POOL_RECONNECT_INTERVAL_MS%',
+				idleTimeoutMs: '%?project.env.DB_POOL_IDLE_TIMEOUT_MS%',
+				acquireTimeoutMs: '%?project.env.DB_POOL_ACQUIRE_TIMEOUT_MS%',
+				maxUses: '%?project.env.DB_POOL_MAX_USES%',
+				maxAgeMs: '%?project.env.DB_POOL_MAX_AGE_MS%',
+			},
 		},
 	},
 	server: {

package/src/index.ts

@@ -1,9 +1,22 @@
 import { MasterContainerFactory, MasterContainerArgs } from './MasterContainer'
 import { ProjectConfig } from '@contember/engine-http'
 import { readConfig } from './config/config'
-import { ProcessType } from './utils'
+import { serverConfigSchema } from './config/configSchema'
+import { TenantConfigResolver } from './config/tenantConfigResolver'
+import { ProjectGroupContainerFactory } from './projectGroup/ProjectGroupContainer'
 
-export { MasterContainerFactory, ProjectConfig, readConfig, ProcessType }
+export * from './utils/serverStartup'
+export * from './utils/serverTermination'
+export * from './utils/sentry'
+export * from './MasterContainer'
+
+export {
+	ProjectConfig,
+	readConfig,
+	serverConfigSchema,
+	TenantConfigResolver,
+	ProjectGroupContainerFactory,
+}
 
 export const createContainer = (args: MasterContainerArgs) => {
 	return new MasterContainerFactory().create(args)

package/src/project/ProjectContainer.ts

@@ -57,7 +57,7 @@ export class ProjectContainerFactory {
 			.addService('project', () =>
 				project)
 			.addService('connection', ({ project }) =>
-				new Connection(project.db, { timing: true }))
+				Connection.create(project.db))
 			.addService('graphQlSchemaBuilderFactory', () =>
 				new GraphQlSchemaBuilderFactory())
 			.addService('permissionsByIdentityFactory', ({}) =>