From 5048b3a282f71a0f8fb86626ff82145f8e3db871 Mon Sep 17 00:00:00 2001
From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Date: Sun, 25 Oct 2026 15:10:22 +0100
Subject: [PATCH] refactor(server): migrate ip_access_control to ESM

---
 eslint.config.mjs                                  | 6 +++---
 js/{ip_access_control.js => ip_access_control.mjs} | 6 +++---
 js/server.js                                       | 2 +-
 tests/unit/functions/ip_access_control_spec.js     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename js/{ip_access_control.js => ip_access_control.mjs} (97%)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index a76d11d694..446af56f80 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -32,7 +32,7 @@ export default defineConfig([
 		}
 	},
 	{
-		files: ["**/*.js", "js/app.mjs"],
+		files: ["**/*.js", "js/app.mjs", "js/ip_access_control.mjs"],
 		languageOptions: {
 			ecmaVersion: "latest",
 			globals: {
@@ -104,7 +104,7 @@ export default defineConfig([
 		}
 	},
 	{
-		files: ["**/*.js", "js/app.mjs"],
+		files: ["**/*.js", "js/app.mjs", "js/ip_access_control.mjs"],
 		ignores: [
 			"clientonly/index.js",
 			"js/logger.js",
@@ -118,7 +118,7 @@ export default defineConfig([
 	},
 	{
 		files: ["**/*.mjs"],
-		ignores: ["js/app.mjs"],
+		ignores: ["js/app.mjs", "js/ip_access_control.mjs"],
 		languageOptions: {
 			ecmaVersion: "latest",
 			globals: {
diff --git a/js/ip_access_control.js b/js/ip_access_control.mjs
similarity index 97%
rename from js/ip_access_control.js
rename to js/ip_access_control.mjs
index b81ea23200..e3853a473c 100644
--- a/js/ip_access_control.js
+++ b/js/ip_access_control.mjs
@@ -1,5 +1,5 @@
-const ipaddr = require("ipaddr.js");
-const Log = require("logger");
+import ipaddr from "ipaddr.js";
+import Log from "./logger.js";
 
 /**
  * Checks if a client IP matches any entry in the whitelist
@@ -140,4 +140,4 @@ const socketIpAccessControl = (whitelist, trustedProxies) => {
 	};
 };
 
-module.exports = { ipAccessControl, socketIpAccessControl };
+export { ipAccessControl, socketIpAccessControl };
diff --git a/js/server.js b/js/server.js
index 60728203f7..9ca6667a4c 100644
--- a/js/server.js
+++ b/js/server.js
@@ -7,7 +7,7 @@ const helmet = require("helmet");
 const socketio = require("socket.io");
 const Log = require("logger");
 
-const { ipAccessControl, socketIpAccessControl } = require("./ip_access_control");
+const { ipAccessControl, socketIpAccessControl } = require("./ip_access_control.mjs");
 
 const vendor = require("./vendor");
 
diff --git a/tests/unit/functions/ip_access_control_spec.js b/tests/unit/functions/ip_access_control_spec.js
index 529b213baa..f5ec1fb687 100644
--- a/tests/unit/functions/ip_access_control_spec.js
+++ b/tests/unit/functions/ip_access_control_spec.js
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { ipAccessControl, socketIpAccessControl } from "../../../js/ip_access_control";
+import { ipAccessControl, socketIpAccessControl } from "../../../js/ip_access_control.mjs";
 
 /**
  * Creates a minimal Express-like response mock used by the middleware tests.