Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'esm' of github.com:gchq/CyberChef into node-lib

This commit is contained in:
d98762625 2018-05-03 13:52:50 +01:00
parent 3d672802a3 4cff1c8fa9
commit e50758f0a6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/Recipe.mjs
View File

@ -7,8 +7,8 @@
// import Operation from "./Operation.js";
import OpModules from "./config/modules/OpModules";
import OperationConfig from "./config/OperationConfig.json";
import log from "loglevel";
import OperationError from "./errors/OperationError";
import log from "loglevel";
/**
* The Recipe controls a list of Operations and the Dish they operate on.
@ -176,7 +176,7 @@ class Recipe {
dish.set(output, op.outputType);
}
} catch (err) {
// print expected errors in output pane
// Return expected errors as output
if (err instanceof OperationError) {
dish.set(err.message, "string");
return i;
@ -185,11 +185,10 @@ class Recipe {
e.progress = i;
if (e.fileName) {
e.displayStr = op.name + " - " + e.name + " in " +
e.fileName + " on line " + e.lineNumber +
".<br><br>Message: " + (e.displayStr || e.message);
e.displayStr = `${op.name} - ${e.name} in ${e.fileName} on line ` +
`${e.lineNumber}.<br><br>Message: ${e.displayStr || e.message}`;
} else {
e.displayStr = op.name + " - " + (e.displayStr || e.message);
e.displayStr = `${op.name} - ${e.displayStr || e.message}`;
}
throw e;

12
src/core/errors/OperationError.mjs
View File

@ -1,12 +1,16 @@
/**
* Create custom error type for handling operation input errors.
* i.e. where the operation can handle the error and print a
* message to the screen.
* Custom error type for handling operation input errors.
* i.e. where the operation can handle the error and print a message to the screen.
*
* @author d98762625 [d98762625@gmail.com]
* @copyright Crown Copyright 2018
* @license Apache-2.0
*/
class OperationError extends Error {
/**
* Standard error constructor. Adds no new behaviour.
* @param args standard error args
*
* @param args - Standard error args
*/
constructor(...args) {
super(...args);