@contember/engine-server 1.1.0-rc.0 → 1.2.0-alpha.1

package/tests/e2e/requests.ts

@@ -0,0 +1,71 @@
+import { executeGraphql, gql, loginToken } from './tester'
+import { assert } from 'vitest'
+
+export const signIn = async (email: string, password = '123456'): Promise<string> => {
+	const response = await executeGraphql(
+		'/tenant',
+		gql`
+			mutation ($email: String!, $password: String!) {
+				signIn(email: $email, password: $password) {
+					ok
+					result {
+						token
+					}
+				}
+			}
+		`,
+		{
+			variables: { email, password },
+			authorizationToken: loginToken,
+		},
+	).expect(200)
+
+	return response.body.data.signIn.result.token
+}
+
+
+export const signUp = async (email: string, password = '123456') => {
+	const signUpResponse = await executeGraphql(
+		'/tenant',
+		gql`
+			mutation($email: String!, $password: String!) {
+				signUp(email: $email, password: $password) {
+					ok
+					result {
+						person {
+							identity {
+								id
+							}
+						}
+					}
+				}
+			}
+		`,
+		{
+			variables: { email, password },
+		},
+	).expect(200)
+
+	return signUpResponse.body.data.signUp.result.person.identity.id
+}
+
+
+export const addProjectMember = async (identityId: string, projectSlug: string, role = 'admin') => {
+	await executeGraphql(
+		'/tenant',
+		gql`
+			mutation ($identity: String!, $projectSlug: String!, $role: String!) {
+				addProjectMember(identityId: $identity, projectSlug: $projectSlug, memberships: [{ role: $role, variables: [] }]) {
+					ok
+				}
+			}
+		`,
+		{
+			variables: { identity: identityId, projectSlug, role },
+		},
+	)
+		.expect(200)
+		.expect(response => {
+			assert.deepStrictEqual(response.body.data, { addProjectMember: { ok: true } })
+		})
+}

package/tests/e2e/tester.ts

@@ -0,0 +1,118 @@
+import nodeAssert from 'assert'
+import supertest from 'supertest'
+import { Schema } from '@contember/schema'
+import {
+	Migration,
+	MigrationVersionHelper,
+	ModificationHandlerFactory,
+	SchemaDiffer,
+	SchemaMigrator, VERSION_LATEST,
+} from '@contember/schema-migrations'
+import { emptySchema } from '@contember/schema-utils'
+import { assert } from 'vitest'
+
+
+export const rootToken = String(process.env.CONTEMBER_ROOT_TOKEN)
+export const loginToken = String(process.env.CONTEMBER_LOGIN_TOKEN)
+export const apiUrl = String(process.env.CONTEMBER_API_URL)
+
+// Used to allow prettier formatting of GraphQL queries
+export const gql = (strings: TemplateStringsArray) => {
+	nodeAssert.strictEqual(strings.length, 1)
+	return strings[0]
+}
+
+
+export const executeGraphql = (
+	path: string,
+	query: string,
+	options: { authorizationToken?: string; variables?: Record<string, any> },
+) => {
+	return supertest(apiUrl)
+		.post(path)
+		.set('Authorization', 'Bearer ' + (options.authorizationToken || rootToken))
+		.send({
+			query,
+			variables: options.variables || {},
+		})
+}
+
+
+const createMigrations = (schema: Schema) => {
+	const modificationHandlerFactory = new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap)
+	const differ = new SchemaDiffer(new SchemaMigrator(modificationHandlerFactory))
+	return differ.diffSchemas(emptySchema, schema)
+}
+
+const createProject = async (slug: string) => {
+	await executeGraphql(
+		'/tenant',
+		gql`
+		mutation($projectSlug: String!, $config: Json!) {
+			createProject(projectSlug: $projectSlug, config: $config) {
+				ok
+				error { code }
+			}
+		}
+	`,
+		{
+			variables: {
+				projectSlug: slug,
+				config: {},
+			},
+		})
+		.expect(response => {
+			assert.isOk(response.body)
+			assert.isOk(response.body.data)
+			assert.isOk(response.body.data.createProject)
+			assert.isOk(response.body.data.createProject.ok)
+		})
+		.expect(200)
+}
+
+const executeMigrations = async (projectSlug: string, modifications: Migration.Modification[]) => {
+	const [version, fullName] = MigrationVersionHelper.createVersion('test')
+	await executeGraphql(
+		'/system/' + projectSlug,
+		gql`
+		mutation($migrations: [Migration!]!) {
+			migrate(migrations: $migrations) {
+				ok
+				error { code }
+			}
+		}
+	`,
+		{
+			variables: {
+				migrations: [{
+					formatVersion: VERSION_LATEST,
+					modifications,
+					version,
+					name: fullName,
+				}],
+			},
+		})
+		.expect(response => {
+			assert.deepStrictEqual(response.body.data, {
+				migrate: {
+					error: null,
+					ok: true,
+				},
+			})
+		})
+}
+
+export const createTester = async (schema: Schema) => {
+	const projectSlug = 'test_' + Date.now()
+	await createProject(projectSlug)
+	const migrations = createMigrations(schema)
+	await executeMigrations(projectSlug, migrations)
+
+	const queryCb = (
+		query: string,
+		options: { path?: string; authorizationToken?: string; variables?: Record<string, any> } = {}) => {
+		return executeGraphql(options.path ?? '/content/' + projectSlug + '/live', query, options)
+	}
+	queryCb.projectSlug = projectSlug
+	return queryCb
+}

