Remove subdomain filter from proxyservice

This commit is contained in:
Ben Allfree 2023-12-28 23:45:44 -08:00
parent 2b6da4ded7
commit 0d68cfa2a5
3 changed files with 3 additions and 14 deletions

View File

@ -454,7 +454,6 @@ export const instanceService = mkSingleton(
}
;(await proxyService()).use(
(subdomain) => true,
['(/*)'],
async (req, res, meta, logger) => {
const { dbg } = logger

View File

@ -6,7 +6,6 @@ import {
mkSingleton,
} from '$shared'
import { asyncExitHook } from '$util'
import { isFunction } from '@s-libs/micro-dash'
import {
IncomingMessage,
RequestListener,
@ -98,22 +97,17 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
const middleware: MiddlewareListener[] = []
const use = (
subdomainFilter: string | ((subdomain: string) => boolean),
urlFilters: string | string[],
handler: ProxyMiddleware,
handlerName: string,
) => {
const _handlerLogger = _proxyLogger.create(`${handlerName}`)
const { dbg, trace } = _handlerLogger
dbg({ subdomainFilter, urlFilters })
dbg({ urlFilters })
const _urlFilters = Array.isArray(urlFilters)
? urlFilters.map((f) => new UrlPattern(f))
: [new UrlPattern(urlFilters)]
const _subdomainFilter = isFunction(subdomainFilter)
? subdomainFilter
: (subdomain: string) =>
subdomainFilter === '*' || subdomain === subdomainFilter
middleware.push((req, res) => {
const host = req.headers.host
@ -132,11 +126,8 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
if (!url) {
throw new Error(`Expected URL here`)
}
trace({ subdomainFilter, _urlFilters, host, url })
if (!_subdomainFilter(subdomain)) {
trace(`Subdomain ${subdomain} does not match filter ${subdomainFilter}`)
return false
}
trace({ _urlFilters, host, url })
if (
!_urlFilters.find((u) => {
const isMatch = !!u.match(url)

View File

@ -22,7 +22,6 @@ export const realtimeLog = mkSingleton(async (config: RealtimeLogConfig) => {
const { dbg, error } = _realtimeLogger
;(await proxyService()).use(
'*',
'/logs',
async (req, res, meta, logger) => {
const { subdomain, host, coreInternalUrl } = meta