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

fix spaces

Browse source
This commit is contained in:
waveringana 2022-12-10 19:09:27 +00:00
parent f83c5aa423
commit 135c772723
7 changed files with 331 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

182
app/app.ts
View file

@ -22,19 +22,19 @@ let server = http.createServer(app);
let port = normalizePort(process.env.EBPORT || "3000"); let port = normalizePort(process.env.EBPORT || "3000");
function normalizePort(val: string) { function normalizePort(val: string) {
var port = parseInt(val, 10); var port = parseInt(val, 10);
if (isNaN(port)) { if (isNaN(port)) {
// named pipe // named pipe
return val; return val;
} }
if (port >= 0) { if (port >= 0) {
// port number // port number
return port; return port;
} }
return false; return false;
} }
app.set("port", port); app.set("port", port);
@ -43,59 +43,59 @@ server.on("error", onError);
server.on("listening", onListening); server.on("listening", onListening);
function onError(error: any) { function onError(error: any) {
if (error.syscall !== "listen") { if (error.syscall !== "listen") {
throw error; throw error;
} }
var bind = typeof port === "string" var bind = typeof port === "string"
? "Pipe " + port ? "Pipe " + port
: "Port " + port; : "Port " + port;
// handle specific listen errors with friendly messages // handle specific listen errors with friendly messages
switch (error.code) { switch (error.code) {
case "EACCES": case "EACCES":
console.error(bind + " requires elevated privileges"); console.error(bind + " requires elevated privileges");
process.exit(1); process.exit(1);
break; break;
case "EADDRINUSE": case "EADDRINUSE":
console.error(bind + " is already in use"); console.error(bind + " is already in use");
process.exit(1); process.exit(1);
break; break;
default: default:
throw error; throw error;
} }
} }
db.serialize(function() { db.serialize(function() {
// create the database schema for the embedders app // create the database schema for the embedders app
db.run("CREATE TABLE IF NOT EXISTS users ( \ db.run("CREATE TABLE IF NOT EXISTS users ( \
id INTEGER PRIMARY KEY, \ id INTEGER PRIMARY KEY, \
username TEXT UNIQUE, \ username TEXT UNIQUE, \
hashed_password BLOB, \ hashed_password BLOB, \
salt BLOB \ salt BLOB \
)"); )");
db.run("CREATE TABLE IF NOT EXISTS media ( \ db.run("CREATE TABLE IF NOT EXISTS media ( \
id INTEGER PRIMARY KEY, \ id INTEGER PRIMARY KEY, \
path TEXT NOT NULL, \ path TEXT NOT NULL, \
expire INTEGER \, \ expire INTEGER \, \
username TEXT \ username TEXT \
)"); )");
db.run("ALTER TABLE media ADD COLUMN username TEXT", (err) => { db.run("ALTER TABLE media ADD COLUMN username TEXT", (err) => {
if(err) if(err)
return; return;
}); //TODO, version new DB, run this command when detecting old DB }); //TODO, version new DB, run this command when detecting old DB
createUser("admin", process.env.EBPASS || "changeme"); createUser("admin", process.env.EBPASS || "changeme");
}); });
function onListening() { function onListening() {
var addr = server.address(); var addr = server.address();
var bind = typeof addr === "string" var bind = typeof addr === "string"
? "pipe " + addr ? "pipe " + addr
: "port " + addr.port; : "port " + addr.port;
console.log("Listening on " + bind); console.log("Listening on " + bind);
} }
app.enable("trust proxy"); app.enable("trust proxy");
@ -106,21 +106,21 @@ app.set("view engine", "ejs");
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ app.use(express.urlencoded({
extended: false extended: false
})); }));
app.use(cookieParser()); app.use(cookieParser());
app.use(express.static(path.join(__dirname, "public"))); app.use(express.static(path.join(__dirname, "public")));
app.use(express.static(path.join(__dirname, "public"))); app.use(express.static(path.join(__dirname, "public")));
app.use(session({ app.use(session({
secret: process.env.EBSECRET || "pleasechangeme", secret: process.env.EBSECRET || "pleasechangeme",
resave: false, resave: false,
saveUninitialized: false, saveUninitialized: false,
// @ts-ignore // @ts-ignore
store: new SQLiteStore({ store: new SQLiteStore({
db: "sessions.db", db: "sessions.db",
dir: "./var/db" dir: "./var/db"
}) })
})); }));
app.use(passport.authenticate("session")); app.use(passport.authenticate("session"));
@ -131,38 +131,38 @@ app.use("/", adduserRouter);
app.use("/uploads", express.static("uploads")); app.use("/uploads", express.static("uploads"));
function prune () { function prune () {
db.all("SELECT * FROM media", (err: Error, rows: []) => { db.all("SELECT * FROM media", (err: Error, rows: []) => {
console.log("Uploaded files: " + rows.length); console.log("Uploaded files: " + rows.length);
console.log(rows); console.log(rows);
}); });
console.log("Vacuuming database..."); console.log("Vacuuming database...");
db.run("VACUUM"); db.run("VACUUM");
db.all("SELECT * FROM media WHERE expire < ?", [Date.now()], (err: Error, rows: []) => { db.all("SELECT * FROM media WHERE expire < ?", [Date.now()], (err: Error, rows: []) => {
console.log("Expired rows: " + rows); console.log("Expired rows: " + rows);
if (err) return console.error(err); if (err) return console.error(err);
rows.forEach((row: MediaRow) => { rows.forEach((row: MediaRow) => {
console.log(`Deleting ${row.path}`); console.log(`Deleting ${row.path}`);
fs.unlink(`uploads/${row.path}`, (err) => { fs.unlink(`uploads/${row.path}`, (err) => {
if (err) { if (err) {
if(err.errno == -4058) { if(err.errno == -4058) {
console.log("File already deleted"); console.log("File already deleted");
db.all("DELETE FROM media WHERE path = ?", [row.path], (err: Error) => { db.all("DELETE FROM media WHERE path = ?", [row.path], (err: Error) => {
if (err) return console.error(err); if (err) return console.error(err);
}); });
} else { } else {
console.error(err); console.error(err);
} }
} else { } else {
db.all("DELETE FROM media WHERE path = ?", [row.path], (err: Error) => { db.all("DELETE FROM media WHERE path = ?", [row.path], (err: Error) => {
if (err) return console.error(err); if (err) return console.error(err);
}); });
} }
}); });
console.log(`Deleted ${row.path}`); console.log(`Deleted ${row.path}`);
}); });
}); });
} }
setInterval(prune, 1000 * 60); //prune every minute setInterval(prune, 1000 * 60); //prune every minute

