@buoy-gg/sync-broker 7.0.32 → 7.0.34

package/dist/index.d.mts

@@ -203,6 +203,13 @@ interface User {
      * phone it is attached to is signed in.
      */
     licenseKey?: string;
+    /**
+     * More than one app is registered under this deviceId right now — a pinned
+     * `externalSync.deviceId` copied onto two devices. Actions sent to the id
+     * land on an arbitrary one. Broker-computed from the per-runtime
+     * `instanceId` each socket announces; never set for apps that predate it.
+     */
+    collision?: boolean;
 }
 
 export { type BrokerHandle, type CreateBrokerOptions, DEFAULT_BROKER_PORT, type DevToolActionMessage, type DevToolActionResultMessage, type DevToolRequestMessage, type DevToolSyncMessage, type DevToolWatchMessage, type DeviceCapabilitiesMessage, SOCKET_CONFIG, SYNC_PROTOCOL_VERSION, type SyncKind, type ToolCapability, type User, createBroker, socketHandle };

package/dist/index.d.ts

@@ -203,6 +203,13 @@ interface User {
      * phone it is attached to is signed in.
      */
     licenseKey?: string;
+    /**
+     * More than one app is registered under this deviceId right now — a pinned
+     * `externalSync.deviceId` copied onto two devices. Actions sent to the id
+     * land on an arbitrary one. Broker-computed from the per-runtime
+     * `instanceId` each socket announces; never set for apps that predate it.
+     */
+    collision?: boolean;
 }
 
 export { type BrokerHandle, type CreateBrokerOptions, DEFAULT_BROKER_PORT, type DevToolActionMessage, type DevToolActionResultMessage, type DevToolRequestMessage, type DevToolSyncMessage, type DevToolWatchMessage, type DeviceCapabilitiesMessage, SOCKET_CONFIG, SYNC_PROTOCOL_VERSION, type SyncKind, type ToolCapability, type User, createBroker, socketHandle };

package/dist/index.js

@@ -135,6 +135,7 @@ var allDevices = [];
 var dashboardClients = [];
 var deviceIdMap = /* @__PURE__ */ new Map();
 var activeConnectionsMap = /* @__PURE__ */ new Map();
+var instanceIdMap = /* @__PURE__ */ new Map();
 var deviceCapabilities = /* @__PURE__ */ new Map();
 var watches = new WatchRegistry();
 var brokerLogBuffer = [];
@@ -151,8 +152,34 @@ function socketHandle({ io }) {
     }
     forwardToDashboards("broker-log", entry);
   }
