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 #15172 from overleaf/em-promise-utils

Browse source 
Move util/promises from web into a shared library

GitOrigin-RevId: fe1980dc57b9dc8ce86fa1fad6a8a817e9505b3d
This commit is contained in:
Eric Mc Sween 2023-10-19 07:38:17 -04:00 committed by Copybot
parent 6f2b24706a
commit 680ebae30b
95 changed files with 229 additions and 487 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
package-lock.json generated
View file

@ -502,6 +502,62 @@
"mocha": "^5.2.0" "mocha": "^5.2.0"
} }
}, },
"libraries/promise-utils": {
"name": "@overleaf/promise-utils",
"version": "0.1.0",
"license": "AGPL-3.0-only",
"dependencies": {
"p-limit": "^2.3.0"
},
"devDependencies": {
"chai": "^4.3.10",
"mocha": "^10.2.0"
}
},
"libraries/promise-utils/node_modules/chai": {
"version": "4.3.10",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
"integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
"dev": true,
"dependencies": {
"assertion-error": "^1.1.0",
"check-error": "^1.0.3",
"deep-eql": "^4.1.3",
"get-func-name": "^2.0.2",
"loupe": "^2.3.6",
"pathval": "^1.1.1",
"type-detect": "^4.0.8"
},
"engines": {
"node": ">=4"
}
},
"libraries/promise-utils/node_modules/deep-eql": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
"integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
"dev": true,
"dependencies": {
"type-detect": "^4.0.0"
},
"engines": {
"node": ">=6"
}
},
"libraries/promise-utils/node_modules/p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dependencies": {
"p-try": "^2.0.0"
},
"engines": {
"node": ">=6"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"libraries/ranges-tracker": { "libraries/ranges-tracker": {
"name": "@overleaf/ranges-tracker", "name": "@overleaf/ranges-tracker",
"devDependencies": { "devDependencies": {
@ -7636,6 +7692,10 @@
"resolved": "services/project-history", "resolved": "services/project-history",
"link": true "link": true
}, },
"node_modules/@overleaf/promise-utils": {
"resolved": "libraries/promise-utils",
"link": true
},
"node_modules/@overleaf/ranges-tracker": { "node_modules/@overleaf/ranges-tracker": {
"resolved": "libraries/ranges-tracker", "resolved": "libraries/ranges-tracker",
"link": true "link": true
@ -16134,10 +16194,13 @@
} }
}, },
"node_modules/check-error": { "node_modules/check-error": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
"dev": true, "dev": true,
"dependencies": {
"get-func-name": "^2.0.2"
},
"engines": { "engines": {
"node": "*" "node": "*"
} }
@ -22348,9 +22411,9 @@
} }
}, },
"node_modules/get-func-name": { "node_modules/get-func-name": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "*" "node": "*"
@ -27039,9 +27102,9 @@
} }
}, },
"node_modules/loupe": { "node_modules/loupe": {
"version": "2.3.1", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.1.tgz", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
"integrity": "sha512-EN1D3jyVmaX4tnajVlfbREU4axL647hLec1h/PXAb8CPDMJiYitcWF2UeLVNttRqaIqQs4x+mRvXf+d+TlDrCA==", "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"get-func-name": "^2.0.0" "get-func-name": "^2.0.0"
@ -39214,6 +39277,7 @@
"@overleaf/metrics": "*", "@overleaf/metrics": "*",
"@overleaf/o-error": "*", "@overleaf/o-error": "*",
"@overleaf/object-persistor": "*", "@overleaf/object-persistor": "*",
"@overleaf/promise-utils": "*",
"@overleaf/redis-wrapper": "*", "@overleaf/redis-wrapper": "*",
"@overleaf/settings": "*", "@overleaf/settings": "*",
"@slack/webhook": "^6.1.0", "@slack/webhook": "^6.1.0",
@ -46968,6 +47032,48 @@
} }
} }
}, },
"@overleaf/promise-utils": {
"version": "file:libraries/promise-utils",
"requires": {
"chai": "^4.3.10",
"mocha": "^10.2.0",
"p-limit": "^2.3.0"
},
"dependencies": {
"chai": {
"version": "4.3.10",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
"integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
"dev": true,
"requires": {
"assertion-error": "^1.1.0",
"check-error": "^1.0.3",
"deep-eql": "^4.1.3",
"get-func-name": "^2.0.2",
"loupe": "^2.3.6",
"pathval": "^1.1.1",
"type-detect": "^4.0.8"
}
},
"deep-eql": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
"integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
"dev": true,
"requires": {
"type-detect": "^4.0.0"
}
},
"p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"requires": {
"p-try": "^2.0.0"
}
}
}
},
"@overleaf/ranges-tracker": { "@overleaf/ranges-tracker": {
"version": "file:libraries/ranges-tracker", "version": "file:libraries/ranges-tracker",
"requires": { "requires": {
@ -47452,6 +47558,7 @@
"@overleaf/metrics": "*", "@overleaf/metrics": "*",
"@overleaf/o-error": "*", "@overleaf/o-error": "*",
"@overleaf/object-persistor": "*", "@overleaf/object-persistor": "*",
"@overleaf/promise-utils": "*",
"@overleaf/ranges-tracker": "*", "@overleaf/ranges-tracker": "*",
"@overleaf/redis-wrapper": "*", "@overleaf/redis-wrapper": "*",
"@overleaf/settings": "*", "@overleaf/settings": "*",
@ -54897,10 +55004,13 @@
"requires": {} "requires": {}
}, },
"check-error": { "check-error": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
"dev": true "dev": true,
"requires": {
"get-func-name": "^2.0.2"
}
}, },
"check-more-types": { "check-more-types": {
"version": "2.24.0", "version": "2.24.0",
@ -59536,9 +59646,9 @@
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
}, },
"get-func-name": { "get-func-name": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
"dev": true "dev": true
}, },
"get-intrinsic": { "get-intrinsic": {
@ -63152,9 +63262,9 @@
} }
}, },
"loupe": { "loupe": {
"version": "2.3.1", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.1.tgz", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
"integrity": "sha512-EN1D3jyVmaX4tnajVlfbREU4axL647hLec1h/PXAb8CPDMJiYitcWF2UeLVNttRqaIqQs4x+mRvXf+d+TlDrCA==", "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
"dev": true, "dev": true,
"requires": { "requires": {
"get-func-name": "^2.0.0" "get-func-name": "^2.0.0"

2
services/web/app/src/Features/Analytics/AnalyticsManager.js
View file

@ -5,7 +5,7 @@ const Metrics = require('../../infrastructure/Metrics')
const Queues = require('../../infrastructure/Queues') const Queues = require('../../infrastructure/Queues')
const crypto = require('crypto') const crypto = require('crypto')
const _ = require('lodash') const _ = require('lodash')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { getAnalyticsIdFromMongoUser } = require('./AnalyticsHelper') const { getAnalyticsIdFromMongoUser } = require('./AnalyticsHelper')

2
services/web/app/src/Features/Analytics/AnalyticsRouter.js
View file

@ -3,7 +3,7 @@ const AnalyticsController = require('./AnalyticsController')
const AnalyticsProxy = require('./AnalyticsProxy') const AnalyticsProxy = require('./AnalyticsProxy')
const { RateLimiter } = require('../../infrastructure/RateLimiter') const { RateLimiter } = require('../../infrastructure/RateLimiter')
const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware') const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const rateLimiters = { const rateLimiters = {
recordEvent: new RateLimiter('analytics-record-event', { recordEvent: new RateLimiter('analytics-record-event', {

2
services/web/app/src/Features/Authorization/AuthorizationMiddleware.js
View file

@ -6,7 +6,7 @@ const HttpErrorHandler = require('../Errors/HttpErrorHandler')
const AuthenticationController = require('../Authentication/AuthenticationController') const AuthenticationController = require('../Authentication/AuthenticationController')
const SessionManager = require('../Authentication/SessionManager') const SessionManager = require('../Authentication/SessionManager')
const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler') const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const { const {
canRedirectToAdminDomain, canRedirectToAdminDomain,
} = require('../Helpers/AdminAuthorizationHelper') } = require('../Helpers/AdminAuthorizationHelper')

2
services/web/app/src/Features/Captcha/CaptchaMiddleware.js
View file

@ -5,7 +5,7 @@ const Metrics = require('@overleaf/metrics')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const DeviceHistory = require('./DeviceHistory') const DeviceHistory = require('./DeviceHistory')
const AuthenticationController = require('../Authentication/AuthenticationController') const AuthenticationController = require('../Authentication/AuthenticationController')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
function respondInvalidCaptcha(req, res) { function respondInvalidCaptcha(req, res) {
res.status(400).json({ res.status(400).json({

2
services/web/app/src/Features/Collaborators/CollaboratorsController.js
View file

@ -9,7 +9,7 @@ const EditorRealTimeController = require('../Editor/EditorRealTimeController')
const TagsHandler = require('../Tags/TagsHandler') const TagsHandler = require('../Tags/TagsHandler')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const { hasAdminAccess } = require('../Helpers/AdminAuthorizationHelper') const { hasAdminAccess } = require('../Helpers/AdminAuthorizationHelper')
const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler') const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
const ProjectAuditLogHandler = require('../Project/ProjectAuditLogHandler') const ProjectAuditLogHandler = require('../Project/ProjectAuditLogHandler')

2
services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js
View file

@ -11,7 +11,7 @@ const EditorRealTimeController = require('../Editor/EditorRealTimeController')
const AnalyticsManager = require('../Analytics/AnalyticsManager') const AnalyticsManager = require('../Analytics/AnalyticsManager')
const SessionManager = require('../Authentication/SessionManager') const SessionManager = require('../Authentication/SessionManager')
const { RateLimiter } = require('../../infrastructure/RateLimiter') const { RateLimiter } = require('../../infrastructure/RateLimiter')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const ProjectAuditLogHandler = require('../Project/ProjectAuditLogHandler') const ProjectAuditLogHandler = require('../Project/ProjectAuditLogHandler')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')

2
services/web/app/src/Features/Compile/ClsiCookieManager.js
View file

@ -6,7 +6,7 @@ const RedisWrapper = require('../../infrastructure/RedisWrapper')
const Cookie = require('cookie') const Cookie = require('cookie')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const Metrics = require('@overleaf/metrics') const Metrics = require('@overleaf/metrics')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const clsiCookiesEnabled = (Settings.clsiCookie?.key ?? '') !== '' const clsiCookiesEnabled = (Settings.clsiCookie?.key ?? '') !== ''

2
services/web/app/src/Features/Compile/ClsiFormatChecker.js
View file

@ -13,7 +13,7 @@ let ClsiFormatChecker
const _ = require('lodash') const _ = require('lodash')
const async = require('async') const async = require('async')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
module.exports = ClsiFormatChecker = { module.exports = ClsiFormatChecker = {
checkRecoursesForProblems(resources, callback) { checkRecoursesForProblems(resources, callback) {

2
services/web/app/src/Features/Compile/ClsiManager.js
View file

@ -1,5 +1,5 @@
const { callbackify } = require('util') const { callbackify } = require('util')
const { callbackifyMultiResult } = require('../../util/promises') const { callbackifyMultiResult } = require('@overleaf/promise-utils')
const { const {
fetchString, fetchString,
fetchStringWithResponse, fetchStringWithResponse,

2
services/web/app/src/Features/Compile/CompileController.js
View file

@ -17,7 +17,7 @@ const ClsiCookieManager = require('./ClsiCookieManager')(
const Path = require('path') const Path = require('path')
const AnalyticsManager = require('../Analytics/AnalyticsManager') const AnalyticsManager = require('../Analytics/AnalyticsManager')
const SplitTestHandler = require('../SplitTests/SplitTestHandler') const SplitTestHandler = require('../SplitTests/SplitTestHandler')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const { const {
fetchStreamWithResponse, fetchStreamWithResponse,
RequestFailedError, RequestFailedError,

2
services/web/app/src/Features/Contacts/ContactController.js
View file

@ -2,7 +2,7 @@ const SessionManager = require('../Authentication/SessionManager')
const ContactManager = require('./ContactManager') const ContactManager = require('./ContactManager')
const UserGetter = require('../User/UserGetter') const UserGetter = require('../User/UserGetter')
const Modules = require('../../infrastructure/Modules') const Modules = require('../../infrastructure/Modules')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
function _formatContact(contact) { function _formatContact(contact) {
return { return {

2
services/web/app/src/Features/Cooldown/CooldownManager.js
View file

@ -14,7 +14,7 @@ let CooldownManager
const RedisWrapper = require('../../infrastructure/RedisWrapper') const RedisWrapper = require('../../infrastructure/RedisWrapper')
const rclient = RedisWrapper.client('cooldown') const rclient = RedisWrapper.client('cooldown')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const COOLDOWN_IN_SECONDS = 60 * 10 const COOLDOWN_IN_SECONDS = 60 * 10

2
services/web/app/src/Features/Docstore/DocstoreManager.js
View file

@ -1,5 +1,5 @@
const { promisify } = require('util') const { promisify } = require('util')
const { promisifyMultiResult } = require('../../util/promises') const { promisifyMultiResult } = require('@overleaf/promise-utils')
const request = require('request').defaults({ jar: false }) const request = require('request').defaults({ jar: false })
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')

2
services/web/app/src/Features/Documents/DocumentController.js
View file

@ -5,7 +5,7 @@ const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandle
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const _ = require('lodash') const _ = require('lodash')
const { plainTextResponse } = require('../../infrastructure/Response') const { plainTextResponse } = require('../../infrastructure/Response')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
async function getDocument(req, res) { async function getDocument(req, res) {
const { Project_id: projectId, doc_id: docId } = req.params const { Project_id: projectId, doc_id: docId } = req.params

2
services/web/app/src/Features/Editor/EditorController.js
View file

@ -8,7 +8,7 @@ const ProjectDeleter = require('../Project/ProjectDeleter')
const EditorRealTimeController = require('./EditorRealTimeController') const EditorRealTimeController = require('./EditorRealTimeController')
const async = require('async') const async = require('async')
const PublicAccessLevels = require('../Authorization/PublicAccessLevels') const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const EditorController = { const EditorController = {
addDoc(projectId, folderId, docName, docLines, source, userId, callback) { addDoc(projectId, folderId, docName, docLines, source, userId, callback) {

2
services/web/app/src/Features/Editor/EditorHttpController.js
View file

@ -13,7 +13,7 @@ const SessionManager = require('../Authentication/SessionManager')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const DocstoreManager = require('../Docstore/DocstoreManager') const DocstoreManager = require('../Docstore/DocstoreManager')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const SplitTestHandler = require('../SplitTests/SplitTestHandler') const SplitTestHandler = require('../SplitTests/SplitTestHandler')
const { const {
NEW_COMPILE_TIMEOUT_ENFORCED_CUTOFF, NEW_COMPILE_TIMEOUT_ENFORCED_CUTOFF,

2
services/web/app/src/Features/FileStore/FileStoreHandler.js
View file

@ -8,7 +8,7 @@ const FileHashManager = require('./FileHashManager')
const { File } = require('../../models/File') const { File } = require('../../models/File')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const ONE_MIN_IN_MS = 60 * 1000 const ONE_MIN_IN_MS = 60 * 1000
const FIVE_MINS_IN_MS = ONE_MIN_IN_MS * 5 const FIVE_MINS_IN_MS = ONE_MIN_IN_MS * 5

2
services/web/app/src/Features/Institutions/InstitutionsAPI.js
View file

@ -3,7 +3,7 @@ const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics') const metrics = require('@overleaf/metrics')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const request = require('requestretry') const request = require('requestretry')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const NotificationsBuilder = require('../Notifications/NotificationsBuilder') const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
const { const {
V1ConnectionError, V1ConnectionError,

2
services/web/app/src/Features/Institutions/InstitutionsFeatures.js
View file

@ -2,7 +2,7 @@ let InstitutionsFeatures
const UserGetter = require('../User/UserGetter') const UserGetter = require('../User/UserGetter')
const PlansLocator = require('../Subscription/PlansLocator') const PlansLocator = require('../Subscription/PlansLocator')
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
module.exports = InstitutionsFeatures = { module.exports = InstitutionsFeatures = {
getInstitutionsFeatures(userId, callback) { getInstitutionsFeatures(userId, callback) {

2
services/web/app/src/Features/LinkedFiles/LinkedFilesHandler.js
View file

@ -21,7 +21,7 @@ const {
V1ProjectNotFoundError, V1ProjectNotFoundError,
BadDataError, BadDataError,
} = require('./LinkedFilesErrors') } = require('./LinkedFilesErrors')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const LinkedFilesHandler = { const LinkedFilesHandler = {
getFileById(projectId, fileId, callback) { getFileById(projectId, fileId, callback) {

2
services/web/app/src/Features/LinkedFiles/UrlAgent.js
View file

@ -4,7 +4,7 @@ const { InvalidUrlError, UrlFetchFailedError } = require('./LinkedFilesErrors')
const LinkedFilesHandler = require('./LinkedFilesHandler') const LinkedFilesHandler = require('./LinkedFilesHandler')
const UrlHelper = require('../Helpers/UrlHelper') const UrlHelper = require('../Helpers/UrlHelper')
const { fetchStream, RequestFailedError } = require('@overleaf/fetch-utils') const { fetchStream, RequestFailedError } = require('@overleaf/fetch-utils')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const { FileTooLargeError } = require('../Errors/Errors') const { FileTooLargeError } = require('../Errors/Errors')
async function createLinkedFile( async function createLinkedFile(

2
services/web/app/src/Features/Notifications/NotificationsBuilder.js
View file

@ -1,5 +1,5 @@
const NotificationsHandler = require('./NotificationsHandler') const NotificationsHandler = require('./NotificationsHandler')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const request = require('request') const request = require('request')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')

2
services/web/app/src/Features/Notifications/NotificationsHandler.js
View file

@ -2,7 +2,7 @@ const settings = require('@overleaf/settings')
const request = require('request') const request = require('request')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const _ = require('lodash') const _ = require('lodash')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const notificationsApi = _.get(settings, ['apis', 'notifications', 'url']) const notificationsApi = _.get(settings, ['apis', 'notifications', 'url'])
const oneSecond = 1000 const oneSecond = 1000

2
services/web/app/src/Features/PasswordReset/PasswordResetController.js
View file

@ -7,7 +7,7 @@ const UserUpdater = require('../User/UserUpdater')
const UserSessionsManager = require('../User/UserSessionsManager') const UserSessionsManager = require('../User/UserSessionsManager')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const EmailsHelper = require('../Helpers/EmailHelper') const EmailsHelper = require('../Helpers/EmailHelper')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
async function setNewUserPassword(req, res, next) { async function setNewUserPassword(req, res, next) {
let user let user

2
services/web/app/src/Features/Project/ProjectAuditLogHandler.js
View file

@ -1,6 +1,6 @@
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { ProjectAuditLogEntry } = require('../../models/ProjectAuditLogEntry') const { ProjectAuditLogEntry } = require('../../models/ProjectAuditLogEntry')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
module.exports = { module.exports = {
promises: { promises: {

2
services/web/app/src/Features/Project/ProjectDeleter.js
View file

@ -20,7 +20,7 @@ const FilestoreHandler = require('../FileStore/FileStoreHandler')
const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender') const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
const ChatApiHandler = require('../Chat/ChatApiHandler') const ChatApiHandler = require('../Chat/ChatApiHandler')
const moment = require('moment') const moment = require('moment')
const { promiseMapWithLimit } = require('../../util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { READ_PREFERENCE_SECONDARY } = require('../../infrastructure/mongodb') const { READ_PREFERENCE_SECONDARY } = require('../../infrastructure/mongodb')
const EXPIRE_PROJECTS_AFTER_DAYS = 90 const EXPIRE_PROJECTS_AFTER_DAYS = 90

2
services/web/app/src/Features/Project/ProjectDuplicator.js
View file

@ -1,7 +1,7 @@
const { callbackify } = require('util') const { callbackify } = require('util')
const Path = require('path') const Path = require('path')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const { promiseMapWithLimit } = require('../../util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { Doc } = require('../../models/Doc') const { Doc } = require('../../models/Doc')
const { File } = require('../../models/File') const { File } = require('../../models/File')
const DocstoreManager = require('../Docstore/DocstoreManager') const DocstoreManager = require('../Docstore/DocstoreManager')

2
services/web/app/src/Features/Project/ProjectEntityHandler.js
View file

@ -2,7 +2,7 @@ const path = require('path')
const DocstoreManager = require('../Docstore/DocstoreManager') const DocstoreManager = require('../Docstore/DocstoreManager')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const ProjectGetter = require('./ProjectGetter') const ProjectGetter = require('./ProjectGetter')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const { iterablePaths } = require('./IterablePath') const { iterablePaths } = require('./IterablePath')

2
services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
View file

@ -1,5 +1,5 @@
const { callbackify } = require('util') const { callbackify } = require('util')
const { callbackifyMultiResult } = require('../../util/promises') const { callbackifyMultiResult } = require('@overleaf/promise-utils')
const _ = require('underscore') const _ = require('underscore')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const path = require('path') const path = require('path')

2
services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
View file

@ -21,7 +21,7 @@ const SafePath = require('./SafePath')
const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender') const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
const FileWriter = require('../../infrastructure/FileWriter') const FileWriter = require('../../infrastructure/FileWriter')
const EditorRealTimeController = require('../Editor/EditorRealTimeController') const EditorRealTimeController = require('../Editor/EditorRealTimeController')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const { iterablePaths } = require('./IterablePath') const { iterablePaths } = require('./IterablePath')
const LOCK_NAMESPACE = 'sequentialProjectStructureUpdateLock' const LOCK_NAMESPACE = 'sequentialProjectStructureUpdateLock'

2
services/web/app/src/Features/Project/ProjectGetter.js
View file

@ -2,7 +2,7 @@ const { db } = require('../../infrastructure/mongodb')
const { normalizeQuery } = require('../Helpers/Mongo') const { normalizeQuery } = require('../Helpers/Mongo')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const metrics = require('@overleaf/metrics') const metrics = require('@overleaf/metrics')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const { Project } = require('../../models/Project') const { Project } = require('../../models/Project')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const LockManager = require('../../infrastructure/LockManager') const LockManager = require('../../infrastructure/LockManager')

2
services/web/app/src/Features/Project/ProjectHistoryHandler.js
View file

@ -2,7 +2,7 @@ const { Project } = require('../../models/Project')
const ProjectDetailsHandler = require('./ProjectDetailsHandler') const ProjectDetailsHandler = require('./ProjectDetailsHandler')
const HistoryManager = require('../History/HistoryManager') const HistoryManager = require('../History/HistoryManager')
const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler') const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const ProjectHistoryHandler = { const ProjectHistoryHandler = {
setHistoryId(projectId, historyId, callback) { setHistoryId(projectId, historyId, callback) {

2
services/web/app/src/Features/Project/ProjectListController.js
View file

@ -9,7 +9,7 @@ const Sources = require('../Authorization/Sources')
const UserGetter = require('../User/UserGetter') const UserGetter = require('../User/UserGetter')
const SurveyHandler = require('../Survey/SurveyHandler') const SurveyHandler = require('../Survey/SurveyHandler')
const TagsHandler = require('../Tags/TagsHandler') const TagsHandler = require('../Tags/TagsHandler')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const Features = require('../../infrastructure/Features') const Features = require('../../infrastructure/Features')
const SubscriptionViewModelBuilder = require('../Subscription/SubscriptionViewModelBuilder') const SubscriptionViewModelBuilder = require('../Subscription/SubscriptionViewModelBuilder')

2
services/web/app/src/Features/Project/ProjectLocator.js
View file

@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
const async = require('async') const async = require('async')
const ProjectGetter = require('./ProjectGetter') const ProjectGetter = require('./ProjectGetter')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const { promisifyMultiResult } = require('../../util/promises') const { promisifyMultiResult } = require('@overleaf/promise-utils')
const { iterablePaths } = require('./IterablePath') const { iterablePaths } = require('./IterablePath')
function findElement(options, _callback) { function findElement(options, _callback) {

2
services/web/app/src/Features/Project/ProjectOptionsHandler.js
View file

@ -1,6 +1,6 @@
const { Project } = require('../../models/Project') const { Project } = require('../../models/Project')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const safeCompilers = ['xelatex', 'pdflatex', 'latex', 'lualatex'] const safeCompilers = ['xelatex', 'pdflatex', 'latex', 'lualatex']

2
services/web/app/src/Features/Project/ProjectRootDocManager.js
View file

@ -23,7 +23,7 @@ const { promisify } = require('util')
const async = require('async') const async = require('async')
const globby = require('globby') const globby = require('globby')
const _ = require('underscore') const _ = require('underscore')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
module.exports = ProjectRootDocManager = { module.exports = ProjectRootDocManager = {
setRootDocAutomatically(projectId, callback) { setRootDocAutomatically(projectId, callback) {

2
services/web/app/src/Features/Project/ProjectUpdateHandler.js
View file

@ -11,7 +11,7 @@
*/ */
const { Project } = require('../../models/Project') const { Project } = require('../../models/Project')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const ProjectUpdateHandler = { const ProjectUpdateHandler = {
markAsUpdated(projectId, lastUpdatedAt, lastUpdatedBy, callback) { markAsUpdated(projectId, lastUpdatedAt, lastUpdatedBy, callback) {

2
services/web/app/src/Features/Publishers/PublishersGetter.js
View file

@ -1,7 +1,7 @@
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { fetchJson } = require('@overleaf/fetch-utils') const { fetchJson } = require('@overleaf/fetch-utils')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const UserMembershipsHandler = require('../UserMembership/UserMembershipsHandler') const UserMembershipsHandler = require('../UserMembership/UserMembershipsHandler')
const UserMembershipEntityConfigs = require('../UserMembership/UserMembershipEntityConfigs') const UserMembershipEntityConfigs = require('../UserMembership/UserMembershipEntityConfigs')

2
services/web/app/src/Features/Referal/ReferalAllocator.js
View file

@ -1,7 +1,7 @@
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const { User } = require('../../models/User') const { User } = require('../../models/User')
const FeaturesUpdater = require('../Subscription/FeaturesUpdater') const FeaturesUpdater = require('../Subscription/FeaturesUpdater')
const { promisify } = require('../../util/promises') const { promisify } = require('@overleaf/promise-utils')
function allocate( function allocate(
referalId, referalId,

2
services/web/app/src/Features/Security/LoginRateLimiter.js
View file

@ -1,5 +1,5 @@
const { RateLimiter } = require('../../infrastructure/RateLimiter') const { RateLimiter } = require('../../infrastructure/RateLimiter')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const rateLimiter = new RateLimiter('login', { const rateLimiter = new RateLimiter('login', {
points: 10, points: 10,

2
services/web/app/src/Features/Security/OneTimeTokenHandler.js
View file

@ -1,7 +1,7 @@
const crypto = require('crypto') const crypto = require('crypto')
const { db } = require('../../infrastructure/mongodb') const { db } = require('../../infrastructure/mongodb')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const ONE_HOUR_IN_S = 60 * 60 const ONE_HOUR_IN_S = 60 * 60

2
services/web/app/src/Features/Spelling/SpellingHandler.js
View file

@ -1,6 +1,6 @@
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const Metrics = require('@overleaf/metrics') const Metrics = require('@overleaf/metrics')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const LearnedWordsManager = require('./LearnedWordsManager') const LearnedWordsManager = require('./LearnedWordsManager')
module.exports = { module.exports = {

2
services/web/app/src/Features/Subscription/FeaturesUpdater.js
View file

@ -1,6 +1,6 @@
const _ = require('lodash') const _ = require('lodash')
const { callbackify } = require('util') const { callbackify } = require('util')
const { callbackifyMultiResult } = require('../../util/promises') const { callbackifyMultiResult } = require('@overleaf/promise-utils')
const PlansLocator = require('./PlansLocator') const PlansLocator = require('./PlansLocator')
const SubscriptionLocator = require('./SubscriptionLocator') const SubscriptionLocator = require('./SubscriptionLocator')
const UserFeaturesUpdater = require('./UserFeaturesUpdater') const UserFeaturesUpdater = require('./UserFeaturesUpdater')

2
services/web/app/src/Features/Subscription/LimitationsManager.js
View file

@ -8,7 +8,7 @@ const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
const CollaboratorsInvitesHandler = require('../Collaborators/CollaboratorsInviteHandler') const CollaboratorsInvitesHandler = require('../Collaborators/CollaboratorsInviteHandler')
const V1SubscriptionManager = require('./V1SubscriptionManager') const V1SubscriptionManager = require('./V1SubscriptionManager')
const { V1ConnectionError } = require('../Errors/Errors') const { V1ConnectionError } = require('../Errors/Errors')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const LimitationsManager = { const LimitationsManager = {
allowedNumberOfCollaboratorsInProject(projectId, callback) { allowedNumberOfCollaboratorsInProject(projectId, callback) {

2
services/web/app/src/Features/Subscription/SubscriptionController.js
View file

@ -14,7 +14,7 @@ const GroupPlansData = require('./GroupPlansData')
const V1SubscriptionManager = require('./V1SubscriptionManager') const V1SubscriptionManager = require('./V1SubscriptionManager')
const AnalyticsManager = require('../Analytics/AnalyticsManager') const AnalyticsManager = require('../Analytics/AnalyticsManager')
const RecurlyEventHandler = require('./RecurlyEventHandler') const RecurlyEventHandler = require('./RecurlyEventHandler')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const SplitTestHandler = require('../SplitTests/SplitTestHandler') const SplitTestHandler = require('../SplitTests/SplitTestHandler')
const SubscriptionHelper = require('./SubscriptionHelper') const SubscriptionHelper = require('./SubscriptionHelper')

2
services/web/app/src/Features/Subscription/SubscriptionHandler.js
View file

@ -9,7 +9,7 @@ const LimitationsManager = require('./LimitationsManager')
const EmailHandler = require('../Email/EmailHandler') const EmailHandler = require('../Email/EmailHandler')
const PlansLocator = require('./PlansLocator') const PlansLocator = require('./PlansLocator')
const SubscriptionHelper = require('./SubscriptionHelper') const SubscriptionHelper = require('./SubscriptionHelper')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
function validateNoSubscriptionInRecurly(userId, callback) { function validateNoSubscriptionInRecurly(userId, callback) {
RecurlyWrapper.listAccountActiveSubscriptions( RecurlyWrapper.listAccountActiveSubscriptions(

2
services/web/app/src/Features/Subscription/SubscriptionUpdater.js
View file

@ -1,5 +1,5 @@
const { db, ObjectId } = require('../../infrastructure/mongodb') const { db, ObjectId } = require('../../infrastructure/mongodb')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const { Subscription } = require('../../models/Subscription') const { Subscription } = require('../../models/Subscription')
const SubscriptionLocator = require('./SubscriptionLocator') const SubscriptionLocator = require('./SubscriptionLocator')
const PlansLocator = require('./PlansLocator') const PlansLocator = require('./PlansLocator')

2
services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
View file

@ -11,7 +11,7 @@ const sanitizeHtml = require('sanitize-html')
const _ = require('underscore') const _ = require('underscore')
const async = require('async') const async = require('async')
const SubscriptionHelper = require('./SubscriptionHelper') const SubscriptionHelper = require('./SubscriptionHelper')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const { const {
InvalidError, InvalidError,
NotFoundError, NotFoundError,

2
services/web/app/src/Features/Subscription/TeamInvitesController.js
View file

@ -7,7 +7,7 @@ const SubscriptionLocator = require('./SubscriptionLocator')
const ErrorController = require('../Errors/ErrorController') const ErrorController = require('../Errors/ErrorController')
const EmailHelper = require('../Helpers/EmailHelper') const EmailHelper = require('../Helpers/EmailHelper')
const UserGetter = require('../User/UserGetter') const UserGetter = require('../User/UserGetter')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const HttpErrorHandler = require('../Errors/HttpErrorHandler') const HttpErrorHandler = require('../Errors/HttpErrorHandler')
const PermissionsManager = require('../Authorization/PermissionsManager') const PermissionsManager = require('../Authorization/PermissionsManager')
const EmailHandler = require('../Email/EmailHandler') const EmailHandler = require('../Email/EmailHandler')

5
services/web/app/src/Features/Subscription/TeamInvitesHandler.js
View file

@ -16,7 +16,10 @@ const EmailHandler = require('../Email/EmailHandler')
const EmailHelper = require('../Helpers/EmailHelper') const EmailHelper = require('../Helpers/EmailHelper')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const { callbackify, callbackifyMultiResult } = require('../../util/promises') const {
callbackify,
callbackifyMultiResult,
} = require('@overleaf/promise-utils')
const NotificationsBuilder = require('../Notifications/NotificationsBuilder') const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
async function getInvite(token) { async function getInvite(token) {

2
services/web/app/src/Features/Subscription/UserFeaturesUpdater.js
View file

@ -1,5 +1,5 @@
const { User } = require('../../models/User') const { User } = require('../../models/User')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
function _featuresChanged(newFeatures, featuresBefore) { function _featuresChanged(newFeatures, featuresBefore) {

2
services/web/app/src/Features/Subscription/V1SubscriptionManager.js
View file

@ -3,7 +3,7 @@ const UserGetter = require('../User/UserGetter')
const request = require('requestretry') const request = require('requestretry')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const { V1ConnectionError, NotFoundError } = require('../Errors/Errors') const { V1ConnectionError, NotFoundError } = require('../Errors/Errors')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
module.exports = V1SubscriptionManager = { module.exports = V1SubscriptionManager = {
getSubscriptionsFromV1(userId, callback) { getSubscriptionsFromV1(userId, callback) {

2
services/web/app/src/Features/Survey/SurveyHandler.js
View file

@ -1,7 +1,7 @@
const crypto = require('crypto') const crypto = require('crypto')
const SurveyCache = require('./SurveyCache') const SurveyCache = require('./SurveyCache')
const SubscriptionLocator = require('../Subscription/SubscriptionLocator') const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
/** /**
* @typedef {import('../../../../types/project/dashboard/survey').Survey} Survey * @typedef {import('../../../../types/project/dashboard/survey').Survey} Survey

2
services/web/app/src/Features/Tags/TagsController.js
View file

@ -1,7 +1,7 @@
const TagsHandler = require('./TagsHandler') const TagsHandler = require('./TagsHandler')
const SessionManager = require('../Authentication/SessionManager') const SessionManager = require('../Authentication/SessionManager')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
async function _getTags(userId, _req, res) { async function _getTags(userId, _req, res) {
if (!userId) { if (!userId) {

2
services/web/app/src/Features/Tags/TagsHandler.js
View file

@ -1,5 +1,5 @@
const { Tag } = require('../../models/Tag') const { Tag } = require('../../models/Tag')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
const MAX_TAG_LENGTH = 50 const MAX_TAG_LENGTH = 50

2
services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js
View file

@ -1,4 +1,4 @@
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const TpdsUpdateHandler = require('./TpdsUpdateHandler') const TpdsUpdateHandler = require('./TpdsUpdateHandler')
const UpdateMerger = require('./UpdateMerger') const UpdateMerger = require('./UpdateMerger')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')

2
services/web/app/src/Features/TokenAccess/TokenAccessController.js
View file

@ -5,7 +5,7 @@ const Errors = require('../Errors/Errors')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const AuthorizationManager = require('../Authorization/AuthorizationManager') const AuthorizationManager = require('../Authorization/AuthorizationManager')
const PrivilegeLevels = require('../Authorization/PrivilegeLevels') const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
const { const {

2
services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
View file

@ -6,7 +6,7 @@ const Settings = require('@overleaf/settings')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const V1Api = require('../V1/V1Api') const V1Api = require('../V1/V1Api')
const crypto = require('crypto') const crypto = require('crypto')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const Analytics = require('../Analytics/AnalyticsManager') const Analytics = require('../Analytics/AnalyticsManager')
const READ_AND_WRITE_TOKEN_PATTERN = '([0-9]+[a-z]{6,12})' const READ_AND_WRITE_TOKEN_PATTERN = '([0-9]+[a-z]{6,12})'

2
services/web/app/src/Features/Tutorial/TutorialController.js
View file

@ -1,6 +1,6 @@
const SessionManager = require('../Authentication/SessionManager') const SessionManager = require('../Authentication/SessionManager')
const TutorialHandler = require('./TutorialHandler') const TutorialHandler = require('./TutorialHandler')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const VALID_KEYS = [ const VALID_KEYS = [
'react-history-buttons-tutorial', 'react-history-buttons-tutorial',

2
services/web/app/src/Features/Uploads/ArchiveManager.js
View file

@ -26,7 +26,7 @@ const {
ZipContentsTooLargeError, ZipContentsTooLargeError,
} = require('./ArchiveErrors') } = require('./ArchiveErrors')
const _ = require('underscore') const _ = require('underscore')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const ONE_MEG = 1024 * 1024 const ONE_MEG = 1024 * 1024

2
services/web/app/src/Features/Uploads/FileTypeManager.js
View file

@ -1,7 +1,7 @@
const fs = require('fs') const fs = require('fs')
const Path = require('path') const Path = require('path')
const isUtf8 = require('utf-8-validate') const isUtf8 = require('utf-8-validate')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
const Minimatch = require('minimatch').Minimatch const Minimatch = require('minimatch').Minimatch

2
services/web/app/src/Features/User/SAMLIdentityManager.js
View file

@ -10,7 +10,7 @@ const UserGetter = require('../User/UserGetter')
const UserUpdater = require('../User/UserUpdater') const UserUpdater = require('../User/UserUpdater')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { User } = require('../../models/User') const { User } = require('../../models/User')
const { promiseMapWithLimit } = require('../../util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
async function _addAuditLogEntry(operation, userId, auditLog, extraInfo) { async function _addAuditLogEntry(operation, userId, auditLog, extraInfo) {
await UserAuditLogHandler.promises.addEntry( await UserAuditLogHandler.promises.addEntry(

2
services/web/app/src/Features/User/ThirdPartyIdentityManager.js
View file

@ -8,7 +8,7 @@ const logger = require('@overleaf/logger')
const OError = require('@overleaf/o-error') const OError = require('@overleaf/o-error')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const { User } = require(`${APP_ROOT}/models/User`) const { User } = require(`${APP_ROOT}/models/User`)
const { promisifyAll } = require(`${APP_ROOT}/util/promises`) const { promisifyAll } = require('@overleaf/promise-utils')
const oauthProviders = settings.oauthProviders || {} const oauthProviders = settings.oauthProviders || {}

2
services/web/app/src/Features/User/UserController.js
View file

@ -17,7 +17,7 @@ const OError = require('@overleaf/o-error')
const EmailHandler = require('../Email/EmailHandler') const EmailHandler = require('../Email/EmailHandler')
const UrlHelper = require('../Helpers/UrlHelper') const UrlHelper = require('../Helpers/UrlHelper')
const { promisify } = require('util') const { promisify } = require('util')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const { const {
acceptsJson, acceptsJson,
} = require('../../infrastructure/RequestContentTypeDetection') } = require('../../infrastructure/RequestContentTypeDetection')

2
services/web/app/src/Features/User/UserEmailsController.js
View file

@ -10,7 +10,7 @@ const UserEmailsConfirmationHandler = require('./UserEmailsConfirmationHandler')
const { endorseAffiliation } = require('../Institutions/InstitutionsAPI') const { endorseAffiliation } = require('../Institutions/InstitutionsAPI')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const HttpErrorHandler = require('../Errors/HttpErrorHandler') const HttpErrorHandler = require('../Errors/HttpErrorHandler')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const AsyncFormHelper = require('../Helpers/AsyncFormHelper') const AsyncFormHelper = require('../Helpers/AsyncFormHelper')
const AnalyticsManager = require('../Analytics/AnalyticsManager') const AnalyticsManager = require('../Analytics/AnalyticsManager')
const UserPrimaryEmailCheckHandler = require('../User/UserPrimaryEmailCheckHandler') const UserPrimaryEmailCheckHandler = require('../User/UserPrimaryEmailCheckHandler')

2
services/web/app/src/Features/User/UserGetter.js
View file

@ -4,7 +4,7 @@ const metrics = require('@overleaf/metrics')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const moment = require('moment') const moment = require('moment')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const { const {
promises: InstitutionsAPIPromises, promises: InstitutionsAPIPromises,
} = require('../Institutions/InstitutionsAPI') } = require('../Institutions/InstitutionsAPI')

2
services/web/app/src/Features/User/UserInfoManager.js
View file

@ -1,5 +1,5 @@
const UserGetter = require('./UserGetter') const UserGetter = require('./UserGetter')
const { callbackify } = require('../../util/promises') const { callbackify } = require('@overleaf/promise-utils')
async function getPersonalInfo(userId) { async function getPersonalInfo(userId) {
return UserGetter.promises.getUser(userId, { return UserGetter.promises.getUser(userId, {

2
services/web/app/src/Features/User/UserPagesController.js
View file

@ -8,7 +8,7 @@ const SessionManager = require('../Authentication/SessionManager')
const NewsletterManager = require('../Newsletter/NewsletterManager') const NewsletterManager = require('../Newsletter/NewsletterManager')
const SubscriptionLocator = require('../Subscription/SubscriptionLocator') const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
const _ = require('lodash') const _ = require('lodash')
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const Features = require('../../infrastructure/Features') const Features = require('../../infrastructure/Features')
const SplitTestHandler = require('../SplitTests/SplitTestHandler') const SplitTestHandler = require('../SplitTests/SplitTestHandler')

2
services/web/app/src/Features/UserMembership/UserMembershipHandler.js
View file

@ -13,7 +13,7 @@
*/ */
const { ObjectId } = require('mongodb') const { ObjectId } = require('mongodb')
const async = require('async') const async = require('async')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const EntityModels = { const EntityModels = {
Institution: require('../../models/Institution').Institution, Institution: require('../../models/Institution').Institution,

2
services/web/app/src/Features/UserMembership/UserMembershipMiddleware.js
View file

@ -1,4 +1,4 @@
const { expressify } = require('../../util/promises') const { expressify } = require('@overleaf/promise-utils')
const async = require('async') const async = require('async')
const UserMembershipAuthorization = require('./UserMembershipAuthorization') const UserMembershipAuthorization = require('./UserMembershipAuthorization')
const AuthenticationController = require('../Authentication/AuthenticationController') const AuthenticationController = require('../Authentication/AuthenticationController')

2
services/web/app/src/Features/UserMembership/UserMembershipsHandler.js
View file

@ -10,7 +10,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/ */
const async = require('async') const async = require('async')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
const EntityModels = { const EntityModels = {
Institution: require('../../models/Institution').Institution, Institution: require('../../models/Institution').Institution,
Subscription: require('../../models/Subscription').Subscription, Subscription: require('../../models/Subscription').Subscription,

2
services/web/app/src/Features/V1/V1Api.js
View file

@ -10,7 +10,7 @@
const request = require('request') const request = require('request')
const settings = require('@overleaf/settings') const settings = require('@overleaf/settings')
const Errors = require('../Errors/Errors') const Errors = require('../Errors/Errors')
const { promisifyAll } = require('../../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
// TODO: check what happens when these settings aren't defined // TODO: check what happens when these settings aren't defined
const DEFAULT_V1_PARAMS = { const DEFAULT_V1_PARAMS = {

2
services/web/app/src/infrastructure/ExpressLocals.js
View file

@ -20,7 +20,7 @@ const {
const { const {
addOptionalCleanupHandlerAfterDrainingConnections, addOptionalCleanupHandlerAfterDrainingConnections,
} = require('./GracefulShutdown') } = require('./GracefulShutdown')
const { expressify } = require('../util/promises') const { expressify } = require('@overleaf/promise-utils')
const IEEE_BRAND_ID = Settings.ieeeBrandId const IEEE_BRAND_ID = Settings.ieeeBrandId

2
services/web/app/src/infrastructure/FileWriter.js
View file

@ -19,7 +19,7 @@ const Settings = require('@overleaf/settings')
const request = require('request') const request = require('request')
const { Transform, pipeline } = require('stream') const { Transform, pipeline } = require('stream')
const { FileTooLargeError } = require('../Features/Errors/Errors') const { FileTooLargeError } = require('../Features/Errors/Errors')
const { promisifyAll } = require('../util/promises') const { promisifyAll } = require('@overleaf/promise-utils')
class SizeLimitedStream extends Transform { class SizeLimitedStream extends Transform {
constructor(options) { constructor(options) {

2
services/web/app/src/infrastructure/GeoIpLookup.js
View file

@ -3,7 +3,7 @@ const settings = require('@overleaf/settings')
const _ = require('underscore') const _ = require('underscore')
const logger = require('@overleaf/logger') const logger = require('@overleaf/logger')
const { URL } = require('url') const { URL } = require('url')
const { promisify, promisifyMultiResult } = require('../util/promises') const { promisify, promisifyMultiResult } = require('@overleaf/promise-utils')
const DEFAULT_CURRENCY_CODE = 'USD' const DEFAULT_CURRENCY_CODE = 'USD'

172
services/web/app/src/util/promises.js
View file

@ -1,168 +1,8 @@
const { promisify, callbackify } = require('util') // This stub module is temporary. Keep it around for a while to allow old
const pLimit = require('p-limit') // branches to be merged.
module.exports = { module.exports = require('@overleaf/promise-utils')
promisify,
promisifyAll,
promisifyClass,
promisifyMultiResult,
callbackify,
callbackifyMultiResult,
expressify,
promiseMapWithLimit,
}
/** process.emitWarning(
* Promisify all functions in a module. 'The util/promises module is deprecated. Use @overleaf/promise-utils instead.'
* )
* This is meant to be used only when all functions in the module are async
* callback-style functions.
*
* It's very much tailored to our current module structure. In particular, it
* binds `this` to the module when calling the function in order not to break
* modules that call sibling functions using `this`.
*
* This will not magically fix all modules. Special cases should be promisified
* manually.
*
* The second argument is a bag of options:
*
* - without: an array of function names that shouldn't be promisified
*
* - multiResult: an object whose keys are function names and values are lists
* of parameter names. This is meant for functions that invoke their callbacks
* with more than one result in separate parameters. The promisifed function
* will return these results as a single object, with each result keyed under
* the corresponding parameter name.
*/
function promisifyAll(module, opts = {}) {
const { without = [], multiResult = {} } = opts
const promises = {}
for (const propName of Object.getOwnPropertyNames(module)) {
if (without.includes(propName)) {
continue
}
const propValue = module[propName]
if (typeof propValue !== 'function') {
continue
}
if (multiResult[propName] != null) {
promises[propName] = promisifyMultiResult(
propValue,
multiResult[propName]
).bind(module)
} else {
promises[propName] = promisify(propValue).bind(module)
}
}
return promises
}
/**
* Promisify all methods in a class.
*
* Options are the same as for promisifyAll
*/
function promisifyClass(cls, opts = {}) {
const promisified = class extends cls {}
const { without = [], multiResult = {} } = opts
for (const propName of Object.getOwnPropertyNames(cls.prototype)) {
if (propName === 'constructor' || without.includes(propName)) {
continue
}
const propValue = cls.prototype[propName]
if (typeof propValue !== 'function') {
continue
}
if (multiResult[propName] != null) {
promisified.prototype[propName] = promisifyMultiResult(
propValue,
multiResult[propName]
)
} else {
promisified.prototype[propName] = promisify(propValue)
}
}
return promisified
}
/**
* Promisify a function that returns multiple results via additional callback
* parameters.
*
* The promisified function returns the results in a single object whose keys
* are the names given in the array `resultNames`.
*
* Example:
*
* function f(callback) {
* return callback(null, 1, 2, 3)
* }
*
* const g = promisifyMultiResult(f, ['a', 'b', 'c'])
*
* const result = await g() // returns {a: 1, b: 2, c: 3}
*/
function promisifyMultiResult(fn, resultNames) {
function promisified(...args) {
return new Promise((resolve, reject) => {
try {
fn.bind(this)(...args, (err, ...results) => {
if (err != null) {
return reject(err)
}
const promiseResult = {}
for (let i = 0; i < resultNames.length; i++) {
promiseResult[resultNames[i]] = results[i]
}
resolve(promiseResult)
})
} catch (err) {
reject(err)
}
})
}
return promisified
}
/**
* Reverse the effect of `promisifyMultiResult`.
*
* This is meant for providing a temporary backward compatible callback
* interface while we migrate to promises.
*/
function callbackifyMultiResult(fn, resultNames) {
function callbackified(...args) {
const [callback] = args.splice(-1)
fn(...args)
.then(result => {
const cbResults = resultNames.map(resultName => result[resultName])
callback(null, ...cbResults)
})
.catch(err => {
callback(err)
})
}
return callbackified
}
/**
* Transform an async function into an Express middleware
*
* Any error will be passed to the error middlewares via `next()`
*/
function expressify(fn) {
return (req, res, next) => {
fn(req, res, next).catch(next)
}
}
/**
* Map values in `array` with the async function `fn`
*
* Limit the number of unresolved promises to `concurrency`.
*/
function promiseMapWithLimit(concurrency, array, fn) {
const limit = pLimit(concurrency)
return Promise.all(array.map(x => limit(() => fn(x))))
}

1
services/web/package.json
View file

@ -74,6 +74,7 @@
"@overleaf/metrics": "*", "@overleaf/metrics": "*",
"@overleaf/o-error": "*", "@overleaf/o-error": "*",
"@overleaf/object-persistor": "*", "@overleaf/object-persistor": "*",
"@overleaf/promise-utils": "*",
"@overleaf/redis-wrapper": "*", "@overleaf/redis-wrapper": "*",
"@overleaf/settings": "*", "@overleaf/settings": "*",
"@slack/webhook": "^6.1.0", "@slack/webhook": "^6.1.0",

2
services/web/scripts/back_fill_deleted_files.js
View file

@ -1,5 +1,5 @@
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit, promisify } = require('../app/src/util/promises') const { promiseMapWithLimit, promisify } = require('@overleaf/promise-utils')
const { db } = require('../app/src/infrastructure/mongodb') const { db } = require('../app/src/infrastructure/mongodb')
const sleep = promisify(setTimeout) const sleep = promisify(setTimeout)
const _ = require('lodash') const _ = require('lodash')

2
services/web/scripts/back_fill_doc_name_for_deleted_docs.js
View file

@ -1,5 +1,5 @@
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit, promisify } = require('../app/src/util/promises') const { promiseMapWithLimit, promisify } = require('@overleaf/promise-utils')
const { db } = require('../app/src/infrastructure/mongodb') const { db } = require('../app/src/infrastructure/mongodb')
const sleep = promisify(setTimeout) const sleep = promisify(setTimeout)
const _ = require('lodash') const _ = require('lodash')

2
services/web/scripts/backfill_mixpanel_user_properties.js
View file

@ -3,7 +3,7 @@ const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10
require('../app/src/models/User') require('../app/src/models/User')
const { batchedUpdateWithResultHandling } = require('./helpers/batchedUpdate') const { batchedUpdateWithResultHandling } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { getQueue } = require('../app/src/infrastructure/Queues') const { getQueue } = require('../app/src/infrastructure/Queues')
const SubscriptionLocator = require('../app/src/Features/Subscription/SubscriptionLocator') const SubscriptionLocator = require('../app/src/Features/Subscription/SubscriptionLocator')

2
services/web/scripts/backfill_user_properties.js
View file

@ -1,7 +1,7 @@
const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10 const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10
const { batchedUpdateWithResultHandling } = require('./helpers/batchedUpdate') const { batchedUpdateWithResultHandling } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const SubscriptionLocator = require('../app/src/Features/Subscription/SubscriptionLocator') const SubscriptionLocator = require('../app/src/Features/Subscription/SubscriptionLocator')
const PlansLocator = require('../app/src/Features/Subscription/PlansLocator') const PlansLocator = require('../app/src/Features/Subscription/PlansLocator')
const FeaturesHelper = require('../app/src/Features/Subscription/FeaturesHelper') const FeaturesHelper = require('../app/src/Features/Subscription/FeaturesHelper')

2
services/web/scripts/bench_bcrypt.js
View file

@ -1,7 +1,7 @@
const minimist = require('minimist') const minimist = require('minimist')
const { promisify } = require('util') const { promisify } = require('util')
const bcrypt = require('bcrypt') const bcrypt = require('bcrypt')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const csv = require('csv/sync') const csv = require('csv/sync')
const bcryptCompare = promisify(bcrypt.compare) const bcryptCompare = promisify(bcrypt.compare)

2
services/web/scripts/clear_sessions_2fa.js
View file

@ -1,4 +1,4 @@
const { promisify, promiseMapWithLimit } = require('../app/src/util/promises') const { promisify, promiseMapWithLimit } = require('@overleaf/promise-utils')
const rClient = require('../app/src/Features/User/UserSessionsRedis').client() const rClient = require('../app/src/Features/User/UserSessionsRedis').client()
const args = require('minimist')(process.argv.slice(2)) const args = require('minimist')(process.argv.slice(2))

2
services/web/scripts/convert_archived_state.js
View file

@ -4,7 +4,7 @@ const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10
const { db } = require('../app/src/infrastructure/mongodb') const { db } = require('../app/src/infrastructure/mongodb')
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
// $ node scripts/convert_archived_state.js FIRST,SECOND // $ node scripts/convert_archived_state.js FIRST,SECOND

2
services/web/scripts/delete_orphaned_chat_threads.js
View file

@ -14,7 +14,7 @@ process.env.MONGO_SOCKET_TIMEOUT =
parseInt(process.env.MONGO_SOCKET_TIMEOUT, 10) || 600000 parseInt(process.env.MONGO_SOCKET_TIMEOUT, 10) || 600000
const { ObjectId } = require('mongodb') const { ObjectId } = require('mongodb')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')
const ChatApiHandler = require('../app/src/Features/Chat/ChatApiHandler') const ChatApiHandler = require('../app/src/Features/Chat/ChatApiHandler')
const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper') const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper')

2
services/web/scripts/delete_orphaned_data_helper.js
View file

@ -3,7 +3,7 @@ const {
READ_PREFERENCE_PRIMARY, READ_PREFERENCE_PRIMARY,
READ_PREFERENCE_SECONDARY, READ_PREFERENCE_SECONDARY,
} = require('../app/src/infrastructure/mongodb') } = require('../app/src/infrastructure/mongodb')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
async function getDeletedProject(projectId, readPreference) { async function getDeletedProject(projectId, readPreference) {
return await db.deletedProjects.findOne( return await db.deletedProjects.findOne(

2
services/web/scripts/delete_orphaned_doc_comment_ranges.js
View file

@ -6,7 +6,7 @@ const { waitForDb } = require('../app/src/infrastructure/mongodb')
const ChatApiHandler = require('../app/src/Features/Chat/ChatApiHandler') const ChatApiHandler = require('../app/src/Features/Chat/ChatApiHandler')
const DocstoreManager = require('../app/src/Features/Docstore/DocstoreManager') const DocstoreManager = require('../app/src/Features/Docstore/DocstoreManager')
const DocumentUpdaterHandler = require('../app/src/Features/DocumentUpdater/DocumentUpdaterHandler') const DocumentUpdaterHandler = require('../app/src/Features/DocumentUpdater/DocumentUpdaterHandler')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
/** /**
* Remove doc comment ranges that are "orphaned" as they do have matching chat * Remove doc comment ranges that are "orphaned" as they do have matching chat

2
services/web/scripts/delete_orphaned_docs_online_check.js
View file

@ -7,7 +7,7 @@ const {
READ_PREFERENCE_PRIMARY, READ_PREFERENCE_PRIMARY,
READ_PREFERENCE_SECONDARY, READ_PREFERENCE_SECONDARY,
} = require('../app/src/infrastructure/mongodb') } = require('../app/src/infrastructure/mongodb')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper') const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper')
const sleep = promisify(setTimeout) const sleep = promisify(setTimeout)

2
services/web/scripts/delete_orphaned_project_archives.js
View file

@ -1,7 +1,7 @@
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
const { fetchJson } = require('@overleaf/fetch-utils') const { fetchJson } = require('@overleaf/fetch-utils')
const { waitForDb } = require('../app/src/infrastructure/mongodb') const { waitForDb } = require('../app/src/infrastructure/mongodb')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper') const { getHardDeletedProjectIds } = require('./delete_orphaned_data_helper')
const TpdsUpdateSender = require('../app/src/Features/ThirdPartyDataStore/TpdsUpdateSender') const TpdsUpdateSender = require('../app/src/Features/ThirdPartyDataStore/TpdsUpdateSender')
const { promisify } = require('util') const { promisify } = require('util')

2
services/web/scripts/migrate_audit_logs.js
View file

@ -1,5 +1,5 @@
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')
const { promiseMapWithLimit, promisify } = require('../app/src/util/promises') const { promiseMapWithLimit, promisify } = require('@overleaf/promise-utils')
const { db, ObjectId, waitForDb } = require('../app/src/infrastructure/mongodb') const { db, ObjectId, waitForDb } = require('../app/src/infrastructure/mongodb')
const sleep = promisify(setTimeout) const sleep = promisify(setTimeout)
const _ = require('lodash') const _ = require('lodash')

2
services/web/scripts/regenerate_duplicate_referral_ids.js
View file

@ -8,7 +8,7 @@ const {
db, db,
READ_PREFERENCE_SECONDARY, READ_PREFERENCE_SECONDARY,
} = require('../app/src/infrastructure/mongodb') } = require('../app/src/infrastructure/mongodb')
const { promiseMapWithLimit } = require('../app/src/util/promises') const { promiseMapWithLimit } = require('@overleaf/promise-utils')
const TokenGenerator = require('../app/src/Features/TokenGenerator/TokenGenerator') const TokenGenerator = require('../app/src/Features/TokenGenerator/TokenGenerator')
const { batchedUpdate } = require('./helpers/batchedUpdate') const { batchedUpdate } = require('./helpers/batchedUpdate')

2
services/web/test/acceptance/src/helpers/RecurlySubscription.js
View file

@ -2,7 +2,7 @@ const { ObjectId } = require('mongodb')
const Subscription = require('./Subscription') const Subscription = require('./Subscription')
const MockRecurlyApiClass = require('../mocks/MockRecurlyApi') const MockRecurlyApiClass = require('../mocks/MockRecurlyApi')
const RecurlyWrapper = require('../../../../app/src/Features/Subscription/RecurlyWrapper') const RecurlyWrapper = require('../../../../app/src/Features/Subscription/RecurlyWrapper')
const { promisifyClass } = require('../../../../app/src/util/promises') const { promisifyClass } = require('@overleaf/promise-utils')
let MockRecurlyApi let MockRecurlyApi

1
services/web/test/unit/bootstrap.js vendored
View file

@ -64,7 +64,6 @@ function getSandboxedModuleRequires() {
} }
const internalModules = [ const internalModules = [
'../../app/src/util/promises',
'../../app/src/Features/Errors/Errors', '../../app/src/Features/Errors/Errors',
'../../app/src/Features/Helpers/Mongo', '../../app/src/Features/Helpers/Mongo',
] ]

211
services/web/test/unit/src/util/promisesTests.js
View file

@ -1,211 +0,0 @@
const { expect } = require('chai')
const {
promisifyAll,
promisifyClass,
callbackifyMultiResult,
} = require('../../../../app/src/util/promises')
describe('promisifyAll', function () {
describe('basic functionality', function () {
before(function () {
this.module = {
SOME_CONSTANT: 1,
asyncAdd(a, b, callback) {
callback(null, a + b)
},
asyncDouble(x, callback) {
this.asyncAdd(x, x, callback)
},
}
this.promisified = promisifyAll(this.module)
})
it('promisifies functions in the module', async function () {
const sum = await this.promisified.asyncAdd(29, 33)
expect(sum).to.equal(62)
})
it('binds this to the original module', async function () {
const sum = await this.promisified.asyncDouble(38)
expect(sum).to.equal(76)
})
it('does not copy over non-functions', async function () {
expect(this.promisified).not.to.have.property('SOME_CONSTANT')
})
it('does not modify the prototype of the module', async function () {
expect(this.promisified.toString()).to.equal('[object Object]')
})
})
describe('without option', function () {
before(function () {
this.module = {
asyncAdd(a, b, callback) {
callback(null, a + b)
},
syncAdd(a, b) {
return a + b
},
}
this.promisified = promisifyAll(this.module, { without: ['syncAdd'] })
})
it('does not promisify excluded functions', function () {
expect(this.promisified.syncAdd).not.to.exist
})
it('promisifies other functions', async function () {
const sum = await this.promisified.asyncAdd(12, 89)
expect(sum).to.equal(101)
})
})
describe('multiResult option', function () {
before(function () {
this.module = {
asyncAdd(a, b, callback) {
callback(null, a + b)
},
asyncArithmetic(a, b, callback) {
callback(null, a + b, a * b)
},
}
this.promisified = promisifyAll(this.module, {
multiResult: { asyncArithmetic: ['sum', 'product'] },
})
})
it('promisifies multi-result functions', async function () {
const result = await this.promisified.asyncArithmetic(3, 6)
expect(result).to.deep.equal({ sum: 9, product: 18 })
})
it('promisifies other functions normally', async function () {
const sum = await this.promisified.asyncAdd(6, 1)
expect(sum).to.equal(7)
})
})
})
describe('promisifyClass', function () {
describe('basic functionality', function () {
before(function () {
this.Class = class {
constructor(a) {
this.a = a
}
asyncAdd(b, callback) {
callback(null, this.a + b)
}
}
this.Promisified = promisifyClass(this.Class)
})
it('promisifies the class methods', async function () {
const adder = new this.Promisified(1)
const sum = await adder.asyncAdd(2)
expect(sum).to.equal(3)
})
})
describe('without option', function () {
before(function () {
this.Class = class {
constructor(a) {
this.a = a
}
asyncAdd(b, callback) {
callback(null, this.a + b)
}
syncAdd(b) {
return this.a + b
}
}
this.Promisified = promisifyClass(this.Class, { without: ['syncAdd'] })
})
it('does not promisify excluded functions', function () {
const adder = new this.Promisified(10)
const sum = adder.syncAdd(12)
expect(sum).to.equal(22)
})
it('promisifies other functions', async function () {
const adder = new this.Promisified(23)
const sum = await adder.asyncAdd(3)
expect(sum).to.equal(26)
})
})
describe('multiResult option', function () {
before(function () {
this.Class = class {
constructor(a) {
this.a = a
}
asyncAdd(b, callback) {
callback(null, this.a + b)
}
asyncArithmetic(b, callback) {
callback(null, this.a + b, this.a * b)
}
}
this.Promisified = promisifyClass(this.Class, {
multiResult: { asyncArithmetic: ['sum', 'product'] },
})
})
it('promisifies multi-result functions', async function () {
const adder = new this.Promisified(3)
const result = await adder.asyncArithmetic(6)
expect(result).to.deep.equal({ sum: 9, product: 18 })
})
it('promisifies other functions normally', async function () {
const adder = new this.Promisified(6)
const sum = await adder.asyncAdd(1)
expect(sum).to.equal(7)
})
})
})
describe('callbackifyMultiResult', function () {
it('callbackifies a multi-result function', function (done) {
async function asyncArithmetic(a, b) {
return { sum: a + b, product: a * b }
}
const callbackified = callbackifyMultiResult(asyncArithmetic, [
'sum',
'product',
])
callbackified(3, 11, (err, sum, product) => {
if (err != null) {
return done(err)
}
expect(sum).to.equal(14)
expect(product).to.equal(33)
done()
})
})
it('propagates errors', function (done) {
async function asyncBomb() {
throw new Error('BOOM!')
}
const callbackified = callbackifyMultiResult(asyncBomb, [
'explosives',
'dynamite',
])
callbackified(err => {
expect(err).to.exist
done()
})
})
})