@contember/engine-server 0.12.0-beta.0 → 1.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-server",
-  "version": "0.12.0-beta.0",
+  "version": "1.0.0-alpha.1",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -8,24 +8,24 @@
     "test": "uvu dist/tests/cases/ \\.js$"
   },
   "dependencies": {
-    "@contember/authorization": "^0.12.0-beta.0",
-    "@contember/config-loader": "^0.12.0-beta.0",
-    "@contember/database": "^0.12.0-beta.0",
-    "@contember/database-migrations": "^0.12.0-beta.0",
-    "@contember/dic": "^0.12.0-beta.0",
-    "@contember/engine-common": "^0.12.0-beta.0",
-    "@contember/engine-content-api": "^0.12.0-beta.0",
-    "@contember/engine-http": "^0.12.0-beta.0",
-    "@contember/engine-plugins": "^0.12.0-beta.0",
-    "@contember/engine-s3-plugin": "^0.12.0-beta.0",
-    "@contember/engine-system-api": "^0.12.0-beta.0",
-    "@contember/engine-tenant-api": "^0.12.0-beta.0",
-    "@contember/engine-vimeo-plugin": "^0.12.0-beta.0",
-    "@contember/queryable": "^0.12.0-beta.0",
-    "@contember/schema": "^0.12.0-beta.0",
-    "@contember/schema-definition": "^0.12.0-beta.0",
-    "@contember/schema-migrations": "^0.12.0-beta.0",
-    "@contember/schema-utils": "^0.12.0-beta.0",
+    "@contember/authorization": "^1.0.0-alpha.1",
+    "@contember/config-loader": "^1.0.0-alpha.1",
+    "@contember/database": "^1.0.0-alpha.1",
+    "@contember/database-migrations": "^1.0.0-alpha.1",
+    "@contember/dic": "^1.0.0-alpha.1",
+    "@contember/engine-common": "^1.0.0-alpha.1",
+    "@contember/engine-content-api": "^1.0.0-alpha.1",
+    "@contember/engine-http": "^1.0.0-alpha.1",
+    "@contember/engine-plugins": "^1.0.0-alpha.1",
+    "@contember/engine-s3-plugin": "^1.0.0-alpha.1",
+    "@contember/engine-system-api": "^1.0.0-alpha.1",
+    "@contember/engine-tenant-api": "^1.0.0-alpha.1",
+    "@contember/engine-vimeo-plugin": "^1.0.0-alpha.1",
+    "@contember/queryable": "^1.0.0-alpha.1",
+    "@contember/schema": "^1.0.0-alpha.1",
+    "@contember/schema-definition": "^1.0.0-alpha.1",
+    "@contember/schema-migrations": "^1.0.0-alpha.1",
+    "@contember/schema-utils": "^1.0.0-alpha.1",
     "@sentry/node": "^6.8.0",
     "graphql": "^15.4.0",
     "koa-bodyparser": "^4.3.0",
@@ -35,9 +35,9 @@
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^0.12.0-beta.0",
+    "@contember/engine-api-tester": "^1.0.0-alpha.1",
     "@types/koa-compress": "^4.0.1",
-    "@types/node": "^15.12.5",
+    "@types/node": "^17.0.5",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.0.1",
     "uvu": "^0.5.1"

package/src/MasterContainer.ts

@@ -1,14 +1,11 @@
 import {
-	ContentApplyDependenciesFactoryImpl,
-	ContentEventApplier,
 	createMapperContainer,
 	EntitiesSelector,
 	EntitiesSelectorMapperFactory,
 	PermissionsByIdentityFactory,
 } from '@contember/engine-content-api'
 import { SystemContainerFactory } from '@contember/engine-system-api'
-import { TenantContainerFactory } from '@contember/engine-tenant-api'
-import getTenantMigrations from '@contember/engine-tenant-api/migrations'
+import { ProjectInitializer as ProjectInitializerInterface, TenantContainerFactory } from '@contember/engine-tenant-api'
 import getSystemMigrations from '@contember/engine-system-api/migrations'
 import { Builder } from '@contember/dic'
 import { Config } from './config/config'
@@ -17,11 +14,27 @@ import { ModificationHandlerFactory } from '@contember/schema-migrations'
 import { Initializer } from './bootstrap'
 import { Plugin } from '@contember/engine-plugins'
 import { DatabaseCredentials, MigrationsRunner } from '@contember/database-migrations'
-import { createRootMiddleware, createShowMetricsMiddleware } from './http'
+import { createColllectHttpMetricsMiddleware, createShowMetricsMiddleware } from './http'
 import {
+	ApiMiddlewareFactory,
+	AuthMiddlewareFactory,
+	compose,
+	ContentServerMiddlewareFactory,
+	createHomepageMiddleware,
+	createPlaygroundMiddleware,
+	createPoweredByHeaderMiddleware,
 	createProviders,
+	createTimerMiddleware,
+	ErrorFactory,
 	Koa,
+	NotModifiedMiddlewareFactory,
 	ProjectConfigResolver,
+	ProjectGroupMiddlewareFactory,
+	ProjectMemberMiddlewareFactory,
+	ProjectResolveMiddlewareFactory,
+	Providers,
+	route,
+	StageResolveMiddlewareFactory,
 	SystemGraphQLMiddlewareFactory,
 	TenantGraphQLMiddlewareFactory,
 } from '@contember/engine-http'
@@ -36,12 +49,16 @@ import {
 } from './project'
 import { ClientBase } from 'pg'
 import { createSecretKey } from 'crypto'
+import koaCompress from 'koa-compress'
+import bodyParser from 'koa-bodyparser'
 
 export interface MasterContainer {
 	initializer: Initializer
 	koa: Koa
 	monitoringKoa: Koa
 	projectContainerResolver: ProjectContainerResolver
+	projectInitializer: ProjectInitializerInterface
+	providers: Providers
 }
 
 export interface MasterContainerArgs {
@@ -76,11 +93,11 @@ export class MasterContainerFactory {
 			.addService('plugins', () =>
 				plugins)
 			.addService('tenantContainerFactory', ({ config }) =>
-				new TenantContainerFactory(config.tenant.db, config.tenant.mailer))
+				new TenantContainerFactory(config.tenant.db, config.tenant.mailer, config.tenant.credentials))
 			.addService('systemContainerFactory', () =>
 				new SystemContainerFactory())
 			.addService('providers', ({ config }) => {
-				const encryptionKey = config.tenant.secrets
+				const encryptionKey = config.tenant.secrets.encryptionKey
 					? createSecretKey(Buffer.from(config.tenant.secrets.encryptionKey, 'hex'))
 					: undefined
 				return createProviders({ encryptionKey })
@@ -109,21 +126,16 @@ export class MasterContainerFactory {
 					}).mapperFactory(db)
 				return new EntitiesSelector(mapperFactory, permissionsByIdentityFactory)
 			})
-			.addService('identityFetcher', ({ tenantContainer }) =>
-				tenantContainer.identityFetcher)
-			.addService('eventApplier', () =>
-				new ContentEventApplier(new ContentApplyDependenciesFactoryImpl()))
 			.addService('systemDbMigrationsRunnerFactory', () =>
 				(db: DatabaseCredentials, dbClient: ClientBase) =>
 					new MigrationsRunner(db, 'system', getSystemMigrations, dbClient))
-			.addService('systemContainer', ({ systemContainerFactory, entitiesSelector, eventApplier, identityFetcher, modificationHandlerFactory, providers, systemDbMigrationsRunnerFactory }) =>
+			.addService('systemContainer', ({ systemContainerFactory, entitiesSelector, modificationHandlerFactory, providers, systemDbMigrationsRunnerFactory, tenantContainer }) =>
 				systemContainerFactory.create({
 					entitiesSelector,
-					eventApplier,
-					identityFetcher,
 					modificationHandlerFactory,
 					providers,
 					systemDbMigrationsRunnerFactory,
+					identityFetcher: tenantContainer.identityFetcher,
 				}))
 			.addService('schemaVersionBuilder', ({ systemContainer }) =>
 				systemContainer.schemaVersionBuilder)
@@ -131,8 +143,8 @@ export class MasterContainerFactory {
 				new ProjectContainerFactory(debugMode, plugins, schemaVersionBuilder, providers))
 			.addService('tenantProjectManager', ({ tenantContainer }) =>
 				tenantContainer.projectManager)
-			.addService('projectContainerResolver', ({ tenantProjectManager, projectContainerFactory, projectConfigResolver }) =>
-				new ProjectContainerResolver(projectContainerFactory, projectConfigResolver, tenantProjectManager))
+			.addService('projectContainerResolver', ({ tenantProjectManager, projectContainerFactory, projectConfigResolver, systemContainer }) =>
+				new ProjectContainerResolver(projectContainerFactory, projectConfigResolver, tenantProjectManager, systemContainer.projectInitializer))
 			.addService('tenantGraphQlMiddlewareFactory', ({ tenantContainer }) =>
 				new TenantGraphQLMiddlewareFactory(tenantContainer.resolvers, tenantContainer.resolverContextFactory, logSentryError))
 			.addService('systemGraphQLMiddlewareFactory', ({ systemContainer, debugMode }) =>
@@ -156,35 +168,82 @@ export class MasterContainerFactory {
 				)
 				return register
 			})
+			.addService('httpErrorFactory', ({ debugMode }) =>
+				new ErrorFactory(debugMode))
+			.addService('authMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) =>
+				new AuthMiddlewareFactory(tenantContainer.apiKeyManager, httpErrorFactory))
+			.addService('projectGroupMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) =>
+				new ProjectGroupMiddlewareFactory(config.server.projectGroup?.domainMapping, tenantContainer.projectGroupProvider, httpErrorFactory))
+			.addService('projectResolverMiddlewareFactory', ({ projectContainerResolver, httpErrorFactory }) =>
+				new ProjectResolveMiddlewareFactory(projectContainerResolver, httpErrorFactory))
+			.addService('apiMiddlewareFactory', ({ projectGroupMiddlewareFactory, authMiddlewareFactory }) =>
+				new ApiMiddlewareFactory(projectGroupMiddlewareFactory, authMiddlewareFactory))
+			.addService('stageResolveMiddlewareFactory', ({ httpErrorFactory }) =>
+				new StageResolveMiddlewareFactory(httpErrorFactory))
+			.addService('notModifiedMiddlewareFactory', () =>
+				new NotModifiedMiddlewareFactory())
+			.addService('projectMemberMiddlewareFactory', ({ debugMode, tenantContainer, httpErrorFactory }) =>
+				new ProjectMemberMiddlewareFactory(debugMode, tenantContainer.projectMemberManager, httpErrorFactory))
+			.addService('contentServerMiddlewareFactory', () =>
+				new ContentServerMiddlewareFactory())
 			.addService(
 				'koa',
 				({
-					tenantGraphQlMiddlewareFactory,
-					projectContainerResolver,
-					tenantContainer,
-					providers,
-					systemGraphQLMiddlewareFactory,
-					promRegistry,
-					debugMode,
-					version,
-					config,
-				}) => {
+					 tenantGraphQlMiddlewareFactory,
+					 systemGraphQLMiddlewareFactory,
+					 apiMiddlewareFactory,
+					 projectResolverMiddlewareFactory,
+					 stageResolveMiddlewareFactory,
+					 notModifiedMiddlewareFactory,
+					 projectMemberMiddlewareFactory,
+					 contentServerMiddlewareFactory,
+					 promRegistry,
+					 debugMode,
+					 version,
+					 config,
+				 }) => {
 					const app = new Koa()
 					app.use(
-						createRootMiddleware(
-							debugMode,
-							version ?? 'unknown',
-							{
-								tenantGraphQlMiddlewareFactory,
-								projectContainerResolver: projectContainerResolver.getProjectContainer.bind(projectContainerResolver),
-								apiKeyManager: tenantContainer.apiKeyManager,
-								projectMemberManager: tenantContainer.projectMemberManager,
-								providers,
-								systemGraphQLMiddlewareFactory,
-							},
-							promRegistry,
-							config.server.http,
-						),
+						compose([
+							koaCompress({
+								br: false,
+							}),
+							bodyParser({
+								jsonLimit: config.server.http.requestBodySize || '1mb',
+							}),
+							createPoweredByHeaderMiddleware(debugMode, version ?? 'unknown'),
+							createColllectHttpMetricsMiddleware(promRegistry),
+							createTimerMiddleware(),
+							route('/playground$', createPlaygroundMiddleware()),
+							createHomepageMiddleware(),
+							route(
+								'/content/:projectSlug/:stageSlug$',
+								compose([
+									apiMiddlewareFactory.create('content'),
+									projectResolverMiddlewareFactory.create(),
+									stageResolveMiddlewareFactory.create(),
+									notModifiedMiddlewareFactory.create(),
+									projectMemberMiddlewareFactory.create(),
+									contentServerMiddlewareFactory.create(),
+								]),
+							),
+							route(
+								'/tenant$',
+								compose([
+									apiMiddlewareFactory.create('tenant'),
+									tenantGraphQlMiddlewareFactory.create(),
+								]),
+							),
+							route(
+								'/system/:projectSlug$',
+								compose([
+									apiMiddlewareFactory.create('system'),
+									projectResolverMiddlewareFactory.create(),
+									projectMemberMiddlewareFactory.create(),
+									systemGraphQLMiddlewareFactory.create(),
+								]),
+							),
+						]),
 					)
 
 					return app
@@ -196,33 +255,25 @@ export class MasterContainerFactory {
 
 				return app
 			})
-			.addService('tenantMigrationsRunner', ({ config }) =>
-				new MigrationsRunner(config.tenant.db, 'tenant', getTenantMigrations))
 			.addService(
 				'initializer',
-				({ tenantMigrationsRunner, tenantContainer, systemContainer, projectContainerResolver, config, providers }) =>
+				({ tenantContainer, systemContainer, projectContainerResolver }) =>
 					new Initializer(
-						tenantMigrationsRunner,
+						tenantContainer.migrationsRunnerFactory,
 						tenantContainer.projectManager,
 						systemContainer.projectInitializer,
 						projectContainerResolver,
-						config.tenant.credentials,
-						providers,
+						tenantContainer.projectGroupProvider,
 					),
 			)
 			.setupService('projectSchemaResolver', (it, { projectContainerResolver, schemaVersionBuilder }) => {
-				it.setResolver(
-					new ProjectSchemaResolver(
-						projectContainerResolver.getProjectContainer.bind(projectContainerResolver),
-						schemaVersionBuilder,
-					),
-				)
+				it.setResolver(new ProjectSchemaResolver(projectContainerResolver, schemaVersionBuilder))
 			})
-			.setupService('projectInitializer', (it, { projectContainerResolver, systemContainer }) => {
-				it.setInitializer(new ProjectInitializer(projectContainerResolver, systemContainer.projectInitializer))
+			.setupService('projectInitializer', (it, { projectContainerResolver }) => {
+				it.setInitializer(new ProjectInitializer(projectContainerResolver))
 			})
 			.build()
 
-		return masterContainer.pick('initializer', 'koa', 'monitoringKoa', 'projectContainerResolver')
+		return masterContainer.pick('initializer', 'koa', 'monitoringKoa', 'projectContainerResolver', 'projectInitializer', 'providers')
 	}
 }

package/src/bootstrap/Initializer.ts

@@ -1,10 +1,4 @@
-import {
-	ProjectManager,
-	Providers as TenantProviders,
-	TenantCredentials,
-	TenantMigrationArgs,
-} from '@contember/engine-tenant-api'
-import { MigrationsRunner } from '@contember/database-migrations'
+import { MigrationsRunnerFactory, ProjectGroupProvider, ProjectManager } from '@contember/engine-tenant-api'
 import { ProjectInitializer } from '@contember/engine-system-api'
 import { Logger } from '@contember/engine-common'
 import { ProjectContainerResolver } from '../project'
@@ -13,26 +7,24 @@ import { Migration } from '@contember/schema-migrations'
 
 export class Initializer {
 	constructor(
-		private readonly tenantDbMigrationsRunner: MigrationsRunner,
+		private readonly tenantDbMigrationsRunnerFactory: MigrationsRunnerFactory,
 		private readonly projectManager: ProjectManager,
 		private readonly projectInitializer: ProjectInitializer,
 		private readonly projectContainerResolver: ProjectContainerResolver,
-		private readonly tenantCredentials: TenantCredentials,
-		private readonly providers: TenantProviders,
+		private readonly projectGroupProvider: ProjectGroupProvider,
 	) {}
 
 	public async initialize(): Promise<string[]> {
 		// eslint-disable-next-line no-console
 		const logger = new Logger(console.log)
 		logger.group('\nInitializing tenant database')
-		await this.tenantDbMigrationsRunner.migrate<TenantMigrationArgs>(logger.write.bind(logger), {
-			credentials: this.tenantCredentials,
-			providers: this.providers,
-		})
+		// todo
+		await this.tenantDbMigrationsRunnerFactory.create('tenant').run(logger.write.bind(logger))
 		logger.groupEnd()
 
 		const projects: string[] = []
-		for (const container of await this.projectContainerResolver.getAllProjectContainers()) {
+		const group = await this.projectGroupProvider.getGroup(undefined)
+		for (const container of await this.projectContainerResolver.getAllProjectContainers(group)) {
 			const project = container.project
 			projects.push(project.slug)
 			logger.group(`\nUpdating project ${project.slug}`)
@@ -46,11 +38,12 @@ export class Initializer {
 
 	public async createProject(project: ProjectConfig, migrations: Migration[]): Promise<void> {
 		const { slug, name, ...config } = project
-		const result = await this.projectManager.createProject({ slug, name, config, secrets: {} }, undefined)
+		const group = await this.projectGroupProvider.getGroup(undefined)
+		const result = await this.projectManager.createProject(group, { slug, name, config, secrets: {} }, undefined)
 		if (!result) {
 			throw new Error('Project already exists')
 		}
-		const container = await this.projectContainerResolver.getProjectContainer(project.slug)
+		const container = await this.projectContainerResolver.getProjectContainer(group, project.slug)
 		if (!container) {
 			throw new Error('Should not happen')
 		}