From da7132822ec06e2daa8dceb26018013a292390c2 Mon Sep 17 00:00:00 2001 From: anarch3 Date: Tue, 22 Nov 2022 22:04:24 -0500 Subject: [PATCH] housekeeping --- app.js | 78 +++++++++++++++++++---- bin/www | 89 --------------------------- cypress.config.js | 3 +- package.json | 2 +- routes/auth.js | 8 +-- routes/index.js | 16 ++--- middleware.js => routes/middleware.js | 2 +- views/index.ejs | 2 +- 8 files changed, 84 insertions(+), 116 deletions(-) delete mode 100644 bin/www rename middleware.js => routes/middleware.js (99%) diff --git a/app.js b/app.js index 25fad73..22b8f13 100644 --- a/app.js +++ b/app.js @@ -1,21 +1,77 @@ require("dotenv").config(); +const express = require("express"); +const passport = require("passport"); +const session = require("express-session"); +const cookieParser = require("cookie-parser"); +const SQLiteStore = require("connect-sqlite3")(session); -let express = require("express"); -let passport = require("passport"); -let session = require("express-session"); -let cookieParser = require("cookie-parser"); -let SQLiteStore = require("connect-sqlite3")(session); +const fs = require("fs"); +const http = require("http"); +const path = require("path"); -let fs = require("fs"); -let path = require("path"); +const authRouter = require("./routes/auth"); +const indexRouter = require("./routes/index"); -let authRouter = require("./routes/auth"); -let indexRouter = require("./routes/index"); - -let db = require("./db"); +const db = require("./db"); let app = express(); +let server = http.createServer(app); +let port = normalizePort(process.env.EBPORT || "3000"); +app.set("port", port); + +server.listen(port); +server.on("error", onError); +server.on("listening", onListening); + +function normalizePort(val) { + var port = parseInt(val, 10); + + if (isNaN(port)) { + // named pipe + return val; + } + + if (port >= 0) { + // port number + return port; + } + + return false; +} + +function onError(error) { + if (error.syscall !== "listen") { + throw error; + } + + var bind = typeof port === "string" + ? "Pipe " + port + : "Port " + port; + + // handle specific listen errors with friendly messages + switch (error.code) { + case "EACCES": + console.error(bind + " requires elevated privileges"); + process.exit(1); + break; + case "EADDRINUSE": + console.error(bind + " is already in use"); + process.exit(1); + break; + default: + throw error; + } +} + +function onListening() { + var addr = server.address(); + var bind = typeof addr === "string" + ? "pipe " + addr + : "port " + addr.port; + console.log("Listening on " + bind); +} + app.enable("trust proxy"); // view engine setup diff --git a/bin/www b/bin/www deleted file mode 100644 index ddb3dc4..0000000 --- a/bin/www +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env node - -/** - * Module dependencies. - */ - -var app = require('../app'); -var http = require('http'); - -/** - * Get port from environment and store in Express. - */ - -var port = normalizePort(process.env.EBPORT || '3000'); -app.set('port', port); - -/** - * Create HTTP server. - */ - -var server = http.createServer(app); - -/** - * Listen on provided port, on all network interfaces. - */ - -server.listen(port); -server.on('error', onError); -server.on('listening', onListening); - -/** - * Normalize a port into a number, string, or false. - */ - -function normalizePort(val) { - var port = parseInt(val, 10); - - if (isNaN(port)) { - // named pipe - return val; - } - - if (port >= 0) { - // port number - return port; - } - - return false; -} - -/** - * Event listener for HTTP server "error" event. - */ - -function onError(error) { - if (error.syscall !== 'listen') { - throw error; - } - - var bind = typeof port === 'string' - ? 'Pipe ' + port - : 'Port ' + port; - - // handle specific listen errors with friendly messages - switch (error.code) { - case 'EACCES': - console.error(bind + ' requires elevated privileges'); - process.exit(1); - break; - case 'EADDRINUSE': - console.error(bind + ' is already in use'); - process.exit(1); - break; - default: - throw error; - } -} - -/** - * Event listener for HTTP server "listening" event. - */ - -function onListening() { - var addr = server.address(); - var bind = typeof addr === 'string' - ? 'pipe ' + addr - : 'port ' + addr.port; - console.log('Listening on ' + bind); -} diff --git a/cypress.config.js b/cypress.config.js index 8f3b625..00a2dac 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -4,5 +4,6 @@ module.exports = defineConfig({ e2e: { baseUrl: "http://localhost:3000", }, - chromeWebSecurity: false + chromeWebSecurity: false, + "video": false }); diff --git a/package.json b/package.json index b3be5bc..502701d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "license": "Unlicense", "scripts": { - "start": "node ./bin/www" + "start": "node ./app.js" }, "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", diff --git a/routes/auth.js b/routes/auth.js index 9e11e71..865f4cf 100644 --- a/routes/auth.js +++ b/routes/auth.js @@ -1,7 +1,7 @@ -let crypto = require("crypto"); -let express = require("express"); -let passport = require("passport"); -let LocalStrategy = require("passport-local"); +const crypto = require("crypto"); +const express = require("express"); +const passport = require("passport"); +const LocalStrategy = require("passport-local"); let db = require("../db"); diff --git a/routes/index.js b/routes/index.js index 371e3d1..9c1cace 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,17 +1,17 @@ -let multer = require("multer"); -let express = require("express"); -let ffmpeg = require("fluent-ffmpeg"); -let imageProbe = require("probe-image-size"); -let ffmpegpath = require("@ffmpeg-installer/ffmpeg").path; -let ffprobepath = require("@ffprobe-installer/ffprobe").path; +const multer = require("multer"); +const express = require("express"); +const ffmpeg = require("fluent-ffmpeg"); +const imageProbe = require("probe-image-size"); +const ffmpegpath = require("@ffmpeg-installer/ffmpeg").path; +const ffprobepath = require("@ffprobe-installer/ffprobe").path; ffmpeg.setFfmpegPath(ffmpegpath); ffmpeg.setFfprobePath(ffprobepath); -let fs = require("fs"); +const fs = require("fs"); let db = require("../db"); -let {checkAuth, convert, handleUpload} = require("../middleware"); +let {checkAuth, convert, handleUpload} = require("./middleware"); function extension(str){ let file = str.split("/").pop(); diff --git a/middleware.js b/routes/middleware.js similarity index 99% rename from middleware.js rename to routes/middleware.js index 2fb670d..950398d 100644 --- a/middleware.js +++ b/routes/middleware.js @@ -7,7 +7,7 @@ ffmpeg.setFfprobePath(ffprobepath); const fs = require("fs"); const process = require("process"); -let db = require("./db.js"); +let db = require("../db.js"); function extension(str){ let file = str.split("/").pop(); diff --git a/views/index.ejs b/views/index.ejs index 219a2a2..856c1ba 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -47,7 +47,7 @@ return string.slice((string.lastIndexOf(".") - 2 >>> 0) + 2); - +

Click the file to copy the url