fix update ZIP missed files

CoNETProject · CoNETProject · commit d81e82f23c35 · 2025-07-15T17:01:36.000-07:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@conet.project/conet-proxy",
 
-    "version": "0.15.5",
+    "version": "0.16.0",
 
     "license": "UNLICENSED",
     "files": [
diff --git a/src/localServer/localServer.ts b/src/localServer/localServer.ts
@@ -172,11 +172,11 @@ const joinMetadata = (metadata: any ) => {
 let _proxyServer: proxyServer
 
 
-const startSilentPass = (vpnObj: Native_StartVPNObj, currentVer: UpdateInfo, reactFolder: string) => {
+const startSilentPass = (vpnObj: Native_StartVPNObj, currentVer: UpdateInfo, reactFolder: string, restart: () => Promise<void> ) => {
 	logger(inspect(vpnObj, false, 3, true))
 
 	_proxyServer = new proxyServer((3002).toString(), vpnObj.entryNodes, vpnObj.exitNode, vpnObj.privateKey, true, '')
-	runUpdater(vpnObj.entryNodes, currentVer, reactFolder)
+	runUpdater(vpnObj.entryNodes, currentVer, reactFolder, restart)
 	return true
 }
 
@@ -235,15 +235,17 @@ export class Daemon {
 
     public _proxyServer: proxyServer|null = null
 
-    public end = () => new Promise (resolve => {
-		
-		this.localserver.close(err => {
-			
-		})
-		setTimeout(() => {
-			resolve(true)
-		}, 5000)
-    })
+	public end = (): Promise<void> => new Promise(resolve => {
+		if (this.localserver) {
+			this.localserver.close(err => {
+				if (err) {
+					logger(Colors.red('关闭服务器时出错:'), err)
+				}
+			})
+		}
+		// 即使服务器不存在或关闭出错，也继续执行
+		resolve()
+	})
 
     public postMessageToLocalDevice ( device: string, encryptedMessage: string ) {
         const index = this.connect_peer_pool.findIndex ( n => n.publicKeyID === device )
@@ -297,6 +299,10 @@ export class Daemon {
             return this.initialize ()
         })
 
+		app.get('/ver'), ( req, res ) => {
+			res.end({ver: this.currentVer?.ver})
+		}
+
         app.post ( '/rule', ( req: any, res: any ) => {
             const vpnObj = req.body.data
             try {
@@ -483,7 +489,7 @@ export class Daemon {
 
         app.get('/ver', (req, res) => {
 			logger (`APP get ${req.url}`)
-            res.json({ver})
+            res.json({ver: this.currentVer?.ver})
         })
 
         app.get('/getAllRegions',async (req, res) => {
@@ -500,7 +506,7 @@ export class Daemon {
 				return res.status(400).send({ error: "No country selected" })
 			}
 			if (this.currentVer) {
-				startSilentPass (vpnObj, this.currentVer, this.reactBuildFolder)
+				startSilentPass (vpnObj, this.currentVer, this.reactBuildFolder, this.restart)
 			}
 			
 
@@ -565,6 +571,28 @@ export class Daemon {
 			])
         })
     }
+
+	// 将 restart 方法改为箭头函数属性
+	public restart = async (): Promise<void> => {
+		logger(Colors.magenta('🔄 开始热启动本地 Web 服务器...'))
+
+		// 1. 确保当前有服务器正在运行
+		if (!this.localserver) {
+			logger(Colors.yellow('服务器未运行，无需重启。将直接进行初始化。'))
+			await this.initialize()
+			return
+		}
+
+		// 2. 关闭现有服务器，并等待其完全关闭
+		logger('🚀 正在关闭现有服务器...')
+		await this.end()
+		logger('✅ 旧服务器已成功关闭。')
+
+		// 3. 再次调用 initialize 方法
+		logger('🚀 正在使用新配置重新初始化服务器...')
+		await this.initialize()
+		logger(Colors.green('🎉 服务器热启动完成！'))
+	}
 }
 
 
diff --git a/src/localServer/updateProcess.ts b/src/localServer/updateProcess.ts
@@ -99,51 +99,109 @@ const getRandomNode = (nodes: nodes_info[]): nodes_info => {
  * @param folderPath 要检查的文件夹根路径
  * @returns 如果验证通过则返回 true，否则返回 false
  */
-const validateUpdateContents = async (folderPath: string, ver: string): Promise<boolean> => {
+const validateUpdateContents = async (folderPath: string, ver: string, nodes: nodes_info[]): Promise<boolean> => {
+	logger('🔍 开始验证和修复更新内容...')
+    const manifestPath = join(folderPath, 'asset-manifest.json')
+
     try {
-        // 1. 检查根目录下的 index.html
-        const hasIndexHtml = fs.existsSync(join(folderPath, 'index.html'))
-        if (!hasIndexHtml) {
-            logger('🔴 验证失败: 未找到 index.html')
-            return false;
+        // 1. 检查并读取 asset-manifest.json
+        if (!fs.existsSync(manifestPath)) {
+            logger('🔴 验证失败: 关键文件 asset-manifest.json 未找到！')
+            // 如果清单都不存在，可以尝试下载它本身
+            const randomNode = getRandomNode(nodes)
+            const manifestUrl = `http://${randomNode.ip_addr}/silentpass-rpc/asset-manifest.json`
+            logger(`尝试下载缺失的 asset-manifest.json from ${manifestUrl}`)
+            await downloadSingleFileHttp(manifestUrl, manifestPath)
         }
 
-        // 2. 检查 static/js 目录下的 main.*.js
-        const jsFolderPath = join(folderPath, 'static', 'js')
-        if (!fs.existsSync(jsFolderPath)) {
-            logger('🔴 验证失败: 未找到目录 static/js')
-            return false;
-        }
-        const jsFiles = fs.readdirSync(jsFolderPath);
-        const hasMainJs = jsFiles.some(file => /^main\..+\.js$/.test(file))
-        if (!hasMainJs) {
-            logger('🔴 验证失败: 在 static/js/ 中未找到 main.*.js 文件')
-            return false;
+        const manifestContent = fs.readFileSync(manifestPath, 'utf8')
+        const manifest = JSON.parse(manifestContent)
+
+        if (!manifest.files || typeof manifest.files !== 'object') {
+            logger('🔴 验证失败: asset-manifest.json 格式不正确或不包含 "files" 对象。')
+            return false
         }
 
-        // 3. 检查 static/css 目录下的 main.*.css
-        const cssFolderPath = join(folderPath, 'static', 'css')
-        if (!fs.existsSync(cssFolderPath)) {
-            logger('🔴 验证失败: 未找到目录 static/css')
-            return false;
+        // 2. 收集所有缺失的文件，并准备下载
+        const downloadPromises: Promise<void>[] = []
+        const filePaths = Object.values(manifest.files) as string[]
+
+        for (const filePath of filePaths) {
+            // Create React App 的路径通常以 / 开头，需要移除
+            const localFilePath = filePath.startsWith('/') ? filePath.substring(1) : filePath
+            const fullPath = join(folderPath, localFilePath)
+
+            if (!fs.existsSync(fullPath)) {
+                logger(`🟡 文件缺失: ${localFilePath}。准备下载...`)
+                
+                const randomNode = getRandomNode(nodes)
+                const downloadUrl = `http://${randomNode.ip_addr}/silentpass-rpc/${localFilePath}`
+                
+                // 将下载任务的 Promise 添加到数组中
+                downloadPromises.push(downloadSingleFileHttp(downloadUrl, fullPath))
+            }
         }
-        const cssFiles = fs.readdirSync(cssFolderPath)
-        const hasMainCss = cssFiles.some(file => /^main\..+\.css$/.test(file))
-        if (!hasMainCss) {
-            logger('🔴 验证失败: 在 static/css/ 中未找到 main.*.css 文件')
-            return false
+
+        // 3. 如果有缺失的文件，则并行下载它们
+        if (downloadPromises.length > 0) {
+            logger(`发现 ${downloadPromises.length} 个缺失文件，开始并行下载修复...`)
+            await Promise.all(downloadPromises)
+            logger('✅ 所有缺失文件已下载完成！')
+        } else {
+            logger('✅ 所有文件均存在，无需修复。')
         }
 
-		await readUpdateInfo(folderPath, ver)
+        // 4. 所有文件都就绪后，执行最终的检查（例如读取 update.json）
+        await readUpdateInfo(folderPath, ver)
 
-        logger('✅ 更新内容验证通过，文件结构正确！')
+        logger('✅ 更新内容验证和修复成功！')
         return true
+
     } catch (error) {
-        logger('🔴 验证过程中发生错误:', error)
+        logger('🔴 验证或修复过程中发生严重错误:', error);
         return false
     }
 }
 
+/**
+ * 下载单个文件（支持 HTTPS）并保存到指定路径。
+ * @param downloadUrl 文件的完整下载 URL (https://...)
+ * @param destinationPath 本地保存的完整路径
+ */
+const downloadSingleFileHttp = (downloadUrl: string, destinationPath: string): Promise<void> => {
+    return new Promise((resolve, reject) => {
+        
+        const dir = join(destinationPath, '..')
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true })
+        }
+		const options = { agent: httpAgent }
+        const fileStream = fs.createWriteStream(destinationPath)
+		logger(`Download ${downloadUrl}`)
+        http.get(downloadUrl, options, (response) => {
+            if (response.statusCode !== 200) {
+                fileStream.close();
+                fs.unlink(destinationPath, () => {}); // 清理不完整的文件
+                return reject(new Error(`下载单个文件失败 [${response.statusCode}]: ${downloadUrl}`));
+            }
+            response.pipe(fileStream)
+        }).on('error', (err) => {
+            fs.unlink(destinationPath, () => {})
+            reject(err)
+        })
+
+        fileStream.on('finish', () => {
+            fileStream.close()
+            resolve()
+        })
+
+        fileStream.on('error', (err) => {
+            fs.unlink(destinationPath, () => {})
+            reject(err)
+        })
+    })
+}
+
 /**
  * Reads and parses the update.json file from a specified folder.
  *
@@ -187,10 +245,12 @@ export const readUpdateInfo = async (staticFolder: string, ver: string): Promise
 })
 
 
+
+
 /**
  * 主更新函数
  */
-export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, reactFolder: string ) => {
+export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, reactFolder: string, restart: () => Promise<void> ) => {
 
 
   logger('🚀 开始执行动态节点更新程序...')
@@ -248,7 +308,7 @@ export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, re
     logger(`🎉 成功下载并解压文件到 ${tempUpdatePath}`)
 
 	// 2. 验证内容
-        if (!(await validateUpdateContents(tempUpdatePath, currentVer.ver))) {
+        if (!(await validateUpdateContents(tempUpdatePath, updateInfo.ver, nodes))) {
             throw new Error('下载的内容无效或不完整，已终止更新。')
         }
 
@@ -272,6 +332,7 @@ export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, re
             fs.rmSync(backupPath, { recursive: true, force: true })
             logger(`旧的备份目录已清理。`)
         }
+		await restart()
 
   	} catch (error) {
 		console.error('❌ 更新过程中发生错误:', error instanceof Error ? error.message : error)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@conet.project/conet-proxy",`
`3`	`3`
`4`		`- "version": "0.15.5",`
	`4`	`+ "version": "0.16.0",`
`5`	`5`
`6`	`6`	`"license": "UNLICENSED",`
`7`	`7`	`"files": [`