mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 15:43:13 +09:00
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:
23 files changed
+391
-121
No files matched your search
@@ -145,15 +145,7 @@ export class LobbyController {
|
||||
/** Address players use to connect to an instance, through the proxy if it's enabled */
|
||||
connectAddress(instance: Readonly<InstanceRecord>) {
|
||||
if (this.proxy) {
|
||||
const configured = this.controller.config.get("lobby.public_address");
|
||||
if (configured) {
|
||||
return configured;
|
||||
}
|
||||
const publicUrl = this.controller.config.get("controller.public_url");
|
||||
if (publicUrl) {
|
||||
return `${new URL(publicUrl).hostname}:${this.proxy.port}`;
|
||||
}
|
||||
return undefined;
|
||||
return this.controller.getPlayerProxyAddress();
|
||||
}
|
||||
|
||||
const hostId = instance.config.get("instance.assigned_host");
|
||||
@@ -328,15 +320,14 @@ export class LobbyController {
|
||||
return listings;
|
||||
}
|
||||
|
||||
const configured = this.controller.config.get("lobby.public_address");
|
||||
const publicUrl = this.controller.config.get("controller.public_url");
|
||||
const { host, port } = configured
|
||||
? parseAddress(configured)
|
||||
: { host: publicUrl ? new URL(publicUrl).hostname : "", port: undefined };
|
||||
if (!host) {
|
||||
this._warnListing("lobby.public_address or controller.public_url must be set to list servers");
|
||||
const address = this.controller.getPlayerProxyAddress();
|
||||
if (!address) {
|
||||
this._warnListing(
|
||||
"controller.player_proxy_public_address or controller.public_url must be set to list servers"
|
||||
);
|
||||
return listings;
|
||||
}
|
||||
const { host, port } = parseAddress(address);
|
||||
let hostAddress = host;
|
||||
if (!isIP(host)) {
|
||||
try {
|
||||
|
||||
Reference in new issue
Block a user