Merge remote-tracking branch 'origin/master' into codex/bark-battle

server-rs/crates/api-server/src/modules/jump_hop.rs

@@ -0,0 +1,76 @@
+use axum::{
+    Router, middleware,
+    routing::{get, post},
+};
+
+use crate::{
+    auth::require_bearer_auth,
+    jump_hop::{
+        create_jump_hop_session, execute_jump_hop_action, get_jump_hop_gallery_detail,
+        get_jump_hop_runtime_work, get_jump_hop_session, jump_hop_run_jump, list_jump_hop_gallery,
+        publish_jump_hop_work, restart_jump_hop_run, start_jump_hop_run,
+    },
+    state::AppState,
+};
+
+pub fn router(state: AppState) -> Router<AppState> {
+    Router::new()
+        .route(
+            "/api/creation/jump-hop/sessions",
+            post(create_jump_hop_session).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/jump-hop/sessions/{session_id}",
+            get(get_jump_hop_session).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/jump-hop/sessions/{session_id}/actions",
+            post(execute_jump_hop_action).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/jump-hop/works/{profile_id}/publish",
+            post(publish_jump_hop_work).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/jump-hop/works/{profile_id}",
+            get(get_jump_hop_runtime_work),
+        )
+        .route(
+            "/api/runtime/jump-hop/runs",
+            post(start_jump_hop_run).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/jump-hop/runs/{run_id}/jump",
+            post(jump_hop_run_jump).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/jump-hop/runs/{run_id}/restart",
+            post(restart_jump_hop_run).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route("/api/runtime/jump-hop/gallery", get(list_jump_hop_gallery))
+        .route(
+            "/api/runtime/jump-hop/gallery/{public_work_code}",
+            get(get_jump_hop_gallery_detail),
+        )
+}

server-rs/crates/api-server/src/modules/puzzle.rs

@@ -1,6 +1,6 @@
 use axum::{
     Router,
-    extract::DefaultBodyLimit,
+    extract::{DefaultBodyLimit, FromRef},
     middleware,
     routing::{get, post},
 };
@@ -17,12 +17,13 @@ use crate::{
         submit_puzzle_agent_message, submit_puzzle_leaderboard, swap_puzzle_pieces,
         update_puzzle_run_pause, use_puzzle_runtime_prop,
     },
-    state::AppState,
+    state::{AppState, PuzzleApiState},
 };
 
 const PUZZLE_REFERENCE_IMAGE_BODY_LIMIT_BYTES: usize = 12 * 1024 * 1024;
 
 pub fn router(state: AppState) -> Router<AppState> {
+    // 中文注释：拼图 handler 只接收 PuzzleApiState，鉴权层仍使用全局 AppState。
     Router::new()
         .route(
             "/api/runtime/puzzle/agent/sessions",
@@ -181,4 +182,6 @@ pub fn router(state: AppState) -> Router<AppState> {
                 require_bearer_auth,
             )),
         )
+        .with_state(PuzzleApiState::from_ref(&state))
+        .with_state(state)
 }