| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110 |
- import nock from 'nock'
- import { expect } from 'chai'
- import assert from 'node:assert'
- 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'
- import { db, ObjectId } from '../../../app/js/mongodb.js'
- 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()
- await db.projects.insertOne({ _id: new ObjectId(this.project_id) })
- 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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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 beforeResync = new Date()
- 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}/legacy_changes should have been called`
- )
- const project = await db.projects.findOne({
- _id: new ObjectId(this.project_id),
- })
- assert(
- project.overleaf.history.lastResyncedAt > beforeResync,
- 'lastResyncedAt should have been updated when resync finished'
- )
- })
- 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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_changes should have been called`
- )
- })
- })
- describe("when a doc's blob content is corrupted", function () {
- beforeEach(function () {
- MockHistoryStore()
- .get(`/api/projects/${historyId}/latest/history`)
- .reply(200, {
- chunk: {
- history: {
- snapshot: {
- files: {
- 'main.tex': {
- hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
- stringLength: 10,
- },
- },
- },
- changes: [
- {
- operations: [
- {
- pathname: 'main.tex',
- // Retain 10 chars, but blob content is only 3 chars.
- // This simulates a corrupted history where the
- // operation doesn't match the blob content, causing
- // an ApplyError when the file is loaded eagerly.
- textOperation: [10],
- },
- ],
- timestamp: '2026-01-01T00:00:00.000Z',
- authors: [],
- v2Authors: [],
- },
- ],
- },
- startVersion: 0,
- },
- })
- // Blob returns valid content, but it doesn't match the operation
- MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(200, 'a\nb')
- })
- it('should remove and re-add the file during hard resync', async function () {
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- // The corrupted file is removed and re-added as two changes
- expect(body).to.have.length(2)
- // First change: remove the corrupted file
- expect(body[0].operations).to.have.length(1)
- expect(body[0].operations[0]).to.deep.include({
- pathname: 'main.tex',
- newPathname: '',
- })
- // Second change: re-add with new blob from docstore
- expect(body[1].operations).to.have.length(1)
- expect(body[1].operations[0].pathname).to.equal('main.tex')
- expect(body[1].operations[0].file).to.have.property('hash')
- return true
- })
- .query({ end_version: 1 })
- .reply(204)
- // The re-added file needs its blob to be stored
- MockHistoryStore()
- .put(new RegExp(`/api/projects/${historyId}/blobs/`))
- .reply(201)
- await ProjectHistoryClient.hardResyncHistory(this.project_id, {
- recoverCorruptedFiles: true,
- })
- 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: 'hello world',
- },
- 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}/legacy_changes should have been called`
- )
- sinon.assert.calledWithMatch(
- loggerWarn,
- sinon.match({
- projectId: this.project_id,
- pathname: 'main.tex',
- }),
- 'failed to load file from history during hard resync, removing and re-adding from docstore'
- )
- })
- it('should restore comments and tracked changes from docstore after hard resync re-add', async function () {
- const commentId = 'comment-id-1'
- const addFile = MockHistoryStore()
- .post(`/api/projects/${historyId}/legacy_changes`, body => {
- // Expect three changes: remove, re-add, then comment sync
- expect(body).to.have.length(3)
- // First change: remove the corrupted file
- expect(body[0].operations).to.have.length(1)
- expect(body[0].operations[0]).to.deep.include({
- pathname: 'main.tex',
- newPathname: '',
- })
- // Second change: re-add with new blob from docstore
- expect(body[1].operations).to.have.length(1)
- expect(body[1].operations[0].pathname).to.equal('main.tex')
- expect(body[1].operations[0].file).to.have.property('hash')
- // Third change: restore comment from docstore ranges
- expect(body[2].operations).to.have.length(1)
- expect(body[2].operations[0]).to.deep.include({
- pathname: 'main.tex',
- commentId,
- })
- expect(body[2].operations[0].ranges).to.deep.equal([
- { pos: 0, length: 5 },
- ])
- return true
- })
- .query({ end_version: 1 })
- .reply(204)
- // The re-added file needs its blob to be stored
- MockHistoryStore()
- .put(new RegExp(`/api/projects/${historyId}/blobs/`))
- .reply(201)
- await ProjectHistoryClient.hardResyncHistory(this.project_id, {
- recoverCorruptedFiles: true,
- })
- 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: 'hello world',
- ranges: {
- comments: [
- {
- id: commentId,
- op: {
- c: 'hello',
- p: 0,
- hpos: 0,
- hlen: 5,
- t: commentId,
- },
- meta: {
- user_id: 'user-id',
- ts: this.timestamp,
- },
- },
- ],
- changes: [],
- },
- },
- 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}/legacy_changes should have been called`
- )
- })
- it('should propagate the error during soft resync', async function () {
- 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: 'hello world',
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- // Soft resync should fail — the error is propagated so it can be
- // retried later (the blob store may be temporarily unavailable).
- const { statusCode } = await ProjectHistoryClient.flushProject(
- this.project_id,
- { allowErrors: true }
- )
- expect(statusCode).to.equal(500)
- })
- it('should propagate the error during hard resync without recoverCorruptedFiles flag', async function () {
- await ProjectHistoryClient.hardResyncHistory(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: 'hello world',
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- // Hard resync without the recoverCorruptedFiles flag should not
- // recover — recovery is too destructive to be the default behaviour.
- const { statusCode } = await ProjectHistoryClient.flushProject(
- this.project_id,
- { allowErrors: true }
- )
- expect(statusCode).to.equal(500)
- })
- })
- describe("when a doc's blob store is temporarily unavailable", 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,
- },
- })
- // Blob returns a 500 simulating a transient server error
- MockHistoryStore()
- .get(
- `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
- )
- .reply(500, 'Internal Server Error')
- })
- it('should propagate transient errors even during hard resync', async function () {
- await ProjectHistoryClient.hardResyncHistory(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: 'hello world',
- },
- doc: this.doc_id,
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, update2)
- // Even hard resync should not recover from transient errors (5xx).
- // The error should propagate so it can be retried.
- const { statusCode } = await ProjectHistoryClient.flushProject(
- this.project_id,
- { allowErrors: true }
- )
- expect(statusCode).to.equal(500)
- })
- })
- 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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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}/legacy_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'
- )
- })
- })
- describe('stuck sync state (missing resyncDocContent updates)', 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 get stuck when resyncDocContent update is missing', async function () {
- // Step 1: Start a resync
- await ProjectHistoryClient.resyncHistory(this.project_id)
- // Step 2: Push resyncProjectStructure update (lists docs to sync)
- // but do NOT push the corresponding resyncDocContent update
- const structureUpdate = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(
- this.project_id,
- structureUpdate
- )
- // Step 3: Flush — processes structure update, adds /main.tex to resyncDocContents
- // This succeeds (204) but leaves sync in an incomplete state
- await ProjectHistoryClient.flushProject(this.project_id)
- // Step 4: Verify the sync state is stuck
- const syncState = await ProjectHistoryClient.getSyncState(
- this.project_id
- )
- expect(syncState).to.not.be.null
- expect(syncState.resyncProjectStructure).to.equal(false)
- expect(syncState.resyncDocContents).to.deep.equal(['/main.tex'])
- expect(syncState.resyncPendingSince).to.be.a('date')
- // Sync thinks it's ongoing because resyncDocContents is not empty
- // Step 5: Push a normal text update (simulating a user edit)
- const textUpdate = {
- doc: this.doc_id,
- op: [{ p: 3, i: '\nc' }],
- v: 1,
- meta: {
- ts: this.timestamp,
- pathname: '/main.tex',
- doc_length: 3,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(this.project_id, textUpdate)
- // Step 6: Flush again — the text update should be silently skipped
- // because the doc is in resyncDocContents (sync "ongoing")
- await ProjectHistoryClient.flushProject(this.project_id)
- // Step 7: Verify the sync state is STILL stuck (text update was skipped)
- const syncStateAfter = await ProjectHistoryClient.getSyncState(
- this.project_id
- )
- expect(syncStateAfter.resyncProjectStructure).to.equal(false)
- expect(syncStateAfter.resyncDocContents).to.deep.equal(['/main.tex'])
- // Step 7b: Verify resync-pending reports ongoing but not yet stuck
- const pending = await ProjectHistoryClient.getResyncPending(
- this.project_id
- )
- expect(pending.resyncPending).to.equal(true)
- expect(pending.syncStuck).to.equal(false)
- // Step 8: Verify a normal resync FAILS because sync is "ongoing"
- try {
- await fetchNothing(
- `http://127.0.0.1:3054/project/${this.project_id}/resync`,
- {
- method: 'POST',
- json: { origin: { kind: 'test-origin' } },
- }
- )
- assert.fail('resync should have failed')
- } catch (error) {
- if (error instanceof RequestFailedError) {
- expect(error.response.status).to.equal(500)
- } else {
- throw error
- }
- }
- })
- it('should recover with a hard resync (force=true)', async function () {
- // Set up the stuck state (same as above)
- await ProjectHistoryClient.resyncHistory(this.project_id)
- const structureUpdate = {
- projectHistoryId: historyId,
- resyncProjectStructure: {
- docs: [{ path: '/main.tex' }],
- files: [],
- },
- meta: {
- ts: this.timestamp,
- },
- }
- await ProjectHistoryClient.pushRawUpdate(
- this.project_id,
- structureUpdate
- )
- await ProjectHistoryClient.flushProject(this.project_id)
- // Verify stuck
- const syncState = await ProjectHistoryClient.getSyncState(
- this.project_id
- )
- expect(syncState.resyncDocContents).to.deep.equal(['/main.tex'])
- // Mock the web resync endpoint for the hard resync
- MockWeb()
- .post(`/project/${this.project_id}/history/resync`)
- .reply(204)
- // Hard resync should clear the stuck state and succeed
- const response = await fetchNothing(
- `http://127.0.0.1:3054/project/${this.project_id}/resync?force=true`,
- {
- method: 'POST',
- json: { origin: { kind: 'test-origin' } },
- }
- )
- expect(response.status).to.equal(204)
- // After hard resync, sync state should be cleared or reset
- const syncStateAfter = await ProjectHistoryClient.getSyncState(
- this.project_id
- )
- // Hard resync clears and restarts — at this point the new resync
- // should be in progress (resyncProjectStructure = true) or cleared
- // depending on whether web sent updates
- if (syncStateAfter) {
- expect(syncStateAfter.resyncProjectStructure).to.equal(true)
- }
- })
- it('should auto-recover when stuck (null resyncPendingSince)', async function () {
- // Inject a stuck sync state: ongoing but no resyncPendingSince
- // (legacy state from before the timestamp field was added)
- await ProjectHistoryClient.injectStuckSyncState(this.project_id, [
- '/main.tex',
- ])
- // Verify the state is recognised as stuck
- const pending = await ProjectHistoryClient.getResyncPending(
- this.project_id
- )
- expect(pending.resyncPending).to.equal(true)
- expect(pending.syncStuck).to.equal(true)
- // Mock the web callback that requestResync triggers
- MockWeb()
- .post(`/project/${this.project_id}/history/resync`)
- .reply(204)
- // A plain resync (no force) should detect stuck, clear, and restart
- await ProjectHistoryClient.resyncHistory(this.project_id)
- // stuckClearCount incremented and a new structure sync started
- const syncState = await ProjectHistoryClient.getSyncState(
- this.project_id
- )
- expect(syncState.stuckClearCount).to.equal(1)
- expect(syncState.resyncProjectStructure).to.equal(true)
- expect(syncState.lastStuckDocPaths).to.deep.equal(['/main.tex'])
- })
- })
- })
- })
- // 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())}`
- )
- })
- })
- })
|