@contember/engine-server 0.12.0-beta.2 → 1.0.0-alpha.0
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/alpine.dockerfile +2 -2
- package/debian.dockerfile +1 -1
- package/dist/src/MasterContainer.d.ts +4 -1
- package/dist/src/MasterContainer.d.ts.map +1 -1
- package/dist/src/MasterContainer.js +60 -31
- package/dist/src/MasterContainer.js.map +1 -1
- package/dist/src/bootstrap/Initializer.d.ts +4 -6
- package/dist/src/bootstrap/Initializer.d.ts.map +1 -1
- package/dist/src/bootstrap/Initializer.js +10 -11
- package/dist/src/bootstrap/Initializer.js.map +1 -1
- package/dist/src/config/config.d.ts +43 -22
- package/dist/src/config/config.d.ts.map +1 -1
- package/dist/src/config/config.js +135 -241
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/http/ShowMetricsMiddleware.js +1 -1
- package/dist/src/http/ShowMetricsMiddleware.js.map +1 -1
- package/dist/src/http/index.d.ts +0 -1
- package/dist/src/http/index.d.ts.map +1 -1
- package/dist/src/http/index.js +0 -1
- package/dist/src/http/index.js.map +1 -1
- package/dist/src/project/ProjectContainer.d.ts +1 -1
- package/dist/src/project/ProjectContainer.d.ts.map +1 -1
- package/dist/src/project/ProjectContainerResolver.d.ts +13 -10
- package/dist/src/project/ProjectContainerResolver.d.ts.map +1 -1
- package/dist/src/project/ProjectContainerResolver.js +48 -33
- package/dist/src/project/ProjectContainerResolver.js.map +1 -1
- package/dist/src/project/ProjectGroupState.d.ts +18 -0
- package/dist/src/project/ProjectGroupState.d.ts.map +1 -0
- package/dist/src/project/ProjectGroupState.js +30 -0
- package/dist/src/project/ProjectGroupState.js.map +1 -0
- package/dist/src/project/ProjectInitializer.d.ts +4 -10
- package/dist/src/project/ProjectInitializer.d.ts.map +1 -1
- package/dist/src/project/ProjectInitializer.js +5 -19
- package/dist/src/project/ProjectInitializer.js.map +1 -1
- package/dist/src/project/ProjectSchemaResolver.d.ts +5 -5
- package/dist/src/project/ProjectSchemaResolver.d.ts.map +1 -1
- package/dist/src/project/ProjectSchemaResolver.js +4 -4
- package/dist/src/project/ProjectSchemaResolver.js.map +1 -1
- package/dist/src/start.js +22 -14
- package/dist/src/start.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/cluster.js +1 -1
- package/dist/src/utils/cluster.js.map +1 -1
- package/dist/tests/cases/http.js +12 -11
- package/dist/tests/cases/http.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +21 -21
- package/src/MasterContainer.ts +106 -55
- package/src/bootstrap/Initializer.ts +10 -17
- package/src/config/config.ts +159 -289
- package/src/http/index.ts +0 -1
- package/src/project/ProjectContainerResolver.ts +58 -35
- package/src/project/ProjectGroupState.ts +33 -0
- package/src/project/ProjectInitializer.ts +9 -23
- package/src/project/ProjectSchemaResolver.ts +12 -7
- package/src/start.ts +13 -6
- package/tests/cases/http.ts +7 -2
- package/dist/src/http/RootMiddleware.d.ts +0 -9
- package/dist/src/http/RootMiddleware.d.ts.map +0 -1
- package/dist/src/http/RootMiddleware.js +0 -33
- package/dist/src/http/RootMiddleware.js.map +0 -1
- package/src/http/RootMiddleware.ts +0 -53
package/alpine.dockerfile
CHANGED
|
@@ -2,7 +2,7 @@ FROM node:14-alpine as builder
|
|
|
2
2
|
|
|
3
3
|
WORKDIR /src
|
|
4
4
|
RUN apk --no-cache add bash
|
|
5
|
-
RUN apk --no-cache add --virtual builds-deps build-base
|
|
5
|
+
RUN apk --no-cache add --virtual builds-deps build-base python2
|
|
6
6
|
COPY ./ ./
|
|
7
7
|
RUN /src/packages/engine-server/build.sh
|
|
8
8
|
|
|
@@ -14,7 +14,7 @@ RUN apk --no-cache add curl
|
|
|
14
14
|
COPY --from=builder /src/server/server.js /src/
|
|
15
15
|
COPY --from=builder /src/server/node_modules /src/node_modules
|
|
16
16
|
COPY --from=builder /src/packages/engine-system-api/migrations /src/system-migrations
|
|
17
|
-
COPY --from=builder /src/packages/engine-tenant-api/migrations /src/tenant-migrations
|
|
17
|
+
COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
|
|
18
18
|
COPY --from=builder /src/packages/engine-server/package.json /src/package.json
|
|
19
19
|
COPY --from=builder /src/license.md /src/
|
|
20
20
|
|
package/debian.dockerfile
CHANGED
|
@@ -11,7 +11,7 @@ WORKDIR /src
|
|
|
11
11
|
COPY --from=builder /src/server/server.js /src/
|
|
12
12
|
COPY --from=builder /src/server/node_modules /src/node_modules
|
|
13
13
|
COPY --from=builder /src/packages/engine-system-api/migrations /src/system-migrations
|
|
14
|
-
COPY --from=builder /src/packages/engine-tenant-api/migrations /src/tenant-migrations
|
|
14
|
+
COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
|
|
15
15
|
COPY --from=builder /src/packages/engine-server/package.json /src/package.json
|
|
16
16
|
COPY --from=builder /src/license.md /src/
|
|
17
17
|
|
|
@@ -1,14 +1,17 @@
|
|
|
1
|
+
import { ProjectInitializer as ProjectInitializerInterface } from '@contember/engine-tenant-api';
|
|
1
2
|
import { Config } from './config/config';
|
|
2
3
|
import { ProcessType } from './utils';
|
|
3
4
|
import { Initializer } from './bootstrap';
|
|
4
5
|
import { Plugin } from '@contember/engine-plugins';
|
|
5
|
-
import { Koa, ProjectConfigResolver } from '@contember/engine-http';
|
|
6
|
+
import { Koa, ProjectConfigResolver, Providers } from '@contember/engine-http';
|
|
6
7
|
import { ProjectContainerResolver } from './project';
|
|
7
8
|
export interface MasterContainer {
|
|
8
9
|
initializer: Initializer;
|
|
9
10
|
koa: Koa;
|
|
10
11
|
monitoringKoa: Koa;
|
|
11
12
|
projectContainerResolver: ProjectContainerResolver;
|
|
13
|
+
projectInitializer: ProjectInitializerInterface;
|
|
14
|
+
providers: Providers;
|
|
12
15
|
}
|
|
13
16
|
export interface MasterContainerArgs {
|
|
14
17
|
debugMode: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,IAAI,2BAA2B,EAA0B,MAAM,8BAA8B,CAAA;AAGxH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAA4C,WAAW,EAAE,MAAM,SAAS,CAAA;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAGlD,OAAO,EAWN,GAAG,EAEH,qBAAqB,EAIrB,SAAS,EAKT,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAEN,wBAAwB,EAKxB,MAAM,WAAW,CAAA;AAMlB,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,wBAAwB,EAAE,wBAAwB,CAAA;IAClD,kBAAkB,EAAE,2BAA2B,CAAA;IAC/C,SAAS,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,MAAM,CAAC,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB,GAAG,eAAe;CAsMxC"}
|
|
@@ -7,8 +7,7 @@ exports.MasterContainerFactory = void 0;
|
|
|
7
7
|
const engine_content_api_1 = require("@contember/engine-content-api");
|
|
8
8
|
const engine_system_api_1 = require("@contember/engine-system-api");
|
|
9
9
|
const engine_tenant_api_1 = require("@contember/engine-tenant-api");
|
|
10
|
-
const migrations_1 = __importDefault(require("@contember/engine-
|
|
11
|
-
const migrations_2 = __importDefault(require("@contember/engine-system-api/migrations"));
|
|
10
|
+
const migrations_1 = __importDefault(require("@contember/engine-system-api/migrations"));
|
|
12
11
|
const dic_1 = require("@contember/dic");
|
|
13
12
|
const utils_1 = require("./utils");
|
|
14
13
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
@@ -19,6 +18,8 @@ const engine_http_1 = require("@contember/engine-http");
|
|
|
19
18
|
const prom_client_1 = __importDefault(require("prom-client"));
|
|
20
19
|
const project_1 = require("./project");
|
|
21
20
|
const crypto_1 = require("crypto");
|
|
21
|
+
const koa_compress_1 = __importDefault(require("koa-compress"));
|
|
22
|
+
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
22
23
|
class MasterContainerFactory {
|
|
23
24
|
create({ config, debugMode, plugins, projectConfigResolver, processType, version, }) {
|
|
24
25
|
const masterContainer = new dic_1.Builder({})
|
|
@@ -28,13 +29,13 @@ class MasterContainerFactory {
|
|
|
28
29
|
.addService('version', () => version)
|
|
29
30
|
.addService('projectConfigResolver', () => projectConfigResolver)
|
|
30
31
|
.addService('plugins', () => plugins)
|
|
31
|
-
.addService('tenantContainerFactory', ({ config }) => new engine_tenant_api_1.TenantContainerFactory(config.tenant.db, config.tenant.mailer))
|
|
32
|
+
.addService('tenantContainerFactory', ({ config }) => new engine_tenant_api_1.TenantContainerFactory(config.tenant.db, config.tenant.mailer, config.tenant.credentials))
|
|
32
33
|
.addService('systemContainerFactory', () => new engine_system_api_1.SystemContainerFactory())
|
|
33
34
|
.addService('providers', ({ config }) => {
|
|
34
|
-
const encryptionKey = config.tenant.secrets
|
|
35
|
-
? crypto_1.createSecretKey(Buffer.from(config.tenant.secrets.encryptionKey, 'hex'))
|
|
35
|
+
const encryptionKey = config.tenant.secrets.encryptionKey
|
|
36
|
+
? (0, crypto_1.createSecretKey)(Buffer.from(config.tenant.secrets.encryptionKey, 'hex'))
|
|
36
37
|
: undefined;
|
|
37
|
-
return engine_http_1.createProviders({ encryptionKey });
|
|
38
|
+
return (0, engine_http_1.createProviders)({ encryptionKey });
|
|
38
39
|
})
|
|
39
40
|
.addService('projectSchemaResolver', () => new project_1.ProjectSchemaResolverProxy())
|
|
40
41
|
.addService('projectInitializer', () => new project_1.ProjectInitializerProxy())
|
|
@@ -46,7 +47,7 @@ class MasterContainerFactory {
|
|
|
46
47
|
.addService('modificationHandlerFactory', () => new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap))
|
|
47
48
|
.addService('permissionsByIdentityFactory', ({}) => new engine_content_api_1.PermissionsByIdentityFactory())
|
|
48
49
|
.addService('entitiesSelector', ({ permissionsByIdentityFactory, providers }) => {
|
|
49
|
-
const mapperFactory = (db, schema, identityVariables, permissions) => engine_content_api_1.createMapperContainer({
|
|
50
|
+
const mapperFactory = (db, schema, identityVariables, permissions) => (0, engine_content_api_1.createMapperContainer)({
|
|
50
51
|
schema,
|
|
51
52
|
identityVariables,
|
|
52
53
|
permissions,
|
|
@@ -54,21 +55,18 @@ class MasterContainerFactory {
|
|
|
54
55
|
}).mapperFactory(db);
|
|
55
56
|
return new engine_content_api_1.EntitiesSelector(mapperFactory, permissionsByIdentityFactory);
|
|
56
57
|
})
|
|
57
|
-
.addService('
|
|
58
|
-
.addService('
|
|
59
|
-
.addService('systemDbMigrationsRunnerFactory', () => (db, dbClient) => new database_migrations_1.MigrationsRunner(db, 'system', migrations_2.default, dbClient))
|
|
60
|
-
.addService('systemContainer', ({ systemContainerFactory, entitiesSelector, eventApplier, identityFetcher, modificationHandlerFactory, providers, systemDbMigrationsRunnerFactory }) => systemContainerFactory.create({
|
|
58
|
+
.addService('systemDbMigrationsRunnerFactory', () => (db, dbClient) => new database_migrations_1.MigrationsRunner(db, 'system', migrations_1.default, dbClient))
|
|
59
|
+
.addService('systemContainer', ({ systemContainerFactory, entitiesSelector, modificationHandlerFactory, providers, systemDbMigrationsRunnerFactory, tenantContainer }) => systemContainerFactory.create({
|
|
61
60
|
entitiesSelector,
|
|
62
|
-
eventApplier,
|
|
63
|
-
identityFetcher,
|
|
64
61
|
modificationHandlerFactory,
|
|
65
62
|
providers,
|
|
66
63
|
systemDbMigrationsRunnerFactory,
|
|
64
|
+
identityFetcher: tenantContainer.identityFetcher,
|
|
67
65
|
}))
|
|
68
66
|
.addService('schemaVersionBuilder', ({ systemContainer }) => systemContainer.schemaVersionBuilder)
|
|
69
67
|
.addService('projectContainerFactory', ({ debugMode, plugins, schemaVersionBuilder, providers }) => new project_1.ProjectContainerFactory(debugMode, plugins, schemaVersionBuilder, providers))
|
|
70
68
|
.addService('tenantProjectManager', ({ tenantContainer }) => tenantContainer.projectManager)
|
|
71
|
-
.addService('projectContainerResolver', ({ tenantProjectManager, projectContainerFactory, projectConfigResolver }) => new project_1.ProjectContainerResolver(projectContainerFactory, projectConfigResolver, tenantProjectManager))
|
|
69
|
+
.addService('projectContainerResolver', ({ tenantProjectManager, projectContainerFactory, projectConfigResolver, systemContainer }) => new project_1.ProjectContainerResolver(projectContainerFactory, projectConfigResolver, tenantProjectManager, systemContainer.projectInitializer))
|
|
72
70
|
.addService('tenantGraphQlMiddlewareFactory', ({ tenantContainer }) => new engine_http_1.TenantGraphQLMiddlewareFactory(tenantContainer.resolvers, tenantContainer.resolverContextFactory, utils_1.logSentryError))
|
|
73
71
|
.addService('systemGraphQLMiddlewareFactory', ({ systemContainer, debugMode }) => new engine_http_1.SystemGraphQLMiddlewareFactory(systemContainer.systemResolversFactory, systemContainer.resolverContextFactory, utils_1.logSentryError, debugMode))
|
|
74
72
|
.addService('promRegistry', ({ projectContainerResolver, processType, tenantContainer }) => {
|
|
@@ -79,7 +77,7 @@ class MasterContainerFactory {
|
|
|
79
77
|
}
|
|
80
78
|
const register = prom_client_1.default.register;
|
|
81
79
|
prom_client_1.default.collectDefaultMetrics({ register });
|
|
82
|
-
const registrar = utils_1.createDbMetricsRegistrar(register);
|
|
80
|
+
const registrar = (0, utils_1.createDbMetricsRegistrar)(register);
|
|
83
81
|
registrar({ connection: tenantContainer.connection, module: 'tenant', project: 'unknown' });
|
|
84
82
|
projectContainerResolver.onCreate.push(container => registrar({
|
|
85
83
|
connection: container.connection,
|
|
@@ -88,33 +86,64 @@ class MasterContainerFactory {
|
|
|
88
86
|
}));
|
|
89
87
|
return register;
|
|
90
88
|
})
|
|
91
|
-
.addService('
|
|
89
|
+
.addService('httpErrorFactory', ({ debugMode }) => new engine_http_1.ErrorFactory(debugMode))
|
|
90
|
+
.addService('authMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) => new engine_http_1.AuthMiddlewareFactory(tenantContainer.apiKeyManager, httpErrorFactory))
|
|
91
|
+
.addService('projectGroupMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) => { var _a; return new engine_http_1.ProjectGroupMiddlewareFactory((_a = config.server.projectGroup) === null || _a === void 0 ? void 0 : _a.domainMapping, tenantContainer.projectGroupProvider, httpErrorFactory); })
|
|
92
|
+
.addService('projectResolverMiddlewareFactory', ({ projectContainerResolver, httpErrorFactory }) => new engine_http_1.ProjectResolveMiddlewareFactory(projectContainerResolver, httpErrorFactory))
|
|
93
|
+
.addService('apiMiddlewareFactory', ({ projectGroupMiddlewareFactory, authMiddlewareFactory }) => new engine_http_1.ApiMiddlewareFactory(projectGroupMiddlewareFactory, authMiddlewareFactory))
|
|
94
|
+
.addService('stageResolveMiddlewareFactory', ({ httpErrorFactory }) => new engine_http_1.StageResolveMiddlewareFactory(httpErrorFactory))
|
|
95
|
+
.addService('notModifiedMiddlewareFactory', () => new engine_http_1.NotModifiedMiddlewareFactory())
|
|
96
|
+
.addService('projectMemberMiddlewareFactory', ({ debugMode, tenantContainer, httpErrorFactory }) => new engine_http_1.ProjectMemberMiddlewareFactory(debugMode, tenantContainer.projectMemberManager, httpErrorFactory))
|
|
97
|
+
.addService('contentServerMiddlewareFactory', () => new engine_http_1.ContentServerMiddlewareFactory())
|
|
98
|
+
.addService('koa', ({ tenantGraphQlMiddlewareFactory, systemGraphQLMiddlewareFactory, apiMiddlewareFactory, projectResolverMiddlewareFactory, stageResolveMiddlewareFactory, notModifiedMiddlewareFactory, projectMemberMiddlewareFactory, contentServerMiddlewareFactory, promRegistry, debugMode, version, config, }) => {
|
|
92
99
|
const app = new engine_http_1.Koa();
|
|
93
|
-
app.use(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
app.use((0, engine_http_1.compose)([
|
|
101
|
+
(0, koa_compress_1.default)({
|
|
102
|
+
br: false,
|
|
103
|
+
}),
|
|
104
|
+
(0, koa_bodyparser_1.default)({
|
|
105
|
+
jsonLimit: config.server.http.requestBodySize || '1mb',
|
|
106
|
+
}),
|
|
107
|
+
(0, engine_http_1.createPoweredByHeaderMiddleware)(debugMode, version !== null && version !== void 0 ? version : 'unknown'),
|
|
108
|
+
(0, http_1.createColllectHttpMetricsMiddleware)(promRegistry),
|
|
109
|
+
(0, engine_http_1.createTimerMiddleware)(),
|
|
110
|
+
(0, engine_http_1.route)('/playground$', (0, engine_http_1.createPlaygroundMiddleware)()),
|
|
111
|
+
(0, engine_http_1.createHomepageMiddleware)(),
|
|
112
|
+
(0, engine_http_1.route)('/content/:projectSlug/:stageSlug$', (0, engine_http_1.compose)([
|
|
113
|
+
apiMiddlewareFactory.create('content'),
|
|
114
|
+
projectResolverMiddlewareFactory.create(),
|
|
115
|
+
stageResolveMiddlewareFactory.create(),
|
|
116
|
+
notModifiedMiddlewareFactory.create(),
|
|
117
|
+
projectMemberMiddlewareFactory.create(),
|
|
118
|
+
contentServerMiddlewareFactory.create(),
|
|
119
|
+
])),
|
|
120
|
+
(0, engine_http_1.route)('/tenant$', (0, engine_http_1.compose)([
|
|
121
|
+
apiMiddlewareFactory.create('tenant'),
|
|
122
|
+
tenantGraphQlMiddlewareFactory.create(),
|
|
123
|
+
])),
|
|
124
|
+
(0, engine_http_1.route)('/system/:projectSlug$', (0, engine_http_1.compose)([
|
|
125
|
+
apiMiddlewareFactory.create('system'),
|
|
126
|
+
projectResolverMiddlewareFactory.create(),
|
|
127
|
+
projectMemberMiddlewareFactory.create(),
|
|
128
|
+
systemGraphQLMiddlewareFactory.create(),
|
|
129
|
+
])),
|
|
130
|
+
]));
|
|
101
131
|
return app;
|
|
102
132
|
})
|
|
103
133
|
.addService('monitoringKoa', ({ promRegistry }) => {
|
|
104
134
|
const app = new engine_http_1.Koa();
|
|
105
|
-
app.use(http_1.createShowMetricsMiddleware(promRegistry));
|
|
135
|
+
app.use((0, http_1.createShowMetricsMiddleware)(promRegistry));
|
|
106
136
|
return app;
|
|
107
137
|
})
|
|
108
|
-
.addService('
|
|
109
|
-
.addService('initializer', ({ tenantMigrationsRunner, tenantContainer, systemContainer, projectContainerResolver, config, providers }) => new bootstrap_1.Initializer(tenantMigrationsRunner, tenantContainer.projectManager, systemContainer.projectInitializer, projectContainerResolver, config.tenant.credentials, providers))
|
|
138
|
+
.addService('initializer', ({ tenantContainer, systemContainer, projectContainerResolver }) => new bootstrap_1.Initializer(tenantContainer.migrationsRunnerFactory, tenantContainer.projectManager, systemContainer.projectInitializer, projectContainerResolver, tenantContainer.projectGroupProvider))
|
|
110
139
|
.setupService('projectSchemaResolver', (it, { projectContainerResolver, schemaVersionBuilder }) => {
|
|
111
|
-
it.setResolver(new project_1.ProjectSchemaResolver(projectContainerResolver
|
|
140
|
+
it.setResolver(new project_1.ProjectSchemaResolver(projectContainerResolver, schemaVersionBuilder));
|
|
112
141
|
})
|
|
113
|
-
.setupService('projectInitializer', (it, { projectContainerResolver
|
|
114
|
-
it.setInitializer(new project_1.ProjectInitializer(projectContainerResolver
|
|
142
|
+
.setupService('projectInitializer', (it, { projectContainerResolver }) => {
|
|
143
|
+
it.setInitializer(new project_1.ProjectInitializer(projectContainerResolver));
|
|
115
144
|
})
|
|
116
145
|
.build();
|
|
117
|
-
return masterContainer.pick('initializer', 'koa', 'monitoringKoa', 'projectContainerResolver');
|
|
146
|
+
return masterContainer.pick('initializer', 'koa', 'monitoringKoa', 'projectContainerResolver', 'projectInitializer', 'providers');
|
|
118
147
|
}
|
|
119
148
|
}
|
|
120
149
|
exports.MasterContainerFactory = MasterContainerFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MasterContainer.js","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { MigrationsRunner } from '@contember/database-migrations';
|
|
1
|
+
import { MigrationsRunnerFactory, ProjectGroupProvider, ProjectManager } from '@contember/engine-tenant-api';
|
|
3
2
|
import { ProjectInitializer } from '@contember/engine-system-api';
|
|
4
3
|
import { ProjectContainerResolver } from '../project';
|
|
5
4
|
import { ProjectConfig } from '@contember/engine-http';
|
|
6
5
|
import { Migration } from '@contember/schema-migrations';
|
|
7
6
|
export declare class Initializer {
|
|
8
|
-
private readonly
|
|
7
|
+
private readonly tenantDbMigrationsRunnerFactory;
|
|
9
8
|
private readonly projectManager;
|
|
10
9
|
private readonly projectInitializer;
|
|
11
10
|
private readonly projectContainerResolver;
|
|
12
|
-
private readonly
|
|
13
|
-
|
|
14
|
-
constructor(tenantDbMigrationsRunner: MigrationsRunner, projectManager: ProjectManager, projectInitializer: ProjectInitializer, projectContainerResolver: ProjectContainerResolver, tenantCredentials: TenantCredentials, providers: TenantProviders);
|
|
11
|
+
private readonly projectGroupProvider;
|
|
12
|
+
constructor(tenantDbMigrationsRunnerFactory: MigrationsRunnerFactory, projectManager: ProjectManager, projectInitializer: ProjectInitializer, projectContainerResolver: ProjectContainerResolver, projectGroupProvider: ProjectGroupProvider);
|
|
15
13
|
initialize(): Promise<string[]>;
|
|
16
14
|
createProject(project: ProjectConfig, migrations: Migration[]): Promise<void>;
|
|
17
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAExD,qBAAa,WAAW;IAEtB,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAJpB,+BAA+B,EAAE,uBAAuB,EACxD,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,kBAAkB,EACtC,wBAAwB,EAAE,wBAAwB,EAClD,oBAAoB,EAAE,oBAAoB;IAG/C,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAsB/B,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB1F"}
|
|
@@ -3,25 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Initializer = void 0;
|
|
4
4
|
const engine_common_1 = require("@contember/engine-common");
|
|
5
5
|
class Initializer {
|
|
6
|
-
constructor(
|
|
7
|
-
this.
|
|
6
|
+
constructor(tenantDbMigrationsRunnerFactory, projectManager, projectInitializer, projectContainerResolver, projectGroupProvider) {
|
|
7
|
+
this.tenantDbMigrationsRunnerFactory = tenantDbMigrationsRunnerFactory;
|
|
8
8
|
this.projectManager = projectManager;
|
|
9
9
|
this.projectInitializer = projectInitializer;
|
|
10
10
|
this.projectContainerResolver = projectContainerResolver;
|
|
11
|
-
this.
|
|
12
|
-
this.providers = providers;
|
|
11
|
+
this.projectGroupProvider = projectGroupProvider;
|
|
13
12
|
}
|
|
14
13
|
async initialize() {
|
|
15
14
|
// eslint-disable-next-line no-console
|
|
16
15
|
const logger = new engine_common_1.Logger(console.log);
|
|
17
16
|
logger.group('\nInitializing tenant database');
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
providers: this.providers,
|
|
21
|
-
});
|
|
17
|
+
// todo
|
|
18
|
+
await this.tenantDbMigrationsRunnerFactory.create('tenant').run(logger.write.bind(logger));
|
|
22
19
|
logger.groupEnd();
|
|
23
20
|
const projects = [];
|
|
24
|
-
|
|
21
|
+
const group = await this.projectGroupProvider.getGroup(undefined);
|
|
22
|
+
for (const container of await this.projectContainerResolver.getAllProjectContainers(group)) {
|
|
25
23
|
const project = container.project;
|
|
26
24
|
projects.push(project.slug);
|
|
27
25
|
logger.group(`\nUpdating project ${project.slug}`);
|
|
@@ -34,11 +32,12 @@ class Initializer {
|
|
|
34
32
|
}
|
|
35
33
|
async createProject(project, migrations) {
|
|
36
34
|
const { slug, name, ...config } = project;
|
|
37
|
-
const
|
|
35
|
+
const group = await this.projectGroupProvider.getGroup(undefined);
|
|
36
|
+
const result = await this.projectManager.createProject(group, { slug, name, config, secrets: {} }, undefined);
|
|
38
37
|
if (!result) {
|
|
39
38
|
throw new Error('Project already exists');
|
|
40
39
|
}
|
|
41
|
-
const container = await this.projectContainerResolver.getProjectContainer(project.slug);
|
|
40
|
+
const container = await this.projectContainerResolver.getProjectContainer(group, project.slug);
|
|
42
41
|
if (!container) {
|
|
43
42
|
throw new Error('Should not happen');
|
|
44
43
|
}
|
|
@@ -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,4DAAiD;AAKjD,MAAa,WAAW;IACvB,YACkB,+BAAwD,EACxD,cAA8B,EAC9B,kBAAsC,EACtC,wBAAkD,EAClD,oBAA0C;QAJ1C,oCAA+B,GAA/B,+BAA+B,CAAyB;QACxD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,OAAO;QACP,MAAM,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1F,MAAM,CAAC,QAAQ,EAAE,CAAA;QAEjB,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACjE,KAAK,MAAM,SAAS,IAAI,MAAM,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE;YAC3F,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;YACjC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YAClD,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACjG,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,QAAQ,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAsB,EAAE,UAAuB;QACzE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAA;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;QAC7G,IAAI,CAAC,MAAM,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SACzC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAC9F,IAAI,CAAC,SAAS,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACpC;QACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CACvC,SAAS,CAAC,4BAA4B,EACtC,OAAO,EACP,IAAI,sBAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EACtB,UAAU,CACV,CAAA;IACF,CAAC;CACD;AAjDD,kCAiDC"}
|
|
@@ -1,31 +1,51 @@
|
|
|
1
|
-
import { DatabaseCredentials } from '@contember/database';
|
|
2
|
-
import { MailerOptions, TenantCredentials } from '@contember/engine-tenant-api';
|
|
3
1
|
import { ConfigProcessor } from '@contember/engine-plugins';
|
|
2
|
+
import { Typesafe } from '@contember/engine-common';
|
|
4
3
|
import { ProjectConfigResolver } from '@contember/engine-http';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
4
|
+
import { MailerOptions } from '@contember/engine-tenant-api';
|
|
5
|
+
export declare type Config = ReturnType<typeof configSchema>;
|
|
6
|
+
export declare type TenantConfig = Config['tenant'];
|
|
7
|
+
declare const configSchema: Typesafe.Type<{
|
|
8
|
+
readonly tenant: {
|
|
9
|
+
readonly db: {
|
|
10
|
+
readonly host: string;
|
|
11
|
+
readonly port: number;
|
|
12
|
+
readonly user: string;
|
|
13
|
+
readonly password: string;
|
|
14
|
+
readonly database: string;
|
|
15
|
+
} & {
|
|
16
|
+
readonly ssl?: boolean | undefined;
|
|
17
|
+
};
|
|
18
|
+
readonly mailer: MailerOptions;
|
|
19
|
+
readonly credentials: {
|
|
20
|
+
readonly rootToken?: string | undefined;
|
|
21
|
+
readonly rootTokenHash?: string | undefined;
|
|
22
|
+
readonly rootPassword?: string | undefined;
|
|
23
|
+
readonly rootEmail?: string | undefined;
|
|
24
|
+
readonly loginToken?: string | undefined;
|
|
25
|
+
};
|
|
26
|
+
} & {
|
|
27
|
+
readonly secrets: {
|
|
28
|
+
readonly encryptionKey?: string | undefined;
|
|
29
|
+
};
|
|
11
30
|
};
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
monitoringPort: number;
|
|
18
|
-
workerCount?: number | string;
|
|
19
|
-
http: {
|
|
20
|
-
requestBodySize?: string;
|
|
31
|
+
readonly server: {
|
|
32
|
+
readonly port: number;
|
|
33
|
+
readonly monitoringPort: number;
|
|
34
|
+
readonly http: {
|
|
35
|
+
readonly requestBodySize?: string | undefined;
|
|
21
36
|
};
|
|
22
|
-
logging: {
|
|
23
|
-
sentry?: {
|
|
24
|
-
dsn: string;
|
|
25
|
-
};
|
|
37
|
+
readonly logging: {} | {
|
|
38
|
+
readonly sentry?: {
|
|
39
|
+
readonly dsn: string;
|
|
40
|
+
} | undefined;
|
|
26
41
|
};
|
|
42
|
+
} & {
|
|
43
|
+
readonly workerCount?: string | number | undefined;
|
|
44
|
+
readonly projectGroup?: {
|
|
45
|
+
readonly domainMapping: string;
|
|
46
|
+
} | undefined;
|
|
27
47
|
};
|
|
28
|
-
}
|
|
48
|
+
}>;
|
|
29
49
|
export declare type ConfigSource = {
|
|
30
50
|
data: string;
|
|
31
51
|
type: 'file' | 'json' | 'yaml';
|
|
@@ -34,4 +54,5 @@ export declare function readConfig(configSources: ConfigSource[], configProcesso
|
|
|
34
54
|
config: Config;
|
|
35
55
|
projectConfigResolver: ProjectConfigResolver;
|
|
36
56
|
}>;
|
|
57
|
+
export {};
|
|
37
58
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE5D,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AACpD,oBAAY,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;AAoE3C,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhB,CAAA;AAqFF,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE3E,wBAAsB,UAAU,CAC/B,aAAa,EAAE,YAAY,EAAE,EAC7B,gBAAgB,GAAE,eAAe,EAAO,GACtC,OAAO,CAAC;IACV,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,qBAAqB,CAAA;CAC5C,CAAC,CAqFD"}
|