Admin panel Incomplete

.eslintrc.json

@@ -11,6 +11,6 @@
   },
   "rules": {},
   "ignorePatterns": [
-    "src/assets/**/*"
+    "src/user/assets/**/*"
   ]
 }

src/config.js → config.js

@@ -1,5 +1,4 @@
 module.exports = Object.freeze({
   root: __dirname,
-  sessionSecret: process.env.SESSION_SECRET || 'secret',
   supportedVideoFormats: ['mp4', 'mkv', 'avi'],
 });

server.js

@@ -1,14 +1,15 @@
-const {networkInterfaces} = require('os');
 const path = require('path');
 
 const yargs = require('yargs/yargs');
 const {hideBin} = require('yargs/helpers');
 require('dotenv').config();
 
-const userSettings = require(__dirname + '/src/user-settings');
-// const argv = parseArgs(process.argv.slice(2));
+global.__config = require(__dirname + '/config');
+const config = global.__config;
 
-const nets = networkInterfaces();
+const settings = require(config.root + '/src/settings');
+const startServer = require(config.root + '/src/utility/startServer.js');
+// const argv = parseArgs(process.argv.slice(2));
 
 const argv = yargs(hideBin(process.argv))
     .scriptName('media-server')
@@ -29,23 +30,37 @@ const argv = yargs(hideBin(process.argv))
         type: 'number',
         description: 'the port to run server on',
       });
+      yargs.option('gui', {
+        alias: 'g',
+        type: 'boolean',
+        description: 'open gui mode for configuring settings',
+      });
     })
     .alias('h', 'help')
     .version(false).argv;
 
-Object.assign(userSettings, argv);
-const app = require(path.join(__dirname, 'src', 'index.js'));
+Object.assign(settings, argv);
+
+console.log(process.argv.slice(2).length && settings.location == undefined);
+if (process.argv.slice(2).length === 0 && settings.location == undefined) {
+  argv.g = true;
+}
 
 const PORT = argv.port || process.env.PORT || 3000;
 
-app.listen(PORT, () => {
-  console.log('server is up');
-  for (const name of Object.keys(nets)) {
-    for (const net of nets[name]) {
-      // skip over non-ipv4 and internal (i.e. 127.0.0.1) addresses
-      if (net.family === 'IPv4' && !net.internal) {
-        console.log('listening at http://' + net.address + ':' + PORT);
-      }
-    }
-  }
-});
+if (argv.g) {
+  const admin = require(config.root + '/src/admin/index.js');
+  const adminServer = admin.listen(parseInt(PORT) + 1, 'localhost', () => {
+    console.log('admin server is up');
+    console.log(
+        'listening at http://' +
+        adminServer.address().address +
+        ':' +
+        adminServer.address().port,
+    );
+  });
+  admin.on('close', () => {});
+} else {
+  const app = require(config.root + '/src/user/index.js');
+  startServer(app, PORT);
+}

src/admin/admin-session-config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  sessionSecret: process.env.ADMIN_SESSION_SECRET || 'secr3t',
+};

src/admin/index.js

@@ -0,0 +1,34 @@
+const config = global.__config;
+
+const express = require('express');
+const session = require('express-session');
+const startServer = require(config.root + '/src/utility/startServer');
+const FileStore = require('session-file-store')(session);
+
+const adminSessionConfig = require(config.root +
+  '/src/admin/admin-session-config');
+
+const app = express();
+
+app.use(express.json());
+app.use(express.urlencoded({extended: true}));
+app.use(
+    session({
+      secret: [adminSessionConfig.sessionSecret],
+      resave: false,
+      saveUninitialized: true,
+      cookie: {
+        maxAge: 30 * 24 * 60 * 60 * 1000, // milliseconds in 30 days
+      },
+      store: new FileStore(),
+    }),
+);
+
+app.get('/start', (req, res) => {
+  delete require.cache[require.resolve(config.root + '/src/user/index.js')];
+  const app = require(config.root + '/src/user/index.js');
+  startServer(app, adminSessionConfig.port);
+  res.send('Done');
+});
+
+module.exports = app;

src/user-settings.js → src/settings.js

@@ -1,3 +1,4 @@
 module.exports = {
   location: process.env.LOCATION,
+  port: process.env.PORT,
 };

src/index.js → src/user/index.js

@@ -5,10 +5,12 @@ const mustacheExpress = require('mustache-express');
 const FileStore = require('session-file-store')(session);
 const favicon = require('serve-favicon');
 
-const config = require(__dirname + '/config');
-const apiRouter = require(config.root + '/routes/api');
-const contentRouter = require(config.root + '/routes/content');
-const userSettings = require(config.root + '/user-settings');
+const config = global.__config;
+const apiRouter = require(config.root + '/src/user/routes/api');
+const contentRouter = require(config.root + '/src/user/routes/content');
+const settings = require(config.root + '/src/settings');
+const userSessionConfig = require(config.root +
+  '/src/user/user-session-config');
 
 const app = express();
 
