Liuliu/windows build

build/mac/entitlements.inherit.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>com.apple.security.cs.allow-jit</key>
+  <true/>
+  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+  <true/>
+  <key>com.apple.security.cs.disable-library-validation</key>
+  <true/>
+</dict>
+</plist>

build/mac/entitlements.mas.inherit.plist

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+
+  </dict>
+</plist>

build/mac/entitlements.mas.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.application-groups</key>
+    <array>
+      <string>FK9YU86WZ5.com.dolthub.dolt-workbench</string>
+    </array>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+  	<true/>
+  </dict>
+</plist>

build/mac/entitlements.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>

graphql-server/src/fileStore/fileStore.service.ts

@@ -1,9 +1,12 @@
 import { Injectable } from "@nestjs/common";
 import * as fs from "fs";
-import { resolve } from "path";
+import path, { resolve } from "path";
 import { DatabaseConnection } from "../databases/database.model";
 
-const storePath = resolve(__dirname, "../../store/store.json");
+const storePath =
+  process.env.NEXT_PUBLIC_FOR_ELECTRON === "true"
+    ? path.join(process.env.NEXT_PUBLIC_USER_DATA_PATH || "", "store.json")
+    : resolve(__dirname, "../../store/store.json");
 
 @Injectable()
 export class FileStoreService {
@@ -37,8 +40,11 @@ export class FileStoreService {
     }
 
     store.push(item);
-
-    if (!fs.existsSync(resolve(__dirname, "../../store"))) {
+    if (process.env.NEXT_PUBLIC_FOR_ELECTRON === "true") {
+      if (!fs.existsSync(process.env.NEXT_PUBLIC_USER_DATA_PATH || "")) {
+        fs.mkdirSync(process.env.NEXT_PUBLIC_USER_DATA_PATH || "");
+      }
+    } else if (!fs.existsSync(resolve(__dirname, "../../store"))) {
       fs.mkdirSync(resolve(__dirname, "../../store"));
     }
 

main/background.ts

@@ -19,6 +19,7 @@ const schemaPath = isProd
   : "graphql-server/schema.gql";
 process.env.SCHEMA_PATH = schemaPath;
 process.env.NEXT_PUBLIC_FOR_ELECTRON = "true";
+process.env.NEXT_PUBLIC_USER_DATA_PATH = userDataPath;
 
 if (isProd) {
   serve({ directory: "app" });
@@ -70,36 +71,52 @@ async function isGraphQLServerReady(url: string): Promise<boolean> {
     });
     return response.ok;
   } catch (error) {
-    console.error("Error pinging GraphQL server:", error);
+    console.error("GraphQL server is not ready:", error);
     return false;
   }
 }
 
 async function waitForGraphQLServer(
   url: string,
-  timeout: number = 30000,
+  timeout: number = 50000,
 ): Promise<void> {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
-    const isReady = await isGraphQLServerReady(url);
-    if (isReady) {
+    if (await isGraphQLServerReady(url)) {
       return;
     }
     await new Promise((resolve) => setTimeout(resolve, 1000));
   }
-  throw new Error("Timed out starting GraphQL server");
+  throw new Error("GraphQL server did not become ready in time");
 }
 