package/alpine.dockerfile

@@ -1,30 +0,0 @@
-FROM node:14-alpine as builder
-
-WORKDIR /src
-RUN apk --no-cache add bash
-RUN apk --no-cache add --virtual builds-deps build-base python2
-COPY ./ ./
-
-RUN test ! -f yarn.tar.gz || tar xf yarn.tar.gz -C "$(yarn cache dir)" .
-RUN /src/packages/engine-server/build.sh
-
-FROM node:14-alpine
-
-WORKDIR /src
-RUN apk --no-cache add curl
-
-COPY --from=builder /src/server/server.js /src/
-COPY --from=builder /src/server/node_modules /src/node_modules
-COPY --from=builder /src/packages/engine-system-api/src/migrations /src/system-migrations
-COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
-COPY --from=builder /src/packages/engine-server/package.json /src/package.json
-COPY --from=builder /src/license.md /src/
-
-ENV NODE_ENV "production"
-ENV CONTEMBER_PORT 4000
-ENV CONTEMBER_MONITORING_PORT 4001
-ENV CONTEMBER_TENANT_MIGRATIONS_DIR /src/tenant-migrations
-ENV CONTEMBER_SYSTEM_MIGRATIONS_DIR /src/system-migrations
-ENV CONTEMBER_PACKAGE_JSON /src/package.json
-
-CMD ["node", "./server.js"]

package/debian.dockerfile

@@ -1,27 +0,0 @@
-FROM node:14 as builder
-
-WORKDIR /src
-COPY ./ ./
-
-RUN test ! -f yarn.tar.gz || tar xf yarn.tar.gz -C "$(yarn cache dir)" .
-RUN /src/packages/engine-server/build.sh
-
-FROM node:14
-
-WORKDIR /src
-
-COPY --from=builder /src/server/server.js /src/
-COPY --from=builder /src/server/node_modules /src/node_modules
-COPY --from=builder /src/packages/engine-system-api/src/migrations /src/system-migrations
-COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
-COPY --from=builder /src/packages/engine-server/package.json /src/package.json
-COPY --from=builder /src/license.md /src/
-
-ENV NODE_ENV "production"
-ENV CONTEMBER_PORT 4000
-ENV CONTEMBER_MONITORING_PORT 4001
-ENV CONTEMBER_TENANT_MIGRATIONS_DIR /src/tenant-migrations
-ENV CONTEMBER_SYSTEM_MIGRATIONS_DIR /src/system-migrations
-ENV CONTEMBER_PACKAGE_JSON /src/package.json
-
-CMD ["node", "./server.js"]

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

