sami7777/dashcaddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

DC-005: Fix all 138 broken test paths after src/ refactor

Browse Source 
After the DC-005 module reorganization (41 files moved into src/ subdirs),
138 test suites failed because the refactor script's path-rewrite logic
missed three categories:

1. Files inside src/ doing 'require("./src/...")' — should be 'require("../...")'
2. Files in src/X/Y/ doing 'require("../../../src/...")' — should be 'require("../../...")'
3. Test files in __tests__/ with leftover 'require("../../../src/...")' paths

Root cause: the original refactor script ran before all files were moved,
so it computed relative paths against stale filesystem state.

Result:
- 30/30 test suites pass
- 879/879 tests pass (was: 18/30 suites, 614/687 tests)

Also fixed:
- routes/apps/restore.js: wrong responses import path
- routes/*/*.js: '../../src/utilities/X' → '../src/utilities/X' (depth 2 routes)
This commit is contained in:
Hermes
2026-06-13 12:16:56 -07:00
parent 9468dfc0eb
commit 7bc2a207f3
129 changed files with 591 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashcaddy-api/__tests__/app-templates.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../app-templates');
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../src/docker/app-templates');
describe('App Templates', () => {
const templates = Object.values(APP_TEMPLATES);
dashcaddy-api/__tests__/auth-manager.test.js
+4 -4
View File
@@ -1,11 +1,11 @@
// Must mock crypto-utils BEFORE auth-manager is required,
// because auth-manager.js line 13: const JWT_SECRET = cryptoUtils.loadOrCreateKey()
const mockFixedKey = Buffer.alloc(32, 'jwt-test-key-pad');
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
loadOrCreateKey: jest.fn(() => mockFixedKey),
}));
jest.mock('../credential-manager', () => ({
jest.mock('../src/managers/credential-manager', () => ({
store: jest.fn().mockResolvedValue(true),
retrieve: jest.fn().mockResolvedValue(null),
delete: jest.fn().mockResolvedValue(true),
@@ -13,8 +13,8 @@ jest.mock('../credential-manager', () => ({
}));
const crypto = require('crypto');
const authManager = require('../auth-manager');
const credentialManager = require('../credential-manager');
const authManager = require('../src/managers/auth-manager');
const credentialManager = require('../src/managers/credential-manager');
describe('AuthManager', () => {
beforeEach(() => {
dashcaddy-api/__tests__/auto-restart-manager.test.js
+3 -3
View File
@@ -9,14 +9,14 @@
*/
const EventEmitter = require('events');
const { AutoRestartManager, DEFAULT_POLICY } = require('../auto-restart-manager');
const { AutoRestartManager, DEFAULT_POLICY } = require('../src/managers/auto-restart-manager');
jest.mock('../fs-helpers', () => ({
jest.mock('../src/utilities/fs-helpers', () => ({
readJsonFile: jest.fn().mockResolvedValue({}),
writeJsonFile: jest.fn().mockResolvedValue(undefined),
}));
const fsHelpers = require('../fs-helpers');
const fsHelpers = require('../src/utilities/fs-helpers');
function makeManager(overrides = {}) {
const servicesStateManager = {
dashcaddy-api/__tests__/backup-manager.test.js
+5 -5
View File
@@ -3,19 +3,19 @@
jest.mock('fs');
jest.mock('child_process');
jest.mock('../credential-manager', () => ({
jest.mock('../src/managers/credential-manager', () => ({
exportBackup: jest.fn().mockReturnValue({ encrypted: 'cred-data' }),
importBackup: jest.fn()
}));
jest.mock('../resource-monitor', () => ({
jest.mock('../src/managers/resource-monitor', () => ({
exportStats: jest.fn().mockReturnValue({ stats: [{ cpu: 10 }] }),
importStats: jest.fn()
}));
const fs = require('fs');
const crypto = require('crypto');
const credentialManager = require('../credential-manager');
const resourceMonitor = require('../resource-monitor');
const credentialManager = require('../src/managers/credential-manager');
const resourceMonitor = require('../src/managers/resource-monitor');
// Setup defaults BEFORE requiring singleton (constructor calls loadConfig/loadHistory)
fs.existsSync.mockReturnValue(false);
@@ -24,7 +24,7 @@ fs.writeFileSync.mockReturnValue(undefined);
fs.mkdirSync.mockReturnValue(undefined);
fs.unlinkSync.mockReturnValue(undefined);
const backupManager = require('../backup-manager');
const backupManager = require('../src/utilities/backup-manager');
beforeEach(() => {
jest.clearAllMocks();
dashcaddy-api/__tests__/config-drift-detector.test.js
+1 -1
View File
@@ -6,7 +6,7 @@
*/
const EventEmitter = require('events');
const { ConfigDriftDetector } = require('../config-drift-detector');
const { ConfigDriftDetector } = require('../src/managers/config-drift-detector');
function makeContainer(overrides = {}) {
return {
dashcaddy-api/__tests__/credential-manager.test.js
+10 -10
View File
@@ -1,12 +1,12 @@
// Mock dependencies before requiring the module
jest.mock('../keychain-manager', () => ({
jest.mock('../src/security/keychain-manager', () => ({
available: false,
store: jest.fn().mockResolvedValue(false),
retrieve: jest.fn().mockResolvedValue(null),
delete: jest.fn().mockResolvedValue(true),
}));
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
encrypt: jest.fn(data => `enc:tag:${Buffer.from(String(data)).toString('base64')}`),
decrypt: jest.fn(data => {
const parts = data.split(':');
@@ -40,8 +40,8 @@ describe('CredentialManager', () => {
// Re-get mocked modules
fs = require('fs');
lockfile = require('proper-lockfile');
keychainManager = require('../keychain-manager');
cryptoUtils = require('../crypto-utils');
keychainManager = require('../src/security/keychain-manager');
cryptoUtils = require('../src/security/crypto-utils');
// Reset mock implementations
fs.existsSync.mockReturnValue(true);
@@ -50,7 +50,7 @@ describe('CredentialManager', () => {
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager.available = false;
credentialManager = require('../credential-manager');
credentialManager = require('../src/managers/credential-manager');
credentialManager.cache.clear();
});
@@ -72,10 +72,10 @@ describe('CredentialManager', () => {
fs.writeFileSync.mockImplementation(() => {});
lockfile = require('proper-lockfile');
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager = require('../keychain-manager');
keychainManager = require('../src/security/keychain-manager');
keychainManager.available = true;
keychainManager.store.mockResolvedValue(true);
credentialManager = require('../credential-manager');
credentialManager = require('../src/managers/credential-manager');
const result = await credentialManager.store('test.key', 'value');
expect(result).toBe(true);
@@ -91,11 +91,11 @@ describe('CredentialManager', () => {
fs.writeFileSync.mockImplementation(() => {});
lockfile = require('proper-lockfile');
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager = require('../keychain-manager');
keychainManager = require('../src/security/keychain-manager');
keychainManager.available = true;
keychainManager.store.mockResolvedValue(false);
cryptoUtils = require('../crypto-utils');
credentialManager = require('../credential-manager');
cryptoUtils = require('../src/security/crypto-utils');
credentialManager = require('../src/managers/credential-manager');
const result = await credentialManager.store('test.key', 'value');
expect(result).toBe(true);
dashcaddy-api/__tests__/crypto-utils.test.js
+1 -1
View File
@@ -11,7 +11,7 @@ const TEST_KEY_HEX = TEST_KEY.toString('hex');
// Load the module once — no jest.resetModules() needed
// We control key state via clearCachedKey() + env vars
process.env.DASHCADDY_ENCRYPTION_KEY = TEST_KEY_HEX;
const cryptoUtils = require('../crypto-utils');
const cryptoUtils = require('../src/security/crypto-utils');
describe('Crypto Utils', () => {
beforeEach(() => {
dashcaddy-api/__tests__/csrf-protection.test.js
+2 -2
View File
@@ -2,7 +2,7 @@ const crypto = require('crypto');
// Mock crypto-utils to provide a predictable signing key
const mockFixedKey = Buffer.alloc(32, 'test-key-material');
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
loadOrCreateKey: jest.fn(() => mockFixedKey),
}));
@@ -16,7 +16,7 @@ const {
csrfCookieMiddleware,
csrfValidationMiddleware,
renewCSRFToken
} = require('../csrf-protection');
} = require('../src/security/csrf-protection');
const { createMockReqRes } = require('./helpers/test-utils');
describe('CSRF Protection', () => {
dashcaddy-api/__tests__/dns-propagation.test.js
+1 -1
View File
@@ -24,7 +24,7 @@ jest.mock('dns', () => {
};
});
const DNSPropagationChecker = require('../dns-propagation');
const DNSPropagationChecker = require('../src/dns/dns-propagation');
describe('DNSPropagationChecker', () => {
let checker;
dashcaddy-api/__tests__/docker-security.test.js
+4 -4
View File
@@ -27,7 +27,7 @@ describe('DockerSecurity Module', () => {
// Reset modules to get fresh instance
jest.resetModules();
dockerSecurity = require('../docker-security');
dockerSecurity = require('../src/security/docker-security');
});
afterEach(() => {
@@ -58,7 +58,7 @@ describe('DockerSecurity Module', () => {
// Force module reload
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
expect(status.trustedImagesCount).toBe(1);
@@ -77,7 +77,7 @@ describe('DockerSecurity Module', () => {
fs.writeFileSync(TEST_CONFIG_FILE, 'INVALID JSON{{{');
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
// Should fall back to default config
@@ -89,7 +89,7 @@ describe('DockerSecurity Module', () => {
process.env.DOCKER_SECURITY_CONFIG = '/nonexistent/path/config.json';
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
// Should fall back to default config
dashcaddy-api/__tests__/error-handler.test.js
+2 -2
View File
@@ -12,7 +12,7 @@ jest.mock('../src/utils/logging', () => ({
LOG_LEVELS: { debug: 0, info: 1, warn: 2, error: 3 }
}));
const { errorMiddleware, notFoundHandler } = require('../error-handler');
const { errorMiddleware, notFoundHandler } = require('../src/utilities/error-handler');
const {
AppError,
ValidationError,
@@ -20,7 +20,7 @@ const {
NotFoundError,
RateLimitError,
DockerError,
} = require('../errors');
} = require('../src/utilities/errors');
describe('Error Handler', () => {
let req, res, next;
dashcaddy-api/__tests__/errors.test.js
+1 -1
View File
@@ -10,7 +10,7 @@ const {
CaddyError,
DNSError,
ServiceUnavailableError
} = require('../errors');
} = require('../src/utilities/errors');
describe('Error Classes', () => {
describe('AppError', () => {
dashcaddy-api/__tests__/health-checker.test.js
+3 -3
View File
@@ -17,7 +17,7 @@ describe('HealthChecker', () => {
fs.writeFileSync.mockImplementation(() => {});
// Fresh instance each test
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
healthChecker = new HealthChecker();
});
@@ -41,7 +41,7 @@ describe('HealthChecker', () => {
services: { svc1: { url: 'http://test.local', enabled: true } }
}));
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
const hc = new HealthChecker();
expect(hc.config.services.svc1).toBeDefined();
});
@@ -52,7 +52,7 @@ describe('HealthChecker', () => {
fs.existsSync.mockReturnValue(true);
fs.readFileSync.mockReturnValue('invalid json');
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
const hc = new HealthChecker();
expect(hc.config).toEqual({ services: {} });
});
dashcaddy-api/__tests__/helpers/test-utils.js
+1 -1
View File
@@ -90,7 +90,7 @@ function buildTestApp(routeFactory, deps, prefix = '/api') {
const router = routeFactory(deps);
app.use(prefix, router);
// Error handler
const { errorMiddleware } = require('../../error-handler');
const { errorMiddleware } = require('../../../src/utilities/error-handler');
app.use(errorMiddleware);
return app;
}
dashcaddy-api/__tests__/input-validator.test.js
+2 -2
View File
@@ -11,7 +11,7 @@ const {
isValidPort,
isPrivateIP,
validateSecurePath
} = require('../input-validator');
} = require('../src/security/input-validator');
describe('Input Validator', () => {
function fail(message) {
@@ -480,7 +480,7 @@ describe('Input Validator', () => {
// Re-require after mocking fs
function getValidateSecurePath() {
return require('../input-validator').validateSecurePath;
return require('../src/security/input-validator').validateSecurePath;
}
it('resolves valid path within allowed roots', async () => {
dashcaddy-api/__tests__/log-digest.test.js
+2 -2
View File
@@ -29,13 +29,13 @@ jest.mock('fs', () => {
};
});
jest.mock('../docker-maintenance', () => ({
jest.mock('../src/docker/docker-maintenance', () => ({
getDiskUsage: jest.fn().mockResolvedValue(null),
}));
const Docker = require('dockerode');
const fs = require('fs');
const logDigest = require('../log-digest');
const logDigest = require('../src/security/log-digest');
describe('LogDigest (singleton)', () => {
let dockerInstance;
dashcaddy-api/__tests__/metrics.test.js
+1 -1
View File
@@ -7,7 +7,7 @@
* state in beforeEach.
*/
const metrics = require('../metrics');
const metrics = require('../src/monitoring/metrics');
describe('Metrics (singleton)', () => {
beforeEach(() => {
dashcaddy-api/__tests__/notification-manager.test.js
+1 -1
View File
@@ -20,7 +20,7 @@ jest.mock('nodemailer', () => ({
const fs = require('fs');
const nodemailer = require('nodemailer');
const NotificationManager = require('../notification-manager');
const NotificationManager = require('../src/managers/notification-manager');
describe('NotificationManager', () => {
let nm;
dashcaddy-api/__tests__/pagination.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { paginate, parsePaginationParams, DEFAULT_LIMIT, MAX_LIMIT } = require('../pagination');
const { paginate, parsePaginationParams, DEFAULT_LIMIT, MAX_LIMIT } = require('../src/utilities/pagination');
describe('Pagination — DashCaddy list endpoints', () => {
dashcaddy-api/__tests__/port-lock-manager.test.js
+1 -1
View File
@@ -16,7 +16,7 @@ fs.unlinkSync.mockReturnValue(undefined);
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
lockfile.check.mockResolvedValue(false);
const portLockManager = require('../port-lock-manager');
const portLockManager = require('../src/managers/port-lock-manager');
beforeEach(() => {
jest.clearAllMocks();
dashcaddy-api/__tests__/resource-monitor.test.js
+1 -1
View File
@@ -12,7 +12,7 @@ fs.existsSync.mockReturnValue(false);
fs.readFileSync.mockReturnValue('{}');
fs.writeFileSync.mockReturnValue(undefined);
const resourceMonitor = require('../resource-monitor');
const resourceMonitor = require('../src/managers/resource-monitor');
function makeStat(overrides = {}) {
return {
dashcaddy-api/__tests__/routes/containers.routes.test.js
+1 -1
View File
@@ -9,7 +9,7 @@ function buildApp(mockDeps) {
const app = express();
app.use(express.json());
const { errorMiddleware } = require('../../error-handler');
const { errorMiddleware } = require('../../src/utilities/error-handler');
const containersRouteFactory = require('../../routes/containers');
app.use('/api/containers', containersRouteFactory(mockDeps));
app.use(errorMiddleware);
dashcaddy-api/__tests__/routes/health.routes.test.js
+5 -5
View File
@@ -52,21 +52,21 @@ jest.mock('../../platform-paths', () => ({
}));
// Mock fs-helpers.exists
jest.mock('../../fs-helpers', () => ({
jest.mock('../../src/utilities/fs-helpers', () => ({
exists: jest.fn().mockResolvedValue(true),
}));
jest.mock('../../url-resolver', () => ({
jest.mock('../../src/utilities/url-resolver', () => ({
resolveServiceUrl: jest.fn((id) => `https://${id}.test`),
}));
jest.mock('../../pagination', () => ({
jest.mock('../../src/utilities/pagination', () => ({
paginate: jest.fn((data, params) => ({ data, pagination: null })),
parsePaginationParams: jest.fn(() => null),
}));
const { exists } = require('../../fs-helpers');
const { resolveServiceUrl } = require('../../url-resolver');
const { exists } = require('../../src/utilities/fs-helpers');
const { resolveServiceUrl } = require('../../src/utilities/url-resolver');
const { execSync } = require('child_process');
describe('Health Routes', () => {
dashcaddy-api/__tests__/routes/services.routes.test.js
+8 -8
View File
@@ -9,27 +9,27 @@ function asyncHandler(fn) {
}
// Mock modules that services.js requires at top-level
jest.mock('../../constants', () => ({
jest.mock('../../src/utilities/constants', () => ({
APP: { USER_AGENTS: { PROBE: 'DashCaddy/1.0' } },
REGEX: { SUBDOMAIN: /^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$/ },
TIMEOUTS: { DEFAULT: 10000 },
HTTP_STATUS: { OK: 200, CREATED: 201, NO_CONTENT: 204, BAD_REQUEST: 400, UNAUTHORIZED: 401, FORBIDDEN: 403, NOT_FOUND: 404, CONFLICT: 409, INTERNAL_ERROR: 500 }
}));
jest.mock('../../input-validator', () => ({
jest.mock('../../src/security/input-validator', () => ({
validateServiceConfig: jest.fn(),
isValidPort: jest.fn(p => p >= 1 && p <= 65535),
}));
jest.mock('../../fs-helpers', () => ({
jest.mock('../../src/utilities/fs-helpers', () => ({
exists: jest.fn().mockResolvedValue(true),
}));
jest.mock('../../url-resolver', () => ({
jest.mock('../../src/utilities/url-resolver', () => ({
resolveServiceUrl: jest.fn((id) => `https://${id}.test`),
}));
jest.mock('../../pagination', () => ({
jest.mock('../../src/utilities/pagination', () => ({
paginate: jest.fn((data, params) => ({ data, pagination: null })),
parsePaginationParams: jest.fn(() => null),
}));
@@ -45,8 +45,8 @@ jest.mock('../../src/utils/responses', () => ({
// errors module NOT mocked — used for real ValidationError/NotFoundError/ConflictError
const { exists } = require('../../fs-helpers');
const { validateServiceConfig } = require('../../input-validator');
const { exists } = require('../../src/utilities/fs-helpers');
const { validateServiceConfig } = require('../../src/security/input-validator');
function createApp(depsOverride = {}) {
const defaultDeps = {
@@ -450,7 +450,7 @@ describe('Services Routes', () => {
});
it('rejects invalid port', async () => {
const { isValidPort } = require('../../input-validator');
const { isValidPort } = require('../../src/security/input-validator');
isValidPort.mockReturnValue(false);
const { app } = createApp();
const res = await request(app)
dashcaddy-api/__tests__/ssl-monitor.test.js
+3 -3
View File
@@ -8,14 +8,14 @@ jest.mock('tls', () => ({
connect: jest.fn(),
}));
jest.mock('../fs-helpers', () => ({
jest.mock('../src/utilities/fs-helpers', () => ({
readJsonFile: jest.fn().mockResolvedValue(null),
writeJsonFile: jest.fn().mockResolvedValue(undefined),
}));
const tls = require('tls');
const fsHelpers = require('../fs-helpers');
const SSLMonitor = require('../ssl-monitor');
const fsHelpers = require('../src/utilities/fs-helpers');
const SSLMonitor = require('../src/monitoring/ssl-monitor');
function makeSocket({ cert = null, error = null } = {}) {
const { EventEmitter } = require('events');
dashcaddy-api/__tests__/state-manager.test.js
+1 -1
View File
@@ -11,7 +11,7 @@ jest.mock('fs', () => ({
const lockfile = require('proper-lockfile');
const fs = require('fs');
const StateManager = require('../state-manager');
const StateManager = require('../src/managers/state-manager');
describe('StateManager', () => {
let sm;
dashcaddy-api/__tests__/update-manager.test.js
+1 -1
View File
@@ -22,7 +22,7 @@ fs.existsSync.mockReturnValue(false);
fs.readFileSync.mockReturnValue('{}');
fs.writeFileSync.mockReturnValue(undefined);
const updateManager = require('../update-manager');
const updateManager = require('../src/managers/update-manager');
// Helper to create a fake https request that responds with a given statusCode/headers/body
function mockHttpsResponse({ statusCode = 200, headers = {}, body = '' } = {}) {
dashcaddy-api/__tests__/url-resolver.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { resolveServiceUrl } = require('../url-resolver');
const { resolveServiceUrl } = require('../src/utilities/url-resolver');
describe('URL Resolver — DashCaddy service URL resolution', () => {
const buildServiceUrl = jest.fn(id => `https://${id}.sami`);
dashcaddy-api/routes/apps/compose.js
+3 -3
View File
@@ -1,9 +1,9 @@
const express = require('express');
const yaml = require('js-yaml');
const { DOCKER, REGEX } = require('../../constants');
const { ValidationError } = require('../../errors');
const { DOCKER, REGEX } = require('../../../src/utilities/constants');
const { ValidationError } = require('../../../src/utilities/errors');
const platformPaths = require('../../platform-paths');
const { ok } = require('../../src/utils/responses');
const { ok } = require('../src/utils/responses');
/**
* Docker Compose import routes
dashcaddy-api/routes/apps/deploy.js
+6 -6
View File
@@ -2,13 +2,13 @@ const express = require('express');
const fsp = require('fs').promises;
const path = require('path');
const validatorLib = require('validator');
const { REGEX, DOCKER } = require('../../constants');
const { isValidPort } = require('../../input-validator');
const { exists } = require('../../fs-helpers');
const { REGEX, DOCKER } = require('../../../src/utilities/constants');
const { isValidPort } = require('../../../src/security/input-validator');
const { exists } = require('../../../src/utilities/fs-helpers');
const platformPaths = require('../../platform-paths');
const { ValidationError } = require('../../errors');
const { logError } = require('../../src/utils/logging');
const { ok } = require('../../src/utils/responses');
const { ValidationError } = require('../../../src/utilities/errors');
const { logError } = require('../src/utils/logging');
const { ok } = require('../src/utils/responses');
/**
* Apps deployment routes factory
* @param {Object} deps - Explicit dependencies
dashcaddy-api/routes/apps/helpers.js
+2 -2
View File
@@ -2,8 +2,8 @@ const fs = require('fs');
const fsp = require('fs').promises;
const path = require('path');
const crypto = require('crypto');
const { REGEX, DOCKER } = require('../../constants');
const { exists } = require('../../fs-helpers');
const { REGEX, DOCKER } = require('../../../src/utilities/constants');
const { exists } = require('../../../src/utilities/fs-helpers');
const platformPaths = require('../../platform-paths');
/**
dashcaddy-api/routes/apps/removal.js
+3 -3
View File
@@ -1,7 +1,7 @@
const express = require('express');
const { exists } = require('../../fs-helpers');
const { logError } = require('../../src/utils/logging');
const { ok } = require('../../src/utils/responses');
const { exists } = require('../../../src/utilities/fs-helpers');
const { logError } = require('../src/utils/logging');
const { ok } = require('../src/utils/responses');
module.exports = function({
docker, caddy, servicesStateManager, asyncHandler, log, helpers,
dashcaddy-api/routes/apps/restore.js
+2 -2
View File
@@ -1,8 +1,8 @@
const express = require('express');
const path = require('path');
const fs = require('fs');
const { DOCKER } = require('../../constants');
const { ok, validationError, notFound, errorResponse } = require('../../src/utils/responses');
const { DOCKER } = require('../../../src/utilities/constants');
const { ok, validationError, notFound, errorResponse } = require('../../../src/utilities/responses');
const DEFAULT_BACKUP_DIR = process.env.BACKUP_DIR || path.join(__dirname, '..', 'backups');
dashcaddy-api/routes/apps/templates.js
+5 -5
View File
@@ -1,5 +1,5 @@
const express = require('express');
const { exists } = require('../../fs-helpers');
const { exists } = require('../../../src/utilities/fs-helpers');
/**
* Apps templates routes factory
* @param {Object} deps - Explicit dependencies
@@ -19,8 +19,8 @@ const { exists } = require('../../fs-helpers');
* @param {string} deps.SERVICES_FILE - Services file path
* @returns {express.Router}
*/
const { REGEX } = require('../../constants');
const { ok } = require('../../src/utils/responses');
const { REGEX } = require('../../../src/utilities/constants');
const { ok } = require('../src/utils/responses');
module.exports = function({
servicesStateManager, asyncHandler, helpers,
@@ -55,7 +55,7 @@ module.exports = function({
const { appId } = req.params;
const template = ctx.APP_TEMPLATES[appId];
if (!template) {
const { NotFoundError } = require('../../errors');
const { NotFoundError } = require('../../../src/utilities/errors');
throw new NotFoundError('App template');
}
ok(res, { template });
@@ -90,7 +90,7 @@ module.exports = function({
// Update subdomain for deployed app
router.post('/update-subdomain', asyncHandler(async (req, res) => {
const { serviceId, oldSubdomain, newSubdomain, containerId, ip } = req.body;
const { ValidationError } = require('../../errors');
const { ValidationError } = require('../../../src/utilities/errors');
if (!oldSubdomain || typeof oldSubdomain !== 'string') {
throw new ValidationError('oldSubdomain is required');
dashcaddy-api/routes/arr/config.js
+5 -5
View File
@@ -1,9 +1,9 @@
const express = require('express');
const { APP_PORTS, ARR_SERVICES } = require('../../constants');
const { validateURL, validateToken } = require('../../input-validator');
const { ValidationError, AuthenticationError, NotFoundError } = require('../../errors');
const { logError } = require('../../src/utils/logging');
const { ok, successMessage } = require('../../src/utils/responses');
const { APP_PORTS, ARR_SERVICES } = require('../../../src/utilities/constants');
const { validateURL, validateToken } = require('../../../src/security/input-validator');
const { ValidationError, AuthenticationError, NotFoundError } = require('../../../src/utilities/errors');
const { logError } = require('../src/utils/logging');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Arr configuration routes factory
dashcaddy-api/routes/arr/credentials.js
+3 -3
View File
@@ -1,7 +1,7 @@
const express = require('express');
const { validateURL, validateToken } = require('../../input-validator');
const { ValidationError } = require('../../errors');
const { ok, successMessage } = require('../../src/utils/responses');
const { validateURL, validateToken } = require('../../../src/security/input-validator');
const { ValidationError } = require('../../../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Arr credentials routes factory
dashcaddy-api/routes/arr/detect.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { APP_PORTS, ARR_SERVICES } = require('../../constants');
const { ok } = require('../../src/utils/responses');
const { APP_PORTS, ARR_SERVICES } = require('../../../src/utilities/constants');
const { ok } = require('../src/utils/responses');
/**
* Arr service detection routes factory
dashcaddy-api/routes/arr/helpers.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { APP_PORTS } = require('../../constants');
const { APP_PORTS } = require('../../../src/utilities/constants');
/**
* Arr helpers factory
dashcaddy-api/routes/arr/plex.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { APP_PORTS } = require('../../constants');
const { ok } = require('../../src/utils/responses');
const { APP_PORTS } = require('../../../src/utilities/constants');
const { ok } = require('../src/utils/responses');
/**
* Plex routes factory
dashcaddy-api/routes/arr/smart-connect.js
+1 -1
View File
@@ -1,5 +1,5 @@
const express = require('express');
const { APP_PORTS } = require('../../constants');
const { APP_PORTS } = require('../../../src/utilities/constants');
/**
* Arr smart-connect routes factory
dashcaddy-api/routes/auth/keys.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { ValidationError, ForbiddenError, NotFoundError } = require('../../errors');
const { ok, successMessage } = require('../../src/utils/responses');
const { ValidationError, ForbiddenError, NotFoundError } = require('../../../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Auth API keys routes factory
* @param {Object} deps - Explicit dependencies
dashcaddy-api/routes/auth/session-handlers.js
+2 -2
View File
@@ -1,5 +1,5 @@
const { SESSION_TTL, APP, PLEX, TIMEOUTS, buildMediaAuth } = require('../../constants');
const { createCache, CACHE_CONFIGS } = require('../../cache-config');
const { SESSION_TTL, APP, PLEX, TIMEOUTS, buildMediaAuth } = require('../../../src/utilities/constants');
const { createCache, CACHE_CONFIGS } = require('../../../src/utilities/cache-config');
/**
* Auth session handlers routes factory
dashcaddy-api/routes/auth/sso-gate.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { SESSION_TTL, APP, PLEX, TIMEOUTS, buildMediaAuth } = require('../../constants');
const { AuthenticationError, NotFoundError } = require('../../errors');
const { SESSION_TTL, APP, PLEX, TIMEOUTS, buildMediaAuth } = require('../../../src/utilities/constants');
const { AuthenticationError, NotFoundError } = require('../../../src/utilities/errors');
/**
* Auth SSO gate routes factory
dashcaddy-api/routes/auth/totp.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { ValidationError, AuthenticationError } = require('../../errors');
const { ok, successMessage } = require('../../src/utils/responses');
const { ValidationError, AuthenticationError } = require('../../../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Auth TOTP routes factory
dashcaddy-api/routes/auto-restart.js
+1 -1
View File
@@ -9,7 +9,7 @@
const express = require('express');
const { success } = require('../src/utils/responses');
const { ValidationError, NotFoundError } = require('../errors');
const { ValidationError, NotFoundError } = require('../src/utilities/errors');
/**
* Auto-restart route factory
dashcaddy-api/routes/backups.js
+14 -14
View File
@@ -55,7 +55,7 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
const { appId, enabled, schedule, retention, runImmediately, destination, destinationPath } = req.body;
if (!appId) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('appId is required');
}
@@ -93,7 +93,7 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
const config = backupManager.getConfig();
if (!config.backups || !config.backups[appId]) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`No backup schedule found for app: ${appId}`, 'DC-404');
}
@@ -153,7 +153,7 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
const backupConfig = config.backups && config.backups[appId];
if (!backupConfig) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`No backup schedule found for app: ${appId}`, 'DC-404');
}
@@ -229,13 +229,13 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
// Security: prevent path traversal
if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('Invalid filename');
}
const filepath = path.join(DEFAULT_BACKUP_DIR, filename);
if (!fs.existsSync(filepath)) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Backup file not found: ${filename}`, 'DC-404');
}
@@ -365,13 +365,13 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
// Security: prevent path traversal
if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('Invalid filename');
}
const filepath = path.join(DEFAULT_BACKUP_DIR, filename);
if (!fs.existsSync(filepath)) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Backup file not found: ${filename}`, 'DC-404');
}
@@ -502,7 +502,7 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
router.post('/backups/test-destination', asyncHandler(async (req, res) => {
const destination = req.body;
if (!destination || !destination.type) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('destination.type is required');
}
const result = await backupManager.testDestination(destination);
@@ -512,10 +512,10 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
// Get cloud credentials (masked) for a provider
// Provider: dropbox | webdav | sftp
router.get('/backups/credentials/:provider', asyncHandler(async (req, res) => {
const credentialManager = require('../credential-manager');
const credentialManager = require('../src/managers/credential-manager');
const provider = req.params.provider;
if (!['dropbox', 'webdav', 'sftp'].includes(provider)) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('Invalid provider');
}
@@ -544,8 +544,8 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
// Save cloud credentials for a provider
router.post('/backups/credentials/:provider', asyncHandler(async (req, res) => {
const credentialManager = require('../credential-manager');
const { ValidationError } = require('../errors');
const credentialManager = require('../src/managers/credential-manager');
const { ValidationError } = require('../src/utilities/errors');
const provider = req.params.provider;
if (!['dropbox', 'webdav', 'sftp'].includes(provider)) {
@@ -585,8 +585,8 @@ module.exports = function({ backupManager, licenseManager, asyncHandler }) {
// Delete cloud credentials for a provider
router.delete('/backups/credentials/:provider', asyncHandler(async (req, res) => {
const credentialManager = require('../credential-manager');
const { ValidationError } = require('../errors');
const credentialManager = require('../src/managers/credential-manager');
const { ValidationError } = require('../src/utilities/errors');
const provider = req.params.provider;
if (!['dropbox', 'webdav', 'sftp'].includes(provider)) {
dashcaddy-api/routes/browse.js
+4 -4
View File
@@ -2,9 +2,9 @@ const express = require('express');
const fs = require('fs');
const fsp = require('fs').promises;
const path = require('path');
const { exists, isAccessible } = require('../fs-helpers');
const { paginate, parsePaginationParams } = require('../pagination');
const { ValidationError, ForbiddenError } = require('../errors');
const { exists, isAccessible } = require('../src/utilities/fs-helpers');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { ValidationError, ForbiddenError } = require('../src/utilities/errors');
const { ok } = require('../src/utils/responses');
/**
@@ -99,7 +99,7 @@ module.exports = function({ asyncHandler, validateSecurePath, auditLogger, docke
}
if (!await exists(resolvedPath)) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Path');
}
dashcaddy-api/routes/ca.js
+6 -6
View File
@@ -3,8 +3,8 @@ const fs = require('fs');
const fsp = require('fs').promises;
const path = require('path');
const { execSync } = require('child_process');
const { exists } = require('../fs-helpers');
const { ValidationError } = require('../errors');
const { exists } = require('../src/utilities/fs-helpers');
const { ValidationError } = require('../src/utilities/errors');
const { ok } = require('../src/utils/responses');
const platformPaths = require('../platform-paths');
@@ -19,7 +19,7 @@ module.exports = function(ctx) {
if (await exists(certInfoPath)) {
certInfoFile = certInfoPath;
} else {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('CA certificate information');
}
@@ -50,7 +50,7 @@ module.exports = function(ctx) {
if (await exists(dashcaCertPath)) certPath = dashcaCertPath;
else if (await exists(hostCertPath)) certPath = hostCertPath;
else {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Root CA certificate');
}
@@ -73,7 +73,7 @@ module.exports = function(ctx) {
if (await exists(certInfoPath)) {
certInfoFile = certInfoPath;
} else {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('CA certificate information. Deploy DashCA first or ensure cert-info.json exists.');
}
@@ -106,7 +106,7 @@ module.exports = function(ctx) {
}
if (!templateContent) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Install script template (${templateName})`);
}
dashcaddy-api/routes/config-drift.js
+1 -1
View File
@@ -9,7 +9,7 @@
const express = require('express');
const { success } = require('../src/utils/responses');
const { ValidationError, NotFoundError } = require('../errors');
const { ValidationError, NotFoundError } = require('../src/utilities/errors');
/**
* Config-drift route factory
dashcaddy-api/routes/config/assets.js
+4 -4
View File
@@ -1,11 +1,11 @@
const express = require('express');
const fsp = require('fs').promises;
const path = require('path');
const { LIMITS } = require('../../constants');
const { exists } = require('../../fs-helpers');
const { ValidationError } = require('../../errors');
const { LIMITS } = require('../../../src/utilities/constants');
const { exists } = require('../../../src/utilities/fs-helpers');
const { ValidationError } = require('../../../src/utilities/errors');
const platformPaths = require('../../platform-paths');
const { ok, successMessage } = require('../../src/utils/responses');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Config assets routes factory
* @param {Object} deps - Explicit dependencies
dashcaddy-api/routes/config/backup.js
+5 -5
View File
@@ -1,11 +1,11 @@
const fsp = require('fs').promises;
const fs = require('fs');
const path = require('path');
const { CADDY } = require('../../constants');
const { exists } = require('../../fs-helpers');
const { ValidationError, AuthenticationError } = require('../../errors');
const { CADDY } = require('../../../src/utilities/constants');
const { exists } = require('../../../src/utilities/fs-helpers');
const { ValidationError, AuthenticationError } = require('../../../src/utilities/errors');
const platformPaths = require('../../platform-paths');
const { ok } = require('../../src/utils/responses');
const { ok } = require('../src/utils/responses');
/**
* Config backup routes factory
@@ -380,7 +380,7 @@ module.exports = function(deps) {
if (results.restored.includes('encryptionKey')) {
try {
// Clear the cached key so crypto-utils reloads from the new file on next use
const cryptoUtils = require('../../crypto-utils');
const cryptoUtils = require('../../../src/security/crypto-utils');
if (typeof cryptoUtils.clearCachedKey === 'function') {
cryptoUtils.clearCachedKey();
}
dashcaddy-api/routes/config/settings.js
+4 -4
View File
@@ -1,8 +1,8 @@
const fsp = require('fs').promises;
const { validateConfig } = require('../../config-schema');
const { exists } = require('../../fs-helpers');
const { ValidationError } = require('../../errors');
const { ok, successMessage } = require('../../src/utils/responses');
const { validateConfig } = require('../../../src/utilities/config-schema');
const { exists } = require('../../../src/utilities/fs-helpers');
const { ValidationError } = require('../../../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
* Config settings routes factory
dashcaddy-api/routes/containers.js
+3 -3
View File
@@ -1,7 +1,7 @@
const express = require('express');
const { DOCKER } = require('../constants');
const { paginate, parsePaginationParams } = require('../pagination');
const { NotFoundError } = require('../errors');
const { DOCKER } = require('../src/utilities/constants');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { NotFoundError } = require('../src/utilities/errors');
const { success } = require('../src/utils/responses');
/**
dashcaddy-api/routes/dependencies.js
+1 -1
View File
@@ -16,7 +16,7 @@
const express = require('express');
const { success, error: errorResponse } = require('../src/utils/responses');
const { NotFoundError, ValidationError } = require('../errors');
const { NotFoundError, ValidationError } = require('../src/utilities/errors');
/**
* Dependencies route factory
dashcaddy-api/routes/dns.js
+3 -3
View File
@@ -2,10 +2,10 @@ const express = require('express');
const fs = require('fs');
const fsp = require('fs').promises;
const validatorLib = require('validator');
const { APP, TIMEOUTS, CADDY, DNS_RECORD_TYPES, REGEX, SESSION_TTL } = require('../constants');
const { exists } = require('../fs-helpers');
const { APP, TIMEOUTS, CADDY, DNS_RECORD_TYPES, REGEX, SESSION_TTL } = require('../src/utilities/constants');
const { exists } = require('../src/utilities/fs-helpers');
const { success, error: errorResponse } = require('../src/utils/responses');
const { ValidationError, AuthenticationError, NotFoundError } = require('../errors');
const { ValidationError, AuthenticationError, NotFoundError } = require('../src/utilities/errors');
/**
* DNS routes factory
dashcaddy-api/routes/docker-resources.js
+1 -1
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { success } = require('../src/utils/responses');
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
/**
* Docker resources route factory (volumes, networks, disk usage)
dashcaddy-api/routes/errorlogs.js
+2 -2
View File
@@ -1,8 +1,8 @@
const express = require('express');
const fs = require('fs');
const fsp = require('fs').promises;
const { exists } = require('../fs-helpers');
const { paginate, parsePaginationParams } = require('../pagination');
const { exists } = require('../src/utilities/fs-helpers');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { success } = require('../src/utils/responses');
/**
dashcaddy-api/routes/health.js
+8 -8
View File
@@ -2,13 +2,13 @@ const express = require('express');
const fs = require('fs');
const path = require('path');
const { execSync } = require('child_process');
const { TIMEOUTS } = require('../constants');
const { exists } = require('../fs-helpers');
const { paginate, parsePaginationParams } = require('../pagination');
const { TIMEOUTS } = require('../src/utilities/constants');
const { exists } = require('../src/utilities/fs-helpers');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const platformPaths = require('../platform-paths');
const { resolveServiceUrl } = require('../url-resolver');
const { resolveServiceUrl } = require('../src/utilities/url-resolver');
const { success, error: errorResponse, errorResponse: sendError, ok, notFound } = require('../src/utils/responses');
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
/**
* Health routes factory
@@ -190,7 +190,7 @@ module.exports = function({
// Load service config
if (!await exists(SERVICES_FILE)) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Services file');
}
@@ -199,7 +199,7 @@ module.exports = function({
const service = services.find(s => (s.id || s.name?.toLowerCase()) === serviceId);
if (!service) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Service');
}
@@ -331,7 +331,7 @@ module.exports = function({
const hours = parseInt(req.query.hours) || 24;
const stats = healthChecker.getServiceStats(req.params.serviceId, hours);
if (!stats) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Service');
}
success(res, { stats });
dashcaddy-api/routes/license.js
+1 -1
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { success, error: errorResponse } = require('../src/utils/responses');
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
/**
* License routes factory
dashcaddy-api/routes/logs.js
+7 -7
View File
@@ -2,9 +2,9 @@ const express = require('express');
const fs = require('fs');
const fsp = require('fs').promises;
const path = require('path');
const { exists } = require('../fs-helpers');
const { paginate, parsePaginationParams } = require('../pagination');
const { NotFoundError, ValidationError, ForbiddenError } = require('../errors');
const { exists } = require('../src/utilities/fs-helpers');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { NotFoundError, ValidationError, ForbiddenError } = require('../src/utilities/errors');
const { ok } = require('../src/utils/responses');
/**
@@ -48,7 +48,7 @@ module.exports = function({ asyncHandler, docker, logDigest, dockerMaintenance }
info = await container.inspect();
} catch (err) {
if (err.statusCode === 404 || (err.message && err.message.includes('no such container'))) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Container ${containerId}`);
}
throw err;
@@ -97,7 +97,7 @@ module.exports = function({ asyncHandler, docker, logDigest, dockerMaintenance }
await container.inspect();
} catch (err) {
if (err.statusCode === 404 || (err.message && err.message.includes('no such container'))) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Container ${containerId}`);
}
throw err;
@@ -232,7 +232,7 @@ module.exports = function({ asyncHandler, docker, logDigest, dockerMaintenance }
try {
resolvedPath = await fsp.realpath(normalizedPath);
} catch {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Log file');
}
@@ -247,7 +247,7 @@ module.exports = function({ asyncHandler, docker, logDigest, dockerMaintenance }
}
if (!await exists(resolvedPath)) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Log file');
}
dashcaddy-api/routes/monitoring.js
+4 -4
View File
@@ -39,7 +39,7 @@ module.exports = function({ resourceMonitor, docker, asyncHandler, log, notifica
router.get('/monitoring/stats/:containerId', asyncHandler(async (req, res) => {
const stats = resourceMonitor.getCurrentStats(req.params.containerId);
if (!stats) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Container');
}
success(res, { stats });
@@ -55,7 +55,7 @@ module.exports = function({ resourceMonitor, docker, asyncHandler, log, notifica
const startTime = parseInt(req.query.startTime, 10);
const endTime = parseInt(req.query.endTime, 10);
if (Number.isNaN(startTime) || Number.isNaN(endTime) || startTime >= endTime) {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('Invalid startTime/endTime');
}
const result = resourceMonitor.getHistoryByRange(containerId, startTime, endTime);
@@ -74,7 +74,7 @@ module.exports = function({ resourceMonitor, docker, asyncHandler, log, notifica
const hours = parseInt(req.query.hours) || 24;
const aggregated = resourceMonitor.getAggregatedStats(req.params.containerId, hours);
if (!aggregated) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError('Monitoring data');
}
success(res, { aggregated, hours });
@@ -92,7 +92,7 @@ module.exports = function({ resourceMonitor, docker, asyncHandler, log, notifica
router.post('/monitoring/alerts/config', asyncHandler(async (req, res) => {
const { configs } = req.body;
if (!configs || typeof configs !== 'object') {
const { ValidationError } = require('../errors');
const { ValidationError } = require('../src/utilities/errors');
throw new ValidationError('configs object required');
}
for (const [containerId, config] of Object.entries(configs)) {
dashcaddy-api/routes/notifications.js
+3 -3
View File
@@ -1,8 +1,8 @@
const express = require('express');
const { validateURL, validateToken } = require('../input-validator');
const { validateURL, validateToken } = require('../src/security/input-validator');
const validatorLib = require('validator');
const { paginate, parsePaginationParams } = require('../pagination');
const { ValidationError } = require('../errors');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { ValidationError } = require('../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
dashcaddy-api/routes/recipes/deploy.js
+4 -4
View File
@@ -1,8 +1,8 @@
const express = require('express');
const { ValidationError } = require('../../errors');
const { ValidationError } = require('../../../src/utilities/errors');
const crypto = require('crypto');
const { DOCKER } = require('../../constants');
const { ok } = require('../../src/utils/responses');
const { DOCKER } = require('../../../src/utilities/constants');
const { ok } = require('../src/utils/responses');
/**
* Recipes deployment routes factory
@@ -28,7 +28,7 @@ module.exports = function({ docker, credentialManager: _credentialManager, servi
// eslint-disable-next-line complexity
router.post('/deploy', asyncHandler(async (req, res) => {
const { recipeId, config } = req.body;
const { RECIPE_TEMPLATES } = require('../../recipe-templates');
const { RECIPE_TEMPLATES } = require('../../../src/recipes/recipe-templates');
const recipe = RECIPE_TEMPLATES[recipeId];
if (!recipe) throw new ValidationError('Invalid recipe template', 'recipeId');
dashcaddy-api/routes/recipes/index.js
+4 -4
View File
@@ -1,8 +1,8 @@
const express = require('express');
const deployRoutes = require('./deploy');
const manageRoutes = require('./manage');
const { NotFoundError } = require('../../errors');
const { ok } = require('../../src/utils/responses');
const { NotFoundError } = require('../../../src/utilities/errors');
const { ok } = require('../src/utils/responses');
/**
* Recipes routes aggregator
@@ -32,7 +32,7 @@ module.exports = function(ctx) {
// GET /api/recipes/templates — list all recipe templates
router.get('/templates', deps.asyncHandler(async (req, res) => {
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('../../recipe-templates');
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('../../../src/recipes/recipe-templates');
const templates = Object.entries(RECIPE_TEMPLATES).map(([id, recipe]) => ({
id,
name: recipe.name,
@@ -61,7 +61,7 @@ module.exports = function(ctx) {
// GET /api/recipes/templates/:recipeId — get single recipe template detail
router.get('/templates/:recipeId', deps.asyncHandler(async (req, res) => {
const { RECIPE_TEMPLATES } = require('../../recipe-templates');
const { RECIPE_TEMPLATES } = require('../../../src/recipes/recipe-templates');
const recipe = RECIPE_TEMPLATES[req.params.recipeId];
if (!recipe) throw new NotFoundError(`Recipe template ${req.params.recipeId}`);
dashcaddy-api/routes/recipes/manage.js
+5 -5
View File
@@ -1,7 +1,7 @@
const express = require('express');
const { DOCKER } = require('../../constants');
const { NotFoundError } = require('../../errors');
const { ok } = require('../../src/utils/responses');
const { DOCKER } = require('../../../src/utilities/constants');
const { NotFoundError } = require('../../../src/utilities/errors');
const { ok } = require('../src/utils/responses');
module.exports = function({ servicesStateManager, asyncHandler, log, docker, notification, buildDomain, caddy }) {
const router = express.Router();
@@ -269,7 +269,7 @@ module.exports = function({ servicesStateManager, asyncHandler, log, docker, not
* Find all Docker containers belonging to a recipe by label
*/
async function findRecipeContainers(recipeId) {
const { RECIPE_TEMPLATES } = require('../../recipe-templates');
const { RECIPE_TEMPLATES } = require('../../../src/recipes/recipe-templates');
const recipe = RECIPE_TEMPLATES[recipeId];
const recipeLabel = recipe
? recipe.name.toLowerCase().replace(/\s+/g, '-')
@@ -293,7 +293,7 @@ module.exports = function({ servicesStateManager, asyncHandler, log, docker, not
* Find recipe ID by its label (name slug)
*/
function findRecipeIdByLabel(label) {
const { RECIPE_TEMPLATES } = require('../../recipe-templates');
const { RECIPE_TEMPLATES } = require('../../../src/recipes/recipe-templates');
for (const [id, recipe] of Object.entries(RECIPE_TEMPLATES)) {
if (recipe.name.toLowerCase().replace(/\s+/g, '-') === label) {
return id;
dashcaddy-api/routes/services.js
+6 -6
View File
@@ -4,12 +4,12 @@ const http = require('http');
const https = require('https');
const tls = require('tls');
const validatorLib = require('validator');
const { APP, REGEX, TIMEOUTS } = require('../constants');
const { validateServiceConfig, isValidPort } = require('../input-validator');
const { exists } = require('../fs-helpers');
const { paginate, parsePaginationParams } = require('../pagination');
const { ValidationError, NotFoundError, ConflictError } = require('../errors');
const { resolveServiceUrl } = require('../url-resolver');
const { APP, REGEX, TIMEOUTS } = require('../src/utilities/constants');
const { validateServiceConfig, isValidPort } = require('../src/security/input-validator');
const { exists } = require('../src/utilities/fs-helpers');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { ValidationError, NotFoundError, ConflictError } = require('../src/utilities/errors');
const { resolveServiceUrl } = require('../src/utilities/url-resolver');
const { success, error: errorResponse } = require('../src/utils/responses');
const platformPaths = require('../platform-paths');
dashcaddy-api/routes/sites.js
+3 -3
View File
@@ -1,8 +1,8 @@
const express = require('express');
const fs = require('fs');
const { CADDY, REGEX, LIMITS } = require('../constants');
const { ValidationError, ConflictError, NotFoundError } = require('../errors');
const { validateURL } = require('../input-validator');
const { CADDY, REGEX, LIMITS } = require('../src/utilities/constants');
const { ValidationError, ConflictError, NotFoundError } = require('../src/utilities/errors');
const { validateURL } = require('../src/security/input-validator');
const { ok, successMessage } = require('../src/utils/responses');
/**
dashcaddy-api/routes/tailscale.js
+4 -4
View File
@@ -1,8 +1,8 @@
const express = require('express');
const fs = require('fs');
const { TAILSCALE } = require('../constants');
const { exists } = require('../fs-helpers');
const { ValidationError, NotFoundError } = require('../errors');
const { TAILSCALE } = require('../src/utilities/constants');
const { exists } = require('../src/utilities/fs-helpers');
const { ValidationError, NotFoundError } = require('../src/utilities/errors');
const { ok, successMessage, unauthorized } = require('../src/utils/responses');
/**
@@ -156,7 +156,7 @@ module.exports = function({
const match = content.match(blockRegex);
if (!match) {
const { NotFoundError } = require('../errors');
const { NotFoundError } = require('../src/utilities/errors');
throw new NotFoundError(`Service ${domain} in Caddyfile`);
}
dashcaddy-api/routes/themes.js
+1 -1
View File
@@ -2,7 +2,7 @@ const express = require('express');
const fs = require('fs');
const path = require('path');
const { success } = require('../src/utils/responses');
const { ValidationError, NotFoundError } = require('../errors');
const { ValidationError, NotFoundError } = require('../src/utilities/errors');
const platformPaths = require('../platform-paths');
/**
dashcaddy-api/routes/updates.js
+2 -2
View File
@@ -1,6 +1,6 @@
const express = require('express');
const { paginate, parsePaginationParams } = require('../pagination');
const { ValidationError } = require('../errors');
const { paginate, parsePaginationParams } = require('../src/utilities/pagination');
const { ValidationError } = require('../src/utilities/errors');
const { ok, successMessage } = require('../src/utils/responses');
/**
dashcaddy-api/scripts/fix-remaining-paths.py
+101
View File
@@ -0,0 +1,101 @@
#!/usr/bin/env python3
"""
Fix the remaining broken require paths after DC-005 refactor.
Two patterns to fix:
1. `require('./src/...')` and `require('../../src/...')` and `require('../../../src/...')`
in files inside `src/` directories → should be `require('../...')` (relative to src/)
2. `require('../../../src/...')` in test files in `__tests__/` → should be `require('../src/...')`
"""
import os
import re
from pathlib import Path
DASHCADDY_API = Path('/root/dashcaddy-krystie/dashcaddy-api')
# Pattern to match require('../../../src/X/Y') and capture
# We need to detect the file's location and rewrite based on that
# A simple approach: find any require that contains 'src/' in the path,
# and rewrite it to be relative to the file's location.
def fix_file(filepath: Path) -> bool:
"""Returns True if file was changed."""
content = filepath.read_text()
original = content
# Find the file's directory relative to dashcaddy-api root
rel_dir = filepath.parent.relative_to(DASHCADDY_API)
depth = len(rel_dir.parts)
# If file is in src/X/Y/file.js, depth is 3 (src, X, Y)
# If file is in __tests__/file.js, depth is 1
# If file is in __tests__/routes/file.js, depth is 2
# Find all require() calls that contain 'src/'
# Pattern: require('(.....)*src/path')
def replacer(match):
quote = match.group(1) # the quote char
path = match.group(2) # the path inside quotes
# Calculate what the path SHOULD be
if 'src/' not in path:
return match.group(0)
# Extract the part after 'src/'
idx = path.find('src/')
after_src = path[idx + 4:] # everything after 'src/'
if filepath.parts[-3] == 'src':
# File is in src/X/file.js - depth 3
# Should be '../<after_src>'
new_path = '../' + after_src
elif filepath.parts[-4] == 'src':
# File is in src/X/Y/file.js - depth 4
# Should be '../../<after_src>'
new_path = '../../' + after_src
elif filepath.parts[-2] == '__tests__' or filepath.parent.name == '__tests__':
# File is in __tests__/file.js - depth 1 (relative to api root)
# Should be '../src/<after_src>'
new_path = '../src/' + after_src
elif filepath.parts[-2] == 'routes' and filepath.parts[-3] == '__tests__':
# File is in __tests__/routes/file.js - depth 2
# Should be '../../src/<after_src>'
new_path = '../../src/' + after_src
elif 'src' in rel_dir.parts:
# Other src nested location
# Count how many .. we need
src_depth = len(rel_dir.parts) - list(rel_dir.parts).index('src') - 1
new_path = '../' * src_depth + after_src
else:
# Other location, leave it
return match.group(0)
return f"require({quote}{new_path}{quote})"
new_content = re.sub(
r"require\((['\"])([^'\"]*src/[^'\"]*)\1\)",
replacer,
content
)
if new_content != original:
filepath.write_text(new_content)
return True
return False
def main():
changed = []
for js_file in DASHCADDY_API.rglob('*.js'):
# Skip node_modules
if 'node_modules' in js_file.parts:
continue
if fix_file(js_file):
changed.append(str(js_file.relative_to(DASHCADDY_API)))
print(f"Changed {len(changed)} files:")
for f in changed:
print(f" {f}")
if __name__ == '__main__':
main()
dashcaddy-api/scripts/refactor-requires.js
+180
View File
@@ -0,0 +1,180 @@
#!/usr/bin/env node
/**
* Refactor helper: rewrites require('./xxx') / require('../xxx') paths in
* dashcaddy-api to point to the new src/<subdir>/xxx.js locations.
*
* Algorithm:
* 1. For each require() call with a relative spec:
* 2. If the resolved file exists, leave it alone.
* 3. If the resolved file does NOT exist, the bare name of the spec
* (or the directory name 'dns-providers') might be one of the
* modules that was moved out of the repo root. In that case, rewrite
* the spec to the correct relative path to the new location.
* 4. Otherwise leave alone.
*/
const fs = require('fs');
const path = require('path');
const REPO = process.cwd();
// Map: bare module name (no extension) -> new repo-relative path (no extension)
const NEW_LOCATIONS = {
'auth-manager': 'src/managers/auth-manager',
'credential-manager': 'src/managers/credential-manager',
'license-manager': 'src/managers/license-manager',
'port-lock-manager': 'src/managers/port-lock-manager',
'state-manager': 'src/managers/state-manager',
'notification-manager': 'src/managers/notification-manager',
'resource-monitor': 'src/managers/resource-monitor',
'config-drift-detector': 'src/managers/config-drift-detector',
'auto-restart-manager': 'src/managers/auto-restart-manager',
'update-manager': 'src/managers/update-manager',
'dependency-manager': 'src/managers/dependency-manager',
'csrf-protection': 'src/security/csrf-protection',
'crypto-utils': 'src/security/crypto-utils',
'docker-security': 'src/security/docker-security',
'input-validator': 'src/security/input-validator',
'keychain-manager': 'src/security/keychain-manager',
'log-digest': 'src/security/log-digest',
'audit-logger': 'src/security/audit-logger',
'docker-maintenance': 'src/docker/docker-maintenance',
'app-templates': 'src/docker/app-templates',
'self-updater': 'src/docker/self-updater',
'dns-propagation': 'src/dns/dns-propagation',
'recipe-templates': 'src/recipes/recipe-templates',
'bundled-workflows': 'src/recipes/bundled-workflows',
'health-checker': 'src/monitoring/health-checker',
'metrics': 'src/monitoring/metrics',
'ssl-monitor': 'src/monitoring/ssl-monitor',
'backup-manager': 'src/utilities/backup-manager',
'error-handler': 'src/utilities/error-handler',
'errors': 'src/utilities/errors',
'fs-helpers': 'src/utilities/fs-helpers',
'pagination': 'src/utilities/pagination',
'url-resolver': 'src/utilities/url-resolver',
'config-schema': 'src/utilities/config-schema',
'constants': 'src/utilities/constants',
'middleware': 'src/utilities/middleware',
'startup-validator': 'src/utilities/startup-validator',
'cache-config': 'src/utilities/cache-config',
};
const SKIP_DIRS = new Set(['node_modules', '.git']);
const SKIP_FILE_PATTERNS = [/\/scripts\/refactor-requires\.js$/];
function* walk(dir) {
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
if (SKIP_DIRS.has(entry.name)) continue;
const full = path.join(dir, entry.name);
if (entry.isDirectory()) {
yield* walk(full);
} else if (entry.name.endsWith('.js')) {
yield full;
}
}
}
function toRelativeFromFile(filePath, targetRel) {
const fromDir = path.dirname(filePath);
const targetAbs = path.resolve(REPO, targetRel);
let rel = path.relative(fromDir, targetAbs);
if (!rel.startsWith('.')) rel = './' + rel;
return rel.split(path.sep).join('/');
}
function fileExistsWithJsOrIndex(p) {
// exists if p is a file, or p is a dir with index.js
try {
if (fs.existsSync(p) && fs.statSync(p).isFile()) return true;
} catch (_) {}
try {
if (fs.existsSync(p + '.js') && fs.statSync(p + '.js').isFile()) return true;
} catch (_) {}
try {
if (
fs.existsSync(p) &&
fs.statSync(p).isDirectory() &&
fs.existsSync(path.join(p, 'index.js'))
)
return true;
} catch (_) {}
return false;
}
function refactor(filePath) {
const relFile = path.relative(REPO, filePath);
if (SKIP_FILE_PATTERNS.some((re) => re.test(relFile))) return false;
const content = fs.readFileSync(filePath, 'utf8');
let changed = false;
const requireRe = /require\(\s*(['"])([^'"]+)\1\s*\)/g;
const newContent = content.replace(requireRe, (full, quote, spec) => {
if (!spec.startsWith('.')) return full; // package require, leave alone
const fromDir = path.dirname(filePath);
const resolvedBase = path.resolve(fromDir, spec);
// If the resolved file exists, the require is correct as-is.
if (fileExistsWithJsOrIndex(resolvedBase)) {
// But — check for the special case: require to <REPO>/dns-providers/x
// which after move becomes <REPO>/src/dns/dns-providers/x — wait,
// that doesn't exist anymore. The dir was moved.
const dnsProvidersOld = path.resolve(REPO, 'dns-providers');
if (
resolvedBase === dnsProvidersOld ||
resolvedBase.startsWith(dnsProvidersOld + path.sep)
) {
const subPath = resolvedBase === dnsProvidersOld ? '' : resolvedBase.slice(dnsProvidersOld.length + 1);
const newResolved = path.resolve(REPO, 'src/dns/dns-providers', subPath);
let rel = path.relative(fromDir, newResolved);
if (!rel.startsWith('.')) rel = './' + rel;
const newSpec = rel.split(path.sep).join('/');
changed = true;
return `require(${quote}${newSpec}${quote})`;
}
return full;
}
// The file does not exist. Check if the bare name is a moved module.
const bare = path.basename(resolvedBase);
if (bare in NEW_LOCATIONS) {
const target = NEW_LOCATIONS[bare];
const newSpec = toRelativeFromFile(filePath, target);
changed = true;
return `require(${quote}${newSpec}${quote})`;
}
// Bare not in map. Check for the special case: the spec points into
// the OLD dns-providers dir (now src/dns/dns-providers). E.g. spec
// could be '../dns-providers/registry' or './dns-providers/registry'
// from somewhere else.
if (spec.includes('dns-providers')) {
const dnsProvidersOld = path.resolve(REPO, 'dns-providers');
if (
resolvedBase === dnsProvidersOld ||
resolvedBase.startsWith(dnsProvidersOld + path.sep)
) {
const subPath =
resolvedBase === dnsProvidersOld ? '' : resolvedBase.slice(dnsProvidersOld.length + 1);
const newResolved = path.resolve(REPO, 'src/dns/dns-providers', subPath);
let rel = path.relative(fromDir, newResolved);
if (!rel.startsWith('.')) rel = './' + rel;
const newSpec = rel.split(path.sep).join('/');
changed = true;
return `require(${quote}${newSpec}${quote})`;
}
}
return full;
});
if (changed) {
fs.writeFileSync(filePath, newContent);
}
return changed;
}
let count = 0;
for (const file of walk(REPO)) {
if (refactor(file)) {
count += 1;
console.log('rewrote', path.relative(REPO, file));
}
}
console.log(`\nDone: rewrote ${count} file(s).`);
dashcaddy-api/server.js
+22 -22
View File
@@ -33,7 +33,7 @@ process.on('uncaughtException', (error) => {
const CONFIG_FILE = process.env.CONFIG_FILE || platformPaths.servicesFile.replace('services.json', 'config.json');
// Validate startup configuration
const { validateStartupConfig } = require('./startup-validator');
const { validateStartupConfig } = require('../src/utilities/startup-validator');
await validateStartupConfig({
log,
CADDYFILE_PATH,
@@ -56,23 +56,23 @@ process.on('uncaughtException', (error) => {
// Attach WebSocket exec handler (with auth)
const attachExecWS = require('./routes/exec');
const authManager = require('./auth-manager');
const authManager = require('../src/managers/auth-manager');
attachExecWS(server, log, authManager);
log.info('server', 'WebSocket exec handler attached (auth enforced)');
// Start feature modules
const resourceMonitor = require('./resource-monitor');
const backupManager = require('./backup-manager');
const healthChecker = require('./health-checker');
const updateManager = require('./update-manager');
const selfUpdater = require('./self-updater');
const portLockManager = require('./port-lock-manager');
const resourceMonitor = require('../src/managers/resource-monitor');
const backupManager = require('../src/utilities/backup-manager');
const healthChecker = require('../src/monitoring/health-checker');
const updateManager = require('../src/managers/update-manager');
const selfUpdater = require('../src/docker/self-updater');
const portLockManager = require('../src/managers/port-lock-manager');
// Optional modules
let dockerMaintenance, logDigest, bundledWorkflows;
try { dockerMaintenance = require('./docker-maintenance'); } catch { /* optional */ }
try { logDigest = require('./log-digest'); } catch { /* optional */ }
try { bundledWorkflows = require('./bundled-workflows'); } catch { /* optional */ }
try { dockerMaintenance = require('../src/docker/docker-maintenance'); } catch { /* optional */ }
try { logDigest = require('../src/security/log-digest'); } catch { /* optional */ }
try { bundledWorkflows = require('../src/recipes/bundled-workflows'); } catch { /* optional */ }
// Initialize workflow engine if bundled-workflows is available
// NOTE: createApp() already initializes the workflow engine in src/app.js
@@ -85,7 +85,7 @@ process.on('uncaughtException', (error) => {
// Create a context with needed services
const workflowCtx = {
docker: { client: require('dockerode')() },
notification: require('./notification-manager')({
notification: require('../src/managers/notification-manager')({
NOTIFICATIONS_FILE: process.env.NOTIFICATIONS_FILE || require('./platform-paths').notificationsFile,
fetchT,
log,
@@ -137,8 +137,8 @@ process.on('uncaughtException', (error) => {
// Health checker (with service sync)
(async () => {
try {
const { syncHealthCheckerServices } = require('./startup-validator');
const StateManager = require('./state-manager');
const { syncHealthCheckerServices } = require('../src/utilities/startup-validator');
const StateManager = require('../src/managers/state-manager');
const servicesStateManager = new StateManager(SERVICES_FILE);
await syncHealthCheckerServices({
@@ -150,7 +150,7 @@ process.on('uncaughtException', (error) => {
? `https://${config.domain}/${subdomain}`
: `https://${subdomain}${config.tld}`,
siteConfig: config,
APP: require('./constants').APP
APP: require('../src/utilities/constants').APP
});
healthChecker.start();
@@ -232,11 +232,11 @@ process.on('uncaughtException', (error) => {
const shutdown = (signal) => {
log.info('shutdown', `${signal} received, draining connections...`);
const resourceMonitor = require('./resource-monitor');
const backupManager = require('./backup-manager');
const healthChecker = require('./health-checker');
const updateManager = require('./update-manager');
const selfUpdater = require('./self-updater');
const resourceMonitor = require('../src/managers/resource-monitor');
const backupManager = require('../src/utilities/backup-manager');
const healthChecker = require('../src/monitoring/health-checker');
const updateManager = require('../src/managers/update-manager');
const selfUpdater = require('../src/docker/self-updater');
resourceMonitor.stop();
backupManager.stop();
@@ -245,12 +245,12 @@ process.on('uncaughtException', (error) => {
selfUpdater.stop();
try {
const dockerMaintenance = require('./docker-maintenance');
const dockerMaintenance = require('../src/docker/docker-maintenance');
dockerMaintenance.stop();
} catch { /* optional */ }
try {
const logDigest = require('./log-digest');
const logDigest = require('../src/security/log-digest');
logDigest.stop();
} catch { /* optional */ }
dashcaddy-api/src/app.js
+40 -40
View File
@@ -15,41 +15,41 @@ const { errorResponse, ok } = require('./utils/responses');
const { asyncHandler } = require('./utils/async-handler');
// Managers and utilities
const StateManager = require('../state-manager');
const StateManager = require('managers/state-manager');
const platformPaths = require('../platform-paths');
const { LicenseManager } = require('../license-manager');
const credentialManager = require('../credential-manager');
const authManager = require('../auth-manager');
const dockerSecurity = require('../docker-security');
const auditLogger = require('../audit-logger');
const portLockManager = require('../port-lock-manager');
const resourceMonitor = require('../resource-monitor');
const backupManager = require('../backup-manager');
const healthChecker = require('../health-checker');
const updateManager = require('../update-manager');
const selfUpdater = require('../self-updater');
const configureMiddleware = require('../middleware');
const { validateStartupConfig: _validateStartupConfig, syncHealthCheckerServices } = require('../startup-validator');
const { CSRF_HEADER_NAME } = require('../csrf-protection');
const { resolveServiceUrl } = require('../url-resolver');
const metrics = require('../metrics');
const { validateURL } = require('../input-validator');
const { LicenseManager } = require('managers/license-manager');
const credentialManager = require('managers/credential-manager');
const authManager = require('managers/auth-manager');
const dockerSecurity = require('security/docker-security');
const auditLogger = require('security/audit-logger');
const portLockManager = require('managers/port-lock-manager');
const resourceMonitor = require('managers/resource-monitor');
const backupManager = require('utilities/backup-manager');
const healthChecker = require('monitoring/health-checker');
const updateManager = require('managers/update-manager');
const selfUpdater = require('docker/self-updater');
const configureMiddleware = require('utilities/middleware');
const { validateStartupConfig: _validateStartupConfig, syncHealthCheckerServices } = require('utilities/startup-validator');
const { CSRF_HEADER_NAME } = require('security/csrf-protection');
const { resolveServiceUrl } = require('utilities/url-resolver');
const metrics = require('monitoring/metrics');
const { validateURL } = require('security/input-validator');
// Optional modules
let dockerMaintenance, logDigest;
try { dockerMaintenance = require('../docker-maintenance'); } catch (_) { /* optional module */ }
try { logDigest = require('../log-digest'); } catch (_) { /* optional module */ }
try { dockerMaintenance = require('docker/docker-maintenance'); } catch (_) { /* optional module */ }
try { logDigest = require('security/log-digest'); } catch (_) { /* optional module */ }
// Workflow engine (bundled workflows)
let bundledWorkflowsModule;
let workflowEngine = null;
try {
bundledWorkflowsModule = require('../bundled-workflows');
bundledWorkflowsModule = require('recipes/bundled-workflows');
} catch (_) { /* optional module */ }
// Templates
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../app-templates');
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('../recipe-templates');
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('docker/app-templates');
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('recipes/recipe-templates');
// Route modules
const healthRoutes = require('../routes/health');
@@ -79,17 +79,17 @@ const dockerResourcesRoutes = require('../routes/docker-resources');
const eventsRoutes = require('../routes/events');
const workflowsRoutes = require('../routes/workflows');
const dependenciesRoutes = require('../routes/dependencies');
const DependencyManager = require('../dependency-manager');
const DependencyManager = require('managers/dependency-manager');
const autoRestartRoutes = require('../routes/auto-restart');
const configDriftRoutes = require('../routes/config-drift');
const sslMonitorRoutes = require('../routes/ssl-monitor');
const { AutoRestartManager } = require('../auto-restart-manager');
const { ConfigDriftDetector } = require('../config-drift-detector');
const SSLMonitor = require('../ssl-monitor');
const DNSPropagationChecker = require('../dns-propagation');
const { AutoRestartManager } = require('managers/auto-restart-manager');
const { ConfigDriftDetector } = require('managers/config-drift-detector');
const SSLMonitor = require('monitoring/ssl-monitor');
const DNSPropagationChecker = require('dns/dns-propagation');
// Constants
const { APP } = require('../constants');
const { APP } = require('utilities/constants');
/**
* Create and configure the Express application
@@ -216,15 +216,15 @@ async function createApp() {
auditLogger,
authManager,
log,
cryptoUtils: require('../crypto-utils'),
cryptoUtils: require('security/crypto-utils'),
isValidContainerId,
isTailscaleIP,
getTailscaleStatus,
RATE_LIMITS: require('../constants').RATE_LIMITS,
LIMITS: require('../constants').LIMITS,
APP: require('../constants').APP,
CACHE_CONFIGS: require('../cache-config').CACHE_CONFIGS,
createCache: require('../cache-config').createCache,
RATE_LIMITS: require('utilities/constants').RATE_LIMITS,
LIMITS: require('utilities/constants').LIMITS,
APP: require('utilities/constants').APP,
CACHE_CONFIGS: require('utilities/cache-config').CACHE_CONFIGS,
createCache: require('utilities/cache-config').createCache,
});
const { strictLimiter } = middlewareResult;
@@ -237,7 +237,7 @@ async function createApp() {
// eslint-disable-next-line require-await -- may grow awaits as config loading evolves
async function readConfig() {
const { readJsonFile } = require('../fs-helpers');
const { readJsonFile } = require('utilities/fs-helpers');
return readJsonFile(config.CONFIG_FILE, {});
}
@@ -260,7 +260,7 @@ async function createApp() {
async function saveTotpConfig() {
try {
const { writeJsonFile } = require('../fs-helpers');
const { writeJsonFile } = require('utilities/fs-helpers');
await writeJsonFile(config.TOTP_CONFIG_FILE, totpConfig);
} catch (e) {
log.error('config', 'Could not save TOTP config', { error: e.message });
@@ -731,7 +731,7 @@ async function createApp() {
// Lightweight probe endpoint
app.get('/probe/:id', boundAsyncHandler(async (req, res) => {
const id = req.params.id;
const { exists } = require('../fs-helpers');
const { exists } = require('utilities/fs-helpers');
let service = null;
if (id !== 'internet' && await exists(config.SERVICES_FILE)) {
@@ -871,7 +871,7 @@ async function createApp() {
app.get('/api/v1/docs/spec', boundAsyncHandler(async (req, res) => {
const path = require('path');
const { exists } = require('../fs-helpers');
const { exists } = require('utilities/fs-helpers');
const fsp = require('fs').promises;
const specPath = path.join(__dirname, '../openapi.yaml');
@@ -884,7 +884,7 @@ async function createApp() {
}, 'api-docs-spec'));
// Error handlers (MUST be last)
const { notFoundHandler, errorMiddleware } = require('../error-handler');
const { notFoundHandler, errorMiddleware } = require('utilities/error-handler');
app.use('/api', notFoundHandler);
app.use(errorMiddleware);
dashcaddy-api/src/config/index.js
+1 -1
View File
@@ -4,7 +4,7 @@
*/
const paths = require('./paths');
const site = require('./site');
const { APP, LIMITS, TIMEOUTS, RETRIES, CADDY } = require('../../constants');
const { APP, LIMITS, TIMEOUTS, RETRIES, CADDY } = require('../utilities/constants');
// Load logging level
const LOG_LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
dashcaddy-api/src/config/site.js
+2 -2
View File
@@ -7,8 +7,8 @@
* updated config back, and the rest of the app only ever sees the current
* schema.
*/
const { validateConfig } = require('../../config-schema');
const { CADDY } = require('../../constants');
const { validateConfig } = require('../utilities/config-schema');
const { CADDY } = require('../utilities/constants');
const { loadAndMigrate, CURRENT_VERSION } = require('./migrations');
const siteConfig = {
dashcaddy-api/src/context/caddy.js
+1 -1
View File
@@ -2,7 +2,7 @@
* Caddy context - Caddyfile manipulation and reload
*/
const fsp = require('fs').promises;
const { RETRIES } = require('../../constants');
const { RETRIES } = require('../utilities/constants');
/**
* Atomically read-modify-write the Caddyfile and reload Caddy.
dashcaddy-api/src/context/dns.js
+2 -2
View File
@@ -6,8 +6,8 @@
*
* This module now delegates to the provider system internally.
*/
const { TIMEOUTS, SESSION_TTL, CADDY } = require('../../constants');
const { createCache, CACHE_CONFIGS } = require('../../cache-config');
const { TIMEOUTS, SESSION_TTL, CADDY } = require('../utilities/constants');
const { createCache, CACHE_CONFIGS } = require('../utilities/cache-config');
const { createProviderDnsContext } = require('./provider-dns');
// DNS token management
dashcaddy-api/src/context/docker.js
+1 -1
View File
@@ -2,7 +2,7 @@
* Docker context - Docker client and operations
*/
const Docker = require('dockerode');
const { DOCKER } = require('../../constants');
const { DOCKER } = require('../utilities/constants');
const docker = new Docker();
dashcaddy-api/src/context/index.js
+1 -1
View File
@@ -6,7 +6,7 @@ const { createDockerContext } = require('./docker');
const { createCaddyContext } = require('./caddy');
const { createDnsContext } = require('./dns');
const { createSessionContext } = require('./session');
const NotificationManager = require('../../notification-manager');
const NotificationManager = require('../managers/notification-manager');
/**
* Assemble the full application context
dashcaddy-api/src/context/provider-dns.js
+2 -2
View File
@@ -6,8 +6,8 @@
* Falls back to legacy Technitium context for backward compatibility
* when no provider is explicitly configured.
*/
const { createCache, CACHE_CONFIGS } = require('../../cache-config');
const { TIMEOUTS, SESSION_TTL, CADDY } = require('../../constants');
const { createCache, CACHE_CONFIGS } = require('../utilities/cache-config');
const { TIMEOUTS, SESSION_TTL, CADDY } = require('../utilities/constants');
const registry = require('../../dns-providers/registry');
// Per-server token cache (legacy Technitium)
dashcaddy-api/dns-propagation.js → dashcaddy-api/src/dns/dns-propagation.js
View File
dashcaddy-api/dns-providers/base.js → dashcaddy-api/src/dns/dns-providers/base.js
View File
dashcaddy-api/dns-providers/cloudflare.js → dashcaddy-api/src/dns/dns-providers/cloudflare.js
View File
dashcaddy-api/dns-providers/manual.js → dashcaddy-api/src/dns/dns-providers/manual.js
View File
dashcaddy-api/dns-providers/registry.js → dashcaddy-api/src/dns/dns-providers/registry.js
View File
dashcaddy-api/dns-providers/rfc2136.js → dashcaddy-api/src/dns/dns-providers/rfc2136.js
View File
dashcaddy-api/dns-providers/technitium.js → dashcaddy-api/src/dns/dns-providers/technitium.js
View File
dashcaddy-api/app-templates.js → dashcaddy-api/src/docker/app-templates.js
View File
dashcaddy-api/docker-maintenance.js → dashcaddy-api/src/docker/docker-maintenance.js
+1 -1
View File
@@ -9,7 +9,7 @@
const Docker = require('dockerode');
const EventEmitter = require('events');
const { DOCKER } = require('./constants');
const { DOCKER } = require('../utilities/constants');
const docker = new Docker();
dashcaddy-api/self-updater.js → dashcaddy-api/src/docker/self-updater.js
View File
dashcaddy-api/auth-manager.js → dashcaddy-api/src/managers/auth-manager.js
+1 -1
View File
@@ -7,7 +7,7 @@
const jwt = require('jsonwebtoken');
const crypto = require('crypto');
const credentialManager = require('./credential-manager');
const cryptoUtils = require('./crypto-utils');
const cryptoUtils = require('../security/crypto-utils');
// JWT signing secret - derived from encryption key for consistency
const JWT_SECRET = cryptoUtils.loadOrCreateKey();
dashcaddy-api/auto-restart-manager.js → dashcaddy-api/src/managers/auto-restart-manager.js
+1 -1
View File
@@ -10,7 +10,7 @@
const EventEmitter = require('events');
const path = require('path');
const { readJsonFile, writeJsonFile } = require('./fs-helpers');
const { readJsonFile, writeJsonFile } = require('../utilities/fs-helpers');
/**
* Default policy values applied when a new policy is created.
dashcaddy-api/config-drift-detector.js → dashcaddy-api/src/managers/config-drift-detector.js
View File
dashcaddy-api/credential-manager.js → dashcaddy-api/src/managers/credential-manager.js
+2 -2
View File
@@ -4,8 +4,8 @@
* Uses OS keychain when available, falls back to encrypted file storage
*/
const keychainManager = require('./keychain-manager');
const cryptoUtils = require('./crypto-utils');
const keychainManager = require('../security/keychain-manager');
const cryptoUtils = require('../security/crypto-utils');
const lockfile = require('proper-lockfile');
const fs = require('fs');
const path = require('path');
dashcaddy-api/dependency-manager.js → dashcaddy-api/src/managers/dependency-manager.js
View File
dashcaddy-api/license-manager.js → dashcaddy-api/src/managers/license-manager.js
+1 -1
View File
@@ -15,7 +15,7 @@ const os = require('os');
const fs = require('fs');
const path = require('path');
const { verifyCode, parseCode, VALID_DURATIONS } = require('./license-keygen');
const { errorResponse } = require('./src/utils/responses');
const { errorResponse } = require('../utils/responses');
const LICENSE_CRED_KEY = 'license.activation';
const LICENSE_SERVER_URL = process.env.LICENSE_SERVER_URL || null; // Set when license server exists
dashcaddy-api/notification-manager.js → dashcaddy-api/src/managers/notification-manager.js
View File
dashcaddy-api/port-lock-manager.js → dashcaddy-api/src/managers/port-lock-manager.js
View File
dashcaddy-api/resource-monitor.js → dashcaddy-api/src/managers/resource-monitor.js
View File

Some files were not shown because too many files have changed in this diff Show More