Fixed some files

src/server.ts

@@ -28,31 +28,43 @@ const port = isRoot ? 80 : 8080
 const httpsport = isRoot ? 443 : 5001
 
 import express from 'express'
-const vhost = require('vhost')
 import logger from './utils/logger.js'
-const utils = require('./utils/utils.js')
-const http = require('http')
-const https = require('https')
-const cors = require('cors')
-const cookieParser = require('cookie-parser')
-const { v4: uuidv4 } = require('uuid')
+import vhost from 'vhost'
+import utils from './utils/utils.js'
+import http from 'http'
+import https from 'https'
+import cors from 'cors'
+import cookieParser from 'cookie-parser'
+import { uuidv4 } from 'uuid'
 
-const dbtools = require('./utils/dbtools.js')
-const reqlogger = require('./middlewares/reqlogger.middleware.js')
-const extraModulesFile = './src/extraModules.json'
-const modulesFile = './src/modules.json'
-const usersDBPath = 'data/dbs/users.db'
-const idStats = require('./utils/ids.js')
+import dbtools from './utils/dbtools.js'
+import reqlogger from './middlewares/reqlogger.middleware.js'
+import extraModulesFile from rc / extraModules.json
+import modulesFile from rc / modules.json
+import usersDBPath from ata / dbs / users.db
+import idStats from './utils/ids.js'
 idStats.Load()
+logger.Load()
+
+interface Modules {
+  [name: string]: Module
+}
+
+interface Module {
+  path: string
+  publicdirs: Array<string>
+  name: string
+  urls: Array<string>
+  nextdir?: string
+  isNextJs?: boolean
+}
 
 if (!utils.FileExists(usersDBPath)) {
   throw new Error('No user DB exists yet! please run utils/dbSetup.js first!')
 }
 const userDB = dbtools.GetDB(usersDBPath)
+let modules: Modules = utils.ReadJSON(modulesFile)
 
-let modules = JSON.parse(utils.ReadFile(modulesFile))
-
-logger.Load()
 const debugLevel = parseInt(process.env.NS_LOGLEVEL) || 0
 logger.Log('Loglevel is: ' + debugLevel)
 
@@ -69,8 +81,6 @@ try {
   console.error(err)
 }
 
-// Setting up exits
-// process.on('exit', () => exit('exit'))
 process.on('SIGINT', () => exit('SIGINT'))
 process.on('SIGTERM', () => exit('SIGTERM'))
 
@@ -138,9 +148,10 @@ app.use(
 )
 
 Object.keys(modules).forEach(function(key) {
-  let module = modules[key]
+  const module = modules[key]
   try {
-    let mod = require(module.path)
+    import mod from module.path
+    // const mod = require(module.path)
     logger.Log(`Loading ${mod.name} module`, logger.GetColor('yellow'))
 
     module.publicdirs.forEach((pdir) => {
@@ -174,7 +185,8 @@ const privkeyFile = '/etc/letsencrypt/live/frylabs.net/privkey.pem'
 const fullchainFile = '/etc/letsencrypt/live/frylabs.net/fullchain.pem'
 const chainFile = '/etc/letsencrypt/live/frylabs.net/chain.pem'
 
-var certsLoaded = false
+let certsLoaded = false
+let certs
 if (
   startHTTPS &&
   utils.FileExists(privkeyFile) &&
@@ -185,7 +197,7 @@ if (
     const key = utils.ReadFile(privkeyFile)
     const cert = utils.ReadFile(fullchainFile)
     const ca = utils.ReadFile(chainFile)
-    var certs = {
+    certs = {
       key: key,
       cert: cert,
       ca: ca,