@@ -1,5 +0,0 @@
-import { KoaMiddleware, ModuleInfoMiddlewareState, ProjectInfoMiddlewareState } from '@contember/engine-http';
-import prom from 'prom-client';
-import { GraphQLKoaState } from '@contember/engine-http';
-export declare const createColllectHttpMetricsMiddleware: (registry: prom.Registry) => KoaMiddleware<Partial<ProjectInfoMiddlewareState & ModuleInfoMiddlewareState & GraphQLKoaState>>;
-//# sourceMappingURL=CollectHttpMetricsMiddelware.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CollectHttpMetricsMiddelware.d.ts","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAC7G,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,eAAO,MAAM,mCAAmC,aACrC,KAAK,QAAQ,KACrB,cAAc,QAAQ,0BAA0B,GAAG,yBAAyB,GAAG,eAAe,CAAC,CAyBjG,CAAA"}

package/dist/src/http/CollectHttpMetricsMiddelware.js

@@ -1,36 +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.createColllectHttpMetricsMiddleware = void 0;
-const prom_client_1 = __importDefault(require("prom-client"));
-const createColllectHttpMetricsMiddleware = (registry) => {
-    const requestSummary = new prom_client_1.default.Histogram({
-        name: 'contember_http_duration_seconds',
-        help: 'Incoming HTTP requests statistics by http_method (OPTIONS requests are ignored), http_code, contember_project (or "unknown" for undefined project), contember_project_group (or "unknown" for undefined project group), contember_module (system, tenant, content, unknown) and graphql_operation (query, mutation, unknown)',
-        registers: [registry],
-        labelNames: ['http_method', 'http_code', 'contember_project', 'contember_project_group', 'contember_module', 'graphql_operation'],
-        buckets: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10],
-    });
-    return async (ctx, next) => {
-        var _a;
-        const end = ctx.method === 'OPTIONS' ? () => null : requestSummary.startTimer();
-        try {
-            await next();
-        }
-        finally {
-            const labels = {
-                http_method: ctx.method,
-                http_code: ctx.status,
-                contember_project: ctx.state.project || 'unknown',
-                contember_project_group: ctx.state.projectGroup || 'unknown',
-                contember_module: ctx.state.module || 'unknown',
-                graphql_operation: ((_a = ctx.state.graphql) === null || _a === void 0 ? void 0 : _a.operationName) || 'unknown',
-            };
-            end(labels);
-        }
-    };
-};
-exports.createColllectHttpMetricsMiddleware = createColllectHttpMetricsMiddleware;
-//# sourceMappingURL=CollectHttpMetricsMiddelware.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CollectHttpMetricsMiddelware.js","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":";;;;;;AACA,8DAA8B;AAGvB,MAAM,mCAAmC,GAAG,CAClD,QAAuB,EAC4E,EAAE;IACrG,MAAM,cAAc,GAAG,IAAI,qBAAI,CAAC,SAAS,CAAC;QACzC,IAAI,EAAE,iCAAiC;QACvC,IAAI,EAAE,8TAA8T;QACpU,SAAS,EAAE,CAAC,QAAQ,CAAC;QACrB,UAAU,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,mBAAmB,CAAC;QACjI,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;KAClE,CAAC,CAAA;IAEF,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;QAC/E,IAAI;YACH,MAAM,IAAI,EAAE,CAAA;SACZ;gBAAS;YACT,MAAM,MAAM,GAAG;gBACd,WAAW,EAAE,GAAG,CAAC,MAAM;gBACvB,SAAS,EAAE,GAAG,CAAC,MAAM;gBACrB,iBAAiB,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS;gBACjD,uBAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS;gBAC5D,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS;gBAC/C,iBAAiB,EAAE,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,OAAO,0CAAE,aAAa,KAAI,SAAS;aAChE,CAAA;YACD,GAAG,CAAC,MAAM,CAAC,CAAA;SACX;IACF,CAAC,CAAA;AACF,CAAC,CAAA;AA3BY,QAAA,mCAAmC,uCA2B/C"}

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

