@contember/engine-server 2.1.0-alpha.9 → 2.1.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-server",
-  "version": "2.1.0-alpha.9",
+  "version": "2.1.0-beta.1",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,18 +23,23 @@
     }
   },
   "dependencies": {
-    "@contember/engine-actions": "2.1.0-alpha.9",
-    "@contember/engine-http": "2.1.0-alpha.9",
-    "@contember/engine-plugins": "2.1.0-alpha.9",
-    "@contember/engine-s3-plugin": "2.1.0-alpha.9",
-    "@contember/engine-vimeo-plugin": "2.1.0-alpha.9",
-    "graphql": "^16.9.0",
-    "pg": "^8.12.0",
-    "uuid": "^11.0.5"
+    "@contember/engine-actions": "2.1.0-beta.1",
+    "@contember/engine-http": "2.1.0-beta.1",
+    "@contember/engine-plugins": "2.1.0-beta.1",
+    "@contember/engine-s3-plugin": "2.1.0-beta.1",
+    "@contember/engine-vimeo-plugin": "2.1.0-beta.1",
+    "graphql": "^16.13.1",
+    "pg": "^8.20.0",
+    "uuid": "^13.0.0"
   },
   "devDependencies": {
-    "@types/koa-compress": "^4.0.6",
-    "@types/node": "^20.17.22"
+    "@types/koa-compress": "^4.0.7",
+    "@types/node": "^24.12.0"
   },
-  "type": "module"
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/contember/contember.git",
+    "directory": "packages/engine-server"
+  }
 }

package/src/cluster.ts

@@ -39,7 +39,6 @@ export const notifyWorkerStarted = () =>
 	})
 
 export class WorkerManager {
-
 	private isTerminating = false
 
 	private workers: Set<Worker> = new Set()
@@ -61,7 +60,6 @@ export class WorkerManager {
 		worker.on('exit', async (code, signal) => {
 			this.workers.delete(worker)
 			if (!this.isTerminating) {
-				// eslint-disable-next-line no-console
 				console.log(`Worker ${worker.process.pid} died with signal ${signal}, restarting`)
 				await timeout(2000)
 				await this.startWorker(env)
@@ -76,20 +74,20 @@ export class WorkerManager {
 			throw new Error(`Worker manager is terminating`)
 		}
 		this.isTerminating = true
-		await Promise.allSettled(Array.from(this.workers).map(async it => {
-			if (!it) {
-				return
-			}
-			// eslint-disable-next-line no-console
-			console.log(`Terminating worker ${it.process.pid}`)
-			const disconnectPromise = new Promise(resolve => it.once('disconnect', resolve))
-			it.disconnect()
-			await disconnectPromise
-			const killPromise = new Promise(resolve => it.once('exit', resolve))
-			it.kill(signal)
-			await killPromise
-			// eslint-disable-next-line no-console
-			console.log(`Worker ${it.process.pid} terminated`)
-		}))
+		await Promise.allSettled(
+			Array.from(this.workers).map(async it => {
+				if (!it) {
+					return
+				}
+				console.log(`Terminating worker ${it.process.pid}`)
+				const disconnectPromise = new Promise(resolve => it.once('disconnect', resolve))
+				it.disconnect()
+				await disconnectPromise
+				const killPromise = new Promise(resolve => it.once('exit', resolve))
+				it.kill(signal)
+				await killPromise
+				console.log(`Worker ${it.process.pid} terminated`)
+			}),
+		)
 	}
 }

package/src/start.ts

@@ -106,11 +106,10 @@ process.on('warning', message => {
 			},
 		})
 		terminationJobs.push(async () => {
-			(await runningWorker).end()
+			;(await runningWorker).end()
 		})
 		await runningWorker
 		logger.info(`Contember Worker ${workerName} started.`)
-
 	}
 
 	const applicationWorker = serverConfig.applicationWorker
@@ -133,7 +132,8 @@ process.on('warning', message => {
 			if (applicationWorker === 'all') {
 				for (const workerName of container.applicationWorkers.getWorkerNames()) {
 					await workerManager.start({
-						workerCount, env: {
+						workerCount,
+						env: {
 							CONTEMBER_APPLICATION_WORKER: workerName,
 						},
 					})
@@ -158,7 +158,6 @@ process.on('warning', message => {
 		}
 		printStarted()
 	}
-
 })().catch(e => {
 	logger.crit(e)
 	process.exit(1)