720p for gifv files

app/routes/index.ts

@@ -11,10 +11,10 @@ ffmpeg.setFfprobePath(ffprobepath.path);
 
 import fs from "fs";
 
-import {extension} from "../types/lib";
+import {extension, videoExtensions} from "../types/lib";
 import {db, MediaRow, getPath, deleteId} from "../types/db";
 import {fileStorage} from "../types/multer";
-import {checkAuth, checkSharexAuth, createEmbedData, handleUpload} from "./middleware";
+import {checkAuth, checkSharexAuth, convertTo720p, createEmbedData, handleUpload} from "../types/middleware";
 
 const upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable?
 /**Middleware to grab media from media database */
@@ -72,7 +72,7 @@ router.get("/gifv/:file", async (req: Request, res: Response, next: NextFunction
   } 
 });
 
-router.post("/", [checkAuth, upload.array("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => {
+router.post("/", [checkAuth, upload.array("fileupload"), convertTo720p, createEmbedData, handleUpload], (req: Request, res: Response) => {
   res.redirect("/");
 });
 
@@ -82,16 +82,26 @@ router.post("/sharex", [checkSharexAuth, upload.single("fileupload"), createEmbe
 
 router.post("/:id(\\d+)/delete", [checkAuth], async (req: Request, res: Response) => {
   const path: any = await getPath(req.params.id);
-  fs.unlink(`uploads/${path.path}`, async (err) => {
-    if (err && err.errno == -4058) {
-      await deleteId("media", req.params.id).then(()=> {
-        return res.redirect("/");
-      });
-    }
-    await deleteId("media", req.params.id).then(()=> {
-      return res.redirect("/");
+
+  const nameAndExtension = extension(path.path);
+
+  const filesToDelete = [path.path, "oembed-" + path.path + ".json"];
+
+  if (videoExtensions.includes(nameAndExtension[1]) || nameAndExtension[1] == ".gif") {
+    filesToDelete.push("720p-" + path.path);
+  } 
+
+  filesToDelete.forEach(path => {
+    fs.unlink(path, async (err) => {
+      console.log(`Deleting ${path}`);
+      if (err && err.errno == -4058) {
+        await deleteId("media", req.params.id);
+      }
+      await deleteId("media", req.params.id);
     });
   });
+
+  return res.redirect("/");
 });
 
 export default router;

app/routes/middleware.ts

@@ -1,143 +0,0 @@
-import type {RequestHandler as Middleware, NextFunction} from "express";
-
-import ffmpeg from "fluent-ffmpeg";
-import ffmpegpath from "@ffmpeg-installer/ffmpeg";
-import ffprobepath from "@ffprobe-installer/ffprobe";
-ffmpeg.setFfmpegPath(ffmpegpath.path);
-ffmpeg.setFfprobePath(ffprobepath.path);
-
-import fs from "fs";
-import process from "process";
-
-import {extension} from "../types/lib";
-import {db, MediaParams} from "../types/db";
-
-export const checkAuth: Middleware = (req, res, next) => {
-  if (!req.user) {
-    return res.status(401);
-  }
-  next();
-};
-
-/**Checks shareX auth key */
-export const checkSharexAuth: Middleware = (req, res, next) => {
-  const auth = process.env.EBAPI_KEY || process.env.EBPASS || "pleaseSetAPI_KEY";
-  let key = null;
-  
-  if (req.headers["key"]) {
-    key = req.headers["key"];
-  } else {
-    return res.status(400).send("{success: false, message: \"No key provided\", fix: \"Provide a key\"}");
-  }
-  
-  if (auth != key) {
-    return res.status(401).send("{success: false, message: '\"'Invalid key\", fix: \"Provide a valid key\"}");
-  }
-  
-  const shortKey = key.substr(0, 3) + "..."; 
-  console.log(`Authenicated user with key: ${shortKey}`);
-  
-  next();
-};
-
-/**Creates oembed json file for embed metadata */
-export const createEmbedData: Middleware = (req, res, next) => {
-  const files = req.files as Express.Multer.File[];
-  for (const file in files) {
-    const nameAndExtension = extension(files[file].originalname);
-    const oembed = {
-      type: "video",
-      version: "1.0",
-      provider_name: "embedder",
-      provider_url: "https://github.com/WaveringAna/embedder",
-      cache_age: 86400,
-      html: `<iframe src='${req.protocol}://${req.get("host")}/gifv/${nameAndExtension[0]}${nameAndExtension[1]}'></iframe>`,
-      width: 640,
-      height: 360
-    };
-  
-    fs.writeFile(`uploads/oembed-${nameAndExtension[0]}${nameAndExtension[1]}.json`, JSON.stringify(oembed), function (err) {
-      if (err) return next(err);
-      console.log(`oembed file created ${nameAndExtension[0]}${nameAndExtension[1]}.json`);
-    });
-  }
-  next();
-};
-/** Converts video to gif and vice versa using ffmpeg */
-export const convert: Middleware = (req, res, next)  => {
-  const files = req.files as Express.Multer.File[];
-  for (const file in files) {
-    const nameAndExtension = extension(files[file].originalname);
-    if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".mkv" || nameAndExtension[1] == ".avi" || nameAndExtension[1] == ".mov") {
-      console.log("Converting " + nameAndExtension[0] + nameAndExtension[1] + " to gif");
-      ffmpeg()
-        .input(`uploads/${nameAndExtension[0]}${nameAndExtension[1]}`)
-        .inputFormat(nameAndExtension[1].substring(1))
-        .outputFormat("gif")
-        .output(`uploads/${nameAndExtension[0]}.gif`)
-        .on("end", function() {
-          console.log("Conversion complete");
-          console.log(`Uploaded to uploads/${nameAndExtension[0]}.gif`);
-        })
-        .on("error", (e) => console.log(e))
-        .run();
-    } else if (nameAndExtension[1] == ".gif") {
-      console.log(`Converting ${nameAndExtension[0]}${nameAndExtension[1]} to mp4`);
-      ffmpeg(`uploads/${nameAndExtension[0]}${nameAndExtension[1]}`)
-        .inputFormat("gif")
-        .outputFormat("mp4")
-        .outputOptions([
-          "-pix_fmt yuv420p",
-          "-c:v libx264",
-          "-movflags +faststart"
-        ])
-        .noAudio()
-        .output(`uploads/${nameAndExtension[0]}.mp4`)
-        .on("end", function() {
-          console.log("Conversion complete");
-          console.log(`Uploaded to uploads/${nameAndExtension[0]}.mp4`);
-        })
-        .run();
-    }
-  }
-};
-/**Middleware for handling uploaded files. Inserts it into the database */
-export const handleUpload: Middleware = (req, res, next) => {
-  if (!req.file && !req.files) {
-    console.log("No files were uploaded");
-    return res.status(400).send("No files were uploaded.");
-  }
-  
-  const files = (req.files) ? req.files as Express.Multer.File[] : req.file; //Check if a single file was uploaded or multiple
-  const username = (req.user) ? req.user.username : "sharex";                //if no username was provided, we can presume that it is sharex
-  const expireDate: Date = (req.body.expire) ? new Date(Date.now() + (req.body.expire * 24 * 60 * 60 * 1000)) : null;
-
-  if (files instanceof Array) {
-    for (const file in files) {
-      insertToDB(files[file].filename, expireDate, username, next);
-    }
-  } else
-    insertToDB(files.filename, expireDate, username, next);
-
-  next();
-};
-/**Inserts into media database */
-function insertToDB (filename: string, expireDate: Date, username: string, next: NextFunction) {
-  const params: MediaParams = [
-    filename, 
-    expireDate, 
-    username
-  ];
-  
-  db.run("INSERT INTO media (path, expire, username) VALUES (?, ?, ?)", params, function (err) {
-    if (err) { 
-      console.log(err);
-      return next(err);
-    }
-    console.log(`Uploaded ${filename} to database`);
-    if (expireDate == null)
-      console.log("It will not expire");
-    else if (expireDate != null || expireDate != undefined)
-      console.log(`It will expire on ${expireDate}`);
-  });
-}