@dxos/plugin-thread 0.8.3 → 0.8.4-main.c1de068

package/dist/lib/browser/{chunk-4H4A264L.mjs → chunk-ZE7KWN36.mjs}

@@ -1,4 +1,9 @@
-// packages/plugins/plugin-thread/src/calls/types.ts
+import {
+  createBlackCanvasStreamTrack,
+  createInaudibleAudioStreamTrack
+} from "./chunk-6NSMBO3B.mjs";
+
+// src/calls/types.ts
 import { buf } from "@dxos/protocols/buf";
 import { UserStateSchema } from "@dxos/protocols/buf/dxos/edge/calls_pb";
 var CALLS_URL = "https://calls-service.dxos.workers.dev";
@@ -24,7 +29,7 @@ var TrackNameCodec = {
   }
 };
 
-// packages/plugins/plugin-thread/src/calls/call-swarm-synchronizer.ts
+// src/calls/call-swarm-synchronizer.ts
 import md5Hex from "md5-hex";
 import { DeferredTask, Event, scheduleTaskInterval, synchronized } from "@dxos/async";
 import { Context, Resource } from "@dxos/context";
@@ -42,7 +47,7 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-swarm-synchronizer.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-swarm-synchronizer.ts";
 var DISCONNECTED_ABRUPT_TIMEOUT = 1e4;
 var CallSwarmSynchronizer = class extends Resource {
   constructor({ networkService }) {
@@ -355,7 +360,7 @@ var LamportTimestampCrdt = class {
 };
 var getTopic = (roomId) => PublicKey.fromHex(md5Hex(roomId));
 
-// packages/plugins/plugin-thread/src/calls/util/audio.ts
+// src/calls/util/audio.ts
 var monitorAudioLevel = ({ mediaStreamTrack, intervalMs = 1e3 / 10, onMeasure }) => {
   let timeout = -1;
   let interval = -1;
@@ -397,13 +402,13 @@ var monitorAudioLevel = ({ mediaStreamTrack, intervalMs = 1e3 / 10, onMeasure })
   };
 };
 
-// packages/plugins/plugin-thread/src/calls/util/calls-service.ts
+// src/calls/util/calls-service.ts
 import { PersistentLifecycle } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 
-// packages/plugins/plugin-thread/src/calls/util/history-cache.ts
+// src/calls/util/history-cache.ts
 var HistoryCache = class {
   constructor(limit = 100) {
     this._limit = limit;
@@ -420,7 +425,7 @@ var HistoryCache = class {
   }
 };
 
-// packages/plugins/plugin-thread/src/calls/util/task-scheduling.ts
+// src/calls/util/task-scheduling.ts
 var DefaultBatchSizeLimit = 64;
 var FIFOScheduler = class {
   #schedulerChain;
@@ -477,8 +482,8 @@ var BulkRequestDispatcher = class {
   }
 };
 
-// packages/plugins/plugin-thread/src/calls/util/calls-service.ts
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/calls-service.ts";
+// src/calls/util/calls-service.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/calls-service.ts";
 var NETWORK_TIMEOUT = 5e3;
 var CallsServicePeer = class extends Resource2 {
   constructor(config) {
@@ -525,7 +530,7 @@ var CallsServicePeer = class extends Resource2 {
           state: peerConnection.connectionState
         }, {
           F: __dxlog_file2,
-          L: 115,
+          L: 118,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -540,7 +545,7 @@ var CallsServicePeer = class extends Resource2 {
           state: peerConnection.iceConnectionState
         }, {
           F: __dxlog_file2,
-          L: 124,
+          L: 127,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -551,7 +556,7 @@ var CallsServicePeer = class extends Resource2 {
           if (peerConnection.iceConnectionState === "connected") {
             log2.info("calls iceConnectionState is connected", void 0, {
               F: __dxlog_file2,
-              L: 133,
+              L: 136,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -562,7 +567,7 @@ var CallsServicePeer = class extends Resource2 {
             timeoutSeconds
           }, {
             F: __dxlog_file2,
-            L: 137,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -575,7 +580,7 @@ var CallsServicePeer = class extends Resource2 {
   async _initiateCallSession() {
     log2("creating new session", void 0, {
       F: __dxlog_file2,
-      L: 147,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -601,7 +606,7 @@ var CallsServicePeer = class extends Resource2 {
         text: await response.text()
       }, {
         F: __dxlog_file2,
-        L: 162,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -633,7 +638,7 @@ var CallsServicePeer = class extends Resource2 {
         status: response.status
       }, {
         F: __dxlog_file2,
-        L: 187,
+        L: 190,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -643,7 +648,7 @@ var CallsServicePeer = class extends Resource2 {
   async _pushTrackInBulk({ ctx, peerConnection, transceiver, sessionId, trackName }) {
     log2.verbose("pushing track ", trackName, {
       F: __dxlog_file2,
-      L: 209,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -670,7 +675,7 @@ var CallsServicePeer = class extends Resource2 {
       });
       invariant2(response.tracks !== void 0, void 0, {
         F: __dxlog_file2,
-        L: 234,
+        L: 237,
         S: this,
         A: [
           "response.tracks !== undefined",
@@ -695,7 +700,7 @@ var CallsServicePeer = class extends Resource2 {
       } else {
         log2.error("missing track data", void 0, {
           F: __dxlog_file2,
-          L: 254,
+          L: 257,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -703,7 +708,7 @@ var CallsServicePeer = class extends Resource2 {
     }).catch((err) => {
       log2.catch(err, void 0, {
         F: __dxlog_file2,
-        L: 258,
+        L: 261,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -721,7 +726,7 @@ var CallsServicePeer = class extends Resource2 {
     await this.waitUntilOpen();
     invariant2(this.session, void 0, {
       F: __dxlog_file2,
-      L: 285,
+      L: 288,
       S: this,
       A: [
         "this.session",
@@ -734,7 +739,7 @@ var CallsServicePeer = class extends Resource2 {
       encodings
     }, {
       F: __dxlog_file2,
-      L: 286,
+      L: 289,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -747,7 +752,7 @@ var CallsServicePeer = class extends Resource2 {
           transceiver: transceiver2
         }, {
           F: __dxlog_file2,
-          L: 290,
+          L: 293,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -759,13 +764,13 @@ var CallsServicePeer = class extends Resource2 {
           transceiver: transceiver2
         }, {
           F: __dxlog_file2,
-          L: 293,
+          L: 296,
           S: this,
           C: (f, a) => f(...a)
         });
         transceiver2.sender.replaceTrack(track).catch((err) => log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 294,
+          L: 297,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -774,7 +779,7 @@ var CallsServicePeer = class extends Resource2 {
     }
     invariant2(track, void 0, {
       F: __dxlog_file2,
-      L: 298,
+      L: 301,
       S: this,
       A: [
         "track",
@@ -787,7 +792,7 @@ var CallsServicePeer = class extends Resource2 {
     });
     log2.verbose("creating transceiver", void 0, {
       F: __dxlog_file2,
-      L: 303,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -800,7 +805,7 @@ var CallsServicePeer = class extends Resource2 {
     });
     invariant2(pushedTrackData, void 0, {
       F: __dxlog_file2,
-      L: 312,
+      L: 315,
       S: this,
       A: [
         "pushedTrackData",
@@ -817,7 +822,7 @@ var CallsServicePeer = class extends Resource2 {
     });
     transceiver.sender.setParameters(parameters).catch((err) => log2.catch(err, void 0, {
       F: __dxlog_file2,
-      L: 319,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -830,7 +835,7 @@ var CallsServicePeer = class extends Resource2 {
       trackName: trackData.trackName
     }, {
       F: __dxlog_file2,
-      L: 337,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -846,7 +851,7 @@ var CallsServicePeer = class extends Resource2 {
       }
       invariant2(newTrackResponse.tracks, void 0, {
         F: __dxlog_file2,
-        L: 350,
+        L: 353,
         S: this,
         A: [
           "newTrackResponse.tracks",
@@ -856,7 +861,7 @@ var CallsServicePeer = class extends Resource2 {
       const trackMap = tracks.reduce((acc, track) => {
         const pulledTrackData = newTrackResponse.tracks?.find((t) => t.trackName === track.trackName && t.sessionId === track.sessionId);
         if (pulledTrackData && pulledTrackData.mid) {
-          acc.set(track, {
+          acc.set(track.trackName, {
             mid: pulledTrackData.mid,
             resolvedTrack: resolveTrack(peerConnection, (t) => t.mid === pulledTrackData.mid)
           });
@@ -886,21 +891,24 @@ var CallsServicePeer = class extends Resource2 {
         trackMap
       };
     })).then(({ trackMap }) => {
-      const trackInfo = trackMap.get(trackData);
+      const trackInfo = trackMap.get(trackData.trackName);
       if (trackInfo) {
         return trackInfo.resolvedTrack.then((track) => {
           mid = trackInfo.mid;
           return track;
         }).catch((err) => log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 402,
+          L: 405,
           S: this,
           C: (f, a) => f(...a)
         }));
       } else {
-        log2.error("missing track info", void 0, {
+        log2.warn("missing track info", {
+          trackData,
+          availableTracks: Array.from(trackMap.keys())
+        }, {
           F: __dxlog_file2,
-          L: 404,
+          L: 407,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -910,7 +918,7 @@ var CallsServicePeer = class extends Resource2 {
       if (mid) {
         log2("closing pulled track ", trackData.trackName, {
           F: __dxlog_file2,
-          L: 410,
+          L: 413,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -926,7 +934,7 @@ var CallsServicePeer = class extends Resource2 {
     await this.waitUntilOpen();
     invariant2(this.session, void 0, {
       F: __dxlog_file2,
-      L: 431,
+      L: 434,
       S: this,
       A: [
         "this.session",
@@ -1010,9 +1018,9 @@ var peerConnectionIsConnected = async (peerConnection) => {
   }
 };
 
-// packages/plugins/plugin-thread/src/calls/util/media.ts
+// src/calls/util/media.ts
 import { log as log3 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/media.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/media.ts";
 var getUserMediaTrack = async (kind, constraints = {}, deviceList) => {
   deviceList ??= (await getDeviceList()).filter((device) => device.kind === kind);
   const firstDevice = deviceList[0];
@@ -1066,58 +1074,7 @@ var getScreenshare = async ({ contentHint }) => {
   return ms;
 };
 
-// packages/plugins/plugin-thread/src/calls/util/stub-media-streams.ts
-import { waitForCondition, scheduleTaskInterval as scheduleTaskInterval2 } from "@dxos/async";
-import { cancelWithContext } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/stub-media-streams.ts";
-var createBlackCanvasStreamTrack = async ({ ctx, width, height }) => {
-  const canvas = document.createElement("canvas");
-  canvas.width = width;
-  canvas.height = height;
-  const canvasCtx = canvas.getContext("2d");
-  invariant3(canvasCtx, void 0, {
-    F: __dxlog_file4,
-    L: 28,
-    S: void 0,
-    A: [
-      "canvasCtx",
-      ""
-    ]
-  });
-  const drawFrame = () => {
-    canvasCtx.fillStyle = "black";
-    canvasCtx.fillRect(0, 0, canvas.width, canvas.height);
-  };
-  scheduleTaskInterval2(ctx, async () => drawFrame(), 1e3);
-  const track = canvas.captureStream().getVideoTracks()[0];
-  drawFrame();
-  await cancelWithContext(ctx, waitForCondition({
-    condition: () => track.readyState === "live",
-    timeout: 1e3
-  }));
-  return track;
-};
-var createInaudibleAudioStreamTrack = async ({ ctx }) => {
-  const audioContext = new window.AudioContext();
-  const oscillator = audioContext.createOscillator();
-  oscillator.type = "triangle";
-  oscillator.frequency.setValueAtTime(0.1, audioContext.currentTime);
-  const gainNode = audioContext.createGain();
-  gainNode.gain.setValueAtTime(0, audioContext.currentTime);
-  oscillator.connect(gainNode);
-  const destination = audioContext.createMediaStreamDestination();
-  gainNode.connect(destination);
-  oscillator.start();
-  ctx.onDispose(async () => {
-    oscillator.disconnect();
-    oscillator.stop();
-    await audioContext.close();
-  });
-  return destination.stream.getAudioTracks()[0];
-};
-
-// packages/plugins/plugin-thread/src/calls/speaking-monitor.ts
+// src/calls/speaking-monitor.ts
 import { DeferredTask as DeferredTask2, Event as Event2, sleep } from "@dxos/async";
 import { Resource as Resource3 } from "@dxos/context";
 var NOT_SPEAKING_AFTER = 500;
@@ -1173,9 +1130,9 @@ var SpeakingMonitor = class extends Resource3 {
   }
 };
 
-// packages/plugins/plugin-thread/src/calls/media-manager.ts
+// src/calls/media-manager.ts
 import { DeferredTask as DeferredTask3, Event as Event3, sleep as sleep2, synchronized as synchronized2 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext2, Resource as Resource4 } from "@dxos/context";
+import { cancelWithContext, Resource as Resource4 } from "@dxos/context";
 import { log as log4 } from "@dxos/log";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -1183,12 +1140,13 @@ function _ts_decorate2(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/media-manager.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/media-manager.ts";
 var VIDEO_WIDTH = 1280;
 var VIDEO_HEIGHT = 720;
 var MAX_WEB_CAM_FRAMERATE = 24;
 var MAX_WEB_CAM_BITRATE = 12e5;
 var RETRY_INTERVAL = 500;
+var USE_INAUDIBLE_AUDIO = false;
 var MediaManager = class extends Resource4 {
   constructor() {
     super(...arguments);
@@ -1222,10 +1180,12 @@ var MediaManager = class extends Resource4 {
     this._state.videoTrack = this._blackCanvasStreamTrack;
     this._state.videoStream = new MediaStream();
     this._state.videoStream.addTrack(this._state.videoTrack);
-    this._inaudibleAudioStreamTrack = await createInaudibleAudioStreamTrack({
-      ctx: this._ctx
-    });
-    this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    if (USE_INAUDIBLE_AUDIO) {
+      this._inaudibleAudioStreamTrack = await createInaudibleAudioStreamTrack({
+        ctx: this._ctx
+      });
+      this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    }
     this._pushTracksTask = new DeferredTask3(this._ctx, async () => {
       await this._pushTracks();
     });
@@ -1300,11 +1260,14 @@ var MediaManager = class extends Resource4 {
   async turnAudioOff() {
     void this._speakingMonitor?.close();
     this._speakingMonitor = void 0;
-    if (this._state.audioTrack !== this._inaudibleAudioStreamTrack) {
+    this._state.audioEnabled = false;
+    if (USE_INAUDIBLE_AUDIO && this._state.audioTrack !== this._inaudibleAudioStreamTrack) {
       this._state.audioTrack?.stop();
       this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    } else {
+      this._state.audioTrack?.stop();
+      this._state.audioTrack = void 0;
     }
-    this._state.audioEnabled = false;
     this.stateUpdated.emit(this._state);
     this._pushTracksTask.schedule();
   }
@@ -1337,12 +1300,12 @@ var MediaManager = class extends Resource4 {
   }
   async _reconcilePulledMedia() {
     log4("reconciling tracks", void 0, {
-      F: __dxlog_file5,
-      L: 215,
+      F: __dxlog_file4,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
-    await cancelWithContext2(this._ctx, sleep2(800));
+    await cancelWithContext(this._ctx, sleep2(800));
     const trackNames = this._trackToReconcile;
     const tracksToPull = trackNames.filter((name) => !this._state.pulledAudioTracks[name] && !this._state.pulledVideoStreams[name]);
     const audioTracksToClose = Object.entries(this._state.pulledAudioTracks).filter(([key]) => !trackNames.some((name) => name === key));
@@ -1355,8 +1318,8 @@ var MediaManager = class extends Resource4 {
       currentAudioTracks: Object.keys(this._state.pulledAudioTracks),
       currentVideoStreams: Object.keys(this._state.pulledVideoStreams)
     }, {
-      F: __dxlog_file5,
-      L: 234,
+      F: __dxlog_file4,
+      L: 241,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1369,8 +1332,8 @@ var MediaManager = class extends Resource4 {
       currentAudioTracks: Object.keys(this._state.pulledAudioTracks),
       currentVideoStreams: Object.keys(this._state.pulledVideoStreams)
     }, {
-      F: __dxlog_file5,
-      L: 249,
+      F: __dxlog_file4,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1454,18 +1417,18 @@ var MediaManager = class extends Resource4 {
         err,
         name
       }, {
-        F: __dxlog_file5,
-        L: 319,
+        F: __dxlog_file4,
+        L: 326,
         S: this,
         C: (f, a) => f(...a)
       });
       void ctx.dispose();
-      await cancelWithContext2(this._ctx, sleep2(RETRY_INTERVAL));
+      await cancelWithContext(this._ctx, sleep2(RETRY_INTERVAL));
       log4.verbose("retrying pull track", {
         name
       }, {
-        F: __dxlog_file5,
-        L: 322,
+        F: __dxlog_file4,
+        L: 329,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1490,11 +1453,11 @@ _ts_decorate2([
   synchronized2
 ], MediaManager.prototype, "leave", null);
 
-// packages/plugins/plugin-thread/src/calls/call-manager.ts
+// src/calls/call-manager.ts
 import { computed } from "@preact/signals-core";
 import { Event as Event4, synchronized as synchronized3 } from "@dxos/async";
 import { Resource as Resource5 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { live } from "@dxos/live-object";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 function _ts_decorate3(decorators, target, key, desc) {
@@ -1503,7 +1466,7 @@ function _ts_decorate3(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-manager.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-manager.ts";
 var CallManager = class extends Resource5 {
   /** @reactive */
   get roomId() {
@@ -1538,8 +1501,8 @@ var CallManager = class extends Resource5 {
     return this._state.media;
   }
   /** @reactive */
-  get pulledAudioTracks() {
-    return Object.values(this._state.media.pulledAudioTracks).map((track) => track.track);
+  get audioTracksToPlay() {
+    return (this._state.call.users ?? []).map((user) => user.tracks?.audioEnabled ? user.tracks?.audio : void 0).filter(isNonNullable2).map((track) => this._state.media.pulledAudioTracks[track]?.track).filter(isNonNullable2);
   }
   /** @reactive */
   get state() {
@@ -1594,9 +1557,9 @@ var CallManager = class extends Resource5 {
     }), this._raisedHandSignal = computed(() => this._state.call.raisedHand ?? false), this._speakingSignal = computed(() => this._state.call.speaking ?? false), this._joinedSignal = computed(() => this._state.call.joined ?? false);
     this._client.config.getOrThrow("runtime.services.edge.url");
     const networkService = this._client.services.services.NetworkService;
-    invariant4(networkService, "network service not found", {
-      F: __dxlog_file6,
-      L: 155,
+    invariant3(networkService, "network service not found", {
+      F: __dxlog_file5,
+      L: 159,
       S: this,
       A: [
         "networkService",
@@ -1699,10 +1662,8 @@ export {
   getUserMediaTrack,
   getDeviceList,
   getScreenshare,
-  createBlackCanvasStreamTrack,
-  createInaudibleAudioStreamTrack,
   SpeakingMonitor,
   MediaManager,
   CallManager
 };
-//# sourceMappingURL=chunk-4H4A264L.mjs.map
+//# sourceMappingURL=chunk-ZE7KWN36.mjs.map