mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-06-04 14:49:01 +02:00
Remove unused EventLog (#23419)
GitOrigin-RevId: 25e09466c2a16545436fd9c312431f78e68b3194
This commit is contained in:
@@ -96,7 +96,7 @@ export const EditorManagerProvider: FC = ({ children }) => {
|
||||
const { t } = useTranslation()
|
||||
const ide = useIdeContext()
|
||||
const { projectId } = useIdeReactContext()
|
||||
const { reportError, eventEmitter, eventLog } = useIdeReactContext()
|
||||
const { reportError, eventEmitter } = useIdeReactContext()
|
||||
const { setOutOfSync } = useEditorContext()
|
||||
const { socket, closeConnection, connectionState } = useConnectionContext()
|
||||
const { view, setView } = useLayoutContext()
|
||||
@@ -182,13 +182,7 @@ export const EditorManagerProvider: FC = ({ children }) => {
|
||||
}, [genericModalVisible])
|
||||
|
||||
const [openDocs] = useState(
|
||||
() =>
|
||||
new OpenDocuments(
|
||||
socket,
|
||||
globalEditorWatchdogManager,
|
||||
eventEmitter,
|
||||
eventLog
|
||||
)
|
||||
() => new OpenDocuments(socket, globalEditorWatchdogManager, eventEmitter)
|
||||
)
|
||||
|
||||
const currentDocumentIdStorageKey = `doc.open_id.${projectId}`
|
||||
|
||||
@@ -20,7 +20,6 @@ import { useConnectionContext } from '@/features/ide-react/context/connection-co
|
||||
import { getMockIde } from '@/shared/context/mock/mock-ide'
|
||||
import { populateEditorScope } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
|
||||
import { postJSON } from '@/infrastructure/fetch-json'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import { populateOnlineUsersScope } from '@/features/ide-react/context/online-users-context'
|
||||
import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
|
||||
import getMeta from '@/utils/meta'
|
||||
@@ -30,7 +29,6 @@ const LOADED_AT = new Date()
|
||||
type IdeReactContextValue = {
|
||||
projectId: string
|
||||
eventEmitter: IdeEventEmitter
|
||||
eventLog: EventLog
|
||||
startedFreeTrial: boolean
|
||||
setStartedFreeTrial: React.Dispatch<
|
||||
React.SetStateAction<IdeReactContextValue['startedFreeTrial']>
|
||||
@@ -92,7 +90,6 @@ export const IdeReactProvider: FC = ({ children }) => {
|
||||
const [scopeEventEmitter] = useState(
|
||||
() => new ReactScopeEventEmitter(eventEmitter)
|
||||
)
|
||||
const [eventLog] = useState(() => new EventLog())
|
||||
const [startedFreeTrial, setStartedFreeTrial] = useState(false)
|
||||
const release = getMeta('ol-ExposedSettings')?.sentryRelease ?? null
|
||||
|
||||
@@ -175,21 +172,13 @@ export const IdeReactProvider: FC = ({ children }) => {
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
eventEmitter,
|
||||
eventLog,
|
||||
startedFreeTrial,
|
||||
setStartedFreeTrial,
|
||||
projectId,
|
||||
reportError,
|
||||
projectJoined,
|
||||
}),
|
||||
[
|
||||
eventEmitter,
|
||||
eventLog,
|
||||
projectId,
|
||||
projectJoined,
|
||||
reportError,
|
||||
startedFreeTrial,
|
||||
]
|
||||
[eventEmitter, projectId, projectJoined, reportError, startedFreeTrial]
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -7,7 +7,6 @@ import { debugConsole } from '@/utils/debugging'
|
||||
import { Socket } from '@/features/ide-react/connection/types/socket'
|
||||
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
|
||||
import { EditorFacade } from '@/features/source-editor/extensions/realtime'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import EditorWatchdogManager from '@/features/ide-react/connection/editor-watchdog-manager'
|
||||
import EventEmitter from '@/utils/EventEmitter'
|
||||
import {
|
||||
@@ -25,7 +24,6 @@ import { decodeUtf8 } from '@/utils/decode-utf8'
|
||||
import {
|
||||
ShareJsOperation,
|
||||
TrackChangesIdSeeds,
|
||||
Version,
|
||||
} from '@/features/ide-react/editor/types/document'
|
||||
import { ThreadId } from '../../../../../types/review-panel/review-panel'
|
||||
import getMeta from '@/utils/meta'
|
||||
@@ -113,7 +111,6 @@ export class DocumentContainer extends EventEmitter {
|
||||
readonly socket: Socket,
|
||||
private readonly globalEditorWatchdogManager: EditorWatchdogManager,
|
||||
private readonly ideEventEmitter: IdeEventEmitter,
|
||||
private readonly eventLog: EventLog,
|
||||
private readonly detachDoc: (docId: string, doc: DocumentContainer) => void
|
||||
) {
|
||||
super()
|
||||
@@ -387,18 +384,7 @@ export class DocumentContainer extends EventEmitter {
|
||||
}
|
||||
|
||||
private onUpdateApplied(update: Update) {
|
||||
this.eventLog.pushEvent('received-update', {
|
||||
doc_id: this.doc_id,
|
||||
remote_doc_id: update?.doc,
|
||||
wantToBeJoined: this.wantToBeJoined,
|
||||
update,
|
||||
hasDoc: !!this.doc,
|
||||
})
|
||||
|
||||
if (update?.doc === this.doc_id && this.doc != null) {
|
||||
this.eventLog.pushEvent('received-update:processing', {
|
||||
update,
|
||||
})
|
||||
// FIXME: change this back to processUpdateFromServer when redis fixed
|
||||
this.doc.processUpdateFromServerInOrder(update)
|
||||
|
||||
@@ -419,7 +405,6 @@ export class DocumentContainer extends EventEmitter {
|
||||
|
||||
private onReconnect = () => {
|
||||
debugConsole.log('[onReconnect] reconnected (joined project)')
|
||||
this.eventLog.pushEvent('reconnected:afterJoinProject')
|
||||
|
||||
this.connected = true
|
||||
if (this.wantToBeJoined || this.doc?.hasBufferedOps()) {
|
||||
@@ -449,10 +434,6 @@ export class DocumentContainer extends EventEmitter {
|
||||
|
||||
private joinDoc(callback?: JoinCallback) {
|
||||
if (this.doc) {
|
||||
this.eventLog.pushEvent('joinDoc:existing', {
|
||||
doc_id: this.doc_id,
|
||||
version: this.doc.getVersion(),
|
||||
})
|
||||
return this.socket.emit(
|
||||
'joinDoc',
|
||||
this.doc_id,
|
||||
@@ -471,9 +452,6 @@ export class DocumentContainer extends EventEmitter {
|
||||
}
|
||||
)
|
||||
} else {
|
||||
this.eventLog.pushEvent('joinDoc:new', {
|
||||
doc_id: this.doc_id,
|
||||
})
|
||||
this.socket.emit(
|
||||
'joinDoc',
|
||||
this.doc_id,
|
||||
@@ -484,18 +462,13 @@ export class DocumentContainer extends EventEmitter {
|
||||
return
|
||||
}
|
||||
this.joined = true
|
||||
this.eventLog.pushEvent('joinDoc:inited', {
|
||||
doc_id: this.doc_id,
|
||||
version,
|
||||
})
|
||||
this.doc = new ShareJsDoc(
|
||||
this.doc_id,
|
||||
docLines,
|
||||
version,
|
||||
this.socket,
|
||||
this.globalEditorWatchdogManager,
|
||||
this.ideEventEmitter,
|
||||
this.eventLog
|
||||
this.ideEventEmitter
|
||||
)
|
||||
this.decodeRanges(ranges)
|
||||
this.ranges = new RangesTracker(ranges?.changes, ranges?.comments)
|
||||
@@ -534,9 +507,6 @@ export class DocumentContainer extends EventEmitter {
|
||||
}
|
||||
|
||||
private leaveDoc(callback?: LeaveCallback) {
|
||||
this.eventLog.pushEvent('leaveDoc', {
|
||||
doc_id: this.doc_id,
|
||||
})
|
||||
debugConsole.log('[leaveDoc] Sending leaveDoc request')
|
||||
this.socket.emit('leaveDoc', this.doc_id, error => {
|
||||
if (error) {
|
||||
@@ -577,25 +547,15 @@ export class DocumentContainer extends EventEmitter {
|
||||
this.onError(error, meta)
|
||||
)
|
||||
this.doc.on('externalUpdate', (update: Update) => {
|
||||
this.eventLog.pushEvent('externalUpdate', { doc_id: this.doc_id })
|
||||
return this.trigger('externalUpdate', update)
|
||||
})
|
||||
this.doc.on('remoteop', (...ops: AnyOperation[]) => {
|
||||
this.eventLog.pushEvent('remoteop', { doc_id: this.doc_id })
|
||||
return this.trigger('remoteop', ...ops)
|
||||
})
|
||||
this.doc.on('op:sent', (op: AnyOperation) => {
|
||||
this.eventLog.pushEvent('op:sent', {
|
||||
doc_id: this.doc_id,
|
||||
op,
|
||||
})
|
||||
return this.trigger('op:sent')
|
||||
})
|
||||
this.doc.on('op:acknowledged', (op: AnyOperation) => {
|
||||
this.eventLog.pushEvent('op:acknowledged', {
|
||||
doc_id: this.doc_id,
|
||||
op,
|
||||
})
|
||||
this.ideEventEmitter.emit('ide:opAcknowledged', {
|
||||
doc_id: this.doc_id,
|
||||
op,
|
||||
@@ -603,24 +563,9 @@ export class DocumentContainer extends EventEmitter {
|
||||
return this.trigger('op:acknowledged')
|
||||
})
|
||||
this.doc.on('op:timeout', (op: AnyOperation) => {
|
||||
this.eventLog.pushEvent('op:timeout', {
|
||||
doc_id: this.doc_id,
|
||||
op,
|
||||
})
|
||||
this.trigger('op:timeout')
|
||||
return this.onError(new Error('op timed out'))
|
||||
})
|
||||
this.doc.on(
|
||||
'flush',
|
||||
(inflightOp: AnyOperation, pendingOp: AnyOperation, version: Version) => {
|
||||
return this.eventLog.pushEvent('flush', {
|
||||
doc_id: this.doc_id,
|
||||
inflightOp,
|
||||
pendingOp,
|
||||
v: version,
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
let docChangedTimeout: number | null = null
|
||||
this.doc.on(
|
||||
|
||||
@@ -4,7 +4,6 @@ import { DocumentContainer } from '@/features/ide-react/editor/document-containe
|
||||
import { debugConsole } from '@/utils/debugging'
|
||||
import { Socket } from '@/features/ide-react/connection/types/socket'
|
||||
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import EditorWatchdogManager from '@/features/ide-react/connection/editor-watchdog-manager'
|
||||
|
||||
export class OpenDocuments {
|
||||
@@ -14,8 +13,7 @@ export class OpenDocuments {
|
||||
constructor(
|
||||
private readonly socket: Socket,
|
||||
private readonly globalEditorWatchdogManager: EditorWatchdogManager,
|
||||
private readonly events: IdeEventEmitter,
|
||||
private readonly eventLog: EventLog
|
||||
private readonly events: IdeEventEmitter
|
||||
) {}
|
||||
|
||||
getDocument(docId: string) {
|
||||
@@ -49,7 +47,6 @@ export class OpenDocuments {
|
||||
this.socket,
|
||||
this.globalEditorWatchdogManager,
|
||||
this.events,
|
||||
this.eventLog,
|
||||
this.detachDoc.bind(this)
|
||||
)
|
||||
this.openDocs.set(docId, doc)
|
||||
|
||||
@@ -7,7 +7,6 @@ import { Socket } from '@/features/ide-react/connection/types/socket'
|
||||
import { debugConsole } from '@/utils/debugging'
|
||||
import { decodeUtf8 } from '@/utils/decode-utf8'
|
||||
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import EditorWatchdogManager from '@/features/ide-react/connection/editor-watchdog-manager'
|
||||
import {
|
||||
Message,
|
||||
@@ -55,8 +54,7 @@ export class ShareJsDoc extends EventEmitter {
|
||||
version: number,
|
||||
readonly socket: Socket,
|
||||
private readonly globalEditorWatchdogManager: EditorWatchdogManager,
|
||||
private readonly eventEmitter: IdeEventEmitter,
|
||||
private readonly eventLog: EventLog
|
||||
private readonly eventEmitter: IdeEventEmitter
|
||||
) {
|
||||
super()
|
||||
this.type = 'text'
|
||||
@@ -133,9 +131,6 @@ export class ShareJsDoc extends EventEmitter {
|
||||
if (doc.snapshot.indexOf('\r') === -1) {
|
||||
return
|
||||
}
|
||||
this.eventLog.pushEvent('remove-carriage-return-char', {
|
||||
doc_id: this.doc_id,
|
||||
})
|
||||
let nextPos
|
||||
while ((nextPos = doc.snapshot.indexOf('\r')) !== -1) {
|
||||
debugConsole.log('[ShareJsDoc] remove-carriage-return-char', nextPos)
|
||||
|
||||
@@ -18,7 +18,6 @@ import {
|
||||
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
|
||||
import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
|
||||
import { ConnectionContext } from '@/features/ide-react/context/connection-context'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import { Socket } from '@/features/ide-react/connection/types/socket'
|
||||
import { ConnectionState } from '@/features/ide-react/connection/types/connection-state'
|
||||
import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
|
||||
@@ -214,7 +213,6 @@ const IdeReactProvider: FC = ({ children }) => {
|
||||
const [ideReactContextValue] = useState(() => ({
|
||||
projectId,
|
||||
eventEmitter: new IdeEventEmitter(),
|
||||
eventLog: new EventLog(),
|
||||
startedFreeTrial,
|
||||
setStartedFreeTrial,
|
||||
reportError: () => {},
|
||||
|
||||
@@ -12,7 +12,6 @@ import {
|
||||
import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
|
||||
import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
|
||||
import { ConnectionContext } from '@/features/ide-react/context/connection-context'
|
||||
import { EventLog } from '@/features/ide-react/editor/event-log'
|
||||
import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
|
||||
|
||||
// these constants can be imported in tests instead of
|
||||
@@ -179,7 +178,6 @@ const IdeReactProvider = ({ children }) => {
|
||||
const [ideReactContextValue] = useState(() => ({
|
||||
projectId: PROJECT_ID,
|
||||
eventEmitter: new IdeEventEmitter(),
|
||||
eventLog: new EventLog(),
|
||||
startedFreeTrial,
|
||||
setStartedFreeTrial,
|
||||
reportError: () => {},
|
||||
|
||||
Reference in New Issue
Block a user