Move to @cloudron/safetydance

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';

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');

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

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) {

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) {

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) {

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';

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';

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';

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';
 

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';

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) {

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) {

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';
 

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`;

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';
 

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

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' });

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', []);

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

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"

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",

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';
 

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';

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';
 

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');

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');

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';
 
 

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';

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';

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';

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';
 

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' ];

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');
 

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');
 

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';

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';

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');
 

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');

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';

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';

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');

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');

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';

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';

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');

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');

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';

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';

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';
 

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';

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';

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';
 

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';
 

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';
 

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';
 

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';
 

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';
 

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';
 

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');

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';
 

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');

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';

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';
 

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';
 

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');

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';

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';
 

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';
 

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');

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');

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';
 

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';
 

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';
 
 

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';

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');

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');
 

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';

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) {

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(',');
 

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');

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';
 

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';

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');

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(',');
 

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';

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';

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) {

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');

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';

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');

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');
 

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');

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';

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';

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');

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,

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';

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';

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';