Merge pull request #576 from dolthub/eric/fix-local-dolt-issues

Fix local dolt server issues

Author: eric-richardson1

web/.gitignore

@@ -51,8 +51,8 @@ yalc.lock
 /build/appx/dolt.exe
 /build/linux/dolt-x64
 /build/linux/dolt-arm64
-/build/databases
+/build/connections
 
 # electron app build
 /app
-dist
+dist

web/main/background.ts

@@ -256,23 +256,17 @@ ipcMain.handle(
     _,
     connectionName: string,
     port: string,
-    databaseName: string,
     init?: boolean,
+    dbName?: string,
   ) => {
     try {
-      console.log(
-        "start-dolt-server",
-        connectionName,
-        port,
-        databaseName,
-        init,
-      );
+      console.log("start-dolt-server", connectionName, port, init, dbName);
       doltServerProcess = await startServer(
         mainWindow,
         connectionName,
         port,
-        databaseName,
         init,
+        dbName,
       );
       if (!doltServerProcess) {
         throw new Error("Failed to start Dolt server");

web/main/doltClone.ts

@@ -4,7 +4,7 @@ import path from "path";
 import { startServerProcess } from "./doltServer";
 import {
   createFolder,
-  getDatabasesPath,
+  getConnectionsPath,
   getDoltPaths,
 } from "./helpers/filePath";
 
@@ -16,11 +16,9 @@ export async function cloneAndStartDatabase(
   port: string,
   mainWindow: BrowserWindow,
 ): Promise<ChildProcess | null> {
-  const dbsFolderPath = getDatabasesPath();
+  const dbsFolderPath = getConnectionsPath();
   const doltPath = getDoltPaths();
   const connectionFolderPath = path.join(dbsFolderPath, connectionName);
-  const dbFolderPath = path.join(connectionFolderPath, newDbName);
-
   try {
     const { errorMsg } = createFolder(path.join(connectionFolderPath));
     if (errorMsg) {
@@ -34,7 +32,12 @@ export async function cloneAndStartDatabase(
       connectionFolderPath,
       mainWindow,
     );
-    return await startServerProcess(doltPath, dbFolderPath, port, mainWindow);
+    return await startServerProcess(
+      doltPath,
+      connectionFolderPath,
+      port,
+      mainWindow,
+    );
   } catch (error) {
     console.error("Failed to clone database:", error);
     throw error;

web/main/doltLogin.ts

@@ -2,7 +2,7 @@ import path from "path";
 import { BrowserWindow, IpcMainInvokeEvent } from "electron";
 import { ChildProcess, execFile } from "child_process";
 import { v4 as randomUUID } from "uuid";
-import { getDatabasesPath, getDoltPaths } from "./helpers/filePath";
+import { getConnectionsPath, getDoltPaths } from "./helpers/filePath";
 
 export async function doltLogin(
   event: IpcMainInvokeEvent,
@@ -12,7 +12,7 @@ export async function doltLogin(
 ): Promise<{ email: string; username: string }> {
   const requestId = randomUUID();
   return new Promise((resolve, reject) => {
-    const dbFolderPath = path.join(getDatabasesPath(), connectionName);
+    const dbFolderPath = path.join(getConnectionsPath(), connectionName);
     const doltPath = getDoltPaths();
 
     // Return the cancellation ID immediately

web/main/doltServer.ts

@@ -4,7 +4,7 @@ import fs from "fs";
 import path from "path";
 import {
   createFolder,
-  getDatabasesPath,
+  getConnectionsPath,
   getDoltPaths,
   getSocketPath,
 } from "./helpers/filePath";
@@ -13,33 +13,33 @@ export async function startServer(
   mainWindow: BrowserWindow,
   connectionName: string,
   port: string,
-  databaseName: string,
   init?: boolean,
+  dbName?: string,
 ): Promise<ChildProcess | null> {
   // Set the path for the database folder
   // In production, it's in the userData directory
   // In development, it's in the build directory since the development userData directory clears its contents every time the app is rerun in dev mode
-  const dbFolderPath = path.join(
-    getDatabasesPath(),
-    connectionName,
-    databaseName,
-  );
+  const connectionPath = path.join(getConnectionsPath(), connectionName);
   const doltPath = getDoltPaths();
-
   try {
     if (init) {
       // Create the folder for the connection
-      const { errorMsg } = createFolder(path.join(dbFolderPath));
+      if (!dbName) {
+        const errorMsg =
+          "Cannot initialize dolt repository without database name";
+        mainWindow.webContents.send("server-error", errorMsg);
+        throw new Error(errorMsg);
+      }
+      const dbConnectionPath = path.join(connectionPath, dbName);
+      const { errorMsg } = createFolder(dbConnectionPath);
       if (errorMsg) {
         mainWindow.webContents.send("server-error", errorMsg);
         throw new Error(errorMsg);
       }
-
       // Initialize and start the server without checking if it's already running
-      await initializeDoltRepository(doltPath, dbFolderPath, mainWindow);
+      await initializeDoltRepository(doltPath, dbConnectionPath, mainWindow);
     }
-
-    return await startServerProcess(doltPath, dbFolderPath, port, mainWindow);
+    return await startServerProcess(doltPath, connectionPath, port, mainWindow);
   } catch (error) {
     console.error("Failed to set up Dolt server:", error);
     throw error;

web/main/helpers/filePath.ts

@@ -4,17 +4,17 @@ import { app } from "electron";
 
 const isProd = process.env.NODE_ENV === "production";
 
-export function getDatabasesPath() {
+export function getConnectionsPath() {
   if (isProd) {
     // Use ~/.local/share for Linux (more persistent than user data folder, which is ~/.config)
     const linuxDbRoot =
       process.platform === "linux"
         ? path.join(app.getPath("home"), ".local", "share", app.getName())
         : app.getPath("userData");
 
-    return path.join(linuxDbRoot, "databases");
+    return path.join(linuxDbRoot, "connections");
   }
-  return path.join(__dirname, "..", "build", "databases");
+  return path.join(__dirname, "..", "build", "connections");
 }
 
 // Returns the path to the Dolt binary based on the platform and environment.

web/main/helpers/removeDoltServerFolder.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { BrowserWindow } from "electron";
 import { rimraf } from "rimraf";
-import { getDatabasesPath } from "./filePath";
+import { getConnectionsPath } from "./filePath";
 
 export function getErrorMessage(error: unknown): string {
   if (error instanceof Error) {
@@ -23,7 +23,7 @@ export async function removeDoltServerFolder(
   mainWindow: BrowserWindow,
   retries = 3,
 ): Promise<ErrorReturnType> {
-  const dbFolderPath = path.join(getDatabasesPath(), connectionName);
+  const dbFolderPath = path.join(getConnectionsPath(), connectionName);
   for (let i = 0; i < retries; i++) {
     try {
       if (process.platform === "darwin") {

web/renderer/components/pageComponents/ConnectionsPage/NewConnection/context/config.tsx

@@ -104,8 +104,8 @@ export function ConfigProvider({ children }: Props) {
         "start-dolt-server",
         state.name.trim(),
         state.port,
-        state.database,
         !state.cloneDolt,
+        state.database,
       );
 
       if (result !== "success") {