yiiiiiiikkkesssb im scaredddd

Author: OptimusPi

.windsurf/workflows/prepare-update.md

@@ -1,21 +1,22 @@
 ---
-description: Prepare a MotelyJAML version update - bump version, clean, build all projects, AOT publish WASM, prepare npm packages, and guide user through npm publish
+description: Prepare a MotelyJAML version update - bump version, clean, build all projects, AOT-publish WASM, prepare npm packages, and guide user through npm publish
 ---
 
 # Prepare Update
 
 Bumps the MotelyVersion, cleans everything, builds all .NET projects, AOT-publishes both WASM targets, prepares both npm packages, and walks the user through publishing.
 
-**User provides**: the new version number — OR if not specified, read the current `<MotelyVersion>` from `Directory.Build.props` and auto-increment the patch (e.g. `2.2.1` → `2.2.2`).
+**User provides**: the new version number — OR if not specified, read the current `<MotelyVersion>` from `Directory.Packages.props` and auto-increment the patch (e.g. `2.2.1` → `2.2.2`).
 
 ---
 
 ## Step 1: Bump MotelyVersion
 
-Edit `x:\JammySeedFinder\src\MotelyJAML\Directory.Build.props` — set `<MotelyVersion>` to the new version.
+Edit `x:\JammySeedFinder\src\MotelyJAML\Directory.Packages.props` — set `<MotelyVersion>` to the new version.
 
-Then update **both** npm package.json files to match:
+Then update **all three** npm package.json files to match:
 - `x:\JammySeedFinder\src\MotelyJAML\Motely.npm\package.json` → set `"version"` to the new version
+- `x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread\package.json` → set `"version"` to the new version
 - `x:\JammySeedFinder\src\MotelyJAML\Motely.node\package.json` → set `"version"` to the new version
 
 Print the version you just set so the user can confirm.
@@ -65,39 +66,48 @@ If any project fails, report the error and stop.
 // turbo
 ```powershell
 Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework -ErrorAction SilentlyContinue
-Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\MotelyNode\_framework -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework_st -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread\_framework -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.node\_framework -ErrorAction SilentlyContinue
 ```
 
 ---
 
 ## Step 7: AOT Release Publish — Browser WASM (frontend)
 
-This publishes `Motely.BrowserWasm` and auto-copies `_framework` into `Motely.npm/_framework/` via MSBuild target.
+This publishes `Motely.BrowserWasm` with browser AOT enabled at publish time and auto-copies `_framework` into `Motely.npm/_framework/` via MSBuild target. The packaged `_framework` output keeps raw `.wasm` assets only and excludes `.br` / `.gz` sidecars.
 
 ```powershell
-dotnet publish x:\JammySeedFinder\src\MotelyJAML\Motely.BrowserWasm\Motely.BrowserWasm.csproj -c Release
+dotnet publish x:\JammySeedFinder\src\MotelyJAML\Motely.BrowserWasm\Motely.BrowserWasm.csproj -c Release -p:RunAOTCompilation=true -p:PublishReadyToRun=false
 ```
 
 Verify the output exists:
 // turbo
 ```powershell
-Test-Path x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework\dotnet.native.wasm
+@(Get-ChildItem x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework\dotnet.native*.wasm -ErrorAction SilentlyContinue).Count -gt 0
 ```
 
 ---
 
-## Step 8: AOT Release Publish — Node WASM (backend)
+## Step 8: AOT Release Publish — Single-thread WASM (Node + browser fallback)
 
-This publishes `Motely.SingleThread` and auto-copies `_framework` into `MotelyNode/_framework/` via MSBuild target.
+This publishes `Motely.SingleThread` with browser AOT enabled at publish time and auto-copies `_framework` into:
+- `Motely.node/_framework/`
+- `Motely.npm/_framework_st/`
+- `Motely.npm.singlethread/_framework/`
+
+The packaged `_framework` output keeps raw `.wasm` assets only and excludes `.br` / `.gz` sidecars.
 
 ```powershell
-dotnet publish x:\JammySeedFinder\src\MotelyJAML\Motely.SingleThread\Motely.SingleThread.csproj -c Release
+dotnet publish x:\JammySeedFinder\src\MotelyJAML\Motely.SingleThread\Motely.SingleThread.csproj -c Release -p:RunAOTCompilation=true -p:PublishReadyToRun=false
 ```
 
-Verify the output exists:
+Verify the outputs exist:
 // turbo
 ```powershell
-Test-Path x:\JammySeedFinder\src\MotelyJAML\MotelyNode\_framework\dotnet.native.wasm
+@(Get-ChildItem x:\JammySeedFinder\src\MotelyJAML\Motely.node\_framework\dotnet.native*.wasm -ErrorAction SilentlyContinue).Count -gt 0
+@(Get-ChildItem x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework_st\dotnet.native*.wasm -ErrorAction SilentlyContinue).Count -gt 0
+@(Get-ChildItem x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread\_framework\dotnet.native*.wasm -ErrorAction SilentlyContinue).Count -gt 0
 ```
 
 ---
