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