@ditojs/server 1.8.1 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.8.1",
+  "version": "1.10.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",
@@ -21,24 +21,24 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.8.0",
-    "@ditojs/build": "^1.8.0",
-    "@ditojs/router": "^1.8.0",
-    "@ditojs/utils": "^1.8.0",
+    "@aws-sdk/client-s3": "^3.135.0",
+    "@ditojs/admin": "^1.10.0",
+    "@ditojs/build": "^1.10.0",
+    "@ditojs/router": "^1.10.0",
+    "@ditojs/utils": "^1.10.0",
     "@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.1141.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",
+    "eventemitter2": "^6.4.6",
+    "file-type": "^17.1.3",
     "fs-extra": "^10.1.0",
-    "image-size": "^1.0.1",
+    "image-size": "^1.0.2",
     "is-svg": "^4.3.2",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
@@ -53,31 +53,31 @@
     "koa-session": "^6.2.0",
     "koa-static": "^5.0.0",
     "mime-types": "^2.1.35",
-    "multer": "^1.4.4",
-    "multer-s3": "^2.10.0",
-    "nanoid": "^3.3.4",
+    "multer": "^1.4.5-lts.1",
+    "multer-s3": "^3.0.1",
+    "nanoid": "^4.0.0",
     "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.11.0",
-    "pino-pretty": "^7.6.1",
+    "pino": "^8.3.0",
+    "pino-pretty": "^8.1.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^8.3.2",
-    "vite": "^2.9.9",
-    "vite-plugin-vue2": "^2.0.1",
-    "vue": "^2.6.14",
-    "vue-template-compiler": "^2.6.14"
+    "vite": "^3.0.2",
+    "vite-plugin-vue2": "^2.0.2",
+    "vue": "^2.7.8",
+    "vue-template-compiler": "^2.7.8"
   },
   "peerDependencies": {
     "knex": "^1.0.5",
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "knex": "^2.0.0",
+    "knex": "^2.2.0",
     "objection": "^3.0.1"
   },
-  "gitHead": "390e0a7e0782b3cb5cff5e5d0454a35c7a954df5"
+  "gitHead": "0b044d649e0fe1bcbcd3603bcdc9c6168058fb6d"
 }

package/src/controllers/AdminController.js

@@ -15,7 +15,7 @@ import { merge } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
 import { ControllerError } from '../errors/index.js'
-import { formatJson, deprecate } from '../utils/index.js'
+import { formatJson, getRandomFreePort, deprecate } from '../utils/index.js'
 
 export class AdminController extends Controller {
   // @override
@@ -130,7 +130,12 @@ export class AdminController extends Controller {
     const server = await createServer({
       ...config,
       server: {
-        middlewareMode: 'html',
+        middlewareMode: true,
+        hmr: {
+          // Use a random free port instead of vite's default 24678, since we
+          // may be running multiple servers in parallel (e.g. e2e and dev).
+          port: await getRandomFreePort()
+        },
         watch: {
           // Watch the @ditojs packages while in dev mode, although they are
           // inside the node_modules folder.

package/src/mixins/AssetMixin.js

@@ -64,11 +64,10 @@ export const AssetMixin = mixin(Model => class extends TimeStampedMixin(Model) {
 
   // @override
   $parseJson(json) {
-    const { constructor } = this
     const { file, storage } = json
     // Convert `AssetMixin#file` to an `AssetFile` instance:
     if (file && storage) {
-      constructor.app.getStorage(storage)?.convertAssetFile(file)
+      this.constructor.app.getStorage(storage)?.convertAssetFile(file)
     }
     return json
   }

package/src/models/Model.js

@@ -579,20 +579,8 @@ export class Model extends objection.Model {
 
   // @override
   $formatJson(json) {
-    const { constructor } = this
-    // Calculate and set the computed properties.
-    for (const key of constructor.computedAttributes) {
-      // Perhaps the computed property is produced in the SQL statement,
-      // in which case we don't have to do anything anymore here.
-      if (!(key in json)) {
-        const value = this[key]
-        if (value !== undefined) {
-          json[key] = value
-        }
-      }
-    }
     // Remove hidden attributes.
-    for (const key of constructor.hiddenAttributes) {
+    for (const key of this.constructor.hiddenAttributes) {
       delete json[key]
     }
     return json

package/src/storage/S3Storage.js

@@ -1,9 +1,10 @@
-import aws from 'aws-sdk'
+import { S3 } from '@aws-sdk/client-s3'
 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'
 
 export class S3Storage extends Storage {
   static type = 's3'
@@ -17,7 +18,7 @@ export class S3Storage extends Storage {
       bucket,
       ...options
     } = config
-    this.s3 = new aws.S3(s3)
+    this.s3 = new S3(s3)
     this.acl = acl
     this.bucket = bucket
 
@@ -101,13 +102,13 @@ export class S3Storage extends Storage {
 
   // @override
   async _addFile(file, buffer) {
-    const data = await this.s3.upload({
+    const data = await this.s3.putObject({
       Bucket: this.bucket,
       ACL: this.acl,
       Key: file.key,
       ContentType: file.type,
       Body: buffer
-    }).promise()
+    })
     // "Convert" `file` to something looking more like a S3 `storageFile`.
     // For now, only the `location` property is of interest:
     return {
@@ -121,7 +122,7 @@ export class S3Storage extends Storage {
     await this.s3.deleteObject({
       Bucket: this.bucket,
       Key: file.key
-    }).promise()
+    })
     // TODO: Check for errors and throw?
   }
 
@@ -129,12 +130,12 @@ export class S3Storage extends Storage {
   async _readFile(file) {
     const {
       ContentType: type,
-      Body: data
+      Body: stream
     } = await this.s3.getObject({
       Bucket: this.bucket,
       Key: file.key
-    }).promise()
-    const buffer = Buffer.isBuffer(data) ? data : Buffer.from(data)
+    })
+    const buffer = await consumers.buffer(stream)
     // See `AssetFile.data` setter:
     buffer.type = type
     return buffer
@@ -146,8 +147,8 @@ export class S3Storage extends Storage {
     const params = { Bucket: this.bucket }
     let result
     do {
-      result = await this.s3.listObjectsV2(params).promise()
-      for (const { Key: key } of result.Contents) {
+      result = await this.s3.listObjectsV2(params)
+      for (const { Key: key } of result.Contents ?? []) {
         files.push(key)
       }
       // Continue it if results are truncated.

package/src/utils/index.js

@@ -4,5 +4,6 @@ export * from './emitter.js'
 export * from './function.js'
 export * from './handler.js'
 export * from './json.js'
+export * from './net.js'
 export * from './object.js'
 export * from './scope.js'

package/src/utils/net.js

@@ -0,0 +1,17 @@
+import net from 'net'
+
+export async function getRandomFreePort() {
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer()
+    srv.listen(0, () => {
+      const port = srv.address().port
+      srv.close(err => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(port)
+        }
+      })
+    })
+  })
+}