diff --git a/src/core/lib/Magic.mjs b/src/core/lib/Magic.mjs index 280d6d35..b36e44d6 100644 --- a/src/core/lib/Magic.mjs +++ b/src/core/lib/Magic.mjs @@ -280,7 +280,7 @@ class Magic { if (_buffersEqual(output, new ArrayBuffer())) { return; } - + const outputRegexes = OperationConfig[op.op].outputRegexes; switch (flag) { case "Input": diff --git a/src/core/lib/Test.mjs b/src/core/lib/Test.mjs index be05fff9..e12ae841 100644 --- a/src/core/lib/Test.mjs +++ b/src/core/lib/Test.mjs @@ -85,17 +85,16 @@ class potentialOps { generateInputOpPatterns() { const opPatterns = []; for (const op in OperationConfig) { - if (!("inputRegexes" in OperationConfig[op])) continue; - - OperationConfig[op].inputRegexes.forEach(pattern => { - opPatterns.push({ - op: op, - match: pattern.match, - flags: pattern.flags, - args: pattern.args, - useful: pattern.useful || false + if (("inputRegexes" in OperationConfig[op]) && !!(OperationConfig[op].inputRegexes)) + OperationConfig[op].inputRegexes.forEach(pattern => { + opPatterns.push({ + op: op, + match: pattern.match, + flags: pattern.flags, + args: pattern.args, + useful: pattern.useful || false + }); }); - }); } return opPatterns; @@ -109,20 +108,19 @@ class potentialOps { generateOutputOpPatterns() { const opPatterns = []; for (const op in OperationConfig) { - if (!(OperationConfig[op].outputRegexes) && (OperationConfig[op].inputRegexes)) continue; - - OperationConfig[op].outputRegexes.forEach(pattern => { - opPatterns.push({ - op: op, - match: pattern.match, - flags: pattern.flags, - shouldMatch: pattern.shouldMatch, - args: pattern.args, - useful: pattern.useful || false + if ((OperationConfig[op].outputRegexes) && !(OperationConfig[op].inputRegexes)) + OperationConfig[op].outputRegexes.forEach(pattern => { + opPatterns.push({ + op: op, + match: pattern.match, + flags: pattern.flags, + shouldMatch: pattern.shouldMatch, + args: pattern.args, + useful: pattern.useful || false + }); }); - }); } - + console.log(opPatterns); return opPatterns; } diff --git a/src/core/operations/DefangIPAddresses.mjs b/src/core/operations/DefangIPAddresses.mjs index a55d21f8..658d2589 100644 --- a/src/core/operations/DefangIPAddresses.mjs +++ b/src/core/operations/DefangIPAddresses.mjs @@ -26,13 +26,13 @@ class DefangIPAddresses extends Operation { this.inputType = "string"; this.outputType = "string"; this.args = []; - this.checks = new magicObject([ + this.checks = new magicObject(/*[ { match: "^\\s*(([0-9]{1,3}\\.){3}[0-9]{1,3}|([0-9a-f]{4}:){7}[0-9a-f]{4})\\s*$", flags: "i", args: [], } - ], + ],*/null, [ { match: "^\\s*(([0-9]{1,3}\\[\\.\\]){3}[0-9]{1,3}|([0-9a-f]{4}\\[\\:\\]){7}[0-9a-f]{4})\\s*$",