github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #20552 from overleaf/ac-update-node-fetch-2

Browse source 
Reapply "Upgrade node-fetch to 2.7.0", Fix fetch-utils tests

GitOrigin-RevId: b42a2d2c50ce73f474e39755845e4df065f30b48
This commit is contained in:
Antoine Clausse 2024-09-30 11:49:47 +02:00 committed by Copybot
parent 9997c4874f
commit 6c2cf20125
11 changed files with 107 additions and 409 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/fetch-utils/package.json
View file

@ -27,7 +27,7 @@
"dependencies": { "dependencies": {
"@overleaf/o-error": "*", "@overleaf/o-error": "*",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"node-fetch": "^2.6.11", "node-fetch": "^2.7.0",
"selfsigned": "^2.4.1" "selfsigned": "^2.4.1"
} }
} }

79
libraries/fetch-utils/test/unit/FetchUtilsTests.js
View file

@ -1,5 +1,5 @@
const { expect } = require('chai') const { expect } = require('chai')
const { FetchError } = require('node-fetch') const { FetchError, AbortError } = require('node-fetch')
const { Readable } = require('stream') const { Readable } = require('stream')
const { once } = require('events') const { once } = require('events')
const { TestServer } = require('./helpers/TestServer') const { TestServer } = require('./helpers/TestServer')
@ -15,8 +15,6 @@ const {
CustomHttpsAgent, CustomHttpsAgent,
} = require('../..') } = require('../..')
const abortErrorMessage = 'The user aborted a request'
const HTTP_PORT = 30001 const HTTP_PORT = 30001
const HTTPS_PORT = 30002 const HTTPS_PORT = 30002
@ -106,8 +104,11 @@ describe('fetch-utils', function () {
it('supports abort signals', async function () { it('supports abort signals', async function () {
await expect( await expect(
fetchJson(this.url('/hang'), { signal: AbortSignal.timeout(10) }) abortOnceReceived(
).to.be.rejectedWith(abortErrorMessage) signal => fetchJson(this.url('/hang'), { signal }),
this.server
)
).to.be.rejectedWith(AbortError)
await expectRequestAborted(this.server.lastReq) await expectRequestAborted(this.server.lastReq)
}) })
@ -148,7 +149,7 @@ describe('fetch-utils', function () {
body: stream, body: stream,
}) })
stream.destroy() stream.destroy()
await expect(promise).to.be.rejectedWith(abortErrorMessage) await expect(promise).to.be.rejectedWith(AbortError)
await wait(80) await wait(80)
expect(this.server.lastReq).to.be.undefined expect(this.server.lastReq).to.be.undefined
}) })
@ -162,7 +163,7 @@ describe('fetch-utils', function () {
}) })
await once(this.server.events, 'request-received') await once(this.server.events, 'request-received')
stream.destroy() stream.destroy()
await expect(promise).to.be.rejectedWith(abortErrorMessage) await expect(promise).to.be.rejectedWith(AbortError)
await expectRequestAborted(this.server.lastReq) await expectRequestAborted(this.server.lastReq)
}) })
@ -175,20 +176,27 @@ describe('fetch-utils', function () {
it('supports abort signals', async function () { it('supports abort signals', async function () {
await expect( await expect(
fetchStream(this.url('/hang'), { signal: AbortSignal.timeout(10) }) abortOnceReceived(
).to.be.rejectedWith(abortErrorMessage) signal => fetchStream(this.url('/hang'), { signal }),
this.server
)
).to.be.rejectedWith(AbortError)
await expectRequestAborted(this.server.lastReq) await expectRequestAborted(this.server.lastReq)
}) })
it('destroys the request body when an error occurs', async function () { it('destroys the request body when an error occurs', async function () {
const stream = Readable.from(infiniteIterator()) const stream = Readable.from(infiniteIterator())
await expect( await expect(
fetchStream(this.url('/hang'), { abortOnceReceived(
method: 'POST', signal =>
body: stream, fetchStream(this.url('/hang'), {
signal: AbortSignal.timeout(10), method: 'POST',
}) body: stream,
).to.be.rejectedWith(abortErrorMessage) signal,
}),
this.server
)
).to.be.rejectedWith(AbortError)
expect(stream.destroyed).to.be.true expect(stream.destroyed).to.be.true
}) })
}) })
@ -206,7 +214,7 @@ describe('fetch-utils', function () {
body: stream, body: stream,
}) })
stream.destroy() stream.destroy()
await expect(promise).to.be.rejectedWith(abortErrorMessage) await expect(promise).to.be.rejectedWith(AbortError)
expect(this.server.lastReq).to.be.undefined expect(this.server.lastReq).to.be.undefined
}) })
@ -219,7 +227,7 @@ describe('fetch-utils', function () {
}) })
await once(this.server.events, 'request-received') await once(this.server.events, 'request-received')
stream.destroy() stream.destroy()
await expect(promise).to.be.rejectedWith(abortErrorMessage) await expect(promise).to.be.rejectedWith(AbortError)
await wait(80) await wait(80)
await expectRequestAborted(this.server.lastReq) await expectRequestAborted(this.server.lastReq)
}) })
@ -238,20 +246,27 @@ describe('fetch-utils', function () {
it('supports abort signals', async function () { it('supports abort signals', async function () {
await expect( await expect(
fetchNothing(this.url('/hang'), { signal: AbortSignal.timeout(10) }) abortOnceReceived(
).to.be.rejectedWith(abortErrorMessage) signal => fetchNothing(this.url('/hang'), { signal }),
this.server
)
).to.be.rejectedWith(AbortError)
await expectRequestAborted(this.server.lastReq) await expectRequestAborted(this.server.lastReq)
}) })
it('destroys the request body when an error occurs', async function () { it('destroys the request body when an error occurs', async function () {
const stream = Readable.from(infiniteIterator()) const stream = Readable.from(infiniteIterator())
await expect( await expect(
fetchNothing(this.url('/hang'), { abortOnceReceived(
method: 'POST', signal =>
body: stream, fetchNothing(this.url('/hang'), {
signal: AbortSignal.timeout(10), method: 'POST',
}) body: stream,
).to.be.rejectedWith(abortErrorMessage) signal,
}),
this.server
)
).to.be.rejectedWith(AbortError)
expect(stream.destroyed).to.be.true expect(stream.destroyed).to.be.true
}) })
}) })
@ -365,6 +380,18 @@ async function* infiniteIterator() {
} }
} }
/**
* @param {(signal: AbortSignal) => Promise<any>} func
* @param {TestServer} server
*/
async function abortOnceReceived(func, server) {
const controller = new AbortController()
const promise = func(controller.signal)
await once(server.events, 'request-received')
controller.abort()
return await promise
}
async function expectRequestAborted(req) { async function expectRequestAborted(req) {
if (!req.destroyed) { if (!req.destroyed) {
try { try {
@ -376,8 +403,8 @@ async function expectRequestAborted(req) {
throw err throw err
} }
} }
expect(req.destroyed).to.be.true
} }
expect(req.destroyed).to.be.true
} }
const wait = ms => new Promise(resolve => setTimeout(resolve, ms)) const wait = ms => new Promise(resolve => setTimeout(resolve, ms))

