@rithien/discord_bridge 0.3.4 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.3.5 - rithien fork
+
+- **Fixed lost JOIN/LEAVE (and other actions) after a transient controller disconnect.** `onControllerConnectionEvent` flushed the offline `messageQueue` only on `connect`, but clusterio emits `resume` after a brief link drop (`connect` only happens on a new session, e.g. controller restart). Actions buffered during the drop window stayed stuck in the queue until the next full `connect` — symptom: missing `joined`/`left` messages on Discord, especially after chat inactivity (an idle host↔controller link drops unnoticed and resumes). Now flushes on `connect` **or** `resume` (same fix already shipped in comfy_adapter as FIX31 #2). This was the discord-bridge analog of #2 that was never ported.
+- **Added Discord gateway lifecycle handlers** (`error`, `shardError`, `shardDisconnect`, `shardReconnecting`, `shardResume`, `invalidated`). Previously none were attached, so client/shard errors were swallowed (no log trace) and an `invalidated` session left the bot dead until a controller restart. `invalidated` now re-logs in via `connect()` (guarded against a reconnect loop); the rest add observability for diagnosing gateway drops. (discord.js v14 already auto-reconnects shards and `channel.send` goes over REST, so this is mainly recovery + visibility, not the primary fix.)
+- **Wrapped `channel.send` in `handleInstanceAction` in try/catch** — a transient REST/permission/rate-limit error no longer silently drops the action or throws an unhandled rejection out of the event handler (consistent with the existing `.catch` in `onHostConnectionEvent`/`onInstanceStatusChanged`). Losses are now logged.
+
 ## 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).

package/controller.js

@@ -12,6 +12,7 @@ class ControllerPlugin extends BaseControllerPlugin {
 		this.channelByInstance = new Map();
 		this.instancesByChannel = new Map();
 		this.fallbackChannel = null;
+		this.reconnecting = false; // guard przed pętlą reloginu po evencie "invalidated"
 
 		this.controller.handle(InstanceActionEvent, this.handleInstanceAction.bind(this));
 		await this.connect();
@@ -44,6 +45,39 @@ class ControllerPlugin extends BaseControllerPlugin {
 			this.discordMessage(message).catch(err => { this.logger.error(`Unexpected error:\n${err.stack}`); });
 		});
 
+		// Handlery cyklu życia gatewaya. Wcześniej żaden nie był podpięty — błędy klienta/shardu
+		// były połykane (brak śladu w logach), a "invalidated" zostawiał bota martwego do restartu
+		// kontrolera. discord.js v14 sam rekonektuje shardy (channel.send i tak idzie przez REST,
+		// odporny na blipy gatewaya) — te handlery służą głównie OBSERWOWALNOŚCI + recovery z invalidated.
+		this.client.on("error", (err) => {
+			this.logger.error(`Discord client error:\n${err?.stack ?? err}`);
+		});
+		this.client.on("shardError", (err) => {
+			this.logger.error(`Discord shard websocket error:\n${err?.stack ?? err}`);
+		});
+		this.client.on("shardDisconnect", (event, shardId) => {
+			this.logger.warn(`Discord shard ${shardId} disconnected (code ${event?.code}) — discord.js spróbuje reconnect`);
+		});
+		this.client.on("shardReconnecting", (shardId) => {
+			this.logger.info(`Discord shard ${shardId} reconnecting`);
+		});
+		this.client.on("shardResume", (shardId) => {
+			this.logger.info(`Discord shard ${shardId} resumed`);
+		});
+		this.client.on("invalidated", () => {
+			// Sesja nieodwracalnie unieważniona — discord.js zatrzymuje klienta i NIE wznawia sam.
+			// Bez reloginu bot zostaje martwy do restartu kontrolera. connect() robi destroy + nowy
+			// login; flaga reconnecting blokuje pętlę gdyby invalidated przyszło wielokrotnie.
+			this.logger.error("Discord session invalidated — ponowne logowanie");
+			if (this.reconnecting) {
+				return;
+			}
+			this.reconnecting = true;
+			this.connect()
+				.catch(err => { this.logger.error(`Relogin po invalidated nie powiódł się:\n${err?.stack ?? err}`); })
+				.finally(() => { this.reconnecting = false; });
+		});
+
 		this.logger.info("Logging in to Discord");
 		try {
 			await this.client.login(token);
@@ -277,7 +311,14 @@ class ControllerPlugin extends BaseControllerPlugin {
 		}
 		const hostName = this.getHostName(instance.config.get("instance.assigned_host"));
 		const message = this.formatMessage(template, hostName, instanceName, content);
-		await channel.send({ content: message, allowedMentions: { parse: [] } });
+		// try/catch: przejściowy błąd REST/permission/rate-limit nie może cicho zgubić akcji ani
+		// rzucić unhandled rejection z handlera eventu (spójnie z .catch w onHostConnectionEvent /
+		// onInstanceStatusChanged). Strata jest teraz widoczna w logach.
+		try {
+			await channel.send({ content: message, allowedMentions: { parse: [] } });
+		} catch (err) {
+			this.logger.error(`Failed to send ${action} to Discord:\n${err?.stack ?? err}`);
+		}
 	}
 }
 

package/dist/web/manifest.json

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

package/dist/web/static/{discord_bridge.3b69d59522327ecb3b8a.js → discord_bridge.19d9629215eba402e78a.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":"04ae25900d51f777e4ec"}[chunkId] + ".js";
+/******/ 			return "static/" + chunkId + "." + {"info_js":"131defcd9652f0e24d4a","package_json":"84f9beada3e5dfdb2a77"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/ 	

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

@@ -15,7 +15,7 @@
   \**********************/
 (module) {
 
-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"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@rithien/discord_bridge","version":"0.3.5","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

@@ -24,7 +24,12 @@ class InstancePlugin extends BaseInstancePlugin {
 	}
 
 	onControllerConnectionEvent(event) {
-		if (event === "connect") {
+		// clusterio emituje connect/drop/resume/close. Po krótkim lagu sieci leci "resume"
+		// (wznowienie sesji), NIE "connect" (ten tylko przy nowej sesji, np. restart kontrolera).
+		// Bez wariantu "resume" akcje z okna dropu (JOIN/LEAVE/CHAT) zostawały uwięzione w kolejce
+		// aż do następnego pełnego connect — objaw: gubione join/leave, zwłaszcza po bezczynności
+		// (ciche łącze pada niezauważone). Analog naprawionego FIX31 #2 w comfy_adapter.
+		if ((event === "connect" || event === "resume") && this.messageQueue.length > 0) {
 			for (let [action, content] of this.messageQueue) {
 				this.sendChat(action, content);
 			}

package/package.json

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