stellar-ui-plus 1.25.7 → 1.25.8

package/components/ste-app-update/method.ts

@@ -39,13 +39,9 @@ interface DownloadOptions {
     onProgressUpdate?: (res: UniApp.OnProgressDownloadResult) => void;
 }
 
-export function download(
-    data: ClientData,
-    options: DownloadOptions
-): UniApp.DownloadTask {
+export function download(data: ClientData, options: DownloadOptions): any {
     const { success, error, downloadSuccess, onProgressUpdate } = options;
 
-    // 参数验证
     if (!data.updateFile) {
         const errorMsg = '更新文件地址不能为空';
         uni.showToast({ title: errorMsg, icon: 'none' });
@@ -54,15 +50,110 @@ export function download(
     }
 
     const package_type = data.package_type;
+
+    // #ifdef APP-PLUS
     let timeout: ReturnType<typeof setTimeout>;
 
+    const task = plus.downloader.createDownload(
+        data.updateFile,
+        {
+            filename: '_downloads/stellar_update/',
+        },
+        (download, status) => {
+            clearTimeout(timeout);
+
+            if (status === 200) {
+                if (!download.filename) {
+                    const errorMsg = '下载文件路径为空';
+                    uni.showToast({ title: errorMsg, icon: 'none' });
+                    error?.(new Error(errorMsg));
+                    return;
+                }
+
+                downloadSuccess?.(download.filename);
+
+                plus.runtime.install(
+                    download.filename,
+                    { force: true },
+                    () => {
+                        if (package_type == 1) {
+                            uni.showModal({
+                                title: '提示',
+                                content: '升级成功，请重新启动！',
+                                confirmText: '确定',
+                                showCancel: false,
+                                success: () => {
+                                    success?.();
+                                    plus.runtime.restart();
+                                },
+                            });
+                        } else {
+                            success?.();
+                        }
+                    },
+                    e => {
+                        const errorMsg = e.message || '安装失败';
+                        uni.showModal({
+                            title: '提示',
+                            content: errorMsg,
+                            showCancel: false,
+                            success: () => {
+                                error?.(e);
+                            },
+                        });
+                    }
+                );
+            } else {
+                const errorMsg = `下载失败，状态码：${status}`;
+                uni.showToast({ title: errorMsg, icon: 'none' });
+                error?.(new Error(errorMsg));
+            }
+        }
+    );
+
+    task.addEventListener('statechanged', (download: any) => {
+        if (download.state === 3 && download.totalSize > 0) {
+            const progress = Math.round((download.downloadedSize / download.totalSize) * 100);
+            onProgressUpdate?.({
+                progress,
+                totalBytesWritten: download.downloadedSize,
+                totalBytesExpectedToWrite: download.totalSize,
+            } as UniApp.OnProgressDownloadResult);
+
+            clearTimeout(timeout);
+            timeout = setTimeout(() => {
+                task.abort();
+                const errorMsg = '下载超时，请检查网络连接';
+                uni.showToast({ title: errorMsg, icon: 'none' });
+                error?.(new Error(errorMsg));
+            }, 300000);
+        }
+
+        if (download.state === 4 || download.state === -1) {
+            clearTimeout(timeout);
+        }
+    });
+
+    timeout = setTimeout(() => {
+        task.abort();
+        const errorMsg = '下载超时，请检查网络连接';
+        uni.showToast({ title: errorMsg, icon: 'none' });
+        error?.(new Error(errorMsg));
+    }, 300000);
+
+    task.start();
+    return task;
+    // #endif
+
+    // #ifndef APP-PLUS
+    let timeoutFallback: ReturnType<typeof setTimeout>;
+
     const downloadTask = uni.downloadFile({
         url: data.updateFile,
         success: res => {
-            clearTimeout(timeout);
+            clearTimeout(timeoutFallback);
 
             if (res.statusCode === 200) {
-                // 文件完整性检查
                 if (!res.tempFilePath) {
                     const errorMsg = '下载文件路径为空';
                     uni.showToast({ title: errorMsg, icon: 'none' });
@@ -88,7 +179,6 @@ export function download(
                                 },
                             });
                         } else {
-                            // 整包升级时，执行到此处更新并未完成，只是弹出了安装提示，无法获悉用户是否安装了更新包，若是在此处清除资源，会导致升级包被删除，后续流程无法继续执行
                             success?.();
                         }
                     },
@@ -110,33 +200,29 @@ export function download(
                 error?.(new Error(errorMsg));
             }
         },
-        fail: (err) => {
-            clearTimeout(timeout);
+        fail: err => {
+            clearTimeout(timeoutFallback);
             const errorMsg = `网络请求失败：${err.errMsg || '未知错误'}`;
             uni.showToast({ title: errorMsg, icon: 'none' });
             error?.(err);
-        }
+        },
     });
 
-    // 下载进度监控
     downloadTask.onProgressUpdate(res => {
-        // 添加进度验证
         if (res.progress >= 0 && res.progress <= 100) {
             onProgressUpdate?.(res);
         }
 
-        // 重置超时计时器
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
+        clearTimeout(timeoutFallback);
+        timeoutFallback = setTimeout(() => {
             downloadTask.abort();
             const errorMsg = '下载超时，请检查网络连接';
             uni.showToast({ title: errorMsg, icon: 'none' });
             error?.(new Error(errorMsg));
-        }, 300000); // 5分钟超时
+        }, 300000);
     });
 
