diff --git a/bun.lockb b/bun.lockb index db143bc..9794334 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/entities/Domain.ts b/entities/Domain.ts index 19bc8fb..15c840b 100644 --- a/entities/Domain.ts +++ b/entities/Domain.ts @@ -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"; diff --git a/index.ts b/index.ts index bd37930..d9a3bb1 100644 --- a/index.ts +++ b/index.ts @@ -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")}`); -}); \ No newline at end of file +}); + +/*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)}`); +});*/ \ No newline at end of file diff --git a/package.json b/package.json index 633b438..327570a 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/repos/DomainRepo.ts b/repos/DomainRepo.ts index d9ad62c..4b9da3a 100644 --- a/repos/DomainRepo.ts +++ b/repos/DomainRepo.ts @@ -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; diff --git a/services/DomainService.ts b/services/DomainService.ts index 356ee69..93a8236 100644 --- a/services/DomainService.ts +++ b/services/DomainService.ts @@ -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; + } + } } \ No newline at end of file diff --git a/utilities/HeaderUtility.ts b/utilities/HeaderUtility.ts index 490130e..3f089d4 100644 --- a/utilities/HeaderUtility.ts +++ b/utilities/HeaderUtility.ts @@ -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]);