added / fixed some types

src/modules/dataEditor/dataEditor.ts

@@ -19,9 +19,8 @@
  ------------------------------------------------------------------------- */
 
 // package requires
-import express from 'express'
-import bodyParser from 'body-parser'
-import busboy from 'connect-busboy'
+import express, { RequestHandler } from 'express'
+import type { Database } from 'better-sqlite3'
 const app = express()
 
 // other requires
@@ -32,21 +31,21 @@ import { SetupData } from '../../server'
 import { ModuleType, Request } from '../../types/basicTypes'
 
 // stuff gotten from server.js
-let userDB
-let publicdirs = []
+let userDB: Database
+let publicdirs: string[] = []
 let nextdir = ''
 
 function GetApp(): ModuleType {
   app.use(
-    bodyParser.urlencoded({
+    express.urlencoded({
       limit: '5mb',
       extended: true,
-    })
+    }) as RequestHandler
   )
   app.use(
-    bodyParser.json({
+    express.json({
       limit: '5mb',
-    })
+    }) as RequestHandler
   )
   app.set('view engine', 'ejs')
   app.set('views', ['./src/modules/dataEditor/views', './src/sharedViews'])
@@ -57,7 +56,7 @@ function GetApp(): ModuleType {
       exceptions: ['/favicon.ico'],
     })
   )
-  app.use((req: Request, res, next) => {
+  app.use((req: Request, _res, next) => {
     const url = req.url.split('?')[0]
     if (url.includes('.html') || url === '/') {
       logger.LogReq(req)
@@ -69,17 +68,10 @@ function GetApp(): ModuleType {
     app.use(express.static(pdir))
   })
   app.use(express.static(nextdir))
-  app.use(
-    busboy({
-      limits: {
-        fileSize: 10000 * 1024 * 1024,
-      },
-    })
-  )
 
   // --------------------------------------------------------------
 
-  function AddHtmlRoutes(files) {
+  function AddHtmlRoutes(files: string[]) {
     const routes = files.reduce((acc, file) => {
       if (file.includes('html')) {
         acc.push(file.split('.')[0])
@@ -90,7 +82,7 @@ function GetApp(): ModuleType {
 
     routes.forEach((route) => {
       logger.DebugLog(`Added route /${route}`, 'DataEditor routes', 1)
-      app.get(`/${route}`, function (req: Request, res) {
+      app.get(`/${route}`, function (_req: Request, res) {
         res.redirect(`${route}.html`)
       })
     })
@@ -104,11 +96,11 @@ function GetApp(): ModuleType {
     logger.LogReq(req)
   })
 
-  app.get('*', function (req: Request, res) {
+  app.get('*', function (_req: Request, res) {
     res.status(404).render('404')
   })
 
-  app.post('*', function (req: Request, res) {
+  app.post('*', function (_req: Request, res) {
     res.status(404).render('404')
   })