diff --git a/web/http/nissyapp.mjs b/web/http/nissyapp.mjs index 55ca198..1f9fa72 100644 --- a/web/http/nissyapp.mjs +++ b/web/http/nissyapp.mjs @@ -30,8 +30,8 @@ worker.onmessage = (event) => { function updateResults(label, results, enable) { resultsLabel.innerText = label; resultsText.innerText = results; - solveButton.disable = !enable; - solverSelector.disable = !enable; + solveButton.disabled = !enable; + solverSelector.disabled = !enable; } var logVisible = false; @@ -49,7 +49,27 @@ toggleLog.addEventListener("click", () => { solveButton.addEventListener("click", () => { const solver = solverSelector.options[solverSelector.selectedIndex].value; const scramble = scrField.value; - loadDataThenSolve(solver, scramble); + + const callbackId = ++lastCallbackId; + callbacks.set(callbackId, { + f: (callbackArg, validateResult) => { + if (validateResult) { + loadDataThenSolve(callbackArg.solver, callbackArg.scramble); + } else { + updateResults("Scramble is invalid", "", true); + } + }, + arg: { + solver: solver, + scramble: scramble + } + }); + + worker.postMessage({ + command: "validate scramble", + id: lastCallbackId, + arg: scramble + }); }); function loadDataThenSolve(solver, scramble) { diff --git a/web/worker.mjs b/web/worker.mjs index 0cb618b..12de1dc 100644 --- a/web/worker.mjs +++ b/web/worker.mjs @@ -8,6 +8,7 @@ const commands = [ { name: "load solver data", exec: loadSolverDataFromStorage }, { name: "download solver data", exec: downloadSolverData }, { name: "generate solver data", exec: generateSolverData }, + { name: "validate scramble", exec: validateScramble }, { name: "solve", exec: solve }, ]; @@ -45,7 +46,7 @@ async function loadSolverDataFromStorage(id, solver) { }); if (!(await nissy.isSolverAvailable(solver))) { - async_return(false, "Error: solver " + arg.solver + + async_return(false, "Error: solver " + solver + " is not available in this version of nissy."); return; } @@ -113,6 +114,19 @@ async function generateSolverData(id, solver) { } } +// Check if the scramble is valid. +// Argument: string (the scramble). +async function validateScramble(id, arg) { + const async_return = (success) => postMessage({ + command: "validate scramble", + id: id, + arg: success + }); + + var cube = new nissy.Cube(); + async_return(cube.move(arg).ok()); +} + // Solve the cube with the given options. // Argument: { // solver: string -- cgit v1.3