@things-factory/attachment-base 6.0.7 → 6.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "6.0.7",
+  "version": "6.0.18",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,12 +27,12 @@
     "@aws-sdk/lib-storage": "^3.46.0",
     "@aws-sdk/s3-presigned-post": "^3.46.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^6.0.7",
+    "@things-factory/auth-base": "^6.0.18",
     "@things-factory/env": "^6.0.7",
-    "@things-factory/shell": "^6.0.7",
+    "@things-factory/shell": "^6.0.18",
     "memfs": "^3.0.1",
     "mime": "^2.4.4",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "5af6d8613bd6eab6feaa69df942ef3ddfae764fe"
+  "gitHead": "2e3e970ad20b2d7b67653ce04341bdf150ae7ebc"
 }

package/server/routes.ts

@@ -6,6 +6,8 @@ import { ATTACHMENT_PATH, STORAGE } from './attachment-const'
 const multer = require('@koa/multer')
 const upload = multer() // note you can pass `multer` options here
 
+const { Readable } = require('stream')
+
 // process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
 process.on('bootstrap-module-global-public-route' as any, (app, routes) => {
   // TODO make this secure
@@ -13,11 +15,16 @@ process.on('bootstrap-module-global-public-route' as any, (app, routes) => {
     await STORAGE.sendFile(context, context.params.attachment, next)
   })
 
-  routes.post(`/${ATTACHMENT_PATH}`, async (context, next) => {
-    const { files } = await upload(context.request)
+  routes.post(`/${ATTACHMENT_PATH}`, upload.any(), async (context, next) => {
+    const files = context.files
 
     const result: { id: string; path: string; size: number }[] = await Promise.all(
-      files.map(file => STORAGE.uploadFile({ stream: file, filename: file.filename }))
+      files.map(file =>
+        STORAGE.uploadFile({
+          stream: Readable.from(file.buffer),
+          filename: Buffer.from(file.originalname, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+        })
+      )
     )
 
     context.status = 200

package/server/service/attachment/attachment-mutation.ts

@@ -96,8 +96,9 @@ export class AttachmentMutation {
 
 export async function createAttachment(_: any, { attachment }, context: ResolverContext): Promise<Attachment> {
   const { file, category, refType = '', refBy, description } = attachment
-  const { createReadStream, filename, mimetype, encoding } = await file
+  var { createReadStream, filename, mimetype, encoding } = await file
   const stream = createReadStream()
+  filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
 
   const { id, path, size } = await STORAGE.uploadFile({ stream, filename })
   const { domain, user, tx } = context.state

package/server/storage-file.ts

@@ -29,9 +29,10 @@ if (STORAGE && STORAGE.type == 'file') {
             fs.unlinkSync(path)
           reject(error)
         })
+        .on('data', chunk => {
+          size += chunk.length
+        })
         .pipe(fs.createWriteStream(path))
-        .on('error', error => reject(error))
-        .on('data', chunk => (size += chunk.length))
         .on('finish', () => resolve({ id, path: relativePath, size }))
     )
   }