bridge-update-server 1.0.0 → 1.0.1

package/bin/bridge-updater.js

@@ -20,20 +20,30 @@ if (args.includes('--help') || args.includes('-h')) {
 		'用法: bridge-updater [options]',
 		'',
 		'选项:',
-		'  --port <number>       HTTP 端口 (默认: 51145)',
-		'  --mdns-host <string>  mDNS 广播的 host 覆盖值',
-		'  --mdns-port <number>  mDNS 广播的 port 覆盖值',
-		'  --mdns-path <string>  API 路径前缀 (默认: "")',
-		'  --help, -h            显示帮助信息',
+		'  --port <number>        HTTP 端口 (默认: 51145)',
+		'  --svr-proto <string>   服务对外的协议 (如 https)',
+		'  --svr-host <string>    服务对外的域名或IP',
+		'  --svr-port <number>    服务对外的端口',
+		'  --svr-path <string>    服务对外的路径前缀',
+		'  --help, -h             显示帮助信息',
 		''
 	].join('\n'));
 	process.exit(0);
 }
 
 const port = parseInt(getArg('--port', '51145'), 10);
-const mdnsHost = getArg('--mdns-host', '') || '';
-const mdnsPort = parseInt(getArg('--mdns-port', '0'), 10) || 0;
-const mdnsPath = (getArg('--mdns-path', '') || '').replace(/^\/+/, '').replace(/\/+$/, '');
-const normalizedPath = mdnsPath ? '/' + mdnsPath : '';
+const svrProto = getArg('--svr-proto', '') || '';
+const svrHost = getArg('--svr-host', '') || '';
+const svrPort = parseInt(getArg('--svr-port', '0'), 10) || 0;
+const svrPath = (getArg('--svr-path', '') || '').replace(/^\/+/, '').replace(/\/+$/, '');
+const normalizedSvrPath = svrPath ? '/' + svrPath : '';
 
