mirrors/txtdot
3
0
Fork 0
mirror of https://github.com/txtdot/txtdot synced 2024-10-18 14:40:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into error-pages

Browse Source
This commit is contained in:
DarkCat09 2023-08-23 13:58:58 +04:00
commit 2f9032ba5f
No known key found for this signature in database
GPG Key ID: 0A26CD5B3345D6E3
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.example
View File

@ -1,3 +1,4 @@
HOST=127.0.0.1 # set 0.0.0.0 if you don't use reverse proxy HOST=127.0.0.1 # 0.0.0.0 if txtdot is not behind reverse proxy
PORT=8080 PORT=8080
REVERSE_PROXY_ENABLED=true # if you use reverse proxy set x-forwarded-host
REVERSE_PROXY=true # only for reverse proxy; see docs

2
src/app.ts
View File

@ -27,7 +27,7 @@ class App {
async init() { async init() {
const fastify = Fastify({ const fastify = Fastify({
logger: true, logger: true,
trustProxy: this.config.reverse_proxy_enabled, trustProxy: this.config.reverse_proxy,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {

12
src/config/config.service.ts
View File

@ -3,18 +3,14 @@ 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; public readonly reverse_proxy: boolean;
constructor() { constructor() {
const parsed = config().parsed; config();
if (!parsed) {
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; this.reverse_proxy = Boolean(process.env.REVERSE_PROXY) || false;
} }
} }

9
src/utils/generate.ts
View File

@ -12,9 +12,12 @@ export function generateProxyUrl(
engine?: string engine?: string
): string { ): string {
const parsedHref = new URL(href); const parsedHref = new URL(href);
const hrefWithoutHash = href.replace(parsedHref.hash, "");
const urlParam = `?url=${encodeURIComponent(hrefWithoutHash)}`; const hash = parsedHref.hash; // save #hash
parsedHref.hash = ""; // remove
const urlParam = `?url=${encodeURIComponent(parsedHref.toString())}`;
const engineParam = engine ? `&engine=${engine}` : ""; const engineParam = engine ? `&engine=${engine}` : "";
return `${requestUrl.origin}/get${urlParam}${engineParam}${parsedHref.hash}`;
return `${requestUrl.origin}/get${urlParam}${engineParam}${hash}`;
} }

3
static/get.css
View File

@ -6,7 +6,8 @@
font-size: 0.9rem; font-size: 0.9rem;
} }
.title { .title {
font-weight: 500; font-weight: 600;
margin: 1rem;
} }
a { a {