waveringana/embedder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

linting

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

39
.eslintrc.js Normal file
View file

@ -0,0 +1,39 @@
module.exports = {
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
],
"overrides": [
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint"
],
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"double"
],
"semi": [
"error",
"always"
]
}
};

31
app/.eslintrc.json
View file

@ -1,31 +0,0 @@
{
"env": {
"node": true,
"commonjs": true,
"es2021": true
},
"extends": "eslint:recommended",
"overrides": [
],
"parserOptions": {
"ecmaVersion": "latest"
},
"rules": {
"indent": [
"error",
"tab"
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"double"
],
"semi": [
"error",
"always"
]
}
}

30
app/app.ts
View file

@ -1,4 +1,4 @@
require("dotenv").config();
import "dotenv";
import express from "express";
import passport from "passport";
@ -17,20 +17,18 @@ import adduserRouter from "./routes/adduser";
import {db, expire, createUser, MediaRow} from "./types/db";
let app = express();
let server = http.createServer(app);
let port = normalizePort(process.env.EBPORT || "3000");
const app = express();
const server = http.createServer(app);
const port = normalizePort(process.env.EBPORT || "3000");
function normalizePort(val: string) {
var port = parseInt(val, 10);
const port = parseInt(val, 10);
if (isNaN(port)) {
// named pipe
return val;
}
if (port >= 0) {
// port number
return port;
}
@ -47,7 +45,7 @@ function onError(error: any) {
throw error;
}
var bind = typeof port === "string"
const bind = typeof port === "string"
? "Pipe " + port
: "Port " + port;
@ -78,21 +76,24 @@ db.serialize(function() {
db.run("CREATE TABLE IF NOT EXISTS media ( \
id INTEGER PRIMARY KEY, \
path TEXT NOT NULL, \
expire INTEGER \, \
expire INTEGER, \
username TEXT \
)");
db.run("ALTER TABLE media ADD COLUMN username TEXT", (err) => {
if(err)
return;
if(err) return;
}); //TODO, version new DB, run this command when detecting old DB
db.run("ALTER TABLE users ADD COLUMN username TEXT", (err) => {
if (err) return;
});
createUser("admin", process.env.EBPASS || "changeme");
});
function onListening() {
var addr = server.address();
var bind = typeof addr === "string"
const addr = server.address();
const bind = typeof addr === "string"
? "pipe " + addr
: "port " + addr.port;
console.log("Listening on " + bind);
@ -116,11 +117,10 @@ app.use(session({
secret: process.env.EBSECRET || "pleasechangeme",
resave: false,
saveUninitialized: false,
// @ts-ignore
store: new SQLiteStore({
db: "sessions.db",
dir: "./var/db"
})
}) as session.Store
}));
app.use(passport.authenticate("session"));

12
app/routes/adduser.ts
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;

