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

fix never expire

Browse source
This commit is contained in:
anarch3 2022-11-20 19:08:36 -05:00
parent 13082c74a9
commit 3dcf670d28
3 changed files with 110 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

172
app.js
View file

@ -1,86 +1,86 @@
require("dotenv").config(); require("dotenv").config();
let express = require("express"); let express = require("express");
let passport = require("passport"); let passport = require("passport");
let session = require("express-session"); let session = require("express-session");
let cookieParser = require("cookie-parser"); let cookieParser = require("cookie-parser");
let SQLiteStore = require("connect-sqlite3")(session); let SQLiteStore = require("connect-sqlite3")(session);
let fs = require("fs"); let fs = require("fs");
let path = require("path"); let path = require("path");
let authRouter = require("./routes/auth"); let authRouter = require("./routes/auth");
let indexRouter = require("./routes/index"); let indexRouter = require("./routes/index");
let db = require("./db"); let db = require("./db");
let app = express(); let app = express();
app.enable("trust proxy"); app.enable("trust proxy");
// view engine setup // view engine setup
app.set("views", path.join(__dirname, "views")); app.set("views", path.join(__dirname, "views"));
app.set("view engine", "ejs"); 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,
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"));
app.use("/", indexRouter); app.use("/", indexRouter);
app.use("/", authRouter); app.use("/", authRouter);
app.use("/uploads", express.static("uploads")); app.use("/uploads", express.static("uploads"));
function prune () { function prune () {
db.all("SELECT * FROM media", (err, rows) => { db.all("SELECT * FROM media", (err, 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, rows) => { db.all("SELECT * FROM media WHERE expire < ?", [Date.now()], (err, 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) => { rows.forEach((row) => {
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) => { db.all("DELETE FROM media WHERE path = ?", [row.path], (err) => {
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) => { db.all("DELETE FROM media WHERE path = ?", [row.path], (err) => {
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
module.exports = app; module.exports = app;

24
docker-entrypoint.sh
View file

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# Exit build script on first failure. # Exit build script on first failure.
set -e set -e
# Exit on unset variable. # Exit on unset variable.
set -u set -u
set -x set -x
node db.js node db.js
npm start npm start

15
middleware.js
View file

@ -100,14 +100,23 @@ function handleUpload(req, res, next) {
for (let file in req.files) { for (let file in req.files) {
let currentdate = Date.now(); let currentdate = Date.now();
let expireDate = new Date(currentdate + (req.body.expire * 24 * 60 * 60 * 1000)); let expireDate= "";
if (req.body.expire) {
expireDate = new Date(currentdate + (req.body.expire * 24 * 60 * 60 * 1000));
console.log(req.body.expire);
console.log(expireDate);
} else
expireDate = null;
db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [req.files[file].filename, expireDate], function (err) { db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [req.files[file].filename, expireDate], function (err) {
if (err) { if (err) {
console.log(err); console.log(err);
return next(err); return next(err);
} }
console.log("Uploaded " + req.files[file].filename + " to database"); console.log(`Uploaded ${req.files[file].filename} to database`);
console.log("It will expire in " + req.body.expire + " days"); if (expireDate != null || expireDate != undefined || expireDate != "")
console.log(`It will expire in ${req.body.expire} days`);
else
console.log("It will not expire");
}); });
} }