-startServer({port, mdnsHost, mdnsPort, mdnsPath: normalizedPath});
+startServer({
+	port,
+	svrOptions: {
+		proto: svrProto,
+		host: svrHost,
+		port: svrPort,
+		path: normalizedSvrPath
+	}
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge-update-server",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Bridge App Update Server",
   "type": "module",
   "bin": {

package/public/index.html

@@ -98,7 +98,7 @@
 			<span class="status" id="status-text">正在获取版本信息…</span>
 		</div>
 		<div id="buttons" style="display: none;">
-			<a id="btn-cache" class="btn btn-cache">本地下载</a>
+			<a id="btn-cache" class="btn btn-cache" target="_blank" rel="noopener">本地下载</a>
 			<a id="btn-github" class="btn btn-github" target="_blank" rel="noopener">GitHub 下载</a>
 		</div>
 		<div id="sha256"></div>
@@ -124,7 +124,7 @@
 			const btnGithub = document.getElementById('btn-github');
 
 			if (downUrl.local) {
-				btnCache.href = base + 'download';
+				btnCache.href = downUrl.local;
 			} else {
 				btnCache.removeAttribute('href');
 				btnCache.classList.add('btn-disabled');

package/src/cache.js

@@ -17,11 +17,6 @@ export function getCachedApkPath() {
 	return existsSync(filePath) ? filePath : null;
 }
 
-// 是否已有APK缓存
-export function hasCachedApk() {
-	return getCachedApkPath() !== null;
-}
-
 // 获取APK文件流
 export function getCachedApkStream() {
 	const filePath = getCachedApkPath();
@@ -51,17 +46,6 @@ function computeSha256(filePath) {
 	});
 }
 
-// 验证本地缓存文件的SHA256是否匹配
-export async function verifyCachedApk() {
-	const info = getVersionInfo();
-	const filePath = getCachedApkPath();
-	if (!filePath || !info?.sha256) {
-		return false;
-	}
-	const actual = await computeSha256(filePath);
-	return actual === info.sha256;
-}
-
 async function downloadFromUrl(url, destPath) {
 	const res = await fetch(url, {
 		headers: {'User-Agent': 'bridge-update-server'}
@@ -151,7 +135,9 @@ export async function triggerRebuild(discoverPeers) {
 // 确保APK缓存可用。返回true表示已就绪，false表示正在同步中
 export async function syncApk(discoverPeers) {
 	const info = getVersionInfo();
-	if (!info || downloading) return false;
+	if (!info || downloading) {
+		return false;
+	}
 
 	const filePath = getCachedApkPath();
 	if (!filePath) {

package/src/mdns.js

@@ -11,19 +11,19 @@ let publishedService = null;
 const instanceId = randomUUID();
 
 // 启动mDNS广播
-export async function startMdns(port, mdnsHost, mdnsPort, mdnsPath) {
+export async function startMdns(port, svrOptions = {}) {
 	bonjourInstance = new Bonjour();
 	ciaoResponder = ciao.getResponder();
 
 	const txt = {instance: instanceId};
-	if (mdnsPath) {
-		txt.path = mdnsPath;
+	if (svrOptions.path) {
+		txt.path = svrOptions.path;
 	}
-	if (mdnsHost) {
-		txt.host = mdnsHost;
+	if (svrOptions.host) {
+		txt.host = svrOptions.host;
 	}
-	if (mdnsPort) {
-		txt.port = String(mdnsPort);
+	if (svrOptions.port) {
+		txt.port = String(svrOptions.port);
 	}
 
 	publishedService = ciaoResponder.createService({

package/src/router.js

@@ -2,17 +2,22 @@ import {fileURLToPath} from 'node:url';
 import {dirname, join} from 'node:path';
 import express, {Router} from 'express';
 import {getVersionInfo} from './github.js';
-import {getCachedApkSize, getCachedApkStream, hasCachedApk, syncApk} from './cache.js';
+import {getCachedApkSize, getCachedApkStream, syncApk} from './cache.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // 创建REST API路由
-export function createRouter(mdnsPath, discoverPeers) {
+export function createRouter(discoverPeers, svrOptions = {}, serverPort = 0) {
 	const router = Router();
 
 	// 静态文件
 	router.use(express.static(join(__dirname, '../public')));
 
+	// 连通性探测
+	router.get('/hello', (req, res) => {
+		res.send('hello');
+	});
+
 	// 获取最新版本信息
 	router.get('/version', (req, res) => {
 		const info = getVersionInfo();
@@ -23,12 +28,28 @@ export function createRouter(mdnsPath, discoverPeers) {
 			});
 		}
 
-		let localUrl = null;
-		if (hasCachedApk()) {
-			const proto = req.get('X-Forwarded-Proto') || req.protocol || 'http';
-			const host = req.get('X-Forwarded-Host') || req.get('Host');
-			localUrl = `${proto}://${host}${mdnsPath}/download`;
-		}
+		const proto = svrOptions.proto
+			|| req.get('X-Forwarded-Proto')
+			|| req.protocol
+			|| 'http';
+
+		const fwdHost = req.get('X-Forwarded-Host') || '';
+		const fwdHostName = fwdHost.split(':')[0];
+		const fwdHostPort = fwdHost.split(':')[1] || '';
+		const host = svrOptions.host || fwdHostName || req.hostname;
+
+		const rawPort = svrOptions.port
+			|| parseInt(req.get('X-Forwarded-Port') || fwdHostPort || '0', 10)
+			|| serverPort;
+		const isDefaultPort = (proto === 'https' && rawPort === 443)
+			|| (proto === 'http' && rawPort === 80);
+		const portStr = (!rawPort || isDefaultPort) ? '' : ':' + rawPort;
+
+		const path = svrOptions.path
+			|| req.get('X-Forwarded-Prefix')
+			|| '';
+
+		const localUrl = proto + '://' + host + portStr + path + '/download';
 
 		res.json({
 			state: true,
@@ -42,6 +63,7 @@ export function createRouter(mdnsPath, discoverPeers) {
 				sha256: info.sha256
 			}
 		});
+		console.log('[Version]', '返回版本信息', 'localUrl=', localUrl, 'githubUrl=', info.apkUrl);
 	});
 
 	// 下载APK

package/src/server.js

@@ -6,18 +6,14 @@ import {syncApk} from './cache.js';
 import {discoverPeers, startMdns} from './mdns.js';
 
 export async function startServer(options) {
-	const {port, mdnsHost, mdnsPort, mdnsPath} = options;
+	const {port, svrOptions} = options;
 
 	const app = express();
 	const server = createServer(app);
 
 	// 挂载路由
-	const router = createRouter(mdnsPath, discoverPeers);
-	if (mdnsPath) {
-		app.use(mdnsPath, router);
-	} else {
-		app.use(router);
-	}
+	const router = createRouter(discoverPeers, svrOptions, port);
+	app.use(router);
 
 	// 每次轮询成功后同步APK
 	onPollComplete(() => syncApk(discoverPeers));
@@ -31,7 +27,7 @@ export async function startServer(options) {
 	});
 
 	// 启动mDNS广播
-	await startMdns(port, mdnsHost, mdnsPort, mdnsPath);
+	await startMdns(port, svrOptions);
 
 	return server;
 }