chore: update to new proto

Author: zaaarf

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 = "0e3af02296d33563dde6fe4caf7fd8df237c9357", features = ["client"] }
+codemp-proto = { git = "https://github.com/hexedtech/codemp-proto", rev = "6b45fd7bd7c03ef60234880c59157481def4ca71", features = ["client"] }
 uuid = { version = "1.17", features = ["v4"] }
 tonic = { version = "0.14", features = ["tls-native-roots"] }
 # api

Cargo.toml

@@ -17,28 +17,27 @@ public final class WorkspaceEventKind {
 	 */
 	public static final int USER_LEAVE_WORKSPACE = 2;
 	/**
-	 * Event that occurs when a file is created in a workspace.
+	 * Event that occurs when a user joins a buffer.
 	 */
-	public static final int FILE_CREATE = 3;
+	public static final int USER_JOIN_BUFFER = 3;
 	/**
-	 * Event that occurs when a file is renamed in a workspace.
+	 * Event that occurs when a user leaves a buffer.
 	 */
-	public static final int FILE_RENAME = 4;
+	public static final int USER_LEAVE_BUFFER = 4;
 	/**
-	 * Event that occurs when a file is deleted in a workspace.
+	 * Event that occurs when a buffer is created in a workspace.
 	 */
-	public static final int FILE_DELETE = 5;
+	public static final int BUFFER_CREATE = 5;
 	/**
-	 * Event that occurs when a user joins a buffer.
+	 * Event that occurs when a buffer is renamed in a workspace.
 	 */
-	public static final int USER_JOIN_BUFFER = 6;
+	public static final int BUFFER_RENAME = 6;
 	/**
-	 * Event that occurs when a user leaves a buffer.
+	 * Event that occurs when a buffer is deleted in a workspace.
 	 */
-	public static final int USER_LEAVE_BUFFER = 7;
-
+	public static final int BUFFER_DELETE = 7;
 	/**
 	 * Event that occurs when a buffer has one of its attributes changed.
 	 */
-	public static final int FILE_ATTRS_UPDATED = 8;
+	public static final int BUFFER_ATTRS_UPDATED = 8;
 }

dist/java/src/mp/code/proto/WorkspaceEventKind.java

@@ -11,12 +11,12 @@ local SessionEventKind = {
 local WorkspaceEventKind = {
 	UserJoinWorkspace = 1,
 	UserLeaveWorkspace = 2,
-	FileCreate = 3,
-	FileRename = 4,
-	FileDelete = 5,
-	UserJoinBuffer = 6,
-	UserLeaveBuffer = 7,
-	FileAttrsUpdated = 8,
+	UserJoinBuffer = 3,
+	UserLeaveBuffer = 4,
+	BufferCreate = 5,
+	BufferRename = 6,
+	BufferDelete = 7,
+	BufferAttrsUpdated = 8,
 }
 
 return {

dist/lua/enums.lua

@@ -1,4 +1,4 @@
-use codemp_proto::{common::UserInfo, files::{BufferAttributes, BufferNode}, session::WorkspaceIdentifier, workspace::WorkspaceEvent};
+use codemp_proto::{common::UserInfo, buffer::{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;

src/ffi/js/workspace.rs

@@ -10,7 +10,7 @@ pub use crate::api::{
 
 pub use crate::proto::{
 	common::UserInfo as CodempUserInfo,
-	files::BufferNode as CodempBufferNode, files::BufferAttributes as CodempBufferAttributes,
+	buffer::BufferNode as CodempBufferNode, buffer::BufferAttributes as CodempBufferAttributes,
 	buffer::BufferEvent as CodempBufferEvent,
 	cursor::CursorEvent as CodempCursorEvent, cursor::CursorUpdate as CodempCursorUpdate,
 	cursor::CursorPosition as CodempCursorPosition, cursor::RowCol as CodempRowCol,

src/prelude.rs

@@ -14,8 +14,8 @@ use crate::{
 };
 
 use codemp_proto::{
+	buffer::{BufferAttributes, BufferNode, BufferPath},
 	common::Empty,
-	files::{BufferAttributes, BufferNode, BufferPath},
 	workspace::{WorkspaceEvent, WorkspaceEventKind},
 };
 
@@ -467,7 +467,7 @@ impl WorkspaceWorker {
 								}
 							},
 
-							WorkspaceEventKind::FileCreate => {
+							WorkspaceEventKind::BufferCreate => {
 								if let (Some(path), Some(attributes)) = (event.path, event.attributes) {
 									inner.buffer_users.insert(path.clone(), Vec::new());
 									inner.filetree.insert(path.clone(), BufferNode {
@@ -476,7 +476,7 @@ impl WorkspaceWorker {
 									});
 								}
 							}
-							WorkspaceEventKind::FileRename => {
+							WorkspaceEventKind::BufferRename => {
 								if let (Some(before), Some(after)) = (event.path, event.after) {
 									if let Some((_path, controller)) = inner.buffers.remove(&before) {
 										inner.buffers.insert(after.clone(), controller);
@@ -489,14 +489,14 @@ impl WorkspaceWorker {
 									}
 								}
 							}
-							WorkspaceEventKind::FileDelete => {
+							WorkspaceEventKind::BufferDelete => {
 								if let Some(path) = event.path {
 									inner.filetree.remove(&path);
 									inner.buffer_users.remove(&path);
 									let _ = inner.buffers.remove(&path);
 								}
 							}
-							WorkspaceEventKind::FileAttrsUpdated => {
+							WorkspaceEventKind::BufferAttrsUpdated => {
 								if let (Some(path), Some(attributes)) = (event.path, event.attributes) {
 									if let Some(mut r) = inner.filetree.get_mut(&path) {
 										r.attributes = attributes;