From 6fdf9ed8128a8453e81ebe1cea54bdc5445a50d8 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:26:05 +0100
Subject: [PATCH] Added more types.

---
 src/node/hooks/express.ts          | 2 +-
 src/node/security/SecretRotator.ts | 4 ++--
 src/node/server.ts                 | 4 ++--
 src/node/stats.ts                  | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/node/hooks/express.ts b/src/node/hooks/express.ts
index b1ca252ac..85a0db5fd 100644
--- a/src/node/hooks/express.ts
+++ b/src/node/hooks/express.ts
@@ -17,7 +17,7 @@ const stats = require('../stats');
 const util = require('util');
 const webaccess = require('./express/webaccess');
 
-const SecretRotator = require('../security/SecretRotator')
+import SecretRotator from '../security/SecretRotator';
 
 // TODO once we have ESM we can use the type of the class
 let secretRotator: any|null = null;
diff --git a/src/node/security/SecretRotator.ts b/src/node/security/SecretRotator.ts
index 7d1c3a370..ad1f27457 100644
--- a/src/node/security/SecretRotator.ts
+++ b/src/node/security/SecretRotator.ts
@@ -1,4 +1,4 @@
-'use strict';
+
 
 import {DeriveModel} from "../types/DeriveModel";
 import {LegacyParams} from "../types/LegacyParams";
@@ -261,4 +261,4 @@ export class SecretRotator {
   }
 }
 
-module.exports = SecretRotator;
+export default SecretRotator
diff --git a/src/node/server.ts b/src/node/server.ts
index af5608202..fef67e7a5 100755
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -28,7 +28,7 @@ import {PluginType} from "./types/Plugin";
 import {ErrorCaused} from "./types/ErrorCaused";
 import {PromiseHooks} from "node:v8";
 
-const log4js = require('log4js');
+import log4js from 'log4js';
 
 const settings = require('./utils/Settings');
 
@@ -55,7 +55,7 @@ const pluginDefs = require('../static/js/pluginfw/plugin_defs');
 const plugins = require('../static/js/pluginfw/plugins');
 const installer = require('../static/js/pluginfw/installer');
 const {Gate} = require('./utils/promises');
-const stats = require('./stats');
+import * as stats from './stats';
 
 const logger = log4js.getLogger('server');
 
diff --git a/src/node/stats.ts b/src/node/stats.ts
index 2767b542f..1c7aac26d 100644
--- a/src/node/stats.ts
+++ b/src/node/stats.ts
@@ -1,6 +1,7 @@
 'use strict';
 
-const measured = require('measured-core');
+// @ts-ignore
+import measured from 'measured-core';
 
 module.exports = measured.createCollection();