npm - markpdfdown - Versions diffs - 0.1.8-beta.6 → 0.2.0 - Mend

markpdfdown 0.1.8-beta.6 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

package/dist/main/index.js +398 -14
package/dist/preload/index.js +20 -1
package/dist/renderer/assets/{index-yTU2skrN.css → index-B_JfRqwM.css} +54 -0
package/dist/renderer/assets/{index-iEK8qT5k.js → index-wHB9i2kW.js} +623 -320
package/dist/renderer/index.html +2 -2
package/package.json +10 -3
package/dist/app/app.js +0 -49
package/dist/app/controllers/completionController.js +0 -19
package/dist/app/controllers/modelController.js +0 -53
package/dist/app/controllers/providerController.js +0 -120
package/dist/app/dal/modelDal.js +0 -44
package/dist/app/dal/providerDal.js +0 -78
package/dist/app/db/index.js +0 -56
package/dist/app/db/migration.js +0 -157
package/dist/app/logic/llm/AnthropicClient.js +0 -219
package/dist/app/logic/llm/AzureOpenAIClient.js +0 -239
package/dist/app/logic/llm/GeminiClient.js +0 -212
package/dist/app/logic/llm/LLMClient.js +0 -80
package/dist/app/logic/llm/OpenAIClient.js +0 -235
package/dist/app/logic/llm/example-advanced.js +0 -232
package/dist/app/logic/llm/index.js +0 -14
package/dist/app/logic/model.js +0 -27
package/dist/app/middleware/logger.js +0 -23
package/dist/app/routes/routes.js +0 -16
package/dist/app/types/Provider.js +0 -1
package/dist/server/controllers/FileController.js +0 -64
package/dist/server/controllers/TaskController.js +0 -57
package/dist/server/controllers/completionController.js +0 -64
package/dist/server/controllers/modelController.js +0 -74
package/dist/server/controllers/providerController.js +0 -120
package/dist/server/dal/TaskDal.js +0 -67
package/dist/server/dal/modelDal.js +0 -44
package/dist/server/dal/providerDal.js +0 -83
package/dist/server/db/index.js +0 -57
package/dist/server/db/migration.js +0 -157
package/dist/server/index.js +0 -49
package/dist/server/logic/File.js +0 -34
package/dist/server/logic/Task.js +0 -21
package/dist/server/logic/llm/AnthropicClient.js +0 -220
package/dist/server/logic/llm/AzureOpenAIClient.js +0 -239
package/dist/server/logic/llm/GeminiClient.js +0 -213
package/dist/server/logic/llm/LLMClient.js +0 -83
package/dist/server/logic/llm/OllamaClient.js +0 -220
package/dist/server/logic/llm/OpenAIClient.js +0 -235
package/dist/server/logic/llm/example-advanced.js +0 -231
package/dist/server/logic/llm/index.js +0 -15
package/dist/server/logic/model.js +0 -59
package/dist/server/middleware/logger.js +0 -23
package/dist/server/routes/routes.js +0 -30
package/dist/server/types/Provider.js +0 -1
package/dist/server/types/Task.js +0 -1

package/dist/renderer/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MarkPDFdown</title>
-    <script type="module" crossorigin src="./assets/index-iEK8qT5k.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-yTU2skrN.css">
+    <script type="module" crossorigin src="./assets/index-wHB9i2kW.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-B_JfRqwM.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "markpdfdown",
-  "version": "0.1.8-beta.6",
+  "version": "0.2.0",
   "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.",
   "author": "MarkPDFdown",
   "main": "dist/main/index.js",
