@contember/engine-server 1.2.0-alpha.8 → 1.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/MasterContainer.d.ts +6 -6
- package/dist/src/MasterContainer.d.ts.map +1 -1
- package/dist/src/MasterContainer.js +10 -13
- package/dist/src/MasterContainer.js.map +1 -1
- package/dist/src/bootstrap/Initializer.d.ts.map +1 -1
- package/dist/src/bootstrap/Initializer.js +3 -15
- package/dist/src/bootstrap/Initializer.js.map +1 -1
- package/dist/src/config/configSchema.d.ts +81 -0
- package/dist/src/config/configSchema.d.ts.map +1 -1
- package/dist/src/config/configSchema.js +16 -2
- package/dist/src/config/configSchema.js.map +1 -1
- package/dist/src/config/configTemplate.d.ts.map +1 -1
- package/dist/src/config/configTemplate.js +29 -24
- package/dist/src/config/configTemplate.js.map +1 -1
- package/dist/src/project/ProjectContainer.d.ts +8 -2
- package/dist/src/project/ProjectContainer.d.ts.map +1 -1
- package/dist/src/project/ProjectContainer.js +20 -5
- package/dist/src/project/ProjectContainer.js.map +1 -1
- package/dist/src/project/ProjectContainerResolver.d.ts +2 -3
- package/dist/src/project/ProjectContainerResolver.d.ts.map +1 -1
- package/dist/src/project/ProjectContainerResolver.js +3 -4
- package/dist/src/project/ProjectContainerResolver.js.map +1 -1
- package/dist/src/project/ProjectInitializer.d.ts +3 -2
- package/dist/src/project/ProjectInitializer.d.ts.map +1 -1
- package/dist/src/project/ProjectInitializer.js +3 -3
- package/dist/src/project/ProjectInitializer.js.map +1 -1
- package/dist/src/project/ProjectSchemaResolver.d.ts +2 -7
- package/dist/src/project/ProjectSchemaResolver.d.ts.map +1 -1
- package/dist/src/project/ProjectSchemaResolver.js +2 -16
- package/dist/src/project/ProjectSchemaResolver.js.map +1 -1
- package/dist/src/projectGroup/ProjectGroupContainer.d.ts +3 -1
- package/dist/src/projectGroup/ProjectGroupContainer.d.ts.map +1 -1
- package/dist/src/projectGroup/ProjectGroupContainer.js +10 -8
- package/dist/src/projectGroup/ProjectGroupContainer.js.map +1 -1
- package/dist/src/start.js +16 -13
- package/dist/src/start.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/sentry.d.ts +8 -9
- package/dist/src/utils/sentry.d.ts.map +1 -1
- package/dist/src/utils/sentry.js +44 -29
- package/dist/src/utils/sentry.js.map +1 -1
- package/dist/src/utils/serverStartup.d.ts +3 -1
- package/dist/src/utils/serverStartup.d.ts.map +1 -1
- package/dist/src/utils/serverStartup.js +49 -12
- package/dist/src/utils/serverStartup.js.map +1 -1
- package/dist/src/utils/serverTermination.d.ts +2 -1
- package/dist/src/utils/serverTermination.d.ts.map +1 -1
- package/dist/src/utils/serverTermination.js +4 -6
- package/dist/src/utils/serverTermination.js.map +1 -1
- package/dist/tests/cases/configResolver.test.d.ts +2 -0
- package/dist/tests/cases/configResolver.test.d.ts.map +1 -0
- package/dist/tests/cases/configResolver.test.js +67 -0
- package/dist/tests/cases/configResolver.test.js.map +1 -0
- package/dist/tests/src/tester.js +2 -2
- package/dist/tests/src/tester.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +19 -22
- package/src/MasterContainer.ts +17 -15
- package/src/bootstrap/Initializer.ts +3 -16
- package/src/config/configSchema.ts +44 -21
- package/src/config/configTemplate.ts +29 -24
- package/src/project/ProjectContainer.ts +23 -4
- package/src/project/ProjectContainerResolver.ts +4 -4
- package/src/project/ProjectInitializer.ts +4 -3
- package/src/project/ProjectSchemaResolver.ts +1 -18
- package/src/projectGroup/ProjectGroupContainer.ts +12 -7
- package/src/start.ts +24 -17
- package/src/tsconfig.json +6 -15
- package/src/utils/sentry.ts +45 -35
- package/src/utils/serverStartup.ts +46 -10
- package/src/utils/serverTermination.ts +5 -6
- package/tests/cases/configResolver.test.ts +67 -0
- package/tests/src/tester.ts +1 -1
|
@@ -7,13 +7,12 @@ import { ServerConfig } from './config/config';
|
|
|
7
7
|
import { ModificationHandlerFactory } from '@contember/schema-migrations';
|
|
8
8
|
import { Initializer } from './bootstrap';
|
|
9
9
|
import { Plugin } from '@contember/engine-plugins';
|
|
10
|
-
import { ContentApiMiddlewareFactory, ContentGraphQLContextFactory, ContentQueryHandlerFactory, ContentSchemaTransferMappingFactory, ErrorMiddlewareFactory, ExportApiMiddlewareFactory, ExportExecutor, ImportApiMiddlewareFactory, ImportExecutor, Koa, NotModifiedChecker, Providers, SystemApiMiddlewareFactory, SystemGraphQLContextFactory, SystemGraphQLHandlerFactory, SystemSchemaTransferMappingFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
|
|
10
|
+
import { ContentApiMiddlewareFactory, ContentGraphQLContextFactory, ContentQueryHandlerFactory, ContentSchemaTransferMappingFactory, ErrorMiddlewareFactory, ExportApiMiddlewareFactory, ExportExecutor, ImportApiMiddlewareFactory, ImportExecutor, Koa, NotModifiedChecker, ProjectGroupResolver as ProjectGroupResolverInterface, Providers, SystemApiMiddlewareFactory, SystemGraphQLContextFactory, SystemGraphQLHandlerFactory, SystemSchemaTransferMappingFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
|
|
11
11
|
import { ProjectContainerFactoryFactory } from './project';
|
|
12
12
|
import { ProjectConfigResolver } from './config/projectConfigResolver';
|
|
13
13
|
import { TenantConfigResolver } from './config/tenantConfigResolver';
|
|
14
14
|
import { ProjectGroupContainerFactory } from './projectGroup/ProjectGroupContainer';
|
|
15
|
-
import {
|
|
16
|
-
import { Logger } from '@contember/engine-common';
|
|
15
|
+
import { Logger } from '@contember/logger';
|
|
17
16
|
export interface MasterContainer {
|
|
18
17
|
initializer: Initializer;
|
|
19
18
|
koa: Koa;
|
|
@@ -25,10 +24,11 @@ export interface MasterContainerArgs {
|
|
|
25
24
|
projectConfigResolver: ProjectConfigResolver;
|
|
26
25
|
tenantConfigResolver: TenantConfigResolver;
|
|
27
26
|
plugins: Plugin[];
|
|
27
|
+
logger: Logger;
|
|
28
28
|
version?: string;
|
|
29
29
|
}
|
|
30
30
|
export declare class MasterContainerFactory {
|
|
31
|
-
createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, }: MasterContainerArgs): Builder<{
|
|
31
|
+
createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, logger, }: MasterContainerArgs): Builder<{
|
|
32
32
|
serverConfig: {
|
|
33
33
|
readonly port: number;
|
|
34
34
|
readonly http: {
|
|
@@ -75,6 +75,8 @@ export declare class MasterContainerFactory {
|
|
|
75
75
|
tenantGraphQLHandlerFactory: TenantGraphQLHandlerFactory;
|
|
76
76
|
} & {
|
|
77
77
|
systemGraphQLHandlerFactory: SystemGraphQLHandlerFactory;
|
|
78
|
+
} & {
|
|
79
|
+
logger: Logger;
|
|
78
80
|
} & {
|
|
79
81
|
projectGroupContainerFactory: ProjectGroupContainerFactory;
|
|
80
82
|
} & {
|
|
@@ -99,8 +101,6 @@ export declare class MasterContainerFactory {
|
|
|
99
101
|
systemGraphQLContextFactory: SystemGraphQLContextFactory;
|
|
100
102
|
} & {
|
|
101
103
|
systemApiMiddlewareFactory: SystemApiMiddlewareFactory;
|
|
102
|
-
} & {
|
|
103
|
-
logger: Logger;
|
|
104
104
|
} & {
|
|
105
105
|
contentSchemaTransferMappingFactory: ContentSchemaTransferMappingFactory;
|
|
106
106
|
} & {
|
|
@@ -1 +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;
|
|
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,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,EAC1B,mCAAmC,EAQnC,sBAAsB,EACtB,0BAA0B,EAC1B,cAAc,EACd,0BAA0B,EAC1B,cAAc,EACd,GAAG,EACH,kBAAkB,EAClB,oBAAoB,IAAI,6BAA6B,EACrD,SAAS,EAET,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,EAC3B,kCAAkC,EAClC,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,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,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,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,aAAa,CAAC,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EACpB,OAAO,EACP,MAAM,GACN,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgItB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe;CAIlD"}
|
|
@@ -7,7 +7,6 @@ exports.MasterContainerFactory = void 0;
|
|
|
7
7
|
const engine_system_api_1 = require("@contember/engine-system-api");
|
|
8
8
|
const engine_tenant_api_1 = require("@contember/engine-tenant-api");
|
|
9
9
|
const dic_1 = require("@contember/dic");
|
|
10
|
-
const utils_1 = require("./utils");
|
|
11
10
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
12
11
|
const bootstrap_1 = require("./bootstrap");
|
|
13
12
|
const engine_http_1 = require("@contember/engine-http");
|
|
@@ -17,9 +16,8 @@ const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
|
17
16
|
const ProjectGroupContainer_1 = require("./projectGroup/ProjectGroupContainer");
|
|
18
17
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
19
18
|
const ProjectGroupResolver_1 = require("./projectGroup/ProjectGroupResolver");
|
|
20
|
-
const engine_common_1 = require("@contember/engine-common");
|
|
21
19
|
class MasterContainerFactory {
|
|
22
|
-
createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, }) {
|
|
20
|
+
createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, version, logger, }) {
|
|
23
21
|
return new dic_1.Builder({})
|
|
24
22
|
.addService('serverConfig', () => serverConfig)
|
|
25
23
|
.addService('debugMode', () => debugMode)
|
|
@@ -32,30 +30,28 @@ class MasterContainerFactory {
|
|
|
32
30
|
.addService('modificationHandlerFactory', () => new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap))
|
|
33
31
|
.addService('systemContainerFactory', ({ providers, modificationHandlerFactory }) => new engine_system_api_1.SystemContainerFactory(providers, modificationHandlerFactory))
|
|
34
32
|
.addService('projectContainerFactoryFactory', ({ debugMode, plugins, providers }) => new project_1.ProjectContainerFactoryFactory(debugMode, plugins, providers))
|
|
35
|
-
.addService('tenantGraphQLHandlerFactory', () => new engine_http_1.TenantGraphQLHandlerFactory(
|
|
36
|
-
.addService('systemGraphQLHandlerFactory', ({ debugMode }) => new engine_http_1.SystemGraphQLHandlerFactory(
|
|
37
|
-
.addService('
|
|
33
|
+
.addService('tenantGraphQLHandlerFactory', () => new engine_http_1.TenantGraphQLHandlerFactory())
|
|
34
|
+
.addService('systemGraphQLHandlerFactory', ({ debugMode }) => new engine_http_1.SystemGraphQLHandlerFactory(debugMode))
|
|
35
|
+
.addService('logger', () => logger)
|
|
36
|
+
.addService('projectGroupContainerFactory', ({ debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory, logger }) => new ProjectGroupContainer_1.ProjectGroupContainerFactory(debugMode, providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory, logger))
|
|
38
37
|
.addService('projectGroupContainer', ({ tenantConfigResolver, projectGroupContainerFactory }) => projectGroupContainerFactory.create({ slug: undefined, config: tenantConfigResolver(undefined, {}) }))
|
|
39
38
|
.addService('httpErrorMiddlewareFactory', ({ debugMode }) => new engine_http_1.ErrorMiddlewareFactory(debugMode))
|
|
40
39
|
.addService('projectGroupResolver', ({ projectGroupContainer }) => new ProjectGroupResolver_1.ProjectGroupResolver(projectGroupContainer))
|
|
41
40
|
.addService('notModifiedChecker', () => new engine_http_1.NotModifiedChecker())
|
|
42
41
|
.addService('contentGraphqlContextFactory', ({ providers }) => new engine_http_1.ContentGraphQLContextFactory(providers))
|
|
43
|
-
.addService('contentQueryHandlerFactory', ({ debugMode }) => new engine_http_1.ContentQueryHandlerFactory(debugMode
|
|
42
|
+
.addService('contentQueryHandlerFactory', ({ debugMode }) => new engine_http_1.ContentQueryHandlerFactory(debugMode))
|
|
44
43
|
.addService('contentApiMiddlewareFactory', ({ projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) => new engine_http_1.ContentApiMiddlewareFactory(projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
|
|
45
44
|
.addService('tenantGraphQLContextFactory', () => new engine_http_1.TenantGraphQLContextFactory())
|
|
46
45
|
.addService('tenantApiMiddlewareFactory', ({ debugMode, projectGroupResolver, tenantGraphQLContextFactory }) => new engine_http_1.TenantApiMiddlewareFactory(debugMode, projectGroupResolver, tenantGraphQLContextFactory))
|
|
47
46
|
.addService('systemGraphQLContextFactory', () => new engine_http_1.SystemGraphQLContextFactory())
|
|
48
47
|
.addService('systemApiMiddlewareFactory', ({ debugMode, projectGroupResolver, systemGraphQLContextFactory }) => new engine_http_1.SystemApiMiddlewareFactory(debugMode, projectGroupResolver, systemGraphQLContextFactory))
|
|
49
|
-
.addService('logger', () =>
|
|
50
|
-
// eslint-disable-next-line no-console
|
|
51
|
-
new engine_common_1.Logger(console.log))
|
|
52
48
|
.addService('contentSchemaTransferMappingFactory', () => new engine_http_1.ContentSchemaTransferMappingFactory())
|
|
53
49
|
.addService('systemSchemaTransferMappingFactory', () => new engine_http_1.SystemSchemaTransferMappingFactory())
|
|
54
|
-
.addService('importExecutor', ({ contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory
|
|
50
|
+
.addService('importExecutor', ({ contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory }) => new engine_http_1.ImportExecutor(contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory))
|
|
55
51
|
.addService('exportExecutor', ({ contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory }) => new engine_http_1.ExportExecutor(contentSchemaTransferMappingFactory, systemSchemaTransferMappingFactory))
|
|
56
52
|
.addService('importApiMiddlewareFactory', ({ projectGroupResolver, importExecutor }) => new engine_http_1.ImportApiMiddlewareFactory(projectGroupResolver, importExecutor))
|
|
57
53
|
.addService('exportApiMiddlewareFactory', ({ projectGroupResolver, exportExecutor }) => new engine_http_1.ExportApiMiddlewareFactory(projectGroupResolver, exportExecutor))
|
|
58
|
-
.addService('koaMiddlewares', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, importApiMiddlewareFactory, exportApiMiddlewareFactory, httpErrorMiddlewareFactory, debugMode, version, serverConfig }) => (0, engine_http_1.compose)([
|
|
54
|
+
.addService('koaMiddlewares', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, importApiMiddlewareFactory, exportApiMiddlewareFactory, httpErrorMiddlewareFactory, debugMode, version, serverConfig, logger }) => (0, engine_http_1.compose)([
|
|
59
55
|
(0, koa_compress_1.default)({
|
|
60
56
|
br: false,
|
|
61
57
|
}),
|
|
@@ -63,8 +59,9 @@ class MasterContainerFactory {
|
|
|
63
59
|
jsonLimit: serverConfig.http.requestBodySize || '1mb',
|
|
64
60
|
}),
|
|
65
61
|
(0, engine_http_1.createPoweredByHeaderMiddleware)(debugMode, version !== null && version !== void 0 ? version : 'unknown'),
|
|
62
|
+
(0, engine_http_1.createLoggerMiddleware)(logger),
|
|
63
|
+
(0, engine_http_1.createTimerMiddleware)({ debugMode }),
|
|
66
64
|
httpErrorMiddlewareFactory.create(),
|
|
67
|
-
(0, engine_http_1.createTimerMiddleware)(),
|
|
68
65
|
(0, engine_http_1.route)('/playground$', (0, engine_http_1.createPlaygroundMiddleware)()),
|
|
69
66
|
(0, engine_http_1.createHomepageMiddleware)(),
|
|
70
67
|
(0, cors_1.default)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAqE;AACrE,oEAAqE;AACrE,wCAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AAAA,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;CAmB5C"}
|
|
@@ -1,37 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Initializer = void 0;
|
|
4
|
-
const engine_common_1 = require("@contember/engine-common");
|
|
5
4
|
class Initializer {
|
|
6
5
|
constructor(projectGroupContainer) {
|
|
7
6
|
this.projectGroupContainer = projectGroupContainer;
|
|
8
7
|
}
|
|
9
8
|
async initialize() {
|
|
10
|
-
// eslint-disable-next-line no-console
|
|
11
|
-
const logger = new engine_common_1.Logger(console.log);
|
|
12
|
-
logger.group('\nInitializing tenant database');
|
|
13
|
-
// todo
|
|
14
9
|
const groupContainer = await this.projectGroupContainer;
|
|
10
|
+
const tenantMigrationsLogger = groupContainer.logger.child();
|
|
15
11
|
const tenantContainer = groupContainer.tenantContainer;
|
|
16
|
-
await tenantContainer.migrationsRunner.run(
|
|
17
|
-
logger.groupEnd();
|
|
12
|
+
await tenantContainer.migrationsRunner.run(tenantMigrationsLogger);
|
|
18
13
|
const projects = [];
|
|
19
14
|
const tenantProjects = await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext);
|
|
20
15
|
for (const { slug: projectSlug } of tenantProjects) {
|
|
21
|
-
|
|
22
|
-
const projectContainer = await groupContainer.projectContainerResolver.getProjectContainer(projectSlug, {
|
|
23
|
-
alias: false,
|
|
24
|
-
logger,
|
|
25
|
-
});
|
|
16
|
+
const projectContainer = await groupContainer.projectContainerResolver.getProjectContainer(projectSlug, { alias: false });
|
|
26
17
|
if (!projectContainer) {
|
|
27
18
|
throw new Error();
|
|
28
19
|
}
|
|
29
20
|
const project = projectContainer.project;
|
|
30
21
|
projects.push(project.slug);
|
|
31
|
-
logger.groupEnd();
|
|
32
22
|
}
|
|
33
|
-
// eslint-disable-next-line no-console
|
|
34
|
-
console.log('');
|
|
35
23
|
return projects;
|
|
36
24
|
}
|
|
37
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IACvB,YACkB,qBAA4C;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;IAC3D,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAA;QACvD,MAAM,sBAAsB,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QAC5D,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;QACtD,MAAM,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QAElE,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,gBAAgB,GAAG,MAAM,cAAc,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;YACzH,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;SAC3B;QACD,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AAxBD,kCAwBC"}
|
|
@@ -16,11 +16,38 @@ export declare const dbConfigSchema: Typesafe.Type<{
|
|
|
16
16
|
readonly maxConnecting?: number | undefined;
|
|
17
17
|
readonly maxIdle?: number | undefined;
|
|
18
18
|
readonly reconnectIntervalMs?: number | undefined;
|
|
19
|
+
readonly rateLimitCount?: number | undefined;
|
|
20
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
19
21
|
readonly idleTimeoutMs?: number | undefined;
|
|
20
22
|
readonly acquireTimeoutMs?: number | undefined;
|
|
21
23
|
readonly maxUses?: number | undefined;
|
|
22
24
|
readonly maxAgeMs?: number | undefined;
|
|
23
25
|
} | undefined;
|
|
26
|
+
} & {
|
|
27
|
+
readonly read?: ({
|
|
28
|
+
readonly host?: string | undefined;
|
|
29
|
+
readonly port?: number | undefined;
|
|
30
|
+
readonly user?: string | undefined;
|
|
31
|
+
readonly password?: string | undefined;
|
|
32
|
+
readonly database?: string | undefined;
|
|
33
|
+
} & {
|
|
34
|
+
readonly ssl?: boolean | undefined;
|
|
35
|
+
readonly queryTimeoutMs?: number | undefined;
|
|
36
|
+
readonly statementTimeoutMs?: number | undefined;
|
|
37
|
+
readonly connectionTimeoutMs?: number | undefined;
|
|
38
|
+
readonly pool?: {
|
|
39
|
+
readonly maxConnections?: number | undefined;
|
|
40
|
+
readonly maxConnecting?: number | undefined;
|
|
41
|
+
readonly maxIdle?: number | undefined;
|
|
42
|
+
readonly reconnectIntervalMs?: number | undefined;
|
|
43
|
+
readonly rateLimitCount?: number | undefined;
|
|
44
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
45
|
+
readonly idleTimeoutMs?: number | undefined;
|
|
46
|
+
readonly acquireTimeoutMs?: number | undefined;
|
|
47
|
+
readonly maxUses?: number | undefined;
|
|
48
|
+
readonly maxAgeMs?: number | undefined;
|
|
49
|
+
} | undefined;
|
|
50
|
+
}) | undefined;
|
|
24
51
|
}>;
|
|
25
52
|
export declare const tenantConfigSchema: Typesafe.Type<{
|
|
26
53
|
readonly db: {
|
|
@@ -39,11 +66,38 @@ export declare const tenantConfigSchema: Typesafe.Type<{
|
|
|
39
66
|
readonly maxConnecting?: number | undefined;
|
|
40
67
|
readonly maxIdle?: number | undefined;
|
|
41
68
|
readonly reconnectIntervalMs?: number | undefined;
|
|
69
|
+
readonly rateLimitCount?: number | undefined;
|
|
70
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
42
71
|
readonly idleTimeoutMs?: number | undefined;
|
|
43
72
|
readonly acquireTimeoutMs?: number | undefined;
|
|
44
73
|
readonly maxUses?: number | undefined;
|
|
45
74
|
readonly maxAgeMs?: number | undefined;
|
|
46
75
|
} | undefined;
|
|
76
|
+
} & {
|
|
77
|
+
readonly read?: ({
|
|
78
|
+
readonly host?: string | undefined;
|
|
79
|
+
readonly port?: number | undefined;
|
|
80
|
+
readonly user?: string | undefined;
|
|
81
|
+
readonly password?: string | undefined;
|
|
82
|
+
readonly database?: string | undefined;
|
|
83
|
+
} & {
|
|
84
|
+
readonly ssl?: boolean | undefined;
|
|
85
|
+
readonly queryTimeoutMs?: number | undefined;
|
|
86
|
+
readonly statementTimeoutMs?: number | undefined;
|
|
87
|
+
readonly connectionTimeoutMs?: number | undefined;
|
|
88
|
+
readonly pool?: {
|
|
89
|
+
readonly maxConnections?: number | undefined;
|
|
90
|
+
readonly maxConnecting?: number | undefined;
|
|
91
|
+
readonly maxIdle?: number | undefined;
|
|
92
|
+
readonly reconnectIntervalMs?: number | undefined;
|
|
93
|
+
readonly rateLimitCount?: number | undefined;
|
|
94
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
95
|
+
readonly idleTimeoutMs?: number | undefined;
|
|
96
|
+
readonly acquireTimeoutMs?: number | undefined;
|
|
97
|
+
readonly maxUses?: number | undefined;
|
|
98
|
+
readonly maxAgeMs?: number | undefined;
|
|
99
|
+
} | undefined;
|
|
100
|
+
}) | undefined;
|
|
47
101
|
};
|
|
48
102
|
readonly mailer: MailerOptions & Typesafe.JsonObject;
|
|
49
103
|
readonly credentials: {
|
|
@@ -106,11 +160,38 @@ export declare const projectConfigSchema: Typesafe.Type<{
|
|
|
106
160
|
readonly maxConnecting?: number | undefined;
|
|
107
161
|
readonly maxIdle?: number | undefined;
|
|
108
162
|
readonly reconnectIntervalMs?: number | undefined;
|
|
163
|
+
readonly rateLimitCount?: number | undefined;
|
|
164
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
109
165
|
readonly idleTimeoutMs?: number | undefined;
|
|
110
166
|
readonly acquireTimeoutMs?: number | undefined;
|
|
111
167
|
readonly maxUses?: number | undefined;
|
|
112
168
|
readonly maxAgeMs?: number | undefined;
|
|
113
169
|
} | undefined;
|
|
170
|
+
} & {
|
|
171
|
+
readonly read?: ({
|
|
172
|
+
readonly host?: string | undefined;
|
|
173
|
+
readonly port?: number | undefined;
|
|
174
|
+
readonly user?: string | undefined;
|
|
175
|
+
readonly password?: string | undefined;
|
|
176
|
+
readonly database?: string | undefined;
|
|
177
|
+
} & {
|
|
178
|
+
readonly ssl?: boolean | undefined;
|
|
179
|
+
readonly queryTimeoutMs?: number | undefined;
|
|
180
|
+
readonly statementTimeoutMs?: number | undefined;
|
|
181
|
+
readonly connectionTimeoutMs?: number | undefined;
|
|
182
|
+
readonly pool?: {
|
|
183
|
+
readonly maxConnections?: number | undefined;
|
|
184
|
+
readonly maxConnecting?: number | undefined;
|
|
185
|
+
readonly maxIdle?: number | undefined;
|
|
186
|
+
readonly reconnectIntervalMs?: number | undefined;
|
|
187
|
+
readonly rateLimitCount?: number | undefined;
|
|
188
|
+
readonly rateLimitPeriodMs?: number | undefined;
|
|
189
|
+
readonly idleTimeoutMs?: number | undefined;
|
|
190
|
+
readonly acquireTimeoutMs?: number | undefined;
|
|
191
|
+
readonly maxUses?: number | undefined;
|
|
192
|
+
readonly maxAgeMs?: number | undefined;
|
|
193
|
+
} | undefined;
|
|
194
|
+
}) | undefined;
|
|
114
195
|
}) | {
|
|
115
196
|
readonly useTenantDb: true;
|
|
116
197
|
}) & {
|
|
@@ -1 +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;
|
|
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;AAwC5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAW1B,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"}
|
|
@@ -26,13 +26,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.projectConfigSchema = exports.stageConfig = exports.serverConfigSchema = exports.tenantConfigSchema = exports.dbConfigSchema = void 0;
|
|
27
27
|
const Typesafe = __importStar(require("@contember/typesafe"));
|
|
28
28
|
const utils_1 = require("../utils");
|
|
29
|
-
|
|
29
|
+
const dbConfigRequired = {
|
|
30
30
|
host: Typesafe.string,
|
|
31
31
|
port: Typesafe.number,
|
|
32
32
|
user: Typesafe.string,
|
|
33
33
|
password: Typesafe.string,
|
|
34
34
|
database: Typesafe.string,
|
|
35
|
-
}
|
|
35
|
+
};
|
|
36
|
+
const dbConfigOptional = {
|
|
36
37
|
ssl: Typesafe.boolean,
|
|
37
38
|
queryTimeoutMs: Typesafe.number,
|
|
38
39
|
statementTimeoutMs: Typesafe.number,
|
|
@@ -42,11 +43,24 @@ exports.dbConfigSchema = Typesafe.intersection(Typesafe.object({
|
|
|
42
43
|
maxConnecting: Typesafe.number,
|
|
43
44
|
maxIdle: Typesafe.number,
|
|
44
45
|
reconnectIntervalMs: Typesafe.number,
|
|
46
|
+
rateLimitCount: Typesafe.number,
|
|
47
|
+
rateLimitPeriodMs: Typesafe.number,
|
|
45
48
|
idleTimeoutMs: Typesafe.number,
|
|
46
49
|
acquireTimeoutMs: Typesafe.number,
|
|
47
50
|
maxUses: Typesafe.number,
|
|
48
51
|
maxAgeMs: Typesafe.number,
|
|
49
52
|
}),
|
|
53
|
+
};
|
|
54
|
+
const dbConfigSchemaInner = Typesafe.intersection(Typesafe.object(dbConfigRequired), Typesafe.partial(dbConfigOptional));
|
|
55
|
+
const readDbSchema = Typesafe.intersection(Typesafe.partial(dbConfigRequired), Typesafe.partial(dbConfigOptional));
|
|
56
|
+
exports.dbConfigSchema = Typesafe.intersection(dbConfigSchemaInner, Typesafe.partial({
|
|
57
|
+
read: (val) => {
|
|
58
|
+
const readDb = readDbSchema(val);
|
|
59
|
+
if ('host' in readDb) {
|
|
60
|
+
return readDb;
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
},
|
|
50
64
|
}));
|
|
51
65
|
exports.tenantConfigSchema = Typesafe.intersection(Typesafe.object({
|
|
52
66
|
db: exports.dbConfigSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAE/C,oCAAyC;
|
|
1
|
+
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTemplate.d.ts","sourceRoot":"","sources":["../../../src/config/configTemplate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configTemplate.d.ts","sourceRoot":"","sources":["../../../src/config/configTemplate.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,cAAc,EAAE,GAiE5B,CAAA"}
|
|
@@ -1,6 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configTemplate = void 0;
|
|
4
|
+
const createDbConfigTemplate = (prefix) => {
|
|
5
|
+
return {
|
|
6
|
+
ssl: `%?${prefix}_SSL::bool%`,
|
|
7
|
+
queryTimeoutMs: `%?${prefix}_QUERY_TIMEOUT_MS::number%`,
|
|
8
|
+
statementTimeoutMs: `%?${prefix}_STATEMENT_TIMEOUT_MS::number%`,
|
|
9
|
+
connectionTimeoutMs: `%?${prefix}_CONNECTION_TIMEOUT_MS::number%`,
|
|
10
|
+
pool: {
|
|
11
|
+
maxConnections: `%?${prefix}_POOL_MAX_CONNECTIONS::number%`,
|
|
12
|
+
maxConnecting: `%?${prefix}_POOL_MAX_CONNECTING::number%`,
|
|
13
|
+
maxIdle: `%?${prefix}_POOL_MAX_IDLE::number%`,
|
|
14
|
+
reconnectIntervalMs: `%?${prefix}_POOL_RECONNECT_INTERVAL_MS::number%`,
|
|
15
|
+
idleTimeoutMs: `%?${prefix}_POOL_IDLE_TIMEOUT_MS::number%`,
|
|
16
|
+
acquireTimeoutMs: `%?${prefix}_POOL_ACQUIRE_TIMEOUT_MS::number%`,
|
|
17
|
+
maxUses: `%?${prefix}_POOL_MAX_USES::number%`,
|
|
18
|
+
maxAgeMs: `%?${prefix}_POOL_MAX_AGE_MS::number%`,
|
|
19
|
+
rateLimitCount: `%?${prefix}_POOL_RATE_LIMIT_COUNT::number%`,
|
|
20
|
+
rateLimitPeriodMs: `%?${prefix}_POOL_RATE_LIMIT_PERIOD_MS::number%`,
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
};
|
|
4
24
|
exports.configTemplate = {
|
|
5
25
|
tenant: {
|
|
6
26
|
db: {
|
|
@@ -9,20 +29,7 @@ exports.configTemplate = {
|
|
|
9
29
|
user: `%tenant.env.DB_USER%`,
|
|
10
30
|
password: `%tenant.env.DB_PASSWORD%`,
|
|
11
31
|
database: `%tenant.env.DB_NAME%`,
|
|
12
|
-
|
|
13
|
-
queryTimeoutMs: '%?tenant.env.DB_QUERY_TIMEOUT_MS::number%',
|
|
14
|
-
statementTimeoutMs: '%?tenant.env.DB_STATEMENT_TIMEOUT_MS::number%',
|
|
15
|
-
connectionTimeoutMs: '%?tenant.env.DB_CONNECTION_TIMEOUT_MS::number%',
|
|
16
|
-
pool: {
|
|
17
|
-
maxConnections: '%?tenant.env.DB_POOL_MAX_CONNECTIONS::number%',
|
|
18
|
-
maxConnecting: '%?tenant.env.DB_POOL_MAX_CONNECTING::number%',
|
|
19
|
-
maxIdle: '%?tenant.env.DB_POOL_MAX_IDLE::number%',
|
|
20
|
-
reconnectIntervalMs: '%?tenant.env.DB_POOL_RECONNECT_INTERVAL_MS::number%',
|
|
21
|
-
idleTimeoutMs: '%?tenant.env.DB_POOL_IDLE_TIMEOUT_MS::number%',
|
|
22
|
-
acquireTimeoutMs: '%?tenant.env.DB_POOL_ACQUIRE_TIMEOUT_MS::number%',
|
|
23
|
-
maxUses: '%?tenant.env.DB_POOL_MAX_USES::number%',
|
|
24
|
-
maxAgeMs: '%?tenant.env.DB_POOL_MAX_AGE_MS::number%',
|
|
25
|
-
},
|
|
32
|
+
...createDbConfigTemplate('tenant.env.DB'),
|
|
26
33
|
},
|
|
27
34
|
mailer: {
|
|
28
35
|
from: '%?tenant.env.MAILER_FROM%',
|
|
@@ -50,16 +57,14 @@ exports.configTemplate = {
|
|
|
50
57
|
user: `%?project.env.DB_USER%`,
|
|
51
58
|
password: `%?project.secret.db.password||project.env.DB_PASSWORD%`,
|
|
52
59
|
database: `%?project.env.DB_NAME||project.slug%`,
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
maxUses: '%?project.env.DB_POOL_MAX_USES%',
|
|
62
|
-
maxAgeMs: '%?project.env.DB_POOL_MAX_AGE_MS%',
|
|
60
|
+
...createDbConfigTemplate('project.env.DB'),
|
|
61
|
+
read: {
|
|
62
|
+
host: `%?project.env.DB_READ_HOST%`,
|
|
63
|
+
port: `%?project.env.DB_READ_PORT::number%`,
|
|
64
|
+
user: `%?project.env.DB_READ_USER%`,
|
|
65
|
+
password: `%?project.secret.db.read.password||project.env.DB_READ_PASSWORD%`,
|
|
66
|
+
database: `%?project.env.DB_READ_NAME%`,
|
|
67
|
+
...createDbConfigTemplate('project.env.DB_READ'),
|
|
63
68
|
},
|
|
64
69
|
},
|
|
65
70
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTemplate.js","sourceRoot":"","sources":["../../../src/config/configTemplate.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"configTemplate.js","sourceRoot":"","sources":["../../../src/config/configTemplate.ts"],"names":[],"mappings":";;;AAAA,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACjD,OAAO;QACN,GAAG,EAAE,KAAK,MAAM,aAAa;QAC7B,cAAc,EAAE,KAAK,MAAM,4BAA4B;QACvD,kBAAkB,EAAE,KAAK,MAAM,gCAAgC;QAC/D,mBAAmB,EAAE,KAAK,MAAM,iCAAiC;QACjE,IAAI,EAAE;YACL,cAAc,EAAE,KAAK,MAAM,gCAAgC;YAC3D,aAAa,EAAE,KAAK,MAAM,+BAA+B;YACzD,OAAO,EAAE,KAAK,MAAM,yBAAyB;YAC7C,mBAAmB,EAAE,KAAK,MAAM,sCAAsC;YACtE,aAAa,EAAE,KAAK,MAAM,gCAAgC;YAC1D,gBAAgB,EAAE,KAAK,MAAM,mCAAmC;YAChE,OAAO,EAAE,KAAK,MAAM,yBAAyB;YAC7C,QAAQ,EAAE,KAAK,MAAM,2BAA2B;YAChD,cAAc,EAAE,KAAK,MAAM,iCAAiC;YAC5D,iBAAiB,EAAE,KAAK,MAAM,qCAAqC;SACnE;KACD,CAAA;AACF,CAAC,CAAA;AACY,QAAA,cAAc,GAAQ;IAClC,MAAM,EAAE;QACP,EAAE,EAAE;YACH,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,sBAAsB;YAC5B,QAAQ,EAAE,0BAA0B;YACpC,QAAQ,EAAE,sBAAsB;YAChC,GAAG,sBAAsB,CAAC,eAAe,CAAC;SAC1C;QACD,MAAM,EAAE;YACP,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,mCAAmC;YACzC,IAAI,EAAE,mCAAmC;YACzC,MAAM,EAAE,mCAAmC;YAC3C,IAAI,EAAE,2BAA2B;YACjC,QAAQ,EAAE,+BAA+B;SACzC;QACD,WAAW,EAAE;YACZ,SAAS,EAAE,6BAA6B;YACxC,SAAS,EAAE,6BAA6B;YACxC,aAAa,EAAE,kCAAkC;YACjD,YAAY,EAAE,gCAAgC;YAC9C,UAAU,EAAE,8BAA8B;SAC1C;QACD,OAAO,EAAE;YACR,aAAa,EAAE,iCAAiC;SAChD;KACD;IACD,eAAe,EAAE;QAChB,EAAE,EAAE;YACH,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE,gCAAgC;YACtC,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,wDAAwD;YAClE,QAAQ,EAAE,sCAAsC;YAChD,GAAG,sBAAsB,CAAC,gBAAgB,CAAC;YAC3C,IAAI,EAAE;gBACL,IAAI,EAAE,6BAA6B;gBACnC,IAAI,EAAE,qCAAqC;gBAC3C,IAAI,EAAE,6BAA6B;gBACnC,QAAQ,EAAE,kEAAkE;gBAC5E,QAAQ,EAAE,6BAA6B;gBACvC,GAAG,sBAAsB,CAAC,qBAAqB,CAAC;aAChD;SACD;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,8BAA8B;QACpC,cAAc,EAAE,yCAAyC;QACzD,WAAW,EAAE,uCAAuC;QACpD,IAAI,EAAE;YACL,eAAe,EAAE,iDAAiD;SAClE;QACD,YAAY,EAAE;YACb,aAAa,EAAE,+CAA+C;YAC9D,YAAY,EAAE,8CAA8C;YAC5D,mBAAmB,EAAE,sDAAsD;SAC3E;QACD,OAAO,EAAE;YACR,MAAM,EAAE;gBACP,GAAG,EAAE,mBAAmB;aACxB;SACD;KACD;CACD,CAAA"}
|
|
@@ -4,12 +4,13 @@ import { DatabaseContextFactory, SchemaVersionBuilder } from '@contember/engine-
|
|
|
4
4
|
import { GraphQlSchemaBuilderFactory, PermissionsByIdentityFactory } from '@contember/engine-content-api';
|
|
5
5
|
import { Plugin } from '@contember/engine-plugins';
|
|
6
6
|
import { ContentSchemaResolver, GraphQlSchemaFactory, ProjectConfig, ProjectContainer, Providers } from '@contember/engine-http';
|
|
7
|
+
import { Logger } from '@contember/logger';
|
|
7
8
|
export declare class ProjectContainerFactoryFactory {
|
|
8
9
|
private readonly debug;
|
|
9
10
|
private readonly plugins;
|
|
10
11
|
private readonly providers;
|
|
11
12
|
constructor(debug: boolean, plugins: Plugin[], providers: Providers);
|
|
12
|
-
create(schemaVersionBuilder: SchemaVersionBuilder): ProjectContainerFactory;
|
|
13
|
+
create(schemaVersionBuilder: SchemaVersionBuilder, logger: Logger): ProjectContainerFactory;
|
|
13
14
|
}
|
|
14
15
|
interface ProjectContainerFactoryArgs {
|
|
15
16
|
project: ProjectConfig;
|
|
@@ -19,7 +20,8 @@ export declare class ProjectContainerFactory {
|
|
|
19
20
|
private readonly plugins;
|
|
20
21
|
private readonly schemaVersionBuilder;
|
|
21
22
|
private readonly providers;
|
|
22
|
-
|
|
23
|
+
private readonly logger;
|
|
24
|
+
constructor(debug: boolean, plugins: Plugin[], schemaVersionBuilder: SchemaVersionBuilder, providers: Providers, logger: Logger);
|
|
23
25
|
createContainer(args: ProjectContainerFactoryArgs): ProjectContainer;
|
|
24
26
|
protected createBuilder({ project }: ProjectContainerFactoryArgs): Builder<{
|
|
25
27
|
providers: {
|
|
@@ -32,10 +34,14 @@ export declare class ProjectContainerFactory {
|
|
|
32
34
|
};
|
|
33
35
|
} & {
|
|
34
36
|
schemaVersionBuilder: SchemaVersionBuilder;
|
|
37
|
+
} & {
|
|
38
|
+
logger: Logger;
|
|
35
39
|
} & {
|
|
36
40
|
project: ProjectConfig;
|
|
37
41
|
} & {
|
|
38
42
|
connection: Connection;
|
|
43
|
+
} & {
|
|
44
|
+
readConnection: Connection;
|
|
39
45
|
} & {
|
|
40
46
|
graphQlSchemaBuilderFactory: GraphQlSchemaBuilderFactory;
|
|
41
47
|
} & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectContainer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAC3F,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAA4B,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC5E,OAAO,EACN,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"ProjectContainer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAC3F,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAA4B,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC5E,OAAO,EACN,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,qBAAa,8BAA8B;IAEzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS;IAItC,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,uBAAuB;CAG3F;AAED,UAAU,2BAA2B;IACpC,OAAO,EAAE,aAAa,CAAA;CACtB;AAED,qBAAa,uBAAuB;IAElC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAJN,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM;IAGzB,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,gBAAgB;IAc3E,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwChE"}
|
|
@@ -12,29 +12,44 @@ class ProjectContainerFactoryFactory {
|
|
|
12
12
|
this.plugins = plugins;
|
|
13
13
|
this.providers = providers;
|
|
14
14
|
}
|
|
15
|
-
create(schemaVersionBuilder) {
|
|
16
|
-
return new ProjectContainerFactory(this.debug, this.plugins, schemaVersionBuilder, this.providers);
|
|
15
|
+
create(schemaVersionBuilder, logger) {
|
|
16
|
+
return new ProjectContainerFactory(this.debug, this.plugins, schemaVersionBuilder, this.providers, logger);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.ProjectContainerFactoryFactory = ProjectContainerFactoryFactory;
|
|
20
20
|
class ProjectContainerFactory {
|
|
21
|
-
constructor(debug, plugins, schemaVersionBuilder, providers) {
|
|
21
|
+
constructor(debug, plugins, schemaVersionBuilder, providers, logger) {
|
|
22
22
|
this.debug = debug;
|
|
23
23
|
this.plugins = plugins;
|
|
24
24
|
this.schemaVersionBuilder = schemaVersionBuilder;
|
|
25
25
|
this.providers = providers;
|
|
26
|
+
this.logger = logger;
|
|
26
27
|
}
|
|
27
28
|
createContainer(args) {
|
|
28
29
|
return this.createBuilder(args)
|
|
29
30
|
.build()
|
|
30
|
-
.pick('project', 'connection', 'systemDatabaseContextFactory', 'contentSchemaResolver', 'graphQlSchemaFactory');
|
|
31
|
+
.pick('project', 'connection', 'readConnection', 'systemDatabaseContextFactory', 'contentSchemaResolver', 'graphQlSchemaFactory', 'logger');
|
|
31
32
|
}
|
|
32
33
|
createBuilder({ project }) {
|
|
33
34
|
return new dic_1.Builder({})
|
|
34
35
|
.addService('providers', () => this.providers)
|
|
35
36
|
.addService('schemaVersionBuilder', () => this.schemaVersionBuilder)
|
|
37
|
+
.addService('logger', () => this.logger.child({ project: project.slug }))
|
|
36
38
|
.addService('project', () => project)
|
|
37
|
-
.addService('connection', ({ project }) => database_1.Connection.create(project.db))
|
|
39
|
+
.addService('connection', ({ project, logger }) => database_1.Connection.create(project.db, err => logger.error(err)))
|
|
40
|
+
.addService('readConnection', ({ project, logger, connection }) => {
|
|
41
|
+
if (!project.db.read) {
|
|
42
|
+
return connection;
|
|
43
|
+
}
|
|
44
|
+
return database_1.Connection.create({
|
|
45
|
+
...project.db,
|
|
46
|
+
...project.db.read,
|
|
47
|
+
pool: {
|
|
48
|
+
...project.db.pool,
|
|
49
|
+
...project.db.read.pool,
|
|
50
|
+
},
|
|
51
|
+
}, err => logger.error(err));
|
|
52
|
+
})
|
|
38
53
|
.addService('graphQlSchemaBuilderFactory', () => new engine_content_api_1.GraphQlSchemaBuilderFactory())
|
|
39
54
|
.addService('permissionsByIdentityFactory', ({}) => new engine_content_api_1.PermissionsByIdentityFactory())
|
|
40
55
|
.addService('graphQlSchemaFactory', ({ project, permissionsByIdentityFactory, graphQlSchemaBuilderFactory, providers }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectContainer.js","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,kDAAgD;AAChD,oEAA2F;AAC3F,sEAAyG;AAEzG,wDAM+B;
|
|
1
|
+
{"version":3,"file":"ProjectContainer.js","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"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"}
|