-    // 初始超时设置
-    timeout = setTimeout(() => {
+    timeoutFallback = setTimeout(() => {
         downloadTask.abort();
         const errorMsg = '下载超时，请检查网络连接';
         uni.showToast({ title: errorMsg, icon: 'none' });
@@ -144,6 +230,7 @@ export function download(
     }, 300000);
 
     return downloadTask;
+    // #endif
 }
 
 // 获取设备唯一标识
@@ -187,4 +274,86 @@ export const getVersion = (appVersion: string): Promise<string> => {
             });
         }
     });
-};
+};
+
+export interface DownloadState {
+    versionCode: string;
+    updateFile: string;
+    startTime: number;
+}
+
+const DOWNLOAD_STATE_KEY = 'app_update_download_state';
+export const DOWNLOAD_TIMEOUT = 30 * 60 * 1000;
+
+export const saveDownloadState = (state: DownloadState): void => {
+    try {
+        uni.setStorageSync(DOWNLOAD_STATE_KEY, JSON.stringify(state));
+    } catch (e) {
+        console.warn('保存下载状态失败:', e);
+    }
+};
+
+export const getDownloadState = (): DownloadState | null => {
+    try {
+        const stored = uni.getStorageSync(DOWNLOAD_STATE_KEY);
+        if (stored) {
+            return JSON.parse(stored);
+        }
+    } catch (e) {
+        console.warn('读取下载状态失败:', e);
+    }
+    return null;
+};
+
+export const clearDownloadState = (): void => {
+    try {
+        uni.removeStorageSync(DOWNLOAD_STATE_KEY);
+    } catch (e) {
+        console.warn('清除下载状态失败:', e);
+    }
+};
+
+export const isDownloadStateExpired = (state: DownloadState): boolean => {
+    return Date.now() - state.startTime > DOWNLOAD_TIMEOUT;
+};
+
+export interface ExistingDownloadTask {
+    task: any;
+    state: number;
+    filename: string;
+}
+
+export const findExistingDownloadTask = (url: string): Promise<ExistingDownloadTask | null> => {
+    return new Promise(resolve => {
+        // #ifdef APP-PLUS
+        plus.downloader.enumerate((tasks: any[]) => {
+            if (!tasks || !tasks.length) {
+                resolve(null);
+                return;
+            }
+            for (let i = tasks.length - 1; i >= 0; i--) {
+                const task = tasks[i];
+                if (task.url === url) {
+                    if (task.state === 0 || task.state === 1 || task.state === 2 || task.state === 3 || task.state === 4) {
+                        resolve({ task, state: task.state, filename: task.filename || '' });
+                        return;
+                    }
+                    if (task.state === -1) {
+                        try {
+                            task.abort();
+                        } catch (_) {}
+                    }
+                    break;
+                }
+            }
+            // #endif
+            resolve(null);
+            // #ifdef APP-PLUS
+        });
+        // #endif
+
+        // #ifndef APP-PLUS
+        resolve(null);
+        // #endif
+    });
+};

package/components/ste-app-update/ste-app-update.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive, onUnmounted } from 'vue';
 import propsData from './props';