@@ -1,4 +0,0 @@
-import { KoaMiddleware } from '@contember/engine-http';
-import prom from 'prom-client';
-export declare const createShowMetricsMiddleware: (registry: prom.Registry) => KoaMiddleware<any>;
-//# sourceMappingURL=ShowMetricsMiddleware.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ShowMetricsMiddleware.d.ts","sourceRoot":"","sources":["../../../src/http/ShowMetricsMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,wBAAwB,CAAA;AAC7D,OAAO,IAAI,MAAM,aAAa,CAAA;AAE9B,eAAO,MAAM,2BAA2B,aAAc,KAAK,QAAQ,KAAG,cAAc,GAAG,CAQtF,CAAA"}

package/dist/src/http/ShowMetricsMiddleware.js

@@ -1,20 +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.createShowMetricsMiddleware = void 0;
-const engine_http_1 = require("@contember/engine-http");
-const prom_client_1 = __importDefault(require("prom-client"));
-const createShowMetricsMiddleware = (registry) => {
-    return (0, engine_http_1.route)('/metrics', async (ctx) => {
-        if (registry instanceof prom_client_1.default.AggregatorRegistry) {
-            ctx.body = await registry.clusterMetrics();
-        }
-        else {
-            ctx.body = registry.metrics();
-        }
-    });
-};
-exports.createShowMetricsMiddleware = createShowMetricsMiddleware;
-//# sourceMappingURL=ShowMetricsMiddleware.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ShowMetricsMiddleware.js","sourceRoot":"","sources":["../../../src/http/ShowMetricsMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA6D;AAC7D,8DAA8B;AAEvB,MAAM,2BAA2B,GAAG,CAAC,QAAuB,EAAsB,EAAE;IAC1F,OAAO,IAAA,mBAAK,EAAC,UAAU,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;QACpC,IAAI,QAAQ,YAAY,qBAAI,CAAC,kBAAkB,EAAE;YAChD,GAAG,CAAC,IAAI,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAA;SAC1C;aAAM;YACN,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;SAC7B;IACF,CAAC,CAAC,CAAA;AACH,CAAC,CAAA;AARY,QAAA,2BAA2B,+BAQvC"}

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

@@ -1,3 +0,0 @@
-export * from './CollectHttpMetricsMiddelware';
-export * from './ShowMetricsMiddleware';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAA;AAC9C,cAAc,yBAAyB,CAAA"}

package/dist/src/http/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CollectHttpMetricsMiddelware"), exports);
-__exportStar(require("./ShowMetricsMiddleware"), exports);
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA8C;AAC9C,0DAAuC"}

package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts

@@ -1,12 +0,0 @@
-import { TenantConfigResolver } from '../config/tenantConfigResolver';
-import { ProjectGroupContainer, ProjectGroupContainerResolver as ProjectGroupContainerResolverInterface } from '@contember/engine-http';
-import { ProjectGroupContainerFactory } from './ProjectGroupContainer';
-export declare class ProjectGroupContainerResolver implements ProjectGroupContainerResolverInterface {
-    private readonly configResolver;
-    private readonly containerFactory;
-    private containers;
-    readonly onCreate: ((container: ProjectGroupContainer, slug: string | undefined) => void | (() => void))[];
-    constructor(configResolver: TenantConfigResolver, containerFactory: ProjectGroupContainerFactory);
-    getProjectGroupContainer(slug: string | undefined, config?: any): Promise<ProjectGroupContainer>;
-}
-//# sourceMappingURL=ProjectGroupContainerResolver.d.ts.map

