3 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
25 changed files with 428 additions and 475 deletions
-22
View File
@@ -1,22 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
REGISTRY="${REGISTRY#https://}"
REGISTRY="${REGISTRY#http://}"
REGISTRY="${REGISTRY%/}"
IMAGE="${REGISTRY}/${REPOSITORY}:${TAG}"
echo "Pushing ${IMAGE}"
skopeo copy \
--dest-creds "${USERNAME}:${PASSWORD}" \
"docker-archive:result" \
"docker://${IMAGE}"
if [ "${REF_NAME:-}" = "main" ]; then
skopeo copy \
--dest-creds "${USERNAME}:${PASSWORD}" \
"docker-archive:result" \
"docker://${REGISTRY}/${REPOSITORY}:latest"
fi
-47
View File
@@ -1,47 +0,0 @@
name: Build docker images.
on:
push:
jobs:
build-wordle-solver-image:
runs-on: nixos
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Build wordle-solver image
run: |
nix build .#wordle-solver-docker
- name: Push image
env:
REGISTRY: "${{ gitea.server_url }}"
REPOSITORY: "${{ gitea.repository }}"
USERNAME: "${{ secrets.REGISTRY_USER }}"
PASSWORD: "${{ secrets.REGISTRY_TOKEN }}"
REF_NAME: "${{ gitea.ref_name }}"
TAG: "${{ gitea.sha }}"
run: bash .gitea/scripts/push-image.sh
build-wordle-solver-web-image:
runs-on: nixos
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Build wordle-solver-web image
run: |
nix build .#wordle-solver-web-docker
- name: Push image
env:
REGISTRY: "${{ gitea.server_url }}"
REPOSITORY: "${{ gitea.repository }}-web"
USERNAME: "${{ secrets.REGISTRY_USER }}"
PASSWORD: "${{ secrets.REGISTRY_TOKEN }}"
REF_NAME: "${{ gitea.ref_name }}"
TAG: "${{ gitea.sha }}"
run: bash .gitea/scripts/push-image.sh
Generated
+79 -2
View File
@@ -8,6 +8,12 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "autocfg"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.20.3" version = "3.20.3"
@@ -114,7 +120,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustc_version", "rustc_version",
"syn", "syn 2.0.119",
"unicode-xid", "unicode-xid",
] ]
@@ -199,6 +205,15 @@ version = "0.2.189"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" 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]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.21.4" version = "1.21.4"
@@ -278,6 +293,25 @@ dependencies = [
"crossbeam-utils", "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]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.4.1" version = "0.4.1"
@@ -299,6 +333,36 @@ version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" 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]] [[package]]
name = "slab" name = "slab"
version = "0.4.12" version = "0.4.12"
@@ -325,6 +389,17 @@ dependencies = [
"unicode-ident", "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]] [[package]]
name = "tabular" name = "tabular"
version = "0.2.0" version = "0.2.0"
@@ -430,7 +505,7 @@ dependencies = [
"bumpalo", "bumpalo",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.119",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@@ -479,6 +554,8 @@ dependencies = [
"js-sys", "js-sys",
"rand", "rand",
"rayon", "rayon",
"rmp-serde",
"serde",
"tabular", "tabular",
"wasm-bindgen", "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 } js-sys = { version = "0.3.104", optional = true }
rand = "0.10.2" rand = "0.10.2"
rayon = "1.12.0" 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"] } tabular = { version = "0.2.0", features = ["ansi-cell"] }
wasm-bindgen = { version = "0.2.127", optional = true } wasm-bindgen = { version = "0.2.127", optional = true }
[features] [features]
default = [] 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"]
-60
View File
@@ -1,60 +0,0 @@
# Wordle Solver
This wordle solver uses an information theory based approach to evaluate the next-best-guess. It's heavily inspired by [3b1b's approach](https://www.youtube.com/watch?v=v68zYyaEmEA) on solving wordle.
There are two ways to use the wordle-solver.
1. a CLI tool
2. a web interface
# Docker
#### CLI
```sh
docker run --rm -it git.jroeger.de/jonas/wordle-solver-rs
```
#### web
``` sh
docker run -p 8080:80 --rm -it git.jroeger.de/jonas/wordle-solver-rs-web
```
# Nix
#### CLI
``` sh
nix run .
```
#### Static web site
``` sh
nix build git+http://git.jroeger.de/jonas/wordle-solver-rs#wordle-solver-web
```
# Native
#### CLI
you will need to have `cargo` installed.
```sh
cargo run --profile release
```
#### web
you need the following tools:
- `wasm-pack`
- `wasm-bindgen`
- `cargo`
- `nodejs`
- `yarn`
``` sh
cd web
yarn install
yarn serve # or yarn build
```
+33 -14
View File
@@ -16,6 +16,7 @@
outputs = inputs @ { outputs = inputs @ {
flake-parts, flake-parts,
crate2nix,
rust-overlay, rust-overlay,
... ...
}: }:
@@ -27,24 +28,33 @@
"x86_64-linux" "x86_64-linux"
]; ];
imports = [
./nix/wasm-bindgen.nix
./nix/wordle-solver-docker.nix
./nix/wordle-solver-wasm-pkg.nix
./nix/wordle-solver-wasm.nix
./nix/wordle-solver-web-docker.nix
./nix/wordle-solver-web.nix
./nix/wordle-solver.nix
];
perSystem = { perSystem = {
pkgs, pkgs,
system, system,
self', self',
... ...
}: let }: let
utils = import ./nix/utils.nix; # Use rust-bin to generate the toolchain from rust-toolchain.toml
rust-toolchain = utils.rust-toolchain pkgs; rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
cross-pkgs = pkgs.pkgsCross.wasm32-unknown-none;
toolchain = pkgs.callPackage ./nix/with-toolchain.nix {
cargo = rust-toolchain;
rustc = rust-toolchain;
};
crossToolchain = cross-pkgs.callPackage ./nix/with-toolchain.nix {
cargo = rust-toolchain;
rustc = rust-toolchain;
};
wasm-bindgen = toolchain.pkgs.callPackage ./nix/wasm-bindgen.nix {};
root-crate = pkgs.callPackage ./nix/root-crate.nix {
cargo = rust-toolchain;
rustc = rust-toolchain;
inherit crate2nix;
};
in { in {
# Overlay pkgs with rust-bin # Overlay pkgs with rust-bin
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixpkgs {
@@ -53,13 +63,22 @@
config.allowUnsupportedSystem = true; config.allowUnsupportedSystem = true;
}; };
packages.default = self'.packages.wordle-solver; packages = {
wordle-solver-web = pkgs.callPackage ./nix/wordle-solver-web.nix {inherit (self'.packages) wordle-solver-wasm-pkg;};
wordle-solver-wasm = crossToolchain.pkgs.callPackage ./nix/wordle-solver-wasm.nix {};
wordle-solver-wasm-pkg = pkgs.callPackage ./nix/wordle-solver-wasm-pkg.nix {
inherit wasm-bindgen root-crate;
inherit (self'.packages) wordle-solver-wasm;
};
wordle-solver = root-crate.build;
default = self'.packages.wordle-solver;
};
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
RA_LOG = "rust_analyzer=info"; RA_LOG = "rust_analyzer=info";
buildInputs = [ buildInputs = [
rust-toolchain rust-toolchain
self'.packages.wasm-bindgen wasm-bindgen
pkgs.nodejs pkgs.nodejs
pkgs.svelte-language-server pkgs.svelte-language-server
pkgs.typescript-language-server pkgs.typescript-language-server
+23
View File
@@ -0,0 +1,23 @@
{
crate2nix,
rustc,
cargo,
pkgs,
...
}: let
buildRustCrateForPkgs = _:
pkgs.buildRustCrate.override {
inherit cargo rustc;
};
# Cargo.nix for IFD
generatedCargoNix = crate2nix.tools.${pkgs.hostPlatform.system}.generatedCargoNix {
name = "rustnix";
src = ../.;
};
cargoNix = import generatedCargoNix {
inherit pkgs buildRustCrateForPkgs;
};
in
cargoNix.rootCrate
-21
View File
@@ -1,21 +0,0 @@
rec {
rust-toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml;
toolchain-pkgs = pkgs:
pkgs.extend (_: _: {
rustPlatform = pkgs.makeRustPlatform {
cargo = rust-toolchain pkgs;
rustc = rust-toolchain pkgs;
};
});
toolchain-crosspkgs = pkgs: let
crossPkgs = pkgs.pkgsCross.wasm32-unknown-none;
in
crossPkgs.extend (_: _: {
rustPlatform = crossPkgs.makeRustPlatform {
cargo = rust-toolchain pkgs;
rustc = rust-toolchain pkgs;
};
});
}
+3 -11
View File
@@ -1,11 +1,10 @@
let {
drv = {
fetchCrate, fetchCrate,
buildWasmBindgenCli, buildWasmBindgenCli,
rustPlatform, rustPlatform,
... ...
}: }:
buildWasmBindgenCli rec { buildWasmBindgenCli rec {
src = fetchCrate { src = fetchCrate {
pname = "wasm-bindgen-cli"; pname = "wasm-bindgen-cli";
version = "0.2.127"; version = "0.2.127";
@@ -17,11 +16,4 @@ let
inherit (src) pname version; inherit (src) pname version;
hash = "sha256-FTv2GZIAQs0ePdIZXIXil7JbZ6kIT05VG6vqC1qNFxQ="; hash = "sha256-FTv2GZIAQs0ePdIZXIXil7JbZ6kIT05VG6vqC1qNFxQ=";
}; };
};
utils = import ./utils.nix;
in {
perSystem = {pkgs, ...}: {
packages.wasm-bindgen = (utils.toolchain-pkgs pkgs).callPackage drv {};
};
} }
+16
View File
@@ -0,0 +1,16 @@
{
makeRustPlatform,
cargo,
rustc,
pkgs,
...
}: let
p = pkgs;
in rec {
rustPlatform = makeRustPlatform {
inherit cargo rustc;
};
pkgs = p.extend (_: _: {
inherit rustPlatform;
});
}
-39
View File
@@ -1,39 +0,0 @@
let
drv = {
buildEnv,
dockerTools,
wordle-solver,
runCommand,
...
}:
dockerTools.buildImage {
name = "wordle-solver";
created = "now";
copyToRoot = buildEnv {
name = "image-root";
paths = [
wordle-solver
(runCommand "wordle-data" {} ''
mkdir -p $out/pwd
cp ${../valid-words.txt} $out/pwd/valid-words.txt
cp ${../answers.txt} $out/pwd/answers.txt
'')
];
pathsToLink = ["/bin" "/pwd"];
};
config = {
Cmd = ["/bin/wordle-solver"];
WorkingDir = "/pwd";
};
};
in {
perSystem = {
pkgs,
self',
...
}: {
packages.wordle-solver-docker = pkgs.callPackage drv {
inherit (self'.packages) wordle-solver;
};
};
}
+5 -16
View File
@@ -1,21 +1,16 @@
{ {
perSystem = {
pkgs,
self',
...
}: let
drv = {
stdenvNoCC, stdenvNoCC,
wasm-bindgen, wasm-bindgen,
wordle-solver-wasm, wordle-solver-wasm,
root-crate,
... ...
}: let }: let
snake_name = "wordle_solver"; snake_name = "wordle_solver";
package-meta = { package-meta = {
name = "wordle-solver"; name = "wordle-solver";
type = "module"; type = "module";
description = "module"; description = "module";
version = "0.1.0"; version = root-crate.build.crateVersion;
files = [ files = [
"${snake_name}_bg.wasm" "${snake_name}_bg.wasm"
"${snake_name}.js" "${snake_name}.js"
@@ -30,7 +25,7 @@
]; ];
}; };
package-json = builtins.toJSON package-meta; package-json = builtins.toJSON package-meta;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "wordle-solver-wasm-pkg"; name = "wordle-solver-wasm-pkg";
nativeBuildInputs = [wasm-bindgen]; nativeBuildInputs = [wasm-bindgen];
@@ -41,10 +36,4 @@
${package-json} ${package-json}
EOF EOF
''; '';
}; }
in {
packages.wordle-solver-wasm-pkg = pkgs.callPackage drv {
inherit (self'.packages) wordle-solver-wasm wasm-bindgen;
};
};
}
+5 -22
View File
@@ -1,17 +1,11 @@
{ {
perSystem = {pkgs, ...}: let
utils = import ./utils.nix;
rust-toolchain = utils.rust-toolchain pkgs;
toolchain-crosspkgs = utils.toolchain-crosspkgs pkgs;
drv = {
rustPlatform, rustPlatform,
buildPackages, buildPackages,
lld, lld,
name ? "wordle-solver", name ? "wordle-solver",
removeReferencesTo,
... ...
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit name; inherit name;
src = ../.; # Or your source location src = ../.; # Or your source location
@@ -25,7 +19,6 @@
buildPackages.stdenv.cc buildPackages.stdenv.cc
lld # Needed for wasm-ld lld # Needed for wasm-ld
]; ];
nativeBuildInputs = [removeReferencesTo];
cargoBuildFlags = [ cargoBuildFlags = [
"--lib" "--lib"
@@ -34,23 +27,13 @@
]; ];
# Configure rustc for WASM # Configure rustc for WASM
RUSTFLAGS = ''--cfg=web_sys_unstable_apis -C linker=wasm-ld -C strip=debuginfo -C debuginfo=0''; env = {
RUSTFLAGS = ''--cfg=web_sys_unstable_apis -C linker=wasm-ld'';
};
# Copy the WASM file to the output # Copy the WASM file to the output
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
cp target/wasm32-unknown-unknown/release/*.wasm $out/lib/ cp target/wasm32-unknown-unknown/release/*.wasm $out/lib/
runHook postInstall
''; '';
# Remove toolchain from closure (store paths are debug artifacts)
postInstall = ''
remove-references-to -t ${rust-toolchain} $out/lib/*.wasm
'';
};
in {
packages.toolchain = rust-toolchain;
packages.wordle-solver-wasm = toolchain-crosspkgs.callPackage drv {};
};
} }
-64
View File
@@ -1,64 +0,0 @@
let
drv = {
buildEnv,
dockerTools,
fakeNss,
nginx,
runCommand,
wordle-solver-web,
...
}:
dockerTools.buildImage {
name = "wordle-solver-web";
created = "now";
copyToRoot = buildEnv {
name = "image-root";
paths = [
nginx
(fakeNss.override {
extraGroupLines = [
"nogroup:x:65534:"
];
})
(runCommand "nginx-conf" {} ''
mkdir -p $out/etc
cat <<EOF > $out/etc/nginx.conf
events {}
error_log /dev/stderr;
http {
include ${nginx}/conf/mime.types;
server {
listen 80;
root ${wordle-solver-web};
access_log /dev/stdout;
}
}
daemon off;
EOF
'')
];
pathsToLink = ["/etc"];
};
runAsRoot = ''
mkdir -p /var/log/nginx
'';
config = {
Cmd = ["${nginx}/bin/nginx" "-c" "/etc/nginx.conf"];
};
};
in {
perSystem = {
pkgs,
self',
...
}: {
packages.wordle-solver-web-docker = pkgs.callPackage drv {
inherit (self'.packages) wordle-solver-web;
};
};
}
+3 -15
View File
@@ -1,18 +1,12 @@
{ {
perSystem = {
pkgs,
self',
...
}: let
drv = {
stdenv, stdenv,
fetchYarnDeps, fetchYarnDeps,
yarnConfigHook, yarnConfigHook,
yarnBuildHook, yarnBuildHook,
nodejs, nodejs,
wordle-solver-wasm-pkg, wordle-solver-wasm-pkg,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "wordle-solver-web"; pname = "wordle-solver-web";
version = "0.1.0"; version = "0.1.0";
@@ -40,10 +34,4 @@
# Needed for executing package.json scripts # Needed for executing package.json scripts
nodejs nodejs
]; ];
}); })
in {
packages.wordle-solver-web = pkgs.callPackage drv {
inherit (self'.packages) wordle-solver-wasm-pkg;
};
};
}
-27
View File
@@ -1,27 +0,0 @@
{inputs, ...}: {
perSystem = {pkgs, ...}: let
# Cargo.nix for IFD
generatedCargoNix = inputs.crate2nix.tools.${pkgs.hostPlatform.system}.generatedCargoNix {
name = "rustnix";
src = ../.;
};
utils = import ./utils.nix;
rust-toolchain = utils.rust-toolchain pkgs;
toolchain-pkgs = utils.toolchain-pkgs pkgs;
buildRustCrateForPkgs = _:
pkgs.buildRustCrate.override {
cargo = rust-toolchain;
rustc = rust-toolchain;
};
cargoNix = import generatedCargoNix {
pkgs = toolchain-pkgs;
inherit buildRustCrateForPkgs;
};
in {
packages.wordle-solver = cargoNix.rootCrate.build;
};
}
+4
View File
@@ -1,7 +1,10 @@
use colored::Colorize; use colored::Colorize;
use derive_more::Display; use derive_more::Display;
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
#[derive(Display, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash)] #[derive(Display, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub enum CharStatus { pub enum CharStatus {
GREY, GREY,
YELLOW, YELLOW,
@@ -9,6 +12,7 @@ pub enum CharStatus {
} }
#[derive(Debug, PartialEq, Eq, Hash, Clone)] #[derive(Debug, PartialEq, Eq, Hash, Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Pattern { pub struct Pattern {
chars: Vec<char>, chars: Vec<char>,
stats: Vec<CharStatus>, stats: Vec<CharStatus>,
+5
View File
@@ -7,18 +7,23 @@ use crate::pattern::Pattern;
use indicatif::ParallelProgressIterator; use indicatif::ParallelProgressIterator;
use rayon::iter::{ParallelBridge, ParallelIterator}; use rayon::iter::{ParallelBridge, ParallelIterator};
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
use crate::word_list::WordList; use crate::word_list::WordList;
use derive_more::Display; use derive_more::Display;
use tabular::{Row, Table}; use tabular::{Row, Table};
#[derive(Clone)] #[derive(Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Guess { pub struct Guess {
pub pattern: Pattern, pub pattern: Pattern,
pub information_gained: f64, pub information_gained: f64,
} }
#[derive(Clone)] #[derive(Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
pub struct Solver { pub struct Solver {
valid_words: WordList, valid_words: WordList,
possible_solutions: WordList, possible_solutions: WordList,
+22
View File
@@ -1,5 +1,7 @@
use std::io; use std::io;
use rmp_serde::{from_slice, to_vec};
use serde::Serialize;
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
use crate::{ 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> { pub fn guess(&mut self, word: &str, colors: Vec<Color>) -> Result<(), String> {
let pat = Pattern::try_new( let pat = Pattern::try_new(
word, word,
+3
View File
@@ -1,4 +1,6 @@
use rand::{rng, seq::IteratorRandom}; use rand::{rng, seq::IteratorRandom};
#[cfg(feature = "wasm-bindgen")]
use serde::{Deserialize, Serialize};
use std::{ use std::{
collections::{hash_set, HashSet}, collections::{hash_set, HashSet},
fs::{self}, fs::{self},
@@ -11,6 +13,7 @@ use derive_more::Display;
use crate::pattern::Pattern; use crate::pattern::Pattern;
#[derive(Display, Clone)] #[derive(Display, Clone)]
#[cfg_attr(feature = "wasm-bindgen", derive(Serialize, Deserialize))]
#[display("{:?}", words)] #[display("{:?}", words)]
pub struct WordList { pub struct WordList {
words: HashSet<String>, words: HashSet<String>,
+1 -2
View File
@@ -4,14 +4,13 @@
"version": "0.0.0", "version": "0.0.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"serve": "run-s wasm-pack:release vite:serve",
"build-no-wasm": "run-s tsc vite:build", "build-no-wasm": "run-s tsc vite:build",
"build": "run-s wasm-pack:release tsc vite:build", "build": "run-s wasm-pack:release tsc vite:build",
"dev": "run-s wasm-pack:dev vite:dev", "dev": "run-s wasm-pack:dev vite:dev",
"tsc": "tsc", "tsc": "tsc",
"vite:build": "vite build", "vite:build": "vite build",
"vite:dev": "vite -c vite.config.dev.ts", "vite:dev": "vite -c vite.config.dev.ts",
"vite:serve": "vite -c vite.config.ts", "vite:preview": "vite preview",
"wasm-pack:dev": "rm -rf pkg; wasm-pack build --dev --features wasm-bindgen --manifest-path ../Cargo.toml; mv ../pkg .", "wasm-pack:dev": "rm -rf pkg; wasm-pack build --dev --features wasm-bindgen --manifest-path ../Cargo.toml; mv ../pkg .",
"wasm-pack:release": "rm -rf pkg; wasm-pack build --features wasm-bindgen --manifest-path ../Cargo.toml; mv ../pkg ." "wasm-pack:release": "rm -rf pkg; wasm-pack build --features wasm-bindgen --manifest-path ../Cargo.toml; mv ../pkg ."
}, },
+2 -6
View File
@@ -6,6 +6,7 @@
solver_guess, solver_guess,
solver_reset, solver_reset,
solver_solution_space, solver_solution_space,
solver_stop,
} from "./solver/solver.ts"; } from "./solver/solver.ts";
import type { import type {
GuessResult, GuessResult,
@@ -93,12 +94,7 @@
} }
async function stopSolver() { async function stopSolver() {
await solver_reset(use_default_wordle_answers); await solver_stop();
for (const g of guesses.slice(0, -1)) {
try {
await solver_guess(g.letters, g.colors);
} catch (_) {}
}
} }
async function doGuess() { async function doGuess() {
+56 -5
View File
@@ -1,9 +1,6 @@
import type { Color } from "wordle-solver"; import type { Color } from "wordle-solver";
import SolverWorker from "./worker?worker"; import SolverWorker from "./worker?worker";
import type { GuessResult, SolutionSpaceResult, EvaluateWordsResult, SolverRequest, SolverResponse, EvaluateWordsProgress } from "./types"; import type { GuessResult, SolutionSpaceResult, EvaluateWordsResult, SolverRequest, SolverResponse, EvaluateWordsProgress, SolverStateResult, RestoreSolverState } from "./types";
let solver_worker = new SolverWorker();
await init_solver();
let msg_id = 0; let msg_id = 0;
@@ -14,6 +11,12 @@ const pending = new Map<number, {
const progresses = new Map<number, (p: EvaluateWordsProgress) => void>(); 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> { function init_solver(): Promise<void> {
return new Promise((resolve) => { return new Promise((resolve) => {
solver_worker.onmessage = (event: any) => { 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++; const id = msg_id++;
if (progress) { if (progress) {
progresses.set(id, progress); progresses.set(id, progress);
} }
last_solver_state = await solver_state();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
pending.set(id, { 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> { export async function solver_reset(wordle_answers: boolean): Promise<void> {
solver_worker.terminate(); solver_worker.terminate();
+30
View File
@@ -20,8 +20,19 @@ export type SolverRequest =
type: "reload_wordlist", type: "reload_wordlist",
id: number, id: number,
input: ReloadWordlist input: ReloadWordlist
}
| {
type: "solver_state",
id: number,
input: null
}
| {
type: "restore_solver_state",
id: number,
input: RestoreSolverState
}; };
export type SolverResponse = export type SolverResponse =
| { | {
type: "guess", type: "guess",
@@ -52,8 +63,21 @@ export type SolverResponse =
id: number, id: number,
error: string | null error: string | null
result: boolean | 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 = { export type Guess = {
word: string[], word: string[],
colors: Color[] colors: Color[]
@@ -84,3 +108,9 @@ export type SolutionSpaceResult = {
size: number, size: number,
uncertainty: 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))); self.postMessage(JSON.parse(JSON.stringify(response)));
break; 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;
}
} }
}; };