推进 server-rs DDD 分层与新接口接线

server-rs/crates/spacetime-client/src/mapper.rs

@@ -530,16 +530,12 @@ pub(crate) fn map_procedure_result(
     result: AssetObjectProcedureResult,
 ) -> Result<AssetObjectRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let snapshot = result.record.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回对象快照".to_string())
-    })?;
+    let snapshot = result
+        .record
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("对象快照"))?;
 
     Ok(build_asset_object_record(map_snapshot(snapshot)))
 }
@@ -548,16 +544,12 @@ pub(crate) fn map_entity_binding_procedure_result(
     result: AssetEntityBindingProcedureResult,
 ) -> Result<AssetEntityBindingRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let snapshot = result.record.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回绑定快照".to_string())
-    })?;
+    let snapshot = result
+        .record
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("绑定快照"))?;
 
     Ok(build_asset_entity_binding_record(
         map_entity_binding_snapshot(snapshot),
@@ -568,11 +560,7 @@ pub(crate) fn map_asset_history_list_result(
     result: AssetHistoryListResult,
 ) -> Result<Vec<AssetHistoryEntryRecord>, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
     Ok(result
@@ -609,16 +597,12 @@ pub(crate) fn map_auth_store_snapshot_procedure_result(
     result: AuthStoreSnapshotProcedureResult,
 ) -> Result<AuthStoreSnapshotRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let record = result.record.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回认证快照".to_string())
-    })?;
+    let record = result
+        .record
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("认证快照"))?;
 
     Ok(map_auth_store_snapshot_record(record))
 }
@@ -1003,16 +987,12 @@ pub(crate) fn map_ai_task_procedure_result(
     result: AiTaskProcedureResult,
 ) -> Result<AiTaskMutationRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Runtime(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let task = result.task.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回 ai_task 快照".to_string())
-    })?;
+    let task = result
+        .task
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("ai_task 快照"))?;
 
     Ok(AiTaskMutationRecord {
         task: map_ai_task_snapshot(task),
@@ -1344,18 +1324,12 @@ pub(crate) fn map_big_fish_session_procedure_result(
     result: BigFishSessionProcedureResult,
 ) -> Result<BigFishSessionRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let session = result.session.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 big fish session 快照".to_string(),
-        )
-    })?;
+    let session = result
+        .session
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("big fish session 快照"))?;
 
     Ok(map_big_fish_session_snapshot(session))
 }
@@ -1365,18 +1339,12 @@ pub(crate) fn map_big_fish_works_procedure_result(
     fallback_owner_user_id: Option<&str>,
 ) -> Result<Vec<BigFishWorkSummaryRecord>, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let items_json = result.items_json.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 big fish works 快照".to_string(),
-        )
-    })?;
+    let items_json = result
+        .items_json
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("big fish works 快照"))?;
     let items = serde_json::from_str::<Vec<CompatibleBigFishWorkSummaryRecord>>(&items_json)
         .map_err(|error| {
             SpacetimeClientError::Runtime(format!("big fish works items_json 非法: {error}"))
@@ -1392,21 +1360,15 @@ pub(crate) fn map_story_session_procedure_result(
     result: StorySessionProcedureResult,
 ) -> Result<StorySessionResultRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let session = result.session.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 story session 快照".to_string(),
-        )
-    })?;
-    let event = result.event.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回 story event 快照".to_string())
-    })?;
+    let session = result
+        .session
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("story session 快照"))?;
+    let event = result
+        .event
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("story event 快照"))?;
 
     Ok(StorySessionResultRecord {
         session: map_story_session_snapshot(session),
@@ -1418,18 +1380,12 @@ pub(crate) fn map_story_session_state_procedure_result(
     result: StorySessionStateProcedureResult,
 ) -> Result<StorySessionStateRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let session = result.session.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 story session state 快照".to_string(),
-        )
-    })?;
+    let session = result
+        .session
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("story session state 快照"))?;
 
     Ok(StorySessionStateRecord {
         session: map_story_session_snapshot(session),
@@ -1445,18 +1401,12 @@ pub(crate) fn map_runtime_inventory_state_procedure_result(
     result: RuntimeInventoryStateProcedureResult,
 ) -> Result<RuntimeInventoryStateRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let snapshot = result.snapshot.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 runtime inventory state 快照".to_string(),
-        )
-    })?;
+    let snapshot = result
+        .snapshot
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("runtime inventory state 快照"))?;
 
     Ok(build_runtime_inventory_state_record(
         map_runtime_inventory_state_snapshot(snapshot),
@@ -1467,18 +1417,12 @@ pub(crate) fn map_battle_state_procedure_result(
     result: BattleStateProcedureResult,
 ) -> Result<BattleStateRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let snapshot = result.snapshot.ok_or_else(|| {
-        SpacetimeClientError::Procedure(
-            "SpacetimeDB procedure 未返回 battle_state 快照".to_string(),
-        )
-    })?;
+    let snapshot = result
+        .snapshot
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("battle_state 快照"))?;
 
     Ok(build_battle_state_record(map_battle_state_snapshot(
         snapshot,
@@ -1489,16 +1433,12 @@ pub(crate) fn map_resolve_combat_action_procedure_result(
     result: ResolveCombatActionProcedureResult,
 ) -> Result<ResolveCombatActionRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let action_result = result.result.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回战斗结算结果".to_string())
-    })?;
+    let action_result = result
+        .result
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("战斗结算结果"))?;
 
     Ok(build_resolve_combat_action_record(
         map_resolve_combat_action_result(action_result),
@@ -1509,16 +1449,12 @@ pub(crate) fn map_npc_battle_interaction_procedure_result(
     result: NpcBattleInteractionProcedureResult,
 ) -> Result<NpcBattleInteractionRecord, SpacetimeClientError> {
     if !result.ok {
-        return Err(SpacetimeClientError::Procedure(
-            result
-                .error_message
-                .unwrap_or_else(|| "SpacetimeDB procedure 返回未知错误".to_string()),
-        ));
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
     }
 
-    let interaction_result = result.result.ok_or_else(|| {
-        SpacetimeClientError::Procedure("SpacetimeDB procedure 未返回 NPC 开战结果".to_string())
-    })?;
+    let interaction_result = result
+        .result
+        .ok_or_else(|| SpacetimeClientError::missing_snapshot("NPC 开战结果"))?;
 
     Ok(build_npc_battle_interaction_record(
         map_npc_battle_interaction_result(interaction_result),