inkch/txtdot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35 from TxtDot/dc09-3

Browse Source 
Small improvements (utils/generate, config, css)
This commit is contained in:
Artemy Egorov 2023-08-21 18:19:12 +03:00 committed by GitHub
commit 10a3286c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 16 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
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() {
const fastify = Fastify({
logger: true,
trustProxy: this.config.reverse_proxy_enabled,
trustProxy: this.config.reverse_proxy,
});
fastify.register(fastifyStatic, {

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

@ -3,18 +3,14 @@ import { config } from "dotenv";
export class ConfigService {
public readonly host: string;
public readonly port: number;
public readonly reverse_proxy_enabled: boolean;
public readonly reverse_proxy: boolean;
constructor() {
const parsed = config().parsed;
if (!parsed) {
throw new Error("Invalid .env file");
}
config();
this.host = process.env.HOST || "localhost";
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
): string {
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}` : "";
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;
}
.title {
font-weight: 500;
font-weight: 600;
margin: 1rem;
}
a {

2
static/index.css
View File

@ -69,6 +69,6 @@ select {
background: var(--bg);
color: var(--fg);
font-weight: 500;
font-weight: 600;
font-size: 0.9rem;
}