@ditojs/server 1.23.0 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.23.0",
+  "version": "1.24.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",
@@ -22,10 +22,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.23.0",
-    "@ditojs/build": "^1.23.0",
-    "@ditojs/router": "^1.23.0",
-    "@ditojs/utils": "^1.23.0",
+    "@ditojs/admin": "^1.24.0",
+    "@ditojs/build": "^1.24.0",
+    "@ditojs/router": "^1.24.0",
+    "@ditojs/utils": "^1.24.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -35,9 +35,8 @@
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^4.0.1",
     "eventemitter2": "^6.4.9",
-    "file-type": "^18.2.0",
+    "file-type": "^18.2.1",
     "image-size": "^1.0.2",
-    "is-svg": "^4.3.2",
     "koa": "^2.14.1",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.1.0",
@@ -59,12 +58,12 @@
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^8.9.0",
-    "pino-pretty": "^9.1.1",
+    "pino": "^8.11.0",
+    "pino-pretty": "^9.4.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^9.0.0",
-    "vite": "^4.1.1",
+    "vite": "^4.1.4",
     "vite-plugin-vue2": "^2.0.3",
     "vue": "^2.7.14",
     "vue-template-compiler": "^2.7.14"
@@ -83,15 +82,15 @@
     "@types/koa-response-time": "^2.1.2",
     "@types/koa-session": "^5.10.6",
     "@types/koa-static": "^4.0.2",
-    "@types/koa__cors": "^3.3.0",
-    "@types/node": "^18.11.19",
+    "@types/koa__cors": "^3.3.1",
+    "@types/node": "^18.14.2",
     "knex": "^2.4.2",
     "objection": "^3.0.1",
-    "type-fest": "^3.5.5",
+    "type-fest": "^3.6.1",
     "typescript": "^4.9.5"
   },
   "types": "types",
-  "gitHead": "3258fd030226062efa6837bfc5e5a761e80cead5",
+  "gitHead": "0ca96ce0335509daa9ebbac278ae2d346015baad",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/app/Application.js

@@ -706,7 +706,7 @@ export class Application extends Koa {
       this.on('error', this.logError)
     }
     // It's ok to call this multiple times, because only the entries in the
-    // registres (storages, services, models, controllers) that weren't
+    // registers (storages, services, models, controllers) that weren't
     // initialized yet will be initialized.
     await this.setup()
     await this.emit('before:start')
@@ -797,7 +797,7 @@ export class Application extends Koa {
     return null
   }
 