@@ -106,33 +116,50 @@ Test-Path x:\JammySeedFinder\src\MotelyJAML\MotelyNode\_framework\dotnet.native.
 
 // turbo
 ```powershell
-cd x:\JammySeedFinder\src\MotelyJAML\Motely.npm; npm install; npm run build
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.npm install
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.npm run build
+```
+
+---
+
+## Step 10: Prepare npm package — motely-wasm-singlethread (browser)
+
+// turbo
+```powershell
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread install
 ```
 
 ---
 
-## Step 10: Prepare npm package — motely-node (backend)
+## Step 11: Prepare npm package — motely-node (backend)
 
 // turbo
 ```powershell
-cd x:\JammySeedFinder\src\MotelyJAML\Motely.node; npm install; npm run build; npm run copy-framework
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.node install
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.node run build
+npm --prefix x:\JammySeedFinder\src\MotelyJAML\Motely.node run copy-framework
 ```
 
 ---
 
-## Step 11: Tell user to publish
+## Step 12: Tell user to publish
 
 Tell the user:
 
 ```
-Both npm packages are ready to publish!
+All npm packages are ready to publish!
 
 1. Publish motely-wasm (browser frontend):
    cd x:\JammySeedFinder\src\MotelyJAML\Motely.npm
    npm login       # if not already logged in
    npm publish
 
-2. Publish motely-node (backend/Node.js):
+2. Publish motely-wasm-singlethread (browser fallback):
+   cd x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread
+   npm login       # if not already logged in
+   npm publish
+
+3. Publish motely-node (backend/Node.js):
    cd x:\JammySeedFinder\src\MotelyJAML\Motely.node
    npm login       # if not already logged in
    npm publish
@@ -142,23 +169,25 @@ Wait for user to confirm they published.
 
 ---
 
-## Step 12: Cleanup _framework files
+## Step 13: Cleanup _framework files
 
 After user confirms publish, clean up the large _framework dirs to keep the repo lean:
 
 ```powershell
 Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework -ErrorAction SilentlyContinue
-Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\MotelyNode\_framework -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm\_framework_st -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.npm.singlethread\_framework -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force x:\JammySeedFinder\src\MotelyJAML\Motely.node\_framework -ErrorAction SilentlyContinue
 ```
 
 ---
 
-## Step 13: Summary
+## Step 14: Summary
 
 Print:
 
 ```
 ✅ MotelyJAML update complete!
    Version: <THE_VERSION>
