fix: proxy url

This commit is contained in:
Artemy 2023-08-18 11:38:05 +03:00
parent 87cba82ee6
commit 08a89190ed
7 changed files with 50 additions and 10 deletions

View File

@ -27,6 +27,7 @@ class App {
async init() { async init() {
const fastify = Fastify({ const fastify = Fastify({
logger: true, logger: true,
trustProxy: this.config.reverse_proxy_enabled,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
@ -58,9 +59,12 @@ class App {
fastify.setErrorHandler(errorHandler); fastify.setErrorHandler(errorHandler);
fastify.listen({ host: this.config.host, port: this.config.port }, (err) => { fastify.listen(
err && console.log(err); { host: this.config.host, port: this.config.port },
}); (err) => {
err && console.log(err);
}
);
} }
} }

View File

@ -3,6 +3,7 @@ import { config } from "dotenv";
export class ConfigService { export class ConfigService {
public readonly host: string; public readonly host: string;
public readonly port: number; public readonly port: number;
public readonly reverse_proxy_enabled: boolean;
constructor() { constructor() {
const parsed = config().parsed; const parsed = config().parsed;
@ -11,7 +12,9 @@ export class ConfigService {
throw new Error("Invalid .env file"); throw new Error("Invalid .env file");
} }
this.host = process.env.HOST || 'localhost'; this.host = process.env.HOST || "localhost";
this.port = Number(process.env.PORT) || 8080; this.port = Number(process.env.PORT) || 8080;
this.reverse_proxy_enabled =
Boolean(process.env.REVERSE_PROXY_ENABLED) || false;
} }
} }

View File

@ -18,6 +18,7 @@ import {
export default async function handlePage( export default async function handlePage(
url: string, // remote URL url: string, // remote URL
requestUrl: URL, // proxy URL
engine?: string engine?: string
): Promise<IHandlerOutput> { ): Promise<IHandlerOutput> {
const urlObj = new URL(url); const urlObj = new URL(url);
@ -40,7 +41,7 @@ export default async function handlePage(
const window = new JSDOM(response.data, { url }).window; const window = new JSDOM(response.data, { url }).window;
[...window.document.getElementsByTagName("a")].forEach((link) => { [...window.document.getElementsByTagName("a")].forEach((link) => {
link.href = generateProxyUrl(link.href, engine); link.href = generateProxyUrl(requestUrl, link.href, engine);
}); });
if (engine) { if (engine) {

View File

@ -2,6 +2,7 @@ import { FastifyInstance } from "fastify";
import { GetSchema, IGetSchema } from "../types/requests"; import { GetSchema, IGetSchema } from "../types/requests";
import handlePage from "../handlers/main"; import handlePage from "../handlers/main";
import { generateRequestUrl } from "../utils/generate";
export default async function getRoute(fastify: FastifyInstance) { export default async function getRoute(fastify: FastifyInstance) {
fastify.get<IGetSchema>( fastify.get<IGetSchema>(
@ -11,7 +12,15 @@ export default async function getRoute(fastify: FastifyInstance) {
const remoteUrl = request.query.url; const remoteUrl = request.query.url;
const engine = request.query.engine; const engine = request.query.engine;
const parsed = await handlePage(remoteUrl, engine); const parsed = await handlePage(
remoteUrl,
generateRequestUrl(
request.protocol,
request.hostname,
request.originalUrl
),
engine
);
if (request.query.format === "text") { if (request.query.format === "text") {
reply.type("text/plain; charset=utf-8"); reply.type("text/plain; charset=utf-8");

View File

@ -1,13 +1,22 @@
import { EngineRequest, IParseSchema, parseSchema } from "../types/requests"; import { EngineRequest, IParseSchema, parseSchema } from "../types/requests";
import { FastifyInstance } from "fastify"; import { FastifyInstance } from "fastify";
import handlePage from "../handlers/main"; import handlePage from "../handlers/main";
import { generateRequestUrl } from "../utils/generate";
export default async function parseRoute(fastify: FastifyInstance) { export default async function parseRoute(fastify: FastifyInstance) {
fastify.get<IParseSchema>( fastify.get<IParseSchema>(
"/parse", "/parse",
{ schema: parseSchema }, { schema: parseSchema },
async (request: EngineRequest) => { async (request: EngineRequest) => {
return await handlePage(request.query.url, request.query.engine); return await handlePage(
request.query.url,
generateRequestUrl(
request.protocol,
request.hostname,
request.originalUrl
),
request.query.engine
);
} }
); );
} }

View File

@ -2,13 +2,23 @@ import { FastifyInstance } from "fastify";
import { GetRequest, IParseSchema, rawHtmlSchema } from "../types/requests"; import { GetRequest, IParseSchema, rawHtmlSchema } from "../types/requests";
import handlePage from "../handlers/main"; import handlePage from "../handlers/main";
import { generateRequestUrl } from "../utils/generate";
export default async function rawHtml(fastify: FastifyInstance) { export default async function rawHtml(fastify: FastifyInstance) {
fastify.get<IParseSchema>( fastify.get<IParseSchema>(
"/raw-html", "/raw-html",
{ schema: rawHtmlSchema }, { schema: rawHtmlSchema },
async (request: GetRequest) => { async (request: GetRequest) => {
return (await handlePage(request.query.url)).content; return (
await handlePage(
request.query.url,
generateRequestUrl(
request.protocol,
request.hostname,
request.originalUrl
)
)
).content;
} }
); );
} }

View File

@ -6,8 +6,12 @@ export function generateRequestUrl(
return new URL(`${protocol}://${host}${originalUrl}`); return new URL(`${protocol}://${host}${originalUrl}`);
} }
export function generateProxyUrl(href: string, engine?: string): string { export function generateProxyUrl(
requestUrl: URL,
href: string,
engine?: string
): string {
const urlParam = `?url=${encodeURIComponent(href)}`; const urlParam = `?url=${encodeURIComponent(href)}`;
const engineParam = engine ? `&engine=${engine}` : ""; const engineParam = engine ? `&engine=${engine}` : "";
return `/get${urlParam}${engineParam}`; return `${requestUrl.origin}/get${urlParam}${engineParam}`;
} }