feat: BufferAttributes (and event)

Author: alemidev

Cargo.lock

@@ -31,7 +31,7 @@ thiserror = "2.0"
 # crdt
 diamond-types = "1.0"
 # proto
-codemp-proto = { git = "https://github.com/hexedtech/codemp-proto", rev = "29fb391b4857ac2e3bd2f60ddebcc79494c77953", features = ["client"] }
+codemp-proto = { git = "https://github.com/hexedtech/codemp-proto", rev = "0e3af02296d33563dde6fe4caf7fd8df237c9357", features = ["client"] }
 uuid = { version = "1.17", features = ["v4"] }
 tonic = { version = "0.14", features = ["tls-native-roots"] }
 # api

Cargo.toml

@@ -362,10 +362,14 @@ function Client:callback(cb) end
 ---@field user string username of workspace owner
 ---@field workspace string workspace name
 
+---@class BufferAttributes
+---attributes and properties of a buffer
+---@field ephemeral boolean wheter this buffer is ephemeral
+
 ---@class BufferNode
 ---represents a buffer and holds wheter it is ephemeral
 ---@field path string buffer path
----@field ephemeral boolean wheter this buffer is ephemeral
+---@field attributes BufferAttributes attributes of this buffer
 
 
 

dist/lua/annotations.lua

