From dfef1e7784065d8fea348fb2db082501d2f63a25 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:40:03 +0100 Subject: [PATCH] Fixed tests. --- src/node/db/DB.ts | 2 +- src/node/handler/PadMessageHandler.js | 2 +- src/node/handler/SocketIORouter.js | 2 +- src/node/hooks/express.ts | 2 +- src/node/hooks/express/errorhandling.ts | 2 +- src/node/server.ts | 2 +- src/node/stats.ts | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/node/db/DB.ts b/src/node/db/DB.ts index ada09cd4a..1daab8dd3 100644 --- a/src/node/db/DB.ts +++ b/src/node/db/DB.ts @@ -24,7 +24,7 @@ const ueberDB = require('ueberdb2'); const settings = require('../utils/Settings'); const log4js = require('log4js'); -import stats from '../stats'; +const stats = require('../stats') const logger = log4js.getLogger('ueberDB'); diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 1f5701376..55894017a 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -35,7 +35,7 @@ const log4js = require('log4js'); const messageLogger = log4js.getLogger('message'); const accessLogger = log4js.getLogger('access'); const hooks = require('../../static/js/pluginfw/hooks.js'); -import stats from '../stats' +const stats = require('../stats') const assert = require('assert').strict; const {RateLimiterMemory} = require('rate-limiter-flexible'); const webaccess = require('../hooks/express/webaccess'); diff --git a/src/node/handler/SocketIORouter.js b/src/node/handler/SocketIORouter.js index b01df3c32..7b58032ae 100644 --- a/src/node/handler/SocketIORouter.js +++ b/src/node/handler/SocketIORouter.js @@ -22,7 +22,7 @@ const log4js = require('log4js'); const settings = require('../utils/Settings'); -import stats from '../stats' +const stats = require('../stats') const logger = log4js.getLogger('socket.io'); diff --git a/src/node/hooks/express.ts b/src/node/hooks/express.ts index 134280cf1..b273887d6 100644 --- a/src/node/hooks/express.ts +++ b/src/node/hooks/express.ts @@ -15,7 +15,7 @@ const hooks = require('../../static/js/pluginfw/hooks'); import log4js from 'log4js'; const SessionStore = require('../db/SessionStore'); const settings = require('../utils/Settings'); -import stats from '../stats'; +const stats = require('../stats') import util from 'util'; const webaccess = require('./express/webaccess'); diff --git a/src/node/hooks/express/errorhandling.ts b/src/node/hooks/express/errorhandling.ts index 734d915b2..f0f531eb3 100644 --- a/src/node/hooks/express/errorhandling.ts +++ b/src/node/hooks/express/errorhandling.ts @@ -3,7 +3,7 @@ import {ArgsExpressType} from "../../types/ArgsExpressType"; import {ErrorCaused} from "../../types/ErrorCaused"; -import stats from '../../stats'; +const stats = require('../stats') exports.expressCreateServer = (hook_name:string, args: ArgsExpressType, cb:Function) => { exports.app = args.app; diff --git a/src/node/server.ts b/src/node/server.ts index facefce81..5916dd904 100755 --- a/src/node/server.ts +++ b/src/node/server.ts @@ -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'); -import stats from './stats'; +const stats = require('../stats') const logger = log4js.getLogger('server'); diff --git a/src/node/stats.ts b/src/node/stats.ts index ad0deea1a..f1fc0cccf 100644 --- a/src/node/stats.ts +++ b/src/node/stats.ts @@ -4,6 +4,7 @@ const measured = require('measured-core'); module.exports = measured.createCollection(); +// @ts-ignore module.exports.shutdown = async (hookName, context) => { module.exports.end(); }; \ No newline at end of file