@dxos/plugin-thread 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/dist/lib/browser/{chunk-TUFWPOVS.mjs → chunk-ZCW3NSDZ.mjs}

@@ -1,11 +1,13 @@
 import {
   createBlackCanvasStreamTrack,
   createInaudibleAudioStreamTrack
-} from "./chunk-JGKMMI65.mjs";
+} from "./chunk-ISCHODBV.mjs";
 
 // src/calls/types.ts
+import { invariant } from "@dxos/invariant";
 import { buf } from "@dxos/protocols/buf";
 import { UserStateSchema } from "@dxos/protocols/buf/dxos/edge/calls_pb";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/types.ts";
 var CALLS_URL = "https://calls-service.dxos.workers.dev";
 var codec = {
   encode: (message) => {
@@ -17,14 +19,42 @@ var codec = {
 };
 var TrackNameCodec = {
   encode: (trackData) => {
-    return trackData.sessionId + "/" + trackData.trackName;
+    invariant(trackData.sessionId, void 0, {
+      F: __dxlog_file,
+      L: 65,
+      S: void 0,
+      A: [
+        "trackData.sessionId",
+        ""
+      ]
+    });
+    invariant(trackData.trackName, void 0, {
+      F: __dxlog_file,
+      L: 66,
+      S: void 0,
+      A: [
+        "trackData.trackName",
+        ""
+      ]
+    });
+    invariant(trackData.mid, void 0, {
+      F: __dxlog_file,
+      L: 67,
+      S: void 0,
+      A: [
+        "trackData.mid",
+        ""
+      ]
+    });
+    return trackData.sessionId + "/" + trackData.trackName + "/" + trackData.mid;
   },
   decode: (name) => {
-    const [sessionId, trackName] = name.split("/");
+    const [sessionId, trackName, mid] = name.split("/");
     return {
       sessionId,
       trackName,
-      location: "remote"
+      location: "remote",
+      mid
     };
   }
 };
@@ -34,7 +64,7 @@ import md5Hex from "md5-hex";
 import { DeferredTask, Event, scheduleTaskInterval, synchronized } from "@dxos/async";
 import { Context, Resource } from "@dxos/context";
 import { generateName } from "@dxos/display-name";
-import { invariant } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { buf as buf2 } from "@dxos/protocols/buf";
@@ -47,7 +77,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 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-swarm-synchronizer.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-swarm-synchronizer.ts";
 var DISCONNECTED_ABRUPT_TIMEOUT = 1e4;
 var CallSwarmSynchronizer = class extends Resource {
   stateUpdated = new Event();
@@ -131,7 +161,7 @@ var CallSwarmSynchronizer = class extends Resource {
       log.verbose("joined to a different room", {
         roomId
       }, {
-        F: __dxlog_file,
+        F: __dxlog_file2,
         L: 152,
         S: this,
         C: (f, a) => f(...a)
@@ -153,8 +183,8 @@ var CallSwarmSynchronizer = class extends Resource {
     this._reconcileSwarmStateTask = void 0;
   }
   async join() {
-    invariant(this._state.roomId, void 0, {
-      F: __dxlog_file,
+    invariant2(this._state.roomId, void 0, {
+      F: __dxlog_file2,
       L: 176,
       S: this,
       A: [
@@ -162,8 +192,8 @@ var CallSwarmSynchronizer = class extends Resource {
         ""
       ]
     });
-    invariant(!this._swarmCtx, "Already joined", {
-      F: __dxlog_file,
+    invariant2(!this._swarmCtx, "Already joined", {
+      F: __dxlog_file2,
       L: 177,
       S: this,
       A: [
@@ -172,7 +202,7 @@ var CallSwarmSynchronizer = class extends Resource {
       ]
     });
     this._swarmCtx = new Context(void 0, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 179
     });
     const topic = getTopic(this._state.roomId);
@@ -183,7 +213,7 @@ var CallSwarmSynchronizer = class extends Resource {
         peerKey: this._deviceKey
       }
     }, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 181,
       S: this,
       C: (f, a) => f(...a)
@@ -202,7 +232,7 @@ var CallSwarmSynchronizer = class extends Resource {
             peerKey: this._deviceKey
           }
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 188,
           S: this,
           C: (f, a) => f(...a)
@@ -214,7 +244,7 @@ var CallSwarmSynchronizer = class extends Resource {
             peerKey: this._deviceKey
           }
         }).catch((err) => log.catch(err, void 0, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 194,
           S: this,
           C: (f, a) => f(...a)
@@ -282,8 +312,8 @@ var CallSwarmSynchronizer = class extends Resource {
   }
   async _reconcileSwarmState() {
     const swarmEvent = this._lastSwarmEvent;
-    invariant(swarmEvent, void 0, {
-      F: __dxlog_file,
+    invariant2(swarmEvent, void 0, {
+      F: __dxlog_file2,
       L: 273,
       S: this,
       A: [
@@ -303,7 +333,7 @@ var CallSwarmSynchronizer = class extends Resource {
           error,
           peer
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 290,
           S: this,
           C: (f, a) => f(...a)
@@ -316,7 +346,7 @@ var CallSwarmSynchronizer = class extends Resource {
     log("reconciling swarm state", {
       users
     }, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 297,
       S: this,
       C: (f, a) => f(...a)
@@ -404,9 +434,9 @@ var monitorAudioLevel = ({ mediaStreamTrack, intervalMs = 1e3 / 10, onMeasure })
 };
 
 // src/calls/util/calls-service.ts
-import { PersistentLifecycle } from "@dxos/async";
+import { PersistentLifecycle, Trigger, scheduleTask } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 
 // src/calls/util/history-cache.ts
@@ -486,7 +516,7 @@ var BulkRequestDispatcher = class {
 };
 
 // src/calls/util/calls-service.ts
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/calls-service.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/calls-service.ts";
 var NETWORK_TIMEOUT = 5e3;
 var CallsServicePeer = class extends Resource2 {
   history = new HistoryCache(100);
@@ -530,11 +560,11 @@ var CallsServicePeer = class extends Resource2 {
     });
     peerConnection.addEventListener("connectionstatechange", () => {
       if (peerConnection.connectionState === "failed" || peerConnection.connectionState === "closed") {
-        log2.warn("calls connection failed", {
+        log2.info("calls connection failed", {
           state: peerConnection.connectionState
         }, {
-          F: __dxlog_file2,
-          L: 119,
+          F: __dxlog_file3,
+          L: 121,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -545,11 +575,11 @@ var CallsServicePeer = class extends Resource2 {
     peerConnection.addEventListener("iceconnectionstatechange", () => {
       clearTimeout(iceTimeout);
       if (peerConnection.iceConnectionState === "failed" || peerConnection.iceConnectionState === "closed") {
-        log2.warn("calls connection to ICEs failed", {
+        log2.info("calls connection to ICEs failed", {
           state: peerConnection.iceConnectionState
         }, {
-          F: __dxlog_file2,
-          L: 128,
+          F: __dxlog_file3,
+          L: 130,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -559,19 +589,19 @@ var CallsServicePeer = class extends Resource2 {
         iceTimeout = window.setTimeout(() => {
           if (peerConnection.iceConnectionState === "connected") {
             log2.info("calls iceConnectionState is connected", void 0, {
-              F: __dxlog_file2,
-              L: 137,
+              F: __dxlog_file3,
+              L: 139,
               S: this,
               C: (f, a) => f(...a)
             });
             return;
           }
-          log2.warn("calls iceConnectionState timed out", {
+          log2.info("calls iceConnectionState timed out", {
             state: peerConnection.iceConnectionState,
             timeoutSeconds
           }, {
-            F: __dxlog_file2,
-            L: 141,
+            F: __dxlog_file3,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -583,8 +613,8 @@ var CallsServicePeer = class extends Resource2 {
   }
   async _initiateCallSession() {
     log2("creating new session", void 0, {
-      F: __dxlog_file2,
-      L: 151,
+      F: __dxlog_file3,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -595,6 +625,7 @@ var CallsServicePeer = class extends Resource2 {
   }
   async _fetch(relativePath, requestInit) {
     this.history.push({
+      endpoint: relativePath,
       type: "request",
       time: (/* @__PURE__ */ new Date()).toISOString(),
       method: requestInit?.method ?? "GET",
@@ -609,8 +640,8 @@ var CallsServicePeer = class extends Resource2 {
         status: response.status,
         text: await response.text()
       }, {
-        F: __dxlog_file2,
-        L: 166,
+        F: __dxlog_file3,
+        L: 169,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -619,6 +650,7 @@ var CallsServicePeer = class extends Resource2 {
     try {
       const data = await response.clone().json();
       this.history.push({
+        endpoint: relativePath,
         type: "response",
         time: (/* @__PURE__ */ new Date()).toISOString(),
         status: response.status,
@@ -631,6 +663,7 @@ var CallsServicePeer = class extends Resource2 {
     } catch (error) {
       const text = await response.text();
       this.history.push({
+        endpoint: relativePath,
         type: "response",
         time: (/* @__PURE__ */ new Date()).toISOString(),
         status: response.status,
@@ -641,8 +674,8 @@ var CallsServicePeer = class extends Resource2 {
         text,
         status: response.status
       }, {
-        F: __dxlog_file2,
-        L: 191,
+        F: __dxlog_file3,
+        L: 196,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -651,8 +684,8 @@ var CallsServicePeer = class extends Resource2 {
   }
   async _pushTrackInBulk({ ctx, peerConnection, transceiver, sessionId, trackName }) {
     log2.verbose("pushing track ", trackName, {
-      F: __dxlog_file2,
-      L: 213,
+      F: __dxlog_file3,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -677,9 +710,9 @@ var CallsServicePeer = class extends Resource2 {
           }))
         })
       });
-      invariant2(response.tracks !== void 0, void 0, {
-        F: __dxlog_file2,
-        L: 238,
+      invariant3(response.tracks !== void 0, void 0, {
+        F: __dxlog_file3,
+        L: 243,
         S: this,
         A: [
           "response.tracks !== undefined",
@@ -693,7 +726,7 @@ var CallsServicePeer = class extends Resource2 {
       return {
         tracks: response.tracks
       };
-    })).then(({ tracks }) => {
+    })).then(async ({ tracks }) => {
       const trackData = tracks.find((t) => t.mid === transceiver.mid);
       if (trackData) {
         return {
@@ -703,19 +736,12 @@ var CallsServicePeer = class extends Resource2 {
         };
       } else {
         log2.error("missing track data", void 0, {
-          F: __dxlog_file2,
-          L: 258,
+          F: __dxlog_file3,
+          L: 267,
           S: this,
           C: (f, a) => f(...a)
         });
       }
-    }).catch((err) => {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 262,
-        S: this,
-        C: (f, a) => f(...a)
-      });
     });
     const onDispose = async () => {
       if (transceiver.mid) {
@@ -728,9 +754,9 @@ var CallsServicePeer = class extends Resource2 {
   }
   async pushTrack({ track, encodings = [], ctx, previousTrack }) {
     await this.waitUntilOpen();
-    invariant2(this.session, void 0, {
-      F: __dxlog_file2,
-      L: 289,
+    invariant3(this.session, void 0, {
+      F: __dxlog_file3,
+      L: 295,
       S: this,
       A: [
         "this.session",
@@ -742,8 +768,8 @@ var CallsServicePeer = class extends Resource2 {
       previousTrack,
       encodings
     }, {
-      F: __dxlog_file2,
-      L: 290,
+      F: __dxlog_file3,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -755,8 +781,8 @@ var CallsServicePeer = class extends Resource2 {
           previousTrack,
           transceiver: transceiver2
         }, {
-          F: __dxlog_file2,
-          L: 294,
+          F: __dxlog_file3,
+          L: 300,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -767,23 +793,23 @@ var CallsServicePeer = class extends Resource2 {
           previousTrack,
           transceiver: transceiver2
         }, {
-          F: __dxlog_file2,
-          L: 297,
+          F: __dxlog_file3,
+          L: 303,
           S: this,
           C: (f, a) => f(...a)
         });
         transceiver2.sender.replaceTrack(track).catch((err) => log2.catch(err, void 0, {
-          F: __dxlog_file2,
-          L: 298,
+          F: __dxlog_file3,
+          L: 304,
           S: this,
           C: (f, a) => f(...a)
         }));
         return previousTrack;
       }
     }
-    invariant2(track, void 0, {
-      F: __dxlog_file2,
-      L: 302,
+    invariant3(track, void 0, {
+      F: __dxlog_file3,
+      L: 308,
       S: this,
       A: [
         "track",
@@ -795,8 +821,8 @@ var CallsServicePeer = class extends Resource2 {
       direction: "sendonly"
     });
     log2.verbose("creating transceiver", void 0, {
-      F: __dxlog_file2,
-      L: 307,
+      F: __dxlog_file3,
+      L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -807,9 +833,9 @@ var CallsServicePeer = class extends Resource2 {
       sessionId: this.session.sessionId,
       trackName: stableId
     });
-    invariant2(pushedTrackData, void 0, {
-      F: __dxlog_file2,
-      L: 316,
+    invariant3(pushedTrackData, void 0, {
+      F: __dxlog_file3,
+      L: 322,
       S: this,
       A: [
         "pushedTrackData",
@@ -825,8 +851,8 @@ var CallsServicePeer = class extends Resource2 {
       };
     });
     transceiver.sender.setParameters(parameters).catch((err) => log2.catch(err, void 0, {
-      F: __dxlog_file2,
-      L: 323,
+      F: __dxlog_file3,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -838,8 +864,8 @@ var CallsServicePeer = class extends Resource2 {
     log2("pulling track", {
       trackName: trackData.trackName
     }, {
-      F: __dxlog_file2,
-      L: 341,
+      F: __dxlog_file3,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -853,9 +879,9 @@ var CallsServicePeer = class extends Resource2 {
       if (newTrackResponse.errorCode) {
         throw new Error(newTrackResponse.errorDescription);
       }
-      invariant2(newTrackResponse.tracks, void 0, {
-        F: __dxlog_file2,
-        L: 354,
+      invariant3(newTrackResponse.tracks, void 0, {
+        F: __dxlog_file3,
+        L: 360,
         S: this,
         A: [
           "newTrackResponse.tracks",
@@ -901,18 +927,18 @@ var CallsServicePeer = class extends Resource2 {
           mid = trackInfo.mid;
           return track;
         }).catch((err) => log2.catch(err, void 0, {
-          F: __dxlog_file2,
-          L: 406,
+          F: __dxlog_file3,
+          L: 412,
           S: this,
           C: (f, a) => f(...a)
         }));
       } else {
-        log2.warn("missing track info", {
+        log2.info("missing track info", {
           trackData,
           availableTracks: Array.from(trackMap.keys())
         }, {
-          F: __dxlog_file2,
-          L: 408,
+          F: __dxlog_file3,
+          L: 414,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -921,8 +947,8 @@ var CallsServicePeer = class extends Resource2 {
     const onDispose = async () => {
       if (mid) {
         log2("closing pulled track ", trackData.trackName, {
-          F: __dxlog_file2,
-          L: 414,
+          F: __dxlog_file3,
+          L: 420,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -936,9 +962,9 @@ var CallsServicePeer = class extends Resource2 {
   }
   async pullTrack({ ctx, trackData }) {
     await this.waitUntilOpen();
-    invariant2(this.session, void 0, {
-      F: __dxlog_file2,
-      L: 435,
+    invariant3(this.session, void 0, {
+      F: __dxlog_file3,
+      L: 441,
       S: this,
       A: [
         "this.session",
@@ -1024,7 +1050,7 @@ var peerConnectionIsConnected = async (peerConnection) => {
 
 // src/calls/util/media.ts
 import { log as log3 } from "@dxos/log";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/util/media.ts";
+var __dxlog_file4 = "/__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];
@@ -1036,7 +1062,7 @@ var getUserMediaTrack = async (kind, constraints = {}, deviceList) => {
 var acquireTrack = async (device, constraints) => {
   const { deviceId, label } = device;
   log3.info(`requesting ${label}`, void 0, {
-    F: __dxlog_file3,
+    F: __dxlog_file4,
     L: 23,
     S: void 0,
     C: (f, a) => f(...a)
@@ -1091,15 +1117,15 @@ var SpeakingMonitor = class extends Resource3 {
   * Event that is emitted when the user starts or stops speaking.
   * It is debounced to prevent rapid state changes.
   */
-  speakingChanged;
+  speakingChanged = new Event2();
   /**
   * Real state of the user speaking.
   */
-  _isSpeaking;
-  _lastEventTime;
+  _isSpeaking = false;
+  _lastEventTime = 0;
   _deferredUpdate;
   constructor(_mediaStreamTrack) {
-    super(), this._mediaStreamTrack = _mediaStreamTrack, this.speakingChanged = new Event2(), this._isSpeaking = false, this._lastEventTime = 0;
+    super(), this._mediaStreamTrack = _mediaStreamTrack;
   }
   get isSpeaking() {
     return this._isSpeaking;
@@ -1149,6 +1175,7 @@ var SpeakingMonitor = class extends Resource3 {
 // src/calls/media-manager.ts
 import { DeferredTask as DeferredTask3, Event as Event3, sleep as sleep2, synchronized as synchronized2 } from "@dxos/async";
 import { Resource as Resource4, cancelWithContext } from "@dxos/context";
+import { invariant as invariant4 } from "@dxos/invariant";
 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;
@@ -1156,13 +1183,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_file4 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/media-manager.ts";
+var __dxlog_file5 = "/__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 RETRY_INTERVAL = 100;
+var USE_INAUDIBLE_AUDIO = true;
 var MediaManager = class extends Resource4 {
   stateUpdated = new Event3();
   _state = {
@@ -1313,8 +1340,8 @@ var MediaManager = class extends Resource4 {
   }
   async _reconcilePulledMedia() {
     log4("reconciling tracks", void 0, {
-      F: __dxlog_file4,
-      L: 222,
+      F: __dxlog_file5,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1331,12 +1358,12 @@ var MediaManager = class extends Resource4 {
       currentAudioTracks: Object.keys(this._state.pulledAudioTracks),
       currentVideoStreams: Object.keys(this._state.pulledVideoStreams)
     }, {
-      F: __dxlog_file4,
-      L: 241,
+      F: __dxlog_file5,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
-    await Promise.all(tracksToPull.map((name) => this._pullTrack(name)));
+    const pullResults = await Promise.all(tracksToPull.map((name) => this._pullTrack(name)));
     await Promise.all([
       ...audioTracksToClose,
       ...videoStreamsToClose
@@ -1345,55 +1372,102 @@ var MediaManager = class extends Resource4 {
       currentAudioTracks: Object.keys(this._state.pulledAudioTracks),
       currentVideoStreams: Object.keys(this._state.pulledVideoStreams)
     }, {
-      F: __dxlog_file4,
-      L: 256,
+      F: __dxlog_file5,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdated.emit(this._state);
+    if (pullResults.some(({ shouldRetry }) => shouldRetry)) {
+      await cancelWithContext(this._ctx, sleep2(RETRY_INTERVAL));
+      log4.info("retrying pull tracks", {
+        tracksToPull
+      }, {
+        F: __dxlog_file5,
+        L: 270,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      invariant4(this._pullTracksTask, void 0, {
+        F: __dxlog_file5,
+        L: 271,
+        S: this,
+        A: [
+          "this._pullTracksTask",
+          ""
+        ]
+      });
+      this._pullTracksTask.schedule();
+    }
   }
   async _pushTracks() {
     if (!this._state.peer?.isOpen) {
       return;
     }
     let updated = false;
-    const [pushedVideoTrack, pushedAudioTrack, pushedScreenshareTrack] = await Promise.all([
-      this._pushTrack(this._state.videoTrack, this._state.pushedVideoTrack, [
+    const [pushVideoResult, pushAudioResult, pushScreenshareResult] = await Promise.all([
+      this._maybePushTrack(this._state.videoTrack, this._state.pushedVideoTrack, [
         {
           maxFramerate: MAX_WEB_CAM_FRAMERATE,
           maxBitrate: MAX_WEB_CAM_BITRATE
         }
       ]),
-      this._pushTrack(this._state.audioTrack, this._state.pushedAudioTrack, [
+      this._maybePushTrack(this._state.audioTrack, this._state.pushedAudioTrack, [
         {
           networkPriority: "high"
         }
       ]),
-      this._pushTrack(this._state.screenshareTrack, this._state.pushedScreenshareTrack)
+      this._maybePushTrack(this._state.screenshareTrack, this._state.pushedScreenshareTrack)
     ]);
-    if (pushedVideoTrack !== this._state.pushedVideoTrack) {
-      this._state.pushedVideoTrack = pushedVideoTrack;
+    if (pushVideoResult.track !== this._state.pushedVideoTrack) {
+      this._state.pushedVideoTrack = pushVideoResult.track;
       updated = true;
     }
-    if (pushedAudioTrack !== this._state.pushedAudioTrack) {
-      this._state.pushedAudioTrack = pushedAudioTrack;
+    if (pushAudioResult.track !== this._state.pushedAudioTrack) {
+      this._state.pushedAudioTrack = pushAudioResult.track;
       updated = true;
     }
-    if (pushedScreenshareTrack !== this._state.pushedScreenshareTrack) {
-      this._state.pushedScreenshareTrack = pushedScreenshareTrack;
+    if (pushScreenshareResult.track !== this._state.pushedScreenshareTrack) {
+      this._state.pushedScreenshareTrack = pushScreenshareResult.track;
       updated = true;
     }
-    if (!updated) {
-      return;
+    const shouldRetry = pushVideoResult.shouldRetry || pushAudioResult.shouldRetry || pushScreenshareResult.shouldRetry;
+    if (updated) {
+      this.stateUpdated.emit(this._state);
+    }
+    if (shouldRetry) {
+      await cancelWithContext(this._ctx, sleep2(RETRY_INTERVAL));
+      log4.info("retrying push tracks", {
+        pushVideoResult,
+        pushAudioResult,
+        pushScreenshareResult
+      }, {
+        F: __dxlog_file5,
+        L: 310,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      invariant4(this._pushTracksTask, void 0, {
+        F: __dxlog_file5,
+        L: 311,
+        S: this,
+        A: [
+          "this._pushTracksTask",
+          ""
+        ]
+      });
+      this._pushTracksTask.schedule();
     }
-    this.stateUpdated.emit(this._state);
   }
   async _pullTrack(name) {
     const ctx = this._ctx.derive();
     try {
       const trackData = TrackNameCodec.decode(name);
       const track = await this._state.peer.pullTrack({
-        trackData,
+        trackData: {
+          ...trackData,
+          mid: void 0
+        },
         ctx
       });
       if (track?.readyState === "ended") {
@@ -1406,7 +1480,9 @@ var MediaManager = class extends Resource4 {
             ctx
           };
           ctx.onDispose(() => delete this._state.pulledAudioTracks[name]);
-          break;
+          return {
+            shouldRetry: false
+          };
         }
         case "video": {
           const mediaStream = new MediaStream();
@@ -1420,43 +1496,62 @@ var MediaManager = class extends Resource4 {
             track.stop();
             delete this._state.pulledVideoStreams[name];
           });
-          break;
+          return {
+            shouldRetry: false
+          };
         }
         default:
           throw new Error(`Invalid track kind: ${track?.kind}`);
       }
     } catch (err) {
-      log4.verbose("failed to pull track", {
+      log4.info("failed to pull track", {
         err,
         name
       }, {
-        F: __dxlog_file4,
-        L: 326,
+        F: __dxlog_file5,
+        L: 347,
         S: this,
         C: (f, a) => f(...a)
       });
       void ctx.dispose();
-      await cancelWithContext(this._ctx, sleep2(RETRY_INTERVAL));
-      log4.verbose("retrying pull track", {
-        name
+      return {
+        shouldRetry: true
+      };
+    }
+  }
+  async _maybePushTrack(track, previousTrack, encodings) {
+    if (!track && !previousTrack) {
+      return {
+        track: void 0
+      };
+    }
+    const ctx = this._ctx.derive();
+    try {
+      return {
+        track: await this._state.peer.pushTrack({
+          ctx,
+          track: track ?? null,
+          previousTrack,
+          encodings
+        })
+      };
+    } catch (err) {
+      log4.info("failed to push track", {
+        err,
+        track,
+        previousTrack,
+        encodings
       }, {
-        F: __dxlog_file4,
-        L: 329,
+        F: __dxlog_file5,
+        L: 373,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._pullTracksTask.schedule();
-    }
-  }
-  async _pushTrack(track, previousTrack, encodings) {
-    if (!track && !previousTrack) {
-      return;
+      void ctx.dispose();
+      return {
+        shouldRetry: true
+      };
     }
-    return this._state.peer.pushTrack({
-      track: track ?? null,
-      previousTrack,
-      encodings
-    });
   }
 };
 _ts_decorate2([
@@ -1470,7 +1565,7 @@ _ts_decorate2([
 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 invariant3 } from "@dxos/invariant";
+import { invariant as invariant5 } from "@dxos/invariant";
 import { live } from "@dxos/live-object";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 function _ts_decorate3(decorators, target, key, desc) {
@@ -1479,22 +1574,28 @@ 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_file5 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-manager.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/calls/call-manager.ts";
 var CallManager = class extends Resource5 {
   _client;
-  callStateUpdated;
+  callStateUpdated = new Event4();
   // TODO(wittjosiah): Consolidate isSpeaking into the MediaState type.
-  mediaStateUpdated;
-  left;
+  mediaStateUpdated = new Event4();
+  left = new Event4();
   /**
   * Live object state. Is changed on internal events.
   * CAUTION: Do not change directly.
   */
-  _state;
+  _state = live({
+    call: {},
+    media: {
+      pulledAudioTracks: {},
+      pulledVideoStreams: {}
+    }
+  });
   // TODO(wittjosiah): This shouldn't be necessary, live-object's signals should be granular.
-  _raisedHandSignal;
-  _speakingSignal;
-  _joinedSignal;
+  _raisedHandSignal = computed(() => this._state.call.raisedHand ?? false);
+  _speakingSignal = computed(() => this._state.call.speaking ?? false);
+  _joinedSignal = computed(() => this._state.call.joined ?? false);
   _swarmSynchronizer;
   _mediaManager;
   /** @reactive */
@@ -1577,17 +1678,11 @@ var CallManager = class extends Resource5 {
   }
   // TODO(burdon): Can this be mocked?
   constructor(_client) {
-    super(), this._client = _client, this.callStateUpdated = new Event4(), this.mediaStateUpdated = new Event4(), this.left = new Event4(), this._state = live({
-      call: {},
-      media: {
-        pulledAudioTracks: {},
-        pulledVideoStreams: {}
-      }
-    }), this._raisedHandSignal = computed(() => this._state.call.raisedHand ?? false), this._speakingSignal = computed(() => this._state.call.speaking ?? false), this._joinedSignal = computed(() => this._state.call.joined ?? false);
+    super(), this._client = _client;
     this._client.config.getOrThrow("runtime.services.edge.url");
     const networkService = this._client.services.services.NetworkService;
-    invariant3(networkService, "network service not found", {
-      F: __dxlog_file5,
+    invariant5(networkService, "network service not found", {
+      F: __dxlog_file6,
       L: 159,
       S: this,
       A: [
@@ -1640,7 +1735,7 @@ var CallManager = class extends Resource5 {
     this.roomId && this.left.emit(this.roomId);
   }
   _onCallStateUpdated(state) {
-    const tracksToPull = state.users?.filter((user) => user.joined && user.id !== state.self?.id)?.flatMap((user) => [
+    const tracksToPull = state.users?.filter((user) => user.joined && user.id !== state.self.id)?.flatMap((user) => [
       user.tracks?.video,
       user.tracks?.audio,
       user.tracks?.screenshare
@@ -1695,4 +1790,4 @@ export {
   MediaManager,
   CallManager
 };
-//# sourceMappingURL=chunk-TUFWPOVS.mjs.map
+//# sourceMappingURL=chunk-ZCW3NSDZ.mjs.map