Compare commits

..
Author SHA1 Message Date
jonas 84c931ad17 feat: parallel web solving 2026-08-28 18:49:01 +02:00
jonas b3b9db5954 feat: parallel web solving 2026-08-28 18:48:44 +02:00
jonas 30ba157d43 feat: parallel web solving 2026-08-23 20:19:26 +02:00
10 changed files with 238 additions and 14 deletions
Generated
+79 -2
View File
@@ -8,6 +8,12 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "autocfg"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
[[package]]
name = "bumpalo"
version = "3.20.3"
@@ -114,7 +120,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
"syn",
"syn 2.0.119",
"unicode-xid",
]
@@ -199,6 +205,15 @@ version = "0.2.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.21.4"
@@ -278,6 +293,25 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "rmp"
version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
dependencies = [
"num-traits",
]
[[package]]
name = "rmp-serde"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155"
dependencies = [
"rmp",
"serde",
]
[[package]]
name = "rustc_version"
version = "0.4.1"
@@ -299,6 +333,36 @@ version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
[[package]]
name = "serde"
version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
dependencies = [
"serde_core",
"serde_derive",
]
[[package]]
name = "serde_core"
version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
dependencies = [
"proc-macro2",
"quote",
"syn 3.0.3",
]
[[package]]
name = "slab"
version = "0.4.12"
@@ -325,6 +389,17 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "syn"
version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "tabular"
version = "0.2.0"
@@ -430,7 +505,7 @@ dependencies = [
"bumpalo",
"proc-macro2",
"quote",
"syn",
"syn 2.0.119",
"wasm-bindgen-shared",
]
@@ -479,6 +554,8 @@ dependencies = [
"js-sys",
"rand",
"rayon",
"rmp-serde",
"serde",
"tabular",
"wasm-bindgen",
]
+3 -1
View File
@@ -27,9 +27,11 @@ indicatif = { version = "0.18.6", features = ["rayon"] }
js-sys = { version = "0.3.104", optional = true }
rand = "0.10.2"
rayon = "1.12.0"
rmp-serde = { version = "1.3.1", optional = true }
serde = { version = "1.0.229", optional = true, features = ["derive"] }
tabular = { version = "0.2.0", features = ["ansi-cell"] }
wasm-bindgen = { version = "0.2.127", optional = true }
[features]
default = []
wasm-bindgen = ["dep:wasm-bindgen", "getrandom/wasm_js", "dep:js-sys"]
wasm-bindgen = ["dep:wasm-bindgen", "getrandom/wasm_js", "dep:js-sys", "dep:serde", "dep:rmp-serde"]
+4
View File
@@ -1,7 +1,10 @@
use colored::Colorize;
use derive_more::Display;
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
#[derive(Display, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub enum CharStatus {
GREY,
YELLOW,
@@ -9,6 +12,7 @@ pub enum CharStatus {
}
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Pattern {
chars: Vec<char>,
stats: Vec<CharStatus>,
+5
View File
@@ -7,18 +7,23 @@ use crate::pattern::Pattern;
use indicatif::ParallelProgressIterator;
use rayon::iter::{ParallelBridge, ParallelIterator};
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
use crate::word_list::WordList;
use derive_more::Display;
use tabular::{Row, Table};
#[derive(Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Guess {
pub pattern: Pattern,
pub information_gained: f64,
}
#[derive(Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Solver {
valid_words: WordList,
possible_solutions: WordList,
+22
View File
@@ -1,5 +1,7 @@
use std::io;
use rmp_serde::{from_slice, to_vec};
use serde::Serialize;
use wasm_bindgen::prelude::*;
use crate::{
@@ -63,6 +65,26 @@ impl Solver {
}
}
pub fn serialize(&self) -> Result<js_sys::Uint8Array, String> {
let r = to_vec(&self.0).map_err(|e| {
let s = e.to_string();
drop(e);
s
})?;
Ok(js_sys::Uint8Array::from(&r[..]))
}
pub fn new_from_serialized(bytes: &js_sys::Uint8Array) -> Result<Solver, String> {
from_slice(&bytes.to_vec()[..])
.map_err(|e| {
let s = e.to_string();
drop(e);
s
})
.map(Solver)
}
pub fn guess(&mut self, word: &str, colors: Vec<Color>) -> Result<(), String> {
let pat = Pattern::try_new(
word,
+3
View File
@@ -1,4 +1,6 @@
use rand::{rng, seq::IteratorRandom};
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
use std::{
collections::{hash_set, HashSet},
fs::{self},
@@ -11,6 +13,7 @@ use derive_more::Display;
use crate::pattern::Pattern;
#[derive(Display, Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
#[display("{:?}", words)]
pub struct WordList {
words: HashSet<String>,
+2 -6
View File
@@ -6,6 +6,7 @@
solver_guess,
solver_reset,
solver_solution_space,
solver_stop,
} from "./solver/solver.ts";
import type {
GuessResult,
@@ -93,12 +94,7 @@
}
async function stopSolver() {
await solver_reset(use_default_wordle_answers);
for (const g of guesses.slice(0, -1)) {
try {
await solver_guess(g.letters, g.colors);
} catch (_) {}
}
await solver_stop();
}
async function doGuess() {
+56 -5
View File
@@ -1,9 +1,6 @@
import type { Color } from "wordle-solver";
import SolverWorker from "./worker?worker";
import type { GuessResult, SolutionSpaceResult, EvaluateWordsResult, SolverRequest, SolverResponse, EvaluateWordsProgress } from "./types";
let solver_worker = new SolverWorker();
await init_solver();
import type { GuessResult, SolutionSpaceResult, EvaluateWordsResult, SolverRequest, SolverResponse, EvaluateWordsProgress, SolverStateResult, RestoreSolverState } from "./types";
let msg_id = 0;
@@ -14,6 +11,12 @@ const pending = new Map<number, {
const progresses = new Map<number, (p: EvaluateWordsProgress) => void>();
let solver_worker = new SolverWorker();
await init_solver();
let last_solver_state = await solver_state();
function init_solver(): Promise<void> {
return new Promise((resolve) => {
solver_worker.onmessage = (event: any) => {
@@ -65,13 +68,15 @@ export function solver_solution_space(): Promise<SolutionSpaceResult> {
});
}
export function solver_evaluate_words(n: number, progress: ((p: EvaluateWordsProgress) => void) | null): Promise<EvaluateWordsResult> {
export async function solver_evaluate_words(n: number, progress: ((p: EvaluateWordsProgress) => void) | null): Promise<EvaluateWordsResult> {
const id = msg_id++;
if (progress) {
progresses.set(id, progress);
}
last_solver_state = await solver_state();
return new Promise((resolve, reject) => {
pending.set(id, { resolve, reject });
@@ -85,6 +90,52 @@ export function solver_evaluate_words(n: number, progress: ((p: EvaluateWordsPro
});
}
function solver_state(): Promise<SolverStateResult> {
const id = msg_id++;
return new Promise((resolve, reject) => {
pending.set(id, { resolve, reject });
const r: SolverRequest = {
type: "solver_state",
id: id,
input: null,
};
solver_worker.postMessage(JSON.parse(JSON.stringify(r)));
});
}
function restore_solver_state(s: RestoreSolverState): Promise<void> {
const id = msg_id++;
return new Promise((resolve, reject) => {
pending.set(id, { resolve, reject });
const r: SolverRequest = {
type: "restore_solver_state",
id: id,
input: s,
};
solver_worker.postMessage(r);
});
}
export async function solver_stop(): Promise<void> {
solver_worker.terminate();
pending.forEach((v, _) => {
v.reject("Solver was stopped");
});
pending.clear();
progresses.clear();
await create_solver_worker();
await restore_solver_state(last_solver_state);
}
export async function solver_reset(wordle_answers: boolean): Promise<void> {
solver_worker.terminate();
+30
View File
@@ -20,8 +20,19 @@ export type SolverRequest =
type: "reload_wordlist",
id: number,
input: ReloadWordlist
}
| {
type: "solver_state",
id: number,
input: null
}
| {
type: "restore_solver_state",
id: number,
input: RestoreSolverState
};
export type SolverResponse =
| {
type: "guess",
@@ -52,8 +63,21 @@ export type SolverResponse =
id: number,
error: string | null
result: boolean | null,
}
| {
type: "solver_state",
id: number,
error: string | null
result: SolverStateResult | null,
}
| {
type: "restore_solver_state",
id: number,
error: string | null
result: boolean | null,
};
export type Guess = {
word: string[],
colors: Color[]
@@ -84,3 +108,9 @@ export type SolutionSpaceResult = {
size: number,
uncertainty: number
};
export type SolverStateResult = {
raw: Uint8Array
};
export type RestoreSolverState = {
raw: Uint8Array
};
+34
View File
@@ -99,6 +99,40 @@ self.onmessage = (event: MessageEvent<SolverRequest>) => {
self.postMessage(JSON.parse(JSON.stringify(response)));
break;
};
case "solver_state": {
let response: SolverResponse = {
type: "solver_state",
id: request.id,
error: null,
result: null
};
try {
response.result = { raw: solver.serialize() };
} catch (e) {
response.error = e as string;
}
self.postMessage(response);
break;
};
case "restore_solver_state": {
let response: SolverResponse = {
type: "restore_solver_state",
id: request.id,
error: null,
result: null
};
try {
solver.free();
solver = Solver.new_from_serialized(request.input.raw);
response.result = true;
} catch (e) {
response.error = e as string;
}
self.postMessage(response);
break;
}
}
};