agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-01 05:11:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13778 from overleaf/em-fetch-utils-clsi

Browse Source 
Use fetch-utils in clsi

GitOrigin-RevId: c2ba431b2c6b0fb89f684861f34de40d767cc8cd
This commit is contained in:
Eric Mc Sween
2023-07-10 08:17:47 -04:00
committed by Copybot
parent 13a7e752d5
commit 5bf4adcd76
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -39708,6 +39708,7 @@
"services/clsi": {
"name": "@overleaf/clsi",
"dependencies": {
"@overleaf/fetch-utils": "*",
"@overleaf/logger": "*",
"@overleaf/metrics": "*",
"@overleaf/o-error": "*",
@@ -39721,7 +39722,6 @@
"fs-extra": "^10.0.0",
"lockfile": "^1.0.4",
"lodash": "^4.17.21",
"node-fetch": "^2.6.7",
"p-limit": "^3.1.0",
"request": "^2.88.2",
"send": "^0.17.1",
@@ -39732,6 +39732,7 @@
"chai-as-promised": "^7.1.1",
"mocha": "^10.2.0",
"mock-fs": "^5.1.2",
"node-fetch": "^2.6.7",
"sandboxed-module": "^2.0.4",
"sinon": "~9.0.1",
"sinon-chai": "^3.7.0",
@@ -40984,6 +40985,7 @@
"name": "@overleaf/third-party-datastore",
"dependencies": {
"@overleaf/access-token-encryptor": "*",
"@overleaf/fetch-utils": "*",
"@overleaf/logger": "*",
"@overleaf/metrics": "*",
"@overleaf/o-error": "*",
@@ -48997,6 +48999,7 @@
"@overleaf/clsi": {
"version": "file:services/clsi",
"requires": {
"@overleaf/fetch-utils": "*",
"@overleaf/logger": "*",
"@overleaf/metrics": "*",
"@overleaf/o-error": "*",
@@ -50163,6 +50166,7 @@
"version": "file:services/third-party-datastore",
"requires": {
"@overleaf/access-token-encryptor": "*",
"@overleaf/fetch-utils": "*",
"@overleaf/logger": "*",
"@overleaf/metrics": "*",
"@overleaf/o-error": "*",

14
services/clsi/app/js/UrlFetcher.js
View File

@@ -1,10 +1,9 @@
const fs = require('fs')
const logger = require('@overleaf/logger')
const Settings = require('@overleaf/settings')
const { fetchStream } = require('@overleaf/fetch-utils')
const { URL } = require('url')
const { promisify } = require('util')
const fetch = require('node-fetch')
const pipeline = promisify(require('stream').pipeline)
const { pipeline } = require('stream/promises')
async function pipeUrlToFileWithRetry(url, filePath) {
let remainingAttempts = 3
@@ -33,14 +32,13 @@ async function pipeUrlToFile(url, filePath) {
url = `${Settings.filestoreDomainOveride}${u.pathname}${u.search}`
}
const res = await fetch(url, { signal: AbortSignal.timeout(60 * 1000) })
if (res.status !== 200) {
throw new Error('non success response: ' + res.statusText)
}
const stream = await fetchStream(url, {
signal: AbortSignal.timeout(60 * 1000),
})
const atomicWrite = filePath + '~'
try {
await pipeline(res.body, fs.createWriteStream(atomicWrite))
await pipeline(stream, fs.createWriteStream(atomicWrite))
await fs.promises.rename(atomicWrite, filePath)
} catch (err) {
try {

3
services/clsi/package.json
View File

@@ -16,6 +16,7 @@
"lint:fix": "eslint --fix ."
},
"dependencies": {
"@overleaf/fetch-utils": "*",
"@overleaf/logger": "*",
"@overleaf/metrics": "*",
"@overleaf/o-error": "*",
@@ -29,7 +30,6 @@
"fs-extra": "^10.0.0",
"lockfile": "^1.0.4",
"lodash": "^4.17.21",
"node-fetch": "^2.6.7",
"p-limit": "^3.1.0",
"request": "^2.88.2",
"send": "^0.17.1",
@@ -40,6 +40,7 @@
"chai-as-promised": "^7.1.1",
"mocha": "^10.2.0",
"mock-fs": "^5.1.2",
"node-fetch": "^2.6.7",
"sandboxed-module": "^2.0.4",
"sinon": "~9.0.1",
"sinon-chai": "^3.7.0",