From c8afaf178e0e639902b2a1b19275a0aa1949cb5e Mon Sep 17 00:00:00 2001
From: xxnuo <54252779+xxnuo@users.noreply.github.com>
Date: Thu, 1 Jan 2026 17:21:06 +0800
Subject: [PATCH] refactor(desktop): entry

---
 desktop/server.js                            | 2 +-
 package.json                                 | 8 ++++----
 scripts/build.ts                             | 2 +-
 scripts/electron-dev.ts                      | 6 +++---
 electron-main.js => scripts/electron-main.js | 2 +-
 src/{desktop-server.ts => desktop.ts}        | 0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename electron-main.js => scripts/electron-main.js (79%)
 rename src/{desktop-server.ts => desktop.ts} (100%)

diff --git a/desktop/server.js b/desktop/server.js
index ffbcf48..a9be43d 100644
--- a/desktop/server.js
+++ b/desktop/server.js
@@ -51,7 +51,7 @@ function stripServerArgs() {
 
 async function loadServerModule() {
   if (!serverModulePromise) {
-    serverModulePromise = import('../dist/desktop-server.js');
+    serverModulePromise = import('../dist/desktop.js');
   }
   return serverModulePromise;
 }
diff --git a/package.json b/package.json
index b2e5bc2..e4cec55 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "dev": "bun src/main.ts --log-level debug --port 8990 --model-dir ~/.config/mtran/models",
     "dev2": "bun src/main.ts --log-level debug --port 8989 --model-dir ~/.config/mtran/models",
     "bump": "bun scripts/bump.ts",
-    "electron": "bun run build:lib && electron ./electron-main.js",
+    "electron": "bun run build:lib && electron ./scripts/electron-main.js",
     "electron:dev": "bun run scripts/electron-dev.ts",
     "electron:build": "bun run scripts/electron-build.ts",
     "electron:build:all": "bun run scripts/electron-build.ts --all",
@@ -76,7 +76,7 @@
     "buildDependenciesFromSource": false,
     "copyright": "Copyright © 2025",
     "extraMetadata": {
-      "main": "electron-main.js"
+      "main": "scripts/electron-main.js"
     },
     "asar": false,
     "asarUnpack": [
@@ -86,7 +86,7 @@
     "artifactName": "mtranserver-desktop-${version}-${os}-${arch}.${ext}",
     "files": [
       "desktop/**/*",
-      "electron-main.js",
+      "scripts/electron-main.js",
       "dist/**/*",
       "!dist/mtranserver*",
       "!dist/*.exe",
@@ -118,4 +118,4 @@
       "allowToChangeInstallationDirectory": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/scripts/build.ts b/scripts/build.ts
index 30d0b9d..c4455f3 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -53,7 +53,7 @@ await $`bun tsoa spec-and-routes`;
 
 if (isLib) {
   console.log("Building library...");
-  await $`bun build src/index.ts src/main.ts src/desktop-server.ts --outdir dist --target node --format esm --sourcemap --external zstd-wasm-decoder --external express`;
+  await $`bun build src/index.ts src/main.ts src/desktop.ts --outdir dist --target node --format esm --sourcemap --external zstd-wasm-decoder --external express`;
   await $`tsc -p tsconfig.lib.json`;
   console.log("Build complete!");
   process.exit(0);
diff --git a/scripts/electron-dev.ts b/scripts/electron-dev.ts
index 73ff6e3..afdea4e 100644
--- a/scripts/electron-dev.ts
+++ b/scripts/electron-dev.ts
@@ -29,7 +29,7 @@ function startBuildWatch() {
     'build',
     'src/index.ts',
     'src/main.ts',
-    'src/desktop-server.ts',
+    'src/desktop.ts',
     '--outdir',
     'dist',
     '--target',
@@ -52,7 +52,7 @@ let restarting = false
 
 function startElectron() {
   if (electronProcess) return
-  electronProcess = run(electronBin, ['./electron-main.js'])
+  electronProcess = run(electronBin, ['./scripts/electron-main.js'])
   electronProcess.on('exit', () => {
     electronProcess = null
   })
@@ -94,7 +94,7 @@ function watchPath(target: string) {
 function setupWatchers() {
   watchPath(path.join(root, 'dist'))
   watchPath(path.join(root, 'desktop'))
-  watchPath(path.join(root, 'electron-main.js'))
+  watchPath(path.join(root, 'scripts/electron-main.js'))
 }
 
 async function main() {
diff --git a/electron-main.js b/scripts/electron-main.js
similarity index 79%
rename from electron-main.js
rename to scripts/electron-main.js
index 886cf4c..604227d 100644
--- a/electron-main.js
+++ b/scripts/electron-main.js
@@ -1,5 +1,5 @@
 import { app } from 'electron';
-import { focusMainWindow, startDesktop } from './desktop/app.js';
+import { focusMainWindow, startDesktop } from '../desktop/app.js';
 
 const gotTheLock = app.requestSingleInstanceLock();
 
diff --git a/src/desktop-server.ts b/src/desktop.ts
similarity index 100%
rename from src/desktop-server.ts
rename to src/desktop.ts