[history-ot] initial implementation of using doc-level history-ot (#25054)

* [history-v1-ot] initial implementation of using doc-level history-v1-ot

* [web] fix advancing of the otMigrationStage

Use 'nextStage' for the user provided, desired stage when advancing.

Co-authored-by: Brian Gough <brian.gough@overleaf.com>

* [document-updater] document size check in editor-core

* [history-ot] rename history-v1-ot to history-ot and add types

* [history-ot] apply review feedback

- remove extra !!
- merge variable assignment when processing diff-match-match output
- add helper function for getting docstore lines view of StringFileData

Co-authored-by: Alf Eaton <alf.eaton@overleaf.com>

* Revert "[document-updater] add safe rollback point for history-ot (#25283)"

This reverts commit d7230dd14a379a27d2c6ab03a006463a18979d06

Signed-off-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

---------

Signed-off-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
Co-authored-by: Brian Gough <brian.gough@overleaf.com>
Co-authored-by: Alf Eaton <alf.eaton@overleaf.com>
GitOrigin-RevId: 89c497782adb0427635d50d02263d6f535b12481
This commit is contained in:
Jakob Ackermann
2025-05-08 08:05:44 +00:00
committed by Copybot
co-authored by Alf Eaton Brian Gough
parent 4d93187e58
commit e8b5ee2ff9
48 changed files with 1828 additions and 223 deletions
@@ -2,7 +2,7 @@
// Migrated from services/web/frontend/js/ide/editor/Document.js
import RangesTracker from '@overleaf/ranges-tracker'
import { ShareJsDoc } from './share-js-doc'
import { OTType, ShareJsDoc } from './share-js-doc'
import { debugConsole } from '@/utils/debugging'
import { Socket } from '@/features/ide-react/connection/types/socket'
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
@@ -28,6 +28,7 @@ import {
} from '@/features/ide-react/editor/types/document'
import { ThreadId } from '../../../../../types/review-panel/review-panel'
import getMeta from '@/utils/meta'
import OError from '@overleaf/o-error'
const MAX_PENDING_OP_SIZE = 64
@@ -447,16 +448,36 @@ export class DocumentContainer extends EventEmitter {
'joinDoc',
this.doc_id,
this.doc.getVersion(),
{ encodeRanges: true, age: this.doc.getTimeSinceLastServerActivity() },
(error, docLines, version, updates, ranges) => {
{
encodeRanges: true,
age: this.doc.getTimeSinceLastServerActivity(),
supportsHistoryV1OT: true,
},
(
error,
docLines,
version,
updates,
ranges,
type = 'sharejs-text-ot'
) => {
if (error) {
callback?.(error)
return
}
this.joined = true
this.doc?.catchUp(updates)
this.decodeRanges(ranges)
this.catchUpRanges(ranges?.changes, ranges?.comments)
if (this.doc?.getType() !== type) {
// TODO(24596): page reload after checking for pending ops?
throw new OError('ot type mismatch', {
got: type,
want: this.doc?.getType(),
})
}
if (type === 'sharejs-text-ot') {
this.decodeRanges(ranges)
this.catchUpRanges(ranges?.changes, ranges?.comments)
}
callback?.()
}
)
@@ -464,8 +485,18 @@ export class DocumentContainer extends EventEmitter {
this.socket.emit(
'joinDoc',
this.doc_id,
{ encodeRanges: true },
(error, docLines, version, updates, ranges) => {
{
encodeRanges: true,
supportsHistoryV1OT: true,
},
(
error,
docLines,
version,
updates,
ranges,
type: OTType = 'sharejs-text-ot'
) => {
if (error) {
callback?.(error)
return
@@ -477,9 +508,12 @@ export class DocumentContainer extends EventEmitter {
version,
this.socket,
this.globalEditorWatchdogManager,
this.ideEventEmitter
this.ideEventEmitter,
type
)
this.decodeRanges(ranges)
if (type === 'sharejs-text-ot') {
this.decodeRanges(ranges)
}
this.ranges = new RangesTracker(ranges?.changes, ranges?.comments)
this.bindToShareJsDocEvents()
callback?.()
@@ -580,7 +614,9 @@ export class DocumentContainer extends EventEmitter {
this.doc.on(
'change',
(ops: AnyOperation[], oldSnapshot: any, msg: Message) => {
this.applyOpsToRanges(ops, msg)
if (this.getType() === 'sharejs-text-ot') {
this.applyOpsToRanges(ops, msg)
}
if (docChangedTimeout) {
window.clearTimeout(docChangedTimeout)
}