Преглед на файлове

refactor: Add jobQueue to BaseModule

Owen Diffey преди 1 година
родител
ревизия
07efc4ba9b
променени са 3 файла, в които са добавени 4 реда и са изтрити 9 реда
  1. 4 0
      backend/src/BaseModule.ts
  2. 0 4
      backend/src/modules/DataModule.ts
  3. 0 5
      backend/src/modules/WebSocketModule.ts

+ 4 - 0
backend/src/BaseModule.ts

@@ -1,3 +1,4 @@
+import JobQueue from "./JobQueue";
 import LogBook, { Log } from "./LogBook";
 import ModuleManager from "./ModuleManager";
 import { Modules } from "./types/Modules";
@@ -17,6 +18,8 @@ export default abstract class BaseModule {
 
 	protected logBook: LogBook;
 
+	protected jobQueue: JobQueue;
+
 	protected name: string;
 
 	protected status: ModuleStatus;
@@ -31,6 +34,7 @@ export default abstract class BaseModule {
 	public constructor(name: string) {
 		this.moduleManager = ModuleManager.getPrimaryInstance();
 		this.logBook = LogBook.getPrimaryInstance();
+		this.jobQueue = JobQueue.getPrimaryInstance();
 		this.name = name;
 		this.status = ModuleStatus.LOADED;
 		this.dependentModules = [];

+ 0 - 4
backend/src/modules/DataModule.ts

@@ -17,7 +17,6 @@ import { Schemas } from "../types/Schemas";
 import documentVersionPlugin from "../schemas/plugins/documentVersion";
 import getDataPlugin from "../schemas/plugins/getData";
 import Migration from "../Migration";
-import JobQueue from "../JobQueue";
 
 export default class DataModule extends BaseModule {
 	private models?: Models;
@@ -26,8 +25,6 @@ export default class DataModule extends BaseModule {
 
 	//	private redisClient?: RedisClientType;
 
-	private jobQueue: JobQueue;
-
 	/**
 	 * Data Module
 	 */
@@ -35,7 +32,6 @@ export default class DataModule extends BaseModule {
 		super("data");
 
 		this.dependentModules = ["events"];
-		this.jobQueue = JobQueue.getPrimaryInstance();
 	}
 
 	/**

+ 0 - 5
backend/src/modules/WebSocketModule.ts

@@ -4,7 +4,6 @@ import http, { Server, IncomingMessage } from "node:http";
 import { RawData, WebSocketServer } from "ws";
 import BaseModule from "../BaseModule";
 import { UniqueMethods } from "../types/Modules";
-import JobQueue from "../JobQueue";
 import WebSocket from "../WebSocket";
 
 export default class WebSocketModule extends BaseModule {
@@ -12,8 +11,6 @@ export default class WebSocketModule extends BaseModule {
 
 	private wsServer?: WebSocketServer;
 
-	private jobQueue: JobQueue;
-
 	private keepAliveInterval?: NodeJS.Timer;
 
 	/**
@@ -21,8 +18,6 @@ export default class WebSocketModule extends BaseModule {
 	 */
 	public constructor() {
 		super("websocket");
-
-		this.jobQueue = JobQueue.getPrimaryInstance();
 	}
 
 	/**