package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProjectGroupContainerResolver.d.ts","sourceRoot":"","sources":["../../../src/projectGroup/ProjectGroupContainerResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EACN,qBAAqB,EACrB,6BAA6B,IAAI,sCAAsC,EACvE,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAA;AAUtE,qBAAa,6BAA8B,YAAW,sCAAsC;IAM1F,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IANlC,OAAO,CAAC,UAAU,CAA0D;IAE5E,SAAgB,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAK;gBAGpG,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,4BAA4B;IAGnD,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,GAAE,GAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAqBjH"}

package/dist/src/projectGroup/ProjectGroupContainerResolver.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectGroupContainerResolver = void 0;
-const engine_common_1 = require("@contember/engine-common");
-const util_1 = require("util");
-class ProjectGroupContainerResolver {
-    constructor(configResolver, containerFactory) {
-        this.configResolver = configResolver;
-        this.containerFactory = containerFactory;
-        this.containers = new engine_common_1.PromiseMap();
-        this.onCreate = [];
-    }
-    async getProjectGroupContainer(slug, config = {}) {
-        const existing = this.containers.get(slug);
-        if (existing) {
-            const existingAwaited = await existing;
-            if ((0, util_1.isDeepStrictEqual)(config, existingAwaited.inputConfig)) {
-                return existingAwaited.container;
-            }
-            existingAwaited.cleanups.forEach(it => it());
-            this.containers.delete(slug);
-        }
-        return (await this.containers.fetch(slug, async (slug) => {
-            const container = this.containerFactory.create({
-                config: this.configResolver(slug, config),
-                slug,
-            });
-            const cleanups = this.onCreate.map(it => it(container, slug) || (() => null));
-            // eslint-disable-next-line no-console
-            await container.tenantContainer.migrationsRunner.run(console.log);
-            return { container, inputConfig: config, cleanups };
-        })).container;
-    }
-}
-exports.ProjectGroupContainerResolver = ProjectGroupContainerResolver;
-//# sourceMappingURL=ProjectGroupContainerResolver.js.map

package/dist/src/projectGroup/ProjectGroupContainerResolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProjectGroupContainerResolver.js","sourceRoot":"","sources":["../../../src/projectGroup/ProjectGroupContainerResolver.ts"],"names":[],"mappings":";;;AAMA,4DAAqD;AACrD,+BAAwC;AAQxC,MAAa,6BAA6B;IAKzC,YACkB,cAAoC,EACpC,gBAA8C;QAD9C,mBAAc,GAAd,cAAc,CAAsB;QACpC,qBAAgB,GAAhB,gBAAgB,CAA8B;QANxD,eAAU,GAAG,IAAI,0BAAU,EAAyC,CAAA;QAE5D,aAAQ,GAA4F,EAAE,CAAA;IAKnH,CAAC;IAEG,KAAK,CAAC,wBAAwB,CAAC,IAAwB,EAAE,SAAc,EAAE;QAC/E,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,QAAQ,EAAE;YACb,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAA;YACtC,IAAI,IAAA,wBAAiB,EAAC,MAAM,EAAE,eAAe,CAAC,WAAW,CAAC,EAAE;gBAC3D,OAAO,eAAe,CAAC,SAAS,CAAA;aAChC;YACD,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;YAC5C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;SAC5B;QACD,OAAO,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;YACtD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC9C,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;gBACzC,IAAI;aACJ,CAAC,CAAA;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;YAC7E,sCAAsC;YACtC,MAAM,SAAS,CAAC,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAA;QACpD,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACd,CAAC;CACD;AA/BD,sEA+BC"}

package/dist/src/utils/cluster.d.ts

@@ -1,9 +0,0 @@
-export declare const getClusterProcessType: (isClusterMode: boolean) => ProcessType;
-export declare enum ProcessType {
-    singleNode = 0,
-    clusterMaster = 1,
-    clusterWorker = 2
-}
-export declare const waitForWorker: (timeoutMs: number) => Promise<unknown>;
-export declare const notifyWorkerStarted: () => boolean | undefined;
-//# sourceMappingURL=cluster.d.ts.map

