@agentdeck/bridge 1.0.2 → 1.0.4

package/dist/voice.d.ts

@@ -3,15 +3,12 @@ export declare class VoiceManager extends EventEmitter {
     private recording;
     private audioProcess;
     private audioFile;
-    private whisperBin;
-    private whisperModel;
     private recBin;
     private soxBin;
-    private hasMetal;
-    private whisperServerBin;
-    private serverPort;
-    private useServer;
     constructor();
+    /** No-op kept so callers written for the whisper-server era keep compiling.
+     *  Transcription now goes through the bundled Swift helper, which the
+     *  Foundation Models client already manages as a long-lived process. */
     connectToServer(): Promise<void>;
     disconnectFromServer(): void;
     startRecording(): void;
@@ -20,10 +17,16 @@ export declare class VoiceManager extends EventEmitter {
     isRecording(): boolean;
     /** Transcribe a WAV file (used by /voice/transcribe endpoint) */
     transcribeFile(filePath: string): Promise<string>;
-    private transcribeViaServer;
-    private transcribeWithCli;
-    private resample;
-    private transcribe;
+    /**
+     * Transcribe with Apple's on-device recognizer via the bundled Swift helper
+     * (the same binary the APME judge uses for Foundation Models). whisper.cpp
+     * was retired here: it required arm64 Homebrew, `brew install whisper-cpp`,
+     * a ~1.5 GB model download and a second long-lived server process, which is
+     * exactly the install surface docs/voice-setup.md removed from the Apple
+     * side. Both daemons now transcribe with the same engine and nothing to
+     * install.
+     */
+    private transcribeViaHelper;
     private cleanup;
 }
 //# sourceMappingURL=voice.d.ts.map

package/dist/voice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"voice.d.ts","sourceRoot":"","sources":["../src/voice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAuFtC,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,SAAS,CAAS;;IAiBpB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtC,oBAAoB,IAAI,IAAI;IAM5B,cAAc,IAAI,IAAI;IA0ChB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAwEtC,MAAM,IAAI,IAAI;IAUd,WAAW,IAAI,OAAO;IAItB,iEAAiE;IAC3D,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAoBzC,mBAAmB;YAkCnB,iBAAiB;IAyC/B,OAAO,CAAC,QAAQ;IA6BhB,OAAO,CAAC,UAAU;IA+ElB,OAAO,CAAC,OAAO;CAMhB"}
+{"version":3,"file":"voice.d.ts","sourceRoot":"","sources":["../src/voice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AA+BtC,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;;IASvB;;4EAEwE;IAClE,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtC,oBAAoB,IAAI,IAAI;IAI5B,cAAc,IAAI,IAAI;IA0ChB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAyDtC,MAAM,IAAI,IAAI;IAUd,WAAW,IAAI,OAAO;IAItB,iEAAiE;IAC3D,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvD;;;;;;;;OAQG;YACW,mBAAmB;IAOjC,OAAO,CAAC,OAAO;CAMhB"}

package/dist/voice.js

@@ -1,16 +1,11 @@
 import { EventEmitter } from 'events';
-import { spawn, execSync } from 'child_process';
+import { spawn } from 'child_process';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { unlinkSync, existsSync, statSync, readFileSync } from 'fs';
 import { debug } from './logger.js';
-import { ensureWhisperServer, releaseWhisperServer } from './whisper-server-manager.js';
-import { MODEL_SEARCH_DIRS, MODELS_WITH_METAL, MODELS_WITHOUT_METAL, WHISPER_CANDIDATES, REC_CANDIDATES, SOX_CANDIDATES, WHISPER_SERVER_CANDIDATES, } from '@agentdeck/shared';
-// Dynamic timeout: base + multiplier × audio duration
-// Metal GPU: fast inference; Rosetta/CPU: ~3-4x slower
-const TIMEOUT_BASE_MS = 15_000;
-const TIMEOUT_MULTIPLIER_METAL = 1; // 15s + 1× audio duration
-const TIMEOUT_MULTIPLIER_ROSETTA = 4; // 15s + 4× audio duration
+import { transcribeWithHelper, probeFoundationModelsHelper } from './foundation-models-helper.js';
+import { REC_CANDIDATES, SOX_CANDIDATES } from '@agentdeck/shared';
 function findBinary(candidates, fallback) {
     for (const path of candidates) {
         if (existsSync(path))
@@ -19,52 +14,6 @@ function findBinary(candidates, fallback) {
     return fallback;
 }
 /** Check if a whisper-cli binary has Metal GPU support (native arm64 + libggml-metal). */
-function detectMetal(whisperPath) {
-    // Skip if whisper-cli doesn't exist (just a fallback name, not installed)
-    if (!existsSync(whisperPath)) {
-        debug('Voice', `whisper-cli not found, skipping Metal detection`);
-        return false;
-    }
-    try {
-        const otoolOut = execSync(`otool -L "${whisperPath}"`, { encoding: 'utf8' });
-        const hasMetal = otoolOut.includes('libggml-metal');
-        const fileOut = execSync(`file "${whisperPath}"`, { encoding: 'utf8' });
-        const isArm64 = fileOut.includes('arm64');
-        debug('Voice', `whisper-cli: arm64=${isArm64}, metal=${hasMetal} (${whisperPath})`);
-        return hasMetal && isArm64;
-    }
-    catch {
-        debug('Voice', `Could not detect capabilities: ${whisperPath}`);
-        return false;
-    }
-}
-function findWhisperModel(preference) {
-    for (const model of preference) {
-        for (const dir of MODEL_SEARCH_DIRS) {
-            const path = join(dir, model);
-            if (existsSync(path)) {
-                debug('Voice', `Selected whisper model: ${path}`);
-                return path;
-            }
-        }
-    }
-    debug('Voice', `No whisper model found in: ${MODEL_SEARCH_DIRS.join(', ')}`);
-    return join(MODEL_SEARCH_DIRS[0], preference[0]);
-}
-function findFallbackModel(currentModel) {
-    const all = [...MODELS_WITH_METAL];
-    const currentName = currentModel.split('/').pop() ?? '';
-    const idx = all.indexOf(currentName);
-    // Find a smaller model than current
-    for (let i = idx + 1; i < all.length; i++) {
-        for (const dir of MODEL_SEARCH_DIRS) {
-            const path = join(dir, all[i]);
-            if (existsSync(path))
-                return path;
-        }
-    }
-    return null;
-}
 /** Compute RMS energy of a 16-bit PCM WAV file (skip 44-byte header). */
 function computeRms(wavFile) {
     const buf = readFileSync(wavFile);
@@ -83,39 +32,25 @@ export class VoiceManager extends EventEmitter {
     recording = false;
     audioProcess = null;
     audioFile = '';
-    whisperBin;
-    whisperModel;
     recBin;
     soxBin;
-    hasMetal;
-    whisperServerBin;
-    serverPort = null;
-    useServer = false;
     constructor() {
         super();
-        this.whisperBin = findBinary(WHISPER_CANDIDATES, 'whisper-cli');
         this.recBin = findBinary(REC_CANDIDATES, 'rec');
         this.soxBin = findBinary(SOX_CANDIDATES, 'sox');
-        this.whisperServerBin = findBinary(WHISPER_SERVER_CANDIDATES, 'whisper-server');
-        this.hasMetal = detectMetal(this.whisperBin);
-        const preference = this.hasMetal ? MODELS_WITH_METAL : MODELS_WITHOUT_METAL;
-        this.whisperModel = findWhisperModel(preference);
-        if (!this.hasMetal) {
-            debug('Voice', 'WARNING: whisper-cli has no Metal GPU support (x86/Rosetta). Using smaller model for speed. Install arm64 Homebrew for best quality.');
-        }
-        debug('Voice', `Binaries: whisper=${this.whisperBin}, rec=${this.recBin}, sox=${this.soxBin}, server=${this.whisperServerBin}`);
+        debug('Voice', `Binaries: rec=${this.recBin}, sox=${this.soxBin} (transcription: Apple Speech via bundled helper)`);
     }
+    /** No-op kept so callers written for the whisper-server era keep compiling.
+     *  Transcription now goes through the bundled Swift helper, which the
+     *  Foundation Models client already manages as a long-lived process. */
     async connectToServer() {
-        const port = await ensureWhisperServer(this.whisperServerBin, this.whisperModel);
-        if (port) {
-            this.serverPort = port;
-            this.useServer = true;
+        const status = await probeFoundationModelsHelper();
+        if (!status.available) {
+            debug('Voice', `Speech helper unavailable: ${status.reason ?? 'unknown'}`);
         }
     }
     disconnectFromServer() {
-        this.useServer = false;
-        this.serverPort = null;
-        releaseWhisperServer();
+        // Helper lifetime is owned by foundation-models-helper.ts.
     }
     startRecording() {
         if (this.recording)
@@ -193,22 +128,7 @@ export class VoiceManager extends EventEmitter {
         }
         // --- Transcription: prefer whisper-server, fallback to whisper-cli ---
         try {
-            let text;
-            if (this.useServer && this.serverPort) {
-                // Server mode: skip resample, whisper-server handles format conversion (--convert)
-                debug('Voice', 'Server mode: skipping sox resample');
-                try {
-                    text = await this.transcribeViaServer(this.audioFile);
-                }
-                catch (serverErr) {
-                    debug('Voice', `Server transcription failed, falling back to whisper-cli: ${serverErr}`);
-                    this.useServer = false;
-                    text = await this.transcribeWithCli(this.audioFile);
-                }
-            }
-            else {
-                text = await this.transcribeWithCli(this.audioFile);
-            }
+            const text = await this.transcribeViaHelper(this.audioFile);
             debug('Voice', `Transcription result: "${text.slice(0, 80)}"`);
             this.emit('transcription', text);
             this.cleanup();
@@ -242,188 +162,22 @@ export class VoiceManager extends EventEmitter {
         if (rms < 0.001) {
             throw new Error('No audio detected — silent recording');
         }
-        if (this.useServer && this.serverPort) {
-            try {
-                return await this.transcribeViaServer(filePath);
-            }
-            catch (serverErr) {
-                debug('Voice', `Server transcription failed, falling back to whisper-cli: ${serverErr}`);
-                this.useServer = false;
-                return await this.transcribeWithCli(filePath);
-            }
-        }
-        return await this.transcribeWithCli(filePath);
-    }
-    async transcribeViaServer(audioFile) {
-        const fileData = readFileSync(audioFile);
-        const boundary = `----whisper${Date.now()}`;
-        const filename = audioFile.split('/').pop() || 'audio.wav';
-        // Build multipart form-data manually (no external deps)
-        const header = Buffer.from(`--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="file"; filename="${filename}"\r\n` +
-            `Content-Type: audio/wav\r\n\r\n`);
-        const footer = Buffer.from(`\r\n--${boundary}--\r\n`);
-        const body = Buffer.concat([header, fileData, footer]);
-        const url = `http://127.0.0.1:${this.serverPort}/inference`;
-        debug('Voice', `POST ${url} (${fileData.length} bytes audio)`);
-        const res = await fetch(url, {
-            method: 'POST',
-            headers: { 'Content-Type': `multipart/form-data; boundary=${boundary}` },
-            body,
-            signal: AbortSignal.timeout(15_000),
-        });
-        if (!res.ok) {
-            throw new Error(`whisper-server returned ${res.status}: ${await res.text()}`);
-        }
-        const json = await res.json();
-        const text = (json.text ?? '').trim();
-        debug('Voice', `whisper-server response: "${text.slice(0, 80)}"`);
+        return await this.transcribeViaHelper(filePath);
+    }
+    /**
+     * Transcribe with Apple's on-device recognizer via the bundled Swift helper
+     * (the same binary the APME judge uses for Foundation Models). whisper.cpp
+     * was retired here: it required arm64 Homebrew, `brew install whisper-cpp`,
+     * a ~1.5 GB model download and a second long-lived server process, which is
+     * exactly the install surface docs/voice-setup.md removed from the Apple
+     * side. Both daemons now transcribe with the same engine and nothing to
+     * install.
+     */
+    async transcribeViaHelper(audioFile) {
+        const text = await transcribeWithHelper(audioFile);
+        debug('Voice', `Helper transcription: "${text.slice(0, 80)}"`);
         return text;
     }
-    async transcribeWithCli(audioFile) {
-        // Resample to 16kHz/16-bit mono WAV (macOS coreaudio may record at 48kHz/32-bit)
-        const resampledFile = audioFile.replace('.wav', '_16k.wav');
-        debug('Voice', `Resampling ${audioFile} → ${resampledFile}`);
-        try {
-            await this.resample(audioFile, resampledFile);
-        }
-        catch (err) {
-            debug('Voice', `Resample failed, using original: ${err}`);
-        }
-        const whisperInput = existsSync(resampledFile) ? resampledFile : audioFile;
-        debug('Voice', `Whisper input: ${whisperInput}`);
-        // Calculate dynamic timeout based on audio duration and Metal support
-        const audioDurationSec = (statSync(whisperInput).size - 44) / 32000; // 16kHz × 16-bit
-        const multiplier = this.hasMetal ? TIMEOUT_MULTIPLIER_METAL : TIMEOUT_MULTIPLIER_ROSETTA;
-        const timeoutMs = TIMEOUT_BASE_MS + Math.ceil(audioDurationSec * 1000 * multiplier);
-        debug('Voice', `Starting whisper-cli transcription (${audioDurationSec.toFixed(1)}s audio, timeout ${(timeoutMs / 1000).toFixed(0)}s, metal=${this.hasMetal})...`);
-        try {
-            let text;
-            try {
-                text = await this.transcribe(whisperInput, this.whisperModel, timeoutMs);
-            }
-            catch (err) {
-                const isTimeout = err instanceof Error && err.message.includes('timed out');
-                const fallback = isTimeout ? findFallbackModel(this.whisperModel) : null;
-                if (fallback) {
-                    debug('Voice', `Timeout with current model, retrying with fallback: ${fallback}`);
-                    this.whisperModel = fallback; // persist for future calls
-                    text = await this.transcribe(whisperInput, fallback, timeoutMs);
-                }
-                else {
-                    throw err;
-                }
-            }
-            if (existsSync(resampledFile))
-                try {
-                    unlinkSync(resampledFile);
-                }
-                catch { /* */ }
-            return text;
-        }
-        catch (err) {
-            if (existsSync(resampledFile))
-                try {
-                    unlinkSync(resampledFile);
-                }
-                catch { /* */ }
-            throw err;
-        }
-    }
-    resample(inputFile, outputFile) {
-        return new Promise((resolve, reject) => {
-            // Resample to 16kHz/16-bit mono + gentle highpass (80Hz removes rumble, preserves voice)
-            // + normalize volume for consistent whisper input
-            const sox = spawn(this.soxBin, [
-                inputFile,
-                '-r', '16000',
-                '-c', '1',
-                '-b', '16',
-                outputFile,
-                'highpass', '80',
-                'norm',
-            ]);
-            let stderr = '';
-            sox.stderr?.on('data', (data) => { stderr += data.toString(); });
-            sox.on('error', (err) => reject(new Error(`sox spawn error: ${err.message}`)));
-            sox.on('close', (code) => {
-                if (code !== 0) {
-                    reject(new Error(`sox exited with code ${code}: ${stderr.slice(-200)}`));
-                }
-                else {
-                    debug('Voice', `Resampled OK (${statSync(outputFile).size} bytes)`);
-                    resolve();
-                }
-            });
-        });
-    }
-    transcribe(audioFile, modelPath, timeoutMs) {
-        return new Promise((resolve, reject) => {
-            const args = [
-                '-m', modelPath,
-                '-l', 'auto', // auto-detect language (supports Korean, English, etc.)
-                '-f', audioFile,
-                '--no-timestamps',
-                '-np', // suppress whisper's own progress output
-                '--prompt', 'coding, programming, Claude, terminal, git, function, component, API',
-            ];
-            debug('Voice', `${this.whisperBin} ${args.join(' ')}`);
-            const whisper = spawn(this.whisperBin, args);
-            let stdout = '';
-            let stderr = '';
-            let settled = false;
-            // Timeout guard (dynamic based on audio length + Metal support)
-            const timer = setTimeout(() => {
-                if (!settled) {
-                    settled = true;
-                    debug('Voice', `whisper-cli timed out after ${(timeoutMs / 1000).toFixed(0)}s, killing`);
-                    whisper.kill('SIGKILL');
-                    reject(new Error(`whisper-cli timed out after ${(timeoutMs / 1000).toFixed(0)}s`));
-                }
-            }, timeoutMs);
-            whisper.stdout.on('data', (data) => {
-                stdout += data.toString();
-            });
-            whisper.stderr.on('data', (data) => {
-                stderr += data.toString();
-            });
-            whisper.on('error', (err) => {
-                if (!settled) {
-                    settled = true;
-                    clearTimeout(timer);
-                    debug('Voice', `whisper-cli spawn error: ${err.message}`);
-                    reject(new Error(`Failed to run whisper-cli: ${err.message}`));
-                }
-            });
-            whisper.on('close', (code) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
-                debug('Voice', `whisper-cli exited with code ${code}`);
-                if (stderr.length > 0) {
-                    debug('Voice', `whisper stderr (last 200): ${stderr.slice(-200)}`);
-                }
-                if (code !== 0) {
-                    reject(new Error(`whisper-cli exited with code ${code}: ${stderr.slice(-300)}`));
-                    return;
-                }
-                const text = stdout
-                    .split('\n')
-                    .map((line) => line.trim())
-                    .filter((line) => line.length > 0 &&
-                    !line.startsWith('[') && // skip timestamp lines
-                    line !== '(blank audio)' && // skip blank audio markers
-                    !line.startsWith('(') && // skip other whisper annotations
-                    !/^\[BLANK_AUDIO\]$/i.test(line) // skip blank audio tags
-                )
-                    .join(' ')
-                    .trim();
-                debug('Voice', `whisper stdout raw (${stdout.length} chars): "${stdout.slice(0, 100)}"`);
-                resolve(text);
-            });
-        });
-    }
     cleanup() {
         if (this.audioFile && existsSync(this.audioFile)) {
             try {

package/dist/voice.js.map

@@ -1 +1 @@
-{"version":3,"file":"voice.js","sourceRoot":"","sources":["../src/voice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"voice.js","sourceRoot":"","sources":["../src/voice.ts"],"names":[],"mappings":"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"}

package/dist/ws-server.d.ts

@@ -5,10 +5,16 @@ export declare class WsServer {
     private wss;
     private commandCallback;
     private rawMessageCallback;
+    private binaryCallback;
+    private onPongCallback;
     private onConnectCallback;
     private onDisconnectCallback;
     private clientAlive;
     private esp32Clients;
+    private recentConnectsByIp;
+    private flappingClients;
+    private knownBoardIps;
+    private socketRemoteIp;
     private eventTransformer;
     private ulanziClients;
     private tuiClients;
@@ -19,10 +25,18 @@ export declare class WsServer {
     onBroadcast(hook: (event: BridgeEvent) => void): void;
     setEventTransformer(transformer: ((event: BridgeEvent, client: WebSocket) => BridgeEvent | null) | null): void;
     isEsp32Client(ws: WebSocket): boolean;
+    /** True when this socket's remote IP has been reconnecting fast enough to
+     *  count as flapping (see the connection handler). Callers use it to skip
+     *  the heavy parts of the initial burst so a marginal client can't resonate
+     *  the daemon into saturation. */
+    isFlappingClient(ws: WebSocket): boolean;
     markEsp32Client(ws: WebSocket): void;
     private payloadFor;
     broadcast(event: BridgeEvent): void;
     onCommand(callback: (cmd: PluginCommand) => void): void;
+    /** Register a callback for binary frames (device audio). */
+    onPong(callback: (ws: WebSocket) => void): void;
+    onBinary(callback: (data: Buffer, sender: WebSocket) => void): void;
     /** Register a callback for raw messages before PluginCommand dispatch. Return true to consume. */
     onRawMessage(callback: (msg: Record<string, unknown>, sender: WebSocket) => boolean): void;
     /** Broadcast to all clients except the sender */

package/dist/ws-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../src/ws-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAK7D,qBAAa,QAAQ;IACnB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,eAAe,CAA+C;IACtE,OAAO,CAAC,kBAAkB,CAA+E;IACzG,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,gBAAgB,CAAgF;IAGxG,OAAO,CAAC,aAAa,CAAwB;IAK7C,OAAO,CAAC,UAAU,CAAsD;IACxE,OAAO,CAAC,SAAS,CAAiC;gBAEtC,MAAM,EAAE,MAAM;IAiH1B,OAAO,CAAC,cAAc,CAA2C;IAEjE,sFAAsF;IACtF,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrD,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,KAAK,WAAW,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAI9G,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAIrC,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAIpC,OAAO,CAAC,UAAU;IAOlB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAiBnC,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI;IAIvD,kGAAkG;IAClG,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,GAAG,IAAI;IAI1F,iDAAiD;IACjD,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAW5D,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAIxD,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAI3D,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;IAQ/C,cAAc,IAAI,MAAM;IAIxB,oBAAoB,IAAI,MAAM;IAI9B;;oDAEgD;IAChD,aAAa,IAAI,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAMpD,KAAK,IAAI,IAAI;CASd"}
+{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../src/ws-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAK7D,qBAAa,QAAQ;IACnB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,eAAe,CAA+C;IACtE,OAAO,CAAC,kBAAkB,CAA+E;IACzG,OAAO,CAAC,cAAc,CAA4D;IAClF,OAAO,CAAC,cAAc,CAA0C;IAChE,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,YAAY,CAAwB;IAE5C,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,eAAe,CAAwB;IAO/C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,gBAAgB,CAAgF;IAGxG,OAAO,CAAC,aAAa,CAAwB;IAK7C,OAAO,CAAC,UAAU,CAAsD;IACxE,OAAO,CAAC,SAAS,CAAiC;gBAEtC,MAAM,EAAE,MAAM;IAoJ1B,OAAO,CAAC,cAAc,CAA2C;IAEjE,sFAAsF;IACtF,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrD,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,KAAK,WAAW,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAI9G,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAIrC;;;sCAGkC;IAClC,gBAAgB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAIxC,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAMpC,OAAO,CAAC,UAAU;IAOlB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAiBnC,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI;IAIvD,4DAA4D;IAC5D,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAI/C,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAInE,kGAAkG;IAClG,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,GAAG,IAAI;IAI1F,iDAAiD;IACjD,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAW5D,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAIxD,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI;IAI3D,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;IAQ/C,cAAc,IAAI,MAAM;IAIxB,oBAAoB,IAAI,MAAM;IAI9B;;oDAEgD;IAChD,aAAa,IAAI,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAMpD,KAAK,IAAI,IAAI;CASd"}

package/dist/ws-server.js

@@ -6,10 +6,23 @@ export class WsServer {
     wss;
     commandCallback = null;
     rawMessageCallback = null;
+    binaryCallback = null;
+    onPongCallback = null;
     onConnectCallback = null;
     onDisconnectCallback = null;
     clientAlive = new Map();
     esp32Clients = new Set();
+    // Per-IP connect timestamps for the flap guard (window: 30s, threshold: >6).
+    recentConnectsByIp = new Map();
+    flappingClients = new Set();
+    // IPs that have ever sent device_info this daemon lifetime. A board that
+    // predates the `?clientType=esp32` tag (XTeink 6ccbe140) is only recognized
+    // AFTER its first device_info — one connect too late, because the initial
+    // burst already went out untagged. Remembering the IP makes every subsequent
+    // connect board-class from byte one, so the ≤4096B invariant holds and a
+    // heap-tight board can't be killed by its own welcome payload.
+    knownBoardIps = new Set();
+    socketRemoteIp = new Map();
     eventTransformer = null;
     // Clients that registered as the Ulanzi Studio plugin. Their WebSocket
     // presence is the daemon's D200H connectivity signal.
@@ -60,10 +73,31 @@ export class WsServer {
                 debug('WS', `Remote client authenticated from ${remoteIp}`);
             }
             const url = new URL(req.url || '/', `http://${req.headers.host || 'localhost'}`);
+            this.socketRemoteIp.set(ws, remoteIp);
             if (url.searchParams.get('clientType') === 'esp32' || url.searchParams.get('esp32') === '1') {
                 this.esp32Clients.add(ws);
                 debug('WS', 'ESP32 WiFi client tagged from query');
             }
+            else if (this.knownBoardIps.has(remoteIp)) {
+                this.esp32Clients.add(ws);
+                debug('WS', `ESP32 WiFi client tagged from known board IP ${remoteIp}`);
+            }
+            // Flap guard: a client whose IP reconnected >6 times in the last 30s is
+            // marked flapping. It is still served (rejecting outright would blind a
+            // recovering board forever), but sendInitialState skips the expensive
+            // burst for it — a marginal-RF board must not be able to resonate the
+            // daemon into event-loop saturation (connect → heavy serialize → client
+            // dies on the burst → immediate reconnect → repeat).
+            {
+                const now = Date.now();
+                const recent = (this.recentConnectsByIp.get(remoteIp) ?? []).filter((t) => now - t < 30_000);
+                recent.push(now);
+                this.recentConnectsByIp.set(remoteIp, recent);
+                if (recent.length > 6) {
+                    this.flappingClients.add(ws);
+                    debug('WS', `Flapping client ${remoteIp}: ${recent.length} connects/30s — initial burst reduced`);
+                }
+            }
             debug('WS', 'Plugin connected');
             this.clientAlive.set(ws, true);
             // Send current state to newly connected client
@@ -72,8 +106,20 @@ export class WsServer {
             }
             ws.on('pong', () => {
                 this.clientAlive.set(ws, true);
+                // A display-only board sends no application messages while idle, so a
+                // message-based lastSeen brands every healthy quiet board "stale". Its
+                // pong every WS_PING_INTERVAL_MS is real liveness — surface it.
+                this.onPongCallback?.(ws);
             });
-            ws.on('message', (data) => {
+            ws.on('message', (data, isBinary) => {
+                // Binary frames are device audio (voice capture), not JSON — route
+                // them out before the parser, which would otherwise log a parse error
+                // per 1 KB PCM frame.
+                if (isBinary) {
+                    const buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
+                    this.binaryCallback?.(buf, ws);
+                    return;
+                }
                 try {
                     const msg = JSON.parse(data.toString());
                     debug('WS', `recv cmd: ${msg.type}`);
@@ -109,6 +155,8 @@ export class WsServer {
                 debug('WS', 'Plugin disconnected');
                 this.clientAlive.delete(ws);
                 this.esp32Clients.delete(ws);
+                this.flappingClients.delete(ws);
+                this.socketRemoteIp.delete(ws);
                 this.tuiClients.delete(ws);
                 if (this.ulanziClients.delete(ws) && this.ulanziClients.size === 0) {
                     debug('WS', 'Ulanzi plugin gone — D200H disconnected');
@@ -133,8 +181,18 @@ export class WsServer {
     isEsp32Client(ws) {
         return this.esp32Clients.has(ws);
     }
+    /** True when this socket's remote IP has been reconnecting fast enough to
+     *  count as flapping (see the connection handler). Callers use it to skip
+     *  the heavy parts of the initial burst so a marginal client can't resonate
+     *  the daemon into saturation. */
+    isFlappingClient(ws) {
+        return this.flappingClients.has(ws);
+    }
     markEsp32Client(ws) {
         this.esp32Clients.add(ws);
+        const ip = this.socketRemoteIp.get(ws);
+        if (ip)
+            this.knownBoardIps.add(ip);
     }
     payloadFor(event, client, cachedPayload) {
         if (!this.eventTransformer)
@@ -170,6 +228,13 @@ export class WsServer {
     onCommand(callback) {
         this.commandCallback = callback;
     }
+    /** Register a callback for binary frames (device audio). */
+    onPong(callback) {
+        this.onPongCallback = callback;
+    }
+    onBinary(callback) {
+        this.binaryCallback = callback;
+    }
     /** Register a callback for raw messages before PluginCommand dispatch. Return true to consume. */
     onRawMessage(callback) {
         this.rawMessageCallback = callback;