made-bridge 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "made-bridge",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "码得（made）独立语音编程设备的电脑侧桥接器：工作台 API、设备接口、任务调度与插件运行时。一条命令启动，配合 ESP32 固件使用，源码在 github.com/jobop/made。",
   "type": "module",
   "license": "MIT",

package/src/board-link.mjs

@@ -248,6 +248,9 @@ export function createBoardLink() {
       if (!payload || typeof payload !== 'object' || Array.isArray(payload)) throw fail('事件无效');
       if (typeof payload.name !== 'string' || !CAPABILITY_NAME.test(payload.name)) throw fail('事件无效');
       const fields = parseFields(payload.fields);
+      // 设备事件一律落日志（含未订阅被拒的）：调试/烧机观察通道依赖它，
+      // 例如 burn-in 压测的水位事件 burnin.mem 就没有任何插件订阅。
+      console.log('[board-event]', deviceId.slice(-6), payload.name, JSON.stringify(fields));
       const catalog = catalogs.get(deviceId);
       if (!catalog || !catalog.events.some((item) => item.name === payload.name)) throw fail('事件不在板侧清单');
       const subscribed = this.subscription(deviceId, runtime, config);

package/src/server.mjs

@@ -582,7 +582,9 @@ export function createApp(config, { run, transcribe, tunnel: providedTunnel, ena
             }
           }
           if (!queued) throw new Error(lastError || '命令未能下发');
-          const deadline = Date.now() + 15000;
+          // USB 分片上传 240×320 帧实测 >15s（base64 走请求通道），15s 会
+          // 误报失败——其实 PNG 随后正常落盘。放宽到 45s。
+          const deadline = Date.now() + 45000;
           while (Date.now() < deadline) {
             const file = screenshots.latest(before);
             if (file) {
@@ -599,7 +601,7 @@ export function createApp(config, { run, transcribe, tunnel: providedTunnel, ena
             }
             await new Promise((resolve) => setTimeout(resolve, 250));
           }
-          throw new Error('码得未在 15 秒内回传截图（固件需要更新到支持 debug.screenshot 的版本）');
+          throw new Error('码得未在 45 秒内回传截图（固件需要更新到支持 debug.screenshot 的版本）');
         }
         if (url.pathname === '/api/firmware') {
           const type = String(req.headers['content-type'] || '');

package/src/usb-receiver.mjs

@@ -220,6 +220,9 @@ export class UsbReceiverProtocol {
 
   feed(chunk) {
     if (this.closed) return;
+    if (chunk.includes(0x22) && chunk.includes(0x3a) && chunk.length > 60 && !chunk.slice(0, 30).includes('hello')) {
+      console.log('[usb-raw]', chunk.length, JSON.stringify(chunk.subarray(0, 120).toString('utf8')));
+    }
     let start = 0;
     for (let index = 0; index < chunk.length; index += 1) {
       if (chunk[index] !== 10) continue;
@@ -264,7 +267,7 @@ export class UsbReceiverProtocol {
         console.error(`[usb-link] log: ${line.slice(0, 240)}`);
         return;
       }
-      console.error(`[usb-link] unparseable: ${line.slice(0, 240)}`);
+      console.error(`[usb-link] unparseable len=${line.length} tail=${JSON.stringify(line.slice(-40))}`);
       this.rejectCurrent(400, 'USB 帧格式无效');
       return;
     }
@@ -272,6 +275,9 @@ export class UsbReceiverProtocol {
       this.rejectCurrent(400, 'USB 帧格式无效');
       return;
     }
+    if (frame && typeof frame.type === 'string' && frame.type !== 'hello') {
+      console.log('[usb-frame]', frame.type, frame.id ?? '', String(frame.path || '').slice(0, 60));
+    }
     if (frame.type === 'hello') {
       if (frame.version !== 1 || ![undefined, 'receiver', 'direct'].includes(frame.mode)) return;
       const direct = frame.mode === 'direct';
@@ -285,13 +291,25 @@ export class UsbReceiverProtocol {
         ssid: direct ? '' : frame.ssid, password: direct ? '' : frame.password };
       if (this.peer && (this.peer.mode !== peer.mode || this.peer.deviceId !== peer.deviceId)) return;
       if (this.onHello(peer) === false) return;
-      console.error(`[usb-link] hello: mode=${peer.mode} ${new Date().toISOString()}`);
+      console.error(`[usb-link] hello: mode=${peer.mode} diag=${frame.diag || '-'} ${new Date().toISOString()}`);
       this.peer = peer;
       this.ackWindow = peer.mode === 'direct' ? ACK_WINDOW_DIRECT : ACK_WINDOW;
       this.helloReceived = true;
       this.onActivity();
       // The receiver waits for this acknowledgement before forwarding HTTP.
       // A USB cable being present does not mean the desktop process is ready.
+      // ready 直发不进 pendingWork：pendingWork 同时承载 writeResponse 的
+      // ack 流控等待——设备偶发丢 ack 时该链最长堵 15s，期间所有重握手
+      // 都等不到 ready，设备侧表现为连环 E263 + UI 闪「连接电脑」（实锤
+      // 于 2026-10-20 冒烟：ack TIMEOUT id=52 前后 15s 全是 1.5s 间隔握手
+      // 超时）。sendLine 走 link.writeQueue，帧原子性与 pendingWork 相同；
+      // direct 固件 read_request_frame 本就支持在响应流中处理 ready。
+      // receiver 模式保持原排队路径（ready 语义 = 桥接进程就绪）。
+      if (peer.mode === 'direct' && !this.closed) {
+        this.sendLine(JSON.stringify({ type: 'ready', version: 1, connectionId: this.connectionId }))
+          .catch(() => this.dispose());
+        return;
+      }
       const generation = this.generation;
       this.pendingWork = this.pendingWork.then(async () => {
         if (!this.closed && this.helloReceived && this.generation === generation) {
@@ -318,6 +336,7 @@ export class UsbReceiverProtocol {
       return;
     }
     if (frame.type === 'request') {
+      console.log('[usb-req]', frame.method, frame.path, 'id=' + frame.id);
       if (this.current || this.responding || !validId(frame.id)) {
         if (this.current) this.rejectCurrent(409, 'USB 请求重叠');
         return;
@@ -382,6 +401,7 @@ export class UsbReceiverProtocol {
       return;
     }
     if (frame.type === 'end') {
+      console.log('[usb-end] id=' + current.id + ' received=' + current.received + ' path=' + current.path.slice(0, 40));
       if (current.received !== current.length) {
         this.rejectCurrent(400, 'USB 请求长度不符');
         return;
@@ -392,6 +412,8 @@ export class UsbReceiverProtocol {
         try {
           if (this.closed || this.current !== current || current.controller.signal.aborted) return;
           const response = await this.forward(request, current.controller.signal);
+          console.log('[usb-resp]', response.status, request.method, request.path.slice(0, 40),
+            'body=' + (response.body ? response.body.length : -1));
           if (this.closed || this.current !== current) return;
           clearTimeout(current.timer);
           await this.writeResponse(current.id, response.status, response.contentType, response.body);
@@ -485,7 +507,7 @@ export class UsbReceiverProtocol {
         console.error(`[usb-link] ack TIMEOUT id=${id} ${new Date().toISOString()}`);
         this.ackWaiters.delete(id);
         reject(new Error('USB ACK 超时'));
-      }, 15_000);
+      }, 3_000);
       timer.unref?.();
       const check = () => {
         if ((this.ackCredits.get(id) || 0) < target) return;