@@ -80,7 +80,8 @@
     "mac": {
       "category": "public.app-category.productivity",
       "target": [
-        "dmg"
+        "dmg",
+        "zip"
       ],
       "artifactName": "${productName}-${version}-${arch}.${ext}",
       "icon": "public/icons/mac/icon.icns",
@@ -112,6 +113,11 @@
     "electronDownload": {
       "mirror": "https://github.com/electron/electron/releases/download/"
     },
+    "publish": {
+      "provider": "github",
+      "owner": "MarkPDFdown",
+      "repo": "markpdfdown-desktop"
+    },
     "asar": true
   },
   "lint-staged": {
@@ -130,13 +136,14 @@
   "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",
+    "electron-updater": "^6.7.3",
     "katex": "^0.16.21",
     "pdf-lib": "^1.17.1",
     "pdf-to-png-converter": "^3.11.0",
+    "prisma": "^6.5.0",
     "prismjs": "^1.30.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/dist/app/app.js DELETED Viewed

@@ -1,49 +0,0 @@
-import express from 'express';
-import cors from 'cors';
-import bodyParser from 'body-parser';
-import { requestLogger, errorLogger } from './middleware/logger.js';
-import { initDatabase, disconnect } from './db/index.js';
-// 初始化Express应用
-const app = express();
-// 中间件配置
-app.use(cors());
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
-app.use(requestLogger);
-// 导入路由
-import routes from './routes/routes.js';
-// 使用路由
-app.use('/api', routes);
-// 健康检查
-app.get('/health', (_req, res) => {
-    res.status(200).json({ status: 'ok' });
-});
-// 错误日志中间件
-app.use(errorLogger);
-// 错误处理中间件
-app.use((err, _req, res, _next) => {
-    res.status(500).json({
-        message: 'Internal Server Error',
-        error: process.env.NODE_ENV === 'development' ? err.message : undefined
-    });
-});
-// 优雅关闭
-process.on('SIGINT', async () => {
-    await disconnect();
-    console.log('Backend server has been shut down');
-    process.exit(0);
-});
-let server = null;
-export { app };
-export const start = async () => {
-    // 确保不会重复启动服务器
-    if (server) {
-        return server;
-    }
-    // 在启动服务器前初始化数据库
-    await initDatabase();
-    // 启动服务器并监听随机端口
-    server = app.listen(0, 'localhost');
-    return server;
-};
-export const getServer = () => server;

package/dist/app/controllers/completionController.js DELETED Viewed

@@ -1,19 +0,0 @@
-import model from '../logic/model.js';
-// 补全请求
-const completion = async (req, res, next) => {
-    // 验证请求
-    if (!req.body.providerId || !req.body.modelId || !req.body.messages) {
-        return res.status(400).json({ message: 'providerId, modelId, messages 为必填项' });
-    }
-    try {
-        const { providerId, modelId, messages, options } = req.body;
-        const completion = await model.completion(providerId, modelId, messages, options);
-        res.json(completion);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-export default {
-    completion
-};

package/dist/app/controllers/modelController.js DELETED Viewed

@@ -1,53 +0,0 @@
-import modelDal from '../dal/modelDal.js';
-// 获取指定服务商的模型列表
-const getModelsByProviderId = async (req, res, next) => {
-    try {
-        const { provider } = req.params;
-        const models = await modelDal.findByProviderId(Number(provider));
-        res.json(models);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 创建模型
-const createModel = async (req, res, next) => {
-    try {
-        const { id, provider, name } = req.body;
-        // 验证请求
-        if (!provider || !name || !id) {
-            return res.status(400).json({ message: '模型ID、服务商ID、名称和为必填项' });
-        }
-        // 创建模型
-        const newModel = await modelDal.create({
-            id,
-            provider: Number(provider),
-            name,
-        });
-        res.status(201).json(newModel);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 删除模型
-const deleteModel = async (req, res, next) => {
-    try {
-        const { id, provider } = req.params;
-        // 验证请求
-        if (!id || !provider) {
-            return res.status(400).json({ message: '模型ID和服务商ID为必填项' });
-        }
-        // 删除模型
-        await modelDal.remove(id, Number(provider));
-        res.status(204).json({ message: '模型删除成功' });
-    }
-    catch (error) {
-        next(error);
-    }
-};
-export default {
-    getModelsByProviderId,
-    createModel,
-    deleteModel
-};

package/dist/app/controllers/providerController.js DELETED Viewed

@@ -1,120 +0,0 @@
-import providerDal from '../dal/providerDal.js';
-// 获取所有服务商
-const getAllProviders = async (_req, res, next) => {
-    try {
-        const providers = await providerDal.findAll();
-        res.json(providers);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 根据ID获取服务商
-const getProviderById = async (req, res, next) => {
-    try {
-        const { id } = req.params;
-        const provider = await providerDal.findById(Number(id));
-        if (!provider) {
-            return res.status(404).json({ message: '服务商不存在' });
-        }
-        res.json(provider);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 创建服务商
-const createProvider = async (req, res, next) => {
-    try {
-        const { name, type } = req.body;
-        // 验证请求
-        if (!name || !type) {
-            return res.status(400).json({ message: '名称和协议类型为必填项' });
-        }
-        // 创建服务商
-        const newProvider = await providerDal.create({
-            name,
-            type,
-            api_key: '',
-            base_url: '',
-            suffix: '',
-            status: 1 // 默认启用
-        });
-        res.status(201).json(newProvider);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 更新服务商
-const updateProvider = async (req, res, next) => {
-    try {
-        const { id } = req.params;
-        const { api_key, base_url, suffix } = req.body;
-        // 验证服务商存在
-        const existingProvider = await providerDal.findById(Number(id));
-        if (!existingProvider) {
-            return res.status(404).json({ message: '服务商不存在' });
-        }
-        // 准备更新数据
-        const updateData = {};
-        if (api_key !== undefined)
-            updateData.api_key = api_key;
-        if (base_url !== undefined)
-            updateData.base_url = base_url;
-        if (suffix !== undefined)
-            updateData.suffix = suffix;
-        // 更新服务商
-        const updatedProvider = await providerDal.update(Number(id), updateData);
-        res.json(updatedProvider);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 删除服务商
-const deleteProvider = async (req, res, next) => {
-    try {
-        const { id } = req.params;
-        // 验证服务商存在
-        const existingProvider = await providerDal.findById(Number(id));
-        if (!existingProvider) {
-            return res.status(404).json({ message: '服务商不存在' });
-        }
-        // 删除服务商
-        await providerDal.remove(Number(id));
-        res.status(204).send();
-    }
-    catch (error) {
-        next(error);
-    }
-};
-// 更新服务商状态
-const updateProviderStatus = async (req, res, next) => {
-    try {
-        const { id } = req.params;
-        const { status } = req.body;
-        if (status === undefined) {
-            return res.status(400).json({ message: '状态值不合法' });
-        }
-        // 验证服务商存在
-        const existingProvider = await providerDal.findById(Number(id));
-        if (!existingProvider) {
-            return res.status(404).json({ message: '服务商不存在' });
-        }
-        // 更新服务商状态
-        const updatedProvider = await providerDal.updateStatus(Number(id), Number(status));
-        res.json(updatedProvider);
-    }
-    catch (error) {
-        next(error);
-    }
-};
-export default {
-    getAllProviders,
-    getProviderById,
-    createProvider,
-    updateProvider,
-    deleteProvider,
-    updateProviderStatus
-};

package/dist/app/dal/modelDal.js DELETED Viewed

@@ -1,44 +0,0 @@
-import { prisma } from "../db/index.js";
-// 查找所有模型
-const findAll = async () => {
-    return await prisma.model.findMany({
-        orderBy: [{ createdAt: "desc" }],
-    });
-};
-// 根据服务商ID查找模型
-const findByProviderId = async (provider) => {
-    return await prisma.model.findMany({
-        where: { provider },
-        orderBy: [{ createdAt: "desc" }],
-    });
-};
-// 创建模型
-const create = async (modelData) => {
-    return await prisma.model.create({
-        data: modelData,
-    });
-};
-// 删除模型 根据id和provider删除
-const remove = async (id, provider) => {
-    return await prisma.model.delete({
-        where: {
-            id_provider: {
-                id: id,
-                provider: provider
-            }
-        }
-    });
-};
-// 批量删除指定服务商的模型
-const removeByProviderId = async (provider) => {
-    return await prisma.model.deleteMany({
-        where: { provider },
-    });
-};
-export default {
-    findAll,
-    findByProviderId,
-    create,
-    remove,
-    removeByProviderId,
-};

package/dist/app/dal/providerDal.js DELETED Viewed

@@ -1,78 +0,0 @@
-import { prisma } from "../db/index.js";
-// 查找所有提供商
-const findAll = async () => {
-    return await prisma.provider.findMany({
-        select: {
-            id: true,
-            name: true,
-            type: true,
-            api_key: true,
-            base_url: true,
-            suffix: true,
-            status: true,
-            createdAt: true,
-            updatedAt: true,
-        },
-        orderBy: [{ createdAt: "desc" }],
-    });
-};
-// 根据ID查找提供商
-const findById = async (id) => {
-    return await prisma.provider.findUnique({
-        where: { id },
-        select: {
-            id: true,
-            name: true,
-            type: true,
-            api_key: true,
-            base_url: true,
-            suffix: true,
-            status: true,
-            createdAt: true,
-            updatedAt: true,
-        },
-    });
-};
-// 创建提供商
-const create = async (providerData) => {
-    // 设置默认值
-    const data = {
-        name: providerData.name || '',
-        type: providerData.type || '',
-        api_key: providerData.api_key || '',
-        base_url: providerData.base_url || '',
-        suffix: providerData.suffix || '',
-        status: providerData.status || 0
-    };
-    return await prisma.provider.create({
-        data
-    });
-};
-// 更新提供商
-const update = async (id, updateData) => {
-    return await prisma.provider.update({
-        where: { id },
-        data: updateData,
-    });
-};
-// 删除提供商
-const remove = async (id) => {
-    return await prisma.provider.delete({
-        where: { id },
-    });
-};
-// 更新提供商状态
-const updateStatus = async (id, status) => {
-    return await prisma.provider.update({
-        where: { id },
-        data: { status },
-    });
-};
-export default {
-    findAll,
-    findById,
-    create,
-    update,
-    remove,
-    updateStatus,
-};

package/dist/app/db/index.js DELETED Viewed

@@ -1,56 +0,0 @@
-import pkg from '@prisma/client';
-const { PrismaClient } = pkg;
-import { runMigrations } from './migration.js';
-import path from 'path';
-import { app } from 'electron';
-import fs from 'fs';
-// 设置和获取数据库URL
-function getDatabaseUrl() {
-    // 否则，为打包应用生成一个默认路径
-    if (app) {
-        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')}`;
-    }
-    // 开发环境回退路径
-    console.log('Using default development database path:', 'file:./dev.db');
-    return 'file:./dev.db';
-}
-// 获取数据库URL
-const dbUrl = getDatabaseUrl();
-// 创建Prisma实例，使用环境变量中的数据库URL
-const prisma = new PrismaClient({
-    datasources: {
-        db: {
-            url: dbUrl
-        }
-    }
-});
-// 初始化数据库，包括运行迁移
-const initDatabase = async () => {
-    try {
-        console.log(`Initializing database(url:${dbUrl})...`);
-        // 验证数据库连接
-        await prisma.$queryRaw `SELECT 1`;
-        console.log('Database connection established successfully.');
-        // 运行迁移，传递现有的prisma实例
-        await runMigrations(prisma);
-        return true;
-    }
-    catch (error) {
-        console.error('Database initialization error:', error);
-        return false;
-    }
-};
-/**
- * 关闭数据库连接
- */
-const disconnect = async () => {
-    await prisma.$disconnect();
-    console.log('Database connection has been closed');
-};
-export { prisma, disconnect, initDatabase };

package/dist/app/db/migration.js DELETED Viewed

@@ -1,157 +0,0 @@
-import path from 'path';
-import fs from 'fs';
-import isDev from 'electron-is-dev';
-import { app } from 'electron';
-// 获取迁移文件目录
-const getMigrationsDir = () => {
-    // 在开发环境使用项目目录
-    if (isDev) {
-        return path.join(process.cwd(), 'app', 'db', 'migrations');
-    }
-    // 在打包环境中，确保使用正确的路径
-    // 使用app.getAppPath()获取应用根目录
-    if (app) {
-        return path.join(app.getAppPath(), 'app', 'db', 'migrations');
-    }
-    // 回退到__dirname相对路径
-    return path.join(__dirname, 'migrations');
-};
-// 创建 _prisma_migrations 表的SQL
-const createMigrationsTableSQL = `
-CREATE TABLE IF NOT EXISTS _prisma_migrations (
-  id                    VARCHAR(36) PRIMARY KEY NOT NULL,
-  checksum              VARCHAR(64) NOT NULL,
-  finished_at           DATETIME,
-  migration_name        VARCHAR(255) NOT NULL,
-  logs                  TEXT,
-  rolled_back_at        DATETIME,
-  started_at            DATETIME NOT NULL DEFAULT current_timestamp,
-  applied_steps_count   INTEGER UNSIGNED NOT NULL DEFAULT 0
-);
-`;
-// 检查迁移是否已应用
-const isMigrationApplied = async (prisma, migrationName) => {
-    try {
-        // 检查 _prisma_migrations 表是否存在
-        const tableExists = await prisma.$queryRaw `
-      SELECT name FROM sqlite_master
-      WHERE type='table' AND name='_prisma_migrations';
-    `;
-        if (!tableExists || tableExists.length === 0) {
-            return false;
-        }
-        // 检查特定迁移是否已应用
-        const migration = await prisma.$queryRaw `
-      SELECT * FROM _prisma_migrations
-      WHERE migration_name = ${migrationName}
-      AND finished_at IS NOT NULL;
-    `;
-        return migration && migration.length > 0;
-    }
-    catch (error) {
-        console.error('Error checking migration status:', error);
-        return false;
-    }
-};
-// 记录已应用的迁移
-const recordMigration = async (prisma, migrationName, checksum) => {
-    const id = generateUUID();
-    const now = new Date().toISOString();
-    try {
-        await prisma.$executeRaw `
-      INSERT INTO _prisma_migrations (
-        id, checksum, migration_name, started_at, finished_at, applied_steps_count
-      ) VALUES (
-        ${id}, ${checksum}, ${migrationName}, ${now}, ${now}, 1
-      );
-    `;
-        console.log(`Recorded migration: ${migrationName}`);
-    }
-    catch (error) {
-        console.error(`Failed to record migration ${migrationName}:`, error);
-    }
-};
-// 生成UUID
-const generateUUID = () => {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-        const r = Math.random() * 16 | 0;
-        const v = c === 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
-};
-// 计算迁移文件的checksum
-const calculateChecksum = async (content) => {
-    // 使用ESM方式导入crypto
-    const crypto = await import('crypto');
-    return crypto.default.createHash('sha256').update(content).digest('hex');
-};
-// 应用单个迁移
-const applyMigration = async (prisma, migrationDir, migrationName) => {
-    const sqlFilePath = path.join(migrationDir, migrationName, 'migration.sql');
-    try {
-        if (!fs.existsSync(sqlFilePath)) {
-            console.error(`Migration SQL file not found: ${sqlFilePath}`);
-            return false;
-        }
-        const sqlContent = fs.readFileSync(sqlFilePath, 'utf8');
-        const sqlStatements = sqlContent.split(';').filter(stmt => stmt.trim());
-        // 应用每条SQL语句
-        for (const statement of sqlStatements) {
-            if (statement.trim()) {
-                await prisma.$executeRawUnsafe(statement.trim());
-            }
-        }
-        // 记录迁移
-        const checksum = await calculateChecksum(sqlContent);
-        await recordMigration(prisma, migrationName, checksum);
-        console.log(`Successfully applied migration: ${migrationName}`);
-        return true;
-    }
-    catch (error) {
-        console.error(`Failed to apply migration ${migrationName}:`, error);
-        return false;
-    }
-};
-// 主要的迁移函数
-const runMigrations = async (prisma = null) => {
-    console.log('Running database migrations...');
-    try {
-        // 确保_prisma_migrations表存在
-        await prisma.$executeRawUnsafe(createMigrationsTableSQL);
-        const migrationsDir = getMigrationsDir();
-        console.log('Migrations directory:', migrationsDir);
-        if (!fs.existsSync(migrationsDir)) {
-            console.error(`Migrations directory not found: ${migrationsDir}`);
-            return false;
-        }
-        // 读取所有迁移目录并按名称排序
-        const migrationDirs = fs
-            .readdirSync(migrationsDir)
-            .filter(dir => {
-            const stat = fs.statSync(path.join(migrationsDir, dir));
-            return stat.isDirectory() && dir !== 'migration_lock.toml';
-        })
-            .sort(); // 按名称排序，确保按正确顺序应用
-        let migrationsApplied = 0;
-        // 应用每个迁移
-        for (const migrationName of migrationDirs) {
-            const isApplied = await isMigrationApplied(prisma, migrationName);
-            if (!isApplied) {
-                console.log(`Applying migration: ${migrationName}`);
-                const success = await applyMigration(prisma, migrationsDir, migrationName);
-                if (success)
-                    migrationsApplied++;
-            }
-            else {
-                console.log(`Migration already applied: ${migrationName}`);
-            }
-        }
-        console.log(`Database migration complete. Applied ${migrationsApplied} migrations.`);
-        return migrationsApplied > 0;
-    }
-    catch (error) {
-        console.error('Migration error:', error);
-        return false;
-    }
-};
-export { runMigrations };