Merge branch 'codex/backend-rewrite-spacetimedb' of http://82.157.175.59:3000/GenarrativeAI/Genarrative into codex/backend-rewrite-spacetimedb

server-rs/crates/module-custom-world/src/lib.rs

@@ -140,6 +140,7 @@ pub enum CustomWorldFieldError {
     MissingProfileId,
     MissingSessionId,
     MissingOwnerUserId,
+    MissingAction,
     MissingWorldName,
     MissingDraftProfileJson,
     MissingProfilePayloadJson,
@@ -153,7 +154,6 @@ pub enum CustomWorldFieldError {
     MissingMessageText,
     MissingOperationId,
     MissingPhaseLabel,
-    MissingAction,
     InvalidProgressPercent,
     MissingCardId,
     MissingCardTitle,
@@ -228,6 +228,61 @@ pub struct CustomWorldGalleryListResult {
     pub error_message: Option<String>,
 }
 
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldPublishBlockerSnapshot {
+    pub blocker_id: String,
+    pub code: String,
+    pub message: String,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldPublishGateSnapshot {
+    pub profile_id: String,
+    pub blockers: Vec<CustomWorldPublishBlockerSnapshot>,
+    pub blocker_count: u32,
+    pub publish_ready: bool,
+    pub can_enter_world: bool,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldWorkSummarySnapshot {
+    pub work_id: String,
+    pub source_type: String,
+    pub status: String,
+    pub title: String,
+    pub subtitle: String,
+    pub summary: String,
+    pub cover_image_src: Option<String>,
+    pub cover_render_mode: Option<String>,
+    pub cover_character_image_srcs_json: String,
+    pub updated_at_micros: i64,
+    pub published_at_micros: Option<i64>,
+    pub stage: Option<RpgAgentStage>,
+    pub stage_label: Option<String>,
+    pub playable_npc_count: u32,
+    pub landmark_count: u32,
+    pub role_visual_ready_count: Option<u32>,
+    pub role_animation_ready_count: Option<u32>,
+    pub role_asset_summary_label: Option<String>,
+    pub session_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub can_resume: bool,
+    pub can_enter_world: bool,
+    pub blocker_count: u32,
+    pub publish_ready: bool,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldWorksListResult {
+    pub ok: bool,
+    pub items: Vec<CustomWorldWorkSummarySnapshot>,
+    pub error_message: Option<String>,
+}
+
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CustomWorldAgentMessageSnapshot {
@@ -274,6 +329,38 @@ pub struct CustomWorldDraftCardSnapshot {
     pub updated_at_micros: i64,
 }
 
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldDraftCardDetailSectionSnapshot {
+    pub section_id: String,
+    pub label: String,
+    pub value: String,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldDraftCardDetailSnapshot {
+    pub card_id: String,
+    pub kind: RpgAgentDraftCardKind,
+    pub title: String,
+    pub sections: Vec<CustomWorldDraftCardDetailSectionSnapshot>,
+    pub linked_ids_json: String,
+    pub locked: bool,
+    pub editable: bool,
+    pub editable_section_ids_json: String,
+    pub warning_messages_json: String,
+    pub asset_status: Option<CustomWorldRoleAssetStatus>,
+    pub asset_status_label: Option<String>,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldDraftCardDetailResult {
+    pub ok: bool,
+    pub card: Option<CustomWorldDraftCardDetailSnapshot>,
+    pub error_message: Option<String>,
+}
+
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CustomWorldAgentSessionSnapshot {
@@ -434,61 +521,6 @@ pub struct CustomWorldWorksListInput {
     pub owner_user_id: String,
 }
 
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldPublishBlockerSnapshot {
-    pub blocker_id: String,
-    pub code: String,
-    pub message: String,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldPublishGateSnapshot {
-    pub profile_id: String,
-    pub blockers: Vec<CustomWorldPublishBlockerSnapshot>,
-    pub blocker_count: u32,
-    pub publish_ready: bool,
-    pub can_enter_world: bool,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldWorkSummarySnapshot {
-    pub work_id: String,
-    pub source_type: String,
-    pub status: String,
-    pub title: String,
-    pub subtitle: String,
-    pub summary: String,
-    pub cover_image_src: Option<String>,
-    pub cover_render_mode: Option<String>,
-    pub cover_character_image_srcs_json: String,
-    pub updated_at_micros: i64,
-    pub published_at_micros: Option<i64>,
-    pub stage: Option<RpgAgentStage>,
-    pub stage_label: Option<String>,
-    pub playable_npc_count: u32,
-    pub landmark_count: u32,
-    pub role_visual_ready_count: Option<u32>,
-    pub role_animation_ready_count: Option<u32>,
-    pub role_asset_summary_label: Option<String>,
-    pub session_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub can_resume: bool,
-    pub can_enter_world: bool,
-    pub blocker_count: u32,
-    pub publish_ready: bool,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldWorksListResult {
-    pub ok: bool,
-    pub items: Vec<CustomWorldWorkSummarySnapshot>,
-    pub error_message: Option<String>,
-}
-
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CustomWorldAgentCardDetailGetInput {
@@ -497,38 +529,6 @@ pub struct CustomWorldAgentCardDetailGetInput {
     pub card_id: String,
 }
 
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldDraftCardDetailSectionSnapshot {
-    pub section_id: String,
-    pub label: String,
-    pub value: String,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldDraftCardDetailSnapshot {
-    pub card_id: String,
-    pub kind: RpgAgentDraftCardKind,
-    pub title: String,
-    pub sections: Vec<CustomWorldDraftCardDetailSectionSnapshot>,
-    pub linked_ids_json: String,
-    pub locked: bool,
-    pub editable: bool,
-    pub editable_section_ids_json: String,
-    pub warning_messages_json: String,
-    pub asset_status: Option<CustomWorldRoleAssetStatus>,
-    pub asset_status_label: Option<String>,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CustomWorldDraftCardDetailResult {
-    pub ok: bool,
-    pub card: Option<CustomWorldDraftCardDetailSnapshot>,
-    pub error_message: Option<String>,
-}
-
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CustomWorldAgentActionExecuteInput {
@@ -1101,11 +1101,7 @@ pub fn validate_custom_world_agent_action_execute_input(
     if input.action.trim().is_empty() {
         return Err(CustomWorldFieldError::MissingAction);
     }
-    if let Some(payload_json) = input.payload_json.as_deref() {
-        if !payload_json.trim().is_empty() {
-            ensure_json_object(payload_json)?;
-        }
-    }
+    ensure_optional_json_object(input.payload_json.as_deref())?;
 
     Ok(())
 }
@@ -1459,6 +1455,7 @@ impl fmt::Display for CustomWorldFieldError {
             Self::MissingProfileId => f.write_str("custom_world.profile_id 不能为空"),
             Self::MissingSessionId => f.write_str("custom_world.session_id 不能为空"),
             Self::MissingOwnerUserId => f.write_str("custom_world.owner_user_id 不能为空"),
+            Self::MissingAction => f.write_str("custom_world_agent_action.action 不能为空"),
             Self::MissingWorldName => f.write_str("custom_world.world_name 不能为空"),
             Self::MissingDraftProfileJson => {
                 f.write_str("custom_world.compile.draft_profile_json 不能为空")
@@ -1490,7 +1487,6 @@ impl fmt::Display for CustomWorldFieldError {
             Self::MissingPhaseLabel => {
                 f.write_str("custom_world_agent_operation.phase_label 不能为空")
             }
-            Self::MissingAction => f.write_str("custom_world_agent_action.action 不能为空"),
             Self::InvalidProgressPercent => f.write_str("progress 必须位于 0~100"),
             Self::MissingCardId => f.write_str("custom_world_draft_card.card_id 不能为空"),
             Self::MissingCardTitle => f.write_str("custom_world_draft_card.title 不能为空"),