Skip to content

refactor(server): migrate ip_access_control to ESM #4316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khassel merged 1 commit into from
Oct 25, 2026
Merged

refactor(server): migrate ip_access_control to ESM #4316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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",
Expand All @@ -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: {
Expand Down
6 changes: 3 additions & 3 deletions js/ip_access_control.js → js/ip_access_control.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -140,4 +140,4 @@ const socketIpAccessControl = (whitelist, trustedProxies) => {
};
};

module.exports = { ipAccessControl, socketIpAccessControl };
export { ipAccessControl, socketIpAccessControl };
2 changes: 1 addition & 1 deletion js/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/functions/ip_access_control_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Loading