优化：拆分test_page.html,把一部分小智连接的代码提取出来，减少单个文件大小

main/xiaozhi-server/test/js/xiaoZhiConnect.js

@@ -0,0 +1,104 @@
+import { log } from './utils/logger.js';
+
+// WebSocket 连接
+export async function webSocketConnect(otaUrl,wsUrl,config){
+    if (!validateWsUrl(wsUrl)) {
+        return;          // 直接返回，不再往下执行
+    }
+
+    if (!validateConfig(config)) {
+        return;
+    }
+    const ok = await sendOTA(otaUrl, config);
+    if (!ok) return;
+
+    // 使用自定义WebSocket实现以添加认证头信息
+    let connUrl = new URL(wsUrl);
+    // 添加认证参数
+    connUrl.searchParams.append('device-id', config.deviceId);
+    connUrl.searchParams.append('client-id', config.clientId);
+    log(`正在连接: ${connUrl.toString()}`, 'info');
+
+    return new WebSocket(connUrl.toString());
+}
+
+// 验证配置
+function validateConfig(config) {
+    if (!config.deviceMac) {
+        log('设备MAC地址不能为空', 'error');
+        return false;
+    }
+    if (!config.clientId) {
+        log('客户端ID不能为空', 'error');
+        return false;
+    }
+    return true;
+}
+
+// 判断wsUrl路径是否存在错误
+function validateWsUrl(wsUrl){
+    if (wsUrl === '') return false;
+    // 检查URL格式
+    if (!wsUrl.startsWith('ws://') && !wsUrl.startsWith('wss://')) {
+        log('URL格式错误，必须以ws://或wss://开头', 'error');
+        return false;
+    }
+    return true
+}
+
+
+// OTA发送请求，验证状态
+async function sendOTA(otaUrl, config) {
+    try {
+        const res = await fetch(otaUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Device-Id': config.deviceId,
+                'Client-Id': config.clientId
+            },
+            body: JSON.stringify({
+                version: 0,
+                uuid: '',
+                application: {
+                    name: 'xiaozhi-web-test',
+                    version: '1.0.0',
+                    compile_time: '2025-04-16 10:00:00',
+                    idf_version: '4.4.3',
+                    elf_sha256: '1234567890abcdef1234567890abcdef1234567890abcdef'
+                },
+                ota: { label: 'xiaozhi-web-test' },
+                board: {
+                    type: 'xiaozhi-web-test',
+                    ssid: 'xiaozhi-web-test',
+                    rssi: 0,
+                    channel: 0,
+                    ip: '192.168.1.1',
+                    mac: config.deviceMac
+                },
+                flash_size: 0,
+                minimum_free_heap_size: 0,
+                mac_address: config.deviceMac,
+                chip_model_name: '',
+                chip_info: { model: 0, cores: 0, revision: 0, features: 0 },
+                partition_table: [{ label: '', type: 0, subtype: 0, address: 0, size: 0 }]
+            })
+        });
+
+        if (!res.ok) throw new Error(`${res.status} ${res.statusText}`);
+
+        const result = await res.json();
+        document.getElementById('otaStatus').textContent = 'ota已连接';
+        document.getElementById('otaStatus').style.color = 'green';
+        return true; // 成功
+    } catch (err) {
+        document.getElementById('otaStatus').textContent = 'ota未连接';
+        document.getElementById('otaStatus').style.color = 'red';
+        return false; // 失败
+    }
+}
+
+
+
+
+

main/xiaozhi-server/test/test_page.html

@@ -101,6 +101,7 @@
 
     <script type="module">
         import { log } from './js/utils/logger.js';
+        import { webSocketConnect } from './js/xiaoZhiConnect.js';
         // 需要加载的脚本列表 - 移除Opus依赖
         const scriptFiles = [];
 
