chore: type fixes

Its4Nik · Its4Nik · commit fd4e2193d817 · 2025-06-30T21:34:59.000+02:00
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@biomejs/biome": "1.9.4",
     "@its_4_nik/gitai": "^1.1.14",
     "@types/bun": "latest",
-    "@types/dockerode": "^3.3.41",
+    "@types/dockerode": "^3.3.42",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.15.32",
     "@types/split2": "^4.2.3",
diff --git a/src/core/database/containerStats.ts b/src/core/database/containerStats.ts
@@ -1,4 +1,4 @@
-import type { containerStatistics } from "~/typings/database";
+import type { container_stats } from "~/typings/database";
 import { db } from "./database";
 import { executeDbOperation } from "./helper";
 
@@ -9,44 +9,35 @@ const insert = db.prepare(`
 
 const get = db.prepare("SELECT * FROM container_stats");
 
-export function addContainerStats(
-	id: string,
-	hostId: string,
-	name: string,
-	image: string,
-	status: string,
-	state: string,
-	cpu_usage: number,
-	memory_usage: number,
-) {
+export function addContainerStats(stats: container_stats) {
 	return executeDbOperation(
 		"Add Container Stats",
 		() =>
 			insert.run(
-				id,
-				hostId,
-				name,
-				image,
-				status,
-				state,
-				cpu_usage,
-				memory_usage,
+				stats.id,
+				stats.hostId,
+				stats.name,
+				stats.image,
+				stats.status,
+				stats.state,
+				stats.cpu_usage,
+				stats.memory_usage,
 			),
 		() => {
 			if (
-				typeof id !== "string" ||
-				typeof hostId !== "string" ||
-				typeof cpu_usage !== "number" ||
-				typeof memory_usage !== "number"
+				typeof stats.id !== "string" ||
+				typeof stats.hostId !== "number" ||
+				typeof stats.cpu_usage !== "number" ||
+				typeof stats.memory_usage !== "number"
 			) {
 				throw new TypeError("Invalid container stats parameters");
 			}
 		},
 	);
 }
 
-export function getContainerStats(): containerStatistics[] {
+export function getContainerStats(): container_stats[] {
 	return executeDbOperation("Get Container Stats", () =>
 		get.all(),
-	) as containerStatistics[];
+	) as container_stats[];
 }
diff --git a/src/core/docker/client.ts b/src/core/docker/client.ts
@@ -1,6 +1,6 @@
 import Docker from "dockerode";
 import { logger } from "~/core/utils/logger";
-import type { DockerHost } from "../../../typings/docker";
+import type { DockerHost } from "~/typings/docker";
 
 export const getDockerClient = (host: DockerHost): Docker => {
 	try {
diff --git a/src/core/docker/monitor.ts b/src/core/docker/monitor.ts
@@ -68,7 +68,7 @@ async function startFor(host: DockerHost) {
 				if (event.Type === "container") {
 					const containerInfo: ContainerInfo = {
 						id: event.Actor?.ID || event.id || "",
-						hostId: host.name,
+						hostId: host.id,
 						name: event.Actor?.Attributes?.name || "",
 						image: event.Actor?.Attributes?.image || event.from || "",
 						status: event.status || event.Actor?.Attributes?.status || "",
diff --git a/src/core/docker/scheduler.ts b/src/core/docker/scheduler.ts
@@ -2,7 +2,7 @@ import { dbFunctions } from "~/core/database";
 import storeContainerData from "~/core/docker/store-container-stats";
 import storeHostData from "~/core/docker/store-host-stats";
 import { logger } from "~/core/utils/logger";
-import type { config } from "../../../typings/database";
+import type { config } from "~/typings/database";
 
 function convertFromMinToMs(minutes: number): number {
 	return minutes * 60 * 1000;
diff --git a/src/core/docker/store-container-stats.ts b/src/core/docker/store-container-stats.ts
@@ -5,6 +5,7 @@ import {
 	calculateCpuPercent,
 	calculateMemoryUsage,
 } from "~/core/utils/calculations";
+import type { container_stats } from "~/typings/database";
 import { logger } from "../utils/logger";
 
 async function storeContainerData() {
@@ -68,16 +69,18 @@ async function storeContainerData() {
 								},
 							);
 
-							dbFunctions.addContainerStats(
-								containerInfo.Id,
-								host.name,
-								containerName,
-								containerInfo.Image,
-								containerInfo.Status,
-								containerInfo.State,
-								calculateCpuPercent(stats),
-								calculateMemoryUsage(stats),
-							);
+							const parsed: container_stats = {
+								cpu_usage: calculateCpuPercent(stats),
+								hostId: host.id,
+								id: containerInfo.Id,
+								image: containerInfo.Image,
+								memory_usage: calculateMemoryUsage(stats),
+								name: containerName,
+								state: containerInfo.State,
+								status: containerInfo.Status,
+							};
+
+							dbFunctions.addContainerStats(parsed);
 						} catch (error) {
 							const errMsg =
 								error instanceof Error ? error.message : String(error);
diff --git a/src/core/plugins/loader.ts b/src/core/plugins/loader.ts
@@ -43,7 +43,7 @@ export async function loadPlugins(pluginDir: string) {
 			pluginManager.register(plugin);
 			pluginCount++;
 		} catch (error) {
-			pluginManager.fail({ name: file });
+			pluginManager.fail({ name: file, version: "0.0.0" });
 			logger.error(
 				`Error while registering plugin ${absolutePath}: ${error as string}`,
 			);
diff --git a/src/core/plugins/plugin-manager.ts b/src/core/plugins/plugin-manager.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "node:events";
-import type { ContainerInfo } from "../../../typings/docker";
-import type { Plugin, PluginInfo } from "../../../typings/plugin";
+import type { ContainerInfo } from "~/typings/docker";
+import type { Plugin, PluginInfo } from "~/typings/plugin";
 import { logger } from "../utils/logger";
 
 function getHooks(plugin: Plugin) {
@@ -52,29 +52,31 @@ class PluginManager extends EventEmitter {
 	}
 
 	getPlugins(): PluginInfo[] {
-		const loadedPlugins = Array.from(this.plugins.values()).map((plugin) => {
+		const plugins: PluginInfo[] = [];
+
+		for (const plugin of this.plugins.values()) {
 			logger.debug(`Loaded plugin: ${plugin}`);
 			const hooks = getHooks(plugin);
-			return {
+			plugins.push({
 				name: plugin.name,
+				version: plugin.version,
 				status: "active",
 				usedHooks: hooks,
-			};
-		});
-
-		const failedPlugins = Array.from(this.failedPlugins.values()).map(
-			(plugin) => {
-				const hooks = getHooks(plugin);
-
-				return {
-					name: plugin.name,
-					status: "inactive",
-					usedHooks: hooks,
-				};
-			},
-		);
-
-		return loadedPlugins.concat(failedPlugins);
+			});
+		}
+
+		for (const plugin of this.failedPlugins.values()) {
+			logger.debug(`Loaded plugin: ${plugin}`);
+			const hooks = getHooks(plugin);
+			plugins.push({
+				name: plugin.name,
+				version: plugin.version,
+				status: "inactive",
+				usedHooks: hooks,
+			});
+		}
+
+		return plugins;
 	}
 
 	// Trigger plugin flows:
diff --git a/src/core/stacks/controller.ts b/src/core/stacks/controller.ts
@@ -35,6 +35,7 @@ export async function deployStack(stack_config: stacks_config): Promise<void> {
 
 		postToClient({
 			type: "stack-status",
+			timestamp: new Date(),
 			data: {
 				stack_id: stackId,
 				status: "pending",
@@ -66,6 +67,7 @@ export async function deployStack(stack_config: stacks_config): Promise<void> {
 
 		postToClient({
 			type: "stack-status",
+			timestamp: new Date(),
 			data: {
 				stack_id: stackId,
 				status: "deployed",
@@ -109,6 +111,7 @@ export async function deployStack(stack_config: stacks_config): Promise<void> {
 
 		postToClient({
 			type: "stack-error",
+			timestamp: new Date(),
 			data: {
 				stack_id: stackId ?? 0,
 				action: "deploying",
@@ -210,6 +213,7 @@ export async function removeStack(stack_id: number): Promise<void> {
 			logger.error(errorMsg);
 			postToClient({
 				type: "stack-error",
+				timestamp: new Date(),
 				data: {
 					stack_id,
 					action: "removing",
@@ -224,6 +228,7 @@ export async function removeStack(stack_id: number): Promise<void> {
 
 		postToClient({
 			type: "stack-removed",
+			timestamp: new Date(),
 			data: {
 				stack_id,
 				message: "Stack removed successfully",
@@ -234,6 +239,7 @@ export async function removeStack(stack_id: number): Promise<void> {
 		logger.error(errorMsg);
 		postToClient({
 			type: "stack-error",
+			timestamp: new Date(),
 			data: {
 				stack_id,
 				action: "removing",
diff --git a/src/core/stacks/operations/runStackCommand.ts b/src/core/stacks/operations/runStackCommand.ts
@@ -1,6 +1,6 @@
-import type { Stack } from "~/../typings/docker-compose";
 import { logger } from "~/core/utils/logger";
 import { postToClient } from "~/handlers/modules/live-stacks";
+import type { Stack } from "~/typings/docker-compose";
 import { getStackName, getStackPath } from "./stackHelpers";
 
 export function wrapProgressCallback(progressCallback?: (log: string) => void) {
@@ -51,6 +51,7 @@ export async function runStackCommand<T>(
 
 			postToClient({
 				type: "stack-progress",
+				timestamp: new Date(),
 				data: {
 					stack_id,
 					action,
@@ -77,6 +78,7 @@ export async function runStackCommand<T>(
 		);
 		postToClient({
 			type: "stack-error",
+			timestamp: new Date(),
 			data: {
 				stack_id,
 				action,
diff --git a/src/core/utils/logger.ts b/src/core/utils/logger.ts
@@ -1,5 +1,5 @@
 import path from "node:path";
-import chalk, { type ChalkInstance } from "chalk";
+import chalk, { type ChalkFunction } from "chalk";
 import type { TransformableInfo } from "logform";
 import { createLogger, format, transports } from "winston";
 import wrapAnsi from "wrap-ansi";
@@ -8,7 +8,7 @@ import { dbFunctions } from "~/core/database";
 
 import { logToClients } from "~/handlers/modules/logs-socket";
 
-import type { log_message } from "../../../typings/database";
+import type { log_message } from "~/typings/database";
 
 import { backupInProgress } from "../database/_dbState";
 
@@ -53,7 +53,7 @@ const formatTerminalMessage = (message: string, prefix: string): string => {
 	}
 };
 
-const levelColors: Record<LogLevel | string, ChalkInstance> = {
+const levelColors: Record<LogLevel | string, ChalkFunction> = {
 	error: chalk.red.bold,
 	warn: chalk.yellow.bold,
 	info: chalk.green.bold,
diff --git a/src/core/utils/package-json.ts b/src/core/utils/package-json.ts
@@ -1,4 +1,4 @@
-import packageJson from "~/../package.json";
+import packageJson from "../../../package.json";
 
 const { version, description, license, dependencies, devDependencies } =
 	packageJson;
diff --git a/src/handlers/config.ts b/src/handlers/config.ts
@@ -14,9 +14,9 @@ import {
 	license,
 	version,
 } from "~/core/utils/package-json";
-import type { config } from "../../typings/database";
-import type { DockerHost } from "../../typings/docker";
-import type { PluginInfo } from "../../typings/plugin";
+import type { config } from "~/typings/database";
+import type { DockerHost } from "~/typings/docker";
+import type { PluginInfo } from "~/typings/plugin";
 
 class apiHandler {
 	getConfig() {
diff --git a/src/handlers/docker.ts b/src/handlers/docker.ts
@@ -3,12 +3,8 @@ import { dbFunctions } from "~/core/database";
 import { getDockerClient } from "~/core/docker/client";
 import { findObjectByKey } from "~/core/utils/helpers";
 import { logger } from "~/core/utils/logger";
-import type {
-	ContainerInfo,
-	DockerHost,
-	HostStats,
-} from "../../typings/docker";
-import type { DockerInfo } from "../../typings/dockerode";
+import type { ContainerInfo, DockerHost, HostStats } from "~/typings/docker";
+import type { DockerInfo } from "~/typings/dockerode";
 
 class basicDockerHandler {
 	async getContainers(): Promise<ContainerInfo[]> {
diff --git a/src/handlers/modules/docker-socket.ts b/src/handlers/modules/docker-socket.ts
@@ -7,7 +7,7 @@ import {
 	calculateMemoryUsage,
 } from "~/core/utils/calculations";
 import { logger } from "~/core/utils/logger";
-import type { DockerStatsEvent } from "../../../typings/docker";
+import type { DockerStatsEvent } from "~/typings/docker";
 
 export function createDockerStatsStream(): Readable {
 	const stream = new Readable({
diff --git a/src/plugins/example.plugin.ts b/src/plugins/example.plugin.ts
@@ -1,7 +1,7 @@
 import { logger } from "~/core/utils/logger";
 
-import type { ContainerInfo } from "../../typings/docker";
-import type { Plugin } from "../../typings/plugin";
+import type { ContainerInfo } from "~/typings/docker";
+import type { Plugin } from "~/typings/plugin";
 
 // See https://outline.itsnik.de/s/dockstat/doc/plugin-development-3UBj9gNMKF for more info
 
diff --git a/src/typings b/src/typings
diff --git a/tsconfig.json b/tsconfig.json
@@ -29,10 +29,11 @@
     /* Modules */
     "module": "ES2022" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "moduleResolution": "bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     "paths": {
-      "~/*": ["./src/*"]
+      "~/*": ["./src/*"],
+      "~/typings/*": ["./typings/*"]
     } /* Specify a set of entries that re-map imports to additional lookup locations. */,
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
diff --git a/typings b/typings
@@ -1 +1 @@
-Subproject commit e029d99dcfbadf80156532ee57dd5f969c696332
+Subproject commit 242f1eeff17da8e7bd6348528856dd8656224854
