jusax23/actions-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

log html fixes

Browse source
This commit is contained in:
jusax23 2023-04-03 00:00:22 +02:00
parent 66c11515ca
commit dd2c7035b5
Signed by: jusax23
GPG key ID: 499E2AA870C1CD41
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/html/log.ts
View file

@ -97,46 +97,47 @@ export default /*html*/ `
} }
if(Array.isArray(json)){ if(Array.isArray(json)){
addSpaces(depth, "["); addSpaces(0, "[");
let doBreak = JSON.stringify(json).length > 64;
json.forEach((e,i) => { json.forEach((e,i) => {
if(i == 0) addBreak(); if(i == 0 && doBreak) addBreak();
addSpaces(depth+2); if(doBreak) addSpaces(depth+2);
addData(e); addData(e);
if(i+1 < json.length){ if(i+1 < json.length){
let k = document.createElement("span"); let k = document.createElement("span");
k.innerText = ","; k.innerText = ", ";
elems.push(k); elems.push(k);
} }
addBreak(); if(doBreak) addBreak();
}); });
addSpaces(depth, "]"); addSpaces(doBreak ? depth : 0, "]");
}else{ }else{
addSpaces(depth, "{"); addSpaces(0, "{");
let keys = Object.keys(json); let keys = Object.keys(json);
let doBreak = JSON.stringify(json).length > 64;
for(let i = 0; i < keys.length; i++){ for(let i = 0; i < keys.length; i++){
if(i == 0) addBreak(); if(i == 0 && doBreak) addBreak();
let key = keys[i]; let key = keys[i];
addSpaces(depth+2); if(doBreak) addSpaces(depth+2);
let keyElem = document.createElement("span"); let keyElem = document.createElement("span");
keyElem.innerText = key + ": "; keyElem.innerText = key + ": ";
elems.push(keyElem); elems.push(keyElem);
addData(json[key]); addData(json[key]);
if(i+1 < json.length){ if(i+1 < keys.length){
let k = document.createElement("span"); let k = document.createElement("span");
k.innerText = ","; k.innerText = ", ";
elems.push(k); elems.push(k);
} }
addBreak(); if(doBreak) addBreak();
} }
addSpaces(depth, "}"); addSpaces(doBreak ? depth : 0, "}");
} }
return elems; return elems;
} }

4
src/sys/log.ts
View file

@ -62,7 +62,7 @@ let clearLogID = setInterval(() => {
if (global.provideLog >= -1) if (global.provideLog >= -1)
logList.splice(0, logList.length - global.provideLog) logList.splice(0, logList.length - global.provideLog)
}, 60000); }, 60000);
addShutdownTask(()=>clearInterval(clearLogID)); addShutdownTask(() => clearInterval(clearLogID));
const consorArgs = (args: any[]) => { const consorArgs = (args: any[]) => {
let out = []; let out = [];
@ -74,7 +74,7 @@ const consorArgs = (args: any[]) => {
} }
const censorLogArg = (arg: any) => { const censorLogArg = (arg: any) => {
if (typeof arg != "object" || arg == null || arg instanceof Error) return arg; if (typeof arg != "object" || arg == null || arg instanceof Error) return arg;
let out: any = {}; let out: any = Array.isArray(arg) ? [] : {};
for (let key in arg) { for (let key in arg) {
if ((["accountKey", "sign", "publicKey", "token"]).includes(key)) out[key] = new Array(Math.min(arg[key].length, 50)).fill("*").join(""); if ((["accountKey", "sign", "publicKey", "token"]).includes(key)) out[key] = new Array(Math.min(arg[key].length, 50)).fill("*").join("");
else out[key] = censorLogArg(arg[key]); else out[key] = censorLogArg(arg[key]);