Merge pull request #23714 from overleaf/ae-revert-unsaved-docs

Revert "Increase the length of unsaved doc time before the editor is locked"

GitOrigin-RevId: 0f2d257a55ebc3353ded2b10d505bfdb2e85f402

services/web/frontend/js/features/ide-react/editor/document-container.ts

@@ -182,10 +182,6 @@ export class DocumentContainer extends EventEmitter {
     return this.doc?.getRecentAck()
   }
 
-  getInflightOpCreatedAt() {
-    return this.doc?.getInflightOpCreatedAt()
-  }
-
   hasBufferedOps() {
     return this.doc?.hasBufferedOps()
   }
@@ -358,7 +354,7 @@ export class DocumentContainer extends EventEmitter {
       pendingOpSize < MAX_PENDING_OP_SIZE
     ) {
       // There is an op waiting to go to server but it is small and
-      // within the recent ack limit, this is OK for now.
+      // within the flushDelay, this is OK for now.
       saved = true
       debugConsole.log(
         '[pollSavedStatus] pending op (small with recent ack) assume ok',

services/web/frontend/js/features/ide-react/editor/open-documents.ts

@@ -83,14 +83,14 @@ export class OpenDocuments {
     }
   }
 
-  unsavedDocs() {
-    const docs = []
-    for (const doc of this.openDocs.values()) {
+  unsavedDocIds() {
+    const ids = []
+    for (const [docId, doc] of this.openDocs) {
       if (!doc.pollSavedStatus()) {
-        docs.push(doc)
+        ids.push(docId)
       }
     }
-    return docs
+    return ids
   }
 
   async awaitBufferedOps(signal: AbortSignal) {

services/web/frontend/js/features/ide-react/editor/share-js-doc.ts

@@ -23,8 +23,7 @@ const SINGLE_USER_FLUSH_DELAY = 2000
 const MULTI_USER_FLUSH_DELAY = 500
 const INFLIGHT_OP_TIMEOUT = 5000 // Retry sending ops after 5 seconds without an ack
 const WAIT_FOR_CONNECTION_TIMEOUT = 500
-const FATAL_OP_TIMEOUT = 45000
-const RECENT_ACK_LIMIT = 2 * SINGLE_USER_FLUSH_DELAY
+const FATAL_OP_TIMEOUT = 30000
 
 type Update = Record<string, any>
 
@@ -43,9 +42,7 @@ export class ShareJsDoc extends EventEmitter {
   // @ts-ignore
   _doc: Doc
   private editorWatchdogManager: EditorWatchdogManager
-  private lastAcked: number | null = null
-  private pendingOpCreatedAt: number | null = null
-  private inflightOpCreatedAt: number | null = null
+  private lastAcked: Date | null = null
   private queuedMessageTimer: number | null = null
   private queuedMessages: Message[] = []
   private detachEditorWatchdogManager: (() => void) | null = null
@@ -93,19 +90,13 @@ export class ShareJsDoc extends EventEmitter {
     })
     this._doc.setFlushDelay(SINGLE_USER_FLUSH_DELAY)
     this._doc.on('change', (...args: any[]) => {
-      if (!this.pendingOpCreatedAt) {
-        debugConsole.log('set pendingOpCreatedAt', new Date())
-        this.pendingOpCreatedAt = performance.now()
-      }
       return this.trigger('change', ...args)
     })
     this.editorWatchdogManager = new EditorWatchdogManager({
       parent: globalEditorWatchdogManager,
     })
     this._doc.on('acknowledge', () => {
-      this.lastAcked = performance.now() // note time of last ack from server for an op we sent
-      this.inflightOpCreatedAt = null
-      debugConsole.log('unset inflightOpCreatedAt')
+      this.lastAcked = new Date() // note time of last ack from server for an op we sent
       this.editorWatchdogManager.onAck() // keep track of last ack globally
       return this.trigger('acknowledge')
     })
@@ -116,10 +107,6 @@ export class ShareJsDoc extends EventEmitter {
       return this.trigger('remoteop', ...args)
     })
     this._doc.on('flipped_pending_to_inflight', () => {
-      this.inflightOpCreatedAt = this.pendingOpCreatedAt
-      debugConsole.log('set inflightOpCreatedAt from pendingOpCreatedAt')
-      this.pendingOpCreatedAt = null
-      debugConsole.log('unset pendingOpCreatedAt')
       return this.trigger('flipped_pending_to_inflight')
     })
     this._doc.on('saved', () => {
@@ -293,7 +280,7 @@ export class ShareJsDoc extends EventEmitter {
     this.connection.id = this.socket.publicId
     this._doc.autoOpen = false
     this._doc._connectionStateChanged(state)
-    this.lastAcked = null // reset the last ack time when connection changes
+    return (this.lastAcked = null) // reset the last ack time when connection changes
   }
 
   hasBufferedOps() {
@@ -312,14 +299,10 @@ export class ShareJsDoc extends EventEmitter {
     // check if we have received an ack recently (within a factor of two of the single user flush delay)
     return (
       this.lastAcked !== null &&
-      performance.now() - this.lastAcked < RECENT_ACK_LIMIT
+      Date.now() - this.lastAcked.getTime() < 2 * SINGLE_USER_FLUSH_DELAY
     )
   }
 
-  getInflightOpCreatedAt() {
-    return this.inflightOpCreatedAt
-  }
-
   private attachEditorWatchdogManager(editor: EditorFacade) {
     // end-to-end check for edits -> acks, for this very ShareJsdoc
     // This will catch a broken connection and missing UX-blocker for the