@@ -838,102 +839,19 @@
         // 连接WebSocket服务器
         async function connectToServer() {
             const url = serverUrlInput.value.trim();
-            if (url === '') return;
+            const config = getConfig();
+            // 先检查OTA状态
+            log('正在检查OTA状态...', 'info');
+            const otaUrl = document.getElementById('otaUrl').value.trim();
+            localStorage.setItem('otaUrl', otaUrl);
+            localStorage.setItem('wsUrl', url);
 
             try {
-                // 获取并验证配置
+                const ws = await webSocketConnect(otaUrl,url,config)
-                const config = getConfig();
+                if (ws === undefined){
-                if (!validateConfig(config)) {
+                    return
-                    return;
                 }
-
+                websocket = ws
-                // 检查URL格式
-                if (!url.startsWith('ws://') && !url.startsWith('wss://')) {
-                    log('URL格式错误，必须以ws://或wss://开头', 'error');
-                    return;
-                }
-
-                // 先检查OTA状态
-                log('正在检查OTA状态...', 'info');
-                const otaUrl = document.getElementById('otaUrl').value.trim();
-                localStorage.setItem('otaUrl', otaUrl);
-                localStorage.setItem('wsUrl', url);
-                try {
-                    const otaResponse = await fetch(otaUrl, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Device-Id': config.deviceId,
-                            'Client-Id': config.clientId
-                        },
-                        body: JSON.stringify({
-                            "version": 0,
-                            "uuid": "",
-                            "application": {
-                                "name": "xiaozhi-web-test",
-                                "version": "1.0.0",
-                                "compile_time": "2025-04-16 10:00:00",
-                                "idf_version": "4.4.3",
-                                "elf_sha256": "1234567890abcdef1234567890abcdef1234567890abcdef"
-                            },
-                            "ota": {
-                                "label": "xiaozhi-web-test",
-                            },
-                            "board": {
-                                "type": "xiaozhi-web-test",
-                                "ssid": "xiaozhi-web-test",
-                                "rssi": 0,
-                                "channel": 0,
-                                "ip": "192.168.1.1",
-                                "mac": config.deviceMac
-                            },
-                            "flash_size": 0,
-                            "minimum_free_heap_size": 0,
-                            "mac_address": config.deviceMac,
-                            "chip_model_name": "",
-                            "chip_info": {
-                                "model": 0,
-                                "cores": 0,
-                                "revision": 0,
-                                "features": 0
-                            },
-                            "partition_table": [
-                                {
-                                    "label": "",
-                                    "type": 0,
-                                    "subtype": 0,
-                                    "address": 0,
-                                    "size": 0
-                                }
-                            ]
-                        })
-                    });
-
-                    if (!otaResponse.ok) {
-                        throw new Error(`OTA检查失败: ${otaResponse.status} ${otaResponse.statusText}`);
-                    }
-
-                    const otaResult = await otaResponse.json();
-                    log(`OTA检查结果: ${JSON.stringify(otaResult)}`, 'info');
-
-                    log('OTA检查通过，开始连接WebSocket...', 'success');
-                    document.getElementById('otaStatus').textContent = 'ota已连接';
-                    document.getElementById('otaStatus').style.color = 'green';
-                } catch (error) {
-                    log(`OTA检查错误: ${error.message}`, 'error');
-                    document.getElementById('otaStatus').textContent = 'ota未连接';
-                    document.getElementById('otaStatus').style.color = 'red';
-                }
-
-                // 使用自定义WebSocket实现以添加认证头信息
-                let connUrl = new URL(url);
-
-                // 添加认证参数
-                connUrl.searchParams.append('device-id', config.deviceId);
-                connUrl.searchParams.append('client-id', config.clientId);
-
-                log(`正在连接: ${connUrl.toString()}`, 'info');
-                websocket = new WebSocket(connUrl.toString());
 
                 // 设置接收二进制数据的类型为ArrayBuffer
                 websocket.binaryType = 'arraybuffer';