@ditojs/server 2.43.0 → 2.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.43.0",
+  "version": "2.44.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": "^2.43.0",
-    "@ditojs/build": "^2.43.0",
-    "@ditojs/router": "^2.43.0",
-    "@ditojs/utils": "^2.43.0",
+    "@ditojs/admin": "^2.44.0",
+    "@ditojs/build": "^2.44.0",
+    "@ditojs/router": "^2.44.0",
+    "@ditojs/utils": "^2.44.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -38,9 +38,9 @@
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^6.0.2",
     "eventemitter2": "^6.4.9",
-    "file-type": "^20.0.0",
+    "file-type": "^20.4.0",
     "helmet": "^8.0.0",
-    "koa": "^2.15.3",
+    "koa": "^2.16.0",
     "koa-bodyparser": "^4.4.1",
     "koa-compose": "^4.1.0",
     "koa-compress": "^5.1.1",
@@ -56,8 +56,8 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
-    "nanoid": "^5.0.9",
-    "parse-duration": "^2.0.1",
+    "nanoid": "^5.1.3",
+    "parse-duration": "^2.1.3",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.1.1",
@@ -66,8 +66,8 @@
     "pino-pretty": "^13.0.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
-    "type-fest": "^4.33.0",
-    "uuid": "^11.0.5"
+    "type-fest": "^4.37.0",
+    "uuid": "^11.1.0"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
@@ -84,11 +84,11 @@
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.0",
-    "@types/node": "^22.12.0",
+    "@types/node": "^22.13.10",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "types": "types",
-  "gitHead": "d24c0baf4d4f3156f5803cff71a6f13c3085037f"
+  "gitHead": "64f76ac9f74a8915bc02bfea79f0db125f3f4437"
 }

package/src/app/Application.js

@@ -886,7 +886,7 @@ export class Application extends Koa {
 
   // Assets handling
 
-  async createAssets(storage, files, count = 0, trx = null) {
+  async createAssets(storage, files, count = 0, transaction = null) {
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
       const assets = files.map(file => ({
@@ -895,7 +895,7 @@ export class Application extends Koa {
         storage: storage.name,
         count
       }))
-      return AssetModel.query(trx).insert(assets)
+      return AssetModel.query(transaction).insert(assets)
     }
     return null
   }
@@ -905,7 +905,7 @@ export class Application extends Koa {
     addedFiles,
     removedFiles,
     changedFiles,
-    trx = null
+    transaction = null
   ) {
     let importedFiles = []
     const AssetModel = this.getModel('Asset')
@@ -913,7 +913,7 @@ export class Application extends Koa {
       importedFiles = await this.addForeignAssets(
         storage,
         [...addedFiles, ...changedFiles],
-        trx
+        transaction
       )
       if (
         addedFiles.length > 0 ||
@@ -921,7 +921,7 @@ export class Application extends Koa {
       ) {
         const changeCount = async (files, increment) => {
           if (files.length > 0) {
-            await AssetModel.query(trx)
+            await AssetModel.query(transaction)
               .whereIn(
                 'key',
                 files.map(file => file.key)
@@ -938,8 +938,8 @@ export class Application extends Koa {
         )
         if (cleanupTimeThreshold > 0) {
           setTimeout(
-            // Don't pass `trx` here, as we want this delayed execution to
-            // create its own transaction.
+            // Don't pass `transaction` here, as we want this delayed execution
+            // to create its own transaction.
             () => this.releaseUnusedAssets(),
             cleanupTimeThreshold
           )
@@ -947,12 +947,12 @@ export class Application extends Koa {
       }
       // Also execute releaseUnusedAssets() immediately in the same
       // transaction, to potentially clean up other pending assets.
-      await this.releaseUnusedAssets(null, trx)
+      await this.releaseUnusedAssets({ transaction })
       return importedFiles
     }
   }
 
-  async addForeignAssets(storage, files, trx = null) {
+  async addForeignAssets(storage, files, transaction = null) {
     const importedFiles = []
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
@@ -961,7 +961,7 @@ export class Application extends Koa {
       await mapConcurrently(
         Object.entries(filesByKey),
         async ([key, files]) => {
-          const asset = await AssetModel.query(trx).findOne('key', key)
+          const asset = await AssetModel.query(transaction).findOne('key', key)
           if (!asset) {
             const [file] = files // Pick the first file
             if (file.data || file.url) {
@@ -997,7 +997,7 @@ export class Application extends Koa {
                 }
               }
               const importedFile = await storage.addFile(file, data)
-              await this.createAssets(storage, [importedFile], 0, trx)
+              await this.createAssets(storage, [importedFile], 0, transaction)
               importedFiles.push(importedFile)
               // Merge back the changed file properties into the actual file
               // objects, so that the data from the static model hook can be
@@ -1030,36 +1030,47 @@ export class Application extends Koa {
     return importedFiles
   }
 
-  async handleModifiedAssets(storage, files, trx = null) {
+  async handleModifiedAssets(storage, files, transaction = null) {
     const modifiedFiles = []
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
-      await mapConcurrently(files, async file => {
-        if (file.data) {
-          const asset = await AssetModel.query(trx).findOne('key', file.key)
-          if (asset) {
-            const changedFile = await storage.addFile(file, file.data)
-            // Merge back the changed file properties into the actual files
-            // object, so that the data from the static model hook can be used
-            // directly for the actual running query.
-            Object.assign(file, changedFile)
-            modifiedFiles.push(changedFile)
-          } else {
-            throw new AssetError(
-              `Unable to update modified asset from memory source: '${
-                file.name
-              }' ('${
-                file.key
-              }')`
+      await mapConcurrently(
+        files,
+        async file => {
+          if (file.data) {
+            const asset = await AssetModel.query(transaction).findOne(
+              'key',
+              file.key
             )
+            if (asset) {
+              const changedFile = await storage.addFile(file, file.data)
+              // Merge back the changed file properties into the actual files
+              // object, so that the data from the static model hook can be used
+              // directly for the actual running query.
+              Object.assign(file, changedFile)
+              modifiedFiles.push(changedFile)
+            } else {
+              throw new AssetError(
+                `Unable to update modified asset from memory source: '${
+                  file.name
+                }' ('${
+                  file.key
+                }')`
+              )
+            }
           }
-        }
-      })
+        },
+        { concurrency: storage.concurrency }
+      )
     }
     return modifiedFiles
   }
 
-  async releaseUnusedAssets(timeThreshold = null, trx = null) {
+  async releaseUnusedAssets({
+    timeThreshold = null,
+    transaction = null,
+    concurrency = 8
+  } = {}) {
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
       const { assets } = this.config
@@ -1069,7 +1080,7 @@ export class Application extends Koa {
       const danglingTimeThreshold = getDuration(
         timeThreshold ?? assets.danglingTimeThreshold
       )
-      return AssetModel.transaction(trx, async trx => {
+      return AssetModel.transaction(transaction, async trx => {
         // 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()
@@ -1100,7 +1111,8 @@ export class Application extends Koa {
                 asset.error = error
               }
               return asset.key
-            }
+            },
+            { concurrency }
           )
           await AssetModel.query(trx).delete().whereIn('key', orphanedKeys)
         }

package/src/utils/duration.js

@@ -1,8 +1,9 @@
 import { isNumber } from '@ditojs/utils'
-import { parse } from 'parse-duration'
+// eslint-disable-next-line import/default
+import parseDuration from 'parse-duration'
 
 export function getDuration(duration) {
-  return isNumber(duration) ? duration : parse(duration)
+  return isNumber(duration) ? duration : parseDuration(duration)
 }
 
 export function addDuration(date, duration) {