fix: site 404 not matched

Host matcher should contain port number, only hostname.

src/caddy/config/get-error-routes.ts

@@ -1,5 +1,5 @@
 import { Site } from '../../entities/sites/site';
-import { getSiteErrorRoutes } from './get-site-error-routes';
+import { getSiteErrorRoutes } from './sites/get-site-error-routes';
 
 export function getErrorRoutes(sites: Site[]) {
   return {

src/caddy/config/sites/generate-site-routes.ts

@@ -33,6 +33,12 @@ export function generateSiteRoutes(site: Site): any[] {
         }],
         handle: [{
           handler: 'subroute',
+          /*
+           * Per Caddy's docs (https://caddyserver.com/docs/modules/http.handlers.subroute),
+           * we could handle errors here for this site, but when I try it, it breaks
+           * password protection. I'm assuming there's a clash between 401 handling, the
+           * auth route and the error handler defined in errors.
+           */
           routes: [
             ...(!branch.password ? [] : [{
               handle: [

src/caddy/config/get-site-error-routes.ts → src/caddy/config/sites/get-site-error-routes.ts

@@ -1,18 +1,18 @@
-import { Site } from '../../entities/sites/site';
+import { Site } from '../../../entities/sites/site';
 import { URL } from 'url';
-import { env } from '../../env/env';
-import { getBranchDirInCaddy } from '../utils/get-branch-dir-in-caddy';
+import { env } from '../../../env/env';
+import { getBranchDirInCaddy } from '../../utils/get-branch-dir-in-caddy';
 
 const sitesUrl = new URL(env.MELI_SITES_URL);
 
 export function getSiteErrorRoutes(site: Site) {
   return site.branches.map(branch => {
     const hosts = [
-      `${branch.slug}.${site.name}.${sitesUrl.host}`,
+      `${branch.slug}.${site.name}.${sitesUrl.hostname}`,
       ...site.domains.map(domain => `${branch.slug}.${domain.name}`),
     ];
     if (site.mainBranch === branch._id) {
-      hosts.push(`${site.name}.${sitesUrl.host}`);
+      hosts.push(`${site.name}.${sitesUrl.hostname}`);
       hosts.push(...site.domains.map(domain => domain.name));
     }
     const branchDir = getBranchDirInCaddy(site._id, branch);