package/dist/src/utils/cluster.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../../src/utils/cluster.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,kBAAmB,OAAO,gBACuD,CAAA;AAEnH,oBAAY,WAAW;IACtB,UAAU,IAAA;IACV,aAAa,IAAA;IACb,aAAa,IAAA;CACb;AAID,eAAO,MAAM,aAAa,cAAe,MAAM,qBAoB9C,CAAA;AAED,eAAO,MAAM,mBAAmB,2BAG7B,CAAA"}

package/dist/src/utils/cluster.js

@@ -1,47 +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.notifyWorkerStarted = exports.waitForWorker = exports.ProcessType = exports.getClusterProcessType = void 0;
-const cluster_1 = __importDefault(require("cluster"));
-const timeout_1 = require("./timeout");
-const getClusterProcessType = (isClusterMode) => !isClusterMode ? ProcessType.singleNode : cluster_1.default.isMaster ? ProcessType.clusterMaster : ProcessType.clusterWorker;
-exports.getClusterProcessType = getClusterProcessType;
-var ProcessType;
-(function (ProcessType) {
-    ProcessType[ProcessType["singleNode"] = 0] = "singleNode";
-    ProcessType[ProcessType["clusterMaster"] = 1] = "clusterMaster";
-    ProcessType[ProcessType["clusterWorker"] = 2] = "clusterWorker";
-})(ProcessType = exports.ProcessType || (exports.ProcessType = {}));
-const MSG_WORKER_STARTED = 'msg_worker_started';
-const waitForWorker = (timeoutMs) => {
-    let ok = false;
-    return Promise.race([
-        new Promise(async (resolve) => {
-            const listener = ({}, message) => {
-                if ('type' in message && message.type === MSG_WORKER_STARTED) {
-                    ok = true;
-                    resolve(null);
-                    cluster_1.default.removeListener('message', listener);
-                }
-            };
-            await cluster_1.default.on('message', listener);
-        }),
-        (0, timeout_1.timeout)(timeoutMs).then(() => {
-            if (!ok) {
-                throw new Error('Worker start timed out');
-            }
-            return true;
-        }),
-    ]);
-};
-exports.waitForWorker = waitForWorker;
-const notifyWorkerStarted = () => {
-    var _a;
-    return (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, {
-        type: MSG_WORKER_STARTED,
-    });
-};
-exports.notifyWorkerStarted = notifyWorkerStarted;
-//# sourceMappingURL=cluster.js.map

package/dist/src/utils/cluster.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,uCAAmC;AAE5B,MAAM,qBAAqB,GAAG,CAAC,aAAsB,EAAE,EAAE,CAC/D,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAA;AADtG,QAAA,qBAAqB,yBACiF;AAEnH,IAAY,WAIX;AAJD,WAAY,WAAW;IACtB,yDAAU,CAAA;IACV,+DAAa,CAAA;IACb,+DAAa,CAAA;AACd,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAED,MAAM,kBAAkB,GAAG,oBAAoB,CAAA;AAExC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE;IAClD,IAAI,EAAE,GAAG,KAAK,CAAA;IACd,OAAO,OAAO,CAAC,IAAI,CAAC;QACnB,IAAI,OAAO,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YAC3B,MAAM,QAAQ,GAAG,CAAC,EAAE,EAAE,OAAY,EAAE,EAAE;gBACrC,IAAI,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB,EAAE;oBAC7D,EAAE,GAAG,IAAI,CAAA;oBACT,OAAO,CAAC,IAAI,CAAC,CAAA;oBACb,iBAAO,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;iBAC3C;YACF,CAAC,CAAA;YACD,MAAM,iBAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACtC,CAAC,CAAC;QACF,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,EAAE,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;aACzC;YACD,OAAO,IAAI,CAAA;QACZ,CAAC,CAAC;KACF,CAAC,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,aAAa,iBAoBzB;AAEM,MAAM,mBAAmB,GAAG,GAAG,EAAE;;IACvC,OAAA,MAAA,OAAO,CAAC,IAAI,wDAAG;QACd,IAAI,EAAE,kBAAkB;KACxB,CAAC,CAAA;CAAA,CAAA;AAHU,QAAA,mBAAmB,uBAG7B"}

