@livedesk/hub 0.1.41 → 0.1.42

package/src/remote-audio-subscription-contract.mjs

@@ -1,109 +1,109 @@
-function normalizedText(value, maxLength = 160) {
-  return String(value || '').trim().slice(0, maxLength);
-}
-
-export function normalizeRemoteAudioStreamBindings(payload = {}, deviceIds = []) {
-  const bindings = new Map();
-  const byDevice = payload?.streamIdsByDeviceId;
-  if (byDevice && typeof byDevice === 'object' && !Array.isArray(byDevice)) {
-    for (const deviceId of deviceIds) {
-      const streamId = normalizedText(byDevice[deviceId], 128);
-      if (streamId) {
-        bindings.set(deviceId, streamId);
-      }
-    }
-  }
-  if (Array.isArray(payload?.streamBindings)) {
-    for (const binding of payload.streamBindings) {
-      const deviceId = normalizedText(binding?.deviceId);
-      const streamId = normalizedText(binding?.streamId, 128);
-      if (deviceIds.includes(deviceId) && streamId) {
-        bindings.set(deviceId, streamId);
-      }
-    }
-  }
-  if (deviceIds.length === 1 && !bindings.has(deviceIds[0])) {
-    const streamId = normalizedText(payload?.streamId, 128);
-    if (streamId) {
-      bindings.set(deviceIds[0], streamId);
-    }
-  }
-  return bindings;
-}
-
-export function remoteAudioSubscriberOwns(client, deviceId, streamId = '') {
-  const subscribedDeviceIds = client?.liveDeskAudioDeviceIds;
-  if (!(subscribedDeviceIds instanceof Set)
-    || subscribedDeviceIds.size === 0
-    || !subscribedDeviceIds.has(deviceId)) {
-    return !(subscribedDeviceIds instanceof Set) || subscribedDeviceIds.size === 0;
-  }
-  const expectedStreamId = normalizedText(streamId, 128);
-  const boundStreamId = client?.liveDeskAudioStreamIdsByDeviceId instanceof Map
-    ? normalizedText(client.liveDeskAudioStreamIdsByDeviceId.get(deviceId), 128)
-    : '';
-  // A legacy subscriber without an exact binding remains a wildcard owner.
-  return !expectedStreamId || !boundStreamId || boundStreamId === expectedStreamId;
-}
-
-export function collectReleasedRemoteAudioOwners({
-  previousDeviceIds,
-  previousStreamIdsByDeviceId,
-  nextDeviceIds,
-  nextStreamIdsByDeviceId,
-  fallbackOwners = []
-}) {
-  const previousIds = previousDeviceIds instanceof Set ? previousDeviceIds : new Set();
-  const nextIds = nextDeviceIds instanceof Set ? nextDeviceIds : new Set();
-  if (previousIds.size === 0) {
-    return fallbackOwners.map(owner => ({
-      deviceId: normalizedText(owner?.deviceId),
-      streamId: normalizedText(owner?.streamId, 128)
-    })).filter(owner => owner.deviceId);
-  }
-  const owners = [];
-  for (const deviceId of previousIds) {
-    const previousStreamId = previousStreamIdsByDeviceId instanceof Map
-      ? normalizedText(previousStreamIdsByDeviceId.get(deviceId), 128)
-      : '';
-    const nextStreamId = nextStreamIdsByDeviceId instanceof Map
-      ? normalizedText(nextStreamIdsByDeviceId.get(deviceId), 128)
-      : '';
-    if (!nextIds.has(deviceId) || previousStreamId !== nextStreamId) {
-      owners.push({ deviceId, streamId: previousStreamId });
-    }
-  }
-  return owners;
-}
-
-export function observeRemoteAudioStopConfirmation({
-  result,
-  deviceId,
-  streamId,
-  reason,
-  hasSubscriber,
-  disconnect,
-  warn = () => {}
-}) {
-  if (!result?.stopPromise) {
-    return false;
-  }
-  void Promise.resolve(result.stopPromise).then(confirmation => {
-    if (confirmation?.captureStopConfirmed === true) {
-      return;
-    }
-    if (!hasSubscriber(deviceId, streamId)) {
-      warn(
-        `audio capture stop was not confirmed device=${deviceId} reason=${reason}: `
-        + `${confirmation?.error || 'audio-stop-unconfirmed'}`
-      );
-      disconnect(deviceId, 'audio-capture-stop-unconfirmed');
-    }
-  }).catch(error => {
-    if (!hasSubscriber(deviceId, streamId)) {
-      warn(`audio capture stop confirmation failed device=${deviceId}: ${error instanceof Error ? error.message : String(error)}`);
-      disconnect(deviceId, 'audio-capture-stop-confirmation-failed');
-    }
-  });
-  return true;
-}
+function normalizedText(value, maxLength = 160) {
+  return String(value || '').trim().slice(0, maxLength);
+}
+
+export function normalizeRemoteAudioStreamBindings(payload = {}, deviceIds = []) {
+  const bindings = new Map();
+  const byDevice = payload?.streamIdsByDeviceId;
+  if (byDevice && typeof byDevice === 'object' && !Array.isArray(byDevice)) {
+    for (const deviceId of deviceIds) {
+      const streamId = normalizedText(byDevice[deviceId], 128);
+      if (streamId) {
+        bindings.set(deviceId, streamId);
+      }
+    }
+  }
+  if (Array.isArray(payload?.streamBindings)) {
+    for (const binding of payload.streamBindings) {
+      const deviceId = normalizedText(binding?.deviceId);
+      const streamId = normalizedText(binding?.streamId, 128);
+      if (deviceIds.includes(deviceId) && streamId) {
+        bindings.set(deviceId, streamId);
+      }
+    }
+  }
+  if (deviceIds.length === 1 && !bindings.has(deviceIds[0])) {
+    const streamId = normalizedText(payload?.streamId, 128);
+    if (streamId) {
+      bindings.set(deviceIds[0], streamId);
+    }
+  }
+  return bindings;
+}
+
+export function remoteAudioSubscriberOwns(client, deviceId, streamId = '') {
+  const subscribedDeviceIds = client?.liveDeskAudioDeviceIds;
+  if (!(subscribedDeviceIds instanceof Set)
+    || subscribedDeviceIds.size === 0
+    || !subscribedDeviceIds.has(deviceId)) {
+    return !(subscribedDeviceIds instanceof Set) || subscribedDeviceIds.size === 0;
+  }
+  const expectedStreamId = normalizedText(streamId, 128);
+  const boundStreamId = client?.liveDeskAudioStreamIdsByDeviceId instanceof Map
+    ? normalizedText(client.liveDeskAudioStreamIdsByDeviceId.get(deviceId), 128)
+    : '';
+  // A legacy subscriber without an exact binding remains a wildcard owner.
+  return !expectedStreamId || !boundStreamId || boundStreamId === expectedStreamId;
+}
+
+export function collectReleasedRemoteAudioOwners({
+  previousDeviceIds,
+  previousStreamIdsByDeviceId,
+  nextDeviceIds,
+  nextStreamIdsByDeviceId,
+  fallbackOwners = []
+}) {
+  const previousIds = previousDeviceIds instanceof Set ? previousDeviceIds : new Set();
+  const nextIds = nextDeviceIds instanceof Set ? nextDeviceIds : new Set();
+  if (previousIds.size === 0) {
+    return fallbackOwners.map(owner => ({
+      deviceId: normalizedText(owner?.deviceId),
+      streamId: normalizedText(owner?.streamId, 128)
+    })).filter(owner => owner.deviceId);
+  }
+  const owners = [];
+  for (const deviceId of previousIds) {
+    const previousStreamId = previousStreamIdsByDeviceId instanceof Map
+      ? normalizedText(previousStreamIdsByDeviceId.get(deviceId), 128)
+      : '';
+    const nextStreamId = nextStreamIdsByDeviceId instanceof Map
+      ? normalizedText(nextStreamIdsByDeviceId.get(deviceId), 128)
+      : '';
+    if (!nextIds.has(deviceId) || previousStreamId !== nextStreamId) {
+      owners.push({ deviceId, streamId: previousStreamId });
+    }
+  }
+  return owners;
+}
+
+export function observeRemoteAudioStopConfirmation({
+  result,
+  deviceId,
+  streamId,
+  reason,
+  hasSubscriber,
+  disconnect,
+  warn = () => {}
+}) {
+  if (!result?.stopPromise) {
+    return false;
+  }
+  void Promise.resolve(result.stopPromise).then(confirmation => {
+    if (confirmation?.captureStopConfirmed === true) {
+      return;
+    }
+    if (!hasSubscriber(deviceId, streamId)) {
+      warn(
+        `audio capture stop was not confirmed device=${deviceId} reason=${reason}: `
+        + `${confirmation?.error || 'audio-stop-unconfirmed'}`
+      );
+      disconnect(deviceId, 'audio-capture-stop-unconfirmed');
+    }
+  }).catch(error => {
+    if (!hasSubscriber(deviceId, streamId)) {
+      warn(`audio capture stop confirmation failed device=${deviceId}: ${error instanceof Error ? error.message : String(error)}`);
+      disconnect(deviceId, 'audio-capture-stop-confirmation-failed');
+    }
+  });
+  return true;
+}

