@rithien/comfy_adapter 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+## v0.1.2 — 2026-05-18
+
+- **Bug fix**: `buildSingleCallback` wysyłał `pcall(Token.get(<n>)(d)); pcall(Server.raise_data_set(d))` (dual-path). Gdy backend nie miał record dla zapytanego key (świeży gracz), `d.value=nil`, a handler `on_data_set_changed` w `scenario/lib/sessions.lua` interpretował to jako DELETE i nullował `storage.sessions[name]` + `storage.trusted[name]` świeżo ustawione przez `try_upload_data_token`. Effect runtime: gracz online > threshold, ale `/sessionsstatus` pokazywał `sessions=0, trusted=false`. Pozostawiono tylko Token callback path; `Server.raise_data_set` nadal wywoływany w `broadcastDataSet` (cross-instance push, intencjonalny). Anuluje decyzję dual-path z [2026-05-17][22:54].
+
+## v0.1.1 — 2026-05-18
+
+- **Bug fix**: `/cc` RCON callbacks (`buildSingleCallback`, `buildAllCallback`, `broadcastDataSet`) used `require('lib.token')` / `require('lib.server')` to access scenario modules. Factorio disables `require` outside of `control.lua` parsing — runtime calls raised `"Require can't be used outside of control.lua parsing"` and dropped the DATA-GET response, leaving `storage.sessions` empty. Switched to `_G.Token` / `_G.Server` (globals exposed by `scenario/control.lua` from v0.1.1+). **Requires** `factorio-polska` scenario v0.1.1 or newer.
+
+## v0.1.0 — 2026-05-17
+
+- Initial release. Parses tagged stdout from the `factorio-polska` scenario:
+  - `[DISCORD*]` → Discord channel (via `@rithien/discord_bridge` channel routing)
+  - `[ANTIGRIEF-LOG]{category, action}` → color-coded Discord embed
+  - `[DATA-SET]{data_set, key, value?}` → JSON datastore upsert (debounced)
+  - `[DATA-GET]<token>{data_set, key}` → JSON read + RCON callback (dual-path: `Token.get` + `Server.raise_data_set`)
+- Cross-instance broadcast for shared datasets (`comfy_adapter.broadcast_data_sets`, default `sessions`) — enables cross-server trust propagation.
+- Shared Discord client with `@rithien/discord_bridge` (no separate bot login).
+- JSON storage with atomic write (tmp + rename) and configurable write debounce.

package/controller.js

