@dosgato/api 0.0.8 → 0.0.10

package/dist/util/filehandler.d.ts

@@ -1,10 +1,15 @@
-import { FastifyRequest, FastifyReply } from 'fastify';
-export declare function handleUpload(req: FastifyRequest, res: FastifyReply): Promise<{
-    filename: string;
-    shasum: any;
-    mime: string;
-    size: number;
-}[]>;
+import { FastifyRequest } from 'fastify';
+export declare function handleUpload(req: FastifyRequest): Promise<{
+    files: {
+        name: string;
+        shasum: string;
+        mime: string;
+        size: number;
+        width: number | undefined;
+        height: number | undefined;
+    }[];
+    data: any;
+}>;
 interface FileHandler {
     moveToPermLocation: (checksum: string) => Promise<void>;
     getFileLocation: (checksum: string) => string;

package/dist/util/filehandler.js

@@ -1,23 +1,67 @@
 import crypto from 'crypto';
-import * as util from 'util';
-import stream from 'stream';
-import { nanoid } from 'nanoid';
+import { fileTypeStream } from 'file-type';
 import fs, { promises as fsp } from 'fs';
+import { lookup } from 'mime-types';
+import { nanoid } from 'nanoid';
 import { dirname } from 'path';
+import sharp from 'sharp';
+import stream from 'stream';
+import * as util from 'util';
+import { makeSafe } from '../internal.js';
 const pipelinep = util.promisify(stream.pipeline);
-export async function handleUpload(req, res) {
+export async function handleUpload(req) {
+    const data = {};
     const files = [];
-    const parts = req.files();
-    for await (const part of parts) {
-        const hash = crypto.createHash('sha1').setEncoding('hex');
-        const tempName = nanoid(10);
-        await pipelinep(part.file, fs.createWriteStream(`/files/tmp/${tempName}`));
-        await pipelinep(fs.createReadStream(`/files/tmp/${tempName}`), hash);
-        const checksum = hash.read();
-        await fsp.rename(`/files/tmp/${tempName}`, `/files/tmp/${checksum}`);
-        files.push({ filename: part.filename, shasum: checksum, mime: part.mimetype, size: part.file.bytesRead });
+    for await (const part of req.parts()) {
+        if (part.file) {
+            const tempName = nanoid(10);
+            const fileTypePassthru = await fileTypeStream(part.file);
+            const hash = crypto.createHash('sha1');
+            const hashingPassthru = new stream.PassThrough();
+            const sharpBuffer = Buffer.alloc(1000000);
+            const sharpPassthru = new stream.PassThrough();
+            let offset = 0;
+            let len = 1000000;
+            sharpPassthru.on('data', (chunk) => {
+                if (offset < 1000000)
+                    sharpBuffer.write(chunk.toString('binary'), offset, len, 'binary');
+                offset += chunk.length;
+                len -= chunk.length;
+            });
+            hashingPassthru.on('data', (chunk) => hash.update(chunk));
+            await pipelinep(fileTypePassthru.pipe(hashingPassthru).pipe(sharpPassthru), fs.createWriteStream(`/files/tmp/${tempName}`));
+            const checksum = hash.digest('hex');
+            const { mime } = fileTypePassthru.fileType ?? { ext: '', mime: part.mimetype };
+            let name = part.filename;
+            const extFromFileName = name.match(/\.(\w+)$/)?.[1];
+            if (extFromFileName && lookup(extFromFileName))
+                name = name.replace(new RegExp('\\.' + extFromFileName + '$'), '');
+            name = makeSafe(name);
+            let metadata;
+            let width;
+            let height;
+            if (mime.startsWith('image/')) {
+                try {
+                    metadata = await sharp(sharpBuffer).metadata();
+                    width = metadata.width;
+                    height = metadata.height;
+                    if ((metadata.orientation ?? 1) > 4) {
+                        width = height;
+                        height = metadata.width;
+                    }
+                }
+                catch (e) {
+                    console.warn('SharpJS was unable to read metadata for image', name, 'of type', mime);
+                }
+            }
+            await fsp.rename(`/files/tmp/${tempName}`, `/files/tmp/${checksum}`);
+            files.push({ name, shasum: checksum, mime, size: part.file.bytesRead, width, height });
+        }
+        else {
+            data[part.fieldname] = part.value;
+        }
     }
-    return files;
+    return { files, data };
 }
 export const FileSystemHandler = {
     async moveToPermLocation(checksum) {

package/dist/util/filehandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"filehandler.js","sourceRoot":"","sources":["../../src/util/filehandler.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,EAAE,EAAE,QAAQ,IAAI,GAAG,EAAE,MAAM,IAAI,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAEjD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAE,GAAmB,EAAE,GAAiB;IACxE,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,CAAA;QAC3B,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC,CAAA;QAC1E,MAAM,SAAS,CAAC,EAAE,CAAC,gBAAgB,CAAC,cAAc,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAC5B,MAAM,GAAG,CAAC,MAAM,CAAC,cAAc,QAAQ,EAAE,EAAE,cAAc,QAAQ,EAAE,CAAC,CAAA;QACpE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;KAC1G;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAQD,MAAM,CAAC,MAAM,iBAAiB,GAAgB;IAC5C,KAAK,CAAC,kBAAkB,CAAE,QAAgB;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3D,MAAM,GAAG,CAAC,MAAM,CAAC,cAAc,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAA;IAC1D,CAAC;IACD,eAAe,CAAE,QAAgB;QAC/B,OAAO,kBAAkB,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9F,CAAC;IACD,KAAK,CAAC,OAAO,CAAE,QAAgB;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QACnD,2GAA2G;IAC7G,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAgB;IAC/C,KAAK,CAAC,kBAAkB,CAAE,QAAgB;QACxC,2BAA2B;IAC7B,CAAC;IACD,eAAe,CAAE,QAAgB;QAC/B,sGAAsG;QACtG,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,OAAO,CAAE,QAAgB;QAC7B,kDAAkD;IACpD,CAAC;CACF,CAAA"}
+{"version":3,"file":"filehandler.js","sourceRoot":"","sources":["../../src/util/filehandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/api",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A CMS designed for large institutions with thousands of editors and hundreds of subsites.",
   "type": "module",
   "exports": {
@@ -9,14 +9,16 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@dosgato/templating": ">=0.0.53",
-    "@fastify/multipart": "^6.0.0",
-    "@txstate-mws/graphql-server": "^1.5.1",
-    "dataloader-factory": "^4.3.2",
+    "@fastify/multipart": "^7.1.2",
+    "@txstate-mws/graphql-server": "2.0.0",
+    "dataloader-factory": "^4.4.3",
     "fast-json-patch": "^3.1.0",
+    "file-type": "^18.0.0",
     "luxon": "^3.0.3",
     "mime-types": "^2.1.35",
-    "mysql2-async": "^1.0.12",
+    "mysql2-async": "^1.1.3",
     "nanoid": "^4.0.0",
+    "sharp": ">=0.31.0",
     "txstate-utils": "^1.7.0",
     "type-graphql": "^1.1.1"
   },
@@ -24,7 +26,8 @@
     "@types/luxon": "^3.0.1",
     "@types/mime-types": "^2.1.1",
     "@types/node": "^18.7.14",
-    "eslint-config-standard-with-typescript": "^20.0.0",
+    "@types/sharp": "^0.30.5",
+    "eslint-config-standard-with-typescript": "^22.0.0",
     "nodemon": "^2.0.12",
     "ts-node": "^10.1.0",
     "typescript": "^4.7.3"