Fixes
This commit is contained in:
@@ -2,7 +2,7 @@ services:
|
|||||||
webui:
|
webui:
|
||||||
image: minimax
|
image: minimax
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "4000:3000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
env_file:
|
env_file:
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ pub struct RhaiAgent<R: Rng + 'static> {
|
|||||||
|
|
||||||
engine: Engine,
|
engine: Engine,
|
||||||
script: AST,
|
script: AST,
|
||||||
scope: Scope<'static>,
|
|
||||||
print_callback: Arc<dyn Fn(&str) + 'static>,
|
print_callback: Arc<dyn Fn(&str) + 'static>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +117,6 @@ impl<R: Rng + 'static> RhaiAgent<R> {
|
|||||||
|
|
||||||
// Do not use FULL, rand_* functions are not pure
|
// Do not use FULL, rand_* functions are not pure
|
||||||
engine.set_optimization_level(OptimizationLevel::Simple);
|
engine.set_optimization_level(OptimizationLevel::Simple);
|
||||||
|
|
||||||
engine.disable_symbol("eval");
|
engine.disable_symbol("eval");
|
||||||
engine.set_max_expr_depths(100, 100);
|
engine.set_max_expr_depths(100, 100);
|
||||||
engine.set_max_strings_interned(1024);
|
engine.set_max_strings_interned(1024);
|
||||||
@@ -201,13 +199,11 @@ impl<R: Rng + 'static> RhaiAgent<R> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let script = engine.compile(script)?;
|
let script = engine.compile(script)?;
|
||||||
let scope = Scope::new(); // Not used
|
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
rng,
|
rng,
|
||||||
engine,
|
engine,
|
||||||
script,
|
script,
|
||||||
scope,
|
|
||||||
print_callback,
|
print_callback,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -227,7 +223,7 @@ impl<R: Rng + 'static> Agent for RhaiAgent<R> {
|
|||||||
fn step_min(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
fn step_min(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
||||||
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
||||||
CallFnOptions::new().eval_ast(false),
|
CallFnOptions::new().eval_ast(false),
|
||||||
&mut self.scope,
|
&mut Scope::new(),
|
||||||
&self.script,
|
&self.script,
|
||||||
"step_min",
|
"step_min",
|
||||||
(board.clone(),),
|
(board.clone(),),
|
||||||
@@ -242,7 +238,7 @@ impl<R: Rng + 'static> Agent for RhaiAgent<R> {
|
|||||||
fn step_max(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
fn step_max(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
||||||
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
||||||
CallFnOptions::new().eval_ast(false),
|
CallFnOptions::new().eval_ast(false),
|
||||||
&mut self.scope,
|
&mut Scope::new(),
|
||||||
&self.script,
|
&self.script,
|
||||||
"step_max",
|
"step_max",
|
||||||
(board.clone(),),
|
(board.clone(),),
|
||||||
|
|||||||
@@ -4,9 +4,12 @@ import { join } from "path";
|
|||||||
import { existsSync } from "fs";
|
import { existsSync } from "fs";
|
||||||
import { SAVE_CONFIG } from "@/lib/saveConfig";
|
import { SAVE_CONFIG } from "@/lib/saveConfig";
|
||||||
|
|
||||||
|
// Force dynamic rendering for this API route
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
export async function GET(request: NextRequest) {
|
export async function GET(request: NextRequest) {
|
||||||
try {
|
try {
|
||||||
const { searchParams } = new URL(request.url);
|
const { searchParams } = request.nextUrl;
|
||||||
const name = searchParams.get("name");
|
const name = searchParams.get("name");
|
||||||
|
|
||||||
if (!name) {
|
if (!name) {
|
||||||
@@ -28,7 +31,6 @@ export async function GET(request: NextRequest) {
|
|||||||
const filename = `${name}.rhai`;
|
const filename = `${name}.rhai`;
|
||||||
const filepath = join(saveDir, filename);
|
const filepath = join(saveDir, filename);
|
||||||
|
|
||||||
// Check if file exists
|
|
||||||
if (!existsSync(filepath)) {
|
if (!existsSync(filepath)) {
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
{ error: `Script "${name}" not found` },
|
{ error: `Script "${name}" not found` },
|
||||||
@@ -36,7 +38,6 @@ export async function GET(request: NextRequest) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read and return file content
|
|
||||||
const content = await readFile(filepath, "utf8");
|
const content = await readFile(filepath, "utf8");
|
||||||
|
|
||||||
return NextResponse.json({
|
return NextResponse.json({
|
||||||
|
|||||||
@@ -1,31 +1,40 @@
|
|||||||
import { NextResponse } from "next/server";
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
import { readdir } from "fs/promises";
|
import { readdir } from "fs/promises";
|
||||||
import { join } from "path";
|
|
||||||
import { existsSync } from "fs";
|
import { existsSync } from "fs";
|
||||||
import { SAVE_CONFIG } from "@/lib/saveConfig";
|
import { SAVE_CONFIG } from "@/lib/saveConfig";
|
||||||
|
|
||||||
export async function GET() {
|
// Force dynamic rendering for this API route
|
||||||
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
const headers = {
|
||||||
|
"Cache-Control": "no-store, no-cache, must-revalidate, proxy-revalidate",
|
||||||
|
Pragma: "no-cache",
|
||||||
|
Expires: "0",
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function GET(_request: NextRequest) {
|
||||||
try {
|
try {
|
||||||
const saveDir = SAVE_CONFIG.SAVE_DIRECTORY;
|
const saveDir = SAVE_CONFIG.SAVE_DIRECTORY;
|
||||||
|
|
||||||
// If save directory doesn't exist, return empty array
|
// If save directory doesn't exist, return empty array
|
||||||
if (!existsSync(saveDir)) {
|
if (!existsSync(saveDir)) {
|
||||||
return NextResponse.json({ scripts: [] });
|
return NextResponse.json({ scripts: [] }, { headers });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read directory and filter for .rhai files
|
// Read directory and filter for .rhai files
|
||||||
const files = await readdir(saveDir);
|
const files = await readdir(saveDir);
|
||||||
|
|
||||||
const scripts = files
|
const scripts = files
|
||||||
.filter((file) => file.endsWith(".rhai"))
|
.filter((file) => file.endsWith(".rhai"))
|
||||||
.map((file) => file.replace(".rhai", ""))
|
.map((file) => file.replace(".rhai", ""))
|
||||||
.sort(); // Sort alphabetically
|
.sort(); // Sort alphabetically
|
||||||
|
|
||||||
return NextResponse.json({ scripts });
|
return NextResponse.json({ scripts }, { headers });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("List scripts error:", error);
|
console.error("List scripts error:", error);
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
{ error: "Failed to list scripts" },
|
{ error: "Failed to list scripts" },
|
||||||
{ status: 500 }
|
{ status: 500, headers }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,8 @@ export const Editor = forwardRef<any, EditorProps>(function Editor(
|
|||||||
editorRef.current = null;
|
editorRef.current = null;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}, []); // DO NOT FILL ARRAY
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []); // DO NOT FILL ARRAY - intentionally empty to prevent re-initialization
|
||||||
|
|
||||||
// Update font size when it changes
|
// Update font size when it changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -42,28 +42,6 @@ fn step_max(board) {
|
|||||||
const AGENTS = {
|
const AGENTS = {
|
||||||
// special-cased below
|
// special-cased below
|
||||||
Self: undefined,
|
Self: undefined,
|
||||||
|
|
||||||
Random: `fn random_action(board) {
|
|
||||||
let symb = rand_symb();
|
|
||||||
let pos = rand_int(0, 10);
|
|
||||||
let action = Action(symb, pos);
|
|
||||||
|
|
||||||
while !board.can_play(action) {
|
|
||||||
let symb = rand_symb();
|
|
||||||
let pos = rand_int(0, 10);
|
|
||||||
action = Action(symb, pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
return action;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn step_min(board) {
|
|
||||||
return random_action(board);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn step_max(board) {
|
|
||||||
return random_action(board);
|
|
||||||
}`,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function Playground() {
|
export default function Playground() {
|
||||||
@@ -71,7 +49,7 @@ export default function Playground() {
|
|||||||
const [isEditorReady, setIsEditorReady] = useState(false);
|
const [isEditorReady, setIsEditorReady] = useState(false);
|
||||||
const [fontSize, setFontSize] = useState(14);
|
const [fontSize, setFontSize] = useState(14);
|
||||||
const [bulkRounds, setBulkRounds] = useState(1000);
|
const [bulkRounds, setBulkRounds] = useState(1000);
|
||||||
const [selectedAgent, setSelectedAgent] = useState("Random");
|
const [selectedAgent, setSelectedAgent] = useState("Self");
|
||||||
const [isHelpOpen, setIsHelpOpen] = useState(false);
|
const [isHelpOpen, setIsHelpOpen] = useState(false);
|
||||||
const [scriptName, setScriptName] = useState("");
|
const [scriptName, setScriptName] = useState("");
|
||||||
const [saveSecret, setSaveSecret] = useState("");
|
const [saveSecret, setSaveSecret] = useState("");
|
||||||
@@ -126,10 +104,7 @@ export default function Playground() {
|
|||||||
// Combine hardcoded agents with saved scripts, ensuring Self and Random are first
|
// Combine hardcoded agents with saved scripts, ensuring Self and Random are first
|
||||||
const combinedAgents = [
|
const combinedAgents = [
|
||||||
"Self",
|
"Self",
|
||||||
"Random",
|
...Object.keys(AGENTS).filter((key) => key !== "Self"),
|
||||||
...Object.keys(AGENTS).filter(
|
|
||||||
(key) => key !== "Self" && key !== "Random"
|
|
||||||
),
|
|
||||||
...scripts,
|
...scripts,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -24,14 +24,18 @@ self.onmessage = async (event) => {
|
|||||||
|
|
||||||
if (type === "data") {
|
if (type === "data") {
|
||||||
if (currentGame !== null) {
|
if (currentGame !== null) {
|
||||||
currentGame.take_input(event_data.data);
|
try {
|
||||||
|
currentGame.take_input(event_data.data);
|
||||||
|
|
||||||
if (currentGame.is_error()) {
|
if (currentGame.is_error()) {
|
||||||
currentGame = null;
|
currentGame = null;
|
||||||
self.postMessage({ type: "complete" });
|
self.postMessage({ type: "complete" });
|
||||||
} else if (currentGame.is_done()) {
|
} else if (currentGame.is_done()) {
|
||||||
currentGame = null;
|
currentGame = null;
|
||||||
self.postMessage({ type: "complete" });
|
self.postMessage({ type: "complete" });
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
self.postMessage({ type: "error", error: String(error) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type === "init") {
|
} else if (type === "init") {
|
||||||
|
|||||||
Reference in New Issue
Block a user