@rithien/discord_bridge 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.3.4 - rithien fork
+
+- `discordMessage` no longer assumes `message.member` is present (it can be `null` in discord.js v14 — author left the guild, partial/cache miss, gateway didn't deliver the member); falls back to the always-present `message.author`, so Discord→Factorio chat is no longer silently dropped with a `TypeError` (FIX31 #31).
+- `fetchChannels` handles channel errors per-channel (log + continue) instead of re-throwing any `code !== 10003`; a single inaccessible channel (Missing Access/Permissions, network) no longer aborts plugin `init()` and leaves the bridge half-built (FIX31 #32).
+- Added `allowedMentions: { parse: [] }` to instance status (`onInstanceStatusChanged`) and host connection (`onHostConnectionEvent`) notifications — previously only player-action messages set it. An instance/host name containing `@everyone`/`@here`/a role mention no longer triggers a real ping (FIX31 #33).
+- Bounded the offline `messageQueue` (cap 1000, FIFO drop-oldest with a one-time warn) so a long controller disconnect during active play cannot grow it without limit nor flood Discord with the whole backlog on reconnect (FIX31 #30).
+
+## v0.3.3 - rithien fork
+
+- Added `allowedMentions: { parse: [] }` to player-action `channel.send` calls so chat relayed from Factorio containing `@everyone`/`@here`/role mentions does not actually ping on Discord (security fix K3).
+
 ## v0.3.2 - rithien fork
 
 - Switched `handleDiscordChatEvent` from `/sc game.print('${text}')` to `/fp ${text}` (custom command exposed by the `factorio-polska` scenario in `commands/fp.lua`). Avoids the persistent "Cheats have been enabled" flag set by `/silent-command`, which permanently disables achievements on the save. Pair with `@rithien/factorio-polska` scenario v0.1.0+ (defines `/fp`). Without that scenario, the chat bridge will fail silently (RCON returns "Unknown command: fp"). To keep working on a vanilla scenario, pin to v0.3.1.

package/controller.js

@@ -98,10 +98,15 @@ class ControllerPlugin extends BaseControllerPlugin {
 					this.logger.error(`Channel ID ${id} was not found`);
 				}
 			} catch (err) {
-				if (err.code !== 10003) { // Unknown channel
-					throw err;
+				// FIX31 #32: odporność per-kanał. Re-throw wywracał fetchChannels() poza connect()/init()
+				// (fetchChannels jest wołane poza try/catch logowania), zostawiając most w stanie
+				// częściowo zbudowanym. Błędy inne niż 10003 to m.in. 50001 (Missing Access),
+				// 50013 (Missing Permissions) i sieciowe — logujemy i kontynuujemy pętlę.
+				if (err.code === 10003) { // Unknown channel
+					this.logger.error(`Channel ID ${id} was not found`);
+				} else {
+					this.logger.error(`Failed to fetch channel ID ${id}, skipping:\n${err.stack}`);
 				}
-				this.logger.error(`Channel ID ${id} was not found`);
 			}
 		}
 
@@ -157,10 +162,15 @@ class ControllerPlugin extends BaseControllerPlugin {
 			return;
 		}
 
+		// FIX31 #31: message.member bywa null (autor nie jest już członkiem gildii, partial/cache
+		// miss, gateway nie dostarczył member) — sięgamy po zawsze obecny message.author.
+		const displayName = message.member?.displayName ?? message.author.displayName ?? message.author.username;
+		const tag = message.author.tag ?? message.author.username;
+
 		const template = this.controller.config.get("discord_bridge.discord_template");
 		const content = template.replace(/(__display_name__|__username__|__content__)/g, (sub) => ({
-			"__display_name__": message.member.displayName,
-			"__username__": message.member.user.tag,
+			"__display_name__": displayName,
+			"__username__": tag,
 			"__content__": message.cleanContent,
 		}[sub]));
 
@@ -204,7 +214,12 @@ class ControllerPlugin extends BaseControllerPlugin {
 			return;
 		}
 
-		await channel.send(this.formatMessage(template, hostName, instanceName, ""));
+		// allowedMentions: nazwa instancji/hosta trafia do szablonu — bez tego @everyone/@here w nazwie
+		// realnie pinguje (FIX31 #33, spójnie z akcjami graczy).
+		await channel.send({
+			content: this.formatMessage(template, hostName, instanceName, ""),
+			allowedMentions: { parse: [] },
+		});
 	}
 
 	onHostConnectionEvent(hostConnection, event) {
@@ -218,7 +233,8 @@ class ControllerPlugin extends BaseControllerPlugin {
 			return;
 		}
 		const message = this.formatMessage(template, hostName, "", "");
-		this.fallbackChannel.send(message).catch(
+		// allowedMentions: nazwa hosta trafia do szablonu — blokujemy ping z @everyone/@here (FIX31 #33).
+		this.fallbackChannel.send({ content: message, allowedMentions: { parse: [] } }).catch(
 			err => { this.logger.error(`Unexpected error:\n${err.stack}`); }
 		);
 	}

package/dist/web/manifest.json

@@ -1,6 +1,6 @@
 {
   "main.js": "static/main.42d03a9854919d3e8189.js",
-  "discord_bridge.js": "static/discord_bridge.eb399a233189cc9de727.js",
+  "discord_bridge.js": "static/discord_bridge.3b69d59522327ecb3b8a.js",
   "static/info_js.js": "static/info_js.131defcd9652f0e24d4a.js",
-  "static/package_json.js": "static/package_json.eb40f2bb2cb67c86f9d0.js"
+  "static/package_json.js": "static/package_json.04ae25900d51f777e4ec.js"
 }

package/dist/web/static/{discord_bridge.eb399a233189cc9de727.js → discord_bridge.3b69d59522327ecb3b8a.js}

@@ -123,7 +123,7 @@ __webpack_require__.d(exports, {
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "static/" + chunkId + "." + {"info_js":"131defcd9652f0e24d4a","package_json":"eb40f2bb2cb67c86f9d0"}[chunkId] + ".js";
+/******/ 			return "static/" + chunkId + "." + {"info_js":"131defcd9652f0e24d4a","package_json":"04ae25900d51f777e4ec"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/ 	

package/dist/web/static/{package_json.eb40f2bb2cb67c86f9d0.js → package_json.04ae25900d51f777e4ec.js}

@@ -15,7 +15,7 @@
   \**********************/
 (module) {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rithien/discord_bridge","version":"0.3.3","description":"Clusterio plugin bridging chat between instances and Discord, with per-instance channel routing","main":"info.js","scripts":{"test":"echo \\"Error: no test specified\\" && exit 1","prepare":"webpack-cli --env production"},"keywords":["clusterio","clusterio-plugin","factorio","discord"],"author":"rithien <jacek@zaluzje.bialystok.pl>","license":"MIT","peerDependencies":{"@clusterio/lib":"^2.0.0-alpha.14"},"devDependencies":{"@clusterio/lib":"^2.0.0-alpha.14","@clusterio/web_ui":"^2.0.0-alpha.14","webpack":"^5.88.2","webpack-cli":"^5.1.4","webpack-merge":"^5.9.0"},"dependencies":{"discord.js":"^14.14.1"},"publishConfig":{"access":"public"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@rithien/discord_bridge","version":"0.3.4","description":"Clusterio plugin bridging chat between instances and Discord, with per-instance channel routing","main":"info.js","scripts":{"test":"echo \\"Error: no test specified\\" && exit 1","prepare":"webpack-cli --env production"},"keywords":["clusterio","clusterio-plugin","factorio","discord"],"author":"rithien <jacek@zaluzje.bialystok.pl>","license":"MIT","peerDependencies":{"@clusterio/lib":"^2.0.0-alpha.14"},"devDependencies":{"@clusterio/lib":"^2.0.0-alpha.14","@clusterio/web_ui":"^2.0.0-alpha.14","webpack":"^5.88.2","webpack-cli":"^5.1.4","webpack-merge":"^5.9.0"},"dependencies":{"discord.js":"^14.14.1"},"publishConfig":{"access":"public"}}');
 
 /***/ }
 

package/instance.js

@@ -3,6 +3,11 @@ const { BaseInstancePlugin } = require("@clusterio/host");
 
 const { InstanceActionEvent, DiscordChatEvent } = require("./info.js");
 
+// Twardy limit bufora akcji na czas rozłączenia z kontrolerem (FIX31 #30). Przy długim rozłączeniu
+// i aktywnej rozgrywce (join/leave/chat) kolejka rosłaby bez ograniczeń (OOM hosta), a po reconnekcie
+// cała zaległość zalałaby kanał Discord naraz. FIFO: po przekroczeniu odrzucamy najstarsze.
+const MAX_MESSAGE_QUEUE = 1000;
+
 
 /**
  * Removes gps and train tags from messags
@@ -14,6 +19,7 @@ function removeTags(content) {
 class InstancePlugin extends BaseInstancePlugin {
 	async init() {
 		this.messageQueue = [];
+		this.queueOverflowWarned = false;
 		this.instance.handle(DiscordChatEvent, this.handleDiscordChatEvent.bind(this));
 	}
 
@@ -23,6 +29,7 @@ class InstancePlugin extends BaseInstancePlugin {
 				this.sendChat(action, content);
 			}
 			this.messageQueue = [];
+			this.queueOverflowWarned = false;
 		}
 	}
 
@@ -53,6 +60,13 @@ class InstancePlugin extends BaseInstancePlugin {
 			this.sendChat(output.action, output.message);
 		} else {
 			this.messageQueue.push([output.action, output.message]);
+			if (this.messageQueue.length > MAX_MESSAGE_QUEUE) {
+				this.messageQueue.shift(); // odrzuć najstarsze (FIX31 #30)
+				if (!this.queueOverflowWarned) {
+					this.logger.warn(`discord_bridge: messageQueue przekroczyła ${MAX_MESSAGE_QUEUE} akcji (kontroler rozłączony) — odrzucam najstarsze`);
+					this.queueOverflowWarned = true;
+				}
+			}
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rithien/discord_bridge",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Clusterio plugin bridging chat between instances and Discord, with per-instance channel routing",
   "main": "info.js",
   "scripts": {