feat: support multiline console output and decode HTML entities
This commit is contained in:
2 files changed
+34
-9
No files matched your search
Vendored
+1
-1
@@ -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
|
||||
+33
-8
@@ -76,12 +76,37 @@ export function detectWarning(logLines) {
|
||||
* @returns {string}
|
||||
*/
|
||||
export function safeDecode(text) {
|
||||
if (typeof text !== "string" || !text.includes("%")) return text;
|
||||
try {
|
||||
return decodeURIComponent(text);
|
||||
} catch (err) {
|
||||
return text;
|
||||
if (typeof text !== "string") return text;
|
||||
let result = text;
|
||||
if (result.includes("%")) {
|
||||
try {
|
||||
result = decodeURIComponent(result);
|
||||
} catch (err) {
|
||||
// Ignore decoding errors
|
||||
}
|
||||
}
|
||||
// Screeps console often contains HTML entities
|
||||
return result
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/"/g, '"')
|
||||
.replace(/&/g, "&");
|
||||
}
|
||||
|
||||
/**
|
||||
* Outputs text to the action log, splitting by newline to ensure proper display.
|
||||
*
|
||||
* @param {string} text
|
||||
* @param {"info"|"warning"|"error"} level
|
||||
*/
|
||||
export function outputMultiline(text, level = "info") {
|
||||
if (!text) return;
|
||||
const lines = text.split(/\r?\n/);
|
||||
lines.forEach((line) => {
|
||||
if (level === "error") core.error(line);
|
||||
else if (level === "warning") core.warning(line);
|
||||
else core.info(line);
|
||||
});
|
||||
}
|
||||
|
||||
// ────────────────────────────────────────────────────────────────────────────
|
||||
@@ -185,7 +210,7 @@ export function handleConsoleEvent(event, opts, stdoutBuffer, state) {
|
||||
const warnPattern = /<font\s+color=['"](?:orange|yellow)['"]/i;
|
||||
logLines
|
||||
.filter((l) => warnPattern.test(l))
|
||||
.forEach((l) => core.warning(safeDecode(l)));
|
||||
.forEach((l) => outputMultiline(safeDecode(l), "warning"));
|
||||
}
|
||||
|
||||
// ── Traceback detection in log lines (Screeps sometimes sends errors here) ─
|
||||
@@ -200,7 +225,7 @@ export function handleConsoleEvent(event, opts, stdoutBuffer, state) {
|
||||
if (logToFile) {
|
||||
stdoutBuffer.push(...allStdout);
|
||||
} else {
|
||||
allStdout.forEach((l) => core.info(l));
|
||||
allStdout.forEach((l) => outputMultiline(l, "info"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,7 +233,7 @@ export function handleConsoleEvent(event, opts, stdoutBuffer, state) {
|
||||
if (errorText) {
|
||||
state.sawErrorLog = true;
|
||||
const decodedError = safeDecode(errorText);
|
||||
core.error(decodedError);
|
||||
outputMultiline(decodedError, "error");
|
||||
if (detectTraceback(decodedError)) {
|
||||
state.sawTraceback = true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user