From 73923e269ae840c46199f8d15aa7d6c273c5ae71 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:12:41 +1100 Subject: [PATCH] Video attachment support! --- package-lock.json | Bin 409007 -> 411527 bytes package.json | 2 ++ src/cdn/routes/attachments.ts | 44 +++++++++++++++++++++++++++++++--- src/cdn/util/FileStorage.ts | 2 +- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5f7abc85537fcd5750f475abf8792e350b79210d..4cba09005903fb7259552fb48de9cb2ffd98c679 100644 GIT binary patch delta 1396 zcmd6lOG_J37>1c-Mz9w#rG{v0)kv?Jxg_RRw31|Un~BLxl1WS!LQFD~Xfnwp8IwpC zZ8vt;N}y+1x-1l`SO|8dt0ENawzv`d1FUW;xT&U4Vks>YgdR8?KHkN7c)#cEv1aL6 z?@C3X&dF)9qT~5|F)e8C4{B%hD1qwN<`w-)4gdQPU#lZ;4llK*VEG2r12(=u2v8~@ z({OtxU^?u~tZRMISWXQ_>?47Nj3Y%Ee1cQbGns{`KajO!PQEHm`lf2yb17{Qr1^;19IDrgJ^^gH;9l^l8*;1-95J>= zVqFamKO%%GQLc;06P(toGoX6#*a8i4S(|-?nkAj?=}g_rB^C-~&KhMfYL387^rDq? ziUi3Bv8u5olOmorM1`!OOuO<%W7!r;x$XV{Yqz+J)|6FZ&8f6h^4Kg@u=xb)YtC6A z(~FC3J^pOU(0`_sUrPe3N6^i%Hy*Z+%}Yi%jgw5#Tz0d#gxRBV$?f6!V1;F?k@>7d z3h98U8l!x^h%ufKPH;@dTp?bo$;=cTr{hVl!@-FOcO_S|XM^C?4x|M|1cEiE3x6BS^YE&u~m58aZmz|{yViiwH<+7&`_H%lZna-6+*&QdMv0RM|Rk#YxWdaE*pCJf6 z7LMmVwHn9El*CMj0(o1Tg@~9gEgBJKob9WrRYx$e8v2!t&otV%z zk1O!|hyN@rcOJsxfY5jJgOx-0&&G}-KjgKEN)6EM!JT014t%dAsFFYp;J}IuN6tl2 l7D%h`08nEcSHb=g(g_A7xU2c@0RA?pQd$*2Mq- delta 125 zcmZqgmt6l_VnYej=E+PV%$v`#&iyo5{g?Q3epOb9=?>W}`kNJgy>Zz7)0)w6+Vp>{ zj55nKg aQ?q^1Zgh@iE2# diff --git a/package.json b/package.json index 303324f5..37a21647 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@types/amqplib": "^0.8.2", "@types/bcrypt": "^5.0.0", "@types/cookie-parser": "^1.4.3", + "@types/fluent-ffmpeg": "^2.1.20", "@types/i18next-node-fs-backend": "^2.1.1", "@types/json-bigint": "^1.0.1", "@types/jsonwebtoken": "^8.5.9", @@ -58,6 +59,7 @@ "exif-be-gone": "^1.3.1", "fast-zlib": "^2.0.1", "file-type": "16.5", + "fluent-ffmpeg": "^2.1.2", "form-data": "^4.0.0", "i18next": "^21.9.2", "i18next-http-middleware": "^3.2.1", diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index 2a1b6f09..9bd256aa 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -5,6 +5,9 @@ import FileType from "file-type"; import { HTTPError } from "lambert-server"; import { multer } from "../util/multer"; import imageSize from "image-size"; +import ffmpeg from "fluent-ffmpeg"; +import Path from "path"; +import { Duplex, Readable, Transform, Writable } from "stream"; const router = Router(); @@ -15,6 +18,14 @@ const SANITIZED_CONTENT_TYPE = [ "application/xhtml+xml", ]; +const probe = (file: string): Promise => new Promise((resolve, reject) => { + ffmpeg.setFfprobePath(process.env.FFPROBE_PATH as string); + ffmpeg.ffprobe(file, (err, data) => { + if (err) return reject(err); + return resolve(data); + }); +}); + router.post( "/:channel_id", multer.single("file"), @@ -44,6 +55,13 @@ router.post( height = dimensions.height; } } + else if (mimetype.includes("video") && process.env.FFPROBE_PATH) { + const root = process.env.STORAGE_LOCATION || "../"; // hmm, stolen from FileStorage + const out = await probe(Path.join(root, path)); + const stream = out.streams[0]; // hmm + width = stream.width; + height = stream.height; + } const file = { id, @@ -63,10 +81,10 @@ router.get( "/:channel_id/:id/:filename", async (req: Request, res: Response) => { const { channel_id, id, filename } = req.params; + const { format } = req.query; - const file = await storage.get( - `attachments/${channel_id}/${id}/${filename}`, - ); + const path = `attachments/${channel_id}/${id}/${filename}`; + let file = await storage.get(path); if (!file) throw new HTTPError("File not found"); const type = await FileType.fromBuffer(file); let content_type = type?.mime || "application/octet-stream"; @@ -75,6 +93,26 @@ router.get( content_type = "application/octet-stream"; } + // lol, super gross + if (content_type.includes("video") && format == "jpeg" && process.env.FFMPEG_PATH) { + const promise = (): Promise => new Promise((resolve, reject) => { + ffmpeg.setFfmpegPath(process.env.FFMPEG_PATH as string); + const out: any[] = []; + const cmd = ffmpeg(Readable.from(file as Buffer)) + .format("mjpeg") + .frames(1) + .on("end", () => resolve(Buffer.concat(out))) + .on("error", (err) => reject(err)) + const stream = cmd.pipe(); + stream.on("data", (data) => { + out.push(data) + }); + }); + const res = await promise(); + file = res; + content_type = "jpeg"; + } + res.set("Content-Type", content_type); res.set("Cache-Control", "public, max-age=31536000"); diff --git a/src/cdn/util/FileStorage.ts b/src/cdn/util/FileStorage.ts index 0e31a50e..9386663f 100644 --- a/src/cdn/util/FileStorage.ts +++ b/src/cdn/util/FileStorage.ts @@ -35,7 +35,7 @@ export class FileStorage implements Storage { async set(path: string, value: any) { path = getPath(path); - if (!fs.existsSync(dirname(path))) fs.mkdirSync(dirname(path)); + if (!fs.existsSync(dirname(path))) fs.mkdirSync(dirname(path), { recursive: true }); value = Readable.from(value); const cleaned_file = fs.createWriteStream(path);