-  async handleAdddedAndRemovedAssets(
+  async handleAddedAndRemovedAssets(
     storage,
     addedFiles,
     removedFiles,
@@ -808,7 +808,7 @@ export class Application extends Koa {
         cleanupTimeThreshold = 0
       } = {}
     } = this.config
-    // Only remove unused assets that haven't seen changes for given timeframe.
+    // Only remove unused assets that haven't seen changes for given time frame.
     const timeThreshold = isString(cleanupTimeThreshold)
       ? parseDuration(cleanupTimeThreshold)
       : cleanupTimeThreshold

package/src/models/Model.js

@@ -985,14 +985,14 @@ export class Model extends objection.Model {
         const removedFiles = beforeFiles.filter(file => !afterByKey[file.key])
         const addedFiles = afterFiles.filter(file => !beforeByKey[file.key])
         // Also handle modified files, which are files where the data property
-        // is changed before update / patch, meanting the file is changed.
+        // is changed before update / patch, meaning the file is changed.
         // NOTE: This will change the content for all the references to it,
         // and thus should only really be used when there's only one reference.
         const modifiedFiles = afterFiles.filter(
           file => file.data && beforeByKey[file.key]
         )
         importedFiles.push(
-          ...await this.app.handleAdddedAndRemovedAssets(
+          ...await this.app.handleAddedAndRemovedAssets(
             storage,
             addedFiles,
             removedFiles,

package/src/storage/AssetFile.js

@@ -8,11 +8,13 @@ const SYMBOL_STORAGE = Symbol('storage')
 const SYMBOL_DATA = Symbol('data')
 
 export class AssetFile {
-  constructor(name, data, type) {
+  constructor({ name, data, type, width, height }) {
     this.key = AssetFile.getUniqueKey(name)
     this.name = name
     // Set `type` before `data`, so it can be used as default in `set data`
     this.type = type
+    this.width = width
+    this.height = height
     this.data = data
   }
 
@@ -60,8 +62,8 @@ export class AssetFile {
     return object
   }
 
-  static create({ name, data, type }) {
-    return new AssetFile(name, data, type)
+  static create(options) {
+    return new AssetFile(options)
   }
 
   static getUniqueKey(name) {

package/src/storage/DiskStorage.js

@@ -38,11 +38,11 @@ export class DiskStorage extends Storage {
   }
 
   // @override
-  async _addFile(file, buffer) {
+  async _addFile(file, data) {
     const filePath = this._getFilePath(file)
     const dir = path.dirname(filePath)
     await fs.mkdir(dir, { recursive: true })
-    await fs.writeFile(filePath, buffer)
+    await fs.writeFile(filePath, data)
     return file
   }
 

package/src/storage/S3Storage.js

@@ -1,9 +1,9 @@
 import multerS3 from 'multer-s3'
 import { fileTypeFromBuffer } from 'file-type'
-import isSvg from 'is-svg'
 import { Storage } from './Storage.js'
 import { PassThrough } from 'stream'
 import consumers from 'stream/consumers'
+import imageSize from 'image-size'
 
 export class S3Storage extends Storage {
   static type = 's3'
@@ -56,7 +56,7 @@ export class S3Storage extends Storage {
           const onData = chunk => {
             if (!data) {
               // 2. Try reading the mimetype from the first chunk.
-              const type = fileTypeFromBuffer(chunk)?.mime
+              const type = getFileTypeFromBuffer(chunk)
               if (type) {
                 stream.off('data', onData)
                 done(type)
@@ -64,11 +64,9 @@ export class S3Storage extends Storage {
                 // 3. If that fails, keep collecting all chunks and determine
                 //    the mimetype using the full data.
                 stream.once('end', () => {
-                  const type = (
-                    fileTypeFromBuffer(data)?.mime ||
-                    (isSvg(data) ? 'image/svg+xml' : 'application/octet-stream')
+                  done(
+                    getFileTypeFromBuffer(data) || 'application/octet-stream'
                   )
-                  done(type)
                 })
               }
             }
@@ -107,19 +105,19 @@ export class S3Storage extends Storage {
   }
 
   // @override
-  async _addFile(file, buffer) {
-    const data = await this.s3.putObject({
+  async _addFile(file, data) {
+    const result = await this.s3.putObject({
       Bucket: this.bucket,
       ACL: this.acl,
       Key: file.key,
       ContentType: file.type,
-      Body: buffer
+      Body: data
     })
     // "Convert" `file` to something looking more like a S3 `storageFile`.
     // For now, only the `location` property is of interest:
     return {
       ...file,
-      location: data.Location
+      location: result.Location
     }
   }
 
@@ -163,3 +161,33 @@ export class S3Storage extends Storage {
     return files
   }
 }
+
+function getFileTypeFromBuffer(buffer) {
+  const type = fileTypeFromBuffer(buffer)
+  if (type) {
+    return type.mime
+  }
+  try {
+    const { type } = imageSize(buffer)
+    return {
+      jpg: 'image/jpeg',
+      png: 'image/png',
+      gif: 'image/gif',
+      svg: 'image/svg+xml',
+      webp: 'image/webp',
+      tiff: 'image/tiff',
+      j2c: 'image/jp2',
+      jp2: 'image/jp2',
+      ktx: 'image/ktx',
+      bmp: 'image/bmp',
+      tga: 'image/x-targa',
+      cur: 'image/x-win-bitmap',
+      icns: 'image/x-icon',
+      ico: 'image/x-icon',
+      pnm: 'image/x-portable-anymap',
+      dds: 'image/vnd-ms.dds',
+      psd: 'image/vnd.adobe.photoshop'
+    }[type]
+  } catch (err) {}
+  return null
+}

package/src/storage/Storage.js

@@ -94,9 +94,9 @@ export class Storage {
     return storageFiles.map(storageFile => this.convertStorageFile(storageFile))
   }
 
-  async addFile(file, buffer) {
-    const storageFile = await this._addFile(file, buffer)
-    file.size = Buffer.byteLength(buffer)
+  async addFile(file, data) {
+    const storageFile = await this._addFile(file, data)
+    file.size = Buffer.byteLength(data)
     file.url = this._getFileUrl(storageFile)
     // TODO: Support `config.readImageSize`, but this can only be done onces
     // there are separate storage instances per model assets config!
@@ -146,7 +146,7 @@ export class Storage {
   _getFileUrl(_file) {}
 
   // @overridable
-  async _addFile(_file, _buffer) {}
+  async _addFile(_file, _data) {}
 
   // @overridable
   async _removeFile(_file) {}