This commit is contained in:
waveringana 2022-12-13 17:41:31 +00:00
parent 34e991f017
commit b217248293
13 changed files with 1229 additions and 406 deletions

View file

@ -1,7 +1,7 @@
import type {RequestHandler as Middleware, Router, Request, Response, NextFunction} from 'express';
import type {RequestHandler as Middleware, Router, Request, Response, NextFunction} from "express";
import express from "express";
import {db, createUser} from "../types/db";
import {createUser} from "../types/db";
const router: Router = express.Router();
/**Middleware to check if a user is actually signed in */
@ -14,16 +14,16 @@ const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction)
}
next();
}
};
router.get("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => {
router.get("/adduser", adminCheck, (req: Request, res: Response) => {
res.locals.filter = null;
res.render("adduser", { user: req.user });
});
router.post("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => {
router.post("/adduser", adminCheck, (req: Request, res: Response) => {
createUser(req.body.username, req.body.password);
res.redirect('/');
res.redirect("/");
});
export default router;

View file

@ -3,10 +3,10 @@ import express from "express";
import passport from "passport";
import {Strategy as LocalStrategy} from "passport-local";
import {User} from "../types/lib"
import {User} from "../types/lib";
import {db, UserRow} from "../types/db";
let router = express.Router();
const router = express.Router();
passport.use(new LocalStrategy(function verify(username, password, cb) {
db.get("SELECT * FROM users WHERE username = ?", [username], function(err: Error, row: UserRow) {

View file

@ -1,10 +1,9 @@
import type {RequestHandler as Middleware, Request, Response, NextFunction} from 'express';
import type {RequestHandler as Middleware, Request, Response, NextFunction} from "express";
import multer from "multer";
import express from "express";
import ffmpeg from "fluent-ffmpeg";
import imageProbe from "probe-image-size";
import ffmpegpath from "@ffmpeg-installer/ffmpeg";
// @ts-ignore
import ffprobepath from "@ffprobe-installer/ffprobe";
ffmpeg.setFfmpegPath(ffmpegpath.path);
@ -14,19 +13,19 @@ import fs from "fs";
import {extension} from "../types/lib";
import {db, MediaRow, getPath, deleteId} from "../types/db";
import {fileStorage, fileFilter} from "../types/multer";
import {fileStorage} from "../types/multer";
import {checkAuth, checkSharexAuth, createEmbedData, handleUpload} from "./middleware";
let upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable?
const upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable?
/**Middleware to grab media from media database */
const fetchMedia: Middleware = (req, res, next) => {
let admin: boolean = req.user.username == "admin" ? true : false
const admin: boolean = req.user.username == "admin" ? true : false;
/**Check if the user is an admin, if so, show all posts from all users */
let query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`;
const query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`;
db.all(query, (err:Error, rows: []) => {
if (err) return next(err);
let files = rows.map((row: MediaRow)=> {
const files = rows.map((row: MediaRow)=> {
return {
id: row.id,
path: row.path,
@ -39,13 +38,13 @@ const fetchMedia: Middleware = (req, res, next) => {
res.locals.Count = files.length;
next();
});
}
};
let router = express.Router();
const router = express.Router();
router.get("/", (req: Request, res: Response, next: NextFunction) => {
if (!req.user)
return res.render("home")
return res.render("home");
next();
}, fetchMedia, (req: Request, res: Response) => {
res.locals.filter = null;
@ -53,46 +52,46 @@ router.get("/", (req: Request, res: Response, next: NextFunction) => {
});
router.get("/gifv/:file", async (req: Request, res: Response, next: NextFunction) => {
let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
const url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
let width; let height;
let nameAndExtension = extension(`uploads/${req.params.file}`);
const nameAndExtension = extension(`uploads/${req.params.file}`);
if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".gif") {
ffmpeg()
.input(`uploads/${req.params.file}`)
.inputFormat(nameAndExtension[1].substring(1))
.ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err);
width = data.streams[0].width;
height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
});
.input(`uploads/${req.params.file}`)
.inputFormat(nameAndExtension[1].substring(1))
.ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err);
width = data.streams[0].width;
height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
});
} else {
let imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`));
const imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`));
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: imageData.width, height: imageData.height });
}
});
router.post("/", [checkAuth, upload.array("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => {
res.redirect("/")
res.redirect("/");
});
router.post("/sharex", [checkSharexAuth, upload.single("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => {
return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.file.filename}`);
});
router.post("/:id(\\d+)/delete", [checkAuth], async (req: Request, res: Response, next: NextFunction) => {
const path: any = await getPath(req.params.id)
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("/");
})
})
});
});
});
export default router;

View file

@ -1,8 +1,7 @@
import type {RequestHandler as Middleware, Router, Request, Response, NextFunction} from 'express';
import type {RequestHandler as Middleware, NextFunction} from "express";
import ffmpeg from "fluent-ffmpeg";
import ffmpegpath from "@ffmpeg-installer/ffmpeg";
// @ts-ignore
import ffprobepath from "@ffprobe-installer/ffprobe";
ffmpeg.setFfmpegPath(ffmpegpath.path);
ffmpeg.setFfprobePath(ffprobepath.path);
@ -18,11 +17,11 @@ export const checkAuth: Middleware = (req, res, next) => {
return res.status(401);
}
next();
}
};
/**Checks shareX auth key */
export const checkSharexAuth: Middleware = (req, res, next) => {
let auth = process.env.EBAPI_KEY || process.env.EBPASS || "pleaseSetAPI_KEY";
const auth = process.env.EBAPI_KEY || process.env.EBPASS || "pleaseSetAPI_KEY";
let key = null;
if (req.headers["key"]) {
@ -35,18 +34,18 @@ export const checkSharexAuth: Middleware = (req, res, next) => {
return res.status(401).send("{success: false, message: '\"'Invalid key\", fix: \"Provide a valid key\"}");
}
let shortKey = key.substr(0, 3) + "...";
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 (let file in files) {
let nameAndExtension = extension(files[file].originalname);
let oembed = {
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",
@ -63,12 +62,12 @@ export const createEmbedData: Middleware = (req, res, next) => {
});
}
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 (let file in files) {
let nameAndExtension = extension(files[file].originalname);
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()
@ -101,7 +100,7 @@ export const convert: Middleware = (req, res, next) => {
.run();
}
}
}
};
/**Middleware for handling uploaded files. Inserts it into the database */
export const handleUpload: Middleware = (req, res, next) => {
if (!req.file && !req.files) {
@ -110,25 +109,25 @@ export const handleUpload: Middleware = (req, res, next) => {
}
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 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 (let file in files) {
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) {
let params: MediaParams = [
const params: MediaParams = [
filename,
expireDate,
username
]
];
db.run("INSERT INTO media (path, expire, username) VALUES (?, ?, ?)", params, function (err) {
if (err) {