4
app/routes/auth.ts
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) {

37
app/routes/index.ts
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,10 +52,10 @@ 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}`)
@ -68,31 +67,31 @@ router.get("/gifv/:file", async (req: Request, res: Response, next: NextFunction
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;

39
app/routes/middleware.ts
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) {

27
app/types/db.ts
View file

@ -9,7 +9,7 @@ export const db = new sqlite3.Database("./var/db/media.db");
/**Inserts a new user to the database */
export function createUser(username: string, password: string) {
let salt = crypto.randomBytes(16);
const salt = crypto.randomBytes(16);
db.run("INSERT OR IGNORE INTO users (username, hashed_password, salt) VALUES (?, ?, ?)", [
username,
@ -21,38 +21,39 @@ export function createUser(username: string, password: string) {
/**Selects a path for a file given ID */
export function getPath(id: number | string) {
return new Promise((resolve, reject) => {
let query: string = `SELECT path FROM media WHERE id = ?`;
const query = "SELECT path FROM media WHERE id = ?";
db.get(query, [id], (err: Error, path: object) => {
if (err) {reject(err)}
resolve(path)
if (err) {reject(err);}
resolve(path);
});
});
})
}
/**Deletes from database given an ID */
export function deleteId(database: string, id: number | string) {
return new Promise((resolve, reject) => {
let query: string = `DELETE FROM ${database} WHERE id = ?`
const query = `DELETE FROM ${database} WHERE id = ?`;
db.run(query, [id], (err: Error) => {
if (err) {reject(err); return;}
resolve(null)
})
})
resolve(null);
});
});
}
/**Expires a database row given a Date in unix time */
export function expire(database: string, column: string, expiration:number) {
return new Promise((resolve, reject) => {
let query: string = `SELECT * FROM ${database} WHERE ${column} < ?`;
const query = `SELECT * FROM ${database} WHERE ${column} < ?`;
db.each(query, [expiration], async (err: Error, row: GenericRow) => {
await deleteId(database, row.id)
if (err) reject(err);
await deleteId(database, row.id);
resolve(null);
});
})
});
}
/**A generic database row */
@ -79,7 +80,7 @@ export type MediaParams = [
/**A row for the user database */
export interface UserRow {
id? : Number,
id? : number,
username: string,
hashed_password: any,
salt: any

1
app/types/declarations/ffprobepath.d.ts vendored Normal file
View file

@ -0,0 +1 @@
declare module "@ffprobe-installer/ffprobe";

3
app/types/lib.ts
View file

@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-namespace */
declare global {
namespace Express {
interface User {
@ -8,7 +9,7 @@ declare global {
}
/**Splits a file name into its name and then its extension */
export function extension(str: string){
let file = str.split("/").pop();
const file = str.split("/").pop();
return [file.substr(0,file.lastIndexOf(".")),file.substr(file.lastIndexOf("."),file.length).toLowerCase()];
}
/**Type for user data */

24
app/types/multer.ts
View file

@ -1,8 +1,8 @@
import {Request} from 'express';
import multer, {FileFilterCallback} from 'multer';
import {Request} from "express";
import multer, {FileFilterCallback} from "multer";
import {db, MediaRow} from './db'
import {extension} from './lib'
import {db, MediaRow} from "./db";
import {extension} from "./lib";
export type DestinationCallback = (error: Error | null, destination: string) => void
export type FileNameCallback = (error: Error | null, filename: string) => void
@ -20,15 +20,15 @@ export const fileStorage = multer.diskStorage({
file: Express.Multer.File,
callback: FileNameCallback
): void => {
let nameAndExtension = extension(file.originalname);
const nameAndExtension = extension(file.originalname);
console.log(`Uploading ${file}`);
db.all("SELECT * FROM media WHERE path = ?", [nameAndExtension[0] + nameAndExtension[1]], (err: Error, exists: []) => {
if (err) {
console.log(err)
callback(err, null)
console.log(err);
callback(err, null);
}
if (exists.length != 0) {
let suffix = new Date().getTime() / 1000;
const suffix = new Date().getTime() / 1000;
if (request.body.title == "" || request.body.title == null || request.body.title == undefined) {
callback(null, nameAndExtension[0] + "-" + suffix + nameAndExtension[1]);
@ -46,7 +46,7 @@ export const fileStorage = multer.diskStorage({
}
});
export let allowedMimeTypes = [
export const allowedMimeTypes = [
"image/png",
"image/jpg",
"image/jpeg",
@ -65,8 +65,8 @@ export const fileFilter = (
callback: FileFilterCallback
): void => {
if (allowedMimeTypes.includes(file.mimetype)) {
callback(null, true)
callback(null, true);
} else {
callback(null, false)
}
callback(null, false);
}
};

1327
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

5
package.json
View file

@ -35,7 +35,7 @@
"cookie-parser": "~1.4.4",
"dotenv": "^8.6.0",
"ejs": "^3.1.8",
"express": "~4.16.1",
"express": "^4.18.2",
"express-session": "^1.17.3",
"fluent-ffmpeg": "^2.1.2",
"http-errors": "~1.6.3",
@ -59,7 +59,8 @@
"@types/passport": "^1.0.11",
"@types/passport-local": "^1.0.34",
"@types/probe-image-size": "^7.2.0",
"@typescript-eslint/parser": "^5.45.0",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1",
"copyfiles": "^2.4.1",
"cypress": "^11.1.0",
"cypress-file-upload": "^5.0.8",