diff --git a/package-lock.json b/package-lock.json index ef4518ab5..46eb39f0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,6 @@ "db-migrate": "^0.11.13", "db-migrate-mysql": "^2.2.0", "debug": "^4.3.4", - "delay": "^5.0.0", "dockerode": "^3.3.1", "ejs": "^3.1.6", "ejs-cli": "^2.2.3", @@ -2021,17 +2020,6 @@ "node": ">=8" } }, - "node_modules/delay": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz", - "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -9530,11 +9518,6 @@ "strip-bom": "^4.0.0" } }, - "delay": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz", - "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==" - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", diff --git a/package.json b/package.json index 0a594737e..e04ec40ec 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "db-migrate": "^0.11.13", "db-migrate-mysql": "^2.2.0", "debug": "^4.3.4", - "delay": "^5.0.0", "dockerode": "^3.3.1", "ejs": "^3.1.6", "ejs-cli": "^2.2.3", diff --git a/src/cloudron.js b/src/cloudron.js index 2392fc287..f876807b0 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -32,7 +32,7 @@ const apps = require('./apps.js'), constants = require('./constants.js'), cron = require('./cron.js'), debug = require('debug')('box:cloudron'), - delay = require('delay'), + delay = require('./delay.js'), dns = require('./dns.js'), dockerProxy = require('./dockerproxy.js'), domains = require('./domains.js'), diff --git a/src/delay.js b/src/delay.js new file mode 100644 index 000000000..b013440ee --- /dev/null +++ b/src/delay.js @@ -0,0 +1,13 @@ +'use strict'; + +exports = module.exports = delay; + +const assert = require('assert'); + +function delay(msecs) { + assert.strictEqual(typeof msecs, 'number'); + + return new Promise(function (resolve) { + setTimeout(resolve, msecs); + }); +} diff --git a/src/docker.js b/src/docker.js index de56be281..23de06a46 100644 --- a/src/docker.js +++ b/src/docker.js @@ -34,7 +34,7 @@ const apps = require('./apps.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:docker'), - delay = require('delay'), + delay = require('./delay.js'), Docker = require('dockerode'), path = require('path'), reverseProxy = require('./reverseproxy.js'), diff --git a/src/platform.js b/src/platform.js index 96e976bd5..ffc77d756 100644 --- a/src/platform.js +++ b/src/platform.js @@ -13,7 +13,7 @@ const apps = require('./apps.js'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), debug = require('debug')('box:platform'), - delay = require('delay'), + delay = require('./delay.js'), fs = require('fs'), infra = require('./infra_version.js'), locker = require('./locker.js'), diff --git a/src/promise-retry.js b/src/promise-retry.js index 0b174b4e3..a32b53a1d 100644 --- a/src/promise-retry.js +++ b/src/promise-retry.js @@ -3,7 +3,7 @@ exports = module.exports = promiseRetry; const assert = require('assert'), - delay = require('delay'), + delay = require('./delay.js'), util = require('util'); async function promiseRetry(options, asyncFunction) { diff --git a/src/routes/test/api-test.js b/src/routes/test/api-test.js index 577f3ea37..0653299a6 100644 --- a/src/routes/test/api-test.js +++ b/src/routes/test/api-test.js @@ -7,7 +7,7 @@ 'use strict'; const common = require('./common.js'), - delay = require('delay'), + delay = require('../../delay.js'), expect = require('expect.js'), superagent = require('superagent'), tokens = require('../../tokens.js'); diff --git a/src/routes/test/common.js b/src/routes/test/common.js index bb5baa597..b6fdf0274 100644 --- a/src/routes/test/common.js +++ b/src/routes/test/common.js @@ -2,7 +2,7 @@ const constants = require('../../constants.js'), database = require('../../database.js'), - delay = require('delay'), + delay = require('../../delay.js'), expect = require('expect.js'), fs = require('fs'), mailer = require('../../mailer.js'), diff --git a/src/routes/test/provision-test.js b/src/routes/test/provision-test.js index 0ef99313d..f5e09fb29 100644 --- a/src/routes/test/provision-test.js +++ b/src/routes/test/provision-test.js @@ -7,7 +7,7 @@ const common = require('./common.js'); -const delay = require('delay'), +const delay = require('../../delay.js'), expect = require('expect.js'), superagent = require('superagent'); diff --git a/src/test/backupcleaner-test.js b/src/test/backupcleaner-test.js index d24dd0904..37dc41967 100644 --- a/src/test/backupcleaner-test.js +++ b/src/test/backupcleaner-test.js @@ -9,7 +9,7 @@ const backupCleaner = require('../backupcleaner.js'), backups = require('../backups.js'), common = require('./common.js'), - delay = require('delay'), + delay = require('../delay.js'), expect = require('expect.js'), moment = require('moment'), settings = require('../settings.js'), diff --git a/src/test/backuptask-test.js b/src/test/backuptask-test.js index d5b9bfb83..f3e01ae57 100644 --- a/src/test/backuptask-test.js +++ b/src/test/backuptask-test.js @@ -10,7 +10,7 @@ const backups = require('../backups.js'), backuptask = require('../backuptask.js'), common = require('./common.js'), DataLayout = require('../datalayout.js'), - delay = require('delay'), + delay = require('../delay.js'), expect = require('expect.js'), fs = require('fs'), os = require('os'), diff --git a/src/test/common.js b/src/test/common.js index 11d7cc72e..30753d375 100644 --- a/src/test/common.js +++ b/src/test/common.js @@ -4,7 +4,7 @@ const apps = require('../apps.js'), async = require('async'), constants = require('../constants.js'), database = require('../database.js'), - delay = require('delay'), + delay = require('../delay.js'), domains = require('../domains.js'), expect = require('expect.js'), fs = require('fs'), diff --git a/src/test/eventlog-test.js b/src/test/eventlog-test.js index d845adb95..6d2f74f3c 100644 --- a/src/test/eventlog-test.js +++ b/src/test/eventlog-test.js @@ -8,7 +8,7 @@ const common = require('./common.js'), database = require('../database.js'), - delay = require('delay'), + delay = require('../delay.js'), eventlog = require('../eventlog.js'), expect = require('expect.js'), notifications = require('../notifications.js'); diff --git a/src/test/notifications-test.js b/src/test/notifications-test.js index 3141069f1..7d4cbd3d8 100644 --- a/src/test/notifications-test.js +++ b/src/test/notifications-test.js @@ -8,7 +8,7 @@ const BoxError = require('../boxerror.js'), common = require('./common.js'), - delay = require('delay'), + delay = require('../delay.js'), expect = require('expect.js'), notifications = require('../notifications.js'), safe = require('safetydance');