package/src/remote-audio-subscription-contract.test.mjs

@@ -1,72 +1,72 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  collectReleasedRemoteAudioOwners,
-  normalizeRemoteAudioStreamBindings,
-  observeRemoteAudioStopConfirmation,
-  remoteAudioSubscriberOwns
-} from './remote-audio-subscription-contract.mjs';
-
-function deferred() {
-  let resolve;
-  const promise = new Promise(resolvePromise => {
-    resolve = resolvePromise;
-  });
-  return { promise, resolve };
-}
-
-test('late old WebSocket cleanup keeps a differently bound replacement owner', () => {
-  const previousDeviceIds = new Set(['device-a']);
-  const previousBindings = new Map([['device-a', 'audio-old']]);
-  const replacement = {
-    liveDeskAudioDeviceIds: new Set(['device-a']),
-    liveDeskAudioStreamIdsByDeviceId: new Map([['device-a', 'audio-new']])
-  };
-  const released = collectReleasedRemoteAudioOwners({
-    previousDeviceIds,
-    previousStreamIdsByDeviceId: previousBindings,
-    nextDeviceIds: new Set(),
-    nextStreamIdsByDeviceId: new Map()
-  });
-
-  assert.deepEqual(released, [{ deviceId: 'device-a', streamId: 'audio-old' }]);
-  assert.equal(remoteAudioSubscriberOwns(replacement, 'device-a', 'audio-old'), false);
-  assert.equal(remoteAudioSubscriberOwns(replacement, 'device-a', 'audio-new'), true);
-});
-
-test('subscription binding change releases only the exact old stream', () => {
-  const nextBindings = normalizeRemoteAudioStreamBindings({
-    streamIdsByDeviceId: { 'device-a': 'audio-new' }
-  }, ['device-a']);
-  assert.deepEqual(
-    collectReleasedRemoteAudioOwners({
-      previousDeviceIds: new Set(['device-a']),
-      previousStreamIdsByDeviceId: new Map([['device-a', 'audio-old']]),
-      nextDeviceIds: new Set(['device-a']),
-      nextStreamIdsByDeviceId: nextBindings
-    }),
-    [{ deviceId: 'device-a', streamId: 'audio-old' }]
-  );
-});
-
-test('deduplicated API-first stop failure still forces final Agent drain', async () => {
-  const stop = deferred();
-  const disconnects = [];
-  const result = { stopPromise: stop.promise };
-  assert.equal(observeRemoteAudioStopConfirmation({
-    result,
-    deviceId: 'device-a',
-    streamId: 'audio-current',
-    reason: 'audio-subscriber-closed',
-    hasSubscriber: () => false,
-    disconnect: (...args) => disconnects.push(args)
-  }), true);
-
-  stop.resolve({ captureStopConfirmed: false, error: 'native-audio-stop-failed' });
-  await stop.promise;
-  await Promise.resolve();
-  assert.deepEqual(disconnects, [
-    ['device-a', 'audio-capture-stop-unconfirmed']
-  ]);
-});
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+  collectReleasedRemoteAudioOwners,
+  normalizeRemoteAudioStreamBindings,
+  observeRemoteAudioStopConfirmation,
+  remoteAudioSubscriberOwns
+} from './remote-audio-subscription-contract.mjs';
+
+function deferred() {
+  let resolve;
+  const promise = new Promise(resolvePromise => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+test('late old WebSocket cleanup keeps a differently bound replacement owner', () => {
+  const previousDeviceIds = new Set(['device-a']);
+  const previousBindings = new Map([['device-a', 'audio-old']]);
+  const replacement = {
+    liveDeskAudioDeviceIds: new Set(['device-a']),
+    liveDeskAudioStreamIdsByDeviceId: new Map([['device-a', 'audio-new']])
+  };
+  const released = collectReleasedRemoteAudioOwners({
+    previousDeviceIds,
+    previousStreamIdsByDeviceId: previousBindings,
+    nextDeviceIds: new Set(),
+    nextStreamIdsByDeviceId: new Map()
+  });
+
+  assert.deepEqual(released, [{ deviceId: 'device-a', streamId: 'audio-old' }]);
+  assert.equal(remoteAudioSubscriberOwns(replacement, 'device-a', 'audio-old'), false);
+  assert.equal(remoteAudioSubscriberOwns(replacement, 'device-a', 'audio-new'), true);
+});
+
+test('subscription binding change releases only the exact old stream', () => {
+  const nextBindings = normalizeRemoteAudioStreamBindings({
+    streamIdsByDeviceId: { 'device-a': 'audio-new' }
+  }, ['device-a']);
+  assert.deepEqual(
+    collectReleasedRemoteAudioOwners({
+      previousDeviceIds: new Set(['device-a']),
+      previousStreamIdsByDeviceId: new Map([['device-a', 'audio-old']]),
+      nextDeviceIds: new Set(['device-a']),
+      nextStreamIdsByDeviceId: nextBindings
+    }),
+    [{ deviceId: 'device-a', streamId: 'audio-old' }]
+  );
+});
+
+test('deduplicated API-first stop failure still forces final Agent drain', async () => {
+  const stop = deferred();
+  const disconnects = [];
+  const result = { stopPromise: stop.promise };
+  assert.equal(observeRemoteAudioStopConfirmation({
+    result,
+    deviceId: 'device-a',
+    streamId: 'audio-current',
+    reason: 'audio-subscriber-closed',
+    hasSubscriber: () => false,
+    disconnect: (...args) => disconnects.push(args)
+  }), true);
+
+  stop.resolve({ captureStopConfirmed: false, error: 'native-audio-stop-failed' });
+  await stop.promise;
+  await Promise.resolve();
+  assert.deepEqual(disconnects, [
+    ['device-a', 'audio-capture-stop-unconfirmed']
+  ]);
+});