23
app/routes/adduser.ts
View file

@ -6,23 +6,24 @@ import {db, createUser} from "../types/db";
const router: Router = express.Router(); const router: Router = express.Router();
const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction) => { const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction) => {
if (!req.user) if (!req.user)
return res.status(403).send("You are not authorized to perform this action"); return res.status(403).send("You are not authorized to perform this action");
else { else {
if (req.user.username != "admin") if (req.user.username != "admin")
return res.status(403).send("You are not authorized to perform this action"); return res.status(403).send("You are not authorized to perform this action");
next(); }
}
next();
} }
router.get("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => { router.get("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => {
res.locals.filter = null; res.locals.filter = null;
res.render("adduser", { user: req.user }); res.render("adduser", { user: req.user });
}); });
router.post("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => { router.post("/adduser", adminCheck, (req: Request, res: Response, next: NextFunction) => {
createUser(req.body.username, req.body.password); createUser(req.body.username, req.body.password);
res.redirect('/'); res.redirect('/');
}); });
export default router; export default router;

78
app/routes/auth.ts
View file

@ -9,61 +9,61 @@ import {db, UserRow} from "../types/db";
let router = express.Router(); let router = express.Router();
passport.use(new LocalStrategy(function verify(username, password, cb) { passport.use(new LocalStrategy(function verify(username, password, cb) {
db.get("SELECT * FROM users WHERE username = ?", [username], function(err: Error, row: UserRow) { db.get("SELECT * FROM users WHERE username = ?", [username], function(err: Error, row: UserRow) {
if (err) { if (err) {
return cb(err); return cb(err);
} }
if (!row) { if (!row) {
return cb(null, false, { return cb(null, false, {
message: "Incorrect username or password." message: "Incorrect username or password."
}); });
} }
crypto.pbkdf2(password, row.salt, 310000, 32, "sha256", function(err, hashedPassword) { crypto.pbkdf2(password, row.salt, 310000, 32, "sha256", function(err, hashedPassword) {
if (err) { if (err) {
return cb(err); return cb(err);
} }
if (!crypto.timingSafeEqual(row.hashed_password, hashedPassword)) { if (!crypto.timingSafeEqual(row.hashed_password, hashedPassword)) {
return cb(null, false, { return cb(null, false, {
message: "Incorrect username or password." message: "Incorrect username or password."
}); });
} }
return cb(null, row); return cb(null, row);
}); });
}); });
})); }));
passport.serializeUser(function(user:User, cb) { passport.serializeUser(function(user:User, cb) {
process.nextTick(function() { process.nextTick(function() {
cb(null, { cb(null, {
id: user.id, id: user.id,
username: user.username username: user.username
}); });
}); });
}); });
passport.deserializeUser(function(user:User, cb) { passport.deserializeUser(function(user:User, cb) {
process.nextTick(function() { process.nextTick(function() {
return cb(null, user); return cb(null, user);
}); });
}); });
router.get("/login", function(req, res) { router.get("/login", function(req, res) {
res.render("login"); res.render("login");
}); });
router.post("/login/password", passport.authenticate("local", { router.post("/login/password", passport.authenticate("local", {
successRedirect: "/", successRedirect: "/",
failureRedirect: "/login" failureRedirect: "/login"
})); }));
router.post("/logout", function(req, res, next) { router.post("/logout", function(req, res, next) {
req.logout(function(err) { req.logout(function(err) {
if (err) { if (err) {
return next(err); return next(err);
} }
res.redirect("/"); res.redirect("/");
}); });
}); });
export default router; export default router;

