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

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.
Files changed (163) hide show
  1. package/dist/src/MasterContainer.d.ts +12 -25
  2. package/dist/src/MasterContainer.d.ts.map +1 -1
  3. package/dist/src/MasterContainer.js +36 -80
  4. package/dist/src/MasterContainer.js.map +1 -1
  5. package/dist/src/bootstrap/Initializer.d.ts +3 -3
  6. package/dist/src/bootstrap/Initializer.d.ts.map +1 -1
  7. package/dist/src/bootstrap/Initializer.js +15 -6
  8. package/dist/src/bootstrap/Initializer.js.map +1 -1
  9. package/dist/src/config/config.d.ts +5 -4
  10. package/dist/src/config/config.d.ts.map +1 -1
  11. package/dist/src/config/config.js +2 -2
  12. package/dist/src/config/config.js.map +1 -1
  13. package/dist/src/config/configSchema.d.ts +45 -11
  14. package/dist/src/config/configSchema.d.ts.map +1 -1
  15. package/dist/src/config/configSchema.js +20 -18
  16. package/dist/src/config/configSchema.js.map +1 -1
  17. package/dist/src/config/configTemplate.d.ts.map +1 -1
  18. package/dist/src/config/configTemplate.js +23 -0
  19. package/dist/src/config/configTemplate.js.map +1 -1
  20. package/dist/src/index.d.ts +9 -3
  21. package/dist/src/index.d.ts.map +1 -1
  22. package/dist/src/index.js +23 -4
  23. package/dist/src/index.js.map +1 -1
  24. package/dist/src/project/ProjectContainer.js +1 -1
  25. package/dist/src/project/ProjectContainer.js.map +1 -1
  26. package/dist/src/project/ProjectContainerResolver.d.ts +6 -3
  27. package/dist/src/project/ProjectContainerResolver.d.ts.map +1 -1
  28. package/dist/src/project/ProjectContainerResolver.js +4 -16
  29. package/dist/src/project/ProjectContainerResolver.js.map +1 -1
  30. package/dist/src/projectGroup/ProjectGroupContainer.d.ts +2 -1
  31. package/dist/src/projectGroup/ProjectGroupContainer.d.ts.map +1 -1
  32. package/dist/src/projectGroup/ProjectGroupContainer.js +8 -4
  33. package/dist/src/projectGroup/ProjectGroupContainer.js.map +1 -1
  34. package/dist/src/projectGroup/ProjectGroupResolver.d.ts +7 -0
  35. package/dist/src/projectGroup/ProjectGroupResolver.d.ts.map +1 -0
  36. package/dist/src/projectGroup/ProjectGroupResolver.js +13 -0
  37. package/dist/src/projectGroup/ProjectGroupResolver.js.map +1 -0
  38. package/dist/src/start.js +15 -112
  39. package/dist/src/start.js.map +1 -1
  40. package/dist/src/tsconfig.tsbuildinfo +1 -1
  41. package/dist/src/utils/index.d.ts +0 -4
  42. package/dist/src/utils/index.d.ts.map +1 -1
  43. package/dist/src/utils/index.js +0 -4
  44. package/dist/src/utils/index.js.map +1 -1
  45. package/dist/src/utils/serverStartup.d.ts +31 -0
  46. package/dist/src/utils/serverStartup.d.ts.map +1 -0
  47. package/dist/src/utils/serverStartup.js +42 -0
  48. package/dist/src/utils/serverStartup.js.map +1 -0
  49. package/dist/src/utils/serverTermination.d.ts +12 -0
  50. package/dist/src/utils/serverTermination.d.ts.map +1 -0
  51. package/dist/src/utils/serverTermination.js +26 -0
  52. package/dist/src/utils/serverTermination.js.map +1 -0
  53. package/dist/tests/e2e/acl-condition-variable.test.d.ts +2 -0
  54. package/dist/tests/e2e/acl-condition-variable.test.d.ts.map +1 -0
  55. package/dist/tests/e2e/acl-condition-variable.test.js +77 -0
  56. package/dist/tests/e2e/acl-condition-variable.test.js.map +1 -0
  57. package/dist/tests/e2e/assume-membership.test.d.ts +2 -0
  58. package/dist/tests/e2e/assume-membership.test.d.ts.map +1 -0
  59. package/dist/tests/e2e/assume-membership.test.js +58 -0
  60. package/dist/tests/e2e/assume-membership.test.js.map +1 -0
  61. package/dist/tests/e2e/content-api-basic.test.d.ts +2 -0
  62. package/dist/tests/e2e/content-api-basic.test.d.ts.map +1 -0
  63. package/dist/tests/e2e/content-api-basic.test.js +50 -0
  64. package/dist/tests/e2e/content-api-basic.test.js.map +1 -0
  65. package/dist/tests/e2e/content-invalid-schema.test.d.ts +2 -0
  66. package/dist/tests/e2e/content-invalid-schema.test.d.ts.map +1 -0
  67. package/dist/tests/e2e/content-invalid-schema.test.js +29 -0
  68. package/dist/tests/e2e/content-invalid-schema.test.js.map +1 -0
  69. package/dist/tests/e2e/homepage.test.d.ts +2 -0
  70. package/dist/tests/e2e/homepage.test.d.ts.map +1 -0
  71. package/dist/tests/e2e/homepage.test.js +15 -0
  72. package/dist/tests/e2e/homepage.test.js.map +1 -0
  73. package/dist/tests/e2e/tenant-member-access.test.d.ts +2 -0
  74. package/dist/tests/e2e/tenant-member-access.test.d.ts.map +1 -0
  75. package/dist/tests/e2e/tenant-member-access.test.js +43 -0
  76. package/dist/tests/e2e/tenant-member-access.test.js.map +1 -0
  77. package/dist/tests/e2e/x-contember-ref.test.d.ts +2 -0
  78. package/dist/tests/e2e/x-contember-ref.test.d.ts.map +1 -0
  79. package/dist/tests/e2e/x-contember-ref.test.js +63 -0
  80. package/dist/tests/e2e/x-contember-ref.test.js.map +1 -0
  81. package/dist/tests/src/requests.d.ts +5 -0
  82. package/dist/tests/src/requests.d.ts.map +1 -0
  83. package/dist/tests/src/requests.js +59 -0
  84. package/dist/tests/src/requests.js.map +1 -0
  85. package/dist/tests/src/tester.d.ts +19 -0
  86. package/dist/tests/src/tester.d.ts.map +1 -0
  87. package/dist/tests/src/tester.js +99 -0
  88. package/dist/tests/src/tester.js.map +1 -0
  89. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  90. package/esbuild.js +7 -14
  91. package/package.json +20 -20
  92. package/src/MasterContainer.ts +58 -110
  93. package/src/bootstrap/Initializer.ts +16 -6
  94. package/src/config/config.ts +7 -5
  95. package/src/config/configSchema.ts +30 -33
  96. package/src/config/configTemplate.ts +23 -0
  97. package/src/index.ts +15 -2
  98. package/src/project/ProjectContainer.ts +1 -1
  99. package/src/project/ProjectContainerResolver.ts +4 -17
  100. package/src/projectGroup/ProjectGroupContainer.ts +12 -3
  101. package/src/projectGroup/ProjectGroupResolver.ts +12 -0
  102. package/src/start.ts +18 -127
  103. package/src/utils/index.ts +0 -4
  104. package/src/utils/serverStartup.ts +42 -0
  105. package/src/utils/serverTermination.ts +20 -0
  106. package/tests/e2e/acl-condition-variable.test.ts +74 -0
  107. package/tests/e2e/assume-membership.test.ts +64 -0
  108. package/tests/e2e/content-api-basic.test.ts +51 -0
  109. package/tests/e2e/content-invalid-schema.test.ts +31 -0
  110. package/tests/e2e/homepage.test.ts +10 -0
  111. package/tests/e2e/tenant-member-access.test.ts +51 -0
  112. package/tests/e2e/x-contember-ref.test.ts +71 -0
  113. package/tests/src/requests.ts +72 -0
  114. package/tests/src/tester.ts +118 -0
  115. package/alpine.dockerfile +0 -30
  116. package/debian.dockerfile +0 -27
  117. package/dist/src/http/CollectHttpMetricsMiddelware.d.ts +0 -5
  118. package/dist/src/http/CollectHttpMetricsMiddelware.d.ts.map +0 -1
  119. package/dist/src/http/CollectHttpMetricsMiddelware.js +0 -36
  120. package/dist/src/http/CollectHttpMetricsMiddelware.js.map +0 -1
  121. package/dist/src/http/ShowMetricsMiddleware.d.ts +0 -4
  122. package/dist/src/http/ShowMetricsMiddleware.d.ts.map +0 -1
  123. package/dist/src/http/ShowMetricsMiddleware.js +0 -20
  124. package/dist/src/http/ShowMetricsMiddleware.js.map +0 -1
  125. package/dist/src/http/index.d.ts +0 -3
  126. package/dist/src/http/index.d.ts.map +0 -1
  127. package/dist/src/http/index.js +0 -19
  128. package/dist/src/http/index.js.map +0 -1
  129. package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts +0 -12
  130. package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts.map +0 -1
  131. package/dist/src/projectGroup/ProjectGroupContainerResolver.js +0 -36
  132. package/dist/src/projectGroup/ProjectGroupContainerResolver.js.map +0 -1
  133. package/dist/src/utils/cluster.d.ts +0 -9
  134. package/dist/src/utils/cluster.d.ts.map +0 -1
  135. package/dist/src/utils/cluster.js +0 -47
  136. package/dist/src/utils/cluster.js.map +0 -1
  137. package/dist/src/utils/dbMetrics.d.ts +0 -16
  138. package/dist/src/utils/dbMetrics.d.ts.map +0 -1
  139. package/dist/src/utils/dbMetrics.js +0 -98
  140. package/dist/src/utils/dbMetrics.js.map +0 -1
  141. package/dist/src/utils/timeout.d.ts +0 -2
  142. package/dist/src/utils/timeout.d.ts.map +0 -1
  143. package/dist/src/utils/timeout.js +0 -8
  144. package/dist/src/utils/timeout.js.map +0 -1
  145. package/dist/src/utils/tuple.d.ts +0 -2
  146. package/dist/src/utils/tuple.d.ts.map +0 -1
  147. package/dist/src/utils/tuple.js +0 -6
  148. package/dist/src/utils/tuple.js.map +0 -1
  149. package/dist/tests/e2e/http.test.d.ts +0 -2
  150. package/dist/tests/e2e/http.test.d.ts.map +0 -1
  151. package/dist/tests/e2e/http.test.js +0 -275
  152. package/dist/tests/e2e/http.test.js.map +0 -1
  153. package/jasmine.json +0 -7
  154. package/src/http/CollectHttpMetricsMiddelware.ts +0 -32
  155. package/src/http/ShowMetricsMiddleware.ts +0 -12
  156. package/src/http/index.ts +0 -2
  157. package/src/projectGroup/ProjectGroupContainerResolver.ts +0 -47
  158. package/src/utils/cluster.ts +0 -40
  159. package/src/utils/dbMetrics.ts +0 -111
  160. package/src/utils/timeout.ts +0 -4
  161. package/src/utils/tuple.ts +0 -1
  162. package/tests/e2e/http.test.ts +0 -303
  163. package/tslint.json +0 -14