@@ -16,6 +16,7 @@ local WorkspaceEventKind = {
 	FileDelete = 5,
 	UserJoinBuffer = 6,
 	UserLeaveBuffer = 7,
+	FileAttrsUpdated = 8,
 }
 
 return {

dist/lua/enums.lua

@@ -4,7 +4,7 @@ use crate::{
 	errors::{ConnectionError, ControllerError, RemoteError},
 	proto::{common::UserInfo, session::WorkspaceIdentifier, workspace::WorkspaceEvent}
 };
-use codemp_proto::files::BufferNode;
+use codemp_proto::files::{BufferAttributes, BufferNode};
 use jni::{Env, objects::JObject};
 use jni_toolbox::jni;
 
@@ -46,8 +46,8 @@ fn user_list(workspace: &mut Workspace) -> Vec<UserInfo> {
 
 /// Create a new buffer.
 #[jni(package = "mp.code", class = "Workspace")]
-fn create_buffer(workspace: &mut Workspace, path: String, ephemeral: bool) -> Result<(), RemoteError> {
-	super::tokio().block_on(workspace.create_buffer(path, ephemeral))
+fn create_buffer(workspace: &mut Workspace, path: String, attributes: Option<BufferAttributes>) -> Result<(), RemoteError> {
+	super::tokio().block_on(workspace.create_buffer(path, attributes))
 }
 
 /// Pins an ephemeral buffer.

src/ffi/java/workspace.rs

@@ -1,4 +1,4 @@
-use codemp_proto::{common::UserInfo, files::BufferNode, session::WorkspaceIdentifier, workspace::WorkspaceEvent};
+use codemp_proto::{common::UserInfo, files::{BufferAttributes, BufferNode}, session::WorkspaceIdentifier, workspace::WorkspaceEvent};
 use crate::{api::AsyncReceiver, buffer::controller::BufferController, cursor::controller::CursorController};
 use napi::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};
 use napi_derive::napi;
@@ -45,8 +45,8 @@ impl Workspace {
 
 	/// Create a new buffer in the current workspace
 	#[napi(js_name = "createBuffer")]
-	pub async fn js_create_buffer(&self, path: String, ephemeral: bool) -> napi::Result<()> {
-		Ok(self.create_buffer(&path, ephemeral).await?)
+	pub async fn js_create_buffer(&self, path: String, attributes: Option<BufferAttributes>) -> napi::Result<()> {
+		Ok(self.create_buffer(&path, attributes).await?)
 	}
 
 	/// Attach to a workspace buffer, starting a BufferController

src/ffi/js/workspace.rs

@@ -10,7 +10,7 @@ impl LuaUserData for CodempWorkspace {
 		});
 		methods.add_method(
 			"create_buffer",
-			|_, this, (name, ephemeral): (String, bool)| a_sync! { this => this.create_buffer(name, ephemeral).await? },
+			|_, this, (name, attrs): (String, Option<CodempBufferAttributes>)| a_sync! { this => this.create_buffer(name, attrs).await? },
 		);
 
 		methods.add_method("pin_buffer", |_, this, (path,): (String,)| {

src/ffi/lua/workspace.rs

@@ -9,9 +9,9 @@ use super::a_sync_detach;
 impl CodempWorkspace {
 	// join a workspace
 	#[pyo3(name = "create_buffer")]
-	fn pycreate_buffer(&self, py: Python, path: String, ephemeral: bool) -> PyResult<Promise> {
+	fn pycreate_buffer(&self, py: Python, path: String, attrs: Option<CodempBufferAttributes>) -> PyResult<Promise> {
 		let this = self.clone();
-		a_sync_detach!(py, this.create_buffer(path.as_str(), ephemeral).await)
+		a_sync_detach!(py, this.create_buffer(path.as_str(), attrs).await)
 	}
 
 	#[pyo3(name = "pin_buffer")]

src/ffi/python/workspace.rs

@@ -9,11 +9,13 @@ pub use crate::api::{
 };
 
 pub use crate::proto::{
-	files::BufferNode as CodempBufferNode, buffer::BufferEvent as CodempBufferEvent,
+	common::UserInfo as CodempUserInfo,
+	files::BufferNode as CodempBufferNode, files::BufferAttributes as CodempBufferAttributes,
+	buffer::BufferEvent as CodempBufferEvent,
 	cursor::CursorEvent as CodempCursorEvent, cursor::CursorUpdate as CodempCursorUpdate,
 	cursor::CursorPosition as CodempCursorPosition, cursor::RowCol as CodempRowCol,
-	session::SessionEvent as CodempSessionEvent, workspace::WorkspaceEvent as CodempWorkspaceEvent,
-	session::WorkspaceIdentifier as CodempWorkspaceIdentifier, common::UserInfo as CodempUserInfo,
+	session::SessionEvent as CodempSessionEvent, session::WorkspaceIdentifier as CodempWorkspaceIdentifier,
+	workspace::WorkspaceEvent as CodempWorkspaceEvent,
 };
 
 pub use crate::{

src/prelude.rs

@@ -15,7 +15,7 @@ use crate::{
 
 use codemp_proto::{
 	common::Empty,
-	files::{BufferNode, BufferPath},
+	files::{BufferAttributes, BufferNode, BufferPath},
 	workspace::{WorkspaceEvent, WorkspaceEventKind},
 };
 
@@ -48,7 +48,7 @@ pub(crate) struct WorkspaceInner {
 	cursor: cursor::Controller,
 	buffers: DashMap<String, buffer::Controller>,
 	services: Services,
-	filetree: DashMap<String, crate::proto::files::BufferNode>,
+	filetree: DashMap<String, BufferNode>,
 	buffer_users: DashMap<String, Vec<String>>,
 	users: Arc<DashMap<String, codemp_proto::common::UserInfo>>,
 	events: tokio::sync::Mutex<mpsc::UnboundedReceiver<WorkspaceEvent>>,
@@ -158,22 +158,23 @@ impl Workspace {
 	}
 
 	/// Create a new buffer in the current workspace.
-	pub async fn create_buffer(&self, path: impl ToString, ephemeral: bool) -> RemoteResult<()> {
+	pub async fn create_buffer(&self, path: impl ToString, attributes: Option<BufferAttributes>) -> RemoteResult<()> {
 		let mut workspace_client = self.0.services.ws();
 		let path = path.to_string();
+		let attributes = attributes.unwrap_or_default();
 		workspace_client
 			.create_buffer(tonic::Request::new(BufferNode {
-				path: crate::proto::files::BufferPath::from(&path),
-				ephemeral,
+				path: BufferPath::from(&path),
+				attributes,
 			}))
 			.await?;
 
 		// add to filetree, not really necessary as we will get an event for it
 		self.0.filetree.insert(
 			path.clone(),
-			crate::proto::files::BufferNode {
-				path: crate::proto::files::BufferPath::from(&path),
-				ephemeral,
+			BufferNode {
+				path: BufferPath::from(&path),
+				attributes,
 			},
 		);
 
@@ -467,11 +468,11 @@ impl WorkspaceWorker {
 							},
 
 							WorkspaceEventKind::FileCreate => {
-								if let (Some(path), Some(ephemeral)) = (event.path, event.ephemeral) {
+								if let (Some(path), Some(attributes)) = (event.path, event.attributes) {
 									inner.buffer_users.insert(path.clone(), Vec::new());
-									inner.filetree.insert(path.clone(), crate::proto::files::BufferNode {
-										path: crate::proto::files::BufferPath::from(&path),
-										ephemeral
+									inner.filetree.insert(path.clone(), BufferNode {
+										path: BufferPath::from(&path),
+										attributes
 									});
 								}
 							}
@@ -495,6 +496,14 @@ impl WorkspaceWorker {
 									let _ = inner.buffers.remove(&path);
 								}
 							}
+							WorkspaceEventKind::FileAttrsUpdated => {
+								if let (Some(path), Some(attributes)) = (event.path, event.attributes) {
+									if let Some(mut r) = inner.filetree.get_mut(&path) {
+										r.attributes = attributes;
+									}
+								}
+							}
+
 						}
 
 						if self.events.send(_event).is_err() {