diff --git a/box.js b/box.js index 6fd723a7b..a7aa4c328 100755 --- a/box.js +++ b/box.js @@ -3,9 +3,9 @@ 'use strict'; const constants = require('./src/constants.js'), - fs = require('fs'), + fs = require('node:fs'), ldapServer = require('./src/ldapserver.js'), - net = require('net'), + net = require('node:net'), oidcServer = require('./src/oidcserver.js'), paths = require('./src/paths.js'), proxyAuth = require('./src/proxyauth.js'), diff --git a/migrations/20141021192552-db-create.js b/migrations/20141021192552-db-create.js index 9bdef02a7..8a6c54ae1 100644 --- a/migrations/20141021192552-db-create.js +++ b/migrations/20141021192552-db-create.js @@ -1,6 +1,6 @@ 'use strict'; -var url = require('url'); +var url = require('node:url'); exports.up = function(db, callback) { var dbName = url.parse(process.env.DATABASE_URL).path.substr(1); // remove slash diff --git a/migrations/20141021192554-db-init.js b/migrations/20141021192554-db-init.js index f1f7dc0fd..a1c0cb5d7 100644 --- a/migrations/20141021192554-db-init.js +++ b/migrations/20141021192554-db-init.js @@ -1,8 +1,8 @@ 'use strict'; -var fs = require('fs'), +var fs = require('node:fs'), async = require('async'), - path = require('path'); + path = require('node:path'); exports.up = function(db, callback) { var schema = fs.readFileSync(path.join(__dirname, 'initial-schema.sql')).toString('utf8'); diff --git a/migrations/20170414193114-database-utf8mb4.js b/migrations/20170414193114-database-utf8mb4.js index f1c9c838b..7464e80eb 100644 --- a/migrations/20170414193114-database-utf8mb4.js +++ b/migrations/20170414193114-database-utf8mb4.js @@ -1,6 +1,6 @@ 'use strict'; -var url = require('url'); +var url = require('node:url'); exports.up = function(db, callback) { var dbName = url.parse(process.env.DATABASE_URL).path.substr(1); // remove slash diff --git a/migrations/20180202184625-download-caas-appstore-configs.js b/migrations/20180202184625-download-caas-appstore-configs.js index 35b9ad8d1..8cdede474 100644 --- a/migrations/20180202184625-download-caas-appstore-configs.js +++ b/migrations/20180202184625-download-caas-appstore-configs.js @@ -1,6 +1,6 @@ 'use strict'; -const fs = require('fs'), +const fs = require('node:fs'), superagent = require('@cloudron/superagent'); exports.up = async function(db) { diff --git a/migrations/20180207000001-migrate-altDomain-to-manual-domain.js b/migrations/20180207000001-migrate-altDomain-to-manual-domain.js index 13136c328..82e1c1c13 100644 --- a/migrations/20180207000001-migrate-altDomain-to-manual-domain.js +++ b/migrations/20180207000001-migrate-altDomain-to-manual-domain.js @@ -1,10 +1,10 @@ 'use strict'; var async = require('async'), - crypto = require('crypto'), - fs = require('fs'), - os = require('os'), - path = require('path'), + crypto = require('node:crypto'), + fs = require('node:fs'), + os = require('node:os'), + path = require('node:path'), safe = require('safetydance'), tldjs = require('tldjs'); diff --git a/migrations/20190215215805-tokens-add-id.js b/migrations/20190215215805-tokens-add-id.js index 1bf6b0bad..de170e6e2 100644 --- a/migrations/20190215215805-tokens-add-id.js +++ b/migrations/20190215215805-tokens-add-id.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - crypto = require('crypto'); + crypto = require('node:crypto'); exports.up = function(db, callback) { async.series([ diff --git a/migrations/20190503170326-settings-get-license.js b/migrations/20190503170326-settings-get-license.js index 4b92dcb4a..7d396dd50 100644 --- a/migrations/20190503170326-settings-get-license.js +++ b/migrations/20190503170326-settings-get-license.js @@ -1,6 +1,6 @@ 'use strict'; -const fs = require('fs'), +const fs = require('node:fs'), superagent = require('@cloudron/superagent'); exports.up = async function(db) { diff --git a/migrations/20190725172940-settings-migrate-cloudron-conf.js b/migrations/20190725172940-settings-migrate-cloudron-conf.js index 91f4c3ff3..d51a46df2 100644 --- a/migrations/20190725172940-settings-migrate-cloudron-conf.js +++ b/migrations/20190725172940-settings-migrate-cloudron-conf.js @@ -1,7 +1,7 @@ 'use strict'; var async = require('async'), - fs = require('fs'); + fs = require('node:fs'); exports.up = function(db, callback) { if (!fs.existsSync('/etc/cloudron/cloudron.conf')) { diff --git a/migrations/20191029223928-settings-default-sysinfo.js b/migrations/20191029223928-settings-default-sysinfo.js index 325a4e56e..5f049aa5a 100644 --- a/migrations/20191029223928-settings-default-sysinfo.js +++ b/migrations/20191029223928-settings-default-sysinfo.js @@ -1,6 +1,6 @@ 'use strict'; -var fs = require('fs'); +var fs = require('node:fs'); exports.up = function(db, callback) { let sysinfoConfig = { provider: 'generic' }; diff --git a/migrations/20200512172301-settings-backup-encryption.js b/migrations/20200512172301-settings-backup-encryption.js index 7a0e9a685..8dc263b2d 100644 --- a/migrations/20200512172301-settings-backup-encryption.js +++ b/migrations/20200512172301-settings-backup-encryption.js @@ -1,6 +1,6 @@ 'use strict'; -const fs = require('fs'), +const fs = require('node:fs'), hush = require('../src/hush.js'); exports.up = function(db, callback) { diff --git a/migrations/20200914172345-split-firewall-config.js b/migrations/20200914172345-split-firewall-config.js index 87de4405a..54a089853 100644 --- a/migrations/20200914172345-split-firewall-config.js +++ b/migrations/20200914172345-split-firewall-config.js @@ -4,7 +4,7 @@ const OLD_FIREWALL_CONFIG_JSON = '/home/yellowtent/boxdata/firewall-config.json' const PORTS_FILE = '/home/yellowtent/boxdata/firewall/ports.json'; const BLOCKLIST_FILE = '/home/yellowtent/boxdata/firewall/blocklist.txt'; -const fs = require('fs'); +const fs = require('node:fs'); exports.up = function (db, callback) { if (!fs.existsSync(OLD_FIREWALL_CONFIG_JSON)) return callback(); diff --git a/migrations/20210429194328-users-add-avatar.js b/migrations/20210429194328-users-add-avatar.js index 3ee11a84c..1a75698d8 100644 --- a/migrations/20210429194328-users-add-avatar.js +++ b/migrations/20210429194328-users-add-avatar.js @@ -1,8 +1,8 @@ 'use strict'; const async = require('async'), - fs = require('fs'), - path = require('path'); + fs = require('node:fs'), + path = require('node:path'); const AVATAR_DIR = '/home/yellowtent/boxdata/profileicons'; diff --git a/migrations/20210429224354-settings-add-valueBlob.js b/migrations/20210429224354-settings-add-valueBlob.js index 64f4b0002..d9d525dc6 100644 --- a/migrations/20210429224354-settings-add-valueBlob.js +++ b/migrations/20210429224354-settings-add-valueBlob.js @@ -1,6 +1,6 @@ 'use strict'; -const fs = require('fs'); +const fs = require('node:fs'); exports.up = function(db, callback) { db.runSql('ALTER TABLE settings ADD COLUMN valueBlob MEDIUMBLOB', function (error) { diff --git a/migrations/20210430200947-apps-add-icon.js b/migrations/20210430200947-apps-add-icon.js index 124e4fc31..bc549cbef 100644 --- a/migrations/20210430200947-apps-add-icon.js +++ b/migrations/20210430200947-apps-add-icon.js @@ -1,8 +1,8 @@ 'use strict'; const async = require('async'), - fs = require('fs'), - path = require('path'); + fs = require('node:fs'), + path = require('node:path'); const APPICONS_DIR = '/home/yellowtent/boxdata/appicons'; diff --git a/migrations/20210503182308-blobs-migrate-secrets.js b/migrations/20210503182308-blobs-migrate-secrets.js index d27a238db..64dcdb399 100644 --- a/migrations/20210503182308-blobs-migrate-secrets.js +++ b/migrations/20210503182308-blobs-migrate-secrets.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - fs = require('fs'), + fs = require('node:fs'), safe = require('safetydance'); const BOX_DATA_DIR = '/home/yellowtent/boxdata'; diff --git a/migrations/20210504221634-settings-migrate-firewall.js b/migrations/20210504221634-settings-migrate-firewall.js index 864be5e83..7ded8fb2a 100644 --- a/migrations/20210504221634-settings-migrate-firewall.js +++ b/migrations/20210504221634-settings-migrate-firewall.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - fs = require('fs'), + fs = require('node:fs'), safe = require('safetydance'); const BOX_DATA_DIR = '/home/yellowtent/boxdata'; diff --git a/migrations/20210505165936-subdomains-add-certificateJson.js b/migrations/20210505165936-subdomains-add-certificateJson.js index 689d9a8de..518ca67f7 100644 --- a/migrations/20210505165936-subdomains-add-certificateJson.js +++ b/migrations/20210505165936-subdomains-add-certificateJson.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - fs = require('fs'), + fs = require('node:fs'), safe = require('safetydance'); const CERTS_DIR = '/home/yellowtent/boxdata/certs'; diff --git a/migrations/20210505223829-blobs-migrate-certs.js b/migrations/20210505223829-blobs-migrate-certs.js index 7ba172645..243fca62e 100644 --- a/migrations/20210505223829-blobs-migrate-certs.js +++ b/migrations/20210505223829-blobs-migrate-certs.js @@ -1,9 +1,9 @@ 'use strict'; const async = require('async'), - child_process = require('child_process'), - fs = require('fs'), - path = require('path'), + child_process = require('node:child_process'), + fs = require('node:fs'), + path = require('node:path'), safe = require('safetydance'); const OLD_CERTS_DIR = '/home/yellowtent/boxdata/certs'; diff --git a/migrations/20211012020255-mail-add-dkimKeyJson.js b/migrations/20211012020255-mail-add-dkimKeyJson.js index 33e302ee8..fadc484ad 100644 --- a/migrations/20211012020255-mail-add-dkimKeyJson.js +++ b/migrations/20211012020255-mail-add-dkimKeyJson.js @@ -1,8 +1,8 @@ 'use strict'; const async = require('async'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), safe = require('safetydance'); const MAIL_DATA_DIR = '/home/yellowtent/boxdata/mail'; diff --git a/migrations/20220219220751-mail-ensure-dkimKey.js b/migrations/20220219220751-mail-ensure-dkimKey.js index 2477c4fb0..3a91436ad 100644 --- a/migrations/20220219220751-mail-ensure-dkimKey.js +++ b/migrations/20220219220751-mail-ensure-dkimKey.js @@ -3,7 +3,7 @@ const async = require('async'), mail = require('../src/mail.js'), safe = require('safetydance'), - util = require('util'); + util = require('node:util'); // it seems some mail domains do not have dkimKey in the database for some reason because of some previous bad migration exports.up = function(db, callback) { diff --git a/migrations/20220602050517-apps-add-storageVolumeId.js b/migrations/20220602050517-apps-add-storageVolumeId.js index 696272b0d..66e1789ff 100644 --- a/migrations/20220602050517-apps-add-storageVolumeId.js +++ b/migrations/20220602050517-apps-add-storageVolumeId.js @@ -1,7 +1,7 @@ 'use strict'; -const crypto = require('crypto'), - path = require('path'), +const crypto = require('node:crypto'), + path = require('node:path'), safe = require('safetydance'); function getMountPoint(dataDir) { diff --git a/migrations/20250507122501-dockerRegistries-create-table.js b/migrations/20250507122501-dockerRegistries-create-table.js index efe6aa8bd..34fcf2959 100644 --- a/migrations/20250507122501-dockerRegistries-create-table.js +++ b/migrations/20250507122501-dockerRegistries-create-table.js @@ -1,6 +1,6 @@ 'use strict'; -const crypto = require('crypto'); +const crypto = require('node:crypto'); exports.up = async function (db) { const cmd = 'CREATE TABLE IF NOT EXISTS dockerRegistries(' + diff --git a/migrations/20250724102340-backupTargets-create-table.js b/migrations/20250724102340-backupTargets-create-table.js index 05d90b60a..e5e6c857c 100644 --- a/migrations/20250724102340-backupTargets-create-table.js +++ b/migrations/20250724102340-backupTargets-create-table.js @@ -1,9 +1,9 @@ 'use strict'; -const child_process = require('child_process'), - crypto = require('crypto'), - fs = require('fs'), - path = require('path'), +const child_process = require('node:child_process'), + crypto = require('node:crypto'), + fs = require('node:fs'), + path = require('node:path'), paths = require('../src/paths.js'); exports.up = async function (db) { diff --git a/migrations/20250724141339-backups-add-targetId.js b/migrations/20250724141339-backups-add-targetId.js index aba8ee0f8..380b08a0a 100644 --- a/migrations/20250724141339-backups-add-targetId.js +++ b/migrations/20250724141339-backups-add-targetId.js @@ -1,7 +1,7 @@ 'use strict'; -const crypto = require('crypto'), - path = require('path'), +const crypto = require('node:crypto'), + path = require('node:path'), paths = require('../src/paths.js'); exports.up = async function(db) { diff --git a/src/acme2.js b/src/acme2.js index 7baf9f9f8..f41a01621 100644 --- a/src/acme2.js +++ b/src/acme2.js @@ -8,15 +8,15 @@ exports = module.exports = { _getChallengeSubdomain: getChallengeSubdomain }; -const assert = require('assert'), +const assert = require('node:assert'), blobs = require('./blobs.js'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), debug = require('debug')('box:cert/acme2'), dns = require('./dns.js'), - fs = require('fs'), - os = require('os'), - path = require('path'), + fs = require('node:fs'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), promiseRetry = require('./promise-retry.js'), safe = require('safetydance'), diff --git a/src/addonconfigs.js b/src/addonconfigs.js index b8569ebe8..1a933d5b6 100644 --- a/src/addonconfigs.js +++ b/src/addonconfigs.js @@ -11,7 +11,7 @@ exports = module.exports = { getAppIdByValue, }; -const assert = require('assert'), +const assert = require('node:assert'), database = require('./database.js'); async function set(appId, addonId, env) { diff --git a/src/apphealthmonitor.js b/src/apphealthmonitor.js index cfc5815e1..2789ccc51 100644 --- a/src/apphealthmonitor.js +++ b/src/apphealthmonitor.js @@ -1,7 +1,7 @@ 'use strict'; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), diff --git a/src/applinks.js b/src/applinks.js index e40e9eda4..16f86f243 100644 --- a/src/applinks.js +++ b/src/applinks.js @@ -9,10 +9,10 @@ exports = module.exports = { del, }; -const assert = require('assert'), +const assert = require('node:assert'), apps = require('./apps.js'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), debug = require('debug')('box:applinks'), jsdom = require('jsdom'), diff --git a/src/apppasswords.js b/src/apppasswords.js index 83b073171..fcde74099 100644 --- a/src/apppasswords.js +++ b/src/apppasswords.js @@ -9,9 +9,9 @@ exports = module.exports = { removePrivateFields }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), hat = require('./hat.js'), safe = require('safetydance'), diff --git a/src/apps.js b/src/apps.js index 9b34f7863..ec2fe0b1d 100644 --- a/src/apps.js +++ b/src/apps.js @@ -150,12 +150,12 @@ exports = module.exports = { const appTaskManager = require('./apptaskmanager.js'), archives = require('./archives.js'), - assert = require('assert'), + assert = require('node:assert'), backups = require('./backups.js'), backupTargets = require('./backuptargets.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), { CronTime } = require('cron'), dashboard = require('./dashboard.js'), database = require('./database.js'), @@ -164,7 +164,7 @@ const appTaskManager = require('./apptaskmanager.js'), docker = require('./docker.js'), domains = require('./domains.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), Location = require('./location.js'), locks = require('./locks.js'), logs = require('./logs.js'), @@ -172,18 +172,18 @@ const appTaskManager = require('./apptaskmanager.js'), manifestFormat = require('@cloudron/manifest-format'), notifications = require('./notifications.js'), once = require('./once.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), - PassThrough = require('stream').PassThrough, + PassThrough = require('node:stream').PassThrough, reverseProxy = require('./reverseproxy.js'), safe = require('safetydance'), semver = require('semver'), services = require('./services.js'), shell = require('./shell.js')('apps'), tasks = require('./tasks.js'), - TransformStream = require('stream').Transform, + TransformStream = require('node:stream').Transform, users = require('./users.js'), - util = require('util'), + util = require('node:util'), volumes = require('./volumes.js'), _ = require('./underscore.js'); diff --git a/src/appstore.js b/src/appstore.js index 910cc08b1..4de2e9a45 100644 --- a/src/appstore.js +++ b/src/appstore.js @@ -29,7 +29,7 @@ exports = module.exports = { _unregister: unregister }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:appstore'), diff --git a/src/apptask.js b/src/apptask.js index 3cb74abbc..776c0cd99 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -13,7 +13,7 @@ exports = module.exports = { const apps = require('./apps.js'), appstore = require('./appstore.js'), - assert = require('assert'), + assert = require('node:assert'), AuditSource = require('./auditsource.js'), backupTargets = require('./backuptargets.js'), backuptask = require('./backuptask.js'), @@ -24,11 +24,11 @@ const apps = require('./apps.js'), dns = require('./dns.js'), docker = require('./docker.js'), ejs = require('ejs'), - fs = require('fs'), + fs = require('node:fs'), iputils = require('./iputils.js'), manifestFormat = require('@cloudron/manifest-format'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), promiseRetry = require('./promise-retry.js'), reverseProxy = require('./reverseproxy.js'), diff --git a/src/apptaskmanager.js b/src/apptaskmanager.js index 195256a1a..d2df5cd1c 100644 --- a/src/apptaskmanager.js +++ b/src/apptaskmanager.js @@ -5,12 +5,12 @@ exports = module.exports = { scheduleTask }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), debug = require('debug')('box:apptaskmanager'), - fs = require('fs'), + fs = require('node:fs'), locks = require('./locks.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), scheduler = require('./scheduler.js'), diff --git a/src/archives.js b/src/archives.js index d855ea348..fdcf0d501 100644 --- a/src/archives.js +++ b/src/archives.js @@ -10,9 +10,9 @@ exports = module.exports = { del, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), eventlog = require('./eventlog.js'), safe = require('safetydance'); diff --git a/src/asynctask.js b/src/asynctask.js index 8c60ccaa7..57715d8d8 100644 --- a/src/asynctask.js +++ b/src/asynctask.js @@ -1,7 +1,7 @@ 'use strict'; const debug = require('debug')('box:asynctask'), - EventEmitter = require('events'), + EventEmitter = require('node:events'), safe = require('safetydance'); // this runs in-process diff --git a/src/backupcleaner.js b/src/backupcleaner.js index 6f8ec6faf..94224ae01 100644 --- a/src/backupcleaner.js +++ b/src/backupcleaner.js @@ -10,14 +10,14 @@ exports = module.exports = { const apps = require('./apps.js'), archives = require('./archives.js'), - assert = require('assert'), + assert = require('node:assert'), backups = require('./backups.js'), backupFormat = require('./backupformat.js'), backupTargets = require('./backuptargets.js'), constants = require('./constants.js'), debug = require('debug')('box:backupcleaner'), moment = require('moment'), - path = require('path'), + path = require('node:path'), safe = require('safetydance'); function applyBackupRetention(allBackups, retention, referencedBackupIds) { diff --git a/src/backupformat.js b/src/backupformat.js index ff5a429aa..1674b0176 100644 --- a/src/backupformat.js +++ b/src/backupformat.js @@ -5,7 +5,7 @@ exports = module.exports = { validateFormat, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'); function api(format) { diff --git a/src/backupformat/rsync.js b/src/backupformat/rsync.js index 226fac13f..a2d28a2b2 100644 --- a/src/backupformat/rsync.js +++ b/src/backupformat/rsync.js @@ -9,23 +9,23 @@ exports = module.exports = { _restoreFsMetadata: restoreFsMetadata }; -const assert = require('assert'), +const assert = require('node:assert'), async = require('async'), backupTargets = require('../backuptargets.js'), BoxError = require('../boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), DataLayout = require('../datalayout.js'), { DecryptStream } = require('../hush.js'), debug = require('debug')('box:backupformat/rsync'), { EncryptStream } = require('../hush.js'), - fs = require('fs'), + fs = require('node:fs'), HashStream = require('../hash-stream.js'), hush = require('../hush.js'), - path = require('path'), + path = require('node:path'), paths = require('../paths.js'), ProgressStream = require('../progress-stream.js'), promiseRetry = require('../promise-retry.js'), - { Readable } = require('stream'), + { Readable } = require('node:stream'), safe = require('safetydance'), shell = require('../shell.js')('backupformat/rsync'), stream = require('stream/promises'), diff --git a/src/backupformat/tgz.js b/src/backupformat/tgz.js index 9db4c63af..af48ac6a4 100644 --- a/src/backupformat/tgz.js +++ b/src/backupformat/tgz.js @@ -1,23 +1,23 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), backupTargets = require('../backuptargets.js'), BoxError = require('../boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), DataLayout = require('../datalayout.js'), debug = require('debug')('box:backupformat/tgz'), { DecryptStream, EncryptStream } = require('../hush.js'), - fs = require('fs'), + fs = require('node:fs'), HashStream = require('../hash-stream.js'), - path = require('path'), + path = require('node:path'), ProgressStream = require('../progress-stream.js'), promiseRetry = require('../promise-retry.js'), - { Readable } = require('stream'), + { Readable } = require('node:stream'), safe = require('safetydance'), stream = require('stream/promises'), { Transform } = require('node:stream'), tar = require('tar-stream'), - zlib = require('zlib'); + zlib = require('node:zlib'); // In tar, the entry header contains the file size. If we don't provide it those many bytes, the tar will become corrupt // Linux provides no guarantee of how many bytes can be read from a file. This is the case with sqlite and log files diff --git a/src/backups.js b/src/backups.js index fabcc40fe..3ce49e093 100644 --- a/src/backups.js +++ b/src/backups.js @@ -25,7 +25,7 @@ exports = module.exports = { BACKUP_STATE_ERROR: 'error', }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), database = require('./database.js'), hat = require('./hat.js'), diff --git a/src/backuptargets.js b/src/backuptargets.js index deb814bfb..2af2c31b7 100644 --- a/src/backuptargets.js +++ b/src/backuptargets.js @@ -34,20 +34,20 @@ exports = module.exports = { createPseudo, }; -const assert = require('assert'), +const assert = require('node:assert'), backupFormat = require('./backupformat.js'), backups = require('./backups.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), cron = require('./cron.js'), { CronTime } = require('cron'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), debug = require('debug')('box:backups'), eventlog = require('./eventlog.js'), hush = require('./hush.js'), locks = require('./locks.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), tasks = require('./tasks.js'); diff --git a/src/backuptask.js b/src/backuptask.js index 29820f483..40b05166b 100644 --- a/src/backuptask.js +++ b/src/backuptask.js @@ -15,7 +15,7 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), backupFormat = require('./backupformat.js'), backups = require('./backups.js'), backupTargets = require('./backuptargets.js'), @@ -26,7 +26,7 @@ const apps = require('./apps.js'), debug = require('debug')('box:backuptask'), df = require('./df.js'), locks = require('./locks.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), services = require('./services.js'), diff --git a/src/blobs.js b/src/blobs.js index d9bb3e3b4..d72e966bb 100644 --- a/src/blobs.js +++ b/src/blobs.js @@ -31,7 +31,7 @@ exports = module.exports = { _clear: clear }; -const assert = require('assert'), +const assert = require('node:assert'), database = require('./database.js'); const BLOBS_FIELDS = [ 'id', 'value' ].join(','); diff --git a/src/boxerror.js b/src/boxerror.js index 96e13cbab..aa898df4d 100644 --- a/src/boxerror.js +++ b/src/boxerror.js @@ -2,9 +2,9 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), HttpError = require('@cloudron/connect-lastmile').HttpError, - util = require('util'); + util = require('node:util'); exports = module.exports = BoxError; diff --git a/src/branding.js b/src/branding.js index 6540ff75a..4bb73b4d6 100644 --- a/src/branding.js +++ b/src/branding.js @@ -17,7 +17,7 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:branding'), diff --git a/src/changelog.js b/src/changelog.js index 9dae32ab8..082387053 100644 --- a/src/changelog.js +++ b/src/changelog.js @@ -1,8 +1,8 @@ 'use strict'; -const assert = require('assert'), - fs = require('fs'), - path = require('path'); +const assert = require('node:assert'), + fs = require('node:fs'), + path = require('node:path'); exports = module.exports = { getChanges diff --git a/src/cloudron.js b/src/cloudron.js index 5a25189b4..6f61de535 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -10,7 +10,7 @@ exports = module.exports = { setLanguage, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), cron = require('./cron.js'), diff --git a/src/constants.js b/src/constants.js index 9a74b0a57..5fd53f899 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,7 +1,7 @@ 'use strict'; -const fs = require('fs'), - path = require('path'); +const fs = require('node:fs'), + path = require('node:path'); const CLOUDRON = process.env.BOX_ENV === 'cloudron', TEST = process.env.BOX_ENV === 'test'; diff --git a/src/cron.js b/src/cron.js index e2ba12678..12ae264c9 100644 --- a/src/cron.js +++ b/src/cron.js @@ -21,7 +21,7 @@ exports = module.exports = { }; const appHealthMonitor = require('./apphealthmonitor.js'), - assert = require('assert'), + assert = require('node:assert'), appstore = require('./appstore.js'), AuditSource = require('./auditsource.js'), backupTargets = require('./backuptargets.js'), @@ -44,7 +44,7 @@ const appHealthMonitor = require('./apphealthmonitor.js'), scheduler = require('./scheduler.js'), system = require('./system.js'), updater = require('./updater.js'), - util = require('util'); + util = require('node:util'); const gJobs = { autoUpdater: null, diff --git a/src/dashboard.js b/src/dashboard.js index 34604f321..831a46f79 100644 --- a/src/dashboard.js +++ b/src/dashboard.js @@ -16,7 +16,7 @@ exports = module.exports = { const apps = require('./apps.js'), appstore = require('./appstore.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), branding = require('./branding.js'), constants = require('./constants.js'), diff --git a/src/database.js b/src/database.js index 8128089f9..d296bbff0 100644 --- a/src/database.js +++ b/src/database.js @@ -12,11 +12,11 @@ exports = module.exports = { _clear: clear }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:database'), - execSync = require('child_process').execSync, + execSync = require('node:child_process').execSync, mysql = require('mysql2/promise'), safe = require('safetydance'), shell = require('./shell.js')('database'); diff --git a/src/datalayout.js b/src/datalayout.js index e32dd91e5..ed1d78d08 100644 --- a/src/datalayout.js +++ b/src/datalayout.js @@ -1,7 +1,7 @@ 'use strict'; -const assert = require('assert'), - path = require('path'); +const assert = require('node:assert'), + path = require('node:path'); class DataLayout { constructor(localRoot, dirMap) { diff --git a/src/df.js b/src/df.js index a98475c8e..309102a88 100644 --- a/src/df.js +++ b/src/df.js @@ -6,7 +6,7 @@ exports = module.exports = { prettyBytes }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), debug = require('debug')('box:df'), safe = require('safetydance'), diff --git a/src/dig.js b/src/dig.js index bb3673e74..9cde53db6 100644 --- a/src/dig.js +++ b/src/dig.js @@ -4,9 +4,9 @@ exports = module.exports = { resolve, }; -const assert = require('assert'), +const assert = require('node:assert'), constants = require('./constants.js'), - dns = require('dns'); + dns = require('node:dns'); // a note on TXT records. It doesn't have quotes ("") at the DNS level. Those quotes // are added for DNS server software to enclose spaces. Such quotes may also be returned diff --git a/src/directoryserver.js b/src/directoryserver.js index 0f2ffa5bb..afcc240c6 100644 --- a/src/directoryserver.js +++ b/src/directoryserver.js @@ -10,7 +10,7 @@ exports = module.exports = { checkCertificate, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), @@ -19,14 +19,14 @@ const assert = require('assert'), ipaddr = require('./ipaddr.js'), groups = require('./groups.js'), ldap = require('ldapjs'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), reverseProxy = require('./reverseproxy.js'), safe = require('safetydance'), settings = require('./settings.js'), shell = require('./shell.js')('directoryserver'), users = require('./users.js'), - util = require('util'); + util = require('node:util'); let gServer = null, gCertificate = null; diff --git a/src/dns.js b/src/dns.js index ad01c81db..a8dc4d00a 100644 --- a/src/dns.js +++ b/src/dns.js @@ -24,7 +24,7 @@ module.exports = exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), dashboard = require('./dashboard.js'), diff --git a/src/dns/bunny.js b/src/dns/bunny.js index 13af2b7dc..b10f948d0 100644 --- a/src/dns/bunny.js +++ b/src/dns/bunny.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/bunny'), diff --git a/src/dns/cloudflare.js b/src/dns/cloudflare.js index 2bbec924b..0e784642c 100644 --- a/src/dns/cloudflare.js +++ b/src/dns/cloudflare.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/cloudflare'), diff --git a/src/dns/desec.js b/src/dns/desec.js index 602075a18..076f18f3a 100644 --- a/src/dns/desec.js +++ b/src/dns/desec.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), constants = require('../constants.js'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/vultr'), diff --git a/src/dns/digitalocean.js b/src/dns/digitalocean.js index 20ff2c613..33bfca2e5 100644 --- a/src/dns/digitalocean.js +++ b/src/dns/digitalocean.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/digitalocean'), diff --git a/src/dns/dnsimple.js b/src/dns/dnsimple.js index faa809c73..f7e7bd291 100644 --- a/src/dns/dnsimple.js +++ b/src/dns/dnsimple.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/dnsimple'), diff --git a/src/dns/gandi.js b/src/dns/gandi.js index ca37e891b..60e66de91 100644 --- a/src/dns/gandi.js +++ b/src/dns/gandi.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/gandi'), diff --git a/src/dns/gcdns.js b/src/dns/gcdns.js index 44de719d9..a0d241294 100644 --- a/src/dns/gcdns.js +++ b/src/dns/gcdns.js @@ -12,7 +12,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/gcdns'), diff --git a/src/dns/godaddy.js b/src/dns/godaddy.js index 8e3004a06..c68d81582 100644 --- a/src/dns/godaddy.js +++ b/src/dns/godaddy.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/godaddy'), diff --git a/src/dns/hetzner.js b/src/dns/hetzner.js index d08bdb64c..cd44edb2a 100644 --- a/src/dns/hetzner.js +++ b/src/dns/hetzner.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/hetzner'), diff --git a/src/dns/interface.js b/src/dns/interface.js index 6ecda3433..d33f2ebbb 100644 --- a/src/dns/interface.js +++ b/src/dns/interface.js @@ -16,7 +16,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'); function removePrivateFields(domainObject) { diff --git a/src/dns/inwx.js b/src/dns/inwx.js index 330f1c44d..5c17f5101 100644 --- a/src/dns/inwx.js +++ b/src/dns/inwx.js @@ -11,7 +11,7 @@ exports = module.exports = { }; const { ApiClient, Language } = require('domrobot-client'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/inwx'), diff --git a/src/dns/linode.js b/src/dns/linode.js index 263879288..cb49d7679 100644 --- a/src/dns/linode.js +++ b/src/dns/linode.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), constants = require('../constants.js'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/linode'), diff --git a/src/dns/manual.js b/src/dns/manual.js index 5ed04d82e..20269fef6 100644 --- a/src/dns/manual.js +++ b/src/dns/manual.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/manual'), dig = require('../dig.js'), diff --git a/src/dns/namecheap.js b/src/dns/namecheap.js index 10bed1fc2..1f3df2982 100644 --- a/src/dns/namecheap.js +++ b/src/dns/namecheap.js @@ -10,7 +10,7 @@ exports = module.exports = { wait }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/namecheap'), @@ -20,7 +20,7 @@ const assert = require('assert'), safe = require('safetydance'), superagent = require('@cloudron/superagent'), timers = require('timers/promises'), - util = require('util'), + util = require('node:util'), waitForDns = require('./waitfordns.js'), xml2js = require('xml2js'); diff --git a/src/dns/namecom.js b/src/dns/namecom.js index a220e4140..17ee6cc3a 100644 --- a/src/dns/namecom.js +++ b/src/dns/namecom.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/namecom'), diff --git a/src/dns/netcup.js b/src/dns/netcup.js index 1ecf502c2..48fcf0df2 100644 --- a/src/dns/netcup.js +++ b/src/dns/netcup.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/netcup'), diff --git a/src/dns/noop.js b/src/dns/noop.js index 8ae563e50..dbc4f1d5b 100644 --- a/src/dns/noop.js +++ b/src/dns/noop.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), debug = require('debug')('box:dns/noop'); function removePrivateFields(domainObject) { diff --git a/src/dns/ovh.js b/src/dns/ovh.js index 7b51c3b8f..1ec374806 100644 --- a/src/dns/ovh.js +++ b/src/dns/ovh.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/ovh'), diff --git a/src/dns/porkbun.js b/src/dns/porkbun.js index 48430070f..6ec3536b2 100644 --- a/src/dns/porkbun.js +++ b/src/dns/porkbun.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:dns/porkbun'), diff --git a/src/dns/route53.js b/src/dns/route53.js index a2445c290..e4483de66 100644 --- a/src/dns/route53.js +++ b/src/dns/route53.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), { ConfiguredRetryStrategy } = require('@smithy/util-retry'), constants = require('../constants.js'), diff --git a/src/dns/vultr.js b/src/dns/vultr.js index f04138f21..35d950ea0 100644 --- a/src/dns/vultr.js +++ b/src/dns/vultr.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), constants = require('../constants.js'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/vultr'), diff --git a/src/dns/waitfordns.js b/src/dns/waitfordns.js index 062b5dd9f..dbead6c4f 100644 --- a/src/dns/waitfordns.js +++ b/src/dns/waitfordns.js @@ -2,7 +2,7 @@ exports = module.exports = waitForDns; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/waitfordns'), dig = require('../dig.js'), diff --git a/src/dns/wildcard.js b/src/dns/wildcard.js index f62bf2aa1..dac38eac1 100644 --- a/src/dns/wildcard.js +++ b/src/dns/wildcard.js @@ -10,7 +10,7 @@ exports = module.exports = { verifyDomainConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:dns/manual'), dig = require('../dig.js'), diff --git a/src/docker.js b/src/docker.js index 386e32271..318cf0c2c 100644 --- a/src/docker.js +++ b/src/docker.js @@ -31,16 +31,16 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), dashboard = require('./dashboard.js'), debug = require('debug')('box:docker'), Docker = require('dockerode'), dockerRegistries = require('./dockerregistries.js'), - fs = require('fs'), + fs = require('node:fs'), mailServer = require('./mailserver.js'), - os = require('os'), + os = require('node:os'), paths = require('./paths.js'), promiseRetry = require('./promise-retry.js'), services = require('./services.js'), diff --git a/src/dockerproxy.js b/src/dockerproxy.js index f34716486..4c8c248e7 100644 --- a/src/dockerproxy.js +++ b/src/dockerproxy.js @@ -6,18 +6,18 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), constants = require('./constants.js'), express = require('express'), debug = require('debug')('box:dockerproxy'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, middleware = require('./middleware'), - net = require('net'), - path = require('path'), + net = require('node:net'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), - util = require('util'), + util = require('node:util'), volumes = require('./volumes.js'); let gHttpServer = null; diff --git a/src/dockerregistries.js b/src/dockerregistries.js index 3a739ca85..6f805bd6a 100644 --- a/src/dockerregistries.js +++ b/src/dockerregistries.js @@ -10,10 +10,10 @@ exports = module.exports = { update, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), Docker = require('dockerode'), eventlog = require('./eventlog.js'), diff --git a/src/domains.js b/src/domains.js index 779133563..49312411c 100644 --- a/src/domains.js +++ b/src/domains.js @@ -17,10 +17,10 @@ module.exports = exports = { checkConfigs }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), dashboard = require('./dashboard.js'), database = require('./database.js'), debug = require('debug')('box:domains'), diff --git a/src/dyndns.js b/src/dyndns.js index 53359ffb3..d822e576f 100644 --- a/src/dyndns.js +++ b/src/dyndns.js @@ -6,12 +6,12 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), dashboard = require('./dashboard.js'), debug = require('debug')('box:dyndns'), dns = require('./dns.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), mailServer = require('./mailserver.js'), network = require('./network.js'), paths = require('./paths.js'), diff --git a/src/eventlog.js b/src/eventlog.js index fe680e354..9d32d0ce9 100644 --- a/src/eventlog.js +++ b/src/eventlog.js @@ -115,8 +115,8 @@ exports = module.exports = { ACTION_PROCESS_CRASH: 'system.crash' // obsolete }; -const assert = require('assert'), - crypto = require('crypto'), +const assert = require('node:assert'), + crypto = require('node:crypto'), database = require('./database.js'), debug = require('debug')('box:eventlog'), mysql = require('mysql2'), diff --git a/src/externalldap.js b/src/externalldap.js index 5cd0fc743..9212f126c 100644 --- a/src/externalldap.js +++ b/src/externalldap.js @@ -16,7 +16,7 @@ exports = module.exports = { sync }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), @@ -29,7 +29,7 @@ const assert = require('assert'), settings = require('./settings.js'), tasks = require('./tasks.js'), users = require('./users.js'), - util = require('util'); + util = require('node:util'); function injectPrivateFields(newConfig, currentConfig) { if (newConfig.bindPassword === constants.SECRET_PLACEHOLDER) newConfig.bindPassword = currentConfig.bindPassword; diff --git a/src/groups.js b/src/groups.js index 0eb2c0632..622e469aa 100644 --- a/src/groups.js +++ b/src/groups.js @@ -27,10 +27,10 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), eventlog = require('./eventlog.js'), safe = require('safetydance'); diff --git a/src/hash-stream.js b/src/hash-stream.js index 95b52a653..46f5b6e90 100644 --- a/src/hash-stream.js +++ b/src/hash-stream.js @@ -1,7 +1,7 @@ 'use strict'; -const crypto = require('crypto'), - stream = require('stream'), +const crypto = require('node:crypto'), + stream = require('node:stream'), TransformStream = stream.Transform; class HashStream extends TransformStream { diff --git a/src/hat.js b/src/hat.js index e87c5b658..7c4aa18dd 100644 --- a/src/hat.js +++ b/src/hat.js @@ -2,7 +2,7 @@ exports = module.exports = hat; -const crypto = require('crypto'); +const crypto = require('node:crypto'); function hat(bits) { return crypto.randomBytes(bits / 8).toString('hex'); diff --git a/src/hush.js b/src/hush.js index 663c4574c..58cc15945 100644 --- a/src/hush.js +++ b/src/hush.js @@ -1,10 +1,10 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), debug = require('debug')('box:hush'), - TransformStream = require('stream').Transform; + TransformStream = require('node:stream').Transform; class EncryptStream extends TransformStream { constructor(encryption) { diff --git a/src/ipaddr.js b/src/ipaddr.js index 09730ffb5..1e3370484 100644 --- a/src/ipaddr.js +++ b/src/ipaddr.js @@ -7,8 +7,8 @@ exports = module.exports = { includes, }; -const assert = require('assert'), - net = require('net'); +const assert = require('node:assert'), + net = require('node:net'); function isValid(ip) { assert.strictEqual(typeof ip, 'string'); diff --git a/src/iputils.js b/src/iputils.js index ce9df0022..f1cf9fcd9 100644 --- a/src/iputils.js +++ b/src/iputils.js @@ -5,7 +5,7 @@ exports = module.exports = { intFromIp }; -const assert = require('assert'); +const assert = require('node:assert'); // this code is used in migrations - 20201120212726-apps-add-containerIp.js function intFromIp(address) { diff --git a/src/janitor.js b/src/janitor.js index f82c224f6..4b75a95b4 100644 --- a/src/janitor.js +++ b/src/janitor.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), debug = require('debug')('box:janitor'), Docker = require('dockerode'), diff --git a/src/ldapserver.js b/src/ldapserver.js index 3109077aa..fc96b8b5e 100644 --- a/src/ldapserver.js +++ b/src/ldapserver.js @@ -8,7 +8,7 @@ exports = module.exports = { }; const addonConfigs = require('./addonconfigs.js'), - assert = require('assert'), + assert = require('node:assert'), apps = require('./apps.js'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), @@ -20,7 +20,7 @@ const addonConfigs = require('./addonconfigs.js'), mail = require('./mail.js'), safe = require('safetydance'), users = require('./users.js'), - util = require('util'); + util = require('node:util'); let gServer = null; diff --git a/src/location.js b/src/location.js index 29b385a72..104e80cd1 100644 --- a/src/location.js +++ b/src/location.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); class Location { constructor(subdomain, domain, type, certificate) { diff --git a/src/locks.js b/src/locks.js index 6c1921947..5ab503fc9 100644 --- a/src/locks.js +++ b/src/locks.js @@ -19,7 +19,7 @@ exports = module.exports = { TYPE_MAIL_SERVER_RESTART: 'mail_restart', }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), database = require('./database.js'), debug = require('debug')('box:locks'), diff --git a/src/logs.js b/src/logs.js index 817751e79..3e8f2744c 100644 --- a/src/logs.js +++ b/src/logs.js @@ -1,11 +1,11 @@ 'use strict'; -const assert = require('assert'), - child_process = require('child_process'), +const assert = require('node:assert'), + child_process = require('node:child_process'), debug = require('debug')('box:logs'), - path = require('path'), - stream = require('stream'), - { StringDecoder } = require('string_decoder'), + path = require('node:path'), + stream = require('node:stream'), + { StringDecoder } = require('node:string_decoder'), TransformStream = stream.Transform; const LOGTAIL_CMD = path.join(__dirname, 'scripts/logtail.sh'); diff --git a/src/mail.js b/src/mail.js index a31289268..cce5536fd 100644 --- a/src/mail.js +++ b/src/mail.js @@ -59,7 +59,7 @@ exports = module.exports = { _updateDomain: updateDomain }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), database = require('./database.js'), @@ -70,11 +70,11 @@ const assert = require('assert'), mailer = require('./mailer.js'), mailServer = require('./mailserver.js'), mysql = require('mysql2'), - net = require('net'), + net = require('node:net'), network = require('./network.js'), nodemailer = require('nodemailer'), notifications = require('./notifications.js'), - path = require('path'), + path = require('node:path'), platform = require('./platform.js'), safe = require('safetydance'), services = require('./services.js'), diff --git a/src/mailer.js b/src/mailer.js index 5f8cd6f22..90de0ef76 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -20,7 +20,7 @@ exports = module.exports = { _mailQueue: [] // accumulate mails in test mode }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), branding = require('./branding.js'), constants = require('./constants.js'), @@ -29,7 +29,7 @@ const assert = require('assert'), ejs = require('ejs'), mailServer = require('./mailserver.js'), nodemailer = require('nodemailer'), - path = require('path'), + path = require('node:path'), safe = require('safetydance'), translations = require('./translations.js'); diff --git a/src/mailserver.js b/src/mailserver.js index 66090e475..9ff12eb94 100644 --- a/src/mailserver.js +++ b/src/mailserver.js @@ -22,23 +22,23 @@ exports = module.exports = { DEFAULT_MEMORY_LIMIT: 512 * 1024 * 1024, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), debug = require('debug')('box:mailserver'), dns = require('./dns.js'), docker = require('./docker.js'), domains = require('./domains.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), hat = require('./hat.js'), infra = require('./infra_version.js'), Location = require('./location.js'), locks = require('./locks.js'), mail = require('./mail.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), platform = require('./platform.js'), reverseProxy = require('./reverseproxy.js'), diff --git a/src/metrics.js b/src/metrics.js index 73b9b40fa..bb8fdf1bd 100644 --- a/src/metrics.js +++ b/src/metrics.js @@ -7,16 +7,16 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:metrics'), docker = require('./docker.js'), - fs = require('fs'), - net = require('net'), - os = require('os'), - path = require('path'), - { Readable } = require('stream'), + fs = require('node:fs'), + net = require('node:net'), + os = require('node:os'), + path = require('node:path'), + { Readable } = require('node:stream'), safe = require('safetydance'), superagent = require('@cloudron/superagent'), _ = require('./underscore.js'); diff --git a/src/middleware/cors.js b/src/middleware/cors.js index bae762066..e915018a8 100644 --- a/src/middleware/cors.js +++ b/src/middleware/cors.js @@ -2,7 +2,7 @@ 'use strict'; -const url = require('url'); +const url = require('node:url'); /* * CORS middleware diff --git a/src/mounts.js b/src/mounts.js index 084d1105f..6ced7b125 100644 --- a/src/mounts.js +++ b/src/mounts.js @@ -19,13 +19,13 @@ exports = module.exports = { MOUNT_TYPE_LOOPBACK: 'loopback' }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:mounts'), ejs = require('ejs'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), shell = require('./shell.js')('mounts'); diff --git a/src/network.js b/src/network.js index 4a4033151..e6344c8bf 100644 --- a/src/network.js +++ b/src/network.js @@ -22,13 +22,13 @@ exports = module.exports = { detectIP }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), cron = require('./cron.js'), - fs = require('fs'), + fs = require('node:fs'), ipaddr = require('./ipaddr.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), settings = require('./settings.js'), diff --git a/src/network/fixed.js b/src/network/fixed.js index 37646a481..84a26fd22 100644 --- a/src/network/fixed.js +++ b/src/network/fixed.js @@ -7,9 +7,9 @@ exports = module.exports = { testIPv6Config }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), - net = require('net'); + net = require('node:net'); async function getIPv4(config) { assert.strictEqual(typeof config, 'object'); diff --git a/src/network/generic.js b/src/network/generic.js index 68a5a4401..101ea1771 100644 --- a/src/network/generic.js +++ b/src/network/generic.js @@ -7,7 +7,7 @@ exports = module.exports = { testIPv6Config }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:network/generic'), diff --git a/src/network/interface.js b/src/network/interface.js index 2fd39adf9..8f9b2c09c 100644 --- a/src/network/interface.js +++ b/src/network/interface.js @@ -13,7 +13,7 @@ exports = module.exports = { testIPv6Config }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'); async function getIPv4(config) { diff --git a/src/network/network-interface.js b/src/network/network-interface.js index 2528d769e..9edf699fb 100644 --- a/src/network/network-interface.js +++ b/src/network/network-interface.js @@ -7,10 +7,10 @@ exports = module.exports = { testIPv6Config }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:network/network-interface'), - os = require('os'), + os = require('node:os'), safe = require('safetydance'); async function getIPv4(config) { diff --git a/src/network/noop.js b/src/network/noop.js index da695ac76..c3c33d4c3 100644 --- a/src/network/noop.js +++ b/src/network/noop.js @@ -7,7 +7,7 @@ exports = module.exports = { testIPv6Config }; -const assert = require('assert'); +const assert = require('node:assert'); async function getIPv4(config) { assert.strictEqual(typeof config, 'object'); diff --git a/src/notifications.js b/src/notifications.js index 2340255a4..c0d25a054 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -37,7 +37,7 @@ exports = module.exports = { _add: add }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), changelog = require('./changelog.js'), diff --git a/src/oidcclients.js b/src/oidcclients.js index a95e8a2bc..813d394e7 100644 --- a/src/oidcclients.js +++ b/src/oidcclients.js @@ -16,7 +16,7 @@ exports = module.exports = { ID_SDK: 'cid-sdk', // created by user via dashboard }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), dashboard = require('./dashboard.js'), database = require('./database.js'), diff --git a/src/oidcserver.js b/src/oidcserver.js index 5cf33b890..4d27f2324 100644 --- a/src/oidcserver.js +++ b/src/oidcserver.js @@ -9,36 +9,36 @@ exports = module.exports = { cleanupExpired, }; -const assert = require('assert'), +const assert = require('node:assert'), apps = require('./apps.js'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), blobs = require('./blobs.js'), branding = require('./branding.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), dashboard = require('./dashboard.js'), debug = require('debug')('box:oidcserver'), dns = require('./dns.js'), ejs = require('ejs'), express = require('express'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), marked = require('marked'), middleware = require('./middleware'), oidcClients = require('./oidcclients.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, jose = require('jose'), safe = require('safetydance'), settings = require('./settings.js'), tokens = require('./tokens.js'), - url = require('url'), + url = require('node:url'), users = require('./users.js'), groups = require('./groups.js'), - util = require('util'); + util = require('node:util'); // 1. Index.vue starts the OIDC flow by navigating to /openid/auth. Webadmin sets callback url to authcallback.html + implicit flow // 2. oidcserver starts an interaction and redirects to oidc_login.html diff --git a/src/paths.js b/src/paths.js index 921fdd169..3597ff5f3 100644 --- a/src/paths.js +++ b/src/paths.js @@ -1,7 +1,7 @@ 'use strict'; const constants = require('./constants.js'), - path = require('path'); + path = require('node:path'); function baseDir() { const homeDir = process.env.HOME; diff --git a/src/platform.js b/src/platform.js index 1065ab42a..fa6223a15 100644 --- a/src/platform.js +++ b/src/platform.js @@ -15,7 +15,7 @@ exports = module.exports = { const apps = require('./apps.js'), appTaskManager = require('./apptaskmanager.js'), - assert = require('assert'), + assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), @@ -24,7 +24,7 @@ const apps = require('./apps.js'), database = require('./database.js'), debug = require('debug')('box:platform'), dockerProxy = require('./dockerproxy.js'), - fs = require('fs'), + fs = require('node:fs'), infra = require('./infra_version.js'), locks = require('./locks.js'), oidcServer = require('./oidcserver.js'), diff --git a/src/progress-stream.js b/src/progress-stream.js index 237f1680a..6b3473628 100644 --- a/src/progress-stream.js +++ b/src/progress-stream.js @@ -1,6 +1,6 @@ 'use strict'; -const stream = require('stream'), +const stream = require('node:stream'), TransformStream = stream.Transform; class ProgressStream extends TransformStream { diff --git a/src/promise-retry.js b/src/promise-retry.js index cf21c0708..f1217264e 100644 --- a/src/promise-retry.js +++ b/src/promise-retry.js @@ -2,9 +2,9 @@ exports = module.exports = promiseRetry; -const assert = require('assert'), +const assert = require('node:assert'), timers = require('timers/promises'), - util = require('util'); + util = require('node:util'); async function promiseRetry(options, asyncFunction) { assert.strictEqual(typeof options, 'object'); diff --git a/src/provision.js b/src/provision.js index 99acde470..bdf1a3068 100644 --- a/src/provision.js +++ b/src/provision.js @@ -8,7 +8,7 @@ exports = module.exports = { }; const appstore = require('./appstore.js'), - assert = require('assert'), + assert = require('node:assert'), backupTargets = require('./backuptargets.js'), backups = require('./backups.js'), backuptask = require('./backuptask.js'), @@ -19,7 +19,7 @@ const appstore = require('./appstore.js'), dns = require('./dns.js'), domains = require('./domains.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), mail = require('./mail.js'), mailServer = require('./mailserver.js'), network = require('./network.js'), diff --git a/src/proxyauth.js b/src/proxyauth.js index c3480b5ca..97ec7f87c 100644 --- a/src/proxyauth.js +++ b/src/proxyauth.js @@ -8,18 +8,18 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), blobs = require('./blobs.js'), constants = require('./constants.js'), dashboard = require('./dashboard.js'), debug = require('debug')('box:proxyAuth'), ejs = require('ejs'), express = require('express'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), paths = require('./paths.js'), hat = require('./hat.js'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, jwt = require('jsonwebtoken'), @@ -28,7 +28,7 @@ const apps = require('./apps.js'), safe = require('safetydance'), settings = require('./settings.js'), users = require('./users.js'), - util = require('util'); + util = require('node:util'); let gHttpServer = null; let gTokenSecret = null; diff --git a/src/reverseproxy.js b/src/reverseproxy.js index 2d9c4f104..0ee688cbf 100644 --- a/src/reverseproxy.js +++ b/src/reverseproxy.js @@ -37,11 +37,11 @@ exports = module.exports = { const acme2 = require('./acme2.js'), apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), blobs = require('./blobs.js'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), dashboard = require('./dashboard.js'), debug = require('debug')('box:reverseproxy'), dns = require('./dns.js'), @@ -50,12 +50,12 @@ const acme2 = require('./acme2.js'), ejs = require('ejs'), eventlog = require('./eventlog.js'), ipaddr = require('./ipaddr.js'), - fs = require('fs'), + fs = require('node:fs'), Location = require('./location.js'), mailServer = require('./mailserver.js'), network = require('./network.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), settings = require('./settings.js'), diff --git a/src/routes/accesscontrol.js b/src/routes/accesscontrol.js index 39d8323d1..b5ed58b4b 100644 --- a/src/routes/accesscontrol.js +++ b/src/routes/accesscontrol.js @@ -9,7 +9,7 @@ exports = module.exports = { }; const apps = require('../apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:routes/accesscontrol'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/applinks.js b/src/routes/applinks.js index 566fe8aad..9d24d61ea 100644 --- a/src/routes/applinks.js +++ b/src/routes/applinks.js @@ -11,7 +11,7 @@ exports = module.exports = { load }; -const assert = require('assert'), +const assert = require('node:assert'), applinks = require('../applinks.js'), BoxError = require('../boxerror.js'), safe = require('safetydance'), diff --git a/src/routes/apppasswords.js b/src/routes/apppasswords.js index 6011c8b07..9ca329488 100644 --- a/src/routes/apppasswords.js +++ b/src/routes/apppasswords.js @@ -8,7 +8,7 @@ exports = module.exports = { }; const appPasswords = require('../apppasswords.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, diff --git a/src/routes/apps.js b/src/routes/apps.js index dd5dde068..6200fd7d6 100644 --- a/src/routes/apps.js +++ b/src/routes/apps.js @@ -73,7 +73,7 @@ exports = module.exports = { const apps = require('../apps.js'), appstore = require('../appstore.js'), - assert = require('assert'), + assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), diff --git a/src/routes/appstore.js b/src/routes/appstore.js index 591f1f372..cf106d5db 100644 --- a/src/routes/appstore.js +++ b/src/routes/appstore.js @@ -10,7 +10,7 @@ exports = module.exports = { }; const appstore = require('../appstore.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), dashboard = require('../dashboard.js'), diff --git a/src/routes/archives.js b/src/routes/archives.js index 1ece74981..e9a9b76dd 100644 --- a/src/routes/archives.js +++ b/src/routes/archives.js @@ -11,7 +11,7 @@ exports = module.exports = { }; const apps = require('../apps.js'), - assert = require('assert'), + assert = require('node:assert'), archives = require('../archives.js'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), diff --git a/src/routes/auth.js b/src/routes/auth.js index c0dfe7e04..ec2464e41 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -8,7 +8,7 @@ exports = module.exports = { setupAccount, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), diff --git a/src/routes/backups.js b/src/routes/backups.js index a40911942..bf1584a36 100644 --- a/src/routes/backups.js +++ b/src/routes/backups.js @@ -8,7 +8,7 @@ exports = module.exports = { update, }; -const assert = require('assert'), +const assert = require('node:assert'), backups = require('../backups.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/backuptargets.js b/src/routes/backuptargets.js index 0b85cc116..b66d96c24 100644 --- a/src/routes/backuptargets.js +++ b/src/routes/backuptargets.js @@ -23,7 +23,7 @@ exports = module.exports = { getStatus, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), backupTargets = require('../backuptargets.js'), BoxError = require('../boxerror.js'), diff --git a/src/routes/branding.js b/src/routes/branding.js index e638e7128..1b1ed377a 100644 --- a/src/routes/branding.js +++ b/src/routes/branding.js @@ -12,7 +12,7 @@ exports = module.exports = { setFooter, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), branding = require('../branding.js'), diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index 298856ac7..84265f73d 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -11,7 +11,7 @@ exports = module.exports = { setTimeZone }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), cloudron = require('../cloudron.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index 1d914ca6e..e3543532c 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -23,10 +23,10 @@ const AuditSource = require('../auditsource.js'), constants = require('../constants.js'), dashboard = require('../dashboard.js'), ejs = require('ejs'), - fs = require('fs'), + fs = require('node:fs'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, - path = require('path'), + path = require('node:path'), paths = require('../paths.js'), safe = require('safetydance'), settings = require('../settings.js'); diff --git a/src/routes/directoryserver.js b/src/routes/directoryserver.js index f092bddda..d2ae08777 100644 --- a/src/routes/directoryserver.js +++ b/src/routes/directoryserver.js @@ -5,7 +5,7 @@ exports = module.exports = { setConfig, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), directoryServer = require('../directoryserver.js'), diff --git a/src/routes/dockerregistries.js b/src/routes/dockerregistries.js index 698e6d834..8a27dc709 100644 --- a/src/routes/dockerregistries.js +++ b/src/routes/dockerregistries.js @@ -9,7 +9,7 @@ exports = module.exports = { load }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), dockerRegistries = require('../dockerregistries.js'), diff --git a/src/routes/domains.js b/src/routes/domains.js index 4bb5e4b21..7d542caac 100644 --- a/src/routes/domains.js +++ b/src/routes/domains.js @@ -12,7 +12,7 @@ exports = module.exports = { syncDnsRecords, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), dns = require('../dns.js'), diff --git a/src/routes/externalldap.js b/src/routes/externalldap.js index a5658be87..82f83fdc2 100644 --- a/src/routes/externalldap.js +++ b/src/routes/externalldap.js @@ -6,7 +6,7 @@ exports = module.exports = { sync }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), externalLdap = require('../externalldap.js'), diff --git a/src/routes/filemanager.js b/src/routes/filemanager.js index 7bb6b3054..0fbfa42ea 100644 --- a/src/routes/filemanager.js +++ b/src/routes/filemanager.js @@ -4,9 +4,9 @@ exports = module.exports = { proxy, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, safe = require('safetydance'), services = require('../services.js'); diff --git a/src/routes/groups.js b/src/routes/groups.js index 78656f199..acdcc5c5c 100644 --- a/src/routes/groups.js +++ b/src/routes/groups.js @@ -12,7 +12,7 @@ exports = module.exports = { setAllowedApps }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), groups = require('../groups.js'), diff --git a/src/routes/mail.js b/src/routes/mail.js index cda0d16c7..cfe551b19 100644 --- a/src/routes/mail.js +++ b/src/routes/mail.js @@ -31,7 +31,7 @@ exports = module.exports = { getMailboxCount }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), mail = require('../mail.js'), diff --git a/src/routes/mailserver.js b/src/routes/mailserver.js index 0c8c9f8c0..1c333697d 100644 --- a/src/routes/mailserver.js +++ b/src/routes/mailserver.js @@ -9,11 +9,11 @@ exports = module.exports = { getLocation }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), debug = require('debug')('box:routes/mailserver'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, mailServer = require('../mailserver.js'), diff --git a/src/routes/network.js b/src/routes/network.js index c47f05105..8f3378b56 100644 --- a/src/routes/network.js +++ b/src/routes/network.js @@ -17,7 +17,7 @@ exports = module.exports = { getIPv6, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/notifications.js b/src/routes/notifications.js index 5f0e6831e..4a408bf1a 100644 --- a/src/routes/notifications.js +++ b/src/routes/notifications.js @@ -7,7 +7,7 @@ exports = module.exports = { update }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, diff --git a/src/routes/oidcclients.js b/src/routes/oidcclients.js index 0acac4677..ada35441a 100644 --- a/src/routes/oidcclients.js +++ b/src/routes/oidcclients.js @@ -9,7 +9,7 @@ exports = module.exports = { del, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), oidcClients = require('../oidcclients.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/profile.js b/src/routes/profile.js index d0fba81b6..256e55cce 100644 --- a/src/routes/profile.js +++ b/src/routes/profile.js @@ -21,7 +21,7 @@ exports = module.exports = { destroyUserSession }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/provision.js b/src/routes/provision.js index caffc22a2..fe101022a 100644 --- a/src/routes/provision.js +++ b/src/routes/provision.js @@ -11,7 +11,7 @@ exports = module.exports = { detectIP }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/reverseproxy.js b/src/routes/reverseproxy.js index 5e423af38..74f8ccec0 100644 --- a/src/routes/reverseproxy.js +++ b/src/routes/reverseproxy.js @@ -7,7 +7,7 @@ exports = module.exports = { renewCerts, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/services.js b/src/routes/services.js index 2da556139..9e365e373 100644 --- a/src/routes/services.js +++ b/src/routes/services.js @@ -12,7 +12,7 @@ exports = module.exports = { getPlatformStatus }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/system.js b/src/routes/system.js index 7af29f7f6..6f26b934e 100644 --- a/src/routes/system.js +++ b/src/routes/system.js @@ -14,7 +14,7 @@ exports = module.exports = { getCpus, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, diff --git a/src/routes/tasks.js b/src/routes/tasks.js index 8f46bb4ac..d6c6841f6 100644 --- a/src/routes/tasks.js +++ b/src/routes/tasks.js @@ -11,7 +11,7 @@ exports = module.exports = { getLogStream }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js index 39d9755f5..490f416cc 100644 --- a/src/routes/test/apps-test.js +++ b/src/routes/test/apps-test.js @@ -6,19 +6,19 @@ const apps = require('../../apps.js'), async = require('async'), - child_process = require('child_process'), + child_process = require('node:child_process'), constants = require('../../constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('../../database.js'), Docker = require('dockerode'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), hat = require('../../hat.js'), - http = require('http'), + http = require('node:http'), ldapServer = require('../../ldapserver.js'), - net = require('net'), + net = require('node:net'), nock = require('nock'), - path = require('path'), + path = require('node:path'), paths = require('../../paths.js'), platform = require('../../platform.js'), safe = require('safetydance'), @@ -26,7 +26,7 @@ const apps = require('../../apps.js'), settings = require('../../settings.js'), superagent = require('@cloudron/superagent'), tokens = require('../../tokens.js'), - url = require('url'); + url = require('node:url'); const SERVER_URL = 'http://localhost:' + constants.PORT; diff --git a/src/routes/test/branding-test.js b/src/routes/test/branding-test.js index ed25bb4b7..660c582f0 100644 --- a/src/routes/test/branding-test.js +++ b/src/routes/test/branding-test.js @@ -8,7 +8,7 @@ const common = require('./common.js'), constants = require('../../constants.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), paths = require('../../paths.js'), superagent = require('@cloudron/superagent'); diff --git a/src/routes/test/cloudron-test.js b/src/routes/test/cloudron-test.js index 4e980653f..eed1e5e3d 100644 --- a/src/routes/test/cloudron-test.js +++ b/src/routes/test/cloudron-test.js @@ -71,7 +71,7 @@ describe('Cloudron', function () { const response3 = await superagent.post(`${serverUrl}/api/v1/auth/setup_account`) .send({ - inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken, + inviteToken: require('node:url').parse(response2.body.inviteLink, true).query.inviteToken, password: USER.password, username: USER.username, displayName: USER.displayName @@ -114,7 +114,7 @@ describe('Cloudron', function () { const response3 = await superagent.post(`${serverUrl}/api/v1/auth/setup_account`) .send({ - inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken, + inviteToken: require('node:url').parse(response2.body.inviteLink, true).query.inviteToken, password: USER.password, username: 'setupuser2', // this will cause a conflict. cannot change username displayName: USER.displayName @@ -124,7 +124,7 @@ describe('Cloudron', function () { const response4 = await superagent.post(`${serverUrl}/api/v1/auth/setup_account`) .send({ - inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken, + inviteToken: require('node:url').parse(response2.body.inviteLink, true).query.inviteToken, password: USER.password, displayName: USER.displayName }) @@ -171,7 +171,7 @@ describe('Cloudron', function () { const response3 = await superagent.post(`${serverUrl}/api/v1/auth/setup_account`) .send({ - inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken, + inviteToken: require('node:url').parse(response2.body.inviteLink, true).query.inviteToken, password: USER.password, username: USER.username, // ignored displayName: USER.displayName // ignored diff --git a/src/routes/test/domains-test.js b/src/routes/test/domains-test.js index 88e23bbac..d905bd779 100644 --- a/src/routes/test/domains-test.js +++ b/src/routes/test/domains-test.js @@ -5,11 +5,11 @@ /* global before:false */ /* global after:false */ -const child_process = require('child_process'), +const child_process = require('node:child_process'), common = require('./common.js'), expect = require('expect.js'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), paths = require('../../paths.js'), superagent = require('@cloudron/superagent'); diff --git a/src/routes/test/profile-test.js b/src/routes/test/profile-test.js index d9c4db81c..90c6eaf6c 100644 --- a/src/routes/test/profile-test.js +++ b/src/routes/test/profile-test.js @@ -316,7 +316,7 @@ describe('Profile API', function () { .query({ access_token: user.token }) .attach('avatar', './logo.png'); - customAvatarSize = require('fs').readFileSync('./logo.png').length; + customAvatarSize = require('node:fs').readFileSync('./logo.png').length; expect(response.status).to.be(204); }); @@ -363,7 +363,7 @@ describe('Profile API', function () { .query({ access_token: user.token }) .ok(() => true); - const customAvatarSize = require('fs').readFileSync('./logo.png').length; + const customAvatarSize = require('node:fs').readFileSync('./logo.png').length; expect(parseInt(response2.headers['content-length'])).to.equal(customAvatarSize); expect(response2.status).to.equal(200); }); diff --git a/src/routes/test/system-test.js b/src/routes/test/system-test.js index 6ed4a5c34..83fe0dfa2 100644 --- a/src/routes/test/system-test.js +++ b/src/routes/test/system-test.js @@ -9,10 +9,10 @@ const constants = require('../../constants.js'), common = require('./common.js'), { EventSource } = require('eventsource'), expect = require('expect.js'), - fs = require('fs'), - http = require('http'), + fs = require('node:fs'), + http = require('node:http'), nock = require('nock'), - os = require('os'), + os = require('node:os'), paths = require('../../paths.js'), safe = require('safetydance'), superagent = require('@cloudron/superagent'); diff --git a/src/routes/test/users-test.js b/src/routes/test/users-test.js index e303da46c..5890f90a4 100644 --- a/src/routes/test/users-test.js +++ b/src/routes/test/users-test.js @@ -389,7 +389,7 @@ describe('Users API', function () { .query({ access_token: owner.token }) .attach('avatar', './logo.png'); - customAvatarSize = require('fs').readFileSync('./logo.png').length; + customAvatarSize = require('node:fs').readFileSync('./logo.png').length; expect(response.status).to.equal(204); diff --git a/src/routes/tokens.js b/src/routes/tokens.js index fcaaf8d8b..9ece731ef 100644 --- a/src/routes/tokens.js +++ b/src/routes/tokens.js @@ -8,7 +8,7 @@ exports = module.exports = { del }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, diff --git a/src/routes/updater.js b/src/routes/updater.js index dd49191e7..ae0f942cb 100644 --- a/src/routes/updater.js +++ b/src/routes/updater.js @@ -10,7 +10,7 @@ exports = module.exports = { updateBox, }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/user-directory.js b/src/routes/user-directory.js index dc4563731..f1bf37ed4 100644 --- a/src/routes/user-directory.js +++ b/src/routes/user-directory.js @@ -5,7 +5,7 @@ exports = module.exports = { setProfileConfig }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), HttpError = require('@cloudron/connect-lastmile').HttpError, diff --git a/src/routes/users.js b/src/routes/users.js index 26482e692..5db6c36bf 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -29,7 +29,7 @@ exports = module.exports = { load }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), groups = require('../groups.js'), diff --git a/src/routes/volumes.js b/src/routes/volumes.js index a7dbf4fe6..6e39b3d31 100644 --- a/src/routes/volumes.js +++ b/src/routes/volumes.js @@ -11,7 +11,7 @@ exports = module.exports = { getStatus }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), volumes = require('../volumes.js'), diff --git a/src/scheduler.js b/src/scheduler.js index 34854fb4f..21c80abc2 100644 --- a/src/scheduler.js +++ b/src/scheduler.js @@ -9,7 +9,7 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), cloudron = require('./cloudron.js'), constants = require('./constants.js'), diff --git a/src/server.js b/src/server.js index 068c741c0..52785de91 100644 --- a/src/server.js +++ b/src/server.js @@ -5,20 +5,20 @@ exports = module.exports = { stop }; -const assert = require('assert'), +const assert = require('node:assert'), AuditSource = require('./auditsource.js'), constants = require('./constants.js'), debug = require('debug')('box:server'), eventlog = require('./eventlog.js'), express = require('express'), - http = require('http'), + http = require('node:http'), HttpError = require('@cloudron/connect-lastmile').HttpError, middleware = require('./middleware'), platform = require('./platform.js'), routes = require('./routes/index.js'), safe = require('safetydance'), users = require('./users.js'), - util = require('util'), + util = require('node:util'), ws = require('ws'); let gHttpServer = null; diff --git a/src/services.js b/src/services.js index c2b696a18..e635bb4ad 100644 --- a/src/services.js +++ b/src/services.js @@ -41,29 +41,29 @@ exports = module.exports = { const addonConfigs = require('./addonconfigs.js'), apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), blobs = require('./blobs.js'), BoxError = require('./boxerror.js'), branding = require('./branding.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), dashboard = require('./dashboard.js'), debug = require('debug')('box:services'), dig = require('./dig.js'), docker = require('./docker.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), hat = require('./hat.js'), - http = require('http'), + http = require('node:http'), infra = require('./infra_version.js'), logs = require('./logs.js'), mail = require('./mail.js'), mailServer = require('./mailserver.js'), oidcClients = require('./oidcclients.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), - { pipeline } = require('stream'), + { pipeline } = require('node:stream'), promiseRetry = require('./promise-retry.js'), safe = require('safetydance'), semver = require('semver'), diff --git a/src/settings.js b/src/settings.js index 02ca3ff57..425ae72c9 100644 --- a/src/settings.js +++ b/src/settings.js @@ -44,7 +44,7 @@ exports = module.exports = { _set: set }; -const assert = require('assert'), +const assert = require('node:assert'), database = require('./database.js'), safe = require('safetydance'); diff --git a/src/sftp.js b/src/sftp.js index f268d238f..187d88322 100644 --- a/src/sftp.js +++ b/src/sftp.js @@ -7,7 +7,7 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), blobs = require('./blobs.js'), BoxError = require('./boxerror.js'), debug = require('debug')('box:sftp'), @@ -15,7 +15,7 @@ const apps = require('./apps.js'), hat = require('./hat.js'), infra = require('./infra_version.js'), mounts = require('./mounts.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), services = require('./services.js'), diff --git a/src/shell.js b/src/shell.js index 2df4b6836..a2a361dfb 100644 --- a/src/shell.js +++ b/src/shell.js @@ -1,10 +1,10 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), - child_process = require('child_process'), + child_process = require('node:child_process'), debug = require('debug')('box:shell'), - path = require('path'), + path = require('node:path'), safe = require('safetydance'), _ = require('./underscore.js'); diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js index 92c29002c..cc925477d 100644 --- a/src/storage/filesystem.js +++ b/src/storage/filesystem.js @@ -24,14 +24,14 @@ exports = module.exports = { removeDir, }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:storage/filesystem'), df = require('../df.js'), - fs = require('fs'), + fs = require('node:fs'), mounts = require('../mounts.js'), - path = require('path'), + path = require('node:path'), paths = require('../paths.js'), safe = require('safetydance'), shell = require('../shell.js')('filesystem'), diff --git a/src/storage/gcs.js b/src/storage/gcs.js index 88e0f985c..b894964bb 100644 --- a/src/storage/gcs.js +++ b/src/storage/gcs.js @@ -23,13 +23,13 @@ exports = module.exports = { injectPrivateFields, }; -const assert = require('assert'), +const assert = require('node:assert'), async = require('async'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:storage/gcs'), GCS = require('@google-cloud/storage').Storage, - path = require('path'), + path = require('node:path'), safe = require('safetydance'), _ = require('../underscore.js'); diff --git a/src/storage/interface.js b/src/storage/interface.js index 1c68d8309..fa32b560a 100644 --- a/src/storage/interface.js +++ b/src/storage/interface.js @@ -35,7 +35,7 @@ exports = module.exports = { injectPrivateFields }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'); function removePrivateFields(apiConfig) { diff --git a/src/storage/noop.js b/src/storage/noop.js index 1d9458711..ee25f2aae 100644 --- a/src/storage/noop.js +++ b/src/storage/noop.js @@ -23,10 +23,10 @@ exports = module.exports = { injectPrivateFields }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:storage/noop'), - fs = require('fs'); + fs = require('node:fs'); async function getAvailableSize(apiConfig) { assert.strictEqual(typeof apiConfig, 'object'); diff --git a/src/storage/s3.js b/src/storage/s3.js index ceb40d95a..332a7b4a6 100644 --- a/src/storage/s3.js +++ b/src/storage/s3.js @@ -26,20 +26,20 @@ exports = module.exports = { _chunk: chunk }; -const assert = require('assert'), +const assert = require('node:assert'), async = require('async'), BoxError = require('../boxerror.js'), { ConfiguredRetryStrategy } = require('@smithy/util-retry'), constants = require('../constants.js'), consumers = require('node:stream/consumers'), - crypto = require('crypto'), + crypto = require('node:crypto'), debug = require('debug')('box:storage/s3'), - http = require('http'), - https = require('https'), + http = require('node:http'), + https = require('node:https'), { NodeHttpHandler } = require('@smithy/node-http-handler'), { PassThrough } = require('node:stream'), - path = require('path'), - { Readable } = require('stream'), + path = require('node:path'), + { Readable } = require('node:stream'), { S3, NoSuchKey, NoSuchBucket } = require('@aws-sdk/client-s3'), safe = require('safetydance'), { Upload } = require('@aws-sdk/lib-storage'), diff --git a/src/syncer.js b/src/syncer.js index c4abcdc40..7acd6e4dc 100644 --- a/src/syncer.js +++ b/src/syncer.js @@ -1,14 +1,14 @@ 'use strict'; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), DataLayout = require('./datalayout.js'), debug = require('debug')('box:syncer'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), readline = require('node:readline'), safe = require('safetydance'), - util = require('util'); + util = require('node:util'); exports = module.exports = { sync, diff --git a/src/system.js b/src/system.js index 5a4149546..f4232761f 100644 --- a/src/system.js +++ b/src/system.js @@ -18,7 +18,7 @@ exports = module.exports = { }; const apps = require('./apps.js'), - assert = require('assert'), + assert = require('node:assert'), { AsyncTask } = require('./asynctask.js'), backupTargets = require('./backuptargets.js'), BoxError = require('./boxerror.js'), @@ -26,11 +26,11 @@ const apps = require('./apps.js'), df = require('./df.js'), docker = require('./docker.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), logs = require('./logs.js'), notifications = require('./notifications.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), shell = require('./shell.js')('system'), diff --git a/src/tasks.js b/src/tasks.js index a6c9045ef..bc10260ba 100644 --- a/src/tasks.js +++ b/src/tasks.js @@ -47,12 +47,12 @@ exports = module.exports = { _TASK_SLEEP: 'sleep' }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), database = require('./database.js'), debug = require('debug')('box:tasks'), logs = require('./logs.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), shell = require('./shell.js')('tasks'), diff --git a/src/taskworker.js b/src/taskworker.js index 3bc64c93d..d9dffb911 100755 --- a/src/taskworker.js +++ b/src/taskworker.js @@ -11,10 +11,10 @@ const apptask = require('./apptask.js'), dns = require('./dns.js'), dyndns = require('./dyndns.js'), externalLdap = require('./externalldap.js'), - fs = require('fs'), + fs = require('node:fs'), locks = require('./locks.js'), mailServer = require('./mailserver.js'), - net = require('net'), + net = require('node:net'), reverseProxy = require('./reverseproxy.js'), safe = require('safetydance'), tasks = require('./tasks.js'), diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js index 509b4e98b..6b993be6e 100644 --- a/src/test/apptask-test.js +++ b/src/test/apptask-test.js @@ -8,7 +8,7 @@ const apptask = require('../apptask.js'), common = require('./common.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), paths = require('../paths.js'), safe = require('safetydance'); diff --git a/src/test/backupformat-test.js b/src/test/backupformat-test.js index b258ed484..7cecb0d6d 100644 --- a/src/test/backupformat-test.js +++ b/src/test/backupformat-test.js @@ -10,9 +10,9 @@ const common = require('./common.js'), DataLayout = require('../datalayout.js'), EnsureFileSizeStream = require('../backupformat/tgz.js')._EnsureFileSizeStream, expect = require('expect.js'), - fs = require('fs'), - os = require('os'), - path = require('path'), + fs = require('node:fs'), + os = require('node:os'), + path = require('node:path'), rsync = require('../backupformat/rsync.js'), safe = require('safetydance'), stream = require('node:stream/promises'); diff --git a/src/test/backuptask-test.js b/src/test/backuptask-test.js index 800b2562b..c3cb4b3ab 100644 --- a/src/test/backuptask-test.js +++ b/src/test/backuptask-test.js @@ -10,9 +10,9 @@ const backups = require('../backups.js'), backupTargets = require('../backuptargets.js'), common = require('./common.js'), expect = require('expect.js'), - fs = require('fs'), - os = require('os'), - path = require('path'), + fs = require('node:fs'), + os = require('node:os'), + path = require('node:path'), tasks = require('../tasks.js'), timers = require('timers/promises'); @@ -63,7 +63,7 @@ describe('backuptask', function () { it('can backup', async function () { // arch only has maria db which lacks some mysqldump options we need, this is only here to allow running the tests :-/ - if (require('child_process').execSync('/usr/bin/mysqldump --version').toString().indexOf('MariaDB') !== -1) { + if (require('node:child_process').execSync('/usr/bin/mysqldump --version').toString().indexOf('MariaDB') !== -1) { console.log('test skipped because of MariaDB'); return; } @@ -77,7 +77,7 @@ describe('backuptask', function () { it('can take another backup', async function () { // arch only has maria db which lacks some mysqldump options we need, this is only here to allow running the tests :-/ - if (require('child_process').execSync('/usr/bin/mysqldump --version').toString().indexOf('MariaDB') !== -1) { + if (require('node:child_process').execSync('/usr/bin/mysqldump --version').toString().indexOf('MariaDB') !== -1) { console.log('test skipped because of MariaDB'); return; } diff --git a/src/test/common.js b/src/test/common.js index b5e1a0b63..54c3c2f1a 100644 --- a/src/test/common.js +++ b/src/test/common.js @@ -9,12 +9,12 @@ const apps = require('../apps.js'), database = require('../database.js'), domains = require('../domains.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), locks = require('../locks.js'), mailer = require('../mailer.js'), mailServer = require('../mailserver.js'), nock = require('nock'), - path = require('path'), + path = require('node:path'), settings = require('../settings.js'), tasks = require('../tasks.js'), timers = require('timers/promises'), diff --git a/src/test/df-test.js b/src/test/df-test.js index 4d1423b2a..51860d469 100644 --- a/src/test/df-test.js +++ b/src/test/df-test.js @@ -18,7 +18,7 @@ describe('df', function () { it('can get filesystems', async function () { // does not work on archlinux 8! - if (require('child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; + if (require('node:child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; const disks = await df.filesystems(); expect(disks).to.be.ok(); @@ -27,7 +27,7 @@ describe('df', function () { it('can get file', async function () { // does not work on archlinux 8! - if (require('child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; + if (require('node:child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; const disks = await df.file(__dirname); expect(disks).to.be.ok(); diff --git a/src/test/dockerproxy-test.js b/src/test/dockerproxy-test.js index 4e2891fe5..1c6cd0b58 100644 --- a/src/test/dockerproxy-test.js +++ b/src/test/dockerproxy-test.js @@ -8,7 +8,7 @@ 'use strict'; -const child_process = require('child_process'), +const child_process = require('node:child_process'), common = require('./common.js'), constants = require('../constants.js'), dockerProxy = require('../dockerproxy.js'), diff --git a/src/test/logs-test.js b/src/test/logs-test.js index b9f8e6342..5d7836a47 100644 --- a/src/test/logs-test.js +++ b/src/test/logs-test.js @@ -4,9 +4,9 @@ 'use strict'; const expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), logs = require('../logs.js'), - stream = require('stream'); + stream = require('node:stream'); describe('log stream', function () { it('can create stream', function (done) { diff --git a/src/test/network-test.js b/src/test/network-test.js index 53a3e74b4..f6b0c73a0 100644 --- a/src/test/network-test.js +++ b/src/test/network-test.js @@ -8,7 +8,7 @@ const BoxError = require('../boxerror.js'), common = require('./common.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), network = require('../network.js'), paths = require('../paths.js'), safe = require('safetydance'); diff --git a/src/test/progress-stream-test.js b/src/test/progress-stream-test.js index a2bae1e5b..f9ea40b71 100644 --- a/src/test/progress-stream-test.js +++ b/src/test/progress-stream-test.js @@ -4,9 +4,9 @@ 'use strict'; const expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), ProgressStream = require('../progress-stream.js'), - stream = require('stream'); + stream = require('node:stream'); describe('progress stream', function () { it('can create stream', function (done) { diff --git a/src/test/reverseproxy-test.js b/src/test/reverseproxy-test.js index e3d256450..c25d55e43 100644 --- a/src/test/reverseproxy-test.js +++ b/src/test/reverseproxy-test.js @@ -9,7 +9,7 @@ const BoxError = require('../boxerror.js'), common = require('./common.js'), domains = require('../domains.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), paths = require('../paths.js'), reverseProxy = require('../reverseproxy.js'), safe = require('safetydance'); diff --git a/src/test/shell-test.js b/src/test/shell-test.js index 885291d3e..cff995cb8 100644 --- a/src/test/shell-test.js +++ b/src/test/shell-test.js @@ -6,7 +6,7 @@ const BoxError = require('../boxerror.js'), expect = require('expect.js'), - path = require('path'), + path = require('node:path'), safe = require('safetydance'), shell = require('../shell.js')('test'); diff --git a/src/test/storage-provider-test.js b/src/test/storage-provider-test.js index 56318d67d..14af748fe 100644 --- a/src/test/storage-provider-test.js +++ b/src/test/storage-provider-test.js @@ -10,14 +10,14 @@ const backupTargets = require('../backuptargets.js'), BoxError = require('../boxerror.js'), common = require('./common.js'), consumers = require('node:stream/consumers'), - execSync = require('child_process').execSync, + execSync = require('node:child_process').execSync, expect = require('expect.js'), filesystem = require('../storage/filesystem.js'), - fs = require('fs'), + fs = require('node:fs'), gcs = require('../storage/gcs.js'), noop = require('../storage/noop.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), s3 = require('../storage/s3.js'), safe = require('safetydance'), stream = require('stream/promises'); diff --git a/src/test/syncer-test.js b/src/test/syncer-test.js index 16e3eb7cd..c76fb704a 100644 --- a/src/test/syncer-test.js +++ b/src/test/syncer-test.js @@ -6,11 +6,11 @@ const createTree = require('./common.js').createTree, DataLayout = require('../datalayout.js'), - execSync = require('child_process').execSync, + execSync = require('node:child_process').execSync, expect = require('expect.js'), - fs = require('fs'), - os = require('os'), - path = require('path'), + fs = require('node:fs'), + os = require('node:os'), + path = require('node:path'), paths = require('../paths.js'), safe = require('safetydance'), syncer = require('../syncer.js'); diff --git a/src/test/syslog-test.js b/src/test/syslog-test.js index 5734eac4e..e862a3ac9 100644 --- a/src/test/syslog-test.js +++ b/src/test/syslog-test.js @@ -7,9 +7,9 @@ 'use strict'; const expect = require('expect.js'), - fs = require('fs'), - net = require('net'), - path = require('path'), + fs = require('node:fs'), + net = require('node:net'), + path = require('node:path'), paths = require('../paths.js'), safe = require('safetydance'), syslogServer = require('../../syslog.js'), diff --git a/src/test/system-test.js b/src/test/system-test.js index c23e1e37c..2af1fa30b 100644 --- a/src/test/system-test.js +++ b/src/test/system-test.js @@ -22,7 +22,7 @@ describe('System', function () { it('can get filesystems', async function () { // does not work on archlinux 8! - if (require('child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; + if (require('node:child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; const filesystems = await system.getFilesystems(); expect(filesystems).to.be.ok(); @@ -31,7 +31,7 @@ describe('System', function () { it('can get swaps', async function () { // does not work on archlinux 8! - if (require('child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; + if (require('node:child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; const swaps = await system.getSwaps(); expect(swaps).to.be.ok(); @@ -40,7 +40,7 @@ describe('System', function () { it('can check for disk space', async function () { // does not work on archlinux 8! - if (require('child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; + if (require('node:child_process').execSync('uname -a').toString().indexOf('-arch') !== -1) return; await system.checkDiskSpace(); }); diff --git a/src/test/tasks-test.js b/src/test/tasks-test.js index f431a25cd..030829614 100644 --- a/src/test/tasks-test.js +++ b/src/test/tasks-test.js @@ -9,7 +9,7 @@ const BoxError = require('../boxerror.js'), common = require('./common.js'), expect = require('expect.js'), - fs = require('fs'), + fs = require('node:fs'), paths = require('../paths.js'), safe = require('safetydance'), tasks = require('../tasks.js'), diff --git a/src/tokens.js b/src/tokens.js index 878a8af16..fc23b5b2e 100644 --- a/src/tokens.js +++ b/src/tokens.js @@ -22,9 +22,9 @@ exports = module.exports = { const TOKENS_FIELDS = [ 'id', 'accessToken', 'identifier', 'clientId', 'scopeJson', 'expires', 'name', 'lastUsedTime', 'allowedIpRanges' ].join(','); -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), hat = require('./hat.js'), ipaddr = require('./ipaddr.js'), diff --git a/src/translations.js b/src/translations.js index 5b23f1c92..9290792e2 100644 --- a/src/translations.js +++ b/src/translations.js @@ -6,11 +6,11 @@ exports = module.exports = { listLanguages }; -const assert = require('assert'), +const assert = require('node:assert'), cloudron = require('./cloudron.js'), debug = require('debug')('box:translation'), - fs = require('fs'), - path = require('path'), + fs = require('node:fs'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'); diff --git a/src/underscore.js b/src/underscore.js index 52b2d956b..ef5a85dca 100644 --- a/src/underscore.js +++ b/src/underscore.js @@ -9,7 +9,7 @@ exports = module.exports = { }; // IMPORTANT: this file is required from the migration logic. avoid requires -const assert = require('assert'); +const assert = require('node:assert'); // note: returns shallow copy. use structuredClone() on top to get a deep copy function pick(obj, keys) { diff --git a/src/updater.js b/src/updater.js index 56f07de86..bde07bb23 100644 --- a/src/updater.js +++ b/src/updater.js @@ -20,7 +20,7 @@ exports = module.exports = { const apps = require('./apps.js'), appstore = require('./appstore.js'), - assert = require('assert'), + assert = require('node:assert'), AuditSource = require('./auditsource.js'), BoxError = require('./boxerror.js'), backupTargets = require('./backuptargets.js'), @@ -28,15 +28,15 @@ const apps = require('./apps.js'), constants = require('./constants.js'), cron = require('./cron.js'), { CronTime } = require('cron'), - crypto = require('crypto'), + crypto = require('node:crypto'), debug = require('debug')('box:updater'), df = require('./df.js'), eventlog = require('./eventlog.js'), - fs = require('fs'), + fs = require('node:fs'), locks = require('./locks.js'), notifications = require('./notifications.js'), - os = require('os'), - path = require('path'), + os = require('node:os'), + path = require('node:path'), paths = require('./paths.js'), promiseRetry = require('./promise-retry.js'), safe = require('safetydance'), diff --git a/src/user-directory.js b/src/user-directory.js index b3aa129ea..0004a2bd7 100644 --- a/src/user-directory.js +++ b/src/user-directory.js @@ -5,7 +5,7 @@ exports = module.exports = { setProfileConfig }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), debug = require('debug')('box:user-directory'), diff --git a/src/users.js b/src/users.js index 4703c83c9..e8fea57ef 100644 --- a/src/users.js +++ b/src/users.js @@ -77,9 +77,9 @@ const USERS_FIELDS = [ 'id', 'username', 'email', 'fallbackEmail', 'password', ' const DEFAULT_GHOST_LIFETIME = 6 * 60 * 60 * 1000; // 6 hours const appPasswords = require('./apppasswords.js'), - assert = require('assert'), + assert = require('node:assert'), BoxError = require('./boxerror.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), constants = require('./constants.js'), dashboard = require('./dashboard.js'), database = require('./database.js'), @@ -101,7 +101,7 @@ const appPasswords = require('./apppasswords.js'), uaParser = require('ua-parser-js'), userDirectory = require('./user-directory.js'), superagent = require('@cloudron/superagent'), - util = require('util'), + util = require('node:util'), validator = require('./validator.js'), _ = require('./underscore.js'); diff --git a/src/validator.js b/src/validator.js index 843cf07d2..657e0b5b4 100644 --- a/src/validator.js +++ b/src/validator.js @@ -4,7 +4,7 @@ exports = module.exports = { isEmail }; -const assert = require('assert'); +const assert = require('node:assert'); // this currently does not match: "john.doe"@example.com, user@[192.168.1.1], john.doe(comment)@example.com or 用户@例子.世界 function isEmail(email) { diff --git a/src/volumes.js b/src/volumes.js index ee6b79da8..2a71c7df1 100644 --- a/src/volumes.js +++ b/src/volumes.js @@ -16,15 +16,15 @@ exports = module.exports = { _validateHostPath: validateHostPath }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), constants = require('./constants.js'), - crypto = require('crypto'), + crypto = require('node:crypto'), database = require('./database.js'), debug = require('debug')('box:volumes'), eventlog = require('./eventlog.js'), mounts = require('./mounts.js'), - path = require('path'), + path = require('node:path'), paths = require('./paths.js'), safe = require('safetydance'), services = require('./services.js'); diff --git a/src/wellknown.js b/src/wellknown.js index 274896787..ad53c9669 100644 --- a/src/wellknown.js +++ b/src/wellknown.js @@ -4,12 +4,12 @@ exports = module.exports = { get }; -const assert = require('assert'), +const assert = require('node:assert'), BoxError = require('./boxerror.js'), dashboard = require('./dashboard.js'), domains = require('./domains.js'), ejs = require('ejs'), - fs = require('fs'), + fs = require('node:fs'), mail = require('./mail.js'), mailServer = require('./mailserver.js'), safe = require('safetydance'), diff --git a/syslog.js b/syslog.js index b897a5c65..7ca0ef331 100755 --- a/syslog.js +++ b/syslog.js @@ -8,11 +8,11 @@ exports = module.exports = { }; const debug = require('debug')('syslog:server'), - fs = require('fs'), - net = require('net'), - path = require('path'), + fs = require('node:fs'), + net = require('node:net'), + path = require('node:path'), paths = require('./src/paths.js'), - util = require('util'); + util = require('node:util'); let gServer = null;