@ditojs/server 1.25.0 → 1.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "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",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@ditojs/admin": "^1.25.0",
     "@ditojs/build": "^1.25.0",
-    "@ditojs/router": "^1.25.0",
+    "@ditojs/router": "^1.25.1",
     "@ditojs/utils": "^1.25.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
@@ -90,7 +90,7 @@
     "typescript": "^4.9.5"
   },
   "types": "types",
-  "gitHead": "29e7f8d8c613c48a856d90d1ee876e85c8d84c08",
+  "gitHead": "bebbf44ddf15a565e50ed8b2cbe0bf8a463c276d",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/app/Application.js

@@ -6,7 +6,6 @@ import Koa from 'koa'
 import Knex from 'knex'
 import pico from 'picocolors'
 import pino from 'pino'
-import parseDuration from 'parse-duration'
 import bodyParser from 'koa-bodyparser'
 import cors from '@koa/cors'
 import compose from 'koa-compose'
@@ -21,9 +20,9 @@ import responseTime from 'koa-response-time'
 import { Model, knexSnakeCaseMappers, ref } from 'objection'
 import Router from '@ditojs/router'
 import {
-  isArray, isObject, isString, asArray, isPlainObject, isModule,
-  hyphenate, clone, merge, parseDataPath, normalizeDataPath, toPromiseCallback,
-  mapConcurrently
+  isArray, isObject, asArray, isPlainObject, isModule,
+  hyphenate, clone, merge, parseDataPath, normalizeDataPath,
+  toPromiseCallback, mapConcurrently
 } from '@ditojs/utils'
 import SessionStore from './SessionStore.js'
 import { Validator } from './Validator.js'
@@ -32,7 +31,7 @@ import { Controller, AdminController } from '../controllers/index.js'
 import { Service } from '../services/index.js'
 import { Storage } from '../storage/index.js'
 import { convertSchema } from '../schema/index.js'
-import { deprecate } from '../utils/index.js'
+import { getDuration, subtractDuration, deprecate } from '../utils/index.js'
 import {
   ResponseError,
   ValidationError,
@@ -66,6 +65,7 @@ export class Application extends Koa {
       // Pluck keys out of `config.app` to keep them secret
       app: { keys, ...app } = {},
       log,
+      assets,
       logger,
       ...rest
     } = config
@@ -74,6 +74,7 @@ export class Application extends Koa {
       log: log === false || log?.silent || process.env.DITO_SILENT
         ? {}
         : getOptions(log),
+      assets: merge(defaultAssetOptions, getOptions(assets)),
       logger: merge(defaultLoggerOptions, getOptions(logger)),
       ...rest
     }
@@ -805,16 +806,6 @@ export class Application extends Koa {
     removedFiles,
     trx = null
   ) {
-    const {
-      assets: {
-        cleanupTimeThreshold = 0
-      } = {}
-    } = this.config
-    // Only remove unused assets that haven't seen changes for given time frame.
-    const timeThreshold = isString(cleanupTimeThreshold)
-      ? parseDuration(cleanupTimeThreshold)
-      : cleanupTimeThreshold
-
     let importedFiles = []
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
@@ -837,18 +828,20 @@ export class Application extends Koa {
           changeCount(addedFiles, 1),
           changeCount(removedFiles, -1)
         ])
-        if (timeThreshold > 0) {
+        const cleanupTimeThreshold =
+          getDuration(this.config.assets.cleanupTimeThreshold)
+        if (cleanupTimeThreshold > 0) {
           setTimeout(
             // Don't pass `trx` here, as we want this delayed execution to
             // create its own transaction.
-            () => this.releaseUnusedAssets(timeThreshold),
-            timeThreshold
+            () => this.releaseUnusedAssets(),
+            cleanupTimeThreshold
           )
         }
       }
       // Also execute releaseUnusedAssets() immediately in the same
       // transaction, to potentially clean up other pending assets.
-      await this.releaseUnusedAssets(timeThreshold, trx)
+      await this.releaseUnusedAssets(null, trx)
       return importedFiles
     }
   }
@@ -951,21 +944,34 @@ export class Application extends Koa {
     return modifiedFiles
   }
 
-  async releaseUnusedAssets(timeThreshold = 0, trx = null) {
+  async releaseUnusedAssets(timeThreshold = null, trx = null) {
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
+      const { assets } = this.config
+      const cleanupTimeThreshold =
+        getDuration(timeThreshold ?? assets.cleanupTimeThreshold)
+      const danglingTimeThreshold =
+        getDuration(timeThreshold ?? assets.danglingTimeThreshold)
       return AssetModel.transaction(trx, async trx => {
-        // Determine the time threshold in JS instead of SQL, as there is no
-        // easy cross-SQL way to do `now() - interval X hours`:
-        const date = new Date()
-        date.setMilliseconds(date.getMilliseconds() - timeThreshold)
+        // Calculate the date math in JS instead of SQL, as there is no easy
+        // cross-SQL way to do `now() - interval X hours`:
+        const now = new Date()
+        const cleanupDate = subtractDuration(now, cleanupTimeThreshold)
+        const danglingDate = subtractDuration(now, danglingTimeThreshold)
         const orphanedAssets = await AssetModel
           .query(trx)
           .where('count', 0)
-          .andWhere('updatedAt', '<=', date)
-          // Protect freshly created assets from being deleted again right away,
-          // .e.g. when `config.assets.cleanupTimeThreshold = 0`
-          .andWhere('updatedAt', '>', ref('createdAt'))
+          .andWhere(
+            query => query
+              .where('updatedAt', '<=', cleanupDate)
+              .orWhere(
+                // Protect freshly created assets from being deleted again right
+                // away, .e.g. when `config.assets.cleanupTimeThreshold = 0`
+                query => query
+                  .where('updatedAt', '=', ref('createdAt'))
+                  .andWhere('updatedAt', '<=', danglingDate)
+              )
+          )
         if (orphanedAssets.length > 0) {
           const orphanedKeys = await mapConcurrently(
             orphanedAssets,
@@ -998,6 +1004,17 @@ function getOptions(options) {
   return isObject(options) ? options : {}
 }
 
+const defaultAssetOptions = {
+  // Only remove unused or dangling assets that haven't seen changes for
+  // these given time frames. Set to `0` to clean up instantly.
+  cleanupTimeThreshold: '24h',
+  // Dangling assets are those that got uploaded but never actually persisted in
+  // the model. This can happen when the admin uploads a file but doesn't store
+  // the associated form. This cannot be set to 0 or else the the file would be
+  // deleted immediately after upload.
+  danglingTimeThreshold: '24h'
+}
+
 const { err, req, res } = pino.stdSerializers
 const defaultLoggerOptions = {
   level: 'info',

package/src/utils/date.js

@@ -0,0 +1,15 @@
+import { isNumber } from '@ditojs/utils'
+import parseDuration from 'parse-duration'
+
+export function getDuration(duration) {
+  return isNumber(duration) ? duration : parseDuration(duration)
+}
+
+export function addDuration(date, duration) {
+  date.setMilliseconds(date.getMilliseconds() + getDuration(duration))
+  return date
+}
+
+export function subtractDuration(date, duration) {
+  return addDuration(date, -getDuration(duration))
+}

package/src/utils/index.js

@@ -1,3 +1,4 @@
+export * from './date.js'
 export * from './decorator.js'
 export * from './deprecate.js'
 export * from './emitter.js'