-import { type ClientData, type ResponseData, download as downloadMethod, getAppId, getDeviceId, getPlatform, getVersion } from './method';
+import { type ClientData, type ResponseData, download as downloadMethod, getAppId, getDeviceId, getPlatform, getVersion, saveDownloadState, getDownloadState, clearDownloadState, isDownloadStateExpired, findExistingDownloadTask } from './method';
 
 // 类型定义
 interface AppUpdateData extends ClientData {
@@ -34,7 +34,10 @@ const tempFilePath = ref('');
 
 // 资源管理
 let timeoutTimer: ReturnType<typeof setTimeout> | null = null;
-let downloadTask: UniApp.DownloadTask | null = null;
+let downloadTask: any = null;
+let nativeDownloadTask: any = null;
+let nativeDownloadListener: ((download: any) => void) | null = null;
+let progressPollTimer: ReturnType<typeof setInterval> | null = null;
 
 // 跳过版本相关
 const skippedVersions = ref<string[]>([]);
@@ -103,12 +106,29 @@ const skipVersion = () => {
 };
 
 // 清理函数
+const stopProgressPolling = () => {
+    if (progressPollTimer) {
+        clearInterval(progressPollTimer);
+        progressPollTimer = null;
+    }
+};
+
 const cleanup = () => {
     if (timeoutTimer) {
         clearTimeout(timeoutTimer);
         timeoutTimer = null;
     }
+    stopProgressPolling();
+    // #ifdef APP-PLUS
+    if (nativeDownloadTask && nativeDownloadListener) {
+        try {
+            nativeDownloadTask.removeEventListener('statechanged', nativeDownloadListener);
+        } catch (_) { }
+    }
+    // #endif
     downloadTask = null;
+    nativeDownloadTask = null;
+    nativeDownloadListener = null;
 };
 
 // 组件卸载时清理资源
@@ -116,7 +136,7 @@ onUnmounted(() => {
     cleanup();
 });
 
-const getData = (callback?: (resVersion: { name: string; code: string; updateFile: string }, version: string) => void) => {
+const getData = async (callback?: (resVersion: { name: string; code: string; updateFile: string }, version: string) => void) => {
     // 参数验证
     if (!props.apiUrl) {
         console.error('API地址不能为空');
@@ -130,7 +150,7 @@ const getData = (callback?: (resVersion: { name: string; code: string; updateFil
         header: {
             Authorization: `Basic ${btoa(props.clientId + ':' + props.clientSecret)}`,
         },
-        success: (res: any) => {
+        success: async (res: any) => {
             try {
                 const _data: {
                     code: number;
@@ -187,6 +207,36 @@ const getData = (callback?: (resVersion: { name: string; code: string; updateFil
                     }
 
                     if (data.updateFile && data.code !== version.value) {
+                        const downloadState = getDownloadState();
+                        const hasValidDownloadState = downloadState
+                            && downloadState.versionCode === data.code
+                            && downloadState.updateFile === data.updateFile
+                            && !isDownloadStateExpired(downloadState);
+
+                        if (hasValidDownloadState) {
+                            const existing = await findExistingDownloadTask(data.updateFile);
+
+                            if (existing) {
+                                open.value = true;
+                                emits('update');
+                                if (existing.state === 0 || existing.state === 1 || existing.state === 2 || existing.state === 3) {
+                                    updateBtn.value = false;
+                                    resumeDownloadProgress(existing.task);
+                                } else if (existing.state === 4) {
+                                    updateBtn.value = false;
+                                    tempFilePath.value = existing.filename;
+                                    if (data.package_type === 1 && existing.filename) {
+                                        installWgt(existing.filename);
+                                    }
+                                }
+                                return;
+                            }
+                        }
+
+                        if (downloadState) {
+                            clearDownloadState();
+                        }
+
                         open.value = true;
                         emits('update');
                         if (data.isForce) confirm();
@@ -279,11 +329,11 @@ const start = async (callback?: (resVersion: { name: string; code: string; updat
 
     const v = await getVersion(props.appVersion);
     if (v) version.value = v;
-
+    // #ifdef APP-PLUS
     // 兜底检查：如果配置了 fallbackApiUrl，先调兜底接口
     const hit = await checkFallback();
     if (hit) return; // 命中兜底，不继续正常流程
-
+    // #endif
     // 正常更新流程
     getData(callback);
 };
@@ -297,16 +347,102 @@ const onProgressUpdate = (res: UniApp.OnProgressDownloadResult) => {
     }
 };
 
-const confirm = () => {
-    // 先清理之前的任务
+const resumeDownloadProgress = (task: any) => {
+    // #ifdef APP-PLUS
+    if (nativeDownloadTask && nativeDownloadListener) {
+        nativeDownloadTask.removeEventListener('statechanged', nativeDownloadListener);
+    }
+    stopProgressPolling();
+
+    nativeDownloadTask = task;
+
+    const updateProgress = () => {
+        if (task.downloadedSize !== undefined && task.totalSize > 0) {
+            percent.value = Math.round((task.downloadedSize / task.totalSize) * 100);
+            downloadedSize.value = (task.downloadedSize / Math.pow(1024, 2)).toFixed(2);
+            packageFileSize.value = (task.totalSize / Math.pow(1024, 2)).toFixed(2);
+        }
+    };
+    updateProgress();
+
+    nativeDownloadListener = (download: any) => {
+        if (download.state === 4) {
+            stopProgressPolling();
+            percent.value = 100;
+            downloadedSize.value = packageFileSize.value;
+            tempFilePath.value = download.filename;
+            if (open.value && data.package_type === 1 && download.filename) {
+                installWgt(download.filename);
+            }
+        } else if (download.state === -1) {
+            stopProgressPolling();
+            updateBtn.value = true;
+            clearDownloadState();
+            cleanup();
+        }
+    };
+
+    task.addEventListener('statechanged', nativeDownloadListener);
+
+    if (task.state === 3) {
+        progressPollTimer = setInterval(updateProgress, 500);
+    }
+
+    if (task.state === 0) {
+        task.start();
+    }
+    // #endif
+};
+
+const installWgt = (filePath: string) => {
+    // #ifdef APP-PLUS
+    plus.runtime.install(
+        filePath,
+        { force: true },
+        () => {
+            uni.showModal({
+                title: '提示',
+                content: '升级成功，请重新启动！',
+                confirmText: '确定',
+                showCancel: false,
+                success: () => {
+                    clearDownloadState();
+                    plus.runtime.restart();
+                },
+            });
+        },
+        e => {
+            uni.showModal({
+                title: '安装失败',
+                content: e.message || '安装过程中出现错误',
+                showCancel: false,
+            });
+        }
+    );
+    // #endif
+};
+
+const confirm = async () => {
     cleanup();
 
-    // 参数验证
     if (!data.updateFile) {
         uni.showToast({ title: '更新文件地址不能为空', icon: 'none' });
         return;
     }
 
+    // #ifdef APP-PLUS
+    const stale = await findExistingDownloadTask(data.updateFile);
+    if (stale) {
+        try { stale.task.abort(); } catch (_) { }
+    }
+    // #endif
+
+    saveDownloadState({
+        versionCode: data.code,
+        updateFile: data.updateFile,
+        startTime: Date.now(),
+    });
+
     if (data.package_type == 0) {
         if (data.updateFile.includes('.apk')) {
             updateBtn.value = false;
@@ -315,9 +451,11 @@ const confirm = () => {
                 downloadSuccess: path => (tempFilePath.value = path),
                 error: () => {
                     updateBtn.value = true;
+                    clearDownloadState();
                     cleanup();
                 },
                 success: () => {
+                    clearDownloadState();
                     cleanup();
                 },
             });
@@ -334,9 +472,11 @@ const confirm = () => {
             downloadSuccess: path => (tempFilePath.value = path),
             error: () => {
                 updateBtn.value = true;
+                clearDownloadState();
                 cleanup();
             },
             success: () => {
+                clearDownloadState();
                 cleanup();
             },
         });
@@ -359,6 +499,7 @@ const install = () => {
         tempFilePath.value,
         { force: true },
         () => {
+            clearDownloadState();
             if (data.package_type == 1) {
                 uni.showModal({
                     title: '提示',
@@ -388,10 +529,10 @@ const cancelDownload = () => {
         content: '确定要取消下载吗？',
         success: res => {
             if (res.confirm) {
-                // 取消下载时才 abort 下载任务
                 if (downloadTask) {
-                    downloadTask.abort();
+                    try { downloadTask.abort(); } catch (_) { }
                 }
+                clearDownloadState();
                 cleanup();
                 updateBtn.value = true;
                 percent.value = 0;
@@ -432,7 +573,8 @@ defineExpose({
             <view class="update-footer">
                 <view class="update-progress-box" v-if="!updateBtn">
                     <view class="progress-container">
-                        <progress class="update-progress" border-radius="35" :percent="percent" activeColor="#3DA7FF" backgroundColor="#f0f0f0" show-info stroke-width="12" />
+                        <progress class="update-progress" border-radius="35" :percent="percent" activeColor="#3DA7FF"
+                            backgroundColor="#f0f0f0" show-info stroke-width="12" />
                         <view class="progress-text">{{ percent }}%</view>
                     </view>
 
@@ -441,10 +583,12 @@ defineExpose({
                             <text class="success-icon">✓</text>
                             下载完成，准备安装...
                         </text>
-                        <text class="update-down-msg" v-else>正在下载，请稍后 ({{ downloadedSize }}/{{ packageFileSize }}MB)</text>
+                        <text class="update-down-msg" v-else>正在下载，请稍后 ({{ downloadedSize }}/{{ packageFileSize
+                            }}MB)</text>
                     </view>
 
-                    <button v-if="!tempFilePath && !data.isForce" class="cancel-download-btn" @click="cancelDownload">取消下载</button>
+                    <button v-if="!tempFilePath && !data.isForce" class="cancel-download-btn"
+                        @click="cancelDownload">取消下载</button>
                 </view>
 
                 <template v-if="updateBtn">
@@ -456,7 +600,8 @@ defineExpose({
                     <button v-if="!data.isForce" class="update-button skip" plain @click="skipVersion">跳过此版本</button>
                 </template>
 
-                <button class="update-button secondary" plain @click="install" v-else-if="data.package_type === 0 && tempFilePath">立即安装</button>
+                <button class="update-button secondary" plain @click="install"
+                    v-else-if="data.package_type === 0 && tempFilePath">立即安装</button>
             </view>
 
             <view class="update-close" v-if="!data.isForce" @click.stop="close">✖</view>