diff --git a/box.js b/box.js index 772ada409..d705b65eb 100755 --- a/box.js +++ b/box.js @@ -7,7 +7,7 @@ import net from 'node:net'; import oidcServer from './src/oidcserver.js'; import paths from './src/paths.js'; import proxyAuth from './src/proxyauth.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import server from './src/server.js'; import directoryServer from './src/directoryserver.js'; import logger from './src/logger.js'; diff --git a/migrations/20150430210225-settings-default-timezone.js b/migrations/20150430210225-settings-default-timezone.js index afaa1f3ba..0e9b6c47a 100644 --- a/migrations/20150430210225-settings-default-timezone.js +++ b/migrations/20150430210225-settings-default-timezone.js @@ -1,6 +1,6 @@ 'use strict'; -var safe = require('safetydance'); +var safe = require('@cloudron/safetydance').default; exports.up = function(db, callback) { var tz = safe.fs.readFileSync('/etc/timezone', 'utf8'); diff --git a/migrations/20171118000001-apps-add-domain.js b/migrations/20171118000001-apps-add-domain.js index e8489b33d..66f30ad49 100644 --- a/migrations/20171118000001-apps-add-domain.js +++ b/migrations/20171118000001-apps-add-domain.js @@ -1,7 +1,7 @@ 'use strict'; var async = require('async'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; exports.up = function(db, callback) { // first check precondtion of domain entry in settings diff --git a/migrations/20171118000002-domains-add-table.js b/migrations/20171118000002-domains-add-table.js index 4a086c428..88109ebe4 100644 --- a/migrations/20171118000002-domains-add-table.js +++ b/migrations/20171118000002-domains-add-table.js @@ -1,7 +1,7 @@ 'use strict'; var async = require('async'), - safe = require('safetydance'), + safe = require('@cloudron/safetydance').default, tld = require('tldjs'); exports.up = function(db, callback) { diff --git a/migrations/20180207000001-migrate-altDomain-to-manual-domain.js b/migrations/20180207000001-migrate-altDomain-to-manual-domain.js index 82e1c1c13..55ee48dcc 100644 --- a/migrations/20180207000001-migrate-altDomain-to-manual-domain.js +++ b/migrations/20180207000001-migrate-altDomain-to-manual-domain.js @@ -5,7 +5,7 @@ var async = require('async'), fs = require('node:fs'), os = require('node:os'), path = require('node:path'), - safe = require('safetydance'), + safe = require('@cloudron/safetydance').default, tldjs = require('tldjs'); exports.up = function(db, callback) { diff --git a/migrations/20201223014453-domains-add-wellKnownJson.js b/migrations/20201223014453-domains-add-wellKnownJson.js index 64a860e8b..ef5a149ea 100644 --- a/migrations/20201223014453-domains-add-wellKnownJson.js +++ b/migrations/20201223014453-domains-add-wellKnownJson.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; exports.up = function(db, callback) { db.runSql('ALTER TABLE domains ADD COLUMN wellKnownJson TEXT', function (error) { diff --git a/migrations/20210503182308-blobs-migrate-secrets.js b/migrations/20210503182308-blobs-migrate-secrets.js index 3ec5e4378..fd4b46f2b 100644 --- a/migrations/20210503182308-blobs-migrate-secrets.js +++ b/migrations/20210503182308-blobs-migrate-secrets.js @@ -2,7 +2,7 @@ const async = require('async'), fs = require('node:fs'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const BOX_DATA_DIR = '/home/yellowtent/boxdata'; const PLATFORM_DATA_DIR = '/home/yellowtent/platformdata'; diff --git a/migrations/20210504221634-settings-migrate-firewall.js b/migrations/20210504221634-settings-migrate-firewall.js index be4e14849..9577b4c01 100644 --- a/migrations/20210504221634-settings-migrate-firewall.js +++ b/migrations/20210504221634-settings-migrate-firewall.js @@ -2,7 +2,7 @@ const async = require('async'), fs = require('node:fs'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const BOX_DATA_DIR = '/home/yellowtent/boxdata'; const PLATFORM_DATA_DIR = '/home/yellowtent/platformdata'; diff --git a/migrations/20210504230054-domains-add-fallbackCertificateJson.js b/migrations/20210504230054-domains-add-fallbackCertificateJson.js index adbf02ae9..a210cfa02 100644 --- a/migrations/20210504230054-domains-add-fallbackCertificateJson.js +++ b/migrations/20210504230054-domains-add-fallbackCertificateJson.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const CERTS_DIR = '/home/yellowtent/boxdata/certs', PLATFORM_CERTS_DIR = '/home/yellowtent/platformdata/nginx/cert'; diff --git a/migrations/20210505165936-subdomains-add-certificateJson.js b/migrations/20210505165936-subdomains-add-certificateJson.js index 518ca67f7..9e9465600 100644 --- a/migrations/20210505165936-subdomains-add-certificateJson.js +++ b/migrations/20210505165936-subdomains-add-certificateJson.js @@ -2,7 +2,7 @@ const async = require('async'), fs = require('node:fs'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const CERTS_DIR = '/home/yellowtent/boxdata/certs'; diff --git a/migrations/20210505223829-blobs-migrate-certs.js b/migrations/20210505223829-blobs-migrate-certs.js index ce8445940..b68a01137 100644 --- a/migrations/20210505223829-blobs-migrate-certs.js +++ b/migrations/20210505223829-blobs-migrate-certs.js @@ -4,7 +4,7 @@ const async = require('async'), child_process = require('node:child_process'), fs = require('node:fs'), path = require('node:path'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const OLD_CERTS_DIR = '/home/yellowtent/boxdata/certs'; const NEW_CERTS_DIR = '/home/yellowtent/platformdata/nginx/cert'; diff --git a/migrations/20210625061443-volumes-change-noop-to-mountpoint.js b/migrations/20210625061443-volumes-change-noop-to-mountpoint.js index ab61ea3d2..cdeeca3be 100644 --- a/migrations/20210625061443-volumes-change-noop-to-mountpoint.js +++ b/migrations/20210625061443-volumes-change-noop-to-mountpoint.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; exports.up = function(db, callback) { db.all('SELECT * FROM volumes', function (error, volumes) { diff --git a/migrations/20210729191138-domains-update-wellKnown-matrix-client.js b/migrations/20210729191138-domains-update-wellKnown-matrix-client.js index 43ff854fc..9cf5b4e0b 100644 --- a/migrations/20210729191138-domains-update-wellKnown-matrix-client.js +++ b/migrations/20210729191138-domains-update-wellKnown-matrix-client.js @@ -1,7 +1,7 @@ 'use strict'; const async = require('async'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; exports.up = function(db, callback) { db.all('SELECT * from domains', [], function (error, results) { diff --git a/migrations/20211006200150-domains-ensure-fallbackCertificate.js b/migrations/20211006200150-domains-ensure-fallbackCertificate.js index e14c29b04..760ac0b47 100644 --- a/migrations/20211006200150-domains-ensure-fallbackCertificate.js +++ b/migrations/20211006200150-domains-ensure-fallbackCertificate.js @@ -2,7 +2,7 @@ const async = require('async'), openssl = require('../src/openssl.js').default, - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const NGINX_CERT_DIR = '/home/yellowtent/platformdata/nginx/cert'; diff --git a/migrations/20211012020255-mail-add-dkimKeyJson.js b/migrations/20211012020255-mail-add-dkimKeyJson.js index e82edc263..65f4eefe0 100644 --- a/migrations/20211012020255-mail-add-dkimKeyJson.js +++ b/migrations/20211012020255-mail-add-dkimKeyJson.js @@ -3,7 +3,7 @@ const async = require('async'), fs = require('node:fs'), path = require('node:path'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; const MAIL_DATA_DIR = '/home/yellowtent/boxdata/mail'; const DKIM_DIR = `${MAIL_DATA_DIR}/dkim`; diff --git a/migrations/20220202011148-blobs-migrate-token-secret.js b/migrations/20220202011148-blobs-migrate-token-secret.js index 489eaaac1..0818d98a4 100644 --- a/migrations/20220202011148-blobs-migrate-token-secret.js +++ b/migrations/20220202011148-blobs-migrate-token-secret.js @@ -1,6 +1,6 @@ 'use strict'; -const safe = require('safetydance'); +const safe = require('@cloudron/safetydance').default; const PROXY_AUTH_TOKEN_SECRET_FILE = '/home/yellowtent/platformdata/proxy-auth-token-secret'; diff --git a/migrations/20220219220751-mail-ensure-dkimKey.js b/migrations/20220219220751-mail-ensure-dkimKey.js index 2f6e0cd8f..9fdf50ee3 100644 --- a/migrations/20220219220751-mail-ensure-dkimKey.js +++ b/migrations/20220219220751-mail-ensure-dkimKey.js @@ -2,7 +2,7 @@ const async = require('async'), mail = require('../src/mail.js').default, - safe = require('safetydance'), + safe = require('@cloudron/safetydance').default, 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 diff --git a/migrations/20220602050517-apps-add-storageVolumeId.js b/migrations/20220602050517-apps-add-storageVolumeId.js index 66e1789ff..5cf5359d3 100644 --- a/migrations/20220602050517-apps-add-storageVolumeId.js +++ b/migrations/20220602050517-apps-add-storageVolumeId.js @@ -2,7 +2,7 @@ const crypto = require('node:crypto'), path = require('node:path'), - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; function getMountPoint(dataDir) { const output = safe.child_process.execSync(`df --output=target "${dataDir}" | tail -1`, { encoding: 'utf8' }); diff --git a/migrations/20220911090713-mail-catchAll-make-absolute.js b/migrations/20220911090713-mail-catchAll-make-absolute.js index fbd261ec9..0a8ffc913 100644 --- a/migrations/20220911090713-mail-catchAll-make-absolute.js +++ b/migrations/20220911090713-mail-catchAll-make-absolute.js @@ -1,6 +1,6 @@ 'use strict'; -const safe = require('safetydance'); +const safe = require('@cloudron/safetydance').default; exports.up = async function (db) { const mailDomains = await db.runSql('SELECT * FROM mail', []); diff --git a/migrations/20250724141339-backups-add-siteId.js b/migrations/20250724141339-backups-add-siteId.js index a8a118021..a202dd099 100644 --- a/migrations/20250724141339-backups-add-siteId.js +++ b/migrations/20250724141339-backups-add-siteId.js @@ -4,7 +4,7 @@ const crypto = require('node:crypto'), fs = require('node:fs'), path = require('node:path'), paths = require('../src/paths.js').default, - safe = require('safetydance'); + safe = require('@cloudron/safetydance').default; exports.up = async function(db) { const backups = await db.runSql('SELECT format, COUNT(*) AS count FROM backups GROUP BY format WITH ROLLUP', []); // https://dev.mysql.com/doc/refman/8.4/en/group-by-modifiers.html diff --git a/package-lock.json b/package-lock.json index cb3a82e15..580d751c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@cloudron/connect-lastmile": "^3.0.0", "@cloudron/manifest-format": "^6.1.0", "@cloudron/pipework": "^2.1.2", + "@cloudron/safetydance": "^3.0.1", "@cloudron/superagent": "^2.1.1", "@google-cloud/dns": "^5.3.1", "@google-cloud/storage": "^7.19.0", @@ -46,7 +47,6 @@ "oidc-provider": "^9.6.1", "ovh": "^2.0.3", "qrcode": "^1.5.4", - "safetydance": "^2.5.1", "semver": "^7.7.4", "speakeasy": "^2.0.0", "tar-stream": "^3.1.8", @@ -7774,15 +7774,6 @@ "version": "2.1.2", "license": "MIT" }, - "node_modules/safetydance": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/safetydance/-/safetydance-2.5.1.tgz", - "integrity": "sha512-loeEErOTR8rhC2ICec1C1dRyfOtjFomS2A1JG8rl5qNQWVHJMJNKdL/kinaSq58yu1mOak0UW+pKY1cb/t4BCg==", - "engines": [ - "node >= 4.0.0" - ], - "license": "MIT" - }, "node_modules/sax": { "version": "1.2.1", "license": "ISC" diff --git a/package.json b/package.json index 01d5f4d98..df56ca60a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "oidc-provider": "^9.6.1", "ovh": "^2.0.3", "qrcode": "^1.5.4", - "safetydance": "^2.5.1", + "@cloudron/safetydance": "^3.0.1", "semver": "^7.7.4", "speakeasy": "^2.0.0", "tar-stream": "^3.1.8", diff --git a/scripts/hotfix b/scripts/hotfix index e217f9952..4c92ad4ce 100755 --- a/scripts/hotfix +++ b/scripts/hotfix @@ -8,7 +8,7 @@ import net from 'node:net'; import os from 'node:os'; import path from 'node:path'; import { program } from 'commander'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import { Client as SshClient } from 'ssh2'; import util from 'node:util'; diff --git a/scripts/release b/scripts/release index e570676a1..63d459994 100755 --- a/scripts/release +++ b/scripts/release @@ -7,7 +7,7 @@ import net from 'net'; import os from 'os'; import path from 'path'; import { program } from 'commander'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import superagent from '@cloudron/superagent'; import Table from 'easy-table'; diff --git a/src/acme2.js b/src/acme2.js index 8b2d3c28e..2b15aaf3a 100644 --- a/src/acme2.js +++ b/src/acme2.js @@ -8,7 +8,7 @@ import openssl from './openssl.js'; import path from 'node:path'; import paths from './paths.js'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import users from './users.js'; diff --git a/src/apphealthmonitor.js b/src/apphealthmonitor.js index 5922ca33f..61e32982a 100644 --- a/src/apphealthmonitor.js +++ b/src/apphealthmonitor.js @@ -6,7 +6,7 @@ import constants from './constants.js'; import logger from './logger.js'; import docker from './docker.js'; import eventlog from './eventlog.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; const { log } = logger('apphealthmonitor'); diff --git a/src/applinks.js b/src/applinks.js index 8c76d52d0..290a142b1 100644 --- a/src/applinks.js +++ b/src/applinks.js @@ -5,7 +5,7 @@ import crypto from 'node:crypto'; import database from './database.js'; import logger from './logger.js'; import jsdom from 'jsdom'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; const { log } = logger('applinks'); diff --git a/src/apppasswords.js b/src/apppasswords.js index d49ba29e3..8dbd75b77 100644 --- a/src/apppasswords.js +++ b/src/apppasswords.js @@ -3,7 +3,7 @@ import BoxError from './boxerror.js'; import crypto from 'node:crypto'; import database from './database.js'; import hat from './hat.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import _ from './underscore.js'; diff --git a/src/apps.js b/src/apps.js index d4eb14322..ae61ee58f 100644 --- a/src/apps.js +++ b/src/apps.js @@ -29,7 +29,7 @@ import path from 'node:path'; import paths from './paths.js'; import { PassThrough } from 'node:stream'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import services from './services.js'; import shellModule from './shell.js'; diff --git a/src/appstore.js b/src/appstore.js index 7d5a70813..4b2851281 100644 --- a/src/appstore.js +++ b/src/appstore.js @@ -15,7 +15,7 @@ import manifestFormat from '@cloudron/manifest-format'; import oidcClients from './oidcclients.js'; import paths from './paths.js'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import settings from './settings.js'; import superagent from '@cloudron/superagent'; diff --git a/src/apptask.js b/src/apptask.js index 33870988f..4f92e9eeb 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -23,7 +23,7 @@ import path from 'node:path'; import paths from './paths.js'; import retry from './retry.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import _ from './underscore.js'; diff --git a/src/apptaskmanager.js b/src/apptaskmanager.js index b1f59f4b7..6a096fd0d 100644 --- a/src/apptaskmanager.js +++ b/src/apptaskmanager.js @@ -5,7 +5,7 @@ import fs from 'node:fs'; import locks from './locks.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import scheduler from './scheduler.js'; import tasks from './tasks.js'; diff --git a/src/archives.js b/src/archives.js index 8d1a21be2..b99cf66a9 100644 --- a/src/archives.js +++ b/src/archives.js @@ -3,7 +3,7 @@ import BoxError from './boxerror.js'; import crypto from 'node:crypto'; import database from './database.js'; import eventlog from './eventlog.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const ARCHIVE_FIELDS = [ 'archives.id', 'backupId', 'archives.creationTime', 'backups.remotePath', 'backups.siteId', 'backups.manifestJson', 'backups.appConfigJson', '(archives.icon IS NOT NULL) AS hasIcon', '(archives.packageIcon IS NOT NULL) AS hasPackageIcon' ]; diff --git a/src/asynctask.js b/src/asynctask.js index e86d4bc71..edffe23e9 100644 --- a/src/asynctask.js +++ b/src/asynctask.js @@ -1,6 +1,6 @@ import logger from './logger.js'; import EventEmitter from 'node:events'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('asynctask'); diff --git a/src/backupcleaner.js b/src/backupcleaner.js index 4e2bb686b..98b2c1046 100644 --- a/src/backupcleaner.js +++ b/src/backupcleaner.js @@ -9,7 +9,7 @@ import constants from './constants.js'; import logger from './logger.js'; import moment from 'moment'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('backupcleaner'); diff --git a/src/backupformat/rsync.js b/src/backupformat/rsync.js index 08f7f1bc9..43f3bb135 100644 --- a/src/backupformat/rsync.js +++ b/src/backupformat/rsync.js @@ -13,7 +13,7 @@ import paths from '../paths.js'; import { pipeline } from 'node:stream/promises'; import ProgressStream from '../progress-stream.js'; import retry from '../retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from '../shell.js'; import syncer from '../syncer.js'; import util from 'node:util'; diff --git a/src/backupformat/tgz.js b/src/backupformat/tgz.js index 4fdbda1a1..7c4a42cc8 100644 --- a/src/backupformat/tgz.js +++ b/src/backupformat/tgz.js @@ -10,7 +10,7 @@ import HashStream from '../hash-stream.js'; import path from 'node:path'; import ProgressStream from '../progress-stream.js'; import retry from '../retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import stream from 'stream/promises'; import { Transform } from 'node:stream'; import tar from 'tar-stream'; diff --git a/src/backupintegrity.js b/src/backupintegrity.js index f3297e012..7bfcd2168 100644 --- a/src/backupintegrity.js +++ b/src/backupintegrity.js @@ -6,7 +6,7 @@ import BoxError from './boxerror.js'; import consumers from 'node:stream/consumers'; import crypto from 'node:crypto'; import logger from './logger.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('backupintegrity'); diff --git a/src/backups.js b/src/backups.js index 13492a849..b06a0f032 100644 --- a/src/backups.js +++ b/src/backups.js @@ -4,7 +4,7 @@ import database from './database.js'; import logger from './logger.js'; import eventlog from './eventlog.js'; import hat from './hat.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from './tasks.js'; const { log } = logger('backups'); diff --git a/src/backupsites.js b/src/backupsites.js index 46b979855..87e7d73a8 100644 --- a/src/backupsites.js +++ b/src/backupsites.js @@ -12,7 +12,7 @@ import hush from './hush.js'; import locks from './locks.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from './tasks.js'; import storageFilesystem from './storage/filesystem.js'; import storageS3 from './storage/s3.js'; diff --git a/src/backuptask.js b/src/backuptask.js index 92cbc74f6..53666d4f2 100644 --- a/src/backuptask.js +++ b/src/backuptask.js @@ -14,7 +14,7 @@ import locks from './locks.js'; import path from 'node:path'; import paths from './paths.js'; import { Readable } from 'node:stream'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import stream from 'stream/promises'; diff --git a/src/branding.js b/src/branding.js index 67374e063..c46868b70 100644 --- a/src/branding.js +++ b/src/branding.js @@ -5,7 +5,7 @@ import constants from './constants.js'; import logger from './logger.js'; import eventlog from './eventlog.js'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; const { log } = logger('branding'); diff --git a/src/community.js b/src/community.js index a6455f6ab..9de5535d0 100644 --- a/src/community.js +++ b/src/community.js @@ -3,7 +3,7 @@ import BoxError from './boxerror.js'; import logger from './logger.js'; import manifestFormat from '@cloudron/manifest-format'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; const { log } = logger('community'); diff --git a/src/cron.js b/src/cron.js index e56a418bd..2c88cedbc 100644 --- a/src/cron.js +++ b/src/cron.js @@ -18,7 +18,7 @@ import network from './network.js'; import oidcServer from './oidcserver.js'; import paths from './paths.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import scheduler from './scheduler.js'; import system from './system.js'; import updater from './updater.js'; diff --git a/src/dashboard.js b/src/dashboard.js index 12f3aba63..81e1a6199 100644 --- a/src/dashboard.js +++ b/src/dashboard.js @@ -13,7 +13,7 @@ import mailServer from './mailserver.js'; import platform from './platform.js'; import passkeys from './passkeys.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import system from './system.js'; import tasks from './tasks.js'; diff --git a/src/database.js b/src/database.js index e40165141..bee08806d 100644 --- a/src/database.js +++ b/src/database.js @@ -4,7 +4,7 @@ import constants from './constants.js'; import logger from './logger.js'; import { execSync } from 'node:child_process'; import mysql from 'mysql2/promise'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; const { log } = logger('database'); diff --git a/src/df.js b/src/df.js index 8126588ca..306ed4aeb 100644 --- a/src/df.js +++ b/src/df.js @@ -1,7 +1,7 @@ import assert from 'node:assert'; import BoxError from './boxerror.js'; import logger from './logger.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; const { log } = logger('df'); diff --git a/src/directoryserver.js b/src/directoryserver.js index a43318334..b56d13c75 100644 --- a/src/directoryserver.js +++ b/src/directoryserver.js @@ -10,7 +10,7 @@ import ldap from 'ldapjs'; import path from 'node:path'; import paths from './paths.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import shellModule from './shell.js'; import users from './users.js'; diff --git a/src/dns.js b/src/dns.js index e5b7ccfb6..28aca2ab9 100644 --- a/src/dns.js +++ b/src/dns.js @@ -10,7 +10,7 @@ import mail from './mail.js'; import mailServer from './mailserver.js'; import network from './network.js'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from './tasks.js'; import tld from 'tldjs'; import dnsBunny from './dns/bunny.js'; diff --git a/src/dns/bunny.js b/src/dns/bunny.js index 00732b16a..b89fff08f 100644 --- a/src/dns/bunny.js +++ b/src/dns/bunny.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/cloudflare.js b/src/dns/cloudflare.js index c81a93c9f..a10f31f93 100644 --- a/src/dns/cloudflare.js +++ b/src/dns/cloudflare.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; import _ from '../underscore.js'; diff --git a/src/dns/desec.js b/src/dns/desec.js index d7d19897c..94aefb2d9 100644 --- a/src/dns/desec.js +++ b/src/dns/desec.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import timers from 'timers/promises'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/digitalocean.js b/src/dns/digitalocean.js index 09017d975..4abd6d920 100644 --- a/src/dns/digitalocean.js +++ b/src/dns/digitalocean.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/dnsimple.js b/src/dns/dnsimple.js index 6bfe01dfe..ebb165441 100644 --- a/src/dns/dnsimple.js +++ b/src/dns/dnsimple.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/gandi.js b/src/dns/gandi.js index 37d9f1c30..6cf88fab0 100644 --- a/src/dns/gandi.js +++ b/src/dns/gandi.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/gcdns.js b/src/dns/gcdns.js index 343601aa4..4f7fcbcb3 100644 --- a/src/dns/gcdns.js +++ b/src/dns/gcdns.js @@ -5,7 +5,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import { DNS as GCDNS } from '@google-cloud/dns'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; import _ from '../underscore.js'; diff --git a/src/dns/godaddy.js b/src/dns/godaddy.js index 098f13286..e8d0fa63e 100644 --- a/src/dns/godaddy.js +++ b/src/dns/godaddy.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/hetzner.js b/src/dns/hetzner.js index 14b32e619..4e9574716 100644 --- a/src/dns/hetzner.js +++ b/src/dns/hetzner.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/hetznercloud.js b/src/dns/hetznercloud.js index f93962e1c..bd2354295 100644 --- a/src/dns/hetznercloud.js +++ b/src/dns/hetznercloud.js @@ -5,7 +5,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import retry from '../retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/inwx.js b/src/dns/inwx.js index 7c4686a86..71936e9c1 100644 --- a/src/dns/inwx.js +++ b/src/dns/inwx.js @@ -5,7 +5,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; const { log } = logger('dns/inwx'); diff --git a/src/dns/linode.js b/src/dns/linode.js index b168430a7..e2d5cb731 100644 --- a/src/dns/linode.js +++ b/src/dns/linode.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/manual.js b/src/dns/manual.js index 5ff12ef42..e63b983da 100644 --- a/src/dns/manual.js +++ b/src/dns/manual.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; const { log } = logger('dns/manual'); diff --git a/src/dns/namecheap.js b/src/dns/namecheap.js index f028d12d4..c99c4cf55 100644 --- a/src/dns/namecheap.js +++ b/src/dns/namecheap.js @@ -5,7 +5,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import network from '../network.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import timers from 'timers/promises'; import util from 'node:util'; diff --git a/src/dns/namecom.js b/src/dns/namecom.js index 4d33b4fbc..8e07c3ff8 100644 --- a/src/dns/namecom.js +++ b/src/dns/namecom.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/netcup.js b/src/dns/netcup.js index 9c90ffb63..2680acbee 100644 --- a/src/dns/netcup.js +++ b/src/dns/netcup.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/ovh.js b/src/dns/ovh.js index 3b03db753..bdbbae0a9 100644 --- a/src/dns/ovh.js +++ b/src/dns/ovh.js @@ -5,7 +5,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import ovhClient from 'ovh'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; const { log } = logger('dns/ovh'); diff --git a/src/dns/porkbun.js b/src/dns/porkbun.js index 866bc8d1a..829b60873 100644 --- a/src/dns/porkbun.js +++ b/src/dns/porkbun.js @@ -4,7 +4,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import timers from 'timers/promises'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/route53.js b/src/dns/route53.js index 213dd523d..7152eef54 100644 --- a/src/dns/route53.js +++ b/src/dns/route53.js @@ -6,7 +6,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import { Route53 } from '@aws-sdk/client-route-53'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; import _ from '../underscore.js'; diff --git a/src/dns/vultr.js b/src/dns/vultr.js index 2280ca8c2..bcfa3038e 100644 --- a/src/dns/vultr.js +++ b/src/dns/vultr.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import waitForDns from './waitfordns.js'; diff --git a/src/dns/waitfordns.js b/src/dns/waitfordns.js index 8db78932c..7b0810cee 100644 --- a/src/dns/waitfordns.js +++ b/src/dns/waitfordns.js @@ -4,7 +4,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from 'node:dns'; import retry from '../retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import _ from '../underscore.js'; const { log } = logger('dns/waitfordns'); diff --git a/src/dns/wildcard.js b/src/dns/wildcard.js index b986c71d0..a5ea6af2d 100644 --- a/src/dns/wildcard.js +++ b/src/dns/wildcard.js @@ -4,7 +4,7 @@ import logger from '../logger.js'; import dig from '../dig.js'; import dns from '../dns.js'; import network from '../network.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import waitForDns from './waitfordns.js'; const { log } = logger('dns/manual'); diff --git a/src/docker.js b/src/docker.js index d382cbe0a..a5e3e971b 100644 --- a/src/docker.js +++ b/src/docker.js @@ -13,7 +13,7 @@ import paths from './paths.js'; import retry from './retry.js'; import services from './services.js'; import shellModule from './shell.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import timers from 'timers/promises'; import volumes from './volumes.js'; diff --git a/src/dockerproxy.js b/src/dockerproxy.js index 12c9505a6..805b6a2a1 100644 --- a/src/dockerproxy.js +++ b/src/dockerproxy.js @@ -9,7 +9,7 @@ import middleware from './middleware/index.js'; import net from 'node:net'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import util from 'node:util'; import volumes from './volumes.js'; diff --git a/src/dockerregistries.js b/src/dockerregistries.js index a28c20bc0..130a5b881 100644 --- a/src/dockerregistries.js +++ b/src/dockerregistries.js @@ -6,7 +6,7 @@ import database from './database.js'; import Docker from 'dockerode'; import eventlog from './eventlog.js'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tld from 'tldjs'; diff --git a/src/domains.js b/src/domains.js index 332d63998..d85909755 100644 --- a/src/domains.js +++ b/src/domains.js @@ -10,7 +10,7 @@ import mailServer from './mailserver.js'; import notifications from './notifications.js'; import openssl from './openssl.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tld from 'tldjs'; import _ from './underscore.js'; import dnsBunny from './dns/bunny.js'; diff --git a/src/dyndns.js b/src/dyndns.js index 978c71d97..c427eab03 100644 --- a/src/dyndns.js +++ b/src/dyndns.js @@ -8,7 +8,7 @@ import fs from 'node:fs'; import mailServer from './mailserver.js'; import network from './network.js'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from './tasks.js'; const { log } = logger('dyndns'); diff --git a/src/eventlog.js b/src/eventlog.js index c959c464f..2b9374915 100644 --- a/src/eventlog.js +++ b/src/eventlog.js @@ -4,7 +4,7 @@ import database from './database.js'; import logger from './logger.js'; import mysql from 'mysql2'; import notifications from './notifications.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('eventlog'); diff --git a/src/externalldap.js b/src/externalldap.js index e12281c49..d4b5561e3 100644 --- a/src/externalldap.js +++ b/src/externalldap.js @@ -7,7 +7,7 @@ import logger from './logger.js'; import eventlog from './eventlog.js'; import groups from './groups.js'; import ldap from 'ldapjs'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import tasks from './tasks.js'; import users from './users.js'; diff --git a/src/file-utils.js b/src/file-utils.js index 1421215a6..7dfc6ea06 100644 --- a/src/file-utils.js +++ b/src/file-utils.js @@ -1,7 +1,7 @@ import assert from 'node:assert'; import { promises as fsPromises } from 'node:fs'; import BoxError from './boxerror.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; // cross device file rename async function renameFile(sourcePath, destPath) { diff --git a/src/groups.js b/src/groups.js index e00b3dffb..e0e8bec67 100644 --- a/src/groups.js +++ b/src/groups.js @@ -5,7 +5,7 @@ import constants from './constants.js'; import crypto from 'node:crypto'; import database from './database.js'; import eventlog from './eventlog.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const GROUPS_FIELDS = [ 'id', 'name', 'source' ].join(','); diff --git a/src/janitor.js b/src/janitor.js index fd784ce74..7919456c4 100644 --- a/src/janitor.js +++ b/src/janitor.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from './boxerror.js'; import logger from './logger.js'; import Docker from 'dockerode'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tokens from './tokens.js'; const { log } = logger('janitor'); diff --git a/src/ldapserver.js b/src/ldapserver.js index 1922dffa3..8bbce78e7 100644 --- a/src/ldapserver.js +++ b/src/ldapserver.js @@ -9,7 +9,7 @@ import eventlog from './eventlog.js'; import groups from './groups.js'; import ldap from 'ldapjs'; import mail from './mail.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from './users.js'; import util from 'node:util'; diff --git a/src/mail.js b/src/mail.js index 798627ffd..a14d8aa82 100644 --- a/src/mail.js +++ b/src/mail.js @@ -15,7 +15,7 @@ import nodemailer from 'nodemailer'; import notifications from './notifications.js'; import path from 'node:path'; import platform from './platform.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import superagent from '@cloudron/superagent'; diff --git a/src/mailer.js b/src/mailer.js index e1429aecc..6a8662d82 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -8,7 +8,7 @@ import ejs from 'ejs'; import mailServer from './mailserver.js'; import nodemailer from 'nodemailer'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import translations from './translations.js'; const { log } = logger('mailer'); diff --git a/src/mailpasswords.js b/src/mailpasswords.js index c38320c06..ecec855c1 100644 --- a/src/mailpasswords.js +++ b/src/mailpasswords.js @@ -1,7 +1,7 @@ import assert from 'node:assert'; import BoxError from './boxerror.js'; import database from './database.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const MAIL_PASSWORD_FIELDS = [ 'clientId', 'userId', 'password', 'creationTime' ].join(','); diff --git a/src/mailserver.js b/src/mailserver.js index b3d9720f2..041902af1 100644 --- a/src/mailserver.js +++ b/src/mailserver.js @@ -15,7 +15,7 @@ import mail from './mail.js'; import paths from './paths.js'; import platform from './platform.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import settings from './settings.js'; import shellModule from './shell.js'; diff --git a/src/metrics.js b/src/metrics.js index 548b1288b..8758c590e 100644 --- a/src/metrics.js +++ b/src/metrics.js @@ -9,7 +9,7 @@ import net from 'node:net'; import network from './network.js'; import os from 'node:os'; import { Readable } from 'node:stream'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import superagent from '@cloudron/superagent'; diff --git a/src/middleware/multipart.js b/src/middleware/multipart.js index dbf753abf..7d3f22c15 100644 --- a/src/middleware/multipart.js +++ b/src/middleware/multipart.js @@ -1,7 +1,7 @@ /* jshint node:true */ import multiparty from 'multiparty'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import timeout from 'connect-timeout'; function _mime(req) { diff --git a/src/mounts.js b/src/mounts.js index b33317d8a..ffa5c0eb7 100644 --- a/src/mounts.js +++ b/src/mounts.js @@ -6,7 +6,7 @@ import ejs from 'ejs'; import fs from 'node:fs'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; const { log } = logger('mounts'); diff --git a/src/network.js b/src/network.js index 269943df4..b4de5cb8d 100644 --- a/src/network.js +++ b/src/network.js @@ -6,7 +6,7 @@ import fs from 'node:fs'; import ipaddr from './ipaddr.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import shellModule from './shell.js'; import noopProvider from './network/noop.js'; diff --git a/src/network/generic.js b/src/network/generic.js index ed9d84944..9fa4e7d2e 100644 --- a/src/network/generic.js +++ b/src/network/generic.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import constants from '../constants.js'; import logger from '../logger.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; const { log } = logger('network/generic'); diff --git a/src/network/network-interface.js b/src/network/network-interface.js index 8c385d8a1..24b115bd8 100644 --- a/src/network/network-interface.js +++ b/src/network/network-interface.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import logger from '../logger.js'; import os from 'node:os'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('network/network-interface'); diff --git a/src/notifications.js b/src/notifications.js index 1614d9f5f..356f780ee 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -7,7 +7,7 @@ import database from './database.js'; import logger from './logger.js'; import eventlog from './eventlog.js'; import mailer from './mailer.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from './users.js'; const { log } = logger('notifications'); diff --git a/src/oidcclients.js b/src/oidcclients.js index c2bb951f1..c52db5ab4 100644 --- a/src/oidcclients.js +++ b/src/oidcclients.js @@ -4,7 +4,7 @@ import dashboard from './dashboard.js'; import database from './database.js'; import mailPasswords from './mailpasswords.js'; import hat from './hat.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const ID_WEBADMIN = 'cid-webadmin'; const ID_DEVELOPMENT = 'cid-development'; diff --git a/src/oidcserver.js b/src/oidcserver.js index 40867d90e..ff63e25cc 100644 --- a/src/oidcserver.js +++ b/src/oidcserver.js @@ -23,7 +23,7 @@ import paths from './paths.js'; import http from 'node:http'; import { HttpError } from '@cloudron/connect-lastmile'; import * as jose from 'jose'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import tokens from './tokens.js'; import users from './users.js'; diff --git a/src/openssl.js b/src/openssl.js index c2dc0260a..823546e03 100644 --- a/src/openssl.js +++ b/src/openssl.js @@ -5,7 +5,7 @@ import logger from './logger.js'; import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; const { log } = logger('openssl'); diff --git a/src/passkeys.js b/src/passkeys.js index c5dd9721b..35cacbc5f 100644 --- a/src/passkeys.js +++ b/src/passkeys.js @@ -4,7 +4,7 @@ import crypto from 'node:crypto'; import dashboard from './dashboard.js'; import database from './database.js'; import logger from './logger.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import { generateRegistrationOptions, verifyRegistrationResponse, diff --git a/src/platform.js b/src/platform.js index 9362dacfd..157995c79 100644 --- a/src/platform.js +++ b/src/platform.js @@ -15,7 +15,7 @@ import locks from './locks.js'; import oidcServer from './oidcserver.js'; import paths from './paths.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import tasks from './tasks.js'; diff --git a/src/provision.js b/src/provision.js index e1f82ca1b..bc371abba 100644 --- a/src/provision.js +++ b/src/provision.js @@ -18,7 +18,7 @@ import oidcClients from './oidcclients.js'; import openssl from './openssl.js'; import platform from './platform.js'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import paths from './paths.js'; import system from './system.js'; diff --git a/src/proxyauth.js b/src/proxyauth.js index 4e2a26566..449fd0fe4 100644 --- a/src/proxyauth.js +++ b/src/proxyauth.js @@ -16,7 +16,7 @@ import { HttpSuccess } from '@cloudron/connect-lastmile'; import jwt from 'jsonwebtoken'; import middleware from './middleware/index.js'; import oidcServer from './oidcserver.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import users from './users.js'; import util from 'node:util'; diff --git a/src/reverseproxy.js b/src/reverseproxy.js index 1649161a2..5befdccb7 100644 --- a/src/reverseproxy.js +++ b/src/reverseproxy.js @@ -19,7 +19,7 @@ import network from './network.js'; import openssl from './openssl.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import shellModule from './shell.js'; import tasks from './tasks.js'; diff --git a/src/routes/accesscontrol.js b/src/routes/accesscontrol.js index abefb75e6..191bdb5ab 100644 --- a/src/routes/accesscontrol.js +++ b/src/routes/accesscontrol.js @@ -3,7 +3,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import logger from '../logger.js'; import { HttpError } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tokens from '../tokens.js'; import users from '../users.js'; diff --git a/src/routes/applinks.js b/src/routes/applinks.js index bbd65130a..c20b444bb 100644 --- a/src/routes/applinks.js +++ b/src/routes/applinks.js @@ -1,7 +1,7 @@ import assert from 'node:assert'; import applinks from '../applinks.js'; import BoxError from '../boxerror.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; diff --git a/src/routes/apppasswords.js b/src/routes/apppasswords.js index d3367b5d7..94c3aa706 100644 --- a/src/routes/apppasswords.js +++ b/src/routes/apppasswords.js @@ -3,7 +3,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function get(req, res, next) { diff --git a/src/routes/apps.js b/src/routes/apps.js index 52e90d3cd..acf3bb084 100644 --- a/src/routes/apps.js +++ b/src/routes/apps.js @@ -12,7 +12,7 @@ import logger from '../logger.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import metrics from '../metrics.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from '../tasks.js'; import updater from '../updater.js'; import users from '../users.js'; diff --git a/src/routes/appstore.js b/src/routes/appstore.js index 9a5e1edc0..03ab60fec 100644 --- a/src/routes/appstore.js +++ b/src/routes/appstore.js @@ -2,7 +2,7 @@ import appstore from '../appstore.js'; import assert from 'node:assert'; import BoxError from '../boxerror.js'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from '../users.js'; import _ from '../underscore.js'; diff --git a/src/routes/archives.js b/src/routes/archives.js index 38215e379..7f6bc65b1 100644 --- a/src/routes/archives.js +++ b/src/routes/archives.js @@ -5,7 +5,7 @@ import AuditSource from '../auditsource.js'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import { getImageContentType } from '../image-content-type.js'; diff --git a/src/routes/auth.js b/src/routes/auth.js index 8216889ea..c489dd733 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -7,7 +7,7 @@ import eventlog from '../eventlog.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import oidcClients from '../oidcclients.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import speakeasy from 'speakeasy'; import tokens from '../tokens.js'; import users from '../users.js'; diff --git a/src/routes/backups.js b/src/routes/backups.js index 2d7fae4ae..bdf1c4ea0 100644 --- a/src/routes/backups.js +++ b/src/routes/backups.js @@ -4,7 +4,7 @@ import backups from '../backups.js'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/backupsites.js b/src/routes/backupsites.js index 3d996b831..dfaa36dce 100644 --- a/src/routes/backupsites.js +++ b/src/routes/backupsites.js @@ -5,7 +5,7 @@ import backupSites from '../backupsites.js'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/branding.js b/src/routes/branding.js index 8f744ace3..c02f3bcb3 100644 --- a/src/routes/branding.js +++ b/src/routes/branding.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import branding from '../branding.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getFooter(req, res, next) { diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index fddee3278..c2fa18a0f 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import cloudron from '../cloudron.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import translations from '../translations.js'; diff --git a/src/routes/community.js b/src/routes/community.js index 1cdaac288..06f011189 100644 --- a/src/routes/community.js +++ b/src/routes/community.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import community from '../community.js'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getAppVersion(req, res, next) { diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index 9069e644c..1aa6ad806 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -9,7 +9,7 @@ import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import path from 'node:path'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from '../settings.js'; diff --git a/src/routes/directoryserver.js b/src/routes/directoryserver.js index 9cc0e36ee..dfc2d125e 100644 --- a/src/routes/directoryserver.js +++ b/src/routes/directoryserver.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import directoryServer from '../directoryserver.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getConfig(req, res, next) { diff --git a/src/routes/dockerregistries.js b/src/routes/dockerregistries.js index 49f7412dc..951819c3a 100644 --- a/src/routes/dockerregistries.js +++ b/src/routes/dockerregistries.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import dockerRegistries from '../dockerregistries.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/domains.js b/src/routes/domains.js index 4a32d0cb2..fc9be3a06 100644 --- a/src/routes/domains.js +++ b/src/routes/domains.js @@ -5,7 +5,7 @@ import dns from '../dns.js'; import domains from '../domains.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function add(req, res, next) { diff --git a/src/routes/eventlog.js b/src/routes/eventlog.js index 1d411f9fc..a914dd4bb 100644 --- a/src/routes/eventlog.js +++ b/src/routes/eventlog.js @@ -3,7 +3,7 @@ import eventlog from '../eventlog.js'; import validator from '../validator.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function get(req, res, next) { diff --git a/src/routes/externalldap.js b/src/routes/externalldap.js index 4b5858c9b..82f811f9f 100644 --- a/src/routes/externalldap.js +++ b/src/routes/externalldap.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import externalLdap from '../externalldap.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function sync(req, res, next) { diff --git a/src/routes/filemanager.js b/src/routes/filemanager.js index 404346195..74b7d4cc1 100644 --- a/src/routes/filemanager.js +++ b/src/routes/filemanager.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import http from 'node:http'; import { HttpError } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from '../services.js'; diff --git a/src/routes/groups.js b/src/routes/groups.js index 980dac3bf..f03b4a2ba 100644 --- a/src/routes/groups.js +++ b/src/routes/groups.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import groups from '../groups.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/mail.js b/src/routes/mail.js index 572e6866e..7944e0d06 100644 --- a/src/routes/mail.js +++ b/src/routes/mail.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import mail from '../mail.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getDomain(req, res, next) { diff --git a/src/routes/mailserver.js b/src/routes/mailserver.js index 494269115..71201394c 100644 --- a/src/routes/mailserver.js +++ b/src/routes/mailserver.js @@ -6,7 +6,7 @@ import http from 'node:http'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import mailServer from '../mailserver.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from '../services.js'; const { log } = logger('routes/mailserver'); diff --git a/src/routes/network.js b/src/routes/network.js index 90a684ae7..eb44face8 100644 --- a/src/routes/network.js +++ b/src/routes/network.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import network from '../network.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getBlocklist(req, res, next) { diff --git a/src/routes/notifications.js b/src/routes/notifications.js index 0e7f7d7cc..59e5f5a1d 100644 --- a/src/routes/notifications.js +++ b/src/routes/notifications.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import notifications from '../notifications.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/oidcclients.js b/src/routes/oidcclients.js index 5378ce2c5..8a1288245 100644 --- a/src/routes/oidcclients.js +++ b/src/routes/oidcclients.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import oidcClients from '../oidcclients.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function add(req, res, next) { diff --git a/src/routes/profile.js b/src/routes/profile.js index 1fa62e668..5ad240755 100644 --- a/src/routes/profile.js +++ b/src/routes/profile.js @@ -6,7 +6,7 @@ import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import oidcServer from '../oidcserver.js'; import passkeys from '../passkeys.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tokens from '../tokens.js'; import userDirectory from '../user-directory.js'; import users from '../users.js'; diff --git a/src/routes/provision.js b/src/routes/provision.js index 29c4c2dba..b77655e54 100644 --- a/src/routes/provision.js +++ b/src/routes/provision.js @@ -5,7 +5,7 @@ import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import network from '../network.js'; import provision from '../provision.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import system from '../system.js'; import users from '../users.js'; diff --git a/src/routes/reverseproxy.js b/src/routes/reverseproxy.js index b31fa8236..ddb26782c 100644 --- a/src/routes/reverseproxy.js +++ b/src/routes/reverseproxy.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import reverseProxy from '../reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function getTrustedIps(req, res, next) { diff --git a/src/routes/services.js b/src/routes/services.js index ccdb9d486..185b0213a 100644 --- a/src/routes/services.js +++ b/src/routes/services.js @@ -5,7 +5,7 @@ import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import metrics from '../metrics.js'; import platform from '../platform.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from '../services.js'; diff --git a/src/routes/system.js b/src/routes/system.js index 3e2ec9af0..fadf72219 100644 --- a/src/routes/system.js +++ b/src/routes/system.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import metrics from '../metrics.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import system from '../system.js'; diff --git a/src/routes/tasks.js b/src/routes/tasks.js index 3e05950dd..d10fd54e0 100644 --- a/src/routes/tasks.js +++ b/src/routes/tasks.js @@ -2,7 +2,7 @@ import assert from 'node:assert'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from '../tasks.js'; diff --git a/src/routes/test/system-test.js b/src/routes/test/system-test.js index c6141c600..827001e86 100644 --- a/src/routes/test/system-test.js +++ b/src/routes/test/system-test.js @@ -8,7 +8,7 @@ import http from 'node:http'; import nock from 'nock'; import os from 'node:os'; import paths from '../../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; diff --git a/src/routes/test/tasks-test.js b/src/routes/test/tasks-test.js index fd07fcd6c..d2f0b4d44 100644 --- a/src/routes/test/tasks-test.js +++ b/src/routes/test/tasks-test.js @@ -1,7 +1,7 @@ import { describe, it, before, after } from 'mocha'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; import tasks from '../../tasks.js'; diff --git a/src/routes/test/volumes-test.js b/src/routes/test/volumes-test.js index 239d339c9..f8f083020 100644 --- a/src/routes/test/volumes-test.js +++ b/src/routes/test/volumes-test.js @@ -1,7 +1,7 @@ import { describe, it, before, after } from 'mocha'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; diff --git a/src/routes/tokens.js b/src/routes/tokens.js index c48e52a4b..ccd63bd4b 100644 --- a/src/routes/tokens.js +++ b/src/routes/tokens.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; import oidcClients from '../oidcclients.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tokens from '../tokens.js'; diff --git a/src/routes/updater.js b/src/routes/updater.js index cb9a0ce38..687d8f2b7 100644 --- a/src/routes/updater.js +++ b/src/routes/updater.js @@ -3,7 +3,7 @@ import AuditSource from '../auditsource.js'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import updater from '../updater.js'; async function getAutoupdateConfig(req, res, next) { diff --git a/src/routes/user-directory.js b/src/routes/user-directory.js index 635c0c43c..7d6a48585 100644 --- a/src/routes/user-directory.js +++ b/src/routes/user-directory.js @@ -3,7 +3,7 @@ import AuditSource from '../auditsource.js'; import BoxError from '../boxerror.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import userDirectory from '../user-directory.js'; diff --git a/src/routes/users.js b/src/routes/users.js index afce72740..96ba7ab29 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import groups from '../groups.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from '../users.js'; import _ from '../underscore.js'; diff --git a/src/routes/volumes.js b/src/routes/volumes.js index 60434d9a5..1b54f208a 100644 --- a/src/routes/volumes.js +++ b/src/routes/volumes.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import volumes from '../volumes.js'; import { HttpError } from '@cloudron/connect-lastmile'; import { HttpSuccess } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function load(req, res, next) { diff --git a/src/routes/wellknown.js b/src/routes/wellknown.js index 09b9356fd..1831698eb 100644 --- a/src/routes/wellknown.js +++ b/src/routes/wellknown.js @@ -1,5 +1,5 @@ import { HttpError } from '@cloudron/connect-lastmile'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import wellknown from '../wellknown.js'; diff --git a/src/scheduler.js b/src/scheduler.js index 265b44c6b..49c8f3b0f 100644 --- a/src/scheduler.js +++ b/src/scheduler.js @@ -6,7 +6,7 @@ import constants from './constants.js'; import { CronJob } from 'cron'; import logger from './logger.js'; import docker from './docker.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import _ from './underscore.js'; const { log } = logger('scheduler'); diff --git a/src/scripts/backupupload.js b/src/scripts/backupupload.js index 74b8320c3..705e2e496 100755 --- a/src/scripts/backupupload.js +++ b/src/scripts/backupupload.js @@ -3,7 +3,7 @@ import backuptask from '../backuptask.js'; import database from '../database.js'; import logger from '../logger.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('backupupload'); diff --git a/src/server.js b/src/server.js index 564f06da0..64a252c73 100644 --- a/src/server.js +++ b/src/server.js @@ -9,7 +9,7 @@ import { HttpError } from '@cloudron/connect-lastmile'; import middleware from './middleware/index.js'; import platform from './platform.js'; import routes from './routes/index.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from './users.js'; import util from 'node:util'; import { WebSocketServer } from 'ws'; diff --git a/src/services.js b/src/services.js index 16c25f0d9..4fdc06e41 100644 --- a/src/services.js +++ b/src/services.js @@ -24,7 +24,7 @@ import path from 'node:path'; import paths from './paths.js'; import { pipeFileToRequest, pipeRequestToFile } from '@cloudron/pipework'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import settings from './settings.js'; import sftp from './sftp.js'; diff --git a/src/settings.js b/src/settings.js index 9d5a9fb6b..7bef81f6a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ import assert from 'node:assert'; import database from './database.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const APPSTORE_API_TOKEN_KEY = 'appstore_api_token'; const API_SERVER_ORIGIN_KEY = 'api_server_origin'; diff --git a/src/sftp.js b/src/sftp.js index ee5bdd769..859bf6d8c 100644 --- a/src/sftp.js +++ b/src/sftp.js @@ -10,7 +10,7 @@ import infra from './infra_version.js'; import mounts from './mounts.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; import shellModule from './shell.js'; import volumes from './volumes.js'; diff --git a/src/shell.js b/src/shell.js index a04156090..4d9e12b23 100644 --- a/src/shell.js +++ b/src/shell.js @@ -3,7 +3,7 @@ import BoxError from './boxerror.js'; import child_process from 'node:child_process'; import logger from './logger.js'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import _ from './underscore.js'; const { log } = logger('shell'); diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js index 2cb5cbec0..0daedc631 100644 --- a/src/storage/filesystem.js +++ b/src/storage/filesystem.js @@ -7,7 +7,7 @@ import fs from 'node:fs'; import mounts from '../mounts.js'; import path from 'node:path'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from '../shell.js'; import _ from '../underscore.js'; diff --git a/src/storage/gcs.js b/src/storage/gcs.js index f2787dff7..3ecf0ca9b 100644 --- a/src/storage/gcs.js +++ b/src/storage/gcs.js @@ -5,7 +5,7 @@ import constants from '../constants.js'; import logger from '../logger.js'; import { Storage as GCS } from '@google-cloud/storage'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import _ from '../underscore.js'; const { log } = logger('storage/gcs'); diff --git a/src/storage/s3.js b/src/storage/s3.js index 5b1fa8d54..bfb33ed78 100644 --- a/src/storage/s3.js +++ b/src/storage/s3.js @@ -13,7 +13,7 @@ import { PassThrough } from 'node:stream'; import path from 'node:path'; import { Readable } from 'node:stream'; import { S3, NoSuchKey, NoSuchBucket } from '@aws-sdk/client-s3'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import { Upload } from '@aws-sdk/lib-storage'; import _ from '../underscore.js'; diff --git a/src/syncer.js b/src/syncer.js index 40ef16c76..36a8eb7e2 100644 --- a/src/syncer.js +++ b/src/syncer.js @@ -5,7 +5,7 @@ import logger from './logger.js'; import fs from 'node:fs'; import path from 'node:path'; import readline from 'node:readline'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import util from 'node:util'; const { log } = logger('syncer'); diff --git a/src/system.js b/src/system.js index 15a124dbc..2e704dc81 100644 --- a/src/system.js +++ b/src/system.js @@ -14,7 +14,7 @@ import notifications from './notifications.js'; import os from 'node:os'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; import volumes from './volumes.js'; diff --git a/src/tasks.js b/src/tasks.js index b518ab429..319438094 100644 --- a/src/tasks.js +++ b/src/tasks.js @@ -6,7 +6,7 @@ import logs from './logs.js'; import mysql from 'mysql2'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from './shell.js'; import _ from './underscore.js'; diff --git a/src/taskworker.js b/src/taskworker.js index b8942b4af..d7709354c 100755 --- a/src/taskworker.js +++ b/src/taskworker.js @@ -15,7 +15,7 @@ import locks from './locks.js'; import mailServer from './mailserver.js'; import net from 'node:net'; import reverseProxy from './reverseproxy.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from './tasks.js'; import timers from 'timers/promises'; import updater from './updater.js'; diff --git a/src/test/applinks-test.js b/src/test/applinks-test.js index c882f4e32..a37cf33cd 100644 --- a/src/test/applinks-test.js +++ b/src/test/applinks-test.js @@ -3,7 +3,7 @@ import applinks from '../applinks.js'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Applinks', function () { diff --git a/src/test/apppasswords-test.js b/src/test/apppasswords-test.js index 9bfa5411a..7c27aef7a 100644 --- a/src/test/apppasswords-test.js +++ b/src/test/apppasswords-test.js @@ -3,7 +3,7 @@ import appPasswords from '../apppasswords.js'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from '../users.js'; diff --git a/src/test/apps-test.js b/src/test/apps-test.js index 031f88407..06e1639f6 100644 --- a/src/test/apps-test.js +++ b/src/test/apps-test.js @@ -5,7 +5,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import Location from '../location.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from '../users.js'; const { proxyApp } = common; diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js index 45ac9e8bb..3fbc8b4dd 100644 --- a/src/test/apptask-test.js +++ b/src/test/apptask-test.js @@ -4,7 +4,7 @@ import common from './common.js'; import assert from 'node:assert/strict'; import fs from 'node:fs'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('apptask', function () { diff --git a/src/test/archives-test.js b/src/test/archives-test.js index b12498247..0d393eeb8 100644 --- a/src/test/archives-test.js +++ b/src/test/archives-test.js @@ -4,7 +4,7 @@ import backups from '../backups.js'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Archives', function () { diff --git a/src/test/backupformat-test.js b/src/test/backupformat-test.js index 425ec735e..4aa603bf3 100644 --- a/src/test/backupformat-test.js +++ b/src/test/backupformat-test.js @@ -8,7 +8,7 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; import rsync from '../backupformat/rsync.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import stream from 'node:stream/promises'; diff --git a/src/test/backups-test.js b/src/test/backups-test.js index 2673355fe..8770684a4 100644 --- a/src/test/backups-test.js +++ b/src/test/backups-test.js @@ -3,7 +3,7 @@ import backups from '../backups.js'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('backups', function () { diff --git a/src/test/backupsites-test.js b/src/test/backupsites-test.js index c549f1fd5..3b2160363 100644 --- a/src/test/backupsites-test.js +++ b/src/test/backupsites-test.js @@ -6,7 +6,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import constants from '../constants.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('backups', function () { diff --git a/src/test/branding-test.js b/src/test/branding-test.js index a1f63e185..b7d6b2c5a 100644 --- a/src/test/branding-test.js +++ b/src/test/branding-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import branding from '../branding.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Branding', function () { diff --git a/src/test/cloudron-test.js b/src/test/cloudron-test.js index 35a326304..82d09e7f1 100644 --- a/src/test/cloudron-test.js +++ b/src/test/cloudron-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import cloudron from '../cloudron.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Cloudron', function () { diff --git a/src/test/community-test.js b/src/test/community-test.js index 6a9cb1e28..dce25fdf4 100644 --- a/src/test/community-test.js +++ b/src/test/community-test.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import community from '../community.js'; import nock from 'nock'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const validManifest = Object.assign({}, common.manifest, { minBoxVersion: '9.1.0', diff --git a/src/test/database-test.js b/src/test/database-test.js index 7d321a64c..f46f6070d 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -2,7 +2,7 @@ import { describe, it, before, after } from 'mocha'; import BoxError from '../boxerror.js'; import database from '../database.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('database', function () { describe('init', function () { diff --git a/src/test/directoryserver-test.js b/src/test/directoryserver-test.js index 662149aaf..a55262e88 100644 --- a/src/test/directoryserver-test.js +++ b/src/test/directoryserver-test.js @@ -6,7 +6,7 @@ import directoryServer from '../directoryserver.js'; import assert from 'node:assert/strict'; import groups from '../groups.js'; import ldap from 'ldapjs'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import speakeasy from 'speakeasy'; import users from '../users.js'; diff --git a/src/test/dockerregistries-test.js b/src/test/dockerregistries-test.js index 13d7b3443..6188dbfbc 100644 --- a/src/test/dockerregistries-test.js +++ b/src/test/dockerregistries-test.js @@ -3,7 +3,7 @@ import dockerRegistries from '../dockerregistries.js'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Docker Registries', function () { diff --git a/src/test/domains-test.js b/src/test/domains-test.js index b019c7497..779985067 100644 --- a/src/test/domains-test.js +++ b/src/test/domains-test.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import domains from '../domains.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Domains', function () { diff --git a/src/test/externalldap-test.js b/src/test/externalldap-test.js index 5e45fdf9c..c11c0f5c5 100644 --- a/src/test/externalldap-test.js +++ b/src/test/externalldap-test.js @@ -6,7 +6,7 @@ import assert from 'node:assert/strict'; import externalLdap from '../externalldap.js'; import groups from '../groups.js'; import ldap from 'ldapjs'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import users from '../users.js'; diff --git a/src/test/groups-test.js b/src/test/groups-test.js index ce4895089..cf039d3ae 100644 --- a/src/test/groups-test.js +++ b/src/test/groups-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import groups from '../groups.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Groups', function () { diff --git a/src/test/ldapserver-test.js b/src/test/ldapserver-test.js index 09f14e66c..8714715b9 100644 --- a/src/test/ldapserver-test.js +++ b/src/test/ldapserver-test.js @@ -8,7 +8,7 @@ import groups from '../groups.js'; import ldap from 'ldapjs'; import ldapServer from '../ldapserver.js'; import mail from '../mail.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; async function ldapBind(dn, password) { diff --git a/src/test/locks-test.js b/src/test/locks-test.js index 25c38989c..31b5ef814 100644 --- a/src/test/locks-test.js +++ b/src/test/locks-test.js @@ -2,7 +2,7 @@ import { describe, it, before, after } from 'mocha'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import locks from '../locks.js'; describe('Locks', function () { diff --git a/src/test/mail-test.js b/src/test/mail-test.js index 589f6854c..c70dd7ae2 100644 --- a/src/test/mail-test.js +++ b/src/test/mail-test.js @@ -3,7 +3,7 @@ import common from './common.js'; import BoxError from '../boxerror.js'; import assert from 'node:assert/strict'; import mail from '../mail.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Mail', function () { diff --git a/src/test/mailpasswords-test.js b/src/test/mailpasswords-test.js index b09e2d0b8..be1509b1d 100644 --- a/src/test/mailpasswords-test.js +++ b/src/test/mailpasswords-test.js @@ -4,7 +4,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import oidcClients from '../oidcclients.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Mail passwords', function () { diff --git a/src/test/network-test.js b/src/test/network-test.js index a5f8d4230..ab7e4dbbb 100644 --- a/src/test/network-test.js +++ b/src/test/network-test.js @@ -5,7 +5,7 @@ import assert from 'node:assert/strict'; import fs from 'node:fs'; import network from '../network.js'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Network', function () { diff --git a/src/test/notifications-test.js b/src/test/notifications-test.js index 986290d46..13f0fcf16 100644 --- a/src/test/notifications-test.js +++ b/src/test/notifications-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import notifications from '../notifications.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import timers from 'timers/promises'; diff --git a/src/test/oidcclients-test.js b/src/test/oidcclients-test.js index 2960bdeac..0a4a0580c 100644 --- a/src/test/oidcclients-test.js +++ b/src/test/oidcclients-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import oidcClients from '../oidcclients.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('OIDC Clients', function () { const { setup, cleanup } = common; diff --git a/src/test/openssl-test.js b/src/test/openssl-test.js index f2487c97b..ec59c2ebb 100644 --- a/src/test/openssl-test.js +++ b/src/test/openssl-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; import BoxError from '../boxerror.js'; import assert from 'node:assert/strict'; import openssl from '../openssl.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('openssl', function () { diff --git a/src/test/passkeys-test.js b/src/test/passkeys-test.js index b0e1e4d44..0ae2cee99 100644 --- a/src/test/passkeys-test.js +++ b/src/test/passkeys-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import passkeys from '../passkeys.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import speakeasy from 'speakeasy'; import users from '../users.js'; import webauthnHelper from './webauthn-helper.js'; diff --git a/src/test/provision-test.js b/src/test/provision-test.js index f339ed956..4cd2fa3f3 100644 --- a/src/test/provision-test.js +++ b/src/test/provision-test.js @@ -5,7 +5,7 @@ import common from './common.js'; import assert from 'node:assert/strict'; import nock from 'nock'; import provision from '../provision.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('Provision', function () { diff --git a/src/test/retry-test.js b/src/test/retry-test.js index 4ea548ea0..8ebe86326 100644 --- a/src/test/retry-test.js +++ b/src/test/retry-test.js @@ -1,7 +1,7 @@ import { describe, it } from 'mocha'; import assert from 'node:assert/strict'; import retry from '../retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; describe('retry', function () { diff --git a/src/test/server-test.js b/src/test/server-test.js index 0915df7a5..ccf21b307 100644 --- a/src/test/server-test.js +++ b/src/test/server-test.js @@ -1,7 +1,7 @@ import { describe, it, before, after } from 'mocha'; import constants from '../constants.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import server from '../server.js'; import superagent from '@cloudron/superagent'; diff --git a/src/test/shell-test.js b/src/test/shell-test.js index b1ae53077..9211bc2a8 100644 --- a/src/test/shell-test.js +++ b/src/test/shell-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; import BoxError from '../boxerror.js'; import assert from 'node:assert/strict'; import path from 'node:path'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import shellModule from '../shell.js'; const shell = shellModule('test'); diff --git a/src/test/storage-provider-test.js b/src/test/storage-provider-test.js index 949c73069..4a43a7c61 100644 --- a/src/test/storage-provider-test.js +++ b/src/test/storage-provider-test.js @@ -11,7 +11,7 @@ import gcs from '../storage/gcs.js'; import os from 'node:os'; import path from 'node:path'; import s3 from '../storage/s3.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import stream from 'stream/promises'; diff --git a/src/test/superagent-test.js b/src/test/superagent-test.js index 426dc802e..0fdf28812 100644 --- a/src/test/superagent-test.js +++ b/src/test/superagent-test.js @@ -1,6 +1,6 @@ import { describe, it } from 'mocha'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent'; diff --git a/src/test/syncer-test.js b/src/test/syncer-test.js index 7d98e7851..a0417e4df 100644 --- a/src/test/syncer-test.js +++ b/src/test/syncer-test.js @@ -8,7 +8,7 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import syncer from '../syncer.js'; diff --git a/src/test/syslog-test.js b/src/test/syslog-test.js index db2528c8b..f72c0ac12 100644 --- a/src/test/syslog-test.js +++ b/src/test/syslog-test.js @@ -5,7 +5,7 @@ import fs from 'node:fs'; import net from 'node:net'; import path from 'node:path'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import syslogServer from '../../syslog.js'; import timers from 'timers/promises'; diff --git a/src/test/tasks-test.js b/src/test/tasks-test.js index 648cc5552..af4705075 100644 --- a/src/test/tasks-test.js +++ b/src/test/tasks-test.js @@ -4,7 +4,7 @@ import common from './common.js'; import assert from 'node:assert/strict'; import fs from 'node:fs'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tasks from '../tasks.js'; import _ from '../underscore.js'; diff --git a/src/test/tokens-test.js b/src/test/tokens-test.js index 30fb528bd..cc4b5bf31 100644 --- a/src/test/tokens-test.js +++ b/src/test/tokens-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import oidcClients from '../oidcclients.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import tokens from '../tokens.js'; diff --git a/src/test/updater-test.js b/src/test/updater-test.js index a961e1932..26d763570 100644 --- a/src/test/updater-test.js +++ b/src/test/updater-test.js @@ -6,7 +6,7 @@ import constants from '../constants.js'; import assert from 'node:assert/strict'; import nock from 'nock'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import updater from '../updater.js'; diff --git a/src/test/users-test.js b/src/test/users-test.js index 603824dde..a707d3ec8 100644 --- a/src/test/users-test.js +++ b/src/test/users-test.js @@ -2,7 +2,7 @@ import { describe, it, before, after } from 'mocha'; import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import speakeasy from 'speakeasy'; import users from '../users.js'; import _ from '../underscore.js'; diff --git a/src/test/volumes-test.js b/src/test/volumes-test.js index 40706820e..22a9997bb 100644 --- a/src/test/volumes-test.js +++ b/src/test/volumes-test.js @@ -3,7 +3,7 @@ import BoxError from '../boxerror.js'; import common from './common.js'; import assert from 'node:assert/strict'; import paths from '../paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import volumes from '../volumes.js'; diff --git a/src/tokens.js b/src/tokens.js index eb2261e5a..bac71a3c7 100644 --- a/src/tokens.js +++ b/src/tokens.js @@ -4,7 +4,7 @@ import crypto from 'node:crypto'; import database from './database.js'; import hat from './hat.js'; import ipaddr from './ipaddr.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const SCOPES = ['*'];//, 'apps', 'domains']; diff --git a/src/translations.js b/src/translations.js index bb0d9a61e..3fb968bb5 100644 --- a/src/translations.js +++ b/src/translations.js @@ -4,7 +4,7 @@ import logger from './logger.js'; import fs from 'node:fs'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; const { log } = logger('translation'); diff --git a/src/updater.js b/src/updater.js index 55bcaa668..11c744c2d 100644 --- a/src/updater.js +++ b/src/updater.js @@ -20,7 +20,7 @@ import os from 'node:os'; import path from 'node:path'; import paths from './paths.js'; import retry from './retry.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import semver from 'semver'; import settings from './settings.js'; import shellModule from './shell.js'; diff --git a/src/users.js b/src/users.js index 3a2adb5bf..62b7fb46a 100644 --- a/src/users.js +++ b/src/users.js @@ -18,7 +18,7 @@ import notifications from './notifications.js'; import oidcClients from './oidcclients.js'; import passkeys from './passkeys.js'; import qrcode from 'qrcode'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import settings from './settings.js'; import speakeasy from 'speakeasy'; import tokens from './tokens.js'; diff --git a/src/volumes.js b/src/volumes.js index ed27af83a..def28c2d7 100644 --- a/src/volumes.js +++ b/src/volumes.js @@ -7,7 +7,7 @@ import eventlog from './eventlog.js'; import mounts from './mounts.js'; import path from 'node:path'; import paths from './paths.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import services from './services.js'; const { log } = logger('volumes'); diff --git a/src/wellknown.js b/src/wellknown.js index 706874731..3a2de139b 100644 --- a/src/wellknown.js +++ b/src/wellknown.js @@ -6,7 +6,7 @@ import ejs from 'ejs'; import fs from 'node:fs'; import mail from './mail.js'; import mailServer from './mailserver.js'; -import safe from 'safetydance'; +import safe from '@cloudron/safetydance'; import superagent from '@cloudron/superagent';