improve exception handing and add more commands

This commit is contained in:
hippoz 2022-05-30 18:53:24 +03:00
parent cadec6cdfe
commit 2e27b99dbf
No known key found for this signature in database
GPG key ID: 7C52899193467641
2 changed files with 74 additions and 7 deletions

View file

@ -4,5 +4,65 @@ export default {
}, },
wine: function(ctx) { wine: function(ctx) {
return `${ctx.streamInput + " " ?? ""}:wine_glass:`; return `${ctx.streamInput + " " ?? ""}:wine_glass:`;
},
slot: function(ctx) {
const template = ctx.argv.join(" ");
const slot = ctx.streamInput ?? "";
return template.replace("%%", slot);
},
times: function(ctx) {
const times = parseInt(ctx.argv[0]);
const text = ctx.streamInput;
if (!times) {
return "times: expected first argument to be the number of times to repeat text";
}
if (!text) {
return "times: expected stream input";
}
let out = "";
for (let i = 0; i < times; i++) {
out += text;
}
return out;
},
djson: function(ctx) {
if (ctx.argc > 24) {
return "djson: arbitrary nesting limit of 24 reached"
}
if (ctx.argc < 1) {
return "djson: expected one or more arguments";
}
if (!ctx.streamInput) {
return "djson: expected stream input";
}
let json;
try {
json = JSON.parse(ctx.streamInput);
} catch (e) {
return "djson: failed to parse json, is it malformed?";
}
const fields = ctx.argv;
let val = json;
for (let i = 0; i < fields.length; i++) {
const field = fields[i];
if (field.includes("__")) {
return "djson: security violation - field names that contain __ are disallowed";
}
if (typeof val !== "object") {
return "null";
}
val = val[field];
}
val ??= "null";
return typeof val === "string" ? val : JSON.stringify(val);
} }
} }

View file

@ -164,6 +164,7 @@ function interpretInstructions(instructions, displayFunc) {
if (inst.inStream) { if (inst.inStream) {
streamInput = streams.get(inst.inStream); streamInput = streams.get(inst.inStream);
} }
try {
let streamOutput = commandFunc({ let streamOutput = commandFunc({
argv: inst.args, argv: inst.args,
argc: inst.args.length, argc: inst.args.length,
@ -172,6 +173,12 @@ function interpretInstructions(instructions, displayFunc) {
if (inst.outStream) { if (inst.outStream) {
streams.set(inst.outStream, streamOutput); streams.set(inst.outStream, streamOutput);
} }
} catch(e) {
console.error("unhandled exception while running command", e);
if (inst.outStream) {
streams.set(inst.outStream, "error: unhandled internal exception");
}
}
break; break;
} }
case InstructionType.DisplayStream: { case InstructionType.DisplayStream: {