@lynker-desktop/electron-sdk 0.0.9-alpha.55 → 0.0.9-alpha.57

package/esm/main/resource-cache.d.ts

@@ -11,6 +11,39 @@ export interface ResourceCacheOptions {
     /** 允许缓存的资源来源，支持null/数组/函数 */
     allowedOrigins?: null | string[] | ((url: string) => boolean);
 }
+/**
+ * 下载进度回调函数类型
+ */
+export type DownloadProgressCallback = (progress: {
+    url: string;
+    downloaded: number;
+    total: number;
+    percentage: number;
+    speed: number;
+}) => void;
+/**
+ * 缓存进度回调函数类型
+ */
+export type CacheProgressCallback = (progress: {
+    current: number;
+    total: number;
+    url: string;
+    success: boolean;
+    result?: {
+        filePath?: string;
+        hostPath?: string;
+        mimeType?: string;
+        size?: number;
+        error?: string;
+    };
+    percentage: number;
+    downloadProgress?: {
+        downloaded: number;
+        total: number;
+        percentage: number;
+        speed: number;
+    };
+}) => void;
 /**
  * 资源缓存类：拦截并缓存静态资源，提升加载性能
  */
@@ -72,9 +105,10 @@ export declare class ResourceCache {
      * @param url 资源URL
      * @param filePath 本地缓存路径
      * @param redirectCount 当前重定向次数（内部使用）
+     * @param onProgress 下载进度回调函数（可选）
      * @returns Promise<void> 下载完成或失败
      */
-    downloadResourceAsync(url: string, filePath: string, redirectCount?: number): Promise<void>;
+    downloadResourceAsync(url: string, filePath: string, redirectCount?: number, onProgress?: DownloadProgressCallback): Promise<void>;
     /**
      * 下载资源到本地缓存（同步版本，不返回 Promise，用于拦截器）
      * @param url 资源URL
@@ -103,10 +137,12 @@ export declare class ResourceCache {
      * 手动缓存指定 URL 的资源
      * @param url 要缓存的资源 URL（支持普通 URL 和 base64 data URL）
      * @param force 是否强制重新下载，即使缓存有效（默认 false）
+     * @param ignoreOrigin 是否忽略来源检查（默认 false）
+     * @param onDownloadProgress 下载进度回调函数（可选）
      * @returns Promise<{ filePath: string, hostPath: string, mimeType: string, size: number }> 返回缓存文件路径、主机路径、MIME 类型和文件大小
      * @throws 如果 URL 不匹配缓存规则或来源不允许，会抛出错误
      */
-    cacheUrl(url: string, force?: boolean, ignoreOrigin?: boolean): Promise<{
+    cacheUrl(url: string, force?: boolean, ignoreOrigin?: boolean, onDownloadProgress?: DownloadProgressCallback): Promise<{
         filePath: string;
         hostPath: string;
         mimeType: string;
@@ -116,9 +152,11 @@ export declare class ResourceCache {
      * 批量缓存多个 URL 的资源
      * @param urls 要缓存的资源 URL 数组
      * @param force 是否强制重新下载，即使缓存有效（默认 false）
+     * @param ignoreOrigin 是否忽略来源检查（默认 false）
+     * @param onProgress 进度回调函数（可选）
      * @returns Promise<Array<{ url: string, success: boolean, filePath?: string, hostPath?: string, mimeType?: string, size?: number, error?: string }>> 返回每个 URL 的缓存结果
      */
-    addCacheUrls(urls: string[], force?: boolean, ignoreOrigin?: boolean): Promise<Array<{
+    addCacheUrls(urls: string[], force?: boolean, ignoreOrigin?: boolean, onProgress?: CacheProgressCallback): Promise<Array<{
         url: string;
         success: boolean;
         filePath?: string;

package/esm/main/resource-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-cache.d.ts","sourceRoot":"","sources":["../../src/main/resource-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resource-cache.d.ts","sourceRoot":"","sources":["../../src/main/resource-cache.ts"],"names":[],"mappings":"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"}

package/esm/main/resource-cache.js

@@ -1,15 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import http from 'node:http';
-import https from 'node:https';
 import md5 from 'md5';
-import ipc__default from '@lynker-desktop/electron-ipc/main';
 import mime from 'mime-types';
+import { ipcMain } from 'electron';
+import { DownloaderHelper } from 'node-downloader-helper';
 
-/**
- * HTTP 重定向状态码
- */
-const REDIRECT_STATUS_CODES = [301, 302, 307, 308];
 /**
  * 默认文件扩展名
  */
@@ -76,14 +71,30 @@ class ResourceCache {
         this._cleanOldCache().catch(err => {
             console.log('初始化时清理过期缓存失败:', err);
         });
-        ipc__default.mainIPC.handleRenderer('core:cache', async (options) => {
+        ipcMain.handle('core:cache', async (event, options) => {
             try {
                 switch (options.method) {
                     case 'clear':
                         return await this.clearCache();
                     case 'add': {
+                        const { id } = options;
+                        const sender = event.sender;
                         const urls = Array.isArray(options.urls) ? options.urls : options.urls ? [options.urls] : [];
-                        const data = await this.addCacheUrls(urls, options.force ?? false, true);
+                        const data = await this.addCacheUrls(urls, options.force ?? false, true, (data) => {
+                            try {
+                                if (sender) {
+                                    if (typeof sender?.send === 'function') {
+                                        sender?.send?.(`core:cache:progress`, {
+                                            id,
+                                            data
+                                        });
+                                    }
+                                }
+                            }
+                            catch (error) {
+                                console.log('发送缓存进度回调失败:', error);
+                            }
+                        });
                         return Array.isArray(options.urls) ? data : data[0];
                     }
                     case 'delete': {
@@ -243,9 +254,10 @@ class ResourceCache {
      * @param url 资源URL
      * @param filePath 本地缓存路径
      * @param redirectCount 当前重定向次数（内部使用）
+     * @param onProgress 下载进度回调函数（可选）
      * @returns Promise<void> 下载完成或失败
      */
-    downloadResourceAsync(url, filePath, redirectCount = 0) {
+    downloadResourceAsync(url, filePath, redirectCount = 0, onProgress) {
         // 检查是否正在下载，避免重复下载
         if (this._downloadingUrls.has(url)) {
             return Promise.reject(new Error(`资源正在下载中: ${url}`));
@@ -257,77 +269,81 @@ class ResourceCache {
         this._downloadingUrls.add(url);
         return new Promise((resolve, reject) => {
             const tempFilePath = `${filePath}.cache`;
-            const lib = url.startsWith('https') ? https : http;
-            const file = fs.createWriteStream(tempFilePath);
-            let request;
-            const cleanupAndAbort = (errMsg, err) => {
-                this._downloadingUrls.delete(url);
-                if (request) {
-                    request.destroy();
+            const downloadDir = path.dirname(tempFilePath);
+            const downloadFileName = path.basename(tempFilePath);
+            // 确保目录存在
+            if (!fs.existsSync(downloadDir)) {
+                fs.mkdirSync(downloadDir, { recursive: true });
+            }
+            // 创建下载器实例
+            const dl = new DownloaderHelper(url, downloadDir, {
+                fileName: downloadFileName,
+                retry: { maxRetries: 3, delay: 1000 },
+                // 超时设置：10 分钟（600000 毫秒）
+                // 对于视频等大文件，需要更长的超时时间
+                // 如果 10 分钟内没有任何数据传输，才会超时
+                timeout: 600000,
+                override: true, // 覆盖已存在的文件
+                httpRequestOptions: {
+                    // 允许重定向
+                    followRedirect: true,
+                    maxRedirects: MAX_REDIRECTS
                 }
-                file.close(() => {
-                    // 异步删除临时文件，不阻塞
-                    fs.promises.unlink(tempFilePath).catch(() => {
-                        // 忽略删除失败
-                    });
-                });
-                const error = err instanceof Error ? err : new Error(errMsg);
-                reject(error);
-            };
-            request = lib.get(url, (res) => {
-                // 处理重定向
-                if (res.statusCode && REDIRECT_STATUS_CODES.includes(res.statusCode)) {
-                    const location = res.headers.location;
-                    if (location) {
-                        request.destroy();
-                        file.close(() => {
-                            // 异步删除临时文件，不阻塞
-                            fs.promises.unlink(tempFilePath).catch(() => {
-                                // 忽略删除失败
-                            });
+            });
+            // 监听下载进度
+            if (onProgress) {
+                dl.on('progress', (stats) => {
+                    try {
+                        // stats 包含: progress (百分比), downloaded (已下载字节), total (总字节), speed (速度)
+                        onProgress({
+                            url,
+                            downloaded: stats.downloaded || 0,
+                            total: stats.total || 0,
+                            percentage: stats.progress !== undefined ? Math.round(stats.progress) : -1,
+                            speed: stats.speed || 0
                         });
-                        this._downloadingUrls.delete(url);
-                        // 递归处理重定向，增加重定向计数
-                        this.downloadResourceAsync(location, filePath, redirectCount + 1).then(resolve).catch(reject);
-                        return;
                     }
-                    // 如果没有 location，继续处理为错误
-                }
-                if (res.statusCode !== 200) {
-                    res.resume(); // 消费响应数据以释放内存
-                    cleanupAndAbort(`下载失败，状态码: ${res.statusCode} for ${url}`);
-                    return;
-                }
-                res.pipe(file);
-            });
-            file.on('finish', () => {
-                file.close((err) => {
-                    if (err) {
-                        return cleanupAndAbort(`关闭临时文件流失败: ${tempFilePath}`, err);
+                    catch (error) {
+                        // 忽略回调中的错误，避免影响下载
+                        console.error('进度回调执行失败:', error);
+                    }
+                });
+            }
+            // 监听下载完成
+            dl.on('end', () => {
+                this._downloadingUrls.delete(url);
+                // 将临时文件重命名为最终文件
+                fs.rename(tempFilePath, filePath, (renameErr) => {
+                    if (renameErr) {
+                        reject(new Error(`缓存文件重命名失败 from ${tempFilePath} to ${filePath}: ${renameErr.message}`));
+                    }
+                    else {
+                        resolve();
                     }
-                    fs.rename(tempFilePath, filePath, (renameErr) => {
-                        this._downloadingUrls.delete(url);
-                        if (renameErr) {
-                            cleanupAndAbort(`缓存文件重命名失败 from ${tempFilePath} to ${filePath}`, renameErr);
-                        }
-                        else {
-                            resolve();
-                        }
-                    });
                 });
             });
-            file.on('error', (err) => {
-                cleanupAndAbort(`写入临时文件失败: ${tempFilePath}`, err);
+            // 监听下载错误
+            dl.on('error', (err) => {
+                this._downloadingUrls.delete(url);
+                // 清理临时文件
+                fs.promises.unlink(tempFilePath).catch(() => {
+                    // 忽略删除失败
+                });
+                reject(err instanceof Error ? err : new Error(`下载失败: ${url}`));
             });
-            request.on('error', (err) => {
-                cleanupAndAbort(`下载资源请求失败: ${url}`, err);
+            // 监听下载停止（取消）
+            dl.on('stop', () => {
+                this._downloadingUrls.delete(url);
+                // 清理临时文件
+                fs.promises.unlink(tempFilePath).catch(() => {
+                    // 忽略删除失败
+                });
+                reject(new Error(`下载已停止: ${url}`));
             });
-            // 添加超时处理（30秒）
-            const timeout = setTimeout(() => {
-                cleanupAndAbort(`下载超时: ${url}`);
-            }, 30000);
-            request.on('close', () => {
-                clearTimeout(timeout);
+            // 开始下载
+            dl.start().catch((err) => {
+                this._downloadingUrls.delete(url);
+                reject(err instanceof Error ? err : new Error(`启动下载失败: ${url}`));
             });
         });
     }
@@ -418,10 +434,12 @@ class ResourceCache {
      * 手动缓存指定 URL 的资源
      * @param url 要缓存的资源 URL（支持普通 URL 和 base64 data URL）
      * @param force 是否强制重新下载，即使缓存有效（默认 false）
+     * @param ignoreOrigin 是否忽略来源检查（默认 false）
+     * @param onDownloadProgress 下载进度回调函数（可选）
      * @returns Promise<{ filePath: string, hostPath: string, mimeType: string, size: number }> 返回缓存文件路径、主机路径、MIME 类型和文件大小
      * @throws 如果 URL 不匹配缓存规则或来源不允许，会抛出错误
      */
-    async cacheUrl(url, force = false, ignoreOrigin = false) {
+    async cacheUrl(url, force = false, ignoreOrigin = false, onDownloadProgress) {
         // 检查是否是 base64 data URL
         const base64Info = this._isBase64DataUrl(url);
         if (base64Info.isBase64) {
@@ -452,7 +470,7 @@ class ResourceCache {
             };
         }
         // 处理普通 URL
-        const shouldCache = this._getMatchFunction();
+        const shouldCache = ignoreOrigin ? () => true : this._getMatchFunction();
         const isAllowedOrigin = ignoreOrigin ? () => true : this._getOriginAllowFunction();
         // 检查是否匹配缓存规则
         if (!shouldCache(url)) {
@@ -477,7 +495,7 @@ class ResourceCache {
             };
         }
         // 下载资源
-        await this.downloadResourceAsync(url, cachePath.filePath);
+        await this.downloadResourceAsync(url, cachePath.filePath, 0, onDownloadProgress);
         // 获取文件大小
         const stats = await fs.promises.stat(cachePath.filePath);
         return {
@@ -490,30 +508,109 @@ class ResourceCache {
      * 批量缓存多个 URL 的资源
      * @param urls 要缓存的资源 URL 数组
      * @param force 是否强制重新下载，即使缓存有效（默认 false）
+     * @param ignoreOrigin 是否忽略来源检查（默认 false）
+     * @param onProgress 进度回调函数（可选）
      * @returns Promise<Array<{ url: string, success: boolean, filePath?: string, hostPath?: string, mimeType?: string, size?: number, error?: string }>> 返回每个 URL 的缓存结果
      */
-    async addCacheUrls(urls, force = false, ignoreOrigin = false) {
-        const results = await Promise.allSettled(urls.map(url => this.cacheUrl(url, force, ignoreOrigin)));
-        return results.map((result, index) => {
-            const url = urls[index] || '';
-            if (result.status === 'fulfilled') {
-                return {
+    async addCacheUrls(urls, force = false, ignoreOrigin = false, onProgress) {
+        const total = urls.length;
+        const results = [];
+        let completed = 0;
+        // 存储每个 URL 的下载进度
+        const downloadProgressMap = new Map();
+        // 进度回调的包装函数，确保线程安全
+        const reportProgress = (url, success, result) => {
+            if (onProgress) {
+                completed++;
+                const downloadProgress = downloadProgressMap.get(url);
+                onProgress({
+                    current: completed,
+                    total,
+                    url,
+                    success,
+                    result,
+                    percentage: Math.round((completed / total) * 100),
+                    downloadProgress: downloadProgress ? {
+                        downloaded: downloadProgress.downloaded,
+                        total: downloadProgress.total,
+                        percentage: downloadProgress.percentage,
+                        speed: downloadProgress.speed
+                    } : undefined
+                });
+            }
+        };
+        // 并行处理所有 URL，但跟踪每个的完成状态
+        const promises = urls.map(async (url, index) => {
+            // 为每个 URL 创建下载进度回调
+            const onDownloadProgress = onProgress
+                ? (progress) => {
+                    // 更新下载进度
+                    downloadProgressMap.set(url, {
+                        downloaded: progress.downloaded,
+                        total: progress.total,
+                        percentage: progress.percentage,
+                        speed: progress.speed
+                    });
+                    // 实时报告下载进度（不增加 completed 计数）
+                    if (onProgress) {
+                        onProgress({
+                            current: completed,
+                            total,
+                            url,
+                            success: true, // 下载中视为进行中
+                            result: undefined,
+                            percentage: Math.round((completed / total) * 100),
+                            downloadProgress: {
+                                downloaded: progress.downloaded,
+                                total: progress.total,
+                                percentage: progress.percentage,
+                                speed: progress.speed
+                            }
+                        });
+                    }
+                }
+                : undefined;
+            try {
+                const result = await this.cacheUrl(url, force, ignoreOrigin, onDownloadProgress);
+                const item = {
                     url,
                     success: true,
-                    filePath: result.value.filePath,
-                    hostPath: result.value.hostPath,
-                    mimeType: result.value.mimeType,
-                    size: result.value.size
+                    filePath: result.filePath,
+                    hostPath: result.hostPath,
+                    mimeType: result.mimeType,
+                    size: result.size
                 };
+                results[index] = item;
+                // 清除下载进度（已完成）
+                downloadProgressMap.delete(url);
+                // 调用进度回调
+                reportProgress(url, true, {
+                    filePath: result.filePath,
+                    hostPath: result.hostPath,
+                    mimeType: result.mimeType,
+                    size: result.size
+                });
+                return item;
             }
-            else {
-                return {
+            catch (error) {
+                const item = {
                     url,
                     success: false,
-                    error: result.reason?.message || '未知错误'
+                    error: error instanceof Error ? error.message : '未知错误'
                 };
+                results[index] = item;
+                // 清除下载进度（失败）
+                downloadProgressMap.delete(url);
+                // 调用进度回调
+                reportProgress(url, false, {
+                    error: item.error
+                });
+                return item;
             }
         });
+        // 等待所有请求完成
+        await Promise.allSettled(promises);
+        return results;
     }
     /**
      * 删除多个 URL 的资源