mbeditor 0.13.1 → 0.14.0

data/app/assets/javascripts/mbeditor/collaboration_service.js

@@ -72,6 +72,12 @@ var CollaborationService = (function () {
   // ever on the other end of that CRDT.
   var _peerPresent = false;
   var _availabilityListeners = [];
+  var _published = false;
+  var _dropTimer = null;
+  // Long enough to cover a peer reloading their tab, and no longer. Presence is
+  // broadcast on a 5s roster, so anything under that expires before the roster
+  // could have reported the peer back and the grace buys nothing.
+  var PEER_DROP_GRACE = 10000;
 
   function _globalsReady() {
     return typeof window.Y !== 'undefined' &&
@@ -107,19 +113,41 @@ var CollaborationService = (function () {
     refreshAvailability();
   }
 
-  function refreshAvailability() {
-    var available = isAvailable();
+  function _publishAvailability(available) {
     // No longer collaborating: close every room so the editor returns to solo
     // behaviour — persistent undo and external-change detection both key off
     // there being no live binding.
     if (!available && Object.keys(_rooms).length) {
       Object.keys(_rooms).forEach(function (path) { leaveRoom(path); });
     }
+    _published = available;
     _availabilityListeners.slice().forEach(function (fn) {
       try { fn(available); } catch (e) { /* a bad listener must not stop the rest */ }
     });
   }
 
+  function refreshAvailability() {
+    var available = isAvailable();
+    if (available && _dropTimer) { clearTimeout(_dropTimer); _dropTimer = null; }
+    // A peer normally "leaves" because their tab reloaded or the cable blinked.
+    // Acting on that immediately tears every room down AND rebuilds every open
+    // editor — EditorPanel's mount effect depends on this value — losing the
+    // cursor, selection and scroll position. Hold the previous value until the
+    // drop has lasted PEER_DROP_GRACE. `_published` only decides whether we are on
+    // a falling edge; it never suppresses a publish, so the current value still
+    // goes out on every roster message.
+    if (!available && _published) {
+      if (!_dropTimer) {
+        _dropTimer = setTimeout(function () {
+          _dropTimer = null;
+          if (!isAvailable()) _publishAvailability(false);
+        }, PEER_DROP_GRACE);
+      }
+      available = true;
+    }
+    _publishAvailability(available);
+  }
+
   // Every condition collaboration depends on, reported separately.
   //
   // isAvailable() collapses five things into one boolean, which is useless when
@@ -127,11 +155,16 @@ var CollaborationService = (function () {
   // the server never advertised, a rejected handshake, or simply nobody else
   // being here. Someone debugging this on another machine cannot paste a console
   // snippet back, so the editor has to be able to say which.
+  // True when any open file's room fell back to local editing. Surfaced in the
+  // diagnostics panel so a silent degrade to single-user mode is visible (#99).
+  function _anyDegradedRoom() {
+    return Object.keys(_rooms).some(function (path) { return _rooms[path].degraded; });
+  }
+
   function diagnostics() {
     var cableStatus = (typeof WebSocketService !== 'undefined' &&
                        typeof WebSocketService.cableStatus === 'function')
       ? WebSocketService.cableStatus() : 'unknown';
-
     var checks = [
       {
         key: 'libraries',
@@ -167,8 +200,18 @@ var CollaborationService = (function () {
         key: 'peers',
         label: 'Another participant connected',
         ok: _peerPresent,
-        detail: 'Presence is held per web process. If two people are on different Puma workers ' +
-                'they never see each other — run a single worker (WEB_CONCURRENCY=0) while pairing.'
+        detail: 'Presence is held per web process. With the default async cable adapter two people on ' +
+                'different Puma workers never see each other; with a cross-process adapter ' +
+                '(redis/postgres/solid_cable) they do, but each worker keeps its own document store, so ' +
+                'run a single worker (WEB_CONCURRENCY=0) while pairing.'
+      },
+      {
+        key: 'degraded',
+        label: 'Every collaborative file is live',
+        ok: !_anyDegradedRoom(),
+        detail: 'A file fell back to local editing because the collaboration handshake did not arrive ' +
+                'in time (slow ruby-lsp boot, a busy git wave, a saturated Puma thread pool, or a cable ' +
+                'reconnect). It stays local for the life of the tab, so edits made now will not reach a peer.'
       }
     ];
 
@@ -204,6 +247,18 @@ var CollaborationService = (function () {
   // Room lifecycle
   // ---------------------------------------------------------------------------
 
+  // ms is the room's age — the only per-room duration this file has, and what
+  // makes the join/seed/attach/defer ordering legible in the trace.
+  function _recCollab(room, phase) {
+    var audit = window.MbeditorAudit;
+    if (!audit) return;
+    var peers = 0;
+    try {
+      if (room.awareness) peers = Math.max(0, room.awareness.getStates().size - 1);
+    } catch (e) { /* awareness torn down mid-teardown */ }
+    audit.rec(audit.EV.COLLAB, audit.code('collabPhase', phase), peers, Date.now() - room.auditStartedAt);
+  }
+
   // Open the Yjs document + channel subscription for a file and start the sync
   // handshake. Idempotent. Returns true when a live room exists (so the caller
   // can gate its own behavior), false when collaboration could not activate.
@@ -217,6 +272,7 @@ var CollaborationService = (function () {
     var doc = new window.Y.Doc();
     var room = {
       doc: doc,
+      path: path,
       text: doc.getText('monaco'),
       subscription: null,
       synced: false,
@@ -232,6 +288,21 @@ var CollaborationService = (function () {
       attachRequested: false,
       degraded: false,
       fallbackTimer: null,
+      // Highest server-assigned delta sequence this client has applied. Sent back
+      // with each snapshot so the server keeps only the deltas the snapshot does
+      // not already contain (#97).
+      lastServerSeq: 0,
+      // A peer snapshot has been requested and not yet answered. Guards against
+      // re-asking on every doc_update while the replay is still incomplete.
+      snapshotRequested: false,
+      // Counters for the periodic snapshot while dirty, so the server's delta
+      // buffer cannot overflow between saves (#97).
+      updatesSinceSnapshot: 0,
+      lastSnapshotAt: 0,
+      // True between rejoinRooms() and the first sync of the new subscription: a
+      // room that existed before the drop must never seed again (#96).
+      rejoining: false,
+      auditStartedAt: Date.now(),
       // Awareness (slice 5): editors is the LIVE set y-monaco renders remote
       // carets into; cursorDisposers holds our per-editor cursor->awareness
       // writers; seenClients tracks peers we've announced ourselves to.
@@ -239,6 +310,11 @@ var CollaborationService = (function () {
       // follower can track where we've scrolled.
       awareness: null,
       editors: new Set(),
+      // Editors that bound before the room finished its handshake, so there was
+      // no binding to register them with yet. _doAttach folds them in. Without
+      // this, the same file open in two panes loses the pane that bound first:
+      // it is never added to the live set and never broadcasts its caret (#98).
+      pendingEditors: new Set(),
       boundEditor: null,
       broadcastAwareness: null,
       cursorDisposers: new Map(),
@@ -255,6 +331,7 @@ var CollaborationService = (function () {
       try {
         room.subscription.perform('doc_update', { update: _u8ToB64(update) });
       } catch (e) { /* not connected yet / cable down — peers reconcile on next op */ }
+      _maybePeriodicSnapshot(room);
     });
 
     room.subscription = WebSocketService.subscribeCollaboration(path, {
@@ -267,6 +344,7 @@ var CollaborationService = (function () {
     }
 
     _rooms[path] = room;
+    _recCollab(room, 'join');
     return true;
   }
 
@@ -279,18 +357,56 @@ var CollaborationService = (function () {
         window.Y.applyUpdate(room.doc, _b64ToU8(data.snapshot), REMOTE);
       }
       if (data.deltas && data.deltas.length) {
-        data.deltas.forEach(function (d) {
-          if (d) window.Y.applyUpdate(room.doc, _b64ToU8(d), REMOTE);
+        data.deltas.forEach(function (d, i) {
+          if (!d) return;
+          window.Y.applyUpdate(room.doc, _b64ToU8(d), REMOTE);
+          var seq = data.delta_seqs && data.delta_seqs[i];
+          if (typeof seq === 'number' && seq > room.lastServerSeq) room.lastServerSeq = seq;
         });
       }
-      room.seedGranted = !!data.seed;
+      if (typeof data.snapshot_seq === 'number' && data.snapshot_seq > room.lastServerSeq) {
+        room.lastServerSeq = data.snapshot_seq;
+      }
+      // A seed is only ever granted on the room's first handshake. On a reconnect
+      // the room already existed (rejoining), and taking the grant would seed a
+      // second copy of the file into whatever a peer still holds (#96). A
+      // degraded room stays local for the life of the tab (#99).
+      var firstSync = !room.synced;
+      room.seedGranted = !!data.seed && firstSync && !room.rejoining && !room.degraded;
+      room.rejoining = false;
       room.synced = true;
       _maybeAttach(room);
     } else if (data.type === 'doc_update') {
       if (data.update) window.Y.applyUpdate(room.doc, _b64ToU8(data.update), REMOTE);
+      if (typeof data.seq === 'number' && data.seq > room.lastServerSeq) {
+        room.lastServerSeq = data.seq;
+      }
+      // One sample a second: a peer typing produces an update per keystroke,
+      // and the trace wants the shape of the traffic, not every packet.
+      var updatedAt = Date.now();
+      if (updatedAt - (room.auditLastUpdate || 0) >= 1000) {
+        room.auditLastUpdate = updatedAt;
+        _recCollab(room, 'update');
+      }
       // A client that deferred attaching (empty room, seed granted to someone
       // else) is waiting for exactly this: the seeder's content has landed.
       _maybeAttach(room);
+    } else if (data.type === 'snapshot') {
+      // A full state update relayed by a peer (answer to request_snapshot, or a
+      // periodic push). Y.applyUpdate is idempotent, so overlap with what we
+      // already hold is harmless. This is how a client whose delta replay was
+      // incomplete — or that rejoined after a restart — catches up without
+      // waiting for the peer's next keystroke (#96, #97).
+      if (data.snapshot) window.Y.applyUpdate(room.doc, _b64ToU8(data.snapshot), REMOTE);
+      if (typeof data.applied_seq === 'number' && data.applied_seq > room.lastServerSeq) {
+        room.lastServerSeq = data.applied_seq;
+      }
+      room.snapshotRequested = false;
+      _maybeAttach(room);
+    } else if (data.type === 'request_snapshot') {
+      // A peer's replay was incomplete. Answer with our full state if we hold
+      // one, so it can attach instead of diverging on stale text.
+      if (room.binding && room.text.length > 0) pushSnapshot(room.path);
     } else if (data.type === 'awareness') {
       if (data.awareness && room.awareness && window.awarenessProtocol) {
         // REMOTE origin keeps the outbound handler from echoing peer state back.
@@ -302,6 +418,47 @@ var CollaborationService = (function () {
     }
   }
 
+  // True when the applied replay left structs pending on missing dependencies:
+  // the delta buffer overflowed (MAX_DELTAS) or a snapshot skipped a concurrent
+  // update, so the document is incomplete. Yjs parks such structs in the store
+  // until the missing update arrives; attaching now would show stale text and
+  // then overwrite the peer's work on the next save (#97).
+  function _replayIncomplete(room) {
+    try {
+      var store = room.doc && room.doc.store;
+      return !!(store && (store.pendingStructs || store.pendingDs));
+    } catch (e) {
+      return false;
+    }
+  }
+
+  // Ask the room for a full snapshot. Any bound peer answers via #snapshot; the
+  // fallback timer degrades to local if nobody does.
+  function _requestSnapshot(room) {
+    if (room.snapshotRequested || !room.subscription) return;
+    room.snapshotRequested = true;
+    try { room.subscription.perform('request_snapshot', {}); } catch (e) { /* cable down */ }
+    if (!room.auditDeferred) { room.auditDeferred = true; _recCollab(room, 'defer'); }
+  }
+
+  // Push a full snapshot every so often while attached, so a long typing session
+  // cannot overflow the server's delta buffer between saves. Count-based first
+  // (keystrokes), time-based as a floor for slow editors.
+  var SNAPSHOT_EVERY_UPDATES = 200;
+  var SNAPSHOT_EVERY_MS = 30000;
+  function _maybePeriodicSnapshot(room) {
+    if (!room.binding || !room.subscription) return;
+    var now = Date.now();
+    room.updatesSinceSnapshot += 1;
+    var byCount = room.updatesSinceSnapshot >= SNAPSHOT_EVERY_UPDATES;
+    var byTime = room.lastSnapshotAt > 0 && (now - room.lastSnapshotAt) >= SNAPSHOT_EVERY_MS;
+    if (!byCount && !byTime) return;
+    if (pushSnapshot(room.path)) {
+      room.updatesSinceSnapshot = 0;
+      room.lastSnapshotAt = now;
+    }
+  }
+
   // Re-open every room's channel subscription on the current consumer.
   //
   // A cable drop tears the consumer down and takes every CollaborationChannel
@@ -315,16 +472,27 @@ var CollaborationService = (function () {
   function rejoinRooms() {
     Object.keys(_rooms).forEach(function (path) {
       var room = _rooms[path];
+      // A degraded room is local for the life of the tab; re-subscribing it would
+      // let it seed the restarted server from its own model (#99).
+      if (room.degraded) return;
       try { if (room.subscription) room.subscription.unsubscribe(); } catch (e) { /* already dead */ }
+      room.rejoining = true;
+      room.snapshotRequested = false;
       room.subscription = WebSocketService.subscribeCollaboration(path, {
         // Awareness is never server-persisted, so peers lost our caret with the
         // connection and would not see it again until we happened to move.
         // The server may have lost the room entirely (restart): re-publish our
         // content so the next opener late-joins instead of being granted a seed
         // that would merge a second copy into what we still hold.
+        //
+        // Only a room that was actually bound may push: it holds converged
+        // content. A deferred room must not seed the restarted server from its
+        // disk copy — a peer re-pushing a different version would merge into two
+        // concatenated copies. It waits for the peer's snapshot instead.
         connected: function () {
           _sendLocalAwareness(room);
           if (room.binding) pushSnapshot(path);
+          _recCollab(room, 'reconnect');
         },
         received: function (data) { _onMessage(room, data); }
       });
@@ -346,10 +514,12 @@ var CollaborationService = (function () {
 
     // The editor is recreated on every tab switch while the model (and binding)
     // persist. If the binding already exists, register this fresh editor so its
-    // caret broadcasts and remote carets render in it.
+    // caret broadcasts and remote carets render in it. Otherwise remember it for
+    // _doAttach, which folds every pre-handshake editor into the live set.
     if (room.binding) _attachEditorToBinding(room, editor);
+    else room.pendingEditors.add(editor);
 
-    if (!room.fallbackTimer && !room.binding) {
+    if (!room.fallbackTimer && !room.binding && !room.degraded) {
       // Safety net: if the sync handshake never lands (e.g. channel rejected),
       // stop waiting and let the natively-loaded content stand.
       room.fallbackTimer = setTimeout(function () { _fallbackLocal(room); }, 6000);
@@ -359,14 +529,36 @@ var CollaborationService = (function () {
 
   function _maybeAttach(room) {
     if (room.binding || !room.synced || !room.attachRequested || !room.model) return;
-    // Shared doc still empty and the seed was granted to another client: its
-    // content is on its way. Binding now would hand the model to an empty Y.Text
-    // and wipe the buffer, so wait for the first doc_update (or the fallback
-    // timer, which lets the natively-loaded content stand).
-    if (room.text.length === 0 && !room.seedGranted && room.model.getValue().length > 0) return;
+    // Once degraded to local, stay local for the life of the tab. Attaching on a
+    // late sync would have the binding replace every edit made in the degraded
+    // window with the server's text, with no dirty marker and no undo (#99).
+    if (room.degraded) return;
+    // An incomplete replay means attaching would show stale text and overwrite
+    // the peer's work on save; ask for a snapshot and wait (#97).
+    if (_replayIncomplete(room)) {
+      _requestSnapshot(room);
+      return;
+    }
+    // Nobody may attach to an empty shared doc except the seed grantee, and only
+    // once its own disk content has arrived. Binding to an empty Y.Text wipes the
+    // buffer, and a client that attaches empty reports consumesDiskLoad() false —
+    // so when its content lands EditorPanel pushes the whole file through the live
+    // binding at offset 0, and two clients doing that concatenate the file into
+    // itself. Wait for the first doc_update, contentReady(), or the fallback timer.
+    if (room.text.length === 0 && !(room.seedGranted && room.model.getValue().length > 0)) {
+      if (!room.auditDeferred) { room.auditDeferred = true; _recCollab(room, 'defer'); }
+      return;
+    }
     _doAttach(room);
   }
 
+  // The disk content for a path has landed in the model. A room that deferred
+  // above with an empty model can now seed the shared doc from it.
+  function contentReady(path) {
+    var room = _rooms[path];
+    if (room) _maybeAttach(room);
+  }
+
   function _doAttach(room) {
     var model = room.model;
     room.lateJoin = room.text.length > 0; // server already had shared state
@@ -378,6 +570,7 @@ var CollaborationService = (function () {
       // Only ever the client the SERVER picked — two clients each seeding an
       // empty room merge into two concatenated copies of the file.
       room.doc.transact(function () { room.text.insert(0, model.getValue()); });
+      _recCollab(room, 'seed');
     }
 
     // Awareness carries each participant's caret/selection + identity. Optional:
@@ -396,9 +589,24 @@ var CollaborationService = (function () {
     // editors added later get an equivalent caret writer from us.
     room.boundEditor = room.editor || null;
     if (room.boundEditor) room.editors.add(room.boundEditor);
+    // The binding's constructor calls model.setValue() whenever the model differs
+    // from the converged text, which resets cursor, selection and scroll — the
+    // "it jumped to the other person's position" symptom. Put the viewport back.
+    var preValue = model.getValue();
+    var preView = room.boundEditor ? room.boundEditor.saveViewState() : null;
     room.binding = new window.MonacoBinding(room.text, model, room.editors, room.awareness);
+    if (preView && model.getValue() !== preValue) room.boundEditor.restoreViewState(preView);
 
     if (room.awareness) _initAwareness(room);
+    _recCollab(room, 'attach');
+
+    // Fold in every editor that bound during the handshake. boundEditor was
+    // added before construction (y-monaco owns its caret writer); the rest get
+    // an equivalent writer from _attachEditorToBinding.
+    room.pendingEditors.forEach(function (ed) {
+      if (ed !== room.boundEditor) _attachEditorToBinding(room, ed);
+    });
+    room.pendingEditors.clear();
 
     // Undo scoped to this client's edits only: y-monaco tags model->doc edits with
     // the binding as origin, so undo can never revert a peer's edit.
@@ -679,6 +887,7 @@ var CollaborationService = (function () {
     room.fallbackTimer = null;
     if (room.binding || room.degraded) return;
     room.degraded = true;
+    _recCollab(room, 'degrade');
     if (room.onSeeded) {
       try { room.onSeeded(); } catch (e) { /* best-effort */ }
     }
@@ -693,15 +902,23 @@ var CollaborationService = (function () {
     return !!(room && room.binding && room.lateJoin);
   }
 
-  // Detach the current editor (tab switch / editor dispose). The binding stays
-  // bound to the persistent model, so the room and its undo history survive.
-  function unbindEditor(path) {
+  // Detach one editor (tab switch / editor dispose). The binding stays bound to
+  // the persistent model, so the room and its undo history survive.
+  //
+  // The editor is passed in, not read from room.editor: room.editor is only ever
+  // "the most recent editor bound" (used by _doAttach to pick boundEditor), and
+  // with the same file open in both panes that is the *other* pane's editor.
+  // Detaching that one left the disposed editor in room.editors, where y-monaco
+  // iterates it on every awareness change and throws. Callers always have the
+  // editor in scope; room.editor remains the fallback for legacy callers.
+  function unbindEditor(path, editor) {
     var room = _rooms[path];
     if (!room) return;
-    var editor = room.editor;
+    editor = editor || room.editor;
     if (editor) {
       // Detach this editor from the binding so a disposed editor isn't iterated
       // and stops broadcasting a stale caret.
+      room.pendingEditors.delete(editor);
       room.editors.delete(editor);
       var dispose = room.cursorDisposers.get(editor);
       if (dispose) { dispose(); room.cursorDisposers.delete(editor); }
@@ -715,7 +932,7 @@ var CollaborationService = (function () {
       room.awareness.setLocalStateField('selection', null);
       room.awareness.setLocalStateField('viewport', null);
     }
-    room.editor = null;
+    if (room.editor === editor) room.editor = null;
   }
 
   // Destroy the room entirely. Called when the Monaco model is actually disposed
@@ -728,10 +945,12 @@ var CollaborationService = (function () {
     room.cursorDisposers.clear();
     room.viewportDisposers.forEach(function (dispose) { try { dispose(); } catch (e) { /* ignore */ } });
     room.viewportDisposers.clear();
+    room.pendingEditors.clear();
     if (room.identityUnsub) { try { room.identityUnsub(); } catch (e) { /* ignore */ } }
     if (room.broadcastAwareness && room.broadcastAwareness.cancel) {
       room.broadcastAwareness.cancel();
     }
+    _recCollab(room, 'leave');
     if (room.awareness) {
       // Tell peers our caret is gone before tearing down (file closed). Remove our
       // state, then send the resulting (null-state) update directly — the throttled
@@ -766,16 +985,18 @@ var CollaborationService = (function () {
   }
 
   // Push a fresh full snapshot to the server so it can compact the doc store:
-  // CollaborationDocStore.replace_snapshot swaps the cached snapshot and clears
-  // the buffered deltas. Called after a manual save, when the shared buffer is
-  // known to be coherent and matches what just landed on disk. No-op when the
-  // file is not collaboratively bound or the wire isn't ready.
+  // CollaborationDocStore.replace_snapshot swaps the cached snapshot and keeps
+  // only the deltas recorded after `applied_seq` (the newest sequence this client
+  // has applied). Called after a manual save and periodically while typing.
   function pushSnapshot(path) {
     var room = _rooms[path];
-    if (!room || !room.subscription || !_globalsReady()) return false;
+    if (!room || !room.subscription) return false;
     try {
       var snapshot = window.Y.encodeStateAsUpdate(room.doc);
-      room.subscription.perform('snapshot', { snapshot: _u8ToB64(snapshot) });
+      room.subscription.perform('snapshot', {
+        snapshot: _u8ToB64(snapshot),
+        applied_seq: room.lastServerSeq || 0
+      });
       return true;
     } catch (e) {
       return false;
@@ -794,6 +1015,7 @@ var CollaborationService = (function () {
     unbindEditor: unbindEditor,
     leaveRoom: leaveRoom,
     consumesDiskLoad: consumesDiskLoad,
+    contentReady: contentReady,
     isBound: isBound,
     isAttached: isAttached,
     pushSnapshot: pushSnapshot,