-   Published: motely-wasm@<THE_VERSION>, motely-node@<THE_VERSION>
+   Published: motely-wasm@<THE_VERSION>, motely-wasm-singlethread@<THE_VERSION>, motely-node@<THE_VERSION>
 ```

Directory.Packages.props

@@ -1,11 +1,13 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <MotelyVersion>2.3.1</MotelyVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Node API for .NET addon: https://microsoft.github.io/node-api-dotnet/scenarios/js-dotnet-module.html (CPM requires fixed version) -->
     <PackageVersion Include="Microsoft.JavaScript.NodeApi" Version="0.9.19" />
     <PackageVersion Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.9.19" />
+    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageVersion Include="DuckDB.NET.Data.Full" Version="1.4.4" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" />

Motely.API/Program.cs

@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.IO;
+using System.Text.Json.Serialization;
 using Motely.DistributedWorker;
 using Motely.Filters;
 
@@ -26,6 +27,23 @@ public record SearchInfo(
     TimeSpan ElapsedTime
 );
 
+public record ActiveSearchInfo(string Id, bool IsCompleted, long SeedsSearched, long Matches, string Elapsed);
+public record ServerStatusResponse(string Hostname, int ProcessorCount, string OS, string Runtime, string Uptime, IEnumerable<ActiveSearchInfo> ActiveSearches, int FilterCount, string PoolUrl);
+
+[JsonSerializable(typeof(CreateFilterRequest))]
+[JsonSerializable(typeof(UpdateFilterRequest))]
+[JsonSerializable(typeof(FilterInfo))]
+[JsonSerializable(typeof(FilterInfo[]))]
+[JsonSerializable(typeof(IEnumerable<FilterInfo>))]
+[JsonSerializable(typeof(StartSearchRequest))]
+[JsonSerializable(typeof(SearchInfo))]
+[JsonSerializable(typeof(ActiveSearchInfo))]
+[JsonSerializable(typeof(ActiveSearchInfo[]))]
+[JsonSerializable(typeof(ServerStatusResponse))]
+internal partial class ApiJsonSerializerContext : JsonSerializerContext
+{
+}
+
 public class Program
 {
     public static void Main(string[] args) => CreateHost(args).Run();
@@ -38,6 +56,11 @@ public static WebApplication CreateHost(string[] args)
     {
         var builder = WebApplication.CreateBuilder(args);
 
+        builder.Services.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.TypeInfoResolverChain.Insert(0, ApiJsonSerializerContext.Default);
+        });
+
         builder.Services.AddEndpointsApiExplorer();
         builder.Services.AddSwaggerGen(c =>
             c.SwaggerDoc("v1", new() { Title = "Motely API", Version = "v1" }));
@@ -194,27 +217,25 @@ public static WebApplication CreateHost(string[] args)
             var activeSearches = searches.Select(kvp =>
             {
                 var s = kvp.Value;
-                return new
-                {
-                    Id = kvp.Key,
-                    IsCompleted = s.IsCompleted,
-                    SeedsSearched = s.TotalSeedsSearched,
-                    Matches = s.MatchingSeeds,
-                    Elapsed = s.ElapsedTime.ToString(@"hh\:mm\:ss"),
-                };
-            });
-
-            return Results.Ok(new
-            {
-                Hostname = Environment.MachineName,
-                ProcessorCount = Environment.ProcessorCount,
-                OS = $"{System.Runtime.InteropServices.RuntimeInformation.OSDescription}",
-                Runtime = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription,
-                Uptime = (DateTime.UtcNow - serverStart).ToString(@"d\.hh\:mm\:ss"),
-                ActiveSearches = activeSearches,
-                FilterCount = Directory.GetFiles(jamlDir, "*.jaml").Length,
-                PoolUrl = "https://www.seedfinder.app",
-            });
+                return new ActiveSearchInfo(
+                    kvp.Key,
+                    s.IsCompleted,
+                    s.TotalSeedsSearched,
+                    s.MatchingSeeds,
+                    s.ElapsedTime.ToString(@"hh\:mm\:ss")
+                );
+            }).ToArray();
+
+            return Results.Ok(new ServerStatusResponse(
+                Environment.MachineName,
+                Environment.ProcessorCount,
+                $"{System.Runtime.InteropServices.RuntimeInformation.OSDescription}",
+                System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription,
+                (DateTime.UtcNow - serverStart).ToString(@"d\.hh\:mm\:ss"),
+                activeSearches,
+                Directory.GetFiles(jamlDir, "*.jaml").Length,
+                "https://www.seedfinder.app"
+            ));
         }).WithName("GetStatus");
 
         app.MapFallbackToFile("/index.html");

Motely.API/Properties/launchSettings.json

@@ -4,20 +4,13 @@
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5030",
+      "launchBrowser": true,
+      "applicationUrl": "http://192.168.0.171:3141",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7213;http://localhost:5030",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "SEARCH_POOL_TOKEN": "ABCD1234",
+        "POOL_URL": "https://www.seedfinder.app/api/search/helper"
       }
     }
   }
-}
+}

Motely.BrowserWasm/Motely.BrowserWasm.csproj

@@ -2,13 +2,13 @@
   <!-- Do NOT add Content Include="wwwroot\**" - SDK includes wwwroot automatically; duplicate causes NETSDK1022 -->
   <PropertyGroup>
     <TargetFramework>net10.0-browser</TargetFramework>
+    <Version>$(MotelyVersion)</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <PublishReadyToRun>false</PublishReadyToRun>
 
     <!-- AOT & Naive Build -->
-    <RunAOTCompilation>true</RunAOTCompilation>
-    <WasmBuildNative>true</WasmBuildNative>
     <WasmEnableThreads>true</WasmEnableThreads>
     <WasmEnableSIMD>true</WasmEnableSIMD>
 
@@ -54,7 +54,7 @@
     <ItemGroup>
       <_FrameworkFiles
         Include="$(PublishDir)wwwroot\_framework\**\*"
-        Exclude="$(PublishDir)wwwroot\_framework\debug\**\*;$(PublishDir)wwwroot\_framework\tmp\**\*"
+        Exclude="$(PublishDir)wwwroot\_framework\debug\**\*;$(PublishDir)wwwroot\_framework\tmp\**\*;$(PublishDir)wwwroot\_framework\**\*.br;$(PublishDir)wwwroot\_framework\**\*.gz"
       />
     </ItemGroup>
 

Motely.BrowserWasm/MotelyJAML.code-workspace

@@ -0,0 +1,21 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		},
+		{
+			"path": "../../../../v0-balatro-seed-hosting"
+		}
+	],
+	"settings": {
+		"files.associations": {
+			"*.jaml": "yaml"
+		},
+		"yaml.schemas": {
+			"jaml.schema.json": "*.jaml"
+		},
+		"yaml.completion": true,
+		"json.schemaDownload.enable": true,
+		"powershell.cwd": "v0-balatro-seed-hosting"
+	}
+}