Merge remote-tracking branch 'origin/master' into codex/tiaoyitiao

# Conflicts:
#	server-rs/crates/api-server/src/jump_hop.rs
#	server-rs/crates/api-server/src/modules/jump_hop.rs

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

@@ -1,15 +1,15 @@
 use axum::{
     Router, middleware,
-    routing::{get, post},
+    routing::{delete, get, post},
 };
 
 use crate::{
     auth::require_bearer_auth,
     bark_battle::{
-        create_bark_battle_draft, finish_bark_battle_run, generate_bark_battle_image_asset,
-        get_bark_battle_run, get_bark_battle_runtime_config, list_bark_battle_gallery,
-        list_bark_battle_works, publish_bark_battle_work, start_bark_battle_run,
-        update_bark_battle_draft_config,
+        create_bark_battle_draft, delete_bark_battle_work, finish_bark_battle_run,
+        generate_bark_battle_image_asset, get_bark_battle_run, get_bark_battle_runtime_config,
+        list_bark_battle_gallery, list_bark_battle_works, publish_bark_battle_work,
+        start_bark_battle_run, update_bark_battle_draft_config,
     },
     state::AppState,
 };
@@ -51,6 +51,13 @@ pub fn router(state: AppState) -> Router<AppState> {
                 require_bearer_auth,
             )),
         )
+        .route(
+            "/api/runtime/bark-battle/works/{work_id}",
+            delete(delete_bark_battle_work).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
         .route(
             "/api/runtime/bark-battle/gallery",
             get(list_bark_battle_gallery),

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

@@ -1,16 +1,17 @@
 use axum::{
-    Router, middleware,
+    middleware,
     routing::{get, post},
+    Router,
 };
 
 use crate::{
     auth::{require_bearer_auth, require_runtime_principal_auth},
     jump_hop::{
-        create_jump_hop_session, execute_jump_hop_action, get_jump_hop_gallery_detail,
-        get_jump_hop_leaderboard, get_jump_hop_runtime_work, get_jump_hop_session,
-        get_jump_hop_work_detail,
-        jump_hop_run_jump, list_jump_hop_gallery, list_jump_hop_works, publish_jump_hop_work,
-        restart_jump_hop_run, start_jump_hop_run,
+        create_jump_hop_session, delete_jump_hop_work, execute_jump_hop_action,
+        get_jump_hop_gallery_detail, get_jump_hop_leaderboard, get_jump_hop_runtime_work,
+        get_jump_hop_session, get_jump_hop_work_detail, jump_hop_run_jump,
+        list_jump_hop_gallery, list_jump_hop_works, publish_jump_hop_work, restart_jump_hop_run,
+        start_jump_hop_run,
     },
     state::AppState,
 };
@@ -47,10 +48,12 @@ pub fn router(state: AppState) -> Router<AppState> {
         )
         .route(
             "/api/creation/jump-hop/works/{profile_id}",
-            get(get_jump_hop_work_detail).route_layer(middleware::from_fn_with_state(
-                state.clone(),
-                require_bearer_auth,
-            )),
+            get(get_jump_hop_work_detail)
+                .delete(delete_jump_hop_work)
+                .route_layer(middleware::from_fn_with_state(
+                    state.clone(),
+                    require_bearer_auth,
+                )),
         )
         .route(
             "/api/creation/jump-hop/works/{profile_id}/publish",

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

@@ -0,0 +1,116 @@
+use axum::{
+    Router, middleware,
+    routing::{get, post},
+};
+
+use crate::{
+    auth::{require_bearer_auth, require_runtime_principal_auth},
+    puzzle_clear::{
+        advance_puzzle_clear_next_level, create_puzzle_clear_session, execute_puzzle_clear_action,
+        get_puzzle_clear_gallery_detail, get_puzzle_clear_run, get_puzzle_clear_runtime_work,
+        get_puzzle_clear_session, get_puzzle_clear_work, list_puzzle_clear_gallery,
+        list_puzzle_clear_works, mark_puzzle_clear_level_time_up, publish_puzzle_clear_work,
+        retry_puzzle_clear_level, start_puzzle_clear_run, swap_puzzle_clear_cards,
+    },
+    state::AppState,
+};
+
+pub fn router(state: AppState) -> Router<AppState> {
+    Router::new()
+        .route(
+            "/api/creation/puzzle-clear/sessions",
+            post(create_puzzle_clear_session).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/puzzle-clear/sessions/{session_id}",
+            get(get_puzzle_clear_session).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/puzzle-clear/sessions/{session_id}/actions",
+            post(execute_puzzle_clear_action).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/puzzle-clear/works",
+            get(list_puzzle_clear_works).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/puzzle-clear/works/{profile_id}",
+            get(get_puzzle_clear_work).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/creation/puzzle-clear/works/{profile_id}/publish",
+            post(publish_puzzle_clear_work).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/works/{profile_id}",
+            get(get_puzzle_clear_runtime_work),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs",
+            post(start_puzzle_clear_run).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs/{run_id}",
+            get(get_puzzle_clear_run).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs/{run_id}/swap",
+            post(swap_puzzle_clear_cards).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs/{run_id}/retry-level",
+            post(retry_puzzle_clear_level).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs/{run_id}/next-level",
+            post(advance_puzzle_clear_next_level).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/runs/{run_id}/time-up",
+            post(mark_puzzle_clear_level_time_up).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_runtime_principal_auth,
+            )),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/gallery",
+            get(list_puzzle_clear_gallery),
+        )
+        .route(
+            "/api/runtime/puzzle-clear/gallery/{public_work_code}",
+            get(get_puzzle_clear_gallery_detail),
+        )
+}

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

@@ -1,16 +1,16 @@
 use axum::{
     Router, middleware,
-    routing::{get, post},
+    routing::{delete, get, post},
 };
 
 use crate::{
     auth::{require_bearer_auth, require_runtime_principal_auth},
     state::AppState,
     wooden_fish::{
-        checkpoint_wooden_fish_run, create_wooden_fish_session, execute_wooden_fish_action,
-        finish_wooden_fish_run, get_wooden_fish_gallery_detail, get_wooden_fish_runtime_work,
-        get_wooden_fish_session, list_wooden_fish_gallery, list_wooden_fish_works,
-        publish_wooden_fish_work, start_wooden_fish_run,
+        checkpoint_wooden_fish_run, create_wooden_fish_session, delete_wooden_fish_work,
+        execute_wooden_fish_action, finish_wooden_fish_run, get_wooden_fish_gallery_detail,
+        get_wooden_fish_runtime_work, get_wooden_fish_session, list_wooden_fish_gallery,
+        list_wooden_fish_works, publish_wooden_fish_work, start_wooden_fish_run,
     },
 };
 
@@ -44,6 +44,13 @@ pub fn router(state: AppState) -> Router<AppState> {
                 require_bearer_auth,
             )),
         )
+        .route(
+            "/api/creation/wooden-fish/works/{profile_id}",
+            delete(delete_wooden_fish_work).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
         .route(
             "/api/creation/wooden-fish/works/{profile_id}/publish",
             post(publish_wooden_fish_work).route_layer(middleware::from_fn_with_state(