105
app/routes/index.ts
View file

@ -20,79 +20,78 @@ import {checkAuth, checkSharexAuth, createEmbedData, handleUpload} from "./middl
let upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable? let upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable?
const fetchMedia: Middleware = (req, res, next) => { const fetchMedia: Middleware = (req, res, next) => {
let admin: boolean = req.user.username == "admin" ? true : false let admin: boolean = req.user.username == "admin" ? true : false
let query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`; let query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`;
db.all(query, (err:Error, rows: []) => { db.all(query, (err:Error, rows: []) => {
if (err) return next(err); if (err) return next(err);
let files = rows.map((row: MediaRow)=> { let files = rows.map((row: MediaRow)=> {
return { return {
id: row.id, id: row.id,
path: row.path, path: row.path,
expire: row.expire, expire: row.expire,
username: row.username, username: row.username,
url: "/" + row.id url: "/" + row.id
}; };
}); });
res.locals.files = files.reverse(); //reverse so newest files appear first res.locals.files = files.reverse(); //reverse so newest files appear first
res.locals.Count = files.length; res.locals.Count = files.length;
next(); next();
}); });
} }
let router = express.Router(); let router = express.Router();
router.get("/", (req: Request, res: Response, next: NextFunction) => { router.get("/", (req: Request, res: Response, next: NextFunction) => {
if (!req.user) if (!req.user)
return res.render("home") return res.render("home")
next(); next();
}, fetchMedia, (req: Request, res: Response) => { }, fetchMedia, (req: Request, res: Response) => {
res.locals.filter = null; res.locals.filter = null;
res.render("index", { user: req.user }); res.render("index", { user: req.user });
}); });
router.get("/gifv/:file", async (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}`; let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
let width; let height; let width; let height;
let nameAndExtension = extension(`uploads/${req.params.file}`); let nameAndExtension = extension(`uploads/${req.params.file}`);
if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".gif") { if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".gif") {
ffmpeg() ffmpeg()
.input(`uploads/${req.params.file}`) .input(`uploads/${req.params.file}`)
.inputFormat(nameAndExtension[1].substring(1)) .inputFormat(nameAndExtension[1].substring(1))
.ffprobe((err: Error, data: ffmpeg.FfprobeData) => { .ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err); if (err) return next(err);
width = data.streams[0].width; width = data.streams[0].width;
height = data.streams[0].height; height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height }); return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
}); });
} else { } else {
let imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`)); let 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 }); 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) => { 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) => { 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}`); 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) => { router.post("/:id(\\d+)/delete", [checkAuth], async (req: Request, res: Response, next: NextFunction) => {
const path: any = await getPath(req.params.id) const path: any = await getPath(req.params.id)
fs.unlink(`uploads/${path.path}`, async (err) => { fs.unlink(`uploads/${path.path}`, async (err) => {
if (err && err.errno == -4058) { if (err && err.errno == -4058) {
await deleteId("media", req.params.id).then(()=> { await deleteId("media", req.params.id).then(()=> {
return res.redirect("/"); return res.redirect("/");
}) })
} else { }
await deleteId("media", req.params.id).then(()=> { await deleteId("media", req.params.id).then(()=> {
return res.redirect("/"); return res.redirect("/");
}) })
} })
})
}); });
export default router; export default router;

216
app/routes/middleware.ts
View file

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

62
app/types/db.ts
View file

@ -9,50 +9,50 @@ mkdirp.sync("./var/db");
export const db = new sqlite3.Database("./var/db/media.db"); export const db = new sqlite3.Database("./var/db/media.db");
export function createUser(username: string, password: string) { export function createUser(username: string, password: string) {
var salt = crypto.randomBytes(16); var salt = crypto.randomBytes(16);
db.run("INSERT OR IGNORE INTO users (username, hashed_password, salt) VALUES (?, ?, ?)", [ db.run("INSERT OR IGNORE INTO users (username, hashed_password, salt) VALUES (?, ?, ?)", [
username, username,
crypto.pbkdf2Sync(password, salt, 310000, 32, "sha256"), crypto.pbkdf2Sync(password, salt, 310000, 32, "sha256"),
salt salt
]); ]);
} }
export function getPath(id: number | string) { export function getPath(id: number | string) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let query: string = `SELECT path FROM media WHERE id = ?`; let query: string = `SELECT path FROM media WHERE id = ?`;
db.get(query, [id], (err: Error, path: object) => { db.get(query, [id], (err: Error, path: object) => {
if (err) {reject(err)} if (err) {reject(err)}
resolve(path) resolve(path)
}); });
}) })
} }
export function deleteId(database: string, id: number | string) { export function deleteId(database: string, id: number | string) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let query: string = `DELETE FROM ${database} WHERE id = ?` let query: string = `DELETE FROM ${database} WHERE id = ?`
db.run(query, [id], (err: Error) => { db.run(query, [id], (err: Error) => {
if (err) {reject(err); return;} if (err) {reject(err); return;}
resolve(null) resolve(null)
}) })
}) })
} }
export interface MediaRow { export interface MediaRow {
id? : Number, id? : Number,
path: String, path: String,
expire: Date, expire: Date,
username?: String username?: String
} }
export type MediaParams = [ export type MediaParams = [
path: String, path: String,
expire: Date, expire: Date,
username?: String username?: String
] ]
export interface UserRow { export interface UserRow {
id? : Number, id? : Number,
username: String, username: String,
hashed_password: any, hashed_password: any,
salt: any salt: any
} }

4
app/types/lib.ts
View file

@ -8,8 +8,8 @@ declare global {
} }
export function extension(str: String){ export function extension(str: String){
let file = str.split("/").pop(); let file = str.split("/").pop();
return [file.substr(0,file.lastIndexOf(".")),file.substr(file.lastIndexOf("."),file.length).toLowerCase()]; return [file.substr(0,file.lastIndexOf(".")),file.substr(file.lastIndexOf("."),file.length).toLowerCase()];
} }
export interface User { export interface User {