@ditojs/server 1.5.2 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -81,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "b7861d7cea5426a8a487ce4c3b9d9f1ff3e908ce"
+  "gitHead": "ec436ef535d96b1653914df6194cc865dfe16ead"
 }

package/src/app/Application.js

@@ -42,6 +42,7 @@ import {
 import {
   attachLogger,
   createTransaction,
+  ensureRunning,
   findRoute,
   handleError,
   handleRoute,
@@ -74,7 +75,6 @@ export class Application extends Koa {
       log = {},
       ...rest
     } = config
-    this.server = null
     this.config = {
       app,
       log: log.silent || process.env.DITO_SILENT ? {} : log,
@@ -89,6 +89,9 @@ export class Application extends Koa {
     this.models = Object.create(null)
     this.services = Object.create(null)
     this.controllers = Object.create(null)
+    this.server = null
+    this.isRunning = false
+
     this.setupLogger()
     this.setupKnex()
     this.setupMiddleware(middleware)
@@ -107,10 +110,6 @@ export class Application extends Koa {
     }
   }
 
-  get isRunning() {
-    return !!this.server
-  }
-
   addRoute(
     method, path, transacted, middlewares, controller = null, action = null
   ) {
@@ -509,6 +508,7 @@ export class Application extends Koa {
 
     // Setup global middleware
 
+    this.use(ensureRunning(this))
     this.use(attachLogger(this.logger))
     if (app.responseTime !== false) {
       this.use(responseTime(getOptions(app.responseTime)))
@@ -731,6 +731,7 @@ export class Application extends Koa {
     if (!this.server) {
       throw new Error('Unable to start Dito.js server')
     }
+    this.isRunning = true
     await this.emit('after:start')
   }
 
@@ -741,6 +742,7 @@ export class Application extends Koa {
 
     const promise = (async () => {
       await this.emit('before:stop')
+      this.isRunning = false
       await new Promise((resolve, reject) => {
         this.server.close(toPromiseCallback(resolve, reject))
       })

package/src/controllers/AdminController.js

@@ -150,12 +150,12 @@ export class AdminController extends Controller {
     this.app.once('before:stop', () => {
       // For good timing it seems crucial to not add more ticks with async
       // signature, so we directly return the `server.close()` promise instead.
-      process.exit = exit
       if (!closed) {
         closed = true
         return server.close()
       }
     })
+
     this.koa.use(handleConnectMiddleware(server.middlewares, {
       expandMountPath: true
     }))

package/src/middleware/ensureRunning.js

@@ -0,0 +1,13 @@
+export function ensureRunning(app) {
+  return async (ctx, next) => {
+    if (app.isRunning) {
+      await next()
+    } else {
+      // When the app isn't running, e.g. while stopping, we don't want to send
+      // content back anymore even if the controllers would still respond. This
+      // is to avoid strange behavior during shut-down of the vite dev server.
+      // For that scenario, sending back an empty 205 response seems to work.
+      ctx.status = 205 // HTTP_RESET_CONTENT
+    }
+  }
+}

package/src/middleware/index.js

@@ -1,5 +1,6 @@
 export * from './attachLogger.js'
 export * from './createTransaction.js'
+export * from './ensureRunning.js'
 export * from './findRoute.js'
 export * from './handleConnectMiddleware.js'
 export * from './handleError.js'