@@ -20,7 +22,7 @@ app.use(express.json());
 app.use(express.urlencoded({extended: true}));
 app.use(
     session({
-      secret: [config.sessionSecret],
+      secret: [userSessionConfig.sessionSecret],
       resave: false,
       saveUninitialized: true,
       cookie: {
@@ -30,19 +32,19 @@ app.use(
     }),
 );
 
-app.use(favicon(config.root + '/public/favicon.ico'));
+app.use(favicon(config.root + '/src/user/public/favicon.ico'));
 
 app.get('/', (req, res) => {
   res.redirect('/content');
 });
 
-if (userSettings.verbose == 1) morganBody(app, {logAllReqHeader: false});
-if (userSettings.verbose >= 2) morganBody(app, {logAllReqHeader: true});
+if (settings.verbose == 1) morganBody(app, {logAllReqHeader: false});
+if (settings.verbose >= 2) morganBody(app, {logAllReqHeader: true});
 app.use('/api', apiRouter);
 app.use('/content', contentRouter);
 
-const content = userSettings.location;
+const content = settings.location;
 app.use('/public', express.static(content));
-app.use('/static', express.static(config.root + '/assets'));
+app.use('/static', express.static(config.root + 'src/user/assets'));
 
 module.exports = app;

src/user/routes/api/index.js

@@ -0,0 +1,11 @@
+const express = require('express');
+const config = global.__config;
+const root = config.root;
+
+// eslint-disable-next-line new-cap
+const router = express.Router();
+
+router.use('/video', require(root + '/src/user/routes/api/video'));
+router.use(require(root + '/src/user/routes/api/info'));
+
+module.exports = router;

src/routes/api/video.js → src/user/routes/api/video.js

@@ -1,8 +1,9 @@
 const express = require('express');
 const {StatusCodes} = require('http-status-codes');
 
-const root = require(__dirname + '/../../config').root;
-const utility = require(root + '/utility');
+const config = global.__config;
+const root = config.root;
+const utility = require(root + '/src/utility');
 
 // eslint-disable-next-line new-cap
 const router = express.Router();

src/routes/content.js → src/user/routes/content.js

@@ -4,14 +4,14 @@ const path = require('path');
 const express = require('express');
 const serveIndex = require('serve-index');
 
-const config = require(__dirname + '/../config');
-const services = require(config.root + '/services');
-const userSettings = require(config.root + '/user-settings');
+const config = global.__config;
+const services = require(config.root + '/src/user/services');
+const settings = require(config.root + '/src/settings');
 
 // eslint-disable-next-line new-cap
 const router = express.Router();
 
-const content = userSettings.location;
+const content = settings.location;
 const supportedVideoFormatsReg = services.video.supportedVideoFormatsReg;
 
 router.get(

src/user/services/index.js

@@ -0,0 +1,6 @@
+const config = global.__config;
+const root = config.root;
+const customRequireDirectory = require(root +
+  '/src/utility/customRequireDirectory');
+
+module.exports = customRequireDirectory(__dirname);

src/services/video.js → src/user/services/video.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 
-const config = require(__dirname + '/../config');
+const config = global.__config;
 
 const supportedVideoFormatsReg = new RegExp(
     '\\.' + '(' + config.supportedVideoFormats.join('|') + ')' + '$',

src/user/user-session-config.js

@@ -0,0 +1,3 @@
+module.exports = Object.freeze({
+  sessionSecret: process.env.USER_SESSION_SECRET || 'secret',
+});

src/utility/index.js

@@ -1,5 +1,7 @@
-const root = require(__dirname + '/../config').root;
+const config = global.__config;
+const root = config.root;
+
 const customRequireDirectory = require(root +
-  '/utility/customRequireDirectory');
+  '/src/utility/customRequireDirectory');
 
 module.exports = customRequireDirectory(__dirname);

src/utility/request-util/index.js

@@ -1,5 +1,6 @@
-const root = require(__dirname + '/../../config').root;
+const config = global.__config;
+const root = config.root;
 const customRequireDirectory = require(root +
-  '/utility/customRequireDirectory');
+  '/src/utility/customRequireDirectory');
 
 module.exports = customRequireDirectory(__dirname);

src/utility/response-util/index.js

@@ -1,5 +1,6 @@
-const root = require(__dirname + '/../../config').root;
+const config = global.__config;
+const root = config.root;
 const customRequireDirectory = require(root +
-  '/utility/customRequireDirectory');
+  '/src/utility/customRequireDirectory');
 
 module.exports = customRequireDirectory(__dirname);

src/utility/startServer.js

@@ -0,0 +1,15 @@
+module.exports = function(app, port) {
+  const {networkInterfaces} = require('os');
+  const nets = networkInterfaces();
+  app.listen(port, () => {
+    console.log('server is up');
+    for (const name of Object.keys(nets)) {
+      for (const net of nets[name]) {
+        // skip over non-ipv4 and internal (i.e. 127.0.0.1) addresses
+        if (net.family === 'IPv4' && !net.internal) {
+          console.log('listening at http://' + net.address + ':' + port);
+        }
+      }
+    }
+  });
+};