markpdfdown 0.1.3-t → 0.1.3-tfour

package/bin/cli.js

@@ -14,6 +14,40 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const projectRoot = join(__dirname, '..');
 
+// 从 package.json 读取 electron 版本要求
+function getElectronVersion() {
+  const require = createRequire(import.meta.url);
+  const pkg = require('../package.json');
+  // 优先从 dependencies 读取，其次从 devDependencies，最后使用默认值
+  return pkg.dependencies?.electron
+    || pkg.devDependencies?.electron
+    || pkg.peerDependencies?.electron
+    || '^35.0.0';
+}
+
+// 确保 Electron 已安装
+async function ensureElectron() {
+  const electronBin = process.platform === 'win32' ? 'electron.cmd' : 'electron';
+  const electronPath = join(projectRoot, 'node_modules', '.bin', electronBin);
+
+  if (!existsSync(electronPath)) {
+    const electronVersion = getElectronVersion();
+    console.log(`📦 Electron not found. Installing electron@${electronVersion}...`);
+    try {
+      execSync(`npm install electron@"${electronVersion}" --no-save`, {
+        cwd: projectRoot,
+        stdio: 'inherit',
+        shell: true
+      });
+      console.log('✅ Electron installed successfully.');
+    } catch (error) {
+      console.error('❌ Failed to install Electron:', error.message);
+      console.error('   Please try manually: npm install electron');
+      process.exit(1);
+    }
+  }
+}
+
 // 确保 Prisma client 存在
 async function ensurePrismaClient() {
   const prismaClientPath = join(projectRoot, 'node_modules', '.prisma', 'client', 'index.js');
@@ -21,11 +55,19 @@ async function ensurePrismaClient() {
   if (!existsSync(prismaClientPath)) {
     console.log('🔧 Prisma client not found. Generating...');
     try {
+      // 使用项目本地的 prisma CLI，避免使用用户系统上可能不兼容的全局版本
+      const prismaBin = process.platform === 'win32' ? 'prisma.cmd' : 'prisma';
+      const prismaPath = join(projectRoot, 'node_modules', '.bin', prismaBin);
+      const prismaCmd = existsSync(prismaPath)
+        ? `"${prismaPath}"`
+        : 'npx prisma'; // 回退到 npx
+
       // 设置临时的 DATABASE_URL，prisma generate 需要此变量存在
       // 实际的数据库路径在运行时由 db/index.ts 动态决定
-      execSync('npx prisma generate --schema=./src/core/infrastructure/db/schema.prisma', {
+      execSync(`${prismaCmd} generate --schema=./src/core/infrastructure/db/schema.prisma`, {
         cwd: projectRoot,
         stdio: 'inherit',
+        shell: true,
         env: {
           ...process.env,
           DATABASE_URL: 'file:./placeholder.db'
@@ -46,7 +88,8 @@ function launchElectron(args) {
   const mainPath = join(projectRoot, 'dist', 'main', 'index.js');
 
   if (!existsSync(mainPath)) {
-    console.error('❌ Application not built. Please run: npm run build');
+    console.error('❌ Application not built. Main file not found at:', mainPath);
+    console.error('   Please run: npm run build');
     process.exit(1);
   }
 
@@ -107,6 +150,7 @@ async function main() {
   switch (command) {
     case 'gui':
     case 'start':
+      await ensureElectron();
       await ensurePrismaClient();
       launchElectron(args.slice(1));
       break;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "markpdfdown",
-  "version": "0.1.3-t",
+  "version": "0.1.3-tfour",
   "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.",
   "author": "MarkPDFdown",
   "main": "dist/main/index.js",
   "bin": {
-    "markpdfdown": "./bin/cli.js"
+    "markpdfdown": "bin/cli.js"
   },
   "type": "module",
   "engines": {
@@ -106,6 +106,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.6.1",
     "@prisma/client": "^6.5.0",
+    "prisma": "^6.5.0",
     "@types/sharp": "^0.31.1",
     "antd": "^5.24.4",
     "electron-is-dev": "^3.0.1",
@@ -125,6 +126,14 @@
     "sharp": "^0.34.1",
     "uuid": "^11.1.0"
   },
+  "peerDependencies": {
+    "electron": "^35.0.0"
+  },
+  "peerDependenciesMeta": {
+    "electron": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
     "@testing-library/jest-dom": "^6.1.5",
@@ -146,7 +155,6 @@
     "husky": "^9.1.7",
     "jsdom": "^25.0.1",
     "nodemon": "^3.1.9",
-    "prisma": "^6.5.0",
     "typescript": "~5.7.2",
     "typescript-eslint": "^8.24.1",
     "vite": "^6.2.0",