Enable the player proxy by default and give lobbies an empty save

The player proxy now listens on 34197 by default. New hosts default to
the port range 34200-34299 so they don't hand that port to instances,
and the controller logs an error and runs without the proxy if the port
is taken, as hosts with the old range only skip it when the controller
already holds it.

Lobby instances start the save lobby.zip, created on first start as a
one tile map with no autoplace and with the freeplay scenario replaced by
an empty one. This uses the new chooseSave instance hook, which lets
plugins pick or create the save to start, and setSaveScenario from
@clusterio/host, which sets the scenario the save patcher keeps loading.
Map gen settings can't use a width and height of 0 for this, as Factorio
takes 0 to mean an unlimited map.

The address players reach the proxy on moves from lobby.public_address
to controller.player_proxy_public_address. When it's set the player_auth
login page lists it once for the instances behind the proxy instead of
their own addresses, and lobbies with player_auth loaded get a button
that opens the web interface login dialog.
This commit is contained in:
Danielv123 committed 2026-10-29 20:54:11 +01:00
1 parent 3ae486143d
commit a5bd43637e
23 files changed
+391 -121

No files matched your search

+16
View File
@@ -369,6 +369,22 @@ describe("controller/Controller.resolvePlayerRoute()", function () {
assert.equal(await controller.resolvePlayerRoute(request({ portInstanceId: 2 })), 4);
});
it("should give the public address of the proxy", function () {
assert.equal(controller.getPlayerProxyAddress(), undefined, "proxy disabled");
controller.playerProxyServer = { port: 34197 };
assert.equal(controller.getPlayerProxyAddress(), undefined, "no address configured");
controller.config.set("controller.public_url", "https://cluster.example/");
assert.equal(controller.getPlayerProxyAddress(), "cluster.example:34197");
assert.equal(controller.getPlayerProxyAddress(34200), "cluster.example:34200");
controller.config.set("controller.player_proxy_public_address", "play.example:5000");
assert.equal(controller.getPlayerProxyAddress(), "play.example:5000");
assert.equal(controller.getPlayerProxyAddress(34200), "play.example:34200");
controller.config.set("controller.player_proxy_public_address", "[::1]");
assert.equal(controller.getPlayerProxyAddress(34200), "[::1]:34200");
controller.config.set("controller.player_proxy_public_address", "::1");
assert.equal(controller.getPlayerProxyAddress(34200), "[::1]:34200");
});
it("should skip instances that can't be routed to", async function () {
controller.hooks.playerProxyRoute.attach("test", () => 5);
assert.equal(await controller.resolvePlayerRoute(request({ portInstanceId: 99 })), 1);