@contember/engine-server 1.2.0-alpha.18 → 1.2.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-server",
-  "version": "1.2.0-alpha.18",
+  "version": "1.2.0-alpha.19",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -9,25 +9,21 @@
     "test-e2e": "vitest --no-threads tests/e2e"
   },
   "dependencies": {
-    "@contember/authorization": "^1.2.0-alpha.18",
-    "@contember/config-loader": "^1.2.0-alpha.18",
-    "@contember/database": "^1.2.0-alpha.18",
-    "@contember/database-migrations": "^1.2.0-alpha.18",
-    "@contember/dic": "^1.2.0-alpha.18",
-    "@contember/typesafe": "^1.2.0-alpha.18",
-    "@contember/engine-content-api": "^1.2.0-alpha.18",
-    "@contember/engine-http": "^1.2.0-alpha.18",
-    "@contember/engine-plugins": "^1.2.0-alpha.18",
-    "@contember/engine-s3-plugin": "^1.2.0-alpha.18",
-    "@contember/engine-system-api": "^1.2.0-alpha.18",
-    "@contember/engine-tenant-api": "^1.2.0-alpha.18",
-    "@contember/engine-vimeo-plugin": "^1.2.0-alpha.18",
-    "@contember/logger": "^1.2.0-alpha.18",
-    "@contember/queryable": "^1.2.0-alpha.18",
-    "@contember/schema": "^1.2.0-alpha.18",
-    "@contember/schema-definition": "^1.2.0-alpha.18",
-    "@contember/schema-migrations": "^1.2.0-alpha.18",
-    "@contember/schema-utils": "^1.2.0-alpha.18",
+    "@contember/config-loader": "^1.2.0-alpha.19",
+    "@contember/database": "^1.2.0-alpha.19",
+    "@contember/dic": "^1.2.0-alpha.19",
+    "@contember/typesafe": "^1.2.0-alpha.19",
+    "@contember/engine-content-api": "^1.2.0-alpha.19",
+    "@contember/engine-common": "^1.2.0-alpha.19",
+    "@contember/engine-http": "^1.2.0-alpha.19",
+    "@contember/engine-plugins": "^1.2.0-alpha.19",
+    "@contember/engine-s3-plugin": "^1.2.0-alpha.19",
+    "@contember/engine-system-api": "^1.2.0-alpha.19",
+    "@contember/engine-tenant-api": "^1.2.0-alpha.19",
+    "@contember/engine-vimeo-plugin": "^1.2.0-alpha.19",
+    "@contember/logger": "^1.2.0-alpha.19",
+    "@contember/schema": "^1.2.0-alpha.19",
+    "@contember/schema-migrations": "^1.2.0-alpha.19",
     "@koa/cors": "^3.1.0",
     "@sentry/node": "^7.1.1",
     "graphql": "^16.5.0",
@@ -35,11 +31,10 @@
     "koa-bodyparser": "^4.3.0",
     "koa-compress": "^5.0.1",
     "pg": "^8.5.0",
-    "prom-client": "^12",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^1.2.0-alpha.18",
+    "@contember/engine-api-tester": "^1.2.0-alpha.19",
     "@types/koa-compress": "^4.0.1",
     "@types/node": "^18",
     "@types/supertest": "^2.0.8",

package/src/config/configSchema.ts

@@ -20,6 +20,8 @@ const dbConfigOptional = {
 		maxConnecting: Typesafe.number,
 		maxIdle: Typesafe.number,
 		reconnectIntervalMs: Typesafe.number,
+		rateLimitCount: Typesafe.number,
+		rateLimitPeriodMs: Typesafe.number,
 		idleTimeoutMs: Typesafe.number,
 		acquireTimeoutMs: Typesafe.number,
 		maxUses: Typesafe.number,

package/src/config/configTemplate.ts

@@ -1,3 +1,23 @@
+const createDbConfigTemplate = (prefix: string) => {
+	return {
+		ssl: `%?${prefix}_SSL::bool%`,
+		queryTimeoutMs: `%?${prefix}_QUERY_TIMEOUT_MS::number%`,
+		statementTimeoutMs: `%?${prefix}_STATEMENT_TIMEOUT_MS::number%`,
+		connectionTimeoutMs: `%?${prefix}_CONNECTION_TIMEOUT_MS::number%`,
+		pool: {
+			maxConnections: `%?${prefix}_POOL_MAX_CONNECTIONS::number%`,
+			maxConnecting: `%?${prefix}_POOL_MAX_CONNECTING::number%`,
+			maxIdle: `%?${prefix}_POOL_MAX_IDLE::number%`,
+			reconnectIntervalMs: `%?${prefix}_POOL_RECONNECT_INTERVAL_MS::number%`,
+			idleTimeoutMs: `%?${prefix}_POOL_IDLE_TIMEOUT_MS::number%`,
+			acquireTimeoutMs: `%?${prefix}_POOL_ACQUIRE_TIMEOUT_MS::number%`,
+			maxUses: `%?${prefix}_POOL_MAX_USES::number%`,
+			maxAgeMs: `%?${prefix}_POOL_MAX_AGE_MS::number%`,
+			rateLimitCount: `%?${prefix}_POOL_RATE_LIMIT_COUNT::number%`,
+			rateLimitPeriodMs: `%?${prefix}_POOL_RATE_LIMIT_PERIOD_MS::number%`,
+		},
+	}
+}
 export const configTemplate: any = {
 	tenant: {
 		db: {
@@ -6,20 +26,7 @@ export const configTemplate: any = {
 			user: `%tenant.env.DB_USER%`,
 			password: `%tenant.env.DB_PASSWORD%`,
 			database: `%tenant.env.DB_NAME%`,
-			ssl: `%?tenant.env.DB_SSL::bool%`,
-			queryTimeoutMs: '%?tenant.env.DB_QUERY_TIMEOUT_MS::number%',
-			statementTimeoutMs: '%?tenant.env.DB_STATEMENT_TIMEOUT_MS::number%',
-			connectionTimeoutMs: '%?tenant.env.DB_CONNECTION_TIMEOUT_MS::number%',
-			pool: {
-				maxConnections: '%?tenant.env.DB_POOL_MAX_CONNECTIONS::number%',
-				maxConnecting: '%?tenant.env.DB_POOL_MAX_CONNECTING::number%',
-				maxIdle: '%?tenant.env.DB_POOL_MAX_IDLE::number%',
-				reconnectIntervalMs: '%?tenant.env.DB_POOL_RECONNECT_INTERVAL_MS::number%',
-				idleTimeoutMs: '%?tenant.env.DB_POOL_IDLE_TIMEOUT_MS::number%',
-				acquireTimeoutMs: '%?tenant.env.DB_POOL_ACQUIRE_TIMEOUT_MS::number%',
-				maxUses: '%?tenant.env.DB_POOL_MAX_USES::number%',
-				maxAgeMs: '%?tenant.env.DB_POOL_MAX_AGE_MS::number%',
-			},
+			...createDbConfigTemplate('tenant.env.DB'),
 		},
 		mailer: {
 			from: '%?tenant.env.MAILER_FROM%',
@@ -47,34 +54,14 @@ export const configTemplate: any = {
 			user: `%?project.env.DB_USER%`,
 			password: `%?project.secret.db.password||project.env.DB_PASSWORD%`,
 			database: `%?project.env.DB_NAME||project.slug%`,
-			ssl: `%?project.env.DB_SSL::bool%`,
-			pool: {
-				maxConnections: '%?project.env.DB_POOL_MAX_CONNECTIONS%',
-				maxConnecting: '%?project.env.DB_POOL_MAX_CONNECTING%',
-				maxIdle: '%?project.env.DB_POOL_MAX_IDLE%',
-				reconnectIntervalMs: '%?project.env.DB_POOL_RECONNECT_INTERVAL_MS%',
-				idleTimeoutMs: '%?project.env.DB_POOL_IDLE_TIMEOUT_MS%',
-				acquireTimeoutMs: '%?project.env.DB_POOL_ACQUIRE_TIMEOUT_MS%',
-				maxUses: '%?project.env.DB_POOL_MAX_USES%',
-				maxAgeMs: '%?project.env.DB_POOL_MAX_AGE_MS%',
-			},
+			...createDbConfigTemplate('project.env.DB'),
 			read: {
 				host: `%?project.env.DB_READ_HOST%`,
 				port: `%?project.env.DB_READ_PORT::number%`,
 				user: `%?project.env.DB_READ_USER%`,
 				password: `%?project.secret.db.read.password||project.env.DB_READ_PASSWORD%`,
 				database: `%?project.env.DB_READ_NAME%`,
-				ssl: `%?project.env.DB_READ_SSL::bool%`,
-				pool: {
-					maxConnections: '%?project.env.DB_READ_POOL_MAX_CONNECTIONS%',
-					maxConnecting: '%?project.env.DB_READ_POOL_MAX_CONNECTING%',
-					maxIdle: '%?project.env.DB_READ_POOL_MAX_IDLE%',
-					reconnectIntervalMs: '%?project.env.DB_READ_POOL_RECONNECT_INTERVAL_MS%',
-					idleTimeoutMs: '%?project.env.DB_READ_POOL_IDLE_TIMEOUT_MS%',
-					acquireTimeoutMs: '%?project.env.DB_READ_POOL_ACQUIRE_TIMEOUT_MS%',
-					maxUses: '%?project.env.DB_READ_POOL_MAX_USES%',
-					maxAgeMs: '%?project.env.DB_READ_POOL_MAX_AGE_MS%',
-				},
+				...createDbConfigTemplate('project.env.DB_READ'),
 			},
 		},
 	},

package/src/projectGroup/ProjectGroupContainer.ts

@@ -22,7 +22,7 @@ import {
 } from '../project'
 import { SystemContainerFactory } from '@contember/engine-system-api'
 import { ProjectConfigResolver } from '../config/projectConfigResolver'
-import { createSecretKey } from 'crypto'
+import { createSecretKey } from 'node:crypto'
 import { Logger } from '@contember/logger'
 
 interface ProjectGroupContainerFactoryArgs

package/src/tsconfig.json

@@ -4,9 +4,6 @@
 		"outDir": "../dist/src"
 	},
 	"references": [
-		{
-			"path": "../../database-migrations/src"
-		},
 		{
 			"path": "../../dic/src"
 		},
@@ -16,21 +13,9 @@
 		{
 			"path": "../../schema/src"
 		},
-		{
-			"path": "../../schema-utils/src"
-		},
-		{
-			"path": "../../schema-definition/src"
-		},
-		{
-			"path": "../../authorization/src"
-		},
 		{
 			"path": "../../database/src"
 		},
-		{
-			"path": "../../queryable/src"
-		},
 		{
 			"path": "../../engine-common/src"
 		},
@@ -60,6 +45,9 @@
 		},
 		{
 			"path": "../../typesafe/src"
+		},
+		{
+			"path": "../../schema-migrations/src"
 		}
 	]
 }

package/src/utils/serverStartup.ts

@@ -1,4 +1,4 @@
-import { join } from 'path'
+import { join } from 'node:path'
 import { ConfigProcessor, Plugin } from '@contember/engine-plugins'
 import { ConfigSource, readConfig, ServerConfig } from '../config/config'
 import { Type } from '@contember/typesafe'

package/src/utils/serverTermination.ts

@@ -1,4 +1,4 @@
-import cluster from 'cluster'
+import cluster from 'node:cluster'
 import { Logger } from '@contember/logger'
 
 const signals = {

package/tests/src/tester.ts

@@ -1,4 +1,4 @@
-import nodeAssert from 'assert'
+import nodeAssert from 'node:assert'
 import supertest from 'supertest'
 import { Schema } from '@contember/schema'
 import {