Mirroristas/pockethost
2
0
Fork 0
mirror of https://github.com/pockethost/pockethost.git synced 2025-05-29 18:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hoist hostname into middleware

Browse Source
This commit is contained in:
Ben Allfree 2023-12-29 00:00:32 -08:00
parent 97d5acb906
commit f626e99d32
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/ProxyService.ts
View File

@ -6,8 +6,7 @@ import {
mkSingleton, mkSingleton,
} from '$shared' } from '$shared'
import { asyncExitHook } from '$util' import { asyncExitHook } from '$util'
import express from 'express' import express, { Request, RequestHandler, Response } from 'express'
import { IncomingMessage, RequestListener, ServerResponse } from 'http'
import { default as Server, default as httpProxy } from 'http-proxy' import { default as Server, default as httpProxy } from 'http-proxy'
import { AsyncReturnType, SetReturnType } from 'type-fest' import { AsyncReturnType, SetReturnType } from 'type-fest'
import UrlPattern from 'url-pattern' import UrlPattern from 'url-pattern'
@ -15,8 +14,8 @@ import UrlPattern from 'url-pattern'
export type ProxyServiceApi = AsyncReturnType<typeof proxyService> export type ProxyServiceApi = AsyncReturnType<typeof proxyService>
export type ProxyMiddleware = ( export type ProxyMiddleware = (
req: IncomingMessage, req: Request,
res: ServerResponse<IncomingMessage>, res: Response,
meta: { meta: {
subdomain: string subdomain: string
coreInternalUrl: string coreInternalUrl: string
@ -41,7 +40,16 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
}) })
const server = express() const server = express()
server.use(async (req, res) => { server.use((req, res, next) => {
const host = req.headers.host
if (!host) {
throw new Error(`Host not found`)
}
res.locals.host = host
next()
})
server.use(async (req, res, next) => {
try { try {
const url = new URL(`http://${req.headers.host}${req.url}`) const url = new URL(`http://${req.headers.host}${req.url}`)
const country = (req.headers['cf-ipcountry'] as string) || '<ct>' const country = (req.headers['cf-ipcountry'] as string) || '<ct>'
@ -59,7 +67,7 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
const { warn } = _proxyLogger.create(sig) const { warn } = _proxyLogger.create(sig)
for (let i = 0; i < middleware.length; i++) { for (let i = 0; i < middleware.length; i++) {
const m = middleware[i]! const m = middleware[i]!
const handled = await m(req, res) const handled = await m(req, res, next)
if (handled) break if (handled) break
} }
} }
@ -83,7 +91,7 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
}) })
type MiddlewareListener = SetReturnType< type MiddlewareListener = SetReturnType<
RequestListener, RequestHandler,
boolean | Promise<boolean> boolean | Promise<boolean>
> >
const middleware: MiddlewareListener[] = [] const middleware: MiddlewareListener[] = []
@ -102,10 +110,7 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
: [new UrlPattern(urlFilters)] : [new UrlPattern(urlFilters)]
middleware.push((req, res) => { middleware.push((req, res) => {
const host = req.headers.host const { host } = res.locals
if (!host) {
throw new Error(`Host not found`)
}
const _requestLogger = _handlerLogger.create(host) const _requestLogger = _handlerLogger.create(host)
const { dbg, trace } = _requestLogger const { dbg, trace } = _requestLogger
_requestLogger.breadcrumb(req.method || 'unknown http method') _requestLogger.breadcrumb(req.method || 'unknown http method')