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

package/src/project/ProjectInitializer.ts

@@ -1,31 +1,17 @@
-import { Logger } from '@contember/engine-common'
-import { ProjectInitializer as ProjectInitializerInterface, ProjectWithSecrets } from '@contember/engine-tenant-api'
+import {
+	ProjectGroup,
+	ProjectInitializer as ProjectInitializerInterface,
+	ProjectWithSecrets,
+} from '@contember/engine-tenant-api'
 import { ProjectContainerResolver } from './ProjectContainerResolver'
-import { ProjectInitializer as SystemProjectInitializer } from '@contember/engine-system-api'
 
 export class ProjectInitializer implements ProjectInitializerInterface {
 	constructor(
 		private readonly projectContainerResolver: ProjectContainerResolver,
-		private readonly systemProjectInitializer: SystemProjectInitializer,
 	) {}
 
-	async initializeProject(project: ProjectWithSecrets) {
-		const container = await this.projectContainerResolver.createProjectContainer(project)
-		if (!container) {
-			throw new Error('Should not happen')
-		}
-		const log: string[] = []
-		try {
-			await this.systemProjectInitializer.initialize(
-				container.systemDatabaseContextFactory,
-				container.project,
-				new Logger(log.push),
-			)
-		} catch (e) {
-			await this.projectContainerResolver.destroyContainer(project.slug)
-			throw e
-		}
-		return { log }
+	async initializeProject(projectGroup: ProjectGroup, project: ProjectWithSecrets) {
+		await this.projectContainerResolver.createProjectContainer(projectGroup, project)
 	}
 }
 
@@ -36,10 +22,10 @@ export class ProjectInitializerProxy implements ProjectInitializerInterface {
 		this.initializer = initializer
 	}
 
-	initializeProject(project: ProjectWithSecrets) {
+	initializeProject(projectGroup: ProjectGroup, project: ProjectWithSecrets) {
 		if (!this.initializer) {
 			throw new Error('Initializer is not set')
 		}
-		return this.initializer.initializeProject(project)
+		return this.initializer.initializeProject(projectGroup, project)
 	}
 }

package/src/project/ProjectSchemaResolver.ts

@@ -1,15 +1,20 @@
-import { ProjectSchemaResolver as ProjectSchemaResolverInterface } from '@contember/engine-tenant-api'
+import {
+	DatabaseContext,
+	ProjectGroup,
+	ProjectSchemaResolver as ProjectSchemaResolverInterface,
+} from '@contember/engine-tenant-api'
 import { SchemaVersionBuilder } from '@contember/engine-system-api'
-import { ProjectContainerResolverCallback } from '@contember/engine-http'
+import { ProjectContainerResolver } from '@contember/engine-http'
 import { Schema } from '@contember/schema'
 
 export class ProjectSchemaResolver implements ProjectSchemaResolverInterface {
 	constructor(
-		private readonly projectContainerResolver: ProjectContainerResolverCallback,
+		private readonly projectContainerResolver: ProjectContainerResolver,
 		private readonly schemaVersionBuilder: SchemaVersionBuilder,
 	) {}
-	async getSchema(slug: string) {
-		const container = await this.projectContainerResolver(slug)
+
+	async getSchema(projectGroup: ProjectGroup, slug: string) {
+		const container = await this.projectContainerResolver.getProjectContainer(projectGroup, slug)
 		if (!container) {
 			return undefined
 		}
@@ -25,10 +30,10 @@ export class ProjectSchemaResolverProxy implements ProjectSchemaResolverInterfac
 		this.resolver = resolver
 	}
 
-	getSchema(projectSlug: string): Promise<Schema | undefined> {
+	getSchema(projectGroup: ProjectGroup, projectSlug: string): Promise<Schema | undefined> {
 		if (!this.resolver) {
 			throw new Error('Resolved is not set')
 		}
-		return this.resolver.getSchema(projectSlug)
+		return this.resolver.getSchema(projectGroup, projectSlug)
 	}
 }

package/src/start.ts

@@ -68,7 +68,7 @@ const createServerTerminator = (): Server[] => {
 	if (process.argv[2] === 'validate') {
 		process.exit(0)
 	}
-	initSentry(config.server.logging.sentry?.dsn)
+	'sentry' in config.server.logging && initSentry(config.server.logging.sentry?.dsn)
 	const workerConfig = config.server.workerCount || 1
 
 	const workerCount = workerConfig === 'auto' ? os.cpus().length : Number(workerConfig)
@@ -95,15 +95,22 @@ const createServerTerminator = (): Server[] => {
 				console.log(`Monitoring running on http://localhost:${monitoringPort}`)
 			}),
 		)
-		initializedProjects = await container.initializer.initialize()
+		if (!config.server.projectGroup) {
+			initializedProjects = await container.initializer.initialize()
+		}
 	}
 
 	const port = config.server.port
 	const printStarted = () => {
-		// eslint-disable-next-line no-console
-		console.log(`Contember API running on http://localhost:${port}`)
-		// eslint-disable-next-line no-console
-		console.log(`Initialized projects: ${initializedProjects.join(', ')}`)
+		if (config.server.projectGroup) {
+			// eslint-disable-next-line no-console
+			console.log('Contember Cloud running')
+		} else {
+			// eslint-disable-next-line no-console
+			console.log(`Contember API running on http://localhost:${port}`)
+			// eslint-disable-next-line no-console
+			console.log(initializedProjects.length ? `Initialized projects: ${initializedProjects.join(', ')}` : 'No project initialized')
+		}
 	}
 
 	if (isClusterMode && cluster.isMaster) {

package/tests/cases/http.ts

@@ -6,6 +6,10 @@ import * as assert from 'uvu/assert'
 import { test } from 'uvu'
 import prom from 'prom-client'
 import { MigrationFilesManager, MigrationsResolver } from '@contember/schema-migrations'
+import { Logger } from '@contember/engine-common'
+import { CreateProjectCommand, DatabaseContext } from '@contember/engine-tenant-api'
+import { ConflictActionType, InsertBuilder } from '@contember/database'
+import uuid from 'uuid'
 
 const dbCredentials = (dbName: string) => {
 	return {
@@ -44,6 +48,7 @@ const createContainer = (debug: boolean) => {
 					rootToken,
 					loginToken,
 				},
+				secrets: {},
 			},
 			server: {
 				logging: {},
@@ -98,14 +103,14 @@ test.before(async () => {
 	try {
 		const connection = await recreateDatabase(String(process.env.TEST_DB_NAME))
 		await connection.end()
-		const connection2 = await recreateDatabase(String(process.env.TEST_DB_NAME_TENANT))
-		await connection2.end()
+		const tenantConnection = await recreateDatabase(String(process.env.TEST_DB_NAME_TENANT))
 		const migrationsResolver = new MigrationsResolver(
 			MigrationFilesManager.createForProject(getExampleProjectDirectory(), 'sample'),
 		)
 		const container = createContainer(false)
 		await container.initializer.initialize()
 		await container.initializer.createProject(projectConfig, await migrationsResolver.getMigrations())
+		await tenantConnection.end()
 	} catch (e) {
 		// eslint-disable-next-line no-console
 		console.error(e)

package/dist/src/http/RootMiddleware.d.ts

@@ -1,9 +0,0 @@
-import { KoaMiddleware, ServicesState } from '@contember/engine-http';
-import prom from 'prom-client';
-import { Config } from '../config/config';
-import { SystemGraphQLMiddlewareFactory, TenantGraphQLMiddlewareFactory } from '@contember/engine-http';
-export declare const createRootMiddleware: (debug: boolean, version: string, services: ServicesState & {
-    tenantGraphQlMiddlewareFactory: TenantGraphQLMiddlewareFactory;
-    systemGraphQLMiddlewareFactory: SystemGraphQLMiddlewareFactory;
-}, prometheusRegistry: prom.Registry, httpConfig: Config['server']['http']) => KoaMiddleware<any>;
-//# sourceMappingURL=RootMiddleware.d.ts.map

package/dist/src/http/RootMiddleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RootMiddleware.d.ts","sourceRoot":"","sources":["../../../src/http/RootMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAYN,aAAa,EAEb,aAAa,EACb,MAAM,wBAAwB,CAAA;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAA;AAI9B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,8BAA8B,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;AAEvG,eAAO,MAAM,oBAAoB,UACzB,OAAO,WACL,MAAM,YACL,aAAa,GAAG;IACzB,8BAA8B,EAAE,8BAA8B,CAAA;IAC9D,8BAA8B,EAAE,8BAA8B,CAAA;CAC9D,sBACmB,KAAK,QAAQ,cACrB,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAClC,cAAc,GAAG,CAoBnB,CAAA"}

package/dist/src/http/RootMiddleware.js

@@ -1,33 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRootMiddleware = void 0;
-const engine_http_1 = require("@contember/engine-http");
-const koa_compress_1 = __importDefault(require("koa-compress"));
-const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
-const CollectHttpMetricsMiddelware_1 = require("./CollectHttpMetricsMiddelware");
-const createRootMiddleware = (debug, version, services, prometheusRegistry, httpConfig) => {
-    return engine_http_1.compose([
-        koa_compress_1.default({
-            br: false,
-        }),
-        koa_bodyparser_1.default({
-            jsonLimit: httpConfig.requestBodySize || '1mb',
-        }),
-        engine_http_1.createPoweredByHeaderMiddleware(debug, version),
-        CollectHttpMetricsMiddelware_1.createColllectHttpMetricsMiddleware(prometheusRegistry),
-        engine_http_1.createDebugInfoMiddleware(debug),
-        engine_http_1.createServicesProviderMiddleware(services),
-        engine_http_1.createErrorResponseMiddleware(),
-        engine_http_1.createTimerMiddleware(),
-        engine_http_1.route('/playground$', engine_http_1.createPlaygroundMiddleware()),
-        engine_http_1.createHomepageMiddleware(),
-        engine_http_1.createContentMiddleware(),
-        engine_http_1.createTenantMiddleware(services.tenantGraphQlMiddlewareFactory),
-        engine_http_1.createSystemMiddleware(services.systemGraphQLMiddlewareFactory),
-    ]);
-};
-exports.createRootMiddleware = createRootMiddleware;
-//# sourceMappingURL=RootMiddleware.js.map

package/dist/src/http/RootMiddleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RootMiddleware.js","sourceRoot":"","sources":["../../../src/http/RootMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,wDAe+B;AAE/B,gEAAsC;AACtC,oEAAuC;AACvC,iFAAoF;AAI7E,MAAM,oBAAoB,GAAG,CACnC,KAAc,EACd,OAAe,EACf,QAGC,EACD,kBAAiC,EACjC,UAAoC,EACf,EAAE;IACvB,OAAO,qBAAO,CAAC;QACd,sBAAW,CAAC;YACX,EAAE,EAAE,KAAK;SACT,CAAC;QACF,wBAAU,CAAC;YACV,SAAS,EAAE,UAAU,CAAC,eAAe,IAAI,KAAK;SAC9C,CAAC;QACF,6CAA+B,CAAC,KAAK,EAAE,OAAO,CAAC;QAC/C,kEAAmC,CAAC,kBAAkB,CAAC;QACvD,uCAAyB,CAAC,KAAK,CAAC;QAChC,8CAAgC,CAAC,QAAQ,CAAC;QAC1C,2CAA6B,EAAE;QAC/B,mCAAqB,EAAE;QACvB,mBAAK,CAAC,cAAc,EAAE,wCAA0B,EAAE,CAAC;QACnD,sCAAwB,EAAE;QAC1B,qCAAuB,EAAE;QACzB,oCAAsB,CAAC,QAAQ,CAAC,8BAA8B,CAAC;QAC/D,oCAAsB,CAAC,QAAQ,CAAC,8BAA8B,CAAC;KAC/D,CAAC,CAAA;AACH,CAAC,CAAA;AA7BY,QAAA,oBAAoB,wBA6BhC"}

package/src/http/RootMiddleware.ts

@@ -1,53 +0,0 @@
-import {
-	compose,
-	createContentMiddleware,
-	createDebugInfoMiddleware,
-	createErrorResponseMiddleware,
-	createHomepageMiddleware,
-	createPlaygroundMiddleware,
-	createPoweredByHeaderMiddleware,
-	createServicesProviderMiddleware,
-	createSystemMiddleware,
-	createTenantMiddleware,
-	createTimerMiddleware,
-	KoaMiddleware,
-	route,
-	ServicesState,
-} from '@contember/engine-http'
-import prom from 'prom-client'
-import koaCompress from 'koa-compress'
-import bodyParser from 'koa-bodyparser'
-import { createColllectHttpMetricsMiddleware } from './CollectHttpMetricsMiddelware'
-import { Config } from '../config/config'
-import { SystemGraphQLMiddlewareFactory, TenantGraphQLMiddlewareFactory } from '@contember/engine-http'
-
-export const createRootMiddleware = (
-	debug: boolean,
-	version: string,
-	services: ServicesState & {
-		tenantGraphQlMiddlewareFactory: TenantGraphQLMiddlewareFactory
-		systemGraphQLMiddlewareFactory: SystemGraphQLMiddlewareFactory
-	},
-	prometheusRegistry: prom.Registry,
-	httpConfig: Config['server']['http'],
-): KoaMiddleware<any> => {
-	return compose([
-		koaCompress({
-			br: false,
-		}),
-		bodyParser({
-			jsonLimit: httpConfig.requestBodySize || '1mb',
-		}),
-		createPoweredByHeaderMiddleware(debug, version),
-		createColllectHttpMetricsMiddleware(prometheusRegistry),
-		createDebugInfoMiddleware(debug),
-		createServicesProviderMiddleware(services),
-		createErrorResponseMiddleware(),
-		createTimerMiddleware(),
-		route('/playground$', createPlaygroundMiddleware()),
-		createHomepageMiddleware(),
-		createContentMiddleware(),
-		createTenantMiddleware(services.tenantGraphQlMiddlewareFactory),
-		createSystemMiddleware(services.systemGraphQLMiddlewareFactory),
-	])
-}