check update

Author: CoNETProject

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@conet.project/conet-proxy",
 
-    "version": "1.0.2",
+    "version": "1.1.0",
 
     "license": "UNLICENSED",
     "files": [

src/localServer/localServer.ts

@@ -14,11 +14,93 @@ import * as openpgp from 'openpgp'
 import os from 'node:os'
 import CONET_Guardian_NodeInfo_ABI from './CONET_Guardian_NodeInfo_ABI.json'
 import {runUpdater, readUpdateInfo} from './updateProcess'
+import allNodes from './nodes.json'
 import fs from 'node:fs'
 import {LayerMinus} from './layerMinus'
 
+
 const ver = '0.1.5'
 
+const deleteNodeFromList = (node: nodes_info) => {
+    const index = allNodes.findIndex(n => n.ip_addr === node.ip_addr)
+    if (index > -1) {
+        allNodes.splice(index, 1)
+    }
+}
+
+export const postToEndpoint = async <T = any> (
+  url: string,
+  post: boolean,
+  jsonData?: any,
+  timeoutMs = 5 * 1000
+): Promise<"" | boolean | T> => {
+  const ac = new AbortController();
+  
+
+  try {
+	const timer = setTimeout(() => ac.abort('TimeoutError'), timeoutMs);
+    const res = await fetch(url, {
+      method: post ? "POST" : "GET",
+      headers:
+        post && jsonData !== undefined
+          ? { "Content-Type": "application/json;charset=UTF-8" }
+          : undefined,
+      body: post ? (jsonData ? JSON.stringify(jsonData) : "") : undefined,
+      signal: ac.signal,
+    });
+
+    // 200 → resolve(false)
+    if (res.status < 200 || res.status >= 300) {
+      return false;
+    }
+	clearTimeout(timer);
+    const text = await res.text();
+    if (!text.length) {
+      return "";
+    }
+
+    // 优先依据 Content-Type
+    const ct = (res.headers.get("Content-Type") || "").toLowerCase();
+    if (ct.includes("application/json") || ct.includes("+json")) {
+      return JSON.parse(text) as T;
+    }
+
+    // 回落：尝试 JSON 解析；失败时保持原规则（POST→""，GET→true）
+    try {
+      return JSON.parse(text) as T;
+    } catch {
+      return (post ? "" : true) as any;
+    }
+  } catch (err) {
+    // AbortError/网络错误 → reject
+    throw err;
+  }
+}
+
+
+const testNode = (node: nodes_info): Promise<boolean> => new Promise (async executor => {
+	try {
+		const url = `http://${node.ip_addr}`
+		await postToEndpoint(url, false, false, 1000)
+		// 只有在“计入结果”的时候才判断是否够数
+		executor(true)
+	} catch (e) {
+		// 失败再次测试
+		deleteNodeFromList(node)
+		executor(false)
+	}
+})
+
+const getRandomNode = async () => {
+    const index = Math.floor(Math.random() * allNodes.length)
+    const node = allNodes[index]
+    const isWorking = await testNode(node)
+    if (!isWorking) {
+        return await getRandomNode ()
+    }
+    return node
+
+}
 const getLocalNetworkIpaddress = () => {
 	const interfaceAll = os.networkInterfaces()
 	let ipv4: string[] = []
@@ -179,7 +261,7 @@ const startSilentPass = (vpnObj: Native_StartVPNObj, currentVer: UpdateInfo, rea
     const layerMinus = new LayerMinus(vpnObj.entryNodes, vpnObj.exitNode, vpnObj.privateKey)
 	_proxyServer = new ProxyServer(3002, layerMinus)
     _proxyServer.start()
-	runUpdater(vpnObj.entryNodes, currentVer, reactFolder, restart)
+	//runUpdater(vpnObj.entryNodes, currentVer, reactFolder, restart)
 	return _proxyServer
 }
 
@@ -223,6 +305,15 @@ type filterRule = {
 }
 
 
+const checkUpdateProcess = async (currentVer: UpdateInfo, reactFolder: string, restart: () => Promise<void>) => {
+    const node = await getRandomNode()
+    await runUpdater(node, currentVer, reactFolder, restart)
+    setTimeout(() => {
+        checkUpdateProcess (currentVer, reactFolder, restart)
+    }, 1000 * 60 * 10)
+}
+
+
 export class Daemon {
     private logsPool: proxyLogs[] = []
 
@@ -279,7 +370,10 @@ export class Daemon {
 		if (!this.currentVer) {
 			staticFolder = defaultPath
 			logger(Colors.red(`updatedPath ERROR, go back to defaultPath ${defaultPath}`))
-		}
+		} else {
+            //  start check update process
+            checkUpdateProcess ( this.currentVer, this.reactBuildFolder, this.restart)
+        }
 
 		// --- 关键逻辑结束 ---
 
@@ -563,6 +657,8 @@ export class Daemon {
 				{ 'Serving files from': staticFolder } 
 			])
         })
