tgpholly/EUS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

experimental media domain + temp allow node while bun has node:http issues

Browse source
This commit is contained in:
Holly Stubbs 2025-03-27 00:02:43 +00:00
parent fb3096ed03
commit 81afe50526
Signed by: tgpholly
GPG key ID: B8583C4B7D18119E
7 changed files with 123 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bun.lockb
View file

Binary file not shown.

1
entities/Domain.ts
View file

@ -6,6 +6,7 @@ export default class Domain {
return this.HasHttps ? "Yes" : "No";
}
public Domain: string = "";
public MediaDomain: string = "";
public Active: boolean = false;
public get ActiveString() {
return this.Active ? "Yes" : "No";

108
index.ts
View file

@ -1,7 +1,10 @@
if (!process.versions.bun) {
console.log("EUS is only designed to run on Bun, sorry!");
process.exit(1);
}
// HSNOTE: It is designed to be used with bun but there is an issue with
// bun's implementation of node:http so i've temp allowed this to
// run with node again. very disapointed.
// if (!process.versions.bun) {
// console.log("EUS is only designed to run on Bun, sorry!");
// process.exit(1);
// }
import Fastify, { type FastifyReply, type FastifyRequest } from "fastify";
import FastifyFormBody from "@fastify/formbody";
@ -9,6 +12,7 @@ import FastifyMultipart from "@fastify/multipart";
import FastifyCookie from "@fastify/cookie";
import FastifyView from "@fastify/view";
import FastifyStatic from "@fastify/static";
//import FastifySend from "@fastify/send";
import Config from "./objects/Config";
import EJS from "ejs";
import { Console } from "hsconsole";
@ -27,6 +31,7 @@ import HeaderUtility from "./utilities/HeaderUtility";
import { createReadStream } from "fs";
import ApiController from "./controllers/ApiController";
import UploadController from "./controllers/UploadController";
import DomainService from "./services/DomainService";
Console.customHeader(`EUS server started at ${new Date()}`);
@ -82,32 +87,40 @@ fastify.addHook("preHandler", (req, res, done) => {
HeaderUtility.AddBakedHeaders(res);
return done();
} else {
const urlParts = req.url.split("/");
if (urlParts.length === 2 && urlParts[1].length <= 16) {
let media = hashLookupCache.get(urlParts[1]) ?? null;
if (!media) {
media = await MediaService.GetByTag(urlParts[1]);
if (media) {
hashLookupCache.set(urlParts[1], media);
const domain = await DomainService.LoadDomainByHost(req.headers.host ?? "");
if (domain) {
const urlParts = req.url.split("/");
if (urlParts.length === 2 && urlParts[1].length <= 16) {
let media = hashLookupCache.get(urlParts[1]) ?? null;
if (!media) {
media = await MediaService.GetByTag(urlParts[1]);
if (media) {
hashLookupCache.set(urlParts[1], media);
}
}
}
if (media) {
// @ts-ignore
req.logType = cyan("MEDIA");
const fileStore = HashFS.GetHashFSInstance("images");
const readStream = createReadStream(join(fileStore.path, fileStore.GetRelativePath(media.Hash)));
res.raw.writeHead(200, HeaderUtility.CombineHeaders({
"content-type": media.MediaType,
"content-length": media.FileSize,
}));
readStream.pipe(res.raw);
if (media) {
// @ts-ignore
/*req.logType = "REDIRECT_TO_MEDIA";
res.redirect(`${domain.HasHttps ? "https" : "http"}://${domain.MediaDomain}/${media.MediaTag}`);
return;*/
printReqInfo(req, res);
return;
// @ts-ignore
req.logType = cyan("MEDIA");
const fileStore = HashFS.GetHashFSInstance("images");
const readStream = createReadStream(join(fileStore.path, fileStore.GetRelativePath(media.Hash)));
res.raw.writeHead(200, HeaderUtility.CombineHeaders({
"content-type": media.MediaType,
"content-length": media.FileSize,
}));
readStream.pipe(res.raw);
printReqInfo(req, res);
return;
}
} else {
HeaderUtility.AddBakedHeaders(res);
}
} else {
HeaderUtility.AddBakedHeaders(res);
}
// @ts-ignore
@ -119,7 +132,10 @@ fastify.addHook("preHandler", (req, res, done) => {
});
fastify.addHook("onSend", (req, res, _payload, done) => {
printReqInfo(req, res);
// @ts-ignore
if (req.logType !== "REDIRECT_TO_MEDIA") {
printReqInfo(req, res);
}
done();
});
@ -158,4 +174,40 @@ fastify.listen({ port: Config.hosts.webPort, host: Config.hosts.webHost }, (err,
Console.printWarn(`[ ${green("MAIN")} ] The EUS rewrite is currently beta software, use at your own risk!`);
Console.printInfo(`[ ${green("MAIN")} ] Listening at ${address.replace("0.0.0.0", "localhost").replace("127.0.0.1", "localhost")}`);
});
});
/*const mediaServer = createServer(async (req, res) => {
const startTime = Date.now();
const urlParts = req.url?.split("/") ?? "";
if (urlParts.length === 2 && urlParts[1].length <= 16) {
let media = hashLookupCache.get(urlParts[1]) ?? null;
if (!media) {
media = await MediaService.GetByTag(urlParts[1]);
if (media) {
hashLookupCache.set(urlParts[1], media);
}
}
if (media) {
const fileStore = HashFS.GetHashFSInstance("images");
const { statusCode, headers, stream } = await FastifySend(req, fileStore.GetRelativePath(media.Hash), { root: fileStore.path });
headers["content-type"] = media.MediaType;
res.writeHead(statusCode, HeaderUtility.CombineHeaders(headers));
stream.pipe(res);
Console.printInfo(`[ ${cyan("MEDIA")} ] [ ${req.method?.toUpperCase()} ] [ ${ConsoleUtility.StatusColor(res.statusCode)} ] [ ${blue(`${Date.now() - startTime}ms`)} ] > ${req.url}`);
return;
} else {
}
}
res.statusCode = 404;
res.write("EUS Media Server");
return res.end();
});
mediaServer.listen(Config.hosts.webPort + 1, () => {
Console.printInfo(`[ ${cyan("MEDIA")} ] Listening at http://localhost:${(Config.hosts.webPort + 1)}`);
});*/

1
package.json
View file

@ -29,6 +29,7 @@
"@fastify/cookie": "^11.0.2",
"@fastify/formbody": "^8.0.2",
"@fastify/multipart": "^9.0.3",
"@fastify/send": "^4.0.0",
"@fastify/static": "^8.1.1",
"@fastify/view": "^11.0.0",
"dyetty": "^1.0.1",

12
repos/DomainRepo.ts
View file

@ -50,6 +50,17 @@ export default class DomainRepo {
}
}
public static async SelectByMediaDomain(domain: string) {
const dbDomain = await Database.Instance.query("SELECT * FROM Domain WHERE MediaDomain = ? AND IsDeleted = 0 LIMIT 1", [domain]);
if (dbDomain == null || dbDomain.length === 0) {
return null;
} else {
const domain = new Domain();
PopulateDomainFromDB(domain, dbDomain[0]);
return domain;
}
}
public static async InsertUpdate(domain: Domain) {
if (domain.Id === Number.MIN_VALUE) {
domain.Id = (await Database.Instance.query("INSERT Domain (UserId, DomainId, FileName, MediaTag, MediaType, Hash, FileSize, CreatedByUserId, CreatedDatetime, LastModifiedByUserId, LastModifiedDatetime, DeletedByUserId, DeletedDatetime, IsDeleted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING Id;", [
@ -70,6 +81,7 @@ function PopulateDomainFromDB(domain: Domain, dbDomain: any) {
domain.UserId = dbDomain.UserId;
domain.HasHttps = dbDomain.HasHttps[0] === 1;
domain.Domain = dbDomain.Domain;
domain.MediaDomain = dbDomain.MediaDomain;
domain.Active = dbDomain.Active[0] === 1;
domain.CreatedByUserId = dbDomain.CreatedByUserId;
domain.CreatedDatetime = dbDomain.CreatedDatetime;

18
services/DomainService.ts
View file

@ -10,4 +10,22 @@ export default abstract class DomainService {
throw e;
}
}
public static async LoadDomainByHost(host: string) {
try {
return await DomainRepo.SelectByDomain(host);
} catch (e) {
Console.printError(`EUS server service error:\n${e}`);
throw e;
}
}
public static async LoadDomainByMediaHost(host: string) {
try {
return await DomainRepo.SelectByMediaDomain(host);
} catch (e) {
Console.printError(`EUS server service error:\n${e}`);
throw e;
}
}
}

12
utilities/HeaderUtility.ts
View file

@ -10,8 +10,11 @@ export default abstract class HeaderUtility {
"Referrer-Policy": "strict-origin-when-cross-origin",
"Content-Security-Policy": "block-all-mixed-content;frame-ancestors 'self'",
"X-Frame-Options": "SAMEORIGIN",
"X-Content-Type-Options": "nosniff"
"X-Content-Type-Options": "nosniff",
"Connection": "keep-alive",
"Keep-Alive": "timeout=5"
};
public static BakedHeadersKeys = Object.keys(this.BakedHeaders);
public static AddBakedHeaders(res: FastifyReply) {
/*res.header("x-powered-by", "EUS");
@ -26,6 +29,13 @@ export default abstract class HeaderUtility {
res.headers(this.BakedHeaders);
}
public static AddBakedHeadersExpress(res: any) {
for (const key of this.BakedHeadersKeys) {
// @ts-ignore
res.header(key, this.BakedHeaders[key]);
}
}
public static CombineHeaders(headers: any) {
// for (const header of Object.keys(headers)) {
// res.header(header, headers[header]);