package/dist/src/utils/dbMetrics.d.ts

@@ -1,16 +0,0 @@
-import prom from 'prom-client';
-import { Connection } from '@contember/database';
-declare const labelNames: ("contember_project" | "contember_module" | "contember_project_group")[];
-declare type LabelNames = typeof labelNames[number];
-declare type Labels = {
-    [K in LabelNames]: string;
-};
-declare type DatabaseMetricsEntry = {
-    connection: Connection.PoolStatusProvider & Connection.Queryable;
-    labels: Labels;
-};
-declare type Unregistrar = () => void;
-declare type DatabaseMetricsRegistrar = (entry: DatabaseMetricsEntry) => Unregistrar;
-export declare const createDbMetricsRegistrar: (registry: prom.Registry) => DatabaseMetricsRegistrar;
-export {};
-//# sourceMappingURL=dbMetrics.d.ts.map

package/dist/src/utils/dbMetrics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dbMetrics.d.ts","sourceRoot":"","sources":["../../../src/utils/dbMetrics.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAgB,MAAM,qBAAqB,CAAA;AAE9D,QAAA,MAAM,UAAU,0EAAkG,CAAA;AAClH,aAAK,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,CAAA;AAC3C,aAAK,MAAM,GAAG;KAAG,CAAC,IAAI,UAAU,GAAG,MAAM;CAAE,CAAA;AAC3C,aAAK,oBAAoB,GAAG;IAC3B,UAAU,EAAE,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAA;IAChE,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AACD,aAAK,WAAW,GAAG,MAAM,IAAI,CAAA;AAC7B,aAAK,wBAAwB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,WAAW,CAAA;AAE5E,eAAO,MAAM,wBAAwB,aAAc,KAAK,QAAQ,KAAG,wBAkBlE,CAAA"}

package/dist/src/utils/dbMetrics.js

