@ditojs/server 1.17.0 → 1.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "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",
@@ -25,10 +25,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.17.0",
+    "@ditojs/admin": "^1.18.0",
     "@ditojs/build": "^1.14.0",
-    "@ditojs/router": "^1.17.0",
-    "@ditojs/utils": "^1.17.0",
+    "@ditojs/router": "^1.18.0",
+    "@ditojs/utils": "^1.18.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -49,9 +49,9 @@
     "koa-etag": "^4.0.0",
     "koa-helmet": "^6.1.0",
     "koa-mount": "^4.0.0",
-    "koa-passport": "^4.1.4",
+    "koa-passport": "https://github.com/ditojs/koa-passport#dito",
     "koa-response-time": "^2.1.0",
-    "koa-session": "^6.2.0",
+    "koa-session": "https://github.com/ditojs/koa-session#dito",
     "koa-static": "^5.0.0",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
@@ -67,7 +67,7 @@
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^9.0.0",
-    "vite": "^3.2.4",
+    "vite": "^3.2.5",
     "vite-plugin-vue2": "^2.0.2",
     "vue": "^2.7.14",
     "vue-template-compiler": "^2.7.14"
@@ -94,5 +94,5 @@
     "typescript": "^4.9.3"
   },
   "types": "types",
-  "gitHead": "45d692909e0ed637fdabe4568f971aeed7e84388"
+  "gitHead": "6d5e8c9d08b4e5a15080b01d7f70a53f98b3a819"
 }

package/src/app/Application.js

@@ -64,12 +64,16 @@ export class Application extends Koa {
     const {
       // Pluck keys out of `config.app` to keep them secret
       app: { keys, ...app } = {},
-      log = {},
+      log,
+      logger,
       ...rest
     } = config
     this.config = {
       app,
-      log: log.silent || process.env.DITO_SILENT ? {} : log,
+      log: log === false || log?.silent || process.env.DITO_SILENT
+        ? {}
+        : getOptions(log),
+      logger: merge(defaultLoggerOptions, getOptions(logger)),
       ...rest
     }
     this.keys = keys
@@ -582,39 +586,13 @@ export class Application extends Koa {
   }
 
   setupLogger() {
-    const { err, req, res } = pino.stdSerializers
-    // Only include `id` from the user, to not inadvertently log PII.
-    const user = user => ({ id: user.id })
-    const serializers = { err, req, res, user }
-
-    const { prettyPrint, ...options } = merge({
-      level: 'info',
-      serializers,
-      prettyPrint: {
-        colorize: true,
-        // List of keys to ignore in pretty mode.
-        ignore: 'req,res,durationMs,user,requestId',
-        // SYS to use system time and not UTC.
-        translateTime: 'SYS:HH:MM:ss.l'
-      },
-      // Redact common sensitive headers.
-      redact: [
-        '*.headers["cookie"]',
-        '*.headers["set-cookie"]',
-        '*.headers["authorization"]'
-      ],
-      base: null // no pid,hostname,name
-    }, getOptions(this.config.logger))
-
+    const { prettyPrint, ...options } = this.config.logger
     const transport = prettyPrint
       ? pino.transport({
         target: 'pino-pretty',
         options: prettyPrint
       }) : null
-
-    const logger = pino(options, transport)
-
-    this.logger = logger.child({ name: 'app' })
+    this.logger = pino(options, transport).child({ name: 'app' })
   }
 
   setupKnex() {
@@ -699,11 +677,14 @@ export class Application extends Koa {
     }
     // Use `util.inspect()` instead of Pino's internal error logging for better
     // stack traces and logging of error data.
-    return util.inspect(copy, {
-      compact: false,
-      depth: null,
-      maxArrayLength: null
-    })
+    return this.config.logger.prettyPrint
+      ? util.inspect(copy, {
+        colors: !!this.config.logger.prettyPrint.colorize,
+        compact: false,
+        depth: null,
+        maxArrayLength: null
+      })
+      : copy
   }
 
   logError(error, ctx) {
@@ -1015,3 +996,29 @@ EventEmitter.mixin(Application.prototype)
 function getOptions(options) {
   return isObject(options) ? options : {}
 }
+
+const { err, req, res } = pino.stdSerializers
+const defaultLoggerOptions = {
+  level: 'info',
+  serializers: {
+    err,
+    req,
+    res,
+    // Only include `id` from the user, to not inadvertently log PII.
+    user: user => ({ id: user.id })
+  },
+  prettyPrint: {
+    colorize: true,
+    // List of keys to ignore in pretty mode.
+    ignore: 'req,res,durationMs,user,requestId',
+    // SYS to use system time and not UTC.
+    translateTime: 'SYS:HH:MM:ss.l'
+  },
+  // Redact common sensitive headers.
+  redact: [
+    '*.headers["cookie"]',
+    '*.headers["set-cookie"]',
+    '*.headers["authorization"]'
+  ],
+  base: null // no pid,hostname,name
+}

package/src/controllers/AdminController.js

@@ -208,7 +208,7 @@ export class AdminController extends Controller {
                     return 'common'
                   } else {
                     const module = id.match(/node_modules\/([^/$]*)/)?.[1] || ''
-                    return testModuleIdentifier(module, CORE_DEPENDENCIES)
+                    return testModuleIdentifier(module, coreDependencies)
                       ? 'core'
                       : 'vendor'
                   }
@@ -219,10 +219,10 @@ export class AdminController extends Controller {
         )
       },
       optimizeDeps: {
-        exclude: development ? DITO_PACKAGES : [],
+        exclude: development ? ditoPackages : [],
         include: [
-          ...(development ? [] : DITO_PACKAGES),
-          ...NON_ESM_DEPENDENCIES
+          ...(development ? [] : ditoPackages),
+          ...nonEsmDependencies
         ]
       },
       resolve: {
@@ -240,13 +240,13 @@ export class AdminController extends Controller {
   }
 }
 
-const DITO_PACKAGES = [
+const ditoPackages = [
   '@ditojs/admin',
   '@ditojs/ui',
   '@ditojs/utils'
 ]
 
-const NON_ESM_DEPENDENCIES = [
+const nonEsmDependencies = [
   // All non-es modules need to be explicitly included here, and some of
   // them only work due to the use of `createCommonJsPlugin()`.
   'vue-color',
@@ -256,8 +256,8 @@ const NON_ESM_DEPENDENCIES = [
   'lowlight'
 ]
 
-const CORE_DEPENDENCIES = [
-  ...DITO_PACKAGES,
+const coreDependencies = [
+  ...ditoPackages,
 
   // TODO: Figure out a way to generate this automatically for the current
   // dito-admin dependencies, e.g. similar to

package/src/middleware/handleUser.js

@@ -7,16 +7,16 @@ export function handleUser() {
     // on the user model:
     const { login, logout } = ctx
 
-    ctx.login = async function(user, options = {}) {
+    ctx.login = ctx.logIn = async function(user, options = {}) {
       await user.$emit('before:login', options)
       await login.call(this, user, options)
       await user.$emit('after:login', options)
     }
 
-    ctx.logout = async function(options = {}) {
+    ctx.logout = ctx.logOut = async function(options = {}) {
       const { user } = ctx.state
       await user?.$emit('before:logout', options)
-      await logout.call(this) // No options in passport's logout()
+      await logout.call(this, options)
       // Clear the session after logout, apparently koa-passport doesn't take
       // care of this itself:
       // https://stackoverflow.com/questions/55818887/koa-passport-logout-is-not-clearing-session