Lotsa typescript bullshit

src/modules/qmining/qmining.ts

@@ -19,23 +19,24 @@
  ------------------------------------------------------------------------- */
 
 // package requires
-const express = require('express')
-const bodyParser = require('body-parser')
-const busboy = require('connect-busboy')
-const url = require('url')
+import express from 'express'
+import bodyParser from 'body-parser'
+import busboy from 'connect-busboy'
 const app = express()
 
 // other requires
-const utils = require('../../utils/utils.js')
-const logger = require('../../utils/logger.js')
-const auth = require('../../middlewares/auth.middleware.js')
+import utils from '../../utils/utils'
+import logger from '../../utils/logger'
+import auth from '../../middlewares/auth.middleware'
+import { SetupData } from '../../server'
+import { ModuleType } from '../../types/basicTypes'
 
 // stuff gotten from server.js
 let publicdirs = []
 let userDB
 let nextdir = ''
 
-function GetApp() {
+function GetApp(): ModuleType {
   app.use(
     bodyParser.urlencoded({
       limit: '5mb',
@@ -180,7 +181,7 @@ function GetApp() {
 
       let target = redirect.to
       if (!redirect.to.includes('?')) {
-        target += url.format({ query: req.query })
+        target += utils.formatUrl({ query: req.query })
       }
 
       res.redirect(target)
@@ -200,10 +201,10 @@ function GetApp() {
 
     routes.forEach((route) => {
       logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
-      app.get(`/${route}`, function(req, res) {
+      app.get(`/${route}`, function(req: express.Request, res) {
         logger.LogReq(req)
         res.redirect(
-          url.format({
+          utils.formatUrl({
             pathname: `${route}.html`,
             query: req.query,
           })
@@ -241,10 +242,12 @@ function GetApp() {
   }
 }
 
-exports.name = 'Qmining'
-exports.getApp = GetApp
-exports.setup = (data) => {
-  userDB = data.userDB
-  publicdirs = data.publicdirs
-  nextdir = data.nextdir
+export default {
+  name: 'Qmining',
+  getApp: GetApp,
+  setup: (data: SetupData): void => {
+    userDB = data.userDB
+    publicdirs = data.publicdirs
+    nextdir = data.nextdir
+  },
 }