2
libraries/fetch-utils/test/unit/helpers/TestServer.js
View file

@ -12,6 +12,7 @@ class TestServer {
this.app.use(bodyParser.json()) this.app.use(bodyParser.json())
this.app.use((req, res, next) => { this.app.use((req, res, next) => {
this.events.emit('request-received')
this.lastReq = req this.lastReq = req
next() next()
}) })
@ -40,7 +41,6 @@ class TestServer {
}) })
this.app.post('/sink', (req, res) => { this.app.post('/sink', (req, res) => {
this.events.emit('request-received')
req.on('data', () => {}) req.on('data', () => {})
req.on('end', () => { req.on('end', () => {
res.status(204).end() res.status(204).end()

384
package-lock.json generated
View file

@ -63,7 +63,7 @@
"bluebird": "^3.5.3", "bluebird": "^3.5.3",
"glob": "^7.1.3", "glob": "^7.1.3",
"googleapis": "^118.0.0", "googleapis": "^118.0.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"overleaf-editor-core": "*", "overleaf-editor-core": "*",
"swagger-client": "^3.8.24", "swagger-client": "^3.8.24",
"tmp": "0.0.33" "tmp": "0.0.33"
@ -165,7 +165,7 @@
"dependencies": { "dependencies": {
"@overleaf/o-error": "*", "@overleaf/o-error": "*",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"node-fetch": "^2.6.11", "node-fetch": "^2.7.0",
"selfsigned": "^2.4.1" "selfsigned": "^2.4.1"
}, },
"devDependencies": { "devDependencies": {
@ -178,44 +178,6 @@
"typescript": "^5.0.4" "typescript": "^5.0.4"
} }
}, },
"libraries/fetch-utils/node_modules/node-fetch": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"libraries/fetch-utils/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"libraries/fetch-utils/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"libraries/fetch-utils/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"libraries/logger": { "libraries/logger": {
"name": "@overleaf/logger", "name": "@overleaf/logger",
"version": "3.1.1", "version": "3.1.1",
@ -5043,44 +5005,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node_modules/@google-cloud/logging-bunyan/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/@google-cloud/logging-bunyan/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/@google-cloud/logging-bunyan/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/@google-cloud/logging-bunyan/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/@google-cloud/logging-bunyan/node_modules/yallist": { "node_modules/@google-cloud/logging-bunyan/node_modules/yallist": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@ -5476,25 +5400,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node_modules/@google-cloud/logging/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/@google-cloud/logging/node_modules/retry-request": { "node_modules/@google-cloud/logging/node_modules/retry-request": {
"version": "7.0.2", "version": "7.0.2",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
@ -5523,11 +5428,6 @@
"node": ">=14" "node": ">=14"
} }
}, },
"node_modules/@google-cloud/logging/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/@google-cloud/logging/node_modules/uuid": { "node_modules/@google-cloud/logging/node_modules/uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@ -5540,20 +5440,6 @@
"uuid": "dist/bin/uuid" "uuid": "dist/bin/uuid"
} }
}, },
"node_modules/@google-cloud/logging/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/@google-cloud/logging/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/@google-cloud/opentelemetry-cloud-trace-exporter": { "node_modules/@google-cloud/opentelemetry-cloud-trace-exporter": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/@google-cloud/opentelemetry-cloud-trace-exporter/-/opentelemetry-cloud-trace-exporter-2.1.0.tgz", "resolved": "https://registry.npmjs.org/@google-cloud/opentelemetry-cloud-trace-exporter/-/opentelemetry-cloud-trace-exporter-2.1.0.tgz",
@ -5794,25 +5680,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node_modules/@google-cloud/profiler/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/@google-cloud/profiler/node_modules/retry-request": { "node_modules/@google-cloud/profiler/node_modules/retry-request": {
"version": "6.0.0", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz",
@ -5854,11 +5721,6 @@
"node": ">=14" "node": ">=14"
} }
}, },
"node_modules/@google-cloud/profiler/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/@google-cloud/profiler/node_modules/uuid": { "node_modules/@google-cloud/profiler/node_modules/uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@ -5871,20 +5733,6 @@
"uuid": "dist/bin/uuid" "uuid": "dist/bin/uuid"
} }
}, },
"node_modules/@google-cloud/profiler/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/@google-cloud/profiler/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/@google-cloud/profiler/node_modules/yallist": { "node_modules/@google-cloud/profiler/node_modules/yallist": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@ -18396,11 +18244,11 @@
"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
}, },
"node_modules/cross-fetch": { "node_modules/cross-fetch": {
"version": "3.1.5", "version": "3.1.8",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
"dependencies": { "dependencies": {
"node-fetch": "2.6.7" "node-fetch": "^2.6.12"
} }
}, },
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
@ -24064,25 +23912,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node_modules/google-gax/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/google-gax/node_modules/object-hash": { "node_modules/google-gax/node_modules/object-hash": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
@ -24176,11 +24005,6 @@
"node": ">= 6" "node": ">= 6"
} }
}, },
"node_modules/google-gax/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/google-gax/node_modules/uuid": { "node_modules/google-gax/node_modules/uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@ -24193,20 +24017,6 @@
"uuid": "dist/bin/uuid" "uuid": "dist/bin/uuid"
} }
}, },
"node_modules/google-gax/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/google-gax/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/google-p12-pem": { "node_modules/google-p12-pem": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz", "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz",
@ -30250,9 +30060,9 @@
} }
}, },
"node_modules/node-fetch": { "node_modules/node-fetch": {
"version": "2.6.7", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": { "dependencies": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },
@ -41829,7 +41639,7 @@
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mock-fs": "^5.1.2", "mock-fs": "^5.1.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sandboxed-module": "^2.0.4", "sandboxed-module": "^2.0.4",
"sinon": "~9.0.1", "sinon": "~9.0.1",
"sinon-chai": "^3.7.0", "sinon-chai": "^3.7.0",
@ -42147,7 +41957,7 @@
"express": "^4.21.0", "express": "^4.21.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"lodash.once": "^4.1.1", "lodash.once": "^4.1.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"range-parser": "^1.2.1", "range-parser": "^1.2.1",
"tiny-async-pool": "^1.1.0" "tiny-async-pool": "^1.1.0"
}, },
@ -42378,7 +42188,7 @@
"chai": "^4.3.6", "chai": "^4.3.6",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sinon": "^9.0.2", "sinon": "^9.0.2",
"swagger-client": "^3.10.0", "swagger-client": "^3.10.0",
"typescript": "^5.0.4", "typescript": "^5.0.4",
@ -43855,7 +43665,7 @@
"minimatch": "^7.4.2", "minimatch": "^7.4.2",
"minimist": "^1.2.8", "minimist": "^1.2.8",
"mongodb-legacy": "^6.0.1", "mongodb-legacy": "^6.0.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"p-limit": "^2.3.0" "p-limit": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
@ -44133,7 +43943,7 @@
"mongoose": "8.5.3", "mongoose": "8.5.3",
"multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e",
"nocache": "^2.1.0", "nocache": "^2.1.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"nodemailer": "^6.7.0", "nodemailer": "^6.7.0",
"nodemailer-ses-transport": "^1.5.1", "nodemailer-ses-transport": "^1.5.1",
"on-headers": "^1.0.2", "on-headers": "^1.0.2",
@ -44312,7 +44122,6 @@
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mocha-each": "^2.0.1", "mocha-each": "^2.0.1",
"mock-fs": "^5.1.2", "mock-fs": "^5.1.2",
"node-fetch": "^2.6.7",
"nvd3": "^1.8.6", "nvd3": "^1.8.6",
"overleaf-editor-core": "*", "overleaf-editor-core": "*",
"pdfjs-dist213": "npm:pdfjs-dist@2.13.216", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216",
@ -48935,14 +48744,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": {
"whatwg-url": "^5.0.0"
}
},
"retry-request": { "retry-request": {
"version": "7.0.2", "version": "7.0.2",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
@ -48965,29 +48766,10 @@
"uuid": "^9.0.0" "uuid": "^9.0.0"
} }
}, },
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"uuid": { "uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
},
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
} }
} }
}, },
@ -49081,33 +48863,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": {
"whatwg-url": "^5.0.0"
}
},
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"yallist": { "yallist": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@ -49477,14 +49232,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": {
"whatwg-url": "^5.0.0"
}
},
"retry-request": { "retry-request": {
"version": "6.0.0", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz",
@ -49514,30 +49261,11 @@
"uuid": "^9.0.0" "uuid": "^9.0.0"
} }
}, },
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"uuid": { "uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
}, },
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"yallist": { "yallist": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@ -51600,7 +51328,7 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mock-fs": "^5.1.2", "mock-fs": "^5.1.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"p-limit": "^3.1.0", "p-limit": "^3.1.0",
"request": "^2.88.2", "request": "^2.88.2",
"sandboxed-module": "^2.0.4", "sandboxed-module": "^2.0.4",
@ -51893,38 +51621,9 @@
"express": "^4.21.0", "express": "^4.21.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"node-fetch": "^2.6.11", "node-fetch": "^2.7.0",
"selfsigned": "^2.4.1", "selfsigned": "^2.4.1",
"typescript": "^5.0.4" "typescript": "^5.0.4"
},
"dependencies": {
"node-fetch": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
"requires": {
"whatwg-url": "^5.0.0"
}
},
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
}
} }
}, },
"@overleaf/filestore": { "@overleaf/filestore": {
@ -51948,7 +51647,7 @@
"lodash.once": "^4.1.1", "lodash.once": "^4.1.1",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mongodb": "^6.1.0", "mongodb": "^6.1.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"range-parser": "^1.2.1", "range-parser": "^1.2.1",
"sandboxed-module": "2.0.4", "sandboxed-module": "2.0.4",
"sinon": "9.0.2", "sinon": "9.0.2",
@ -52582,7 +52281,7 @@
"minimist": "^1.2.8", "minimist": "^1.2.8",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mongodb-legacy": "^6.0.1", "mongodb-legacy": "^6.0.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"p-limit": "^2.3.0", "p-limit": "^2.3.0",
"sandboxed-module": "^2.0.4", "sandboxed-module": "^2.0.4",
"sinon": "9.0.1", "sinon": "9.0.1",
@ -52964,7 +52663,7 @@
"mongoose": "8.5.3", "mongoose": "8.5.3",
"multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e",
"nocache": "^2.1.0", "nocache": "^2.1.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"nodemailer": "^6.7.0", "nodemailer": "^6.7.0",
"nodemailer-ses-transport": "^1.5.1", "nodemailer-ses-transport": "^1.5.1",
"nvd3": "^1.8.6", "nvd3": "^1.8.6",
@ -61674,11 +61373,11 @@
} }
}, },
"cross-fetch": { "cross-fetch": {
"version": "3.1.5", "version": "3.1.8",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
"requires": { "requires": {
"node-fetch": "2.6.7" "node-fetch": "^2.6.12"
} }
}, },
"cross-spawn": { "cross-spawn": {
@ -65948,14 +65647,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": {
"whatwg-url": "^5.0.0"
}
},
"object-hash": { "object-hash": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
@ -66029,29 +65720,10 @@
} }
} }
}, },
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"uuid": { "uuid": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
},
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
} }
} }
}, },
@ -70779,7 +70451,7 @@
"bluebird": "^3.5.3", "bluebird": "^3.5.3",
"glob": "^7.1.3", "glob": "^7.1.3",
"googleapis": "^118.0.0", "googleapis": "^118.0.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"overleaf-editor-core": "*", "overleaf-editor-core": "*",
"swagger-client": "^3.8.24", "swagger-client": "^3.8.24",
"tmp": "0.0.33" "tmp": "0.0.33"
@ -71333,9 +71005,9 @@
"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==" "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
}, },
"node-fetch": { "node-fetch": {
"version": "2.6.7", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": { "requires": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },
@ -71993,7 +71665,7 @@
"lodash": "^4.17.19", "lodash": "^4.17.19",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mongodb": "^6.2.0", "mongodb": "^6.2.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"overleaf-editor-core": "*", "overleaf-editor-core": "*",
"pg": "^8.7.1", "pg": "^8.7.1",
"sinon": "^9.0.2", "sinon": "^9.0.2",

22
patches/node-fetch+2.6.7.patch → patches/node-fetch+2.7.0.patch
View file

@ -1,5 +1,5 @@
diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js
index e5b04f1..8c80924 100644 index 567ff5d..8eb45f7 100644
--- a/node_modules/node-fetch/lib/index.js --- a/node_modules/node-fetch/lib/index.js
+++ b/node_modules/node-fetch/lib/index.js +++ b/node_modules/node-fetch/lib/index.js
@@ -545,8 +545,8 @@ function clone(instance) { @@ -545,8 +545,8 @@ function clone(instance) {
@ -30,47 +30,47 @@ index e5b04f1..8c80924 100644
} }
} }
@@ -1594,7 +1594,7 @@ function fetch(url, opts) { @@ -1638,7 +1638,7 @@ function fetch(url, opts) {
res.once('end', function () { res.once('end', function () {
if (signal) signal.removeEventListener('abort', abortAndFinalize); if (signal) signal.removeEventListener('abort', abortAndFinalize);
}); });
- let body = res.pipe(new PassThrough$1()); - let body = res.pipe(new PassThrough$1());
+ let body = new PassThrough$1(); setTimeout(() => Stream.pipeline(res, body, (err) => { if (err) req.abort() }), 0); // Note: let the call-site attach event handler to "body" before we start streaming. + let body = Stream.pipeline(res, new PassThrough(), error => { if (error) reject(error); });
const response_options = { const response_options = {
url: request.url, url: request.url,
@@ -1635,7 +1635,7 @@ function fetch(url, opts) { @@ -1679,7 +1679,7 @@ function fetch(url, opts) {
// for gzip // for gzip
if (codings == 'gzip' || codings == 'x-gzip') { if (codings == 'gzip' || codings == 'x-gzip') {
- body = body.pipe(zlib.createGunzip(zlibOptions)); - body = body.pipe(zlib.createGunzip(zlibOptions));
+ const bodyGzip = zlib.createGunzip(zlibOptions); Stream.pipeline(body, bodyGzip, () => {}); body = bodyGzip; + body = Stream.pipeline(body, zlib.createGunzip(zlibOptions), error => { if (error) reject(error); });
response = new Response(body, response_options); response = new Response(body, response_options);
resolve(response); resolve(response);
return; return;
@@ -1645,13 +1645,13 @@ function fetch(url, opts) { @@ -1689,13 +1689,13 @@ function fetch(url, opts) {
if (codings == 'deflate' || codings == 'x-deflate') { if (codings == 'deflate' || codings == 'x-deflate') {
// handle the infamous raw deflate response from old servers // handle the infamous raw deflate response from old servers
// a hack for old IIS and Apache servers // a hack for old IIS and Apache servers
- const raw = res.pipe(new PassThrough$1()); - const raw = res.pipe(new PassThrough$1());
+ const raw = new PassThrough$1(); setTimeout(() => Stream.pipeline(res, raw, () => {}), 0); // Note: delay piping into "raw" until we start piping into "body". + const raw = Stream.pipeline(res, new PassThrough(), error => { if (error) reject(error); });
raw.once('data', function (chunk) { raw.once('data', function (chunk) {
// see http://stackoverflow.com/questions/37519828 // see http://stackoverflow.com/questions/37519828
if ((chunk[0] & 0x0F) === 0x08) { if ((chunk[0] & 0x0F) === 0x08) {
- body = body.pipe(zlib.createInflate()); - body = body.pipe(zlib.createInflate());
+ const bodyDeflate = zlib.createInflate(); Stream.pipeline(body, bodyDeflate, () => {}); body = bodyDeflate; + body = Stream.pipeline(body, zlib.createInflate(), error => { if (error) reject(error); });
} else { } else {
- body = body.pipe(zlib.createInflateRaw()); - body = body.pipe(zlib.createInflateRaw());
+ const bodyDeflate = zlib.createInflateRaw(); Stream.pipeline(body, bodyDeflate, () => {}); body = bodyDeflate; + body = Stream.pipeline(body, zlib.createInflateRaw(), error => { if (error) reject(error); });
} }
response = new Response(body, response_options); response = new Response(body, response_options);
resolve(response); resolve(response);
@@ -1661,7 +1661,7 @@ function fetch(url, opts) { @@ -1712,7 +1712,7 @@ function fetch(url, opts) {
// for br // for br
if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') { if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
- body = body.pipe(zlib.createBrotliDecompress()); - body = body.pipe(zlib.createBrotliDecompress());
+ const bodyBrotli = zlib.createBrotliDecompress(); Stream.pipeline(body, bodyBrotli, () => {}); body = bodyBrotli; + body = Stream.pipeline(body, zlib.createBrotliDecompress(), error => { if (error) reject(error); });
response = new Response(body, response_options); response = new Response(body, response_options);
resolve(response); resolve(response);
return; return;

2
services/clsi/package.json
View file

@ -42,7 +42,7 @@
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mock-fs": "^5.1.2", "mock-fs": "^5.1.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sandboxed-module": "^2.0.4", "sandboxed-module": "^2.0.4",
"sinon": "~9.0.1", "sinon": "~9.0.1",
"sinon-chai": "^3.7.0", "sinon-chai": "^3.7.0",

2
services/filestore/package.json
View file

@ -30,7 +30,7 @@
"express": "^4.21.0", "express": "^4.21.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"lodash.once": "^4.1.1", "lodash.once": "^4.1.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"range-parser": "^1.2.1", "range-parser": "^1.2.1",
"tiny-async-pool": "^1.1.0" "tiny-async-pool": "^1.1.0"
}, },

2
services/history-v1/package.json
View file

@ -43,7 +43,7 @@
"chai": "^4.3.6", "chai": "^4.3.6",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sinon": "^9.0.2", "sinon": "^9.0.2",
"swagger-client": "^3.10.0", "swagger-client": "^3.10.0",
"typescript": "^5.0.4", "typescript": "^5.0.4",

3
services/web/package.json
View file

@ -141,7 +141,7 @@
"mongoose": "8.5.3", "mongoose": "8.5.3",
"multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e",
"nocache": "^2.1.0", "nocache": "^2.1.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"nodemailer": "^6.7.0", "nodemailer": "^6.7.0",
"nodemailer-ses-transport": "^1.5.1", "nodemailer-ses-transport": "^1.5.1",
"on-headers": "^1.0.2", "on-headers": "^1.0.2",
@ -320,7 +320,6 @@
"mocha": "^10.2.0", "mocha": "^10.2.0",
"mocha-each": "^2.0.1", "mocha-each": "^2.0.1",
"mock-fs": "^5.1.2", "mock-fs": "^5.1.2",
"node-fetch": "^2.6.7",
"nvd3": "^1.8.6", "nvd3": "^1.8.6",
"overleaf-editor-core": "*", "overleaf-editor-core": "*",
"pdfjs-dist213": "npm:pdfjs-dist@2.13.216", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216",

16
services/web/scripts/translations/package-lock.json generated
View file

@ -6,8 +6,8 @@
"": { "": {
"dependencies": { "dependencies": {
"@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz", "@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sanitize-html": "^2.7.0", "sanitize-html": "^2.12.1",
"yargs": "^17.7.2" "yargs": "^17.7.2"
} }
}, },
@ -524,9 +524,9 @@
} }
}, },
"node_modules/node-fetch": { "node_modules/node-fetch": {
"version": "2.6.7", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": { "dependencies": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },
@ -1291,9 +1291,9 @@
"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
}, },
"node-fetch": { "node-fetch": {
"version": "2.6.7", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"requires": { "requires": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
} }

2
services/web/scripts/translations/package.json
View file

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz", "@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz",
"node-fetch": "^2.6.7", "node-fetch": "^2.7.0",
"sanitize-html": "^2.12.1", "sanitize-html": "^2.12.1",
"yargs": "^17.7.2" "yargs": "^17.7.2"
} }