vk-ssl-auto-deploy 0.8.5 → 0.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vk-ssl-auto-deploy",
-	"version": "0.8.5",
+	"version": "0.8.7",
 	"description": "SSL证书自动部署工具 - 提供HTTP API接口，支持证书文件自动上传和部署",
 	"main": "app.js",
 	"scripts": {

package/routes/admin.js

@@ -410,4 +410,95 @@ router.get('/api/cert/download/:fileName', verifyPassword, (req, res) => {
 	}
 });
 
+// 检查更新
+router.post('/check-update', verifyPassword, async (req, res) => {
+	try {
+		const https = require('https');
+		const currentVersion = require('../package.json').version;
+		
+		// 获取远程 package.json
+		const remoteUrl = 'https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/package.json';
+		
+		https.get(remoteUrl, (response) => {
+			let data = '';
+			
+			response.on('data', (chunk) => {
+				data += chunk;
+			});
+			
+			response.on('end', () => {
+				try {
+					const remotePackage = JSON.parse(data);
+					const remoteVersion = remotePackage.version;
+					
+					const hasUpdate = currentVersion !== remoteVersion;
+					
+					res.json({
+						code: 0,
+						msg: hasUpdate ? '发现新版本' : '已是最新版本',
+						data: {
+							currentVersion,
+							remoteVersion,
+							hasUpdate
+						}
+					});
+				} catch (error) {
+					res.status(500).json({
+						code: 500,
+						msg: '解析远程版本信息失败: ' + error.message,
+						data: null
+					});
+				}
+			});
+		}).on('error', (error) => {
+			res.status(500).json({
+				code: 500,
+				msg: '获取远程版本信息失败: ' + error.message,
+				data: null
+			});
+		});
+	} catch (error) {
+		res.status(500).json({
+			code: 500,
+			msg: '检查更新失败: ' + error.message,
+			data: null
+		});
+	}
+});
+
+// 获取更新命令
+router.post('/execute-update', verifyPassword, async (req, res) => {
+	try {
+		const platform = process.platform;
+		let command, instructions;
+		
+		if (platform === 'win32') {
+			// Windows 系统
+			command = 'powershell -ExecutionPolicy Bypass -Command "iwr -useb https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/install.ps1 | iex"';
+			instructions = '请以管理员身份打开 PowerShell，然后执行以下命令：';
+		} else {
+			// Linux/Unix 系统
+			command = 'curl -fsSL https://gitee.com/vk1688/vk-ssl-auto-deploy/raw/master/install.sh | sudo bash';
+			instructions = '请在服务器终端中执行以下命令：';
+		}
+		
+		res.json({
+			code: 0,
+			msg: '请手动在服务器上执行更新命令',
+			data: {
+				platform: platform === 'win32' ? 'Windows' : 'Linux/Unix',
+				instructions,
+				command,
+				note: '更新完成后程序将自动重启'
+			}
+		});
+	} catch (error) {
+		res.status(500).json({
+			code: 500,
+			msg: '获取更新命令失败: ' + error.message,
+			data: null
+		});
+	}
+});
+
 module.exports = router;

package/views/admin.ejs

@@ -363,7 +363,7 @@
         /* 操作面板按钮组 */
         .operation-buttons {
             display: grid;
-            grid-template-columns: 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr;
             gap: 15px;
             margin-top: 20px;
         }
@@ -372,6 +372,31 @@
             width: 100%;
             height: 60px;
             font-size: 1em;
+            position: relative;
+        }
+
+        /* 红点提示 */
+        .update-badge {
+            position: absolute;
+            top: 8px;
+            right: 8px;
+            width: 10px;
+            height: 10px;
+            background: #f44336;
+            border-radius: 50%;
+            box-shadow: 0 0 0 2px #ff0000, 0 0 10px rgba(244, 67, 54, 0.6);
+            animation: pulse-badge 2s infinite;
+        }
+
+        @keyframes pulse-badge {
+            0%, 100% { 
+                transform: scale(1);
+                opacity: 1;
+            }
+            50% { 
+                transform: scale(1.2);
+                opacity: 0.8;
+            }
         }
 
         /* 弹窗样式 */
@@ -569,6 +594,28 @@
             }
         }
 
+        @keyframes slideIn {
+            from {
+                opacity: 0;
+                transform: translateX(100px);
+            }
+            to {
+                opacity: 1;
+                transform: translateX(0);
+            }
+        }
+
+        @keyframes slideOut {
+            from {
+                opacity: 1;
+                transform: translateX(0);
+            }
+            to {
+                opacity: 0;
+                transform: translateX(100px);
+            }
+        }
+
         .dialog-title {
             font-size: 1.5em;
             color: #00ff88;
@@ -622,6 +669,9 @@
                     <button onclick="executeUpdate()">
                         更新证书
                     </button>
+                    <button id="updateBtn" onclick="checkForUpdates()">
+                        软件更新
+                    </button>
                 </div>
                 
                 <div style="margin-top: 30px; padding-top: 30px; border-top: 1px solid rgba(255, 255, 255, 0.05);">
@@ -890,6 +940,7 @@
             connectWebSocket();
             startScheduleInfoSync();
             updateCallbackApiUrl();
+            checkForUpdates(true); // 静默检查更新
             
             // 搜索框事件
             document.getElementById('certSearch').addEventListener('input', filterCerts);
@@ -1206,6 +1257,220 @@
             }
         }
 
