fix(monitor): use global console channel and implement shard filtering

__tests__/monitor.test.js

@@ -53,20 +53,20 @@ describe("isOfficialServer", () => {
 });
 
 describe("buildSubscribePath", () => {
-  it("returns shard0/console for official server (no shard provided)", () => {
-    expect(buildSubscribePath("screeps.com")).toBe("shard0/console");
+  it("returns console for official server (no shard provided)", () => {
+    expect(buildSubscribePath("screeps.com")).toBe("console");
   });
 
   it("returns console for private server (no shard provided)", () => {
     expect(buildSubscribePath("builder64")).toBe("console");
   });
 
-  it("returns <shard>/console when shard is provided (official)", () => {
-    expect(buildSubscribePath("screeps.com", "shard3")).toBe("shard3/console");
+  it("returns console when shard is provided (official)", () => {
+    expect(buildSubscribePath("screeps.com", "shard3")).toBe("console");
   });
 
-  it("returns <shard>/console when shard is provided (private)", () => {
-    expect(buildSubscribePath("builder64", "myshard")).toBe("myshard/console");
+  it("returns console when shard is provided (private)", () => {
+    expect(buildSubscribePath("builder64", "myshard")).toBe("console");
   });
 });
 
@@ -228,6 +228,21 @@ describe("handleConsoleEvent", () => {
       handleConsoleEvent(event, { logToFile: false }, stdoutBuffer, state),
     ).not.toThrow();
   });
+
+  it("filters messages by shard when targetShard is provided", () => {
+    const event = { data: { shard: "shard0", messages: { log: ["msg0"] } } };
+    handleConsoleEvent(event, { shard: "shard1" }, stdoutBuffer, state);
+    expect(core.info).not.toHaveBeenCalled();
+
+    handleConsoleEvent(event, { shard: "shard0" }, stdoutBuffer, state);
+    expect(core.info).toHaveBeenCalledWith("msg0");
+  });
+
+  it("does not filter when targetShard is undefined", () => {
+    const event = { data: { shard: "shard0", messages: { log: ["msg0"] } } };
+    handleConsoleEvent(event, {}, stdoutBuffer, state);
+    expect(core.info).toHaveBeenCalledWith("msg0");
+  });
 });
 
 // ────────────────────────────────────────────────────────────────────────────
@@ -357,19 +372,19 @@ describe("monitorConsole", () => {
     );
   });
 
-  it("subscribes to 'shard0/console' for the official server (default)", async () => {
+  it("subscribes to 'console' for the official server (default)", async () => {
     const api = buildMockApi({
       hostname: "screeps.com",
       ticks: [100, 101, 102, 103],
     });
     await monitorConsole(api, { ...BASE_OPTS, hostname: "screeps.com" });
     expect(api.socket.subscribe).toHaveBeenCalledWith(
-      "shard0/console",
+      "console",
       expect.any(Function),
     );
   });
 
-  it("subscribes to custom shard when provided", async () => {
+  it("subscribes to 'console' even when custom shard is provided", async () => {
     const api = buildMockApi({
       hostname: "screeps.com",
       ticks: [100, 101, 102, 103],
@@ -380,10 +395,10 @@ describe("monitorConsole", () => {
       shard: "shard3",
     });
     expect(api.socket.subscribe).toHaveBeenCalledWith(
-      "shard3/console",
+      "console",
       expect.any(Function),
     );
-    // Verify polling also uses shard3
+    // Verify polling still uses shard3 for timing
     expect(api.time).toHaveBeenCalledWith("shard3");
   });
 

dist/index.js

@@ -97,4 +97,4 @@ var re=z(20181);var Pe=re.Buffer;function copyProps(i,_){for(var z in i){_[z]=i[
  * @license [MIT]{@link https://github.com/archiverjs/node-zip-stream/blob/master/LICENSE}
  * @copyright (c) 2014 Chris Talkington, contributors.
  */
-var re=z(39023).inherits;var Pe=z(47544).ZipArchiveOutputStream;var $t=z(47544).ZipArchiveEntry;var er=z(53296);var tr=i.exports=function(i){if(!(this instanceof tr)){return new tr(i)}i=this.options=i||{};i.zlib=i.zlib||{};Pe.call(this,i);if(typeof i.level==="number"&&i.level>=0){i.zlib.level=i.level;delete i.level}if(!i.forceZip64&&typeof i.zlib.level==="number"&&i.zlib.level===0){i.store=true}i.namePrependSlash=i.namePrependSlash||false;if(i.comment&&i.comment.length>0){this.setComment(i.comment)}};re(tr,Pe);tr.prototype._normalizeFileData=function(i){i=er.defaults(i,{type:"file",name:null,namePrependSlash:this.options.namePrependSlash,linkname:null,date:null,mode:null,store:this.options.store,comment:""});var _=i.type==="directory";var z=i.type==="symlink";if(i.name){i.name=er.sanitizePath(i.name);if(!z&&i.name.slice(-1)==="/"){_=true;i.type="directory"}else if(_){i.name+="/"}}if(_||z){i.store=true}i.date=er.dateify(i.date);return i};tr.prototype.entry=function(i,_,z){if(typeof z!=="function"){z=this._emitErrorCallback.bind(this)}_=this._normalizeFileData(_);if(_.type!=="file"&&_.type!=="directory"&&_.type!=="symlink"){z(new Error(_.type+" entries not currently supported"));return}if(typeof _.name!=="string"||_.name.length===0){z(new Error("entry name must be a non-empty string value"));return}if(_.type==="symlink"&&typeof _.linkname!=="string"){z(new Error("entry linkname must be a non-empty string value when type equals symlink"));return}var re=new $t(_.name);re.setTime(_.date,this.options.forceLocalTime);if(_.namePrependSlash){re.setName(_.name,true)}if(_.store){re.setMethod(0)}if(_.comment.length>0){re.setComment(_.comment)}if(_.type==="symlink"&&typeof _.mode!=="number"){_.mode=40960}if(typeof _.mode==="number"){if(_.type==="symlink"){_.mode|=40960}re.setUnixMode(_.mode)}if(_.type==="symlink"&&typeof _.linkname==="string"){i=Buffer.from(_.linkname)}return Pe.prototype.entry.call(this,re,i,z)};tr.prototype.finalize=function(){this.finish()}},42078:module=>{module.exports=eval("require")("encoding")},42613:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("assert")},90290:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("async_hooks")},20181:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("buffer")},77969:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("bufferutil")},35317:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("child_process")},64236:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("console")},49140:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("constants")},76982:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("crypto")},31637:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("diagnostics_channel")},24434:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("events")},79896:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("fs")},91943:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("fs/promises")},58611:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("http")},85675:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("http2")},65692:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("https")},69278:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("net")},34589:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:assert")},16698:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:async_hooks")},4573:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:buffer")},37540:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:console")},77598:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:crypto")},53053:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:diagnostics_channel")},40610:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:dns")},78474:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:events")},73024:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs")},51455:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs/promises")},37067:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:http")},32467:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:http2")},44708:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:https")},77030:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:net")},48161:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:os")},76760:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path")},643:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:perf_hooks")},1708:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:process")},41792:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:queryLine truncated
+var re=z(39023).inherits;var Pe=z(47544).ZipArchiveOutputStream;var $t=z(47544).ZipArchiveEntry;var er=z(53296);var tr=i.exports=function(i){if(!(this instanceof tr)){return new tr(i)}i=this.options=i||{};i.zlib=i.zlib||{};Pe.call(this,i);if(typeof i.level==="number"&&i.level>=0){i.zlib.level=i.level;delete i.level}if(!i.forceZip64&&typeof i.zlib.level==="number"&&i.zlib.level===0){i.store=true}i.namePrependSlash=i.namePrependSlash||false;if(i.comment&&i.comment.length>0){this.setComment(i.comment)}};re(tr,Pe);tr.prototype._normalizeFileData=function(i){i=er.defaults(i,{type:"file",name:null,namePrependSlash:this.options.namePrependSlash,linkname:null,date:null,mode:null,store:this.options.store,comment:""});var _=i.type==="directory";var z=i.type==="symlink";if(i.name){i.name=er.sanitizePath(i.name);if(!z&&i.name.slice(-1)==="/"){_=true;i.type="directory"}else if(_){i.name+="/"}}if(_||z){i.store=true}i.date=er.dateify(i.date);return i};tr.prototype.entry=function(i,_,z){if(typeof z!=="function"){z=this._emitErrorCallback.bind(this)}_=this._normalizeFileData(_);if(_.type!=="file"&&_.type!=="directory"&&_.type!=="symlink"){z(new Error(_.type+" entries not currently supported"));return}if(typeof _.name!=="string"||_.name.length===0){z(new Error("entry name must be a non-empty string value"));return}if(_.type==="symlink"&&typeof _.linkname!=="string"){z(new Error("entry linkname must be a non-empty string value when type equals symlink"));return}var re=new $t(_.name);re.setTime(_.date,this.options.forceLocalTime);if(_.namePrependSlash){re.setName(_.name,true)}if(_.store){re.setMethod(0)}if(_.comment.length>0){re.setComment(_.comment)}if(_.type==="symlink"&&typeof _.mode!=="number"){_.mode=40960}if(typeof _.mode==="number"){if(_.type==="symlink"){_.mode|=40960}re.setUnixMode(_.mode)}if(_.type==="symlink"&&typeof _.linkname==="string"){i=Buffer.from(_.linkname)}return Pe.prototype.entry.call(this,re,i,z)};tr.prototype.finalize=function(){this.finish()}},42078:module=>{module.exports=eval("require")("encoding")},42613:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("assert")},90290:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("async_hooks")},20181:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("buffer")},77969:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("bufferutil")},35317:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("child_process")},64236:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("console")},49140:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("constants")},76982:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("crypto")},31637:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("diagnostics_channel")},24434:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("events")},79896:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("fs")},91943:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("fs/promises")},58611:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("http")},85675:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("http2")},65692:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("https")},69278:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("net")},34589:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:assert")},16698:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:async_hooks")},4573:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:buffer")},37540:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:console")},77598:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:crypto")},53053:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:diagnostics_channel")},40610:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:dns")},78474:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:events")},73024:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs")},51455:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs/promises")},37067:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:http")},32467:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:http2")},44708:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:https")},77030:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:net")},48161:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:os")},76760:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path")},643:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:perf_hooks")},1708:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:process")},41792:i=>{i.exports=__WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:queryLine truncated

monitor.js

@@ -29,8 +29,9 @@ export function isOfficialServer(hostname) {
  * @returns {string}
  */
 export function buildSubscribePath(hostname, shard) {
-  if (shard) return `${shard}/console`;
-  return isOfficialServer(hostname) ? "shard0/console" : "console";
+  // The console channel on Screeps official and most private servers is 'console'.
+  // We subscribe to the aggregate feed and filter by shard in handleConsoleEvent.
+  return "console";
 }
 
 /**
@@ -178,8 +179,15 @@ export async function uploadLogArtifact(
  * @param {{ sawTraceback: boolean, sawErrorLog: boolean, sawWarningLog: boolean }} state
  */
 export function handleConsoleEvent(event, opts, stdoutBuffer, state) {
-  const { logToFile } = opts;
+  const { logToFile, shard: targetShard } = opts;
   const data = event?.data ?? {};
+
+  // Shard filtering: If a shard is specified in opts, only process messages from that shard.
+  // Official server events include a 'shard' property in event.data.
+  if (targetShard && data.shard && data.shard !== targetShard) {
+    return;
+  }
+
   const logLines = data?.messages?.log ?? [];
   const results = data?.messages?.results ?? [];
   const errorText = data?.error ?? null;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "screeps-deploy-action",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Deploys screeps code to the official game or a private server.",
   "type": "module",
   "main": "index.js",