beenull/CyberChef
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make set() asynchronous

Browse source
This commit is contained in:
j433866 2019-05-08 13:46:29 +01:00
parent 3cffd9334f
commit 50f9bbeac3
2 changed files with 140 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/web/InputWaiter.mjs
View file

@ -306,7 +306,8 @@ class InputWaiter {
* @param {number} inputData.progress * @param {number} inputData.progress
* @param {boolean} [silent=false] * @param {boolean} [silent=false]
*/ */
set(inputData, silent=false) { async set(inputData, silent=false) {
return new Promise(function(resolve, reject) {
const activeTab = this.getActiveTab(); const activeTab = this.getActiveTab();
if (inputData.inputNum !== activeTab) return; if (inputData.inputNum !== activeTab) return;
@ -338,7 +339,7 @@ class InputWaiter {
} }
if (!silent) window.dispatchEvent(this.manager.statechange); if (!silent) window.dispatchEvent(this.manager.statechange);
}.bind(this));
} }
/** /**

10
src/web/OutputWaiter.mjs
View file

@ -65,6 +65,8 @@ class OutputWaiter {
} }
data = data.buffer; data = data.buffer;
} else if (typeof data !== "object" && typeof data !== "string") {
data = String(data);
} }
return data; return data;
} else if (typeof this.outputs[inputNum].data.result === "string") { } else if (typeof this.outputs[inputNum].data.result === "string") {
@ -226,7 +228,8 @@ class OutputWaiter {
* *
* @param {number} inputNum * @param {number} inputNum
*/ */
set(inputNum) { async set(inputNum) {
return new Promise(function(resolve, reject) {
const output = this.outputs[inputNum]; const output = this.outputs[inputNum];
if (output === undefined || output === null) return; if (output === undefined || output === null) return;
if (typeof inputNum !== "number") inputNum = parseInt(inputNum, 10); if (typeof inputNum !== "number") inputNum = parseInt(inputNum, 10);
@ -351,6 +354,7 @@ class OutputWaiter {
this.setOutputInfo(length, lines, output.data.duration); this.setOutputInfo(length, lines, output.data.duration);
this.backgroundMagic(); this.backgroundMagic();
} }
}.bind(this));
} }
/** /**
@ -359,8 +363,6 @@ class OutputWaiter {
* @param {ArrayBuffer} buf * @param {ArrayBuffer} buf
*/ */
setFile(buf) { setFile(buf) {
const file = new File([buf], "output.dat");
// Display file overlay in output area with details // Display file overlay in output area with details
const fileOverlay = document.getElementById("output-file"), const fileOverlay = document.getElementById("output-file"),
fileSize = document.getElementById("output-file-size"), fileSize = document.getElementById("output-file-size"),
@ -368,7 +370,7 @@ class OutputWaiter {
fileSlice = buf.slice(0, 4096); fileSlice = buf.slice(0, 4096);
fileOverlay.style.display = "block"; fileOverlay.style.display = "block";
fileSize.textContent = file.size.toLocaleString() + " bytes"; fileSize.textContent = buf.byteLength.toLocaleString() + " bytes";
outputText.classList.add("blur"); outputText.classList.add("blur");
outputText.value = Utils.printable(Utils.arrayBufferToStr(fileSlice)); outputText.value = Utils.printable(Utils.arrayBufferToStr(fileSlice));