markpdfdown 0.1.0 → 0.1.2

package/dist/main/index.js

@@ -4,6 +4,7 @@ import fs, { promises } from "fs";
 import isDev from "electron-is-dev";
 import { randomUUID } from "crypto";
 import pkg from "@prisma/client";
+import { fileURLToPath } from "url";
 import { EventEmitter } from "events";
 import { pdfToPng } from "pdf-to-png-converter";
 import { PDFDocument } from "pdf-lib";
@@ -25,10 +26,23 @@ const getMigrationsDir = () => {
       "migrations"
     );
   }
-  if (app) {
+  if (app.isPackaged) {
     return path.join(app.getAppPath(), "..", "migrations");
   }
-  return path.join(__dirname, "migrations");
+  const currentDir = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
+  const projectRoot = path.resolve(currentDir, "..", "..");
+  const migrationsPath = path.join(
+    projectRoot,
+    "src",
+    "core",
+    "infrastructure",
+    "db",
+    "migrations"
+  );
+  if (fs.existsSync(migrationsPath)) {
+    return migrationsPath;
+  }
+  return path.join(currentDir, "migrations");
 };
 const createMigrationsTableSQL = `
 CREATE TABLE IF NOT EXISTS _prisma_migrations (
@@ -152,39 +166,52 @@ const runMigrations = async (prisma2 = null) => {
   }
 };
 const { PrismaClient } = pkg;
+let prismaInstance = null;
+let cachedDbUrl = null;
 function getDatabaseUrl() {
+  if (cachedDbUrl) {
+    return cachedDbUrl;
+  }
   if (!isDev) {
     const userDataPath = app.getPath("userData");
     const dbDir = path.join(userDataPath, "db");
     if (!fs.existsSync(dbDir)) {
       fs.mkdirSync(dbDir, { recursive: true });
     }
-    console.log(
-      "Using userData database path:",
-      `file:${path.join(dbDir, "app.db")}`
-    );
-    return `file:${path.join(dbDir, "app.db")}`;
+    cachedDbUrl = `file:${path.join(dbDir, "app.db")}`;
+    console.log("Using userData database path:", cachedDbUrl);
+    return cachedDbUrl;
   }
-  console.log(
-    "Using default development database path:",
-    `file:${path.join(process.cwd(), "src", "core", "db", "dev.db")}`
-  );
-  return `file:${path.join(process.cwd(), "src", "core", "infrastructure", "db", "dev.db")}`;
+  cachedDbUrl = `file:${path.join(process.cwd(), "src", "core", "infrastructure", "db", "dev.db")}`;
+  console.log("Using default development database path:", cachedDbUrl);
+  return cachedDbUrl;
 }
-const dbUrl = getDatabaseUrl();
-const prisma = new PrismaClient({
-  datasources: {
-    db: {
-      url: dbUrl
-    }
+function getPrismaClient() {
+  if (!prismaInstance) {
+    const dbUrl = getDatabaseUrl();
+    prismaInstance = new PrismaClient({
+      datasources: {
+        db: {
+          url: dbUrl
+        }
+      }
+    });
+  }
+  return prismaInstance;
+}
+const prisma = new Proxy({}, {
+  get(_target, prop) {
+    return Reflect.get(getPrismaClient(), prop);
   }
 });
 const initDatabase = async () => {
   try {
+    const dbUrl = getDatabaseUrl();
+    const client = getPrismaClient();
     console.log(`Initializing database(url:${dbUrl})...`);
-    await prisma.$queryRaw`SELECT 1`;
+    await client.$queryRaw`SELECT 1`;
     console.log("Database connection established successfully.");
-    await runMigrations(prisma);
+    await runMigrations(client);
     return true;
   } catch (error) {
     console.error("Database initialization error:", error);
@@ -192,8 +219,12 @@ const initDatabase = async () => {
   }
 };
 const disconnect = async () => {
-  await prisma.$disconnect();
-  console.log("Database connection has been closed");
+  if (prismaInstance) {
+    await prismaInstance.$disconnect();
+    prismaInstance = null;
+    cachedDbUrl = null;
+    console.log("Database connection has been closed");
+  }
 };
 var TaskStatus = /* @__PURE__ */ ((TaskStatus2) => {
   TaskStatus2[TaskStatus2["CREATED"] = -1] = "CREATED";
@@ -2105,7 +2136,17 @@ class WorkerOrchestrator {
     this.splitterWorker = null;
     this.converterWorkers = [];
     this.mergerWorker = null;
-    this.uploadsDir = fileLogic.getUploadDir();
+    this.uploadsDir = null;
+  }
+  /**
+   * Get uploads directory (lazy initialization)
+   * Must be called after app.setPath() has been configured
+   */
+  getUploadsDir() {
+    if (!this.uploadsDir) {
+      this.uploadsDir = fileLogic.getUploadDir();
+    }
+    return this.uploadsDir;
   }
   /**
    * Start all workers
@@ -2118,9 +2159,10 @@ class WorkerOrchestrator {
     try {
       console.log("[WorkerOrchestrator] Initializing workers...");
       await this.cleanupOrphanedWork();
-      ImagePathUtil.init(this.uploadsDir);
-      console.log(`[WorkerOrchestrator] ImagePathUtil initialized with uploadsDir: ${this.uploadsDir}`);
-      this.splitterWorker = new SplitterWorker(this.uploadsDir);
+      const uploadsDir = this.getUploadsDir();
+      ImagePathUtil.init(uploadsDir);
+      console.log(`[WorkerOrchestrator] ImagePathUtil initialized with uploadsDir: ${uploadsDir}`);
+      this.splitterWorker = new SplitterWorker(uploadsDir);
       console.log(`[WorkerOrchestrator] SplitterWorker created (ID: ${this.splitterWorker.getWorkerId()})`);
       this.splitterWorker.run().catch((error) => {
         console.error("[WorkerOrchestrator] SplitterWorker error:", error);
@@ -2134,7 +2176,7 @@ class WorkerOrchestrator {
           console.error(`[WorkerOrchestrator] ConverterWorker ${worker.getWorkerId().slice(0, 8)} error:`, error);
         });
       }
-      this.mergerWorker = new MergerWorker(this.uploadsDir);
+      this.mergerWorker = new MergerWorker(uploadsDir);
       console.log(`[WorkerOrchestrator] MergerWorker created (ID: ${this.mergerWorker.getWorkerId().slice(0, 8)})`);
       this.mergerWorker.run().catch((error) => {
         console.error("[WorkerOrchestrator] MergerWorker error:", error);
@@ -3342,6 +3384,14 @@ class EventBridge {
   }
 }
 const eventBridge = new EventBridge();
+if (!app.isPackaged) {
+  app.setName("MarkPDFdown");
+  const userDataPath = app.getPath("userData");
+  if (userDataPath.endsWith("Electron")) {
+    const newPath = userDataPath.replace(/Electron$/, "MarkPDFdown");
+    app.setPath("userData", newPath);
+  }
+}
 protocol.registerSchemesAsPrivileged([
   {
     scheme: "local-file",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markpdfdown",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.",
   "author": "MarkPDFdown",
   "main": "dist/main/index.js",