@ditojs/server 1.5.2 → 1.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "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",
@@ -21,23 +21,23 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.5.0",
-    "@ditojs/build": "^1.5.0",
-    "@ditojs/router": "^1.5.0",
-    "@ditojs/utils": "^1.5.0",
+    "@ditojs/admin": "^1.5.5",
+    "@ditojs/build": "^1.5.5",
+    "@ditojs/router": "^1.5.5",
+    "@ditojs/utils": "^1.5.5",
     "@koa/cors": "^3.3.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "aws-sdk": "^2.1108.0",
-    "axios": "^0.26.1",
+    "aws-sdk": "^2.1131.0",
+    "axios": "^0.27.2",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^4.0.0",
     "eventemitter2": "^6.4.5",
     "file-type": "^17.1.1",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^10.1.0",
     "image-size": "^1.0.1",
     "is-svg": "^4.3.2",
     "koa": "^2.13.4",
@@ -55,31 +55,29 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.4",
     "multer-s3": "^2.10.0",
-    "nanoid": "^3.3.2",
+    "nanoid": "^3.3.4",
     "parse-duration": "^1.0.2",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^7.9.2",
-    "pino-pretty": "^7.6.0",
+    "pino": "^7.11.0",
+    "pino-pretty": "^7.6.1",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^8.3.2",
-    "vite": "^2.9.1",
-    "vite-plugin-vue2": "^1.9.3",
+    "vite": "^2.9.8",
+    "vite-plugin-vue2": "^2.0.0",
     "vue": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
   },
   "peerDependencies": {
-    "knex": "^1.0.4",
+    "knex": "^1.0.5",
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "knex": "^1.0.5",
-    "objection": "^3.0.1",
-    "pg": "^8.7.3",
-    "sqlite3": "^5.0.2"
+    "knex": "^2.0.0",
+    "objection": "^3.0.1"
   },
-  "gitHead": "b7861d7cea5426a8a487ce4c3b9d9f1ff3e908ce"
+  "gitHead": "157b519f3f3552fb25b67adf7e0fd402485ac4c9"
 }

package/src/app/Application.js

@@ -74,7 +74,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 +88,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 +109,6 @@ export class Application extends Koa {
     }
   }
 
-  get isRunning() {
-    return !!this.server
-  }
-
   addRoute(
     method, path, transacted, middlewares, controller = null, action = null
   ) {
@@ -731,6 +729,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 +740,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/cli/db/migrate.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function migrate(knex) {
-  const [batch, log] = await knex.migrate.latest()
+export async function migrate(knex, config) {
+  const [batch, log] = await knex.migrate.latest(config)
   console.info(log.length === 0
     ? pico.cyan('Already up to date')
     : pico.green(`Batch ${batch} run: ${log.length} migrations\n`) +

package/src/cli/db/reset.js

@@ -1,11 +1,11 @@
 import pico from 'picocolors'
 import { migrate } from './migrate.js'
 
-export async function reset(knex) {
+export async function reset(knex, config) {
   const batches = []
   const migrations = []
   while (true) {
-    const [batch, log] = await knex.migrate.rollback()
+    const [batch, log] = await knex.migrate.rollback(config)
     if (log.length === 0) break
     batches.push(batch)
     migrations.push(...log)

package/src/cli/db/rollback.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function rollback(knex) {
-  const [batch, log] = await knex.migrate.rollback()
+export async function rollback(knex, config) {
+  const [batch, log] = await knex.migrate.rollback(config)
   console.info(log.length === 0
     ? pico.cyan('Already at the base migration')
     : pico.green(`Batch ${batch} rolled back: ${log.length} migrations\n`) +

package/src/cli/db/unlock.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function unlock(knex) {
-  await knex.migrate.forceFreeMigrationsLock()
+export async function unlock(knex, config) {
+  await knex.migrate.forceFreeMigrationsLock(config)
   console.info(
     pico.green(`Successfully unlocked the migrations lock table`)
   )

package/src/cli/index.js

@@ -8,10 +8,6 @@ import { isPlainObject, isFunction, camelize } from '@ditojs/utils'
 import * as db from './db/index.js'
 import startConsole from './console.js'
 
-// Tell Knex to use ESM. TODO: Fix this properly in Knex itself, so it works
-// with Yarn too.
-process.env.npm_package_type = 'module'
-
 const commands = { db, console: startConsole }
 
 function getCommand(commands, parts) {
@@ -44,8 +40,14 @@ async function execute() {
     }
     if (isFunction(arg)) {
       arg = await arg()
-    } else if (isPlainObject(arg) && arg.knex) {
+    }
+    if (isPlainObject(arg) && arg.knex) {
+      // A config object with a knex field was passed in, create a knex object
+      // from it to pass on to the execute function.
       arg = Knex(arg.knex)
+      // Also add `knex.migrations` config as the first argument to `execute()`,
+      // so db:migrate & co. can receive migration configuration settings.
+      args.unshift(arg.knex.migrations || null)
     }
     const res = await execute(arg, ...args)
     process.exit(res === true ? 0 : 1)

package/src/controllers/AdminController.js

@@ -33,6 +33,7 @@ export class AdminController extends Controller {
     this.mode = this.config.mode || (
       this.app.config.env === 'development' ? 'development' : 'production'
     )
+    this.closed = false
   }
 
   getPath(name) {
@@ -81,13 +82,21 @@ export class AdminController extends Controller {
     // Shield admin views against unauthorized access.
     const authorization = this.processAuthorize(this.authorize)
     return async (ctx, next) => {
-      if (ctx.url === '/dito.js') {
-        // Return without calling `next()`
-        return this.sendDitoObject(ctx)
-      } else if (/\/views\b/.test(ctx.url)) {
-        await this.handleAuthorization(authorization, ctx)
+      if (this.closed) {
+        // Avoid strange behavior during shut-down of the vite dev server.
+        // Sending back a 408 response seems to work best, while a 503 sadly
+        // would put the client into a state that prevents the server from a
+        // proper shut-down, and a 205 would kill future hot-reloads.
+        ctx.status = 408 // Request Timeout
+      } else if (ctx.url === '/dito.js') {
+        // Don't call `next()`
+        this.sendDitoObject(ctx)
+      } else {
+        if (/\/views\b/.test(ctx.url)) {
+          await this.handleAuthorization(authorization, ctx)
+        }
+        await next()
       }
-      await next()
     }
   }
 
@@ -131,7 +140,7 @@ export class AdminController extends Controller {
       }
     })
 
-    let closed = false
+    this.closed = false
 
     // Monkey-patch `process.exit()` to filter out the calls caused by vite's
     // handling of SIGTERM, see: https://github.com/vitejs/vite/issues/7627
@@ -140,22 +149,23 @@ export class AdminController extends Controller {
       if (new Error().stack.includes('/vite/dist/')) {
         // vite's own `exitProcess()` just called `process.exit(), and this
         // means it has already called `server.close()` internally.
-        closed = true
+        this.closed = true
         process.exit = exit
       } else {
         exit(code)
       }
     }
 
-    this.app.once('before:stop', () => {
+    this.app.once('after: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
+      if (!this.closed) {
+        this.closed = true
         return server.close()
       }
     })
+
     this.koa.use(handleConnectMiddleware(server.middlewares, {
       expandMountPath: true
     }))