claw-daemon/clawd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pre-scan WiFi before entering AP mode

Browse Source 
wlan0 cannot scan while in AP mode (hardware limitation).
Now scan nearby networks before starting hotspot and cache
the results for the captive portal page.

Made-with: Cursor
This commit is contained in:
stswangzhiping
2026-03-16 13:04:00 +08:00
parent 64f4050014
commit c6f55c8c15
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/captive-server.js
View File

@@ -2,7 +2,7 @@
const http = require('http');
const log = require('./logger');
const { scanWifi } = require('./network');
// scanWifi 不再在此调用（AP 模式下无法扫描），改用缓存
const { CAPTIVE_DOMAIN } = require('./dns-hijack');
const PORT = 80;
@@ -30,9 +30,10 @@ const CAPTIVE_DETECT_PATHS = new Set([
*/
class CaptiveServer {
constructor(opts = {}) {
this._server = null;
this._clawId = opts.clawId || '???';
this._onConnect = opts.onConnect || null; // (ssid, password) => Promise<{success, error?}>
this._server = null;
this._clawId = opts.clawId || '???';
this._onConnect = opts.onConnect || null;
this._cachedWifiList = opts.cachedWifiList || [];
}
startListening() {
@@ -96,8 +97,8 @@ class CaptiveServer {
// ── API ──────────────────────────────────────────────────────────────────
_apiScan(req, res) {
const list = scanWifi();
this._json(res, { wifi: list });
// AP 模式下 wlan0 无法扫描，返回开 AP 前的缓存结果
this._json(res, { wifi: this._cachedWifiList, cached: true });
}
async _apiConnect(req, res) {
@@ -227,7 +228,9 @@ async function doScan(){
o.textContent=w.ssid+' ('+w.signal+'% '+w.security+')';
sel.appendChild(o);
});
setStatus('扫描到 '+d.wifi.length+' 个网络','ok');
var msg='发现 '+d.wifi.length+' 个网络';
if(d.wifi.length===0) msg='未发现网络，请手动输入 SSID';
setStatus(msg,'ok');
}catch(e){setStatus('扫描失败: '+e.message,'err')}
$('connectBtn').disabled=false;
}

11
lib/provisioning.js
View File

@@ -2,7 +2,7 @@
const EventEmitter = require('events');
const log = require('./logger');
const { hasInternet, hasSavedWifiConnection, isWifiStaConnected, startAP, stopAP, connectWifi, AP_IP } = require('./network');
const { hasInternet, hasSavedWifiConnection, isWifiStaConnected, scanWifi, startAP, stopAP, connectWifi, AP_IP } = require('./network');
const { DnsHijack } = require('./dns-hijack');
const { CaptiveServer } = require('./captive-server');
@@ -98,8 +98,12 @@ class ProvisionManager extends EventEmitter {
if (this._state === 'ap') return;
try {
// 先写 DNS 劫持配置，再启动 AP
// NM 启动热点时会加载 dnsmasq-shared.d/ 下的配置
// AP 模式下无法扫描 WiFi，必须在开 AP 之前扫描并缓存
log.info('provision', '扫描周边 WiFi...');
this._cachedWifiList = scanWifi();
log.info('provision', `扫描到 ${this._cachedWifiList.length} 个网络`);
// 写 DNS 劫持配置（NM 启动热点时加载）
this._dns = new DnsHijack();
this._dns.start('wlan0', AP_IP);
@@ -107,6 +111,7 @@ class ProvisionManager extends EventEmitter {
this._server = new CaptiveServer({
clawId: this._clawId,
cachedWifiList: this._cachedWifiList,
onConnect: (ssid, password) => this._handleWifiConnect(ssid, password),
});
this._server.startListening();