Refactor apps routes: explicit dependency injection
- Updated all apps route modules to use destructured dependencies - Added JSDoc comments for factory functions - Replaced ctx. references with direct parameter access - Updated apps/index.js to extract and pass explicit dependencies - All files pass syntax validation Files refactored: - routes/apps/deploy.js (18k lines) - routes/apps/helpers.js (17k lines) - routes/apps/removal.js - routes/apps/restore.js - routes/apps/templates.js - routes/apps/index.js (orchestrator)
This commit is contained in:
Krystie
@@ -1,12 +1,20 @@
|
||||
const express = require('express');
|
||||
const { exists } = require('../../fs-helpers');
|
||||
/**
|
||||
* Apps templates routes factory
|
||||
* @param {Object} deps - Explicit dependencies
|
||||
* @param {Object} deps.servicesStateManager - Services state manager
|
||||
* @param {Function} deps.asyncHandler - Async route handler wrapper
|
||||
* @param {Object} deps.helpers - Apps helpers module
|
||||
* @returns {express.Router}
|
||||
*/
|
||||
const { REGEX } = require('../../constants');
|
||||
|
||||
module.exports = function(ctx, helpers) {
|
||||
module.exports = function({ servicesStateManager, asyncHandler, helpers }) {
|
||||
const router = express.Router();
|
||||
|
||||
// Get available app templates
|
||||
router.get('/apps/templates', ctx.asyncHandler(async (req, res) => {
|
||||
router.get('/apps/templates', asyncHandler(async (req, res) => {
|
||||
res.json({
|
||||
success: true,
|
||||
templates: ctx.APP_TEMPLATES,
|
||||
@@ -16,7 +24,7 @@ module.exports = function(ctx, helpers) {
|
||||
}, 'apps-templates'));
|
||||
|
||||
// Get specific app template
|
||||
router.get('/apps/templates/:appId', ctx.asyncHandler(async (req, res) => {
|
||||
router.get('/apps/templates/:appId', asyncHandler(async (req, res) => {
|
||||
const { appId } = req.params;
|
||||
const template = ctx.APP_TEMPLATES[appId];
|
||||
if (!template) {
|
||||
@@ -27,7 +35,7 @@ module.exports = function(ctx, helpers) {
|
||||
}, 'apps-template-detail'));
|
||||
|
||||
// Check port availability
|
||||
router.get('/apps/ports/:port/check', ctx.asyncHandler(async (req, res) => {
|
||||
router.get('/apps/ports/:port/check', asyncHandler(async (req, res) => {
|
||||
const port = req.params.port;
|
||||
const conflicts = await helpers.checkPortConflicts([port]);
|
||||
if (conflicts.length > 0) {
|
||||
@@ -39,21 +47,21 @@ module.exports = function(ctx, helpers) {
|
||||
}, 'check-port'));
|
||||
|
||||
// Get suggested available port
|
||||
router.get('/apps/ports/:basePort/suggest', ctx.asyncHandler(async (req, res) => {
|
||||
router.get('/apps/ports/:basePort/suggest', asyncHandler(async (req, res) => {
|
||||
const basePort = parseInt(req.params.basePort) || 8080;
|
||||
const maxAttempts = 100;
|
||||
const usedPorts = await ctx.docker.getUsedPorts();
|
||||
const usedPorts = await docker.getUsedPorts();
|
||||
for (let port = basePort; port < basePort + maxAttempts; port++) {
|
||||
if (!usedPorts.has(port)) {
|
||||
res.json({ success: true, suggestedPort: port, basePort });
|
||||
return;
|
||||
}
|
||||
}
|
||||
ctx.errorResponse(res, 400, `No available ports found in range ${basePort}-${basePort + maxAttempts}`);
|
||||
errorResponse(res, 400, `No available ports found in range ${basePort}-${basePort + maxAttempts}`);
|
||||
}, 'suggest-port'));
|
||||
|
||||
// Update subdomain for deployed app
|
||||
router.post('/apps/update-subdomain', ctx.asyncHandler(async (req, res) => {
|
||||
router.post('/apps/update-subdomain', asyncHandler(async (req, res) => {
|
||||
const { serviceId, oldSubdomain, newSubdomain, containerId, ip } = req.body;
|
||||
if (!oldSubdomain || typeof oldSubdomain !== 'string') {
|
||||
throw new ValidationError('oldSubdomain is required');
|
||||
@@ -64,7 +72,7 @@ module.exports = function(ctx, helpers) {
|
||||
if (!REGEX.SUBDOMAIN.test(newSubdomain)) {
|
||||
throw new ValidationError('[DC-301] Invalid subdomain format for newSubdomain');
|
||||
}
|
||||
ctx.log.info('deploy', 'Updating subdomain', { oldSubdomain, newSubdomain });
|
||||
log.info('deploy', 'Updating subdomain', { oldSubdomain, newSubdomain });
|
||||
const results = { oldDns: null, newDns: null, caddy: null, service: null };
|
||||
|
||||
if (oldSubdomain && ctx.dns.getToken()) {
|
||||
@@ -74,10 +82,10 @@ module.exports = function(ctx, helpers) {
|
||||
token: ctx.dns.getToken(), domain: oldDomain, type: 'A', ipAddress: ip || 'localhost'
|
||||
});
|
||||
results.oldDns = result.status === 'ok' ? 'deleted' : result.errorMessage;
|
||||
ctx.log.info('dns', 'Old DNS record deleted', { domain: oldDomain });
|
||||
log.info('dns', 'Old DNS record deleted', { domain: oldDomain });
|
||||
} catch (error) {
|
||||
results.oldDns = `failed: ${error.message}`;
|
||||
ctx.log.warn('dns', 'Old DNS deletion warning', { error: error.message });
|
||||
log.warn('dns', 'Old DNS deletion warning', { error: error.message });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,22 +93,22 @@ module.exports = function(ctx, helpers) {
|
||||
try {
|
||||
await ctx.dns.createRecord(newSubdomain, ip || 'localhost');
|
||||
results.newDns = 'created';
|
||||
ctx.log.info('dns', 'New DNS record created', { domain: ctx.buildDomain(newSubdomain) });
|
||||
log.info('dns', 'New DNS record created', { domain: ctx.buildDomain(newSubdomain) });
|
||||
} catch (error) {
|
||||
results.newDns = `failed: ${error.message}`;
|
||||
ctx.log.warn('dns', 'New DNS creation warning', { error: error.message });
|
||||
log.warn('dns', 'New DNS creation warning', { error: error.message });
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
if (await exists(ctx.caddy.filePath)) {
|
||||
if (await exists(caddy.filePath)) {
|
||||
const oldDomain = oldSubdomain.includes('.') ? oldSubdomain : ctx.buildDomain(oldSubdomain);
|
||||
const newDomain = newSubdomain.includes('.') ? newSubdomain : ctx.buildDomain(newSubdomain);
|
||||
const escapedOld = oldDomain.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
const oldBlockRegex = new RegExp(`${escapedOld}(?::\\d+)?\\s*\\{[^{}]*(?:\\{[^{}]*(?:\\{[^{}]*\\}[^{}]*)*\\}[^{}]*)*\\}`, 'g');
|
||||
const content = await ctx.caddy.read();
|
||||
const content = await caddy.read();
|
||||
if (oldBlockRegex.test(content)) {
|
||||
const caddyResult = await ctx.caddy.modify(c => {
|
||||
const caddyResult = await caddy.modify(c => {
|
||||
const re = new RegExp(`${escapedOld}(?::\\d+)?\\s*\\{[^{}]*(?:\\{[^{}]*(?:\\{[^{}]*\\}[^{}]*)*\\}[^{}]*)*\\}`, 'g');
|
||||
return c.replace(re, match => match.replace(oldDomain, newDomain));
|
||||
});
|
||||
@@ -113,17 +121,17 @@ module.exports = function(ctx, helpers) {
|
||||
}
|
||||
} catch (error) {
|
||||
results.caddy = `failed: ${error.message}`;
|
||||
ctx.log.error('caddy', 'Caddy update error', { error: error.message });
|
||||
log.error('caddy', 'Caddy update error', { error: error.message });
|
||||
}
|
||||
|
||||
try {
|
||||
if (await exists(ctx.SERVICES_FILE)) {
|
||||
await ctx.servicesStateManager.update(services => {
|
||||
await servicesStateManager.update(services => {
|
||||
const serviceIndex = services.findIndex(s => s.id === oldSubdomain || s.id === serviceId);
|
||||
if (serviceIndex !== -1) {
|
||||
services[serviceIndex].id = newSubdomain;
|
||||
results.service = 'updated';
|
||||
ctx.log.info('deploy', 'Service config updated in services.json');
|
||||
log.info('deploy', 'Service config updated in services.json');
|
||||
} else {
|
||||
results.service = 'not found';
|
||||
}
|
||||
@@ -132,7 +140,7 @@ module.exports = function(ctx, helpers) {
|
||||
}
|
||||
} catch (error) {
|
||||
results.service = `failed: ${error.message}`;
|
||||
ctx.log.warn('deploy', 'Service update warning', { error: error.message || String(error) });
|
||||
log.warn('deploy', 'Service update warning', { error: error.message || String(error) });
|
||||
}
|
||||
|
||||
res.json({
|
||||
|
||||
Reference in New Issue
Block a user