+        // 检查程序更新
+        async function checkForUpdates(silent = false) {
+            if (!silent) {
+                addLog('→ 正在检查更新...', 'info');
+            }
+            
+            try {
+                const response = await authenticatedFetch('/admin/check-update', {
+                    method: 'POST'
+                });
+                const result = await response.json();
+                
+                if (result.code === 0) {
+                    const { currentVersion, remoteVersion, hasUpdate } = result.data;
+                    
+                    if (hasUpdate) {
+                        // 显示红点提示
+                        const updateBtn = document.getElementById('updateBtn');
+                        if (updateBtn && !updateBtn.querySelector('.update-badge')) {
+                            const badge = document.createElement('span');
+                            badge.className = 'update-badge';
+                            updateBtn.appendChild(badge);
+                        }
+                        
+                        if (!silent) {
+                            addLog(`✓ 发现新版本: ${remoteVersion} (当前版本: ${currentVersion})`, 'success');
+                            // 直接显示更新命令弹窗
+                            await performUpdate(currentVersion, remoteVersion);
+                        }
+                    } else {
+                        // 移除红点（如果有）
+                        const updateBtn = document.getElementById('updateBtn');
+                        if (updateBtn) {
+                            const badge = updateBtn.querySelector('.update-badge');
+                            if (badge) {
+                                badge.remove();
+                            }
+                        }
+                        
+                        if (!silent) {
+                            addLog(`✓ 已是最新版本: ${currentVersion}`, 'success');
+                            showAlert('检查更新', `当前已是最新版本 ${currentVersion}`, 'success');
+                        }
+                    }
+                } else {
+                    if (!silent) {
+                        addLog('✗ 检查更新失败: ' + result.msg, 'error');
+                        showAlert('检查更新失败', result.msg, 'error');
+                    }
+                }
+            } catch (error) {
+                if (error.message !== '未设置密码' && error.message !== '密码验证失败') {
+                    if (!silent) {
+                        addLog('✗ 检查更新失败: ' + error.message, 'error');
+                        showAlert('检查更新失败', error.message, 'error');
+                    }
+                }
+            }
+        }
+
+        // 执行更新
+        async function performUpdate(currentVersion = '', remoteVersion = '') {
+            addLog('→ 获取更新命令...', 'info');
+            
+            try {
+                const response = await authenticatedFetch('/admin/execute-update', {
+                    method: 'POST'
+                });
+                const result = await response.json();
+                
+                if (result.code === 0) {
+                    const { platform, instructions, command, note } = result.data;
+                    
+                    addLog('✓ 已获取更新命令', 'success');
+                    
+                    // 显示更新命令弹窗
+                    showUpdateCommandDialog(instructions, command, note, currentVersion, remoteVersion);
+                } else {
+                    addLog('✗ 获取更新命令失败: ' + result.msg, 'error');
+                    showAlert('获取更新命令失败', result.msg, 'error');
+                }
+            } catch (error) {
+                if (error.message !== '未设置密码' && error.message !== '密码验证失败') {
+                    addLog('✗ 获取更新命令失败: ' + error.message, 'error');
+                    showAlert('获取更新命令失败', error.message, 'error');
+                }
+            }
+        }
+
+        // 显示更新命令对话框
+        function showUpdateCommandDialog(instructions, command, note, currentVersion = '', remoteVersion = '') {
+            const dialog = document.getElementById('customDialog');
+            const dialogTitle = document.getElementById('dialogTitleText');
+            const dialogMessage = document.getElementById('dialogMessage');
+            const dialogButtons = document.getElementById('dialogButtons');
+            const dialogIcon = document.getElementById('dialogIcon');
+            
+            dialogIcon.textContent = '🔄';
+            dialogTitle.textContent = '手动执行更新';
+            
+            // 版本信息HTML（如果有版本号才显示）
+            let versionInfo = '';
+            if (currentVersion && remoteVersion) {
+                versionInfo = `
+                    <div style="margin-bottom: 20px; padding: 12px; background: rgba(0, 255, 136, 0.1); border-radius: 8px; border: 1px solid rgba(0, 255, 136, 0.3);">
+                        <div style="display: flex; justify-content: space-between; align-items: center;">
+                            <div>
+                                <span style="color: #888; font-size: 14px;">当前版本：</span>
+                                <span style="color: #00ff88; font-weight: bold;">${currentVersion}</span>
+                            </div>
+                            <div style="color: #00ff88; font-size: 20px;">→</div>
+                            <div>
+                                <span style="color: #888; font-size: 14px;">最新版本：</span>
+                                <span style="color: #00ff88; font-weight: bold;">${remoteVersion}</span>
+                            </div>
+                        </div>
+                    </div>
+                `;
+            }
+            
+            // 创建自定义消息内容
+            dialogMessage.innerHTML = `
+                <div style="text-align: left; line-height: 1.8;">
+                    ${versionInfo}
+                    <p style="margin-bottom: 15px; color: #aaa;">${instructions}</p>
+                    <div style="position: relative; background: rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 255, 136, 0.3); border-radius: 8px; padding: 15px 15px 50px 15px; margin: 15px 0; font-family: 'Consolas', 'Monaco', monospace;">
+                        <pre style="margin: 0; color: #00ff88; word-wrap: break-word; white-space: pre-wrap; font-size: 13px; line-height: 1.6;">${command}</pre>
+                        <button onclick="copyCommand('${command.replace(/'/g, "\\'")}')" style="position: absolute; bottom: 10px; right: 10px; padding: 8px 16px; background: rgba(0, 255, 136, 0.2); border: 1px solid rgba(0, 255, 136, 0.5); border-radius: 5px; color: #00ff88; cursor: pointer; font-size: 13px; font-weight: bold; transition: all 0.2s;" onmouseover="this.style.background='rgba(0, 255, 136, 0.3)'; this.style.transform='translateY(-2px)'; this.style.boxShadow='0 4px 12px rgba(0, 255, 136, 0.3)'" onmouseout="this.style.background='rgba(0, 255, 136, 0.2)'; this.style.transform='translateY(0)'; this.style.boxShadow='none'">📋 复制命令</button>
+                    </div>
+                    <p style="margin-top: 15px; color: #888; font-size: 14px;">💡 ${note}</p>
+                </div>
+            `;
+            
+            // 创建关闭按钮
+            dialogButtons.innerHTML = '';
+            const closeBtn = document.createElement('button');
+            closeBtn.textContent = '关闭';
+            closeBtn.onclick = () => {
+                dialog.classList.remove('show');
+            };
+            dialogButtons.appendChild(closeBtn);
+            
+            dialog.classList.add('show');
+        }
+
+        // 复制命令到剪贴板
+        function copyCommand(command) {
+            // 解码转义的单引号
+            const decodedCommand = command.replace(/\\'/g, "'");
+            
+            // 使用现代 Clipboard API
+            if (navigator.clipboard && window.isSecureContext) {
+                navigator.clipboard.writeText(decodedCommand).then(() => {
+                    addLog('✓ 命令已复制到剪贴板', 'success');
+                    showTempMessage('命令已复制！');
+                }).catch(err => {
+                    console.error('复制失败:', err);
+                    fallbackCopyCommand(decodedCommand);
+                });
+            } else {
+                // 降级方案
+                fallbackCopyCommand(decodedCommand);
+            }
+        }
+
+        // 降级复制方法
+        function fallbackCopyCommand(command) {
+            const textArea = document.createElement("textarea");
+            textArea.value = command;
+            textArea.style.position = "fixed";
+            textArea.style.left = "-999999px";
+            document.body.appendChild(textArea);
+            textArea.select();
+            
+            try {
+                document.execCommand('copy');
+                addLog('✓ 命令已复制到剪贴板', 'success');
+                showTempMessage('命令已复制！');
+            } catch (err) {
+                console.error('复制失败:', err);
+                addLog('✗ 复制失败，请手动复制', 'error');
+            }
+            
+            document.body.removeChild(textArea);
+        }
+
+        // 显示临时提示消息
+        function showTempMessage(message) {
+            const tempMsg = document.createElement('div');
+            tempMsg.textContent = message;
+            tempMsg.style.cssText = `
+                position: fixed;
+                top: 20px;
+                right: 20px;
+                background: rgba(0, 255, 136, 0.9);
+                color: #000;
+                padding: 12px 24px;
+                border-radius: 8px;
+                font-weight: bold;
+                z-index: 10001;
+                animation: slideIn 0.3s ease-out;
+                box-shadow: 0 4px 12px rgba(0, 255, 136, 0.3);
+            `;
+            
+            document.body.appendChild(tempMsg);
+            
+            setTimeout(() => {
+                tempMsg.style.animation = 'slideOut 0.3s ease-in';
+                setTimeout(() => {
+                    document.body.removeChild(tempMsg);
+                }, 300);
+            }, 2000);
+        }
+
         // 同步定时任务信息
         function startScheduleInfoSync() {
             // 立即同步一次