@matter-server/ble-proxy 0.7.2-alpha.0-20260602-cef59f5 → 0.8.0

package/dist/esm/BleProxyHandler.js

@@ -3,34 +3,35 @@
  * Copyright 2025-2026 Open Home Foundation
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createPromise, Logger, Observable, Seconds, Time, withTimeout } from "@matter/main";
+import { Logger, Observable } from "@matter/main";
 import { WebSocket, WebSocketServer } from "ws";
-import {
-  BLE_PROXY_PROTOCOL_VERSION,
-  decodeBinaryFrame,
-  encodeBinaryFrame
-} from "./BleProxyProtocol.js";
+import { BleProxyConnection } from "./BleProxyConnection.js";
+import { BleProxyCommand, BleProxyEvent } from "./BleProxyProtocol.js";
 const logger = Logger.get("BleProxyHandler");
-const HANDSHAKE_TIMEOUT = Seconds(10);
-const COMMAND_TIMEOUT = Seconds(60);
 class BleProxyHandler {
   #wss;
   /** Upgrade listener removers, one per HTTP server `register()` call (multi-bind). */
   #removeUpgradeListeners = [];
-  #client;
-  #handshakeComplete = false;
-  #pendingCommands = /* @__PURE__ */ new Map();
-  /** Command ID counter. Rolls over at 0xFFFF to stay in safe integer range. */
-  #nextCommandId = 0;
+  #connections = /* @__PURE__ */ new Set();
   #closed = false;
-  /** Emitted when a JSON event is received from the BLE proxy client. */
-  eventReceived = new Observable();
-  /** Emitted when a binary frame is received from the BLE proxy client. */
-  binaryFrameReceived = new Observable();
-  /** Emitted once a proxy client has completed the handshake and `connected` is true. */
+  /** Active scan intent + args, so clients joining mid-scan can be synced. */
+  #scanActive = false;
+  #scanArgs;
+  /** Connections currently told to scan, for aggregate `scanStopped`. */
+  #scanning = /* @__PURE__ */ new Set();
+  /** address -> owning connection + every connection that has seen it. */
+  #owners = /* @__PURE__ */ new Map();
+  /** Emitted whenever a connection completes its handshake. */
   connectionEstablished = new Observable();
+  /** Emitted for each `device_discovered`, after ownership is updated. */
+  deviceDiscovered = new Observable();
+  /** Emitted once no connection is scanning anymore. */
+  scanStopped = new Observable();
   get connected() {
-    return this.#handshakeComplete && this.#client?.readyState === WebSocket.OPEN;
+    for (const c of this.#connections) {
+      if (c.connected) return true;
+    }
+    return false;
   }
   async register(server) {
     const isFirstBind = this.#wss === void 0;
@@ -59,38 +60,11 @@ class BleProxyHandler {
         ws.close();
         return;
       }
-      if (this.#client) {
-        logger.warn("Rejecting new BLE proxy client - only one connection allowed");
-        ws.close(4e3, "Only one BLE proxy client allowed");
-        return;
-      }
-      logger.info("BLE proxy client connected, waiting for handshake");
-      this.#client = ws;
-      this.#handshakeComplete = false;
-      const handshakeTimer = Time.getTimer("BLE proxy handshake timeout", HANDSHAKE_TIMEOUT, () => {
-        if (!this.#handshakeComplete) {
-          logger.warn("BLE proxy handshake timeout - closing connection");
-          ws.close(4001, "Handshake timeout");
-          this.#cleanupClient();
-        }
-      }).start();
-      ws.on("message", (data, isBinary) => {
-        if (isBinary) {
-          this.#handleBinaryMessage(data);
-        } else {
-          this.#handleTextMessage(data.toString(), handshakeTimer);
-        }
-      });
-      ws.on("close", () => {
-        handshakeTimer.stop();
-        logger.info("BLE proxy client disconnected");
-        this.#cleanupClient();
-      });
-      ws.on("error", (err) => {
-        logger.error("BLE proxy WebSocket error:", err);
-        handshakeTimer.stop();
-        this.#cleanupClient();
-      });
+      const connection = new BleProxyConnection(ws);
+      this.#connections.add(connection);
+      connection.handshakeCompleted.on(() => this.#onHandshakeCompleted(connection));
+      connection.eventReceived.on((event, data) => this.#onConnectionEvent(connection, event, data));
+      connection.closed.on(() => this.#onConnectionClosed(connection));
     });
   }
   unregister() {
@@ -100,10 +74,12 @@ class BleProxyHandler {
     this.#closed = true;
     for (const remove of this.#removeUpgradeListeners) remove();
     this.#removeUpgradeListeners = [];
-    if (this.#client && this.#client.readyState === WebSocket.OPEN) {
-      this.#client.close();
+    for (const connection of this.#connections) {
+      connection.close();
     }
-    this.#cleanupClient();
+    this.#connections.clear();
+    this.#scanning.clear();
+    this.#owners.clear();
     const wss = this.#wss;
     this.#wss = void 0;
     wss.clients.forEach((client) => {
@@ -112,152 +88,107 @@ class BleProxyHandler {
       }
     });
     return new Promise((resolve, reject) => {
-      wss.close((err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
+      wss.close((err) => err ? reject(err) : resolve());
     });
   }
-  /**
-   * Send a typed command to the BLE proxy client and wait for the response.
-   * The return type is inferred from the command name via BleProxyCommandMap.
-   * Rejects if no client is connected or the client disconnects before responding.
-   */
-  async sendCommand(command, ...rest) {
-    if (!this.connected || !this.#client) {
-      throw new Error("BLE proxy client not connected");
-    }
-    const args = rest[0];
-    const id = this.#nextCommandId;
-    this.#nextCommandId = this.#nextCommandId + 1 & 65535;
-    const message = { id, command };
-    if (args !== void 0) {
-      message.args = args;
-    }
-    const { promise, resolver, rejecter } = createPromise();
-    this.#pendingCommands.set(id, { resolver, rejecter });
-    this.#client.send(JSON.stringify(message), (err) => {
-      if (err) {
-        this.#pendingCommands.delete(id);
-        rejecter(new Error(`Failed to send command ${command}: ${err.message}`));
-      }
-    });
-    return withTimeout(COMMAND_TIMEOUT, promise, () => this.#pendingCommands.delete(id));
+  /** Returns the connection that owns `address`, if it is still connected. */
+  getOwner(address) {
+    const entry = this.#owners.get(address);
+    if (entry && entry.owner.connected) return entry.owner;
+    return void 0;
   }
-  /**
-   * Send a binary frame to the BLE proxy client.
-   */
-  sendBinaryFrame(opcode, connectionHandle, payload) {
-    if (!this.connected || !this.#client) {
-      throw new Error("BLE proxy client not connected");
+  async startScan(args) {
+    this.#scanActive = true;
+    this.#scanArgs = args;
+    const sends = new Array();
+    for (const connection of this.#connections) {
+      if (connection.connected) {
+        this.#scanning.add(connection);
+        sends.push(
+          connection.sendCommand(BleProxyCommand.StartScan, args).catch((err) => {
+            logger.warn(`[${connection.id}] Failed to start scan:`, err);
+            this.#markNotScanning(connection, "start scan failed");
+          })
+        );
+      }
     }
-    const frame = encodeBinaryFrame(opcode, connectionHandle, payload);
-    this.#client.send(frame);
+    await Promise.all(sends);
   }
-  #handleTextMessage(raw, handshakeTimer) {
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      logger.warn("Received invalid JSON from BLE proxy client");
-      return;
-    }
-    const msg = parsed;
-    if (!this.#handshakeComplete) {
-      this.#handleHandshake(msg, handshakeTimer);
-      return;
-    }
-    if ("id" in msg && "success" in msg) {
-      this.#handleResponse(msg);
-      return;
-    }
-    if ("event" in msg && "data" in msg) {
-      this.#handleEvent(msg);
-      return;
+  async stopScan() {
+    this.#scanActive = false;
+    const sends = new Array();
+    for (const connection of this.#connections) {
+      if (connection.connected) {
+        sends.push(
+          connection.sendCommand(BleProxyCommand.StopScan).catch((err) => logger.warn(`[${connection.id}] Failed to stop scan:`, err))
+        );
+      }
     }
-    logger.warn("Received unknown message from BLE proxy client:", msg);
+    this.#scanning.clear();
+    await Promise.all(sends);
   }
-  #handleHandshake(msg, handshakeTimer) {
-    if (msg.type !== "hello") {
-      logger.warn(`Expected hello message, got: ${JSON.stringify(msg)}`);
-      this.#client?.close(4002, "Expected hello message");
-      this.#cleanupClient();
-      return;
-    }
-    const hello = msg;
-    handshakeTimer.stop();
-    if (hello.version !== BLE_PROXY_PROTOCOL_VERSION) {
-      logger.warn(
-        `BLE proxy client version ${hello.version} not supported (server supports ${BLE_PROXY_PROTOCOL_VERSION})`
-      );
-      this.#client?.send(
-        JSON.stringify({
-          type: "hello_response",
-          version: BLE_PROXY_PROTOCOL_VERSION,
-          error: "unsupported_version",
-          message: `Server supports protocol version ${BLE_PROXY_PROTOCOL_VERSION}, client sent version ${hello.version}`
-        })
-      );
-      this.#client?.close(4003, "Unsupported protocol version");
-      this.#cleanupClient();
-      return;
-    }
-    this.#handshakeComplete = true;
-    this.#client?.send(
-      JSON.stringify({
-        type: "hello_response",
-        version: BLE_PROXY_PROTOCOL_VERSION
-      })
-    );
-    logger.info(`BLE proxy handshake complete (version ${BLE_PROXY_PROTOCOL_VERSION})`);
+  #onHandshakeCompleted(connection) {
     this.connectionEstablished.emit();
-  }
-  #handleResponse(msg) {
-    const pending = this.#pendingCommands.get(msg.id);
-    if (!pending) {
-      logger.warn(`Received response for unknown command id ${msg.id}`);
-      return;
-    }
-    this.#pendingCommands.delete(msg.id);
-    if (msg.success) {
-      pending.resolver(msg.result);
-    } else {
-      pending.rejecter(new Error(`${msg.error}: ${msg.message}`));
+    if (this.#scanActive && this.#scanArgs) {
+      this.#scanning.add(connection);
+      connection.sendCommand(BleProxyCommand.StartScan, this.#scanArgs).catch((err) => {
+        logger.warn(`[${connection.id}] Failed to sync scan to joining client:`, err);
+        this.#markNotScanning(connection, "start scan failed");
+      });
     }
   }
-  #handleEvent(msg) {
-    this.eventReceived.emit(msg.event, msg.data);
+  #onConnectionEvent(connection, event, data) {
+    if (event === BleProxyEvent.DeviceDiscovered) {
+      this.#onDeviceDiscovered(connection, data);
+    } else if (event === BleProxyEvent.ScanStopped) {
+      this.#markNotScanning(connection, data.reason ?? "unknown");
+    }
   }
-  #handleBinaryMessage(data) {
-    if (!this.#handshakeComplete) {
-      logger.warn("Received binary frame before handshake");
+  /** Drop a connection from the scanning set; emit aggregate scanStopped once none remain. */
+  #markNotScanning(connection, reason) {
+    if (!this.#scanning.delete(connection)) {
       return;
     }
-    try {
-      const frame = decodeBinaryFrame(new Uint8Array(data));
-      const head = Array.from(frame.payload.subarray(0, 8)).map((b) => b.toString(16).padStart(2, "0")).join("");
-      logger.debug(
-        `[FRAME] opcode=${frame.opcode} handle=${frame.connectionHandle} len=${frame.payload.length} head=${head}`
-      );
-      this.binaryFrameReceived.emit(frame);
-    } catch (err) {
-      logger.warn("Failed to decode binary frame:", err);
+    if (this.#scanning.size === 0) {
+      this.scanStopped.emit(reason);
     }
   }
-  #cleanupClient() {
-    if (this.#client) {
-      if (this.#client.readyState === WebSocket.OPEN) {
-        this.#client.close();
+  #onDeviceDiscovered(connection, data) {
+    let entry = this.#owners.get(data.address);
+    if (!entry) {
+      entry = { owner: connection, seers: /* @__PURE__ */ new Set([connection]) };
+      this.#owners.set(data.address, entry);
+    } else {
+      entry.seers.add(connection);
+      if (!entry.owner.connected) {
+        entry.owner = connection;
       }
-      this.#client = void 0;
     }
-    this.#handshakeComplete = false;
-    for (const [id, pending] of this.#pendingCommands) {
-      pending.rejecter(new Error("BLE proxy client disconnected"));
-      this.#pendingCommands.delete(id);
+    logger.debug(
+      `[${connection.id}] device_discovered ${data.address} rssi=${data.rssi ?? "n/a"} seers=${entry.seers.size} isOwner=${entry.owner === connection}`
+    );
+    this.deviceDiscovered.emit(data, connection);
+  }
+  #onConnectionClosed(connection) {
+    this.#connections.delete(connection);
+    this.#markNotScanning(connection, "client disconnected");
+    for (const [address, entry] of this.#owners) {
+      entry.seers.delete(connection);
+      if (entry.owner === connection) {
+        let next;
+        for (const seer of entry.seers) {
+          if (seer.connected) {
+            next = seer;
+            break;
+          }
+        }
+        if (next) {
+          entry.owner = next;
+          logger.info(`Reassigned ownership of ${address} to [${next.id}]`);
+        } else {
+          this.#owners.delete(address);
+        }
+      }
     }
   }
 }

package/dist/esm/BleProxyHandler.js.map

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

package/dist/esm/ProxyBleChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyBleChannel.d.ts","sourceRoot":"","sources":["../../src/ProxyBleChannel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,WAAW,EAKX,aAAa,EAEb,KAAK,SAAS,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAoC,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AACnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAgC5D;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,SAAS;;IAMtD,YAAY,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,EAGhE;IAEK,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAuNjE;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC,QAAQ,CAKlF;IAEK,KAAK,kBAEV;IAED,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,MAAM,2BAE5C;CACJ;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,KAAK,CAAC;;IAWlD,YAAY,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,IAAI,EAOjG;IAED,IAAI,SAAS,YAEZ;IAED,gBAAgB,SAEf;IAED,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAQ7B;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAOhD;IAED,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAc7C;IAUK,IAAI,CAAC,IAAI,EAAE,KAAK,iBASrB;IAED,IAAI,IAAI,WAEP;IAEK,KAAK,kBAUV;CACJ"}
+{"version":3,"file":"ProxyBleChannel.d.ts","sourceRoot":"","sources":["../../src/ProxyBleChannel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,WAAW,EAKX,aAAa,EAEb,KAAK,SAAS,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAoC,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AACnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAgC5D;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,SAAS;;IAMtD,YAAY,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,EAGhE;IAEK,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CA2PjE;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC,QAAQ,CAKlF;IAEK,KAAK,kBAEV;IAED,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,MAAM,2BAE5C;CACJ;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,KAAK,CAAC;;IAWlD,YAAY,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,IAAI,EAOjG;IAED,IAAI,SAAS,YAEZ;IAED,gBAAgB,SAEf;IAED,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAQ7B;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAOhD;IAED,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAc7C;IAUK,IAAI,CAAC,IAAI,EAAE,KAAK,iBASrB;IAED,IAAI,IAAI,WAEP;IAEK,KAAK,kBAUV;CACJ"}

package/dist/esm/ProxyBleChannel.js

@@ -51,28 +51,34 @@ class ProxyBleCentralInterface {
       throw new InternalError("Network Interface was not added to the system yet.");
     }
     const { peripheralAddress } = address;
-    const { hasAdditionalAdvertisementData } = this.#bleScanner.getDiscoveredDevice(peripheralAddress);
-    if (!this.#handler.connected) {
-      throw new BleError("BLE proxy client not connected");
+    const connection = this.#handler.getOwner(peripheralAddress);
+    if (!connection) {
+      throw new BleError(`No connected BLE proxy client owns peripheral ${peripheralAddress}`);
     }
-    logger.debug(`Connecting to peripheral ${peripheralAddress} via proxy`);
-    const { connection_handle, mtu: peripheralMtu } = await this.#handler.sendCommand(BleProxyCommand.Connect, {
+    const discovered = this.#bleScanner.getDiscoveredDevice(peripheralAddress);
+    const { hasAdditionalAdvertisementData } = discovered;
+    const rssi = discovered.peripheral.rssi;
+    logger.debug(`Connecting to peripheral ${peripheralAddress} (rssi=${rssi ?? "n/a"}) via proxy`);
+    const { connection_handle, mtu: peripheralMtu } = await connection.sendCommand(BleProxyCommand.Connect, {
       address: peripheralAddress
     });
     let mtu = peripheralMtu ?? 0;
     if (mtu > MatterBle.MAXIMUM_BTP_MTU) {
       mtu = MatterBle.MAXIMUM_BTP_MTU;
     }
-    logger.debug(`Connected to ${peripheralAddress}, handle=${connection_handle}, mtu=${mtu}`);
+    logger.info(
+      `Connected to ${peripheralAddress}, handle=${connection_handle}, mtu=${mtu}, rssi=${rssi ?? "n/a"}`
+    );
+    let detachObservers;
     try {
-      const { services } = await this.#handler.sendCommand(BleProxyCommand.DiscoverServices, {
+      const { services } = await connection.sendCommand(BleProxyCommand.DiscoverServices, {
         connection_handle
       });
       const matterService = services.find((s) => MatterBle.isServiceUuid(s.uuid));
       if (!matterService) {
         throw new BleError(`Peripheral ${peripheralAddress} does not have Matter BLE service`);
       }
-      const { characteristics } = await this.#handler.sendCommand(BleProxyCommand.DiscoverCharacteristics, {
+      const { characteristics } = await connection.sendCommand(BleProxyCommand.DiscoverCharacteristics, {
         connection_handle,
         service_uuid: matterService.uuid
       });
@@ -94,24 +100,11 @@ class ProxyBleCentralInterface {
       }
       if (c3Uuid && hasAdditionalAdvertisementData) {
         logger.debug(`Reading additional commissioning data from C3`);
-        await this.#handler.sendCommand(BleProxyCommand.ReadCharacteristic, {
+        await connection.sendCommand(BleProxyCommand.ReadCharacteristic, {
           connection_handle,
           characteristic_uuid: c3Uuid
         });
       }
-      const btpHandshakeRequest = BtpCodec.encodeBtpHandshakeRequest({
-        versions: MatterBle.BTP_SUPPORTED_VERSIONS,
-        attMtu: mtu,
-        clientWindowSize: MatterBle.BTP_MAXIMUM_WINDOW_SIZE
-      });
-      logger.debug(`Sending BTP handshake request on C1 and subscribing C2 atomically`);
-      await this.#handler.sendCommand(BleProxyCommand.WriteAndSubscribe, {
-        connection_handle,
-        write_uuid: c1Uuid,
-        write_value: Buffer.from(btpHandshakeRequest).toString("base64"),
-        write_response: true,
-        subscribe_uuid: c2Uuid
-      });
       const {
         promise: handshakePromise,
         resolver: handshakeResolver,
@@ -133,29 +126,61 @@ class ProxyBleCentralInterface {
           }
         }
       };
-      this.#handler.binaryFrameReceived.on(handshakeObserver);
+      connection.binaryFrameReceived.on(handshakeObserver);
+      const btpHandshakeRequest = BtpCodec.encodeBtpHandshakeRequest({
+        versions: MatterBle.BTP_SUPPORTED_VERSIONS,
+        attMtu: mtu,
+        clientWindowSize: MatterBle.BTP_MAXIMUM_WINDOW_SIZE
+      });
+      logger.debug(`Sending BTP handshake request on C1 and subscribing C2 atomically`);
       let handshakeResponse;
       try {
+        await connection.sendCommand(BleProxyCommand.WriteAndSubscribe, {
+          connection_handle,
+          write_uuid: c1Uuid,
+          write_value: Buffer.from(btpHandshakeRequest).toString("base64"),
+          write_response: true,
+          subscribe_uuid: c2Uuid
+        });
         handshakeResponse = await handshakePromise;
       } finally {
-        this.#handler.binaryFrameReceived.off(handshakeObserver);
+        connection.binaryFrameReceived.off(handshakeObserver);
         btpHandshakeTimeout.stop();
       }
       const onMatterMessageListener = this.#onMatterMessageListener;
       const channelRef = {};
+      const sessionRef = {};
+      const earlyFrames = new Array();
+      const forwardToBtp = (payload) => {
+        sessionRef.session?.handleIncomingBleData(payload).catch(
+          (error) => logger.warn(`Peripheral ${peripheralAddress}: Error handling incoming BLE data`, error)
+        );
+      };
+      const binaryObserver = (frame) => {
+        if (frame.connectionHandle === connection_handle && frame.opcode === BinaryFrameOpcode.Notification) {
+          const payload = new Uint8Array(frame.payload);
+          if (sessionRef.session) {
+            forwardToBtp(payload);
+          } else {
+            earlyFrames.push(payload);
+          }
+        }
+      };
+      connection.binaryFrameReceived.on(binaryObserver);
+      detachObservers = () => connection.binaryFrameReceived.off(binaryObserver);
       const btpSession = await BtpSessionHandler.createAsCentral(
         handshakeResponse,
         // Write callback: send binary frame to proxy client
         async (data) => {
           const bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
-          this.#handler.sendBinaryFrame(BinaryFrameOpcode.WriteData, connection_handle, bytes);
+          connection.sendBinaryFrame(BinaryFrameOpcode.WriteData, connection_handle, bytes);
         },
         // Disconnect callback
         async () => {
           if (!channelRef.channel?.connected) return;
           logger.debug(`Disconnecting from ${peripheralAddress} via proxy`);
           try {
-            await this.#handler.sendCommand(BleProxyCommand.Disconnect, { connection_handle });
+            await connection.sendCommand(BleProxyCommand.Disconnect, { connection_handle });
           } catch (error) {
             logger.debug(
               `Peripheral ${peripheralAddress}: Error sending Disconnect to proxy client`,
@@ -171,14 +196,11 @@ class ProxyBleCentralInterface {
           }
         }
       );
-      const binaryObserver = (frame) => {
-        if (frame.connectionHandle === connection_handle && frame.opcode === BinaryFrameOpcode.Notification) {
-          btpSession.handleIncomingBleData(new Uint8Array(frame.payload)).catch(
-            (error) => logger.warn(`Peripheral ${peripheralAddress}: Error handling incoming BLE data`, error)
-          );
-        }
-      };
-      this.#handler.binaryFrameReceived.on(binaryObserver);
+      sessionRef.session = btpSession;
+      for (const payload of earlyFrames) {
+        forwardToBtp(payload);
+      }
+      earlyFrames.length = 0;
       const eventObserver = (event, data) => {
         if (event === BleProxyEvent.Disconnected && typeof data.connection_handle === "number" && data.connection_handle === connection_handle) {
           logger.info(`Peripheral ${peripheralAddress} disconnected unexpectedly`);
@@ -186,17 +208,25 @@ class ProxyBleCentralInterface {
           channelRef.channel?.close().catch((error) => logger.debug(`Peripheral ${peripheralAddress}: Error closing channel`, error));
         }
       };
-      this.#handler.eventReceived.on(eventObserver);
-      const cleanupObservers = () => {
-        this.#handler.binaryFrameReceived.off(binaryObserver);
-        this.#handler.eventReceived.off(eventObserver);
+      connection.eventReceived.on(eventObserver);
+      const ownerClosedObserver = () => {
+        logger.info(`Owning proxy client for ${peripheralAddress} disconnected`);
+        channelRef.channel?.markDisconnected();
+        channelRef.channel?.close().catch((error) => logger.debug(`Peripheral ${peripheralAddress}: Error closing channel`, error));
+      };
+      connection.closed.on(ownerClosedObserver);
+      detachObservers = () => {
+        connection.binaryFrameReceived.off(binaryObserver);
+        connection.eventReceived.off(eventObserver);
+        connection.closed.off(ownerClosedObserver);
       };
-      const proxyChannel = new ProxyBleChannel(peripheralAddress, btpSession, cleanupObservers);
+      const proxyChannel = new ProxyBleChannel(peripheralAddress, btpSession, detachObservers);
       channelRef.channel = proxyChannel;
       return proxyChannel;
     } catch (error) {
+      detachObservers?.();
       try {
-        await this.#handler.sendCommand(BleProxyCommand.Disconnect, { connection_handle });
+        await connection.sendCommand(BleProxyCommand.Disconnect, { connection_handle });
       } catch (cleanupError) {
         logger.debug(`Peripheral ${peripheralAddress}: Error during connect-failure cleanup`, cleanupError);
       }

package/dist/esm/ProxyBleChannel.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ProxyBleChannel.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EAGI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEG;AACP,SAAS,YAAY,UAAU,UAAU,cAAc,mBAAmB,iBAAiB;AAE3F,SAAS,mBAAmB,iBAAiB,qBAAqB;AAGlE,MAAM,SAAS,OAAO,IAAI,iBAAiB;AAG3C,MAAM,kCAAkC;AACxC,MAAM,kCAAkC;AACxC,MAAM,gCAAgC;AAWtC,SAAS,gBAAgB,MAAsB;AAC3C,QAAM,QAAQ,KAAK,YAAY;AAC/B,MAAI,MAAM,WAAW,IAAI;AACrB,WAAO;AAAA,MACH,MAAM,UAAU,GAAG,CAAC;AAAA,MACpB,MAAM,UAAU,GAAG,EAAE;AAAA,MACrB,MAAM,UAAU,IAAI,EAAE;AAAA,MACtB,MAAM,UAAU,IAAI,EAAE;AAAA,MACtB,MAAM,UAAU,IAAI,EAAE;AAAA,IAC1B,EAAE,KAAK,GAAG;AAAA,EACd;AACA,SAAO;AACX;AAMO,MAAM,yBAA8C;AAAA,EAC9C;AAAA,EACA;AAAA,EACT;AAAA,EACA,UAAU;AAAA,EAEV,YAAY,YAA6B,SAA0B;AAC/D,SAAK,cAAc;AACnB,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAM,YAAY,SAAiD;AAC/D,QAAI,KAAK,SAAS;AACd,YAAM,IAAI,aAAa,6BAA6B;AAAA,IACxD;AACA,QAAI,CAAC,cAAc,MAAM,OAAO,GAAG;AAC/B,YAAM,IAAI,cAAc,2CAA2C;AAAA,IACvE;AACA,QAAI,KAAK,6BAA6B,QAAW;AAC7C,YAAM,IAAI,cAAc,oDAAoD;AAAA,IAChF;AAEA,UAAM,EAAE,kBAAkB,IAAI;AAC9B,UAAM,EAAE,+BAA+B,IAAI,KAAK,YAAY,oBAAoB,iBAAiB;AAEjG,QAAI,CAAC,KAAK,SAAS,WAAW;AAC1B,YAAM,IAAI,SAAS,gCAAgC;AAAA,IACvD;AAEA,WAAO,MAAM,4BAA4B,iBAAiB,YAAY;AAGtE,UAAM,EAAE,mBAAmB,KAAK,cAAc,IAAI,MAAM,KAAK,SAAS,YAAY,gBAAgB,SAAS;AAAA,MACvG,SAAS;AAAA,IACb,CAAC;AAED,QAAI,MAAM,iBAAiB;AAC3B,QAAI,MAAM,UAAU,iBAAiB;AACjC,YAAM,UAAU;AAAA,IACpB;AACA,WAAO,MAAM,gBAAgB,iBAAiB,YAAY,iBAAiB,SAAS,GAAG,EAAE;AAEzF,QAAI;AAEA,YAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS,YAAY,gBAAgB,kBAAkB;AAAA,QACnF;AAAA,MACJ,CAAC;AAED,YAAM,gBAAgB,SAAS,KAAK,OAAK,UAAU,cAAc,EAAE,IAAI,CAAC;AACxE,UAAI,CAAC,eAAe;AAChB,cAAM,IAAI,SAAS,cAAc,iBAAiB,mCAAmC;AAAA,MACzF;AAGA,YAAM,EAAE,gBAAgB,IAAI,MAAM,KAAK,SAAS,YAAY,gBAAgB,yBAAyB;AAAA,QACjG;AAAA,QACA,cAAc,cAAc;AAAA,MAChC,CAAC;AAED,UAAI;AACJ,UAAI;AACJ,UAAI;AAEJ,iBAAW,QAAQ,iBAAiB;AAChC,cAAM,YAAY,gBAAgB,KAAK,IAAI;AAC3C,YAAI,cAAc,UAAU,wBAAwB;AAChD,mBAAS,KAAK;AAAA,QAClB,WAAW,cAAc,UAAU,wBAAwB;AACvD,mBAAS,KAAK;AAAA,QAClB,WAAW,cAAc,UAAU,wBAAwB;AACvD,mBAAS,KAAK;AAAA,QAClB;AAAA,MACJ;AAEA,UAAI,CAAC,UAAU,CAAC,QAAQ;AACpB,cAAM,IAAI,SAAS,cAAc,iBAAiB,kDAAkD;AAAA,MACxG;AAGA,UAAI,UAAU,gCAAgC;AAC1C,eAAO,MAAM,+CAA+C;AAC5D,cAAM,KAAK,SAAS,YAAY,gBAAgB,oBAAoB;AAAA,UAChE;AAAA,UACA,qBAAqB;AAAA,QACzB,CAAC;AAAA,MAGL;AAOA,YAAM,sBAAsB,SAAS,0BAA0B;AAAA,QAC3D,UAAU,UAAU;AAAA,QACpB,QAAQ;AAAA,QACR,kBAAkB,UAAU;AAAA,MAChC,CAAC;AACD,aAAO,MAAM,mEAAmE;AAChF,YAAM,KAAK,SAAS,YAAY,gBAAgB,mBAAmB;AAAA,QAC/D;AAAA,QACA,YAAY;AAAA,QACZ,aAAa,OAAO,KAAK,mBAAkC,EAAE,SAAS,QAAQ;AAAA,QAC9E,gBAAgB;AAAA,QAChB,gBAAgB;AAAA,MACpB,CAAC;AAGD,YAAM;AAAA,QACF,SAAS;AAAA,QACT,UAAU;AAAA,QACV,UAAU;AAAA,MACd,IAAI,cAA0B;AAE9B,YAAM,sBAAsB,KAAK;AAAA,QAC7B;AAAA,QACA,UAAU;AAAA,QACV,MAAM;AACF,4BAAkB,IAAI,SAAS,4CAA4C,iBAAiB,EAAE,CAAC;AAAA,QACnG;AAAA,MACJ,EAAE,MAAM;AAER,YAAM,oBAAoB,CAAC,UAA6E;AACpG,YAAI,MAAM,qBAAqB,qBAAqB,MAAM,WAAW,kBAAkB,cAAc;AACjG,gBAAM,OAAO,IAAI,WAAW,MAAM,OAAO;AACzC,cACI,KAAK,CAAC,MAAM,mCACZ,KAAK,CAAC,MAAM,mCACZ,KAAK,WAAW,+BAClB;AACE,gCAAoB,KAAK;AACzB,8BAAkB,IAAI;AAAA,UAC1B;AAAA,QACJ;AAAA,MACJ;AACA,WAAK,SAAS,oBAAoB,GAAG,iBAAiB;AAEtD,UAAI;AACJ,UAAI;AACA,4BAAoB,MAAM;AAAA,MAC9B,UAAE;AACE,aAAK,SAAS,oBAAoB,IAAI,iBAAiB;AACvD,4BAAoB,KAAK;AAAA,MAC7B;AAIA,YAAM,0BAA0B,KAAK;AACrC,YAAM,aAA4C,CAAC;AAEnD,YAAM,aAAa,MAAM,kBAAkB;AAAA,QACvC;AAAA;AAAA,QAEA,OAAO,SAAgB;AACnB,gBAAM,QAAQ,gBAAgB,aAAa,OAAO,IAAI,WAAW,IAAmB;AACpF,eAAK,SAAS,gBAAgB,kBAAkB,WAAW,mBAAmB,KAAK;AAAA,QACvF;AAAA;AAAA,QAEA,YAAY;AACR,cAAI,CAAC,WAAW,SAAS,UAAW;AACpC,iBAAO,MAAM,sBAAsB,iBAAiB,YAAY;AAChE,cAAI;AACA,kBAAM,KAAK,SAAS,YAAY,gBAAgB,YAAY,EAAE,kBAAkB,CAAC;AAAA,UACrF,SAAS,OAAO;AACZ,mBAAO;AAAA,cACH,cAAc,iBAAiB;AAAA,cAC/B;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAAA;AAAA,QAEA,OAAO,SAAgB;AACnB,cAAI,WAAW,SAAS;AACpB,uBAAW,QAAQ,YAAY,IAAI;AACnC,oCAAwB,WAAW,SAAS,IAAI;AAAA,UACpD;AAAA,QACJ;AAAA,MACJ;AAGA,YAAM,iBAAiB,CAAC,UAA6E;AACjG,YAAI,MAAM,qBAAqB,qBAAqB,MAAM,WAAW,kBAAkB,cAAc;AACjG,qBACK,sBAAsB,IAAI,WAAW,MAAM,OAAO,CAAC,EACnD;AAAA,YAAM,WACH,OAAO,KAAK,cAAc,iBAAiB,sCAAsC,KAAK;AAAA,UAC1F;AAAA,QACR;AAAA,MACJ;AACA,WAAK,SAAS,oBAAoB,GAAG,cAAc;AAGnD,YAAM,gBAAgB,CAAC,OAAe,SAAkC;AACpE,YACI,UAAU,cAAc,gBACxB,OAAO,KAAK,sBAAsB,YAClC,KAAK,sBAAsB,mBAC7B;AACE,iBAAO,KAAK,cAAc,iBAAiB,4BAA4B;AACvE,qBAAW,SAAS,iBAAiB;AACrC,qBAAW,SACL,MAAM,EACP,MAAM,WAAS,OAAO,MAAM,cAAc,iBAAiB,2BAA2B,KAAK,CAAC;AAAA,QACrG;AAAA,MACJ;AACA,WAAK,SAAS,cAAc,GAAG,aAAa;AAG5C,YAAM,mBAAmB,MAAM;AAC3B,aAAK,SAAS,oBAAoB,IAAI,cAAc;AACpD,aAAK,SAAS,cAAc,IAAI,aAAa;AAAA,MACjD;AAEA,YAAM,eAAe,IAAI,gBAAgB,mBAAmB,YAAY,gBAAgB;AACxF,iBAAW,UAAU;AACrB,aAAO;AAAA,IACX,SAAS,OAAO;AAEZ,UAAI;AACA,cAAM,KAAK,SAAS,YAAY,gBAAgB,YAAY,EAAE,kBAAkB,CAAC;AAAA,MACrF,SAAS,cAAc;AACnB,eAAO,MAAM,cAAc,iBAAiB,0CAA0C,YAAY;AAAA,MACtG;AACA,YAAM;AAAA,IACV;AAAA,EACJ;AAAA,EAEA,OAAO,UAA6E;AAChF,SAAK,2BAA2B;AAChC,WAAO;AAAA,MACH,OAAO,YAAY,MAAM,KAAK,MAAM;AAAA,IACxC;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,UAAU;AAAA,EACnB;AAAA,EAEA,SAAS,MAAmB,UAAmB;AAC3C,WAAO,SAAS,YAAY;AAAA,EAChC;AACJ;AAMO,MAAM,wBAAwB,WAAkB;AAAA,EACnD,aAAa;AAAA,EACJ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,kBAAkB,oBAAI,IAAgB;AAAA,EAC/C,iBAAiB,IAAI,MAAa;AAAA,EAClC;AAAA,EACA,gBAAgB;AAAA,EAEhB,YAAY,mBAA2B,YAA+B,kBAA8B;AAChG,UAAM;AACN,SAAK,qBAAqB;AAC1B,SAAK,cAAc;AACnB,SAAK,oBAAoB;AACzB,SAAK,sBAAsB,MAAM,KAAK,WAAW;AACjD,eAAW,OAAO,GAAG,KAAK,mBAAmB;AAAA,EACjD;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,mBAAmB;AACf,SAAK,aAAa;AAAA,EACtB;AAAA,EAEA,YAAY,MAAmB;AAC3B,QAAI,KAAK,iBAAiB;AACtB,YAAM,UAAU,KAAK;AACrB,WAAK,kBAAkB;AACvB,cAAQ,EAAE,OAAO,MAAM,MAAM,MAAM,CAAC;AAAA,IACxC,WAAW,CAAC,KAAK,eAAe;AAC5B,WAAK,eAAe,KAAK,IAAI;AAAA,IACjC;AAAA,EACJ;AAAA,EAEA,QAAQ,UAA0C;AAC9C,SAAK,gBAAgB,IAAI,QAAQ;AACjC,WAAO;AAAA,MACH,OAAO,YAAY;AACf,aAAK,gBAAgB,OAAO,QAAQ;AAAA,MACxC;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,CAAC,OAAO,aAAa,IAA0B;AAC3C,WAAO;AAAA,MACH,MAAM,MAAM;AACR,YAAI,KAAK,eAAe,SAAS,GAAG;AAChC,iBAAO,QAAQ,QAAQ,EAAE,OAAO,KAAK,eAAe,MAAM,GAAI,MAAM,MAAM,CAAC;AAAA,QAC/E;AACA,YAAI,KAAK,iBAAiB,CAAC,KAAK,YAAY;AACxC,iBAAO,QAAQ,QAAQ,EAAE,OAAO,QAA+B,MAAM,KAAK,CAAC;AAAA,QAC/E;AACA,eAAO,IAAI,QAA+B,aAAW;AACjD,eAAK,kBAAkB;AAAA,QAC3B,CAAC;AAAA,MACL;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,qBAA2B;AACvB,QAAI,CAAC,KAAK,eAAe;AACrB,WAAK,gBAAgB;AACrB,WAAK,kBAAkB,EAAE,OAAO,QAA+B,MAAM,KAAK,CAAC;AAC3E,WAAK,kBAAkB;AAAA,IAC3B;AAAA,EACJ;AAAA,EAEA,MAAM,KAAK,MAAa;AACpB,QAAI,CAAC,KAAK,YAAY;AAClB,aAAO,MAAM,uCAAuC,KAAK,kBAAkB,EAAE;AAC7E;AAAA,IACJ;AACA,QAAI,KAAK,gBAAgB,QAAW;AAChC,YAAM,IAAI,aAAa,8CAA8C;AAAA,IACzE;AACA,UAAM,KAAK,YAAY,kBAAkB,IAAI;AAAA,EACjD;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,eAAe,KAAK,kBAAkB;AAAA,EACjD;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,aAAa;AAClB,SAAK,kBAAkB;AACvB,SAAK,mBAAmB;AACxB,eAAW,YAAY,KAAK,iBAAiB;AACzC,eAAS;AAAA,IACb;AACA,SAAK,YAAY,OAAO,IAAI,KAAK,mBAAmB;AACpD,UAAM,KAAK,YAAY,MAAM;AAC7B,SAAK,WAAW;AAAA,EACpB;AACJ;",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/ProxyBleClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyBleClient.d.ts","sourceRoot":"","sources":["../../src/ProxyBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAa5D;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,qBAAa,cAAc;;IAevB,YAAY,OAAO,EAAE,eAAe,EAGnC;IAED,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKzG;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA6BnC;IAEK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAalC;IAED,KAAK,IAAI,IAAI,CAGZ;CAyCJ"}
+{"version":3,"file":"ProxyBleClient.d.ts","sourceRoot":"","sources":["../../src/ProxyBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAa5D;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,qBAAa,cAAc;;IAevB,YAAY,OAAO,EAAE,eAAe,EAInC;IAED,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKzG;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA0BnC;IAEK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAOlC;IAED,KAAK,IAAI,IAAI,CAIZ;CA2CJ"}