moved to src, prepare for unit testing

Author: asomoza

environment.d.ts

@@ -1,6 +1,6 @@
 {
   "ignore": [".git", "node_modules/", "dist/"],
-  "watch": ["server/"],
+  "watch": ["src/"],
   "execMap": {
     "ts": "npx ts-node --esm"
   },

nodemon.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "build": "npx tsc",
-    "start": "nodemon --config nodemon.json server/server.ts"
+    "start": "nodemon --config nodemon.json src/server.ts"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",

package.json

@@ -0,0 +1,58 @@
+import express from 'express';
+import cors from 'cors';
+import connectRedis from 'connect-redis';
+import {createClient} from 'redis';
+import session from 'express-session';
+import env from './utils/env.js';
+import cookieParser from 'cookie-parser';
+import fileupload from 'express-fileupload';
+import auth from './endpoints/auth.js';
+import video from './endpoints/video.js';
+import videos from './endpoints/videos.js';
+import image from './endpoints/image.js';
+import requireAuth from './middleware/requireAuth.js';
+
+const app = express();
+
+const allowedOrigins = ['http://localhost', 'http://localhost:8080'];
+const options: cors.CorsOptions = {
+  origin: allowedOrigins,
+  credentials: true,
+};
+
+const RedisStore = connectRedis(session);
+const redisClient = createClient({legacyMode: true});
+
+redisClient.connect().then(() => {
+  console.log('Successfully connected to redis.');
+}).catch((_error:any) => {
+  console.log('Failed to connect to redis, server not running...');
+  process.exitCode = 1;
+  process.exit();
+});
+
+app.use(cors(options));
+app.use(cookieParser());
+app.use(session({
+  store: new RedisStore({client: redisClient}),
+  secret: env.SESSION_SECRET,
+  resave: false,
+  saveUninitialized: false,
+  cookie: {
+    secure: false, // Change in production
+    httpOnly: true,
+  },
+}));
+app.use(requireAuth);
+app.use(express.json());
+app.use(fileupload({
+  useTempFiles: true,
+  tempFileDir: '/tmp/',
+}));
+
+app.use('/api/auth', auth);
+app.use('/api/video', video);
+app.use('/api/videos', videos);
+app.use('/api/image', image);
+
+export default app;

server/server.ts

@@ -7,15 +7,6 @@ import {getDb} from '../db/mongo.js';
 const auth = express.Router();
 // const saltRounds = Number(process.env.SALT_ROUNDS);
 
-declare module 'express-session' {
-  // eslint-disable-next-line no-unused-vars
-  interface SessionData {
-    userId: string;
-    user: string;
-    profile: number;
-  }
-}
-
 auth.post('/', function(req, res) {
   const {user, password} = req.body;
 
@@ -36,7 +27,10 @@ auth.post('/', function(req, res) {
                 dbResult.password,
                 function(_err, authResult) {
                   if (authResult) {
-                    req.session.userId = dbResult._id;
+                    // console.log(dbResult);
+                    // console.log(req.session);
+
+                    req.session.userId = dbResult._id.toString();
                     req.session.user = dbResult.username;
                     req.session.profile = dbResult.profile;
                     res.json(

src/app.ts

@@ -92,7 +92,6 @@ video.post('/upload', function(req, res) {
 
       const relPath = `/${year}/${month}/${day}`;
 
-      /** Insert video in database */
       const db = getDb();
 
       video.mv(tempDir + '/' + video.name).then(() => {

server/db/mongo.ts renamed to src/db/mongo.ts

@@ -7,11 +7,8 @@ import {Request, Response, NextFunction} from 'express';
  * @param {NextFunction} next NextFunction
  */
 function requireAuth(req: Request, res: Response, next: NextFunction) {
-  // console.log(req.path);
-  // console.log(req.session);
-
   if (req.path !== '/api/auth') {
-    if (req.session.userId === undefined) {
+    if (req.session === undefined || req.session.userId === undefined) {
       console.log('Bloqued request!');
       res.status(400).send('Invalid user');
       return;

server/endpoints/auth.ts renamed to src/endpoints/auth.ts

@@ -0,0 +1,31 @@
+import fs from 'fs';
+import app from './app.js';
+import env from './utils/env.js';
+import {connectToServer} from './db/mongo.js';
+
+fs.stat(env.STORAGE, (err, stats) => {
+  if (err) {
+    // console.log(err.message);
+    console.log('storage not found, server not running.');
+    process.exitCode = 1;
+    process.exit();
+  }
+
+  if (!stats.isDirectory()) {
+    console.log('storage is not a directory, server not running.');
+    process.exitCode = 1;
+    process.exit();
+  }
+
+  connectToServer(function(error: any) {
+    if (error) {
+      console.log('Couldn\'t connect to database, server not running...');
+      process.exitCode = 1;
+      process.exit();
+    }
+
+    app.listen(env.PORT, function() {
+      console.log(`[server]: Server is running on port ${env.PORT}`);
+    });
+  });
+});

server/endpoints/image.ts renamed to src/endpoints/image.ts

@@ -0,0 +1,10 @@
+// eslint-disable-next-line no-unused-vars
+import {SessionData} from 'express-session';
+
+declare module 'express-session' {
+  export interface SessionData {
+    userId?: string;
+    user?: string;
+    profile?: number;
+  }
+}

server/endpoints/video.ts renamed to src/endpoints/video.ts

@@ -0,0 +1,9 @@
+import 'dotenv/config';
+
+export default {
+  PORT: process.env.PORT || 8000,
+  SESSION_SECRET: process.env.SESSION_SECRET || 'must change this!!!',
+  FFMPEG: process.env.FFMPEG || '/usr/bin/ffmpeg',
+  FFPROBE: process.env.FFPROBE || '/usr/bin/ffprobe',
+  STORAGE: process.env.STORAGE || '/mnt/storage',
+};

server/endpoints/videos.ts renamed to src/endpoints/videos.ts

@@ -1,6 +1,9 @@
 {
+  "ts-node": {
+    "files": true
+  },
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "node",
     "outDir": "./dist",
@@ -11,6 +14,6 @@
     "allowJs": false,
     "noImplicitAny": true,
   },
-  "include": [ "server/**/*" ],
-  "exclude": ["node_modules", "**/node_modules/*"],
+  "include": [ "./src/**/*" ],
+  "exclude": ["./node_modules", "**/node_modules/*"],
 }