+
+        
     }
 
 	// 将 restart 方法改为箭头函数属性

src/localServer/nodes.json

@@ -103,7 +103,7 @@ const getRandomNode = (nodes: nodes_info[]): nodes_info => {
  * @param folderPath 要检查的文件夹根路径
  * @returns 如果验证通过则返回 true，否则返回 false
  */
-const validateUpdateContents = async (folderPath: string, ver: string, nodes: nodes_info[]): Promise<boolean> => {
+const validateUpdateContents = async (folderPath: string, ver: string, randomNode: nodes_info): Promise<boolean> => {
 	logger('🔍 开始验证和修复更新内容...')
     const manifestPath = join(folderPath, 'asset-manifest.json')
 
@@ -112,7 +112,6 @@ const validateUpdateContents = async (folderPath: string, ver: string, nodes: no
         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)
@@ -138,7 +137,6 @@ const validateUpdateContents = async (folderPath: string, ver: string, nodes: no
             if (!fs.existsSync(fullPath)) {
                 logger(`🟡 文件缺失: ${localFilePath}。准备下载...`)
 
-                const randomNode = getRandomNode(nodes)
                 const downloadUrl = `http://${randomNode.ip_addr}/silentpass-rpc/${localFilePath}`
 
                 // 将下载任务的 Promise 添加到数组中
@@ -255,15 +253,14 @@ export const readUpdateInfo = async (staticFolder: string, ver: string): Promise
 /**
  * 主更新函数
  */
-export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, reactFolder: string, restart: () => Promise<void> ) => {
+export const runUpdater = async (selectedNode: nodes_info, currentVer: UpdateInfo, reactFolder: string, restart: () => Promise<void> ) => {
 
 
-  logger('🚀 开始执行动态节点更新程序...')
+  logger(`🚀 开始执行动态节点更新程序... local version = ${currentVer.ver}`)
 
   try {
 	tempUpdatePath = join(reactFolder, `conet-update-${Date.now()}`)
 
-    const selectedNode = getRandomNode(nodes)
     logger(`✅ 节点列表获取成功！已随机选择节点: ${selectedNode.ip_addr} (位于 ${selectedNode.region})`);
 
     // --- 步骤 2: 使用选定节点的 IP 获取更新信息 ---
@@ -313,7 +310,7 @@ export const runUpdater = async (nodes: nodes_info[], currentVer: UpdateInfo, re
     logger(`🎉 成功下载并解压文件到 ${tempUpdatePath}`)
 
 	// 2. 验证内容
-        if (!(await validateUpdateContents(tempUpdatePath, updateInfo.ver, nodes))) {
+        if (!(await validateUpdateContents(tempUpdatePath, updateInfo.ver, selectedNode))) {
             throw new Error('下载的内容无效或不完整，已终止更新。')
         }
 
@@ -373,3 +370,5 @@ function isNewerVersion(oldVer: string, newVer: string): boolean {
     return false // 如果版本号完全相同，则不是更新的版本
 }
 
+
+

src/localServer/updateProcess.ts

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.0cb9cf36.css",
-    "main.js": "/static/js/main.e7a80705.js",
+    "main.js": "/static/js/main.5142b55d.js",
     "static/js/453.a5cbc0be.chunk.js": "/static/js/453.a5cbc0be.chunk.js",
     "static/media/GC.svg": "/static/media/GC.32c345f58a5986b6be47a893faa2ccfc.svg",
     "static/media/sp-token.svg": "/static/media/sp-token.cc8bab92d2fc3d4bed2b9a9a85731b6e.svg",
@@ -42,11 +42,11 @@
     "static/media/home-icon-blue.svg": "/static/media/home-icon-blue.df38257e8df35d5d6d3197cc84871954.svg",
     "static/media/home-icon-grey.svg": "/static/media/home-icon-grey.7c0953e4572ebe8dd813c4a3cd870b10.svg",
     "main.0cb9cf36.css.map": "/static/css/main.0cb9cf36.css.map",
-    "main.e7a80705.js.map": "/static/js/main.e7a80705.js.map",
+    "main.5142b55d.js.map": "/static/js/main.5142b55d.js.map",
     "453.a5cbc0be.chunk.js.map": "/static/js/453.a5cbc0be.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.0cb9cf36.css",
-    "static/js/main.e7a80705.js"
+    "static/js/main.5142b55d.js"
   ]
 }