mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-06-17 03:35:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Operations can now set options from within the worker

Browse source
This commit is contained in:
n1474335 2017-09-20 00:37:57 +01:00
parent 13f07abb8a
commit f6b52b7c82
10 changed files with 81 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/web/App.js
View file

@ -105,6 +105,9 @@ App.prototype.handleError = function(err) {
App.prototype.bake = function(step) {
if (this.baking) return;
// Reset attemptHighlight flag
this.options.attemptHighlight = true;
this.manager.worker.bake(
this.getInput(), // The user's input
this.getRecipeConfig(), // The configuration of the recipe

15
src/web/WorkerWaiter.js
View file

@ -40,12 +40,13 @@ WorkerWaiter.prototype.registerChefWorker = function() {
* @param {MessageEvent} e
*/
WorkerWaiter.prototype.handleChefMessage = function(e) {
switch (e.data.action) {
const r = e.data;
switch (r.action) {
case "bakeSuccess":
this.bakingComplete(e.data.data);
this.bakingComplete(r.data);
break;
case "bakeError":
this.app.handleError(e.data.data);
this.app.handleError(r.data);
this.setBakingStatus(false);
break;
case "silentBakeComplete":
@ -55,10 +56,13 @@ WorkerWaiter.prototype.handleChefMessage = function(e) {
this.app.loaded();
break;
case "statusMessage":
this.manager.output.setStatusMsg(e.data.data);
this.manager.output.setStatusMsg(r.data);
break;
case "optionUpdate":
this.app.options[r.data.option] = r.data.value;
break;
case "highlightsCalculated":
this.manager.highlighter.displayHighlights(e.data.data.pos, e.data.data.direction);
this.manager.highlighter.displayHighlights(r.data.pos, r.data.direction);
break;
default:
console.error("Unrecognised message from ChefWorker", e);
@ -104,7 +108,6 @@ WorkerWaiter.prototype.bakingComplete = function(response) {
this.app.handleError(response.error);
}
this.app.options = response.options;
this.app.dishStr = response.type === "html" ? Utils.stripHtmlTags(response.result, true) : response.result;
this.app.progress = response.progress;
this.manager.recipe.updateBreakpointIndicator(response.progress);