-app.on("ready", async () => {
+// Function to create the loading window
+function createLoadingWindow() {
   mainWindow = createWindow("main", {
     width: 1280,
     height: 680,
+    icon:
+      process.platform === "darwin"
+        ? "build/mac/AppIcon.icns"
+        : path.join(process.resourcesPath, "icon.ico"),
     webPreferences: {
       preload: path.join(__dirname, "preload.js"),
     },
   });
-  Menu.setApplicationMenu(initMenu(mainWindow, isProd));
+  if (isProd) {
+    mainWindow.loadURL(path.join(process.resourcesPath, "./loading.html"));
+  } else {
+    mainWindow.loadFile(path.join(__dirname, "../main/loading.html"));
+  }
+}
+
+app.on("ready", async () => {
+  createLoadingWindow();
+
   createGraphqlSeverProcess();
+
+  Menu.setApplicationMenu(initMenu(mainWindow, isProd));
+
   await waitForGraphQLServer("http://localhost:9002/graphql");
 
   if (isProd) {
@@ -148,10 +165,7 @@ app.on("before-quit", () => {
 });
 
 app.on("window-all-closed", () => {
-  // On macOS, closing all windows shouldn't exit the process
-  if (process.platform !== "darwin") {
-    app.quit();
-  }
+  app.quit();
 });
 
 // This does not work

main/helpers/create-window.ts

@@ -49,8 +49,8 @@ export const createWindow = (
     });
   };
 
-  const ensureVisibleOnSomeDisplay = windowState => {
-    const visible = screen.getAllDisplays().some(display => {
+  const ensureVisibleOnSomeDisplay = (windowState) => {
+    const visible = screen.getAllDisplays().some((display) => {
       return windowWithinBounds(windowState, display.bounds);
     });
     if (!visible) {

main/loading.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Starting...</title>
+  <style>
+    body {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+      font-family: Arial, sans-serif;
+      background-color: #f0f0f0;
+    }
+
+    .spinner {
+      width: 24px;
+      height: 24px;
+      border: 4px solid rgba(0, 0, 0, 0.1);
+      border-top-color: #333;
+      border-radius: 50%;
+      animation: spin 1s linear infinite;
+      margin-right: 10px;
+    }
+
+    @keyframes spin {
+      to {
+        transform: rotate(360deg);
+      }
+    }
+
+    .loading {
+      font-size: 12px;
+      color: #333;
+      display: flex;
+      align-items: center;
+    }
+  </style>
+</head>
+<body>
+  <div class="loading">
+    <div class="spinner"></div> <!-- The spinner -->
+    Starting, please wait...
+  </div>
+</body>
+</html>

package-dmg.json

@@ -0,0 +1,85 @@
+{
+  "private": true,
+  "name": "dolt-workbench",
+  "description": "SQL workbench for MySQL and PostgreSQL databases",
+  "version": "0.2.13",
+  "main": "app/background.js",
+  "workspaces": {
+    "packages": [
+      "graphql-server",
+      "web"
+    ]
+  },
+  "packageManager": "[email protected]",
+  "scripts": {
+    "dev": "nextron",
+    "build": "nextron build",
+    "postinstall": "electron-builder install-app-deps",
+    "clean": "npm-run-all 'clean:*'",
+    "clean:web": "yarn workspace @dolt-sql-workbench/web clean",
+    "clean:misc": "rimraf node_modules '*/node_modules' '*/.eslintcache' '*/*.tsbuildinfo' '*/dist' web/.next",
+    "compile": "npm-run-all 'compile:*'",
+    "compile:graphql-server": "yarn workspace @dolt-sql-workbench/graphql-server compile",
+    "compile:web": "yarn workspace @dolt-sql-workbench/web compile"
+  },
+  "build": {
+    "appId": "com.dolthub.dolt-workbench",
+    "productName": "Dolt Workbench",
+    "buildVersion": "0.2.13",
+    "copyright": "Copyright © 2024 <DoltHub Inc>",
+    "files": [
+      "app",
+      "package.json"
+    ],
+    "extraFiles": [
+      "graphql-server/dist/*",
+      "graphql-server/dist/**/*",
+      "graphql-server/node_modules",
+      "!**/node_modules/@nestjs/cli/node_modules/fsevents/**",
+      {
+        "from": "build/mac/Assets.car",
+        "to": "Resources/Assets.car"
+      },
+      {
+        "from": "build/mac/AppIcon.icns",
+        "to": "Resources/AppIcon.icns"
+      }
+    ],
+    "mac": {
+      "category": "public.app-category.developer-tools",
+      "icon": "build/mac/AppIcon.icns",
+      "extendInfo": {
+        "CFBundleIconName": "AppIcon",
+        "CFBundleIconFile": "AppIcon",
+        "CFBundleDisplayName": "Dolt Workbench"
+      },
+      "artifactName": "${productName}-mac-${arch}.${ext}",
+      "target": "dmg",
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "provisioningProfile": "build/mac/AppleDevelopment.provisionprofile",
+      "entitlements": "build/mac/entitlements.plist",
+      "entitlementsInherit": "build/mac/entitlements.inherit.plist"
+    }
+  },
+  "dependencies": {
+    "electron-serve": "^1.3.0",
+    "electron-store": "^8.2.0"
+  },
+  "devDependencies": {
+    "@electron/osx-sign": "^1.3.1",
+    "@types/node": "^22.5.2",
+    "@types/react": "^18.3.5",
+    "autoprefixer": "^10.4.19",
+    "electron": "^31.0.1",
+    "electron-builder": "^25.1.7",
+    "next": "^14.2.4",
+    "nextron": "^9.1.0",
+    "npm-run-all": "4.1.5",
+    "postcss": "^8.4.40",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.4.5"
+  }
+}