@@ -329,6 +329,7 @@ class ControllerPlugin extends BaseControllerPlugin {
 	async broadcastDataSet(sourceInstanceId, dataSet, key, value) {
 		// Buduje pojedyncze /cc per instancja docelowa. Tylko raise_data_set
 		// (nie Token.get — żaden token nie został wygenerowany dla tego data set u odbiorcy).
+		// Używa globalu `Server` z scenario/control.lua (require wyłączone w runtime).
 		const fields = [`data_set=${luaString(dataSet)}`, `key=${luaString(key)}`];
 		if (value !== null && value !== undefined) {
 			fields.push(`value=${luaLiteral(value)}`);
@@ -336,7 +337,7 @@ class ControllerPlugin extends BaseControllerPlugin {
 		const data = `{${fields.join(",")}}`;
 		const cmd =
 			`/cc local d=${data} ` +
-			`local ok,err=pcall(function() require('lib.server').raise_data_set(d) end) ` +
+			`local ok,err=pcall(function() Server.raise_data_set(d) end) ` +
 			`if not ok then log('[comfy_adapter broadcast] '..tostring(err)) end`;
 
 		const targets = [];
@@ -374,8 +375,20 @@ class ControllerPlugin extends BaseControllerPlugin {
 	}
 
 	/**
-	 * Buduje `/cc local d={...}; require('lib.token').get(<token>)(d); require('lib.server').raise_data_set(d)`.
-	 * Oba paths są wywoływane: per-request closure (Token) i broadcast (raise_data_set).
+	 * Buduje `/cc local d={...}; Token.get(<token>)(d)`.
+	 *
+	 * Single-path: tylko per-request closure (Token callback). NIE wywołujemy
+	 * `Server.raise_data_set(d)` na DATA-GET response — to powodowało race condition
+	 * w `scenario/lib/sessions.lua`: gdy backend nie ma record (świeży gracz),
+	 * `d.value=nil`, a handler `on_data_set_changed` interpretuje to jako DELETE
+	 * i nuluje `storage.sessions[name]` + `storage.trusted[name]` świeżo ustawione
+	 * przez Token callback (try_upload_data_token). Cross-instance broadcast
+	 * pozostaje w `broadcastDataSet` (wywoływany z `handleDataSet`, nie z odpowiedzi
+	 * na DATA-GET). Patrz DECISIONS.md [2026-05-18] (anuluje dual-path z [2026-05-17][22:54]).
+	 *
+	 * Używa globala `Token` eksponowanego przez scenario/control.lua —
+	 * `require` jest wyłączone w runtime Factorio ("Require can't be used outside of
+	 * control.lua parsing"). Wymaga scenariusza factorio-polska v0.1.1+.
 	 */
 	buildSingleCallback(token, dataSet, key, value, toPrint = null) {
 		const fields = [
@@ -391,22 +404,21 @@ class ControllerPlugin extends BaseControllerPlugin {
 		const data = `{${fields.join(",")}}`;
 		return (
 			`/cc local d=${data} ` +
-			`local ok1,err1=pcall(function() require('lib.token').get(${token})(d) end) ` +
-			`local ok2,err2=pcall(function() require('lib.server').raise_data_set(d) end) ` +
-			`if not ok1 then log('[comfy_adapter Token callback] '..tostring(err1)) end ` +
-			`if not ok2 then log('[comfy_adapter raise_data_set] '..tostring(err2)) end`
+			`local ok,err=pcall(function() Token.get(${token})(d) end) ` +
+			`if not ok then log('[comfy_adapter Token callback] '..tostring(err)) end`
 		);
 	}
 
 	/**
 	 * DATA-GET-ALL response: pojedyncze callback z `entries` jako tabela {key=value,...}.
 	 * Format kompatybilny z Comfy try_get_all_data callback signature.
+	 * Wymaga _G.Token (scenario v0.1.1+).
 	 */
 	buildAllCallback(token, dataSet, dataset) {
 		const data = `{data_set=${luaString(dataSet)},entries=${luaLiteral(dataset)}}`;
 		return (
 			`/cc local d=${data} ` +
-			`local ok,err=pcall(function() require('lib.token').get(${token})(d) end) ` +
+			`local ok,err=pcall(function() Token.get(${token})(d) end) ` +
 			`if not ok then log('[comfy_adapter Token all callback] '..tostring(err)) end`
 		);
 	}

package/dist/web/manifest.json

@@ -1,6 +1,6 @@
 {
   "main.js": "static/main.761df12d5815fb8e02fa.js",
-  "comfy_adapter.js": "static/comfy_adapter.1ca70d5b170a77bb6963.js",
+  "comfy_adapter.js": "static/comfy_adapter.e593ec53fe47f48d8273.js",
   "static/info_js.js": "static/info_js.9ad5f016be3454c1a255.js",
-  "static/package_json.js": "static/package_json.b88ad27d58c1784bb20f.js"
+  "static/package_json.js": "static/package_json.e650ba10073abbad50e8.js"
 }

package/dist/web/static/{comfy_adapter.1ca70d5b170a77bb6963.js → comfy_adapter.e593ec53fe47f48d8273.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":"9ad5f016be3454c1a255","package_json":"b88ad27d58c1784bb20f"}[chunkId] + ".js";
+/******/ 			return "static/" + chunkId + "." + {"info_js":"9ad5f016be3454c1a255","package_json":"e650ba10073abbad50e8"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/ 	

package/dist/web/static/{package_json.b88ad27d58c1784bb20f.js → package_json.e650ba10073abbad50e8.js}

@@ -15,7 +15,7 @@
   \**********************/
 (module) {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rithien/comfy_adapter","version":"0.1.0","description":"Clusterio plugin: parses Comfy/factorio-polska scenario stdout tags ([DISCORD*], [ANTIGRIEF-LOG], [DATA-SET/GET]) and bridges to Discord + JSON datastore","main":"info.js","scripts":{"test":"echo \\"Error: no test specified\\" && exit 1","prepare":"webpack-cli --env production"},"keywords":["clusterio","clusterio-plugin","factorio","factorio-polska","discord","comfyfactorio"],"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"},"publishConfig":{"access":"public"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@rithien/comfy_adapter","version":"0.1.2","description":"Clusterio plugin: parses Comfy/factorio-polska scenario stdout tags ([DISCORD*], [ANTIGRIEF-LOG], [DATA-SET/GET]) and bridges to Discord + JSON datastore","main":"info.js","scripts":{"test":"echo \\"Error: no test specified\\" && exit 1","prepare":"webpack-cli --env production"},"keywords":["clusterio","clusterio-plugin","factorio","factorio-polska","discord","comfyfactorio"],"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"},"publishConfig":{"access":"public"}}');
 
 /***/ }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rithien/comfy_adapter",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Clusterio plugin: parses Comfy/factorio-polska scenario stdout tags ([DISCORD*], [ANTIGRIEF-LOG], [DATA-SET/GET]) and bridges to Discord + JSON datastore",
   "main": "info.js",
   "scripts": {