|
3 | 3 | //! |
4 | 4 | //! Typed gRPC RPCs: register_tree_view_provider, get_tree_children. |
5 | 5 |
|
6 | | -use serde_json::json; |
| 6 | +use serde_json::{Value, json}; |
7 | 7 | use tauri::Emitter; |
8 | 8 | use tonic::{Response, Status}; |
9 | 9 | use CommonLibrary::{IPC::SkyEvent::SkyEvent, LanguageFeature::DTO::ProviderType::ProviderType}; |
10 | 10 |
|
11 | 11 | use super::CocoonServiceImpl; |
12 | 12 | use crate::{ |
13 | 13 | ApplicationState::DTO::ProviderRegistrationDTO::ProviderRegistrationDTO, |
14 | | - Vine::Generated::{Empty, GetTreeChildrenRequest, GetTreeChildrenResponse, RegisterTreeViewProviderRequest}, |
| 14 | + Vine::{ |
| 15 | + Client::SendRequest, |
| 16 | + Generated::{Empty, GetTreeChildrenRequest, GetTreeChildrenResponse, RegisterTreeViewProviderRequest, TreeItem}, |
| 17 | + }, |
15 | 18 | dev_log, |
16 | 19 | }; |
17 | 20 |
|
| 21 | +/// Matches the viewId-derived handle used by `RegisterTreeViewProvider`. |
| 22 | +fn ViewIdHandle(ViewId:&str) -> u32 { |
| 23 | + ViewId |
| 24 | + .as_bytes() |
| 25 | + .iter() |
| 26 | + .fold(0u32, |Acc, B| Acc.wrapping_mul(31).wrapping_add(*B as u32)) |
| 27 | +} |
| 28 | + |
18 | 29 | pub async fn RegisterTreeViewProvider( |
19 | 30 | Service:&CocoonServiceImpl, |
20 | 31 | req:RegisterTreeViewProviderRequest, |
@@ -59,16 +70,82 @@ pub async fn GetTreeChildren( |
59 | 70 | req:GetTreeChildrenRequest, |
60 | 71 | ) -> Result<Response<GetTreeChildrenResponse>, Status> { |
61 | 72 | dev_log!("cocoon", "[CocoonService] get_tree_children: view={}", req.view_id); |
| 73 | + |
| 74 | + let Handle = ViewIdHandle(&req.view_id); |
| 75 | + let Provider = Service |
| 76 | + .environment |
| 77 | + .ApplicationState |
| 78 | + .Extension |
| 79 | + .ProviderRegistration |
| 80 | + .GetProvider(Handle); |
| 81 | + |
| 82 | + if Provider.is_none() { |
| 83 | + dev_log!( |
| 84 | + "tree-view", |
| 85 | + "[TreeView] get-children view={} parent_handle={} - no provider registered", |
| 86 | + req.view_id, |
| 87 | + req.tree_item_handle |
| 88 | + ); |
| 89 | + return Ok(Response::new(GetTreeChildrenResponse { items:Vec::new() })); |
| 90 | + } |
| 91 | + |
62 | 92 | dev_log!( |
63 | 93 | "tree-view", |
64 | | - "[TreeView] get-children view={} parent_handle={} - STUB returns empty (Mountain→Cocoon round-trip not wired)", |
| 94 | + "[TreeView] get-children view={} parent_handle={} - forwarding to Cocoon $provideTreeChildren", |
65 | 95 | req.view_id, |
66 | 96 | req.tree_item_handle |
67 | 97 | ); |
68 | 98 |
|
69 | | - // Tree children are fetched by forwarding to Cocoon via the generic RPC path. |
70 | | - // The extension registers a TreeDataProvider; when Sky needs children, |
71 | | - // Mountain looks up the provider handle and invokes Cocoon. |
72 | | - // For now return empty - will be wired when Cocoon activation is complete. |
73 | | - Ok(Response::new(GetTreeChildrenResponse { items:Vec::new() })) |
| 99 | + // Round-trip to the Cocoon-side TreeDataProvider. The sidecar identifier |
| 100 | + // mirrors the one `RegisterTreeViewProvider` stored. The handler key |
| 101 | + // `$provideTreeChildren` is the VS Code ext-host shim name the shim layer |
| 102 | + // dispatches on; see |
| 103 | + // `Cocoon/Source/Service/ExtensionHostHandler/TreeView.ts` (added in the |
| 104 | + // same batch). |
| 105 | + let Parameters = json!({ |
| 106 | + "viewId": req.view_id, |
| 107 | + "treeItemHandle": req.tree_item_handle, |
| 108 | + "handle": Handle, |
| 109 | + }); |
| 110 | + |
| 111 | + // 5s default - TreeDataProvider.getChildren can walk FS for folder views, |
| 112 | + // but should never block a UI thread forever. Longer waits fall through |
| 113 | + // to an empty result (consumer can re-request when the view is focused). |
| 114 | + let Response_ = match SendRequest("cocoon-main", "$provideTreeChildren".to_string(), Parameters, 5000).await { |
| 115 | + Ok(Value_) => Value_, |
| 116 | + Err(Error) => { |
| 117 | + dev_log!( |
| 118 | + "tree-view", |
| 119 | + "[TreeView] get-children view={} error forwarding to Cocoon: {:?}", |
| 120 | + req.view_id, |
| 121 | + Error |
| 122 | + ); |
| 123 | + return Ok(Response::new(GetTreeChildrenResponse { items:Vec::new() })); |
| 124 | + }, |
| 125 | + }; |
| 126 | + |
| 127 | + let Items = Response_ |
| 128 | + .get("items") |
| 129 | + .and_then(Value::as_array) |
| 130 | + .cloned() |
| 131 | + .unwrap_or_default() |
| 132 | + .into_iter() |
| 133 | + .map(|Item| { |
| 134 | + let Handle = Item.get("handle").and_then(Value::as_str).unwrap_or("").to_string(); |
| 135 | + let Label = Item.get("label").and_then(Value::as_str).unwrap_or("").to_string(); |
| 136 | + let IsCollapsed = Item.get("isCollapsed").and_then(Value::as_bool).unwrap_or(false); |
| 137 | + let Icon = Item.get("icon").and_then(Value::as_str).unwrap_or("").to_string(); |
| 138 | + TreeItem { handle:Handle, label:Label, is_collapsed:IsCollapsed, icon:Icon } |
| 139 | + }) |
| 140 | + .collect::<Vec<TreeItem>>(); |
| 141 | + |
| 142 | + dev_log!( |
| 143 | + "tree-view", |
| 144 | + "[TreeView] get-children view={} parent_handle={} children={}", |
| 145 | + req.view_id, |
| 146 | + req.tree_item_handle, |
| 147 | + Items.len() |
| 148 | + ); |
| 149 | + |
| 150 | + Ok(Response::new(GetTreeChildrenResponse { items:Items })) |
74 | 151 | } |
0 commit comments