mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve queueing of inputs to avoid baking the same input twice.

Browse source 
Fix generation of input URL.
Fix worker log levels not being set correctly.
This commit is contained in:
j433866 2019-05-02 11:29:54 +01:00
parent b2406b0465
commit 82183bf204
6 changed files with 79 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/web/App.mjs
View file

@ -79,9 +79,6 @@ class App {
if (!this.workerLoaded || !this.appLoaded ||
!document.getElementById("loader-wrapper")) return;
// Bake initial input
this.getAllInput();
// Trigger CSS animations to remove preloader
document.body.classList.add("loaded");
@ -90,7 +87,10 @@ class App {
setTimeout(function() {
document.getElementById("loader-wrapper").remove();
document.body.classList.remove("loaded");
}, 1000);
// Bake initial input
this.getAllInput();
}.bind(this), 1000);
// Clear the loading message interval
clearInterval(window.loadingMsgsInt);
@ -125,7 +125,7 @@ class App {
* whole recipe.
*/
bake(step=false, input) {
// if (this.baking) return;
if (this.baking) return;
// Reset attemptHighlight flag
this.options.attemptHighlight = true;
@ -151,7 +151,7 @@ class App {
// has completed.
if (this.autoBakePause) return false;
if (this.autoBake_ && !this.baking) {
if (this.autoBake_) {
log.debug("Auto-baking");
this.manager.input.inputWorker.postMessage({
action: "autobake",
@ -662,6 +662,16 @@ class App {
this.progress = 0;
this.autoBake();
this.updateUrl(false, "");
}
/**
* Update the page URL to contain the new recipe and input
*
* @param {boolean} includeInput
* @param {string} input
*/
updateUrl(includeInput, input) {
// Set title
const recipeConfig = this.getRecipeConfig();
let title = "CyberChef";
@ -681,8 +691,8 @@ class App {
// Update the current history state (not creating a new one)
if (this.options.updateUrl) {
// this.lastStateUrl = this.manager.controls.generateStateUrl(true, true, recipeConfig);
// window.history.replaceState({}, title, this.lastStateUrl);
this.lastStateUrl = this.manager.controls.generateStateUrl(true, includeInput, input, recipeConfig);
window.history.replaceState({}, title, this.lastStateUrl);
}
}