titaniumnet-mirror/Holy-Unblocker
1
0
Fork 0
mirror of https://github.com/QuiteAFancyEmerald/Holy-Unblocker.git synced 2025-05-16 05:00:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix server startup error

Browse source
This commit is contained in:
00Fjongl 2024-07-24 23:36:57 -05:00
parent 2f29c93d1e
commit daaac6a08a
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server.mjs
View file

@ -7,13 +7,13 @@ import express from "express";
import helmet from "helmet"; import helmet from "helmet";
import http from "http"; import http from "http";
import createRammerhead from "rammerhead/src/server/index.js"; import createRammerhead from "rammerhead/src/server/index.js";
import { createBareServer } from "@tomphttp/bare-server-node";
import wisp from "wisp-server-node"; import wisp from "wisp-server-node";
import { epoxyPath } from "@mercuryworkshop/epoxy-transport"; import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
import { libcurlPath } from "@mercuryworkshop/libcurl-transport"; import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
import { bareModulePath } from "@mercuryworkshop/bare-as-module3"; import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
import { baremuxPath } from "@mercuryworkshop/bare-mux/node"; import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
import { uvPath } from "@titaniumnetwork-dev/ultraviolet"; import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
// import { createBareServer } from "@tomphttp/bare-server-node";
const config = JSON.parse( const config = JSON.parse(
await readFile(new URL("./config.json", import.meta.url)) await readFile(new URL("./config.json", import.meta.url))
@ -23,7 +23,7 @@ __dirname = path.resolve(),
port = process.env.PORT || config.port, port = process.env.PORT || config.port,
app = express(), app = express(),
router = express.Router(), router = express.Router(),
bare = createBareServer("/bare/"), // bare = createBareServer("/bare/"),
rh = createRammerhead(); rh = createRammerhead();
const rammerheadScopes = [ const rammerheadScopes = [
@ -63,9 +63,12 @@ routeRhUpgrade = (req, socket, head) => {
}, },
server = http.createServer((req, res) => { server = http.createServer((req, res) => {
/*
if (bare.shouldRoute(req)) { if (bare.shouldRoute(req)) {
bare.routeRequest(req, res); bare.routeRequest(req, res);
} else if (shouldRouteRh(req)) { } else
*/
if (shouldRouteRh(req)) {
routeRhRequest(req, res); routeRhRequest(req, res);
} else { } else {
app(req, res); app(req, res);
@ -73,9 +76,12 @@ server = http.createServer((req, res) => {
}); });
server.on("upgrade", (req, socket, head) => { server.on("upgrade", (req, socket, head) => {
/*
if (bare.shouldRoute(req)) { if (bare.shouldRoute(req)) {
bare.routeUpgrade(req, socket, head); bare.routeUpgrade(req, socket, head);
} else if (shouldRouteRh(req)) { } else
*/
if (shouldRouteRh(req)) {
routeRhUpgrade(req, socket, head); routeRhUpgrade(req, socket, head);
} else if (req.url.endsWith("/wisp/")) { } else if (req.url.endsWith("/wisp/")) {
wisp.routeRequest(req, socket, head); wisp.routeRequest(req, socket, head);