@@ -1,2 +0,0 @@
1
- export declare const tuple: <T extends unknown[]>(...args: T) => T;
2
- //# sourceMappingURL=tuple.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,wCAA4C,CAAA"}
@@ -1,6 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.tuple = void 0;
4
- const tuple = (...args) => args;
5
- exports.tuple = tuple;
6
- //# sourceMappingURL=tuple.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":";;;AAAO,MAAM,KAAK,GAAG,CAAsB,GAAG,IAAO,EAAE,EAAE,CAAC,IAAI,CAAA;AAAjD,QAAA,KAAK,SAA4C"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=http.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"http.test.d.ts","sourceRoot":"","sources":["../../../tests/e2e/http.test.ts"],"names":[],"mappings":""}
@@ -1,275 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- Object.defineProperty(exports, "__esModule", { value: true });
29
- const supertest_1 = __importDefault(require("supertest"));
30
- const nodeAssert = __importStar(require("assert"));
31
- const vitest_1 = require("vitest");
32
- const schema_migrations_1 = require("@contember/schema-migrations");
33
- const engine_api_tester_1 = require("@contember/engine-api-tester");
34
- const rootToken = String(process.env.CONTEMBER_ROOT_TOKEN);
35
- const loginToken = String(process.env.CONTEMBER_LOGIN_TOKEN);
36
- const apiUrl = String(process.env.CONTEMBER_API_URL);
37
- let projectSlug = '';
38
- // Used to allow prettier formatting of GraphQL queries
39
- const gql = (strings) => {
40
- nodeAssert.strictEqual(strings.length, 1);
41
- return strings[0];
42
- };
43
- const executeGraphql = (query, options = {}) => {
44
- return (0, supertest_1.default)(apiUrl)
45
- .post(options.path || `/content/${projectSlug}/live`)
46
- .set('Authorization', 'Bearer ' + (options.authorizationToken || rootToken))
47
- .send({
48
- query,
49
- variables: options.variables || {},
50
- });
51
- };
52
- const signIn = async (email, password) => {
53
- const response2 = await executeGraphql(gql `
54
- mutation ($email: String!, $password: String!) {
55
- signIn(email: $email, password: $password) {
56
- ok
57
- result {
58
- token
59
- }
60
- }
61
- }
62
- `, {
63
- variables: { email, password },
64
- authorizationToken: loginToken,
65
- path: '/tenant',
66
- });
67
- return response2.body.data.signIn.result.token;
68
- };
69
- (0, vitest_1.beforeAll)(async () => {
70
- projectSlug = 'test' + Date.now();
71
- const result = await executeGraphql(`
72
- mutation($projectSlug: String!, $config: Json!) {
73
- createProject(projectSlug: $projectSlug, config: $config) {
74
- ok
75
- error { code }
76
- }
77
- }
78
- `, {
79
- path: '/tenant',
80
- variables: {
81
- projectSlug: projectSlug,
82
- config: {},
83
- },
84
- })
85
- .expect(response => {
86
- vitest_1.assert.isOk(response.body);
87
- vitest_1.assert.isOk(response.body.data);
88
- vitest_1.assert.isOk(response.body.data.createProject);
89
- if (!response.body.data.createProject.ok) {
90
- vitest_1.assert.equal(response.body.data.createProject.error.code, 'ALREADY_EXISTS');
91
- }
92
- })
93
- .expect(200);
94
- if (!result.body.data.createProject.ok) {
95
- return;
96
- }
97
- const migrationFilesManager = new schema_migrations_1.MigrationsResolver(schema_migrations_1.MigrationFilesManager.createForProject((0, engine_api_tester_1.getExampleProjectDirectory)(), 'sample'));
98
- const migrations = await migrationFilesManager.getMigrations();
99
- vitest_1.assert.isAtLeast(migrations.length, 2);
100
- await executeGraphql(`
101
- mutation($migrations: [Migration!]!) {
102
- migrate(migrations: $migrations) {
103
- ok
104
- error { code }
105
- }
106
- }
107
- `, {
108
- path: '/system/' + projectSlug,
109
- variables: {
110
- migrations,
111
- },
112
- })
113
- .expect(response => {
114
- vitest_1.assert.deepStrictEqual(response.body.data, {
115
- migrate: {
116
- error: null,
117
- ok: true,
118
- },
119
- });
120
- });
121
- });
122
- (0, vitest_1.test)('show homepage', async () => {
123
- await (0, supertest_1.default)(apiUrl)
124
- .get('/')
125
- .expect(200)
126
- .expect('App is running');
127
- });
128
- (0, vitest_1.test)('Content API: create & read tag', async () => {
129
- await executeGraphql(gql `
130
- mutation {
131
- createTag(data: { label: "graphql" }) {
132
- ok
133
- }
134
- }
135
- `)
136
- .expect(response => {
137
- vitest_1.assert.deepStrictEqual(response.body.data, {
138
- createTag: {
139
- ok: true,
140
- },
141
- });
142
- })
143
- .expect(200);
144
- await executeGraphql(gql `
145
- query {
146
- listTag(filter: { label: { eq: "graphql" } }) {
147
- label
148
- }
149
- }
150
- `)
151
- .expect(response => {
152
- vitest_1.assert.deepStrictEqual(response.body.data, {
153
- listTag: [
154
- {
155
- label: 'graphql',
156
- },
157
- ],
158
- });
159
- })
160
- .expect(200);
161
- });
162
- (0, vitest_1.test)('Content API: X-Contember-Ref header', async () => {
163
- await executeGraphql(gql `
164
- mutation {
165
- createTag(data: { label: "typescript" }) {
166
- ok
167
- }
168
- }
169
- `).expect(200);
170
- const response = await executeGraphql(gql `
171
- query {
172
- listTag(filter: { label: { eq: "typescript" } }) {
173
- label
174
- }
175
- }
176
- `)
177
- .set('X-Contember-Ref', 'None')
178
- .expect(response => {
179
- vitest_1.assert.deepStrictEqual(response.body.data, {
180
- listTag: [
181
- {
182
- label: 'typescript',
183
- },
184
- ],
185
- });
186
- })
187
- .expect(200);
188
- const eventKey = response.get('X-Contember-Ref');
189
- await executeGraphql(gql `
190
- query {
191
- listTag {
192
- label
193
- }
194
- }
195
- `)
196
- .set('X-Contember-Ref', eventKey)
197
- .expect(304);
198
- // ignored for mutation
199
- await executeGraphql(gql `
200
- mutation {
201
- createTag(data: { label: "typescript" }) {
202
- ok
203
- }
204
- }
205
- `)
206
- .set('X-Contember-Ref', eventKey)
207
- .expect(200);
208
- });
209
- (0, vitest_1.test)('Content API: invalid schema error', async () => {
210
- await executeGraphql(gql `
211
- mutation {
212
- createFoo(data: { label: "graphql" }) {
213
- ok
214
- }
215
- }
216
- `)
217
- .expect(400)
218
- .expect(response => {
219
- vitest_1.assert.deepStrictEqual(response.body.errors[0].message, 'Cannot query field "createFoo" on type "Mutation". Did you mean "createPost" or "createTag"?');
220
- });
221
- });
222
- (0, vitest_1.test)('Tenant API: sign up, add to a project and check project access', async () => {
223
- const email = `john+${Date.now()}@doe.com`;
224
- const signUpResponse = await executeGraphql(gql `
225
- mutation($email: String!) {
226
- signUp(email: $email, password: "123456") {
227
- ok
228
- result {
229
- person {
230
- identity {
231
- id
232
- }
233
- }
234
- }
235
- }
236
- }
237
- `, {
238
- path: '/tenant',
239
- variables: { email },
240
- }).expect(200);
241
- const identityId = signUpResponse.body.data.signUp.result.person.identity.id;
242
- const authKey = await signIn(email, '123456');
243
- await executeGraphql(gql `
244
- query {
245
- listTag {
246
- id
247
- }
248
- }
249
- `, { authorizationToken: authKey })
250
- .expect(404)
251
- .expect({ errors: [{ message: `Project ${projectSlug} NOT found`, code: 404 }] });
252
- await executeGraphql(gql `
253
- mutation ($identity: String!, $projectSlug: String!) {
254
- addProjectMember(identityId: $identity, projectSlug: $projectSlug, memberships: [{ role: "admin", variables: [] }]) {
255
- ok
256
- }
257
- }
258
- `, { path: '/tenant', variables: { identity: identityId, projectSlug } })
259
- .expect(200)
260
- .expect(response => {
261
- vitest_1.assert.deepStrictEqual(response.body.data, { addProjectMember: { ok: true } });
262
- });
263
- await executeGraphql(gql `
264
- query {
265
- listAuthor {
266
- id
267
- }
268
- }
269
- `, { authorizationToken: authKey })
270
- .expect(response => {
271
- vitest_1.assert.deepStrictEqual(response.body.data, { listAuthor: [] });
272
- })
273
- .expect(200);
274
- });
275
- //# sourceMappingURL=http.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"http.test.js","sourceRoot":"","sources":["../../../tests/e2e/http.test.ts"],"names":[],"mappings":"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"}
package/jasmine.json DELETED
@@ -1,7 +0,0 @@
1
- {
2
- "spec_files": [
3
- "dist/tests/cases/**/*.js"
4
- ],
5
- "stopSpecOnExpectationFailure": false,
6
- "random": false
7
- }
@@ -1,32 +0,0 @@
1
- import { KoaMiddleware, ModuleInfoMiddlewareState, ProjectInfoMiddlewareState } from '@contember/engine-http'
2
- import prom from 'prom-client'
3
- import { GraphQLKoaState } from '@contember/engine-http'
4
-
5
- export const createColllectHttpMetricsMiddleware = (
6
- registry: prom.Registry,
7
- ): KoaMiddleware<Partial<ProjectInfoMiddlewareState & ModuleInfoMiddlewareState & GraphQLKoaState>> => {
8
- const requestSummary = new prom.Histogram({
9
- name: 'contember_http_duration_seconds',
10
- 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)',
11
- registers: [registry],
12
- labelNames: ['http_method', 'http_code', 'contember_project', 'contember_project_group', 'contember_module', 'graphql_operation'],
13
- buckets: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10],
14
- })
15
-
16
- return async (ctx, next) => {
17
- const end = ctx.method === 'OPTIONS' ? () => null : requestSummary.startTimer()
18
- try {
19
- await next()
20
- } finally {
21
- const labels = {
22
- http_method: ctx.method,
23
- http_code: ctx.status,
24
- contember_project: ctx.state.project || 'unknown',
25
- contember_project_group: ctx.state.projectGroup || 'unknown',
26
- contember_module: ctx.state.module || 'unknown',
27
- graphql_operation: ctx.state.graphql?.operationName || 'unknown',
28
- }
29
- end(labels)
30
- }
31
- }
32
- }
@@ -1,12 +0,0 @@
1
- import { KoaMiddleware, route } from '@contember/engine-http'
2
- import prom from 'prom-client'
3
-
4
- export const createShowMetricsMiddleware = (registry: prom.Registry): KoaMiddleware<any> => {
5
- return route('/metrics', async ctx => {
6
- if (registry instanceof prom.AggregatorRegistry) {
7
- ctx.body = await registry.clusterMetrics()
8
- } else {
9
- ctx.body = registry.metrics()
10
- }
11
- })
12
- }
package/src/http/index.ts DELETED
@@ -1,2 +0,0 @@
1
- export * from './CollectHttpMetricsMiddelware'
2
- export * from './ShowMetricsMiddleware'
@@ -1,47 +0,0 @@
1
- import { TenantConfigResolver } from '../config/tenantConfigResolver'
2
- import {
3
- ProjectGroupContainer,
4
- ProjectGroupContainerResolver as ProjectGroupContainerResolverInterface,
5
- } from '@contember/engine-http'
6
- import { ProjectGroupContainerFactory } from './ProjectGroupContainer'
7
- import { PromiseMap } from '@contember/engine-common'
8
- import { isDeepStrictEqual } from 'util'
9
-
10
- interface ContainerWithMeta {
11
- container: ProjectGroupContainer
12
- cleanups: (() => void)[]
13
- inputConfig: any
14
- }
15
-
16
- export class ProjectGroupContainerResolver implements ProjectGroupContainerResolverInterface {
17
- private containers = new PromiseMap<string | undefined, ContainerWithMeta>()
18
-
19
- public readonly onCreate: ((container: ProjectGroupContainer, slug: string | undefined) => void | (() => void))[] = []
20
-
21
- constructor(
22
- private readonly configResolver: TenantConfigResolver,
23
- private readonly containerFactory: ProjectGroupContainerFactory,
24
- ) {}
25
-
26
- public async getProjectGroupContainer(slug: string | undefined, config: any = {}): Promise<ProjectGroupContainer> {
27
- const existing = this.containers.get(slug)
28
- if (existing) {
29
- const existingAwaited = await existing
30
- if (isDeepStrictEqual(config, existingAwaited.inputConfig)) {
31
- return existingAwaited.container
32
- }
33
- existingAwaited.cleanups.forEach(it => it())
34
- this.containers.delete(slug)
35
- }
36
- return (await this.containers.fetch(slug, async slug => {
37
- const container = this.containerFactory.create({
38
- config: this.configResolver(slug, config),
39
- slug,
40
- })
41
- const cleanups = this.onCreate.map(it => it(container, slug) || (() => null))
42
- // eslint-disable-next-line no-console
43
- await container.tenantContainer.migrationsRunner.run(console.log)
44
- return { container, inputConfig: config, cleanups }
45
- })).container
46
- }
47
- }
@@ -1,40 +0,0 @@
1
- import cluster from 'cluster'
2
- import { timeout } from './timeout'
3
-
4
- export const getClusterProcessType = (isClusterMode: boolean) =>
5
- !isClusterMode ? ProcessType.singleNode : cluster.isMaster ? ProcessType.clusterMaster : ProcessType.clusterWorker
6
-
7
- export enum ProcessType {
8
- singleNode,
9
- clusterMaster,
10
- clusterWorker,
11
- }
12
-
13
- const MSG_WORKER_STARTED = 'msg_worker_started'
14
-
15
- export const waitForWorker = (timeoutMs: number) => {
16
- let ok = false
17
- return Promise.race([
18
- new Promise(async resolve => {
19
- const listener = ({}, message: any) => {
20
- if ('type' in message && message.type === MSG_WORKER_STARTED) {
21
- ok = true
22
- resolve(null)
23
- cluster.removeListener('message', listener)
24
- }
25
- }
26
- await cluster.on('message', listener)
27
- }),
28
- timeout(timeoutMs).then(() => {
29
- if (!ok) {
30
- throw new Error('Worker start timed out')
31
- }
32
- return true
33
- }),
34
- ])
35
- }
36
-
37
- export const notifyWorkerStarted = () =>
38
- process.send?.({
39
- type: MSG_WORKER_STARTED,
40
- })
@@ -1,111 +0,0 @@
1
- import prom from 'prom-client'
2
- import { Connection, EventManager } from '@contember/database'
3
-
4
- const labelNames = ['contember_project' as const, 'contember_module' as const, 'contember_project_group' as const]
5
- type LabelNames = typeof labelNames[number]
6
- type Labels = { [K in LabelNames]: string }
7
- type DatabaseMetricsEntry = {
8
- connection: Connection.PoolStatusProvider & Connection.Queryable
9
- labels: Labels
10
- }
11
- type Unregistrar = () => void
12
- type DatabaseMetricsRegistrar = (entry: DatabaseMetricsEntry) => Unregistrar
13
-
14
- export const createDbMetricsRegistrar = (registry: prom.Registry): DatabaseMetricsRegistrar => {
15
- const dbPoolCollectorInner = createSingleDbPoolMetricsCollector(registry)
16
- const entries = new Set<DatabaseMetricsEntry>()
17
- const collector = () => {
18
- for (const entry of entries) {
19
- dbPoolCollectorInner(entry.connection, entry.labels)
20
- }
21
- }
22
- registry.registerCollector(collector)
23
- const sqlMetricsRegistrar = createSqlMetricsRegistrar(registry)
24
- return entry => {
25
- entries.add(entry)
26
- const sqlMetricsUnregistrar = sqlMetricsRegistrar(entry.connection, entry.labels)
27
- return () => {
28
- entries.delete(entry)
29
- sqlMetricsUnregistrar()
30
- }
31
- }
32
- }
33
-
34
- const createSingleDbPoolMetricsCollector = (registry: prom.Registry) => {
35
-
36
- const totalCount = new prom.Gauge({
37
- registers: [registry],
38
- name: `contember_db_pool_total_count`,
39
- 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.',
40
- labelNames,
41
- })
42
- const idleCount = new prom.Gauge({
43
- registers: [registry],
44
- name: `contember_db_pool_idle_count`,
45
- 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.',
46
- labelNames,
47
- })
48
- const waitingCount = new prom.Gauge({
49
- registers: [registry],
50
- name: `contember_db_pool_waiting_count`,
51
- 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.',
52
- labelNames,
53
- })
54
- const maxCount = new prom.Gauge({
55
- registers: [registry],
56
- name: `contember_db_pool_max_count`,
57
- 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.',
58
- labelNames,
59
- })
60
-
61
- return (db: Connection.PoolStatusProvider, labels: Labels) => {
62
- const poolInfo = db.getPoolStatus()
63
- totalCount.set(labels, poolInfo.totalCount)
64
- idleCount.set(labels, poolInfo.idleCount)
65
- waitingCount.set(labels, poolInfo.waitingCount)
66
- maxCount.set(labels, poolInfo.maxCount)
67
- }
68
- }
69
- type SqlMetricsRegistrar = (
70
- connection: Connection.Queryable,
71
- labels: Labels,
72
- ) => Unregistrar
73
- const createSqlMetricsRegistrar = (registry: prom.Registry): SqlMetricsRegistrar => {
74
- const sqlDuration = new prom.Histogram({
75
- name: 'contember_sql_duration_ms',
76
- help: 'Executed SQL queries by contember_module (system, tenant, content or unknown) and contember_project (or "unknown" for unknown project)',
77
- registers: [registry],
78
- labelNames,
79
- buckets: [1, 2, 5, 10, 25, 50, 100, 250, 500, 1000],
80
- })
81
- const sqlErrorRate = new prom.Counter({
82
- name: 'contember_sql_error_count',
83
- help: 'Failed SQL queries by contember_module (system, tenant, content or unknown) and contember_project (or "unknown" for unknown project)',
84
- labelNames,
85
- registers: [registry],
86
- })
87
-
88
- return (connection, labels) => {
89
- const queryEndCallback: EventManager.ListenerTypes[EventManager.Event.queryEnd] = ({ meta }, { timing }) => {
90
- sqlDuration.observe(
91
- {
92
- ...labels,
93
- contember_module: meta.module || labels.contember_module,
94
- },
95
- timing ? timing.selfDuration / 1000 : 0,
96
- )
97
- }
98
- const queryErrorCallback: EventManager.ListenerTypes[EventManager.Event.queryError] = ({ meta }) => {
99
- sqlErrorRate.inc({
100
- ...labels,
101
- contember_module: meta.module || labels.contember_module,
102
- })
103
- }
104
- connection.eventManager.on(EventManager.Event.queryEnd, queryEndCallback)
105
- connection.eventManager.on(EventManager.Event.queryError, queryErrorCallback)
106
- return () => {
107
- connection.eventManager.removeListener(EventManager.Event.queryEnd, queryEndCallback)
108
- connection.eventManager.removeListener(EventManager.Event.queryError, queryErrorCallback)
109
- }
110
- }
111
- }
@@ -1,4 +0,0 @@
1
- export const timeout = (ms: number) =>
2
- new Promise(resolve => {
3
- setTimeout(resolve, ms)
4
- })
@@ -1 +0,0 @@
1
- export const tuple = <T extends unknown[]>(...args: T) => args