From 366f5aec8281b030c31a20ae3ea90f46b872737d Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Sun, 15 Sep 2024 03:11:13 +0200
Subject: [PATCH] fix: update codemp and usage

---
 package.json     |  4 ++--
 src/commands.ts  | 22 ++++++++++++++++------
 src/extension.ts |  1 +
 src/tree.ts      |  4 ++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 5348d3c..48cd60c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "homepage": "https://code.mp",
   "repository": "https://github.com/hexedtech/codemp-vscode",
   "publisher": "hexedtech",
-  "version": "0.0.6",
+  "version": "0.0.10",
   "engines": {
     "vscode": "^1.81.0"
   },
@@ -206,6 +206,6 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "codemp": "^0.0.5"
+    "codemp": "^0.0.10"
   }
 }
diff --git a/src/commands.ts b/src/commands.ts
index 91f7e40..a75dd34 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -12,7 +12,6 @@ let locks : Map<string, boolean> = new Map();
 
 export async function connect() {
 	let config = vscode.workspace.getConfiguration('codemp');
-	let server = config.get<string>("server", "http://code.mp:50053");
 
 	let username = config.get<string>("username");
 	if (!username) {
@@ -23,10 +22,21 @@ export async function connect() {
 	if (!password) {
 		return vscode.window.showErrorMessage("missing password in settings: configure it first!");
 	}
-	vscode.window.showInformationMessage("Connected to codemp");
-	client = await codemp.connect(server, username, password);
-	provider.refresh();
-	listWorkspaces(); // dont await, run in background
+
+	try {
+		client = await codemp.connect({
+			username: username,
+			password: password,
+			host: config.get<string>("server"),
+			port: config.get<number>("port"),
+			tls: config.get<boolean>("tls"),
+		});
+		vscode.window.showInformationMessage("Connected to codemp");
+		provider.refresh();
+		listWorkspaces(); // dont await, run in background
+	} catch (e) {
+		vscode.window.showErrorMessage("could not connect: " + e);
+	}
 }
 
 
@@ -206,7 +216,7 @@ export async function sync(selected: vscode.TreeItem | undefined) {
 
 export async function listBuffers() {
 	if (workspace === null) throw "join a workspace first"
-	let buffers = workspace.filetree();
+	let buffers = workspace.filetree(undefined, false);
 	vscode.window.showInformationMessage(buffers.join("\n"));
 	provider.refresh();
 }
diff --git a/src/extension.ts b/src/extension.ts
index e3b8564..6b04881 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -19,6 +19,7 @@ export function activate(context: vscode.ExtensionContext) {
 		vscode.commands.registerCommand('codemp.connect', commands.connect),
 		vscode.commands.registerCommand('codemp.join', commands.join),
 		vscode.commands.registerCommand('codemp.attach', commands.attach),
+		vscode.commands.registerCommand('codemp.share', commands.share),
 		vscode.commands.registerCommand('codemp.createWorkspace', commands.createWorkspace),
 		vscode.commands.registerCommand('codemp.inviteWorkspace', commands.inviteToWorkspace),
 		vscode.commands.registerCommand('codemp.listWorkspaces', commands.listWorkspaces),
diff --git a/src/tree.ts b/src/tree.ts
index d29b84f..810fc6b 100644
--- a/src/tree.ts
+++ b/src/tree.ts
@@ -27,7 +27,7 @@ export class CodempTreeProvider implements vscode.TreeDataProvider<CodempTreeIte
 						// 	new CodempTreeItem("Buffers", Type.BufferContainer, true),
 						// 	new CodempTreeItem("Users", Type.UserContainer, true)
 						// ];
-						return workspace.filetree().map((x) =>
+						return workspace.filetree(undefined, false).map((x) =>
 							new CodempTreeItem(x, Type.Buffer, false, bufferMapper.bufferToEditorMapping.has(x))
 						);
 					} else {
@@ -35,7 +35,7 @@ export class CodempTreeProvider implements vscode.TreeDataProvider<CodempTreeIte
 					}
 				case Type.BufferContainer:
 					if (workspace === null) { return [] };
-					return workspace.filetree().map((x) =>
+					return workspace.filetree(undefined, false).map((x) =>
 						new CodempTreeItem(x, Type.Buffer, false, bufferMapper.bufferToEditorMapping.has(x))
 					);
 				case Type.UserContainer: