| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553 |
- import nock from 'nock'
- import { expect } from 'chai'
- import assert from 'node:assert'
- import mongodb from 'mongodb-legacy'
- import logger from '@overleaf/logger'
- import Settings from '@overleaf/settings'
- import {
- Snapshot,
- File,
- FileMap,
- StringFileData,
- Change,
- } from 'overleaf-editor-core'
- import * as ProjectHistoryClient from './helpers/ProjectHistoryClient.js'
- import * as ProjectHistoryApp from './helpers/ProjectHistoryApp.js'
- import sinon from 'sinon'
- import { getFailure } from './helpers/ProjectHistoryClient.js'
- import { fetchNothing, RequestFailedError } from '@overleaf/fetch-utils'
- import { _getBlobHashFromString } from '../../../app/js/HashManager.js'
- const { ObjectId } = mongodb
- const EMPTY_FILE_HASH = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
- const MockHistoryStore = () => nock('http://127.0.0.1:3100')
- const MockFileStore = () => nock('http://127.0.0.1:3009')
- const MockWeb = () => nock('http://127.0.0.1:3000')
- describe('Syncing with web and doc-updater', function () {
- const historyId = new ObjectId().toString()
- let loggerWarn, loggerError
- beforeEach(function () {
- loggerWarn = sinon.spy(logger, 'warn')
- loggerError = sinon.spy(logger, 'error')
- })
- afterEach(function () {
- loggerWarn.restore()
- loggerError.restore()
- })
- beforeEach(async function () {
- this.timestamp = new Date()
- await ProjectHistoryApp.ensureRunning()
- this.project_id = new ObjectId().toString()
- this.doc_id = new ObjectId().toString()
- this.file_id = new ObjectId().toString()
- MockHistoryStore().post('/api/projects').reply(200, {
- projectId: historyId,
- })
- MockWeb()
- .get(`/project/${this.project_id}/details`)
- .reply(200, {
- name: 'Test Project',
- overleaf: {
- history: {
- id: historyId,
- },
- },
- })
- await ProjectHistoryClient.initializeProject(historyId)
- })
- afterEach(function () {
- nock.cleanAll()
- })
- describe('resyncing project history', function () {
- describe('without project-history enabled', function () {
- beforeEach(function () {
- MockWeb().post(`/project/${this.project_id}/history/resync`).reply(404)
- })
- it('404s if project-history is not enabled', async function () {
- try {
- await fetchNothing(
- `http://127.0.0.1:3054/project/${this.project_id}/resync`,
- {
- method: 'POST',
- }
- )
- } catch (error) {
- if (error instanceof RequestFailedError) {
- expect(error.response.status).to.equal(404)
- } else {
- throw error
- }
- }
- })
- })
- describe('with project-history enabled', function () {
- beforeEach(function () {
- MockWeb().post(`/project/${this.project_id}/history/resync`).reply(204)
- })
- describe('when a doc is missing', function () {
- it('should send add doc updates to the history store', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedDoc: { hash: EMPTY_FILE_HASH, stringLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- MockHistoryStore()
- .get(`/api/projects/${historyId}/blobs/${EMPTY_FILE_HASH}`)
- .reply(200, '')
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${EMPTY_FILE_HASH}`, '')
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- file: {
- hash: EMPTY_FILE_HASH,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [
- { path: '/main.tex', doc: this.doc_id },
- { path: '/persistedDoc', doc: 'other-doc-id' },
- ],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- })
- describe('when a file is missing', function () {
- it('should send add file updates to the history store', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(404)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- url: `http://127.0.0.1:3009/project/${this.project_id}/file/${this.file_id}`,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(!loggerWarn.called, 'no warning logged on 404')
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should skip HEAD on blob without hash', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/undefined`)
- .reply(500)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- url: `http://127.0.0.1:3009/project/${this.project_id}/file/${this.file_id}`,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(!loggerWarn.called, 'no warning logged on 404')
- assert(
- !headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should record error when checking blob fails with 500', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(500)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- url: `http://127.0.0.1:3009/project/${this.project_id}/file/${this.file_id}`,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- const res = await ProjectHistoryClient.flushProject(this.project_id, {
- allowErrors: true,
- })
- assert(res.statusCode === 500, 'resync should have failed')
- assert(
- loggerError.calledWithMatch(
- sinon.match.any,
- 'error checking whether blob exists'
- ),
- 'error logged on 500'
- )
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- !createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- !addFile.isDone(),
- `/api/projects/${historyId}/changes should have been skipped`
- )
- })
- it('should skip blob write when blob exists', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(200)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- url: `http://127.0.0.1:3009/project/${this.project_id}/file/${this.file_id}`,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(!loggerWarn.called, 'no warning logged on 404')
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- !createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should add file w/o url', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(200)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- createdBlob: true,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(!loggerWarn.called, 'no warning logged on 404')
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- !createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- describe('with filestore disabled', function () {
- before(function () {
- Settings.apis.filestore.enabled = false
- })
- after(function () {
- Settings.apis.filestore.enabled = true
- })
- it('should record error when blob is missing', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- persistedFile: { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .times(3) // three retries
- .reply(404)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- url: `http://127.0.0.1:3009/project/${this.project_id}/file/${this.file_id}`,
- },
- { path: '/persistedFile' },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- const res = await ProjectHistoryClient.flushProject(
- this.project_id,
- {
- allowErrors: true,
- }
- )
- assert(res.statusCode === 500, 'resync should have failed')
- assert(
- loggerError.calledWithMatch(
- sinon.match.any,
- 'blocking filestore read'
- ),
- 'error logged on 500'
- )
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- !createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- !addFile.isDone(),
- `/api/projects/${historyId}/changes should have been skipped`
- )
- })
- })
- })
- describe('when a file hash mismatches', function () {
- it('should remove and re-add file w/o url', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'test.png': { hash: EMPTY_FILE_HASH, byteLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const fileContents = Buffer.from([1, 2, 3])
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockFileStore()
- .get(`/project/${this.project_id}/file/${this.file_id}`)
- .reply(200, fileContents)
- const headBlob = MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(200)
- const createBlob = MockHistoryStore()
- .put(`/api/projects/${historyId}/blobs/${fileHash}`, fileContents)
- .reply(201)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- newPathname: '',
- },
- ],
- origin: { kind: 'test-origin' },
- },
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- createdBlob: true,
- },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(!loggerWarn.called, 'no warning logged on 404')
- assert(
- headBlob.isDone(),
- 'HEAD /api/projects/:historyId/blobs/:hash should have been called'
- )
- assert(
- !createBlob.isDone(),
- '/api/projects/:historyId/blobs/:hash should have been skipped'
- )
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- })
- describe("when a file exists which shouldn't", function () {
- it('should send remove file updates to the history store', async function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- docToKeep: { hash: EMPTY_FILE_HASH, stringLength: 0 },
- docToDelete: { hash: EMPTY_FILE_HASH, stringLength: 0 },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- MockHistoryStore()
- .get(`/api/projects/${historyId}/blobs/${EMPTY_FILE_HASH}`)
- .reply(200, '')
- .get(`/api/projects/${historyId}/blobs/${EMPTY_FILE_HASH}`)
- .reply(200, '') // blob is requested once for each file
- const deleteFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'docToDelete',
- newPathname: '',
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: 'docToKeep' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- deleteFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- })
- describe("when a doc's contents is not up to date", function () {
- beforeEach(function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
- stringLength: 3,
- },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(200, 'a\nb')
- })
- it('should send test updates to the history store', async function () {
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [3, '\nc'],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb\nc',
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should strip non-BMP characters in updates before sending to the history store', async function () {
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [3, '\n\uFFFD\uFFFDc'],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb\n\uD800\uDC00c',
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should add comments in the history store', async function () {
- const commentId = 'comment-id'
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- ranges: [{ pos: 1, length: 10 }],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- ranges: {
- comments: [
- {
- id: commentId,
- op: {
- c: 'a',
- p: 0,
- hpos: 1,
- hlen: 10,
- t: commentId,
- },
- meta: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should add comments in the history store (history-ot)', async function () {
- const commentId = 'comment-id'
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- ranges: [{ pos: 1, length: 10 }],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- comments: [
- {
- id: commentId,
- ranges: [
- {
- pos: 1,
- length: 10,
- },
- ],
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should add tracked changes in the history store', async function () {
- const fixTrackedChange = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- 1,
- ],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- ranges: {
- changes: [
- {
- id: 'id1',
- op: {
- d: 'a',
- p: 0,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- {
- id: 'id2',
- op: {
- i: '\n',
- p: 0,
- hpos: 1,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- fixTrackedChange.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should add tracked changes in the history store (history-ot)', async function () {
- const fixTrackedChange = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- 1,
- ],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 1, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- fixTrackedChange.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- })
- describe("when a doc's ranges are out of sync", function () {
- const commentId = 'comment-id'
- beforeEach(function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
- rangesHash: '0a207c060e61f3b88eaee0a8cd0696f46fb155ec',
- stringLength: 3,
- },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(200, 'a\nb')
- MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155ec`
- )
- .reply(
- 200,
- JSON.stringify({
- comments: [{ id: commentId, ranges: [{ pos: 0, length: 3 }] }],
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 2, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- })
- )
- })
- it('should fix comments in the history store', async function () {
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- ranges: [{ pos: 1, length: 2 }],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- ranges: {
- comments: [
- {
- id: commentId,
- op: {
- c: 'a',
- p: 0,
- hpos: 1,
- hlen: 2,
- t: commentId,
- },
- meta: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- changes: [
- {
- id: 'id1',
- op: {
- d: 'a',
- p: 0,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- {
- id: 'id2',
- op: {
- i: '\n',
- p: 1,
- hpos: 2,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix resolved state for comments in the history store', async function () {
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- resolved: true,
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- resolvedCommentIds: [commentId],
- ranges: {
- comments: [
- {
- id: commentId,
- op: {
- c: 'a',
- p: 0,
- hpos: 0,
- hlen: 3,
- t: commentId,
- },
- meta: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- changes: [
- {
- id: 'id1',
- op: {
- d: 'a',
- p: 0,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- {
- id: 'id2',
- op: {
- i: '\n',
- p: 1,
- hpos: 2,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix comments in the history store (history-ot)', async function () {
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- ranges: [{ pos: 1, length: 2 }],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- comments: [
- {
- id: commentId,
- ranges: [
- {
- pos: 1,
- length: 2,
- },
- ],
- },
- ],
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 2, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix resolved state for comments in the history store (history-ot)', async function () {
- const addComment = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- resolved: true,
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- comments: [
- {
- id: commentId,
- ranges: [
- {
- pos: 0,
- length: 3,
- },
- ],
- resolved: true,
- },
- ],
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 2, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- addComment.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix tracked changes in the history store', async function () {
- const fixTrackedChange = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [
- 1,
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- {
- r: 1,
- tracking: {
- type: 'none',
- },
- },
- ],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- ranges: {
- comments: [
- {
- id: commentId,
- op: {
- c: 'a',
- p: 0,
- hpos: 0,
- hlen: 3,
- t: commentId,
- },
- meta: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- changes: [
- {
- id: 'id1',
- op: {
- d: 'a',
- p: 0,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- {
- id: 'id2',
- op: {
- i: '\n',
- p: 0,
- hpos: 1,
- },
- metadata: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- fixTrackedChange.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix tracked changes in the history store (history-ot)', async function () {
- const fixTrackedChange = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [
- 1,
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- {
- r: 1,
- tracking: {
- type: 'none',
- },
- },
- ],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- comments: [
- {
- id: commentId,
- ranges: [
- {
- pos: 0,
- length: 3,
- },
- ],
- },
- ],
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 1, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- fixTrackedChange.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- it('should fix both comments and tracked changes in the history store (history-ot)', async function () {
- const fixTrackedChange = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- // not merged due to comment operation using history-ot and tracked-changes operation using sharejs ot
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- commentId,
- ranges: [{ pos: 1, length: 2 }],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'main.tex',
- textOperation: [
- 1,
- {
- r: 1,
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- {
- r: 1,
- tracking: {
- type: 'none',
- },
- },
- ],
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update1 = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update1)
- const update2 = {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: 'a\nb',
- historyOTRanges: {
- comments: [
- {
- id: commentId,
- ranges: [
- {
- pos: 1,
- length: 2,
- },
- ],
- },
- ],
- trackedChanges: [
- {
- range: { pos: 0, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'delete',
- userId: 'user-id',
- },
- },
- {
- range: { pos: 1, length: 1 },
- tracking: {
- ts: this.timestamp.toJSON(),
- type: 'insert',
- userId: 'user-id',
- },
- },
- ],
- },
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- await ProjectHistoryClient.flushProject(this.project_id)
- assert(
- fixTrackedChange.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- })
- })
- describe('resyncProjectStructureOnly', function () {
- it('should handle structure only updates', async function () {
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
- stringLength: 3,
- },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const docContentRequest = MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(200, 'a\nb')
- MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(200)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- expect(body).to.deep.equal([
- {
- v2Authors: [],
- authors: [],
- timestamp: this.timestamp.toJSON(),
- operations: [
- {
- pathname: 'test.png',
- file: {
- hash: fileHash,
- },
- },
- ],
- origin: { kind: 'test-origin' },
- },
- ])
- return true
- })
- .query({ end_version: 0 })
- .reply(204)
- // allow a 2nd resync
- MockWeb()
- .post(`/project/${this.project_id}/history/resync`)
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructureOnly: true,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- createdBlob: true,
- },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- await ProjectHistoryClient.flushProject(this.project_id)
- // fails when previous resync did not finish
- await ProjectHistoryClient.resyncHistory(this.project_id)
- assert(
- addFile.isDone(),
- `/api/projects/${historyId}/changes should have been called`
- )
- assert(
- !docContentRequest.isDone(),
- 'should not have requested doc content'
- )
- })
- it('should reject partial resync on docs', async function () {
- const fileHash = 'aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74'
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
- stringLength: 3,
- },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- const docContentRequest = MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(200, 'a\nb')
- MockHistoryStore()
- .head(`/api/projects/${historyId}/blobs/${fileHash}`)
- .reply(200)
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`)
- .query({ end_version: 0 })
- .reply(204)
- // allow a 2nd resync
- MockWeb()
- .post(`/project/${this.project_id}/history/resync`)
- .reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const update = {
- projectHistoryId: historyId,
- resyncProjectStructureOnly: true,
- resyncProjectStructure: {
- docs: [{ path: '/main-renamed.tex' }],
- files: [
- {
- file: this.file_id,
- path: '/test.png',
- _hash: fileHash,
- createdBlob: true,
- },
- ],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update)
- const res = await ProjectHistoryClient.flushProject(this.project_id, {
- allowErrors: true,
- })
- expect(res.statusCode).to.equal(500)
- expect(loggerError).to.have.been.calledWith(
- sinon.match({
- err: {
- name: 'NeedFullProjectStructureResyncError',
- message: 'aborting partial resync: touched doc',
- },
- })
- )
- const failure = await new Promise((resolve, reject) => {
- getFailure(this.project_id, (err, failure) => {
- if (err) return reject(err)
- resolve(failure)
- })
- })
- expect(failure).to.include({
- error:
- 'NeedFullProjectStructureResyncError: aborting partial resync: touched doc',
- })
- // fails when previous resync did not finish
- await ProjectHistoryClient.resyncHistory(this.project_id)
- assert(!addFile.isDone(), 'should not have persisted changes')
- assert(
- !docContentRequest.isDone(),
- 'should not have requested doc content'
- )
- })
- })
- })
- })
- // Regression: UpdateCompressor.compressUpdates optimizes a delete+insert
- // at the same position by diffing the two strings and retaining common
- // substrings. The TC retain ops are computed by the SyncManager based on
- // the original (unoptimized) content diff. When the optimized ops retain
- // characters that the original diff deleted, tracked changes on those
- // characters survive — but the TC retains don't clear them, producing a
- // ghost tracked change.
- describe('resync with tracked changes overlapping content diff', function () {
- const TIMESTAMP = '2025-01-01T00:00:00.000Z'
- const persisted = {
- content: 'lblcdhqcmihkrvzlifscqmwytt\n\ndgakoxboqpzdbbjtom',
- trackedChanges: [
- {
- range: { pos: 2, length: 3 },
- tracking: { type: 'insert', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 12, length: 4 },
- tracking: { type: 'delete', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 26, length: 3 },
- tracking: { type: 'delete', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 32, length: 5 },
- tracking: { type: 'delete', userId: 'user-2', ts: TIMESTAMP },
- },
- ],
- }
- const expected = {
- content: 'lblchfjaqdhqcmihkrvzliftt\ndoqpzdbom',
- trackedChanges: [
- {
- range: { pos: 0, length: 4 },
- tracking: { type: 'insert', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 11, length: 1 },
- tracking: { type: 'delete', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 17, length: 5 },
- tracking: { type: 'delete', userId: 'user-2', ts: TIMESTAMP },
- },
- {
- range: { pos: 22, length: 3 },
- tracking: { type: 'insert', userId: 'user-1', ts: TIMESTAMP },
- },
- {
- range: { pos: 26, length: 5 },
- tracking: { type: 'delete', userId: 'user-1', ts: TIMESTAMP },
- },
- ],
- }
- it('should not leave ghost tracked changes after resync', async function () {
- const rangesBlob = JSON.stringify({
- comments: [],
- trackedChanges: persisted.trackedChanges,
- })
- const contentHash = _getBlobHashFromString(persisted.content)
- const rangesHash = _getBlobHashFromString(rangesBlob)
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: contentHash,
- stringLength: persisted.content.length,
- rangesHash,
- },
- },
- },
- changes: [],
- },
- startVersion: 0,
- },
- })
- MockHistoryStore()
- .get(`/api/projects/${historyId}/blobs/${contentHash}`)
- .reply(200, persisted.content)
- MockHistoryStore()
- .get(`/api/projects/${historyId}/blobs/${rangesHash}`)
- .reply(200, rangesBlob)
- MockHistoryStore()
- .put(/\/api\/projects\/[^/]+\/blobs\/[0-9a-f]+/)
- .optionally()
- .reply(201)
- const allCapturedChanges = []
- MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- allCapturedChanges.push(...body)
- return true
- })
- .query(true)
- .times(5)
- .optionally()
- .reply(204)
- MockWeb().post(`/project/${this.project_id}/history/resync`).reply(204)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- await ProjectHistoryClient.pushRawUpdate(this.project_id, {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: { ts: this.timestamp },
- })
- await ProjectHistoryClient.pushRawUpdate(this.project_id, {
- path: '/main.tex',
- projectHistoryId: historyId,
- resyncDocContent: {
- content: expected.content,
- historyOTRanges: {
- comments: [],
- trackedChanges: expected.trackedChanges,
- },
- },
- doc: this.doc_id,
- meta: { ts: this.timestamp },
- })
- await ProjectHistoryClient.flushProject(this.project_id)
- const fileData = new StringFileData(
- persisted.content,
- [],
- persisted.trackedChanges
- )
- const snapshot = new Snapshot(
- new FileMap({ 'main.tex': new File(fileData) })
- )
- for (const rawChange of allCapturedChanges) {
- Change.fromRaw(rawChange).applyTo(snapshot)
- }
- const file = snapshot.getFile('main.tex')
- assert.strictEqual(file.getContent(), expected.content, 'content')
- assert.deepStrictEqual(
- file.getTrackedChanges().toRaw(),
- expected.trackedChanges,
- `TC mismatch.\n` +
- ` expected: ${JSON.stringify(expected.trackedChanges)}\n` +
- ` actual: ${JSON.stringify(file.getTrackedChanges().toRaw())}`
- )
- })
- })
- })
|