@@ -1,98 +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.createDbMetricsRegistrar = void 0;
-const prom_client_1 = __importDefault(require("prom-client"));
-const database_1 = require("@contember/database");
-const labelNames = ['contember_project', 'contember_module', 'contember_project_group'];
-const createDbMetricsRegistrar = (registry) => {
-    const dbPoolCollectorInner = createSingleDbPoolMetricsCollector(registry);
-    const entries = new Set();
-    const collector = () => {
-        for (const entry of entries) {
-            dbPoolCollectorInner(entry.connection, entry.labels);
-        }
-    };
-    registry.registerCollector(collector);
-    const sqlMetricsRegistrar = createSqlMetricsRegistrar(registry);
-    return entry => {
-        entries.add(entry);
-        const sqlMetricsUnregistrar = sqlMetricsRegistrar(entry.connection, entry.labels);
-        return () => {
-            entries.delete(entry);
-            sqlMetricsUnregistrar();
-        };
-    };
-};
-exports.createDbMetricsRegistrar = createDbMetricsRegistrar;
-const createSingleDbPoolMetricsCollector = (registry) => {
-    const totalCount = new prom_client_1.default.Gauge({
-        registers: [registry],
-        name: `contember_db_pool_total_count`,
-        help: 'The total number of clients existing within the pool by contember_module (tenant or content; system is not used since it uses the same connection) and contember_project for contember_module=content.',
-        labelNames,
-    });
-    const idleCount = new prom_client_1.default.Gauge({
-        registers: [registry],
-        name: `contember_db_pool_idle_count`,
-        help: 'The number of clients which are not checked out but are currently idle in the pool by contember_module (tenant or content; system is not used since it uses the same connection) and contember_project for contember_module=content.',
-        labelNames,
-    });
-    const waitingCount = new prom_client_1.default.Gauge({
-        registers: [registry],
-        name: `contember_db_pool_waiting_count`,
-        help: 'The number of queued requests waiting on a client when all clients are checked out. It can be helpful to monitor this number to see if you need to adjust the size of the pool by contember_module (tenant or content; system is not used since it uses the same connection) and contember_project for contember_module=content.',
-        labelNames,
-    });
-    const maxCount = new prom_client_1.default.Gauge({
-        registers: [registry],
-        name: `contember_db_pool_max_count`,
-        help: 'Maximum number of clients the pool should contain by contember_module (tenant or content; system is not used since it uses the same connection) and contember_project for contember_module=content.',
-        labelNames,
-    });
-    return (db, labels) => {
-        const poolInfo = db.getPoolStatus();
-        totalCount.set(labels, poolInfo.totalCount);
-        idleCount.set(labels, poolInfo.idleCount);
-        waitingCount.set(labels, poolInfo.waitingCount);
-        maxCount.set(labels, poolInfo.maxCount);
-    };
-};
-const createSqlMetricsRegistrar = (registry) => {
-    const sqlDuration = new prom_client_1.default.Histogram({
-        name: 'contember_sql_duration_ms',
-        help: 'Executed SQL queries by contember_module (system, tenant, content or unknown) and contember_project (or "unknown" for unknown project)',
-        registers: [registry],
-        labelNames,
-        buckets: [1, 2, 5, 10, 25, 50, 100, 250, 500, 1000],
-    });
-    const sqlErrorRate = new prom_client_1.default.Counter({
-        name: 'contember_sql_error_count',
-        help: 'Failed SQL queries by contember_module (system, tenant, content or unknown) and contember_project (or "unknown" for unknown project)',
-        labelNames,
-        registers: [registry],
-    });
-    return (connection, labels) => {
-        const queryEndCallback = ({ meta }, { timing }) => {
-            sqlDuration.observe({
-                ...labels,
-                contember_module: meta.module || labels.contember_module,
-            }, timing ? timing.selfDuration / 1000 : 0);
-        };
-        const queryErrorCallback = ({ meta }) => {
-            sqlErrorRate.inc({
-                ...labels,
-                contember_module: meta.module || labels.contember_module,
-            });
-        };
-        connection.eventManager.on(database_1.EventManager.Event.queryEnd, queryEndCallback);
-        connection.eventManager.on(database_1.EventManager.Event.queryError, queryErrorCallback);
-        return () => {
-            connection.eventManager.removeListener(database_1.EventManager.Event.queryEnd, queryEndCallback);
-            connection.eventManager.removeListener(database_1.EventManager.Event.queryError, queryErrorCallback);
-        };
-    };
-};
-//# sourceMappingURL=dbMetrics.js.map

package/dist/src/utils/dbMetrics.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dbMetrics.js","sourceRoot":"","sources":["../../../src/utils/dbMetrics.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/timeout.d.ts

@@ -1,2 +0,0 @@
-export declare const timeout: (ms: number) => Promise<unknown>;
-//# sourceMappingURL=timeout.d.ts.map

package/dist/src/utils/timeout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../src/utils/timeout.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,OAAQ,MAAM,qBAG/B,CAAA"}

package/dist/src/utils/timeout.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeout = void 0;
-const timeout = (ms) => new Promise(resolve => {
-    setTimeout(resolve, ms);
-});
-exports.timeout = timeout;
-//# sourceMappingURL=timeout.js.map

package/dist/src/utils/timeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../src/utils/timeout.ts"],"names":[],"mappings":";;;AAAO,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,CACrC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;IACrB,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAC,CAAA;AAHU,QAAA,OAAO,WAGjB"}