+  function liveInstances(deviceId) {
+    const instances = /* @__PURE__ */ new Set();
+    for (const [socketId, mappedDeviceId] of deviceIdMap) {
+      if (mappedDeviceId !== deviceId) continue;
+      const instance = instanceIdMap.get(socketId);
+      if (instance) instances.add(instance);
+    }
+    return instances.size;
+  }
   function emitAllDevices() {
     const now = Date.now();
+    for (const device of allDevices) {
+      if (!device.deviceId) continue;
+      const instances = liveInstances(device.deviceId);
+      const collision = instances > 1;
+      if (collision && !device.collision) {
+        brokerLog(
+          "warn",
+          `${instances} apps are registered as "${device.deviceId}" \u2014 actions sent to it land on an arbitrary one. Give each device its own externalSync.deviceId, or leave it unset for a per-install default.`,
+          { deviceId: device.deviceId, instances }
+        );
+      } else if (!collision && device.collision) {
+        brokerLog("info", `Device id collision cleared for "${device.deviceId}"`, {
+          deviceId: device.deviceId
+        });
+      }
+      device.collision = collision;
+    }
     for (let i = allDevices.length - 1; i >= 0; i--) {
       const device = allDevices[i];
       if (!device.isConnected && device.lastSeenAt && now - device.lastSeenAt > MAX_OFFLINE_AGE_MS) {
@@ -171,6 +198,7 @@ function socketHandle({ io }) {
     const user = users.find((user2) => user2.id === id);
     const deviceId = deviceIdMap.get(id);
     deviceIdMap.delete(id);
+    instanceIdMap.delete(id);
     let survivor;
     if (deviceId) {
       for (const [socketId, mappedDeviceId] of deviceIdMap) {
@@ -447,8 +475,12 @@ function socketHandle({ io }) {
       platform,
       extraDeviceInfo,
       envVariables,
-      connectionNonce
+      connectionNonce,
+      instanceId
     } = socket.handshake.query;
+    if (typeof instanceId === "string" && instanceId) {
+      instanceIdMap.set(socket.id, instanceId);
+    }
     console.log(
       `${LOG_PREFIX} New connection - ID: ${socket.id}, Name: ${deviceName || "Unknown Device"}${deviceId ? `, DeviceId: ${deviceId}` : ""}${platform ? `, Platform: ${platform}` : ""}${extraDeviceInfo ? `, ExtraDeviceInfo: ${extraDeviceInfo}` : ""}${envVariables ? `, EnvVariables: ${envVariables}` : ""}`
     );

package/dist/index.mjs

@@ -95,6 +95,7 @@ var allDevices = [];
 var dashboardClients = [];
 var deviceIdMap = /* @__PURE__ */ new Map();
 var activeConnectionsMap = /* @__PURE__ */ new Map();
+var instanceIdMap = /* @__PURE__ */ new Map();
 var deviceCapabilities = /* @__PURE__ */ new Map();
 var watches = new WatchRegistry();
 var brokerLogBuffer = [];
@@ -111,8 +112,34 @@ function socketHandle({ io }) {
     }
     forwardToDashboards("broker-log", entry);
   }
+  function liveInstances(deviceId) {
+    const instances = /* @__PURE__ */ new Set();
+    for (const [socketId, mappedDeviceId] of deviceIdMap) {
+      if (mappedDeviceId !== deviceId) continue;
+      const instance = instanceIdMap.get(socketId);
+      if (instance) instances.add(instance);
+    }
+    return instances.size;
+  }
   function emitAllDevices() {
     const now = Date.now();
+    for (const device of allDevices) {
+      if (!device.deviceId) continue;
+      const instances = liveInstances(device.deviceId);
+      const collision = instances > 1;
+      if (collision && !device.collision) {
+        brokerLog(
+          "warn",
+          `${instances} apps are registered as "${device.deviceId}" \u2014 actions sent to it land on an arbitrary one. Give each device its own externalSync.deviceId, or leave it unset for a per-install default.`,
+          { deviceId: device.deviceId, instances }
+        );
+      } else if (!collision && device.collision) {
+        brokerLog("info", `Device id collision cleared for "${device.deviceId}"`, {
+          deviceId: device.deviceId
+        });
+      }
+      device.collision = collision;
+    }
     for (let i = allDevices.length - 1; i >= 0; i--) {
       const device = allDevices[i];
       if (!device.isConnected && device.lastSeenAt && now - device.lastSeenAt > MAX_OFFLINE_AGE_MS) {
@@ -131,6 +158,7 @@ function socketHandle({ io }) {
     const user = users.find((user2) => user2.id === id);
     const deviceId = deviceIdMap.get(id);
     deviceIdMap.delete(id);
+    instanceIdMap.delete(id);
     let survivor;
     if (deviceId) {
       for (const [socketId, mappedDeviceId] of deviceIdMap) {
@@ -407,8 +435,12 @@ function socketHandle({ io }) {
       platform,
       extraDeviceInfo,
       envVariables,
-      connectionNonce
+      connectionNonce,
+      instanceId
     } = socket.handshake.query;
+    if (typeof instanceId === "string" && instanceId) {
+      instanceIdMap.set(socket.id, instanceId);
+    }
     console.log(
       `${LOG_PREFIX} New connection - ID: ${socket.id}, Name: ${deviceName || "Unknown Device"}${deviceId ? `, DeviceId: ${deviceId}` : ""}${platform ? `, Platform: ${platform}` : ""}${extraDeviceInfo ? `, ExtraDeviceInfo: ${extraDeviceInfo}` : ""}${envVariables ? `, EnvVariables: ${envVariables}` : ""}`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buoy-gg/sync-broker",
-  "version": "7.0.32",
+  "version": "7.0.34",
   "description": "Headless Socket.IO broker for the Buoy devtool sync protocol (v1) — routes messages between devices and dashboard/MCP clients",
   "main": "dist/index.js",
   "module": "dist/index.mjs",