mirror of
https://github.com/QuiteAFancyEmerald/Holy-Unblocker.git
synced 2025-05-14 20:30:02 -04:00
Change fastify.mjs to server, express is still there for history reasons
This commit is contained in:
MotorTruck1221
parent
234a9a054b
commit
c41ec4142c
4 changed files with 217 additions and 217 deletions
|
|
@ -1,3 +1,3 @@
|
|||
(async () => {
|
||||
await import("./src/fastify.mjs");
|
||||
await import("./src/server.mjs");
|
||||
})();
|
||||
|
|
|
|||
136
src/express.mjs
Normal file
136
src/express.mjs
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
import { paintSource, tryReadFile } from "./randomization.mjs";
|
||||
import loadTemplates from "./templates.mjs";
|
||||
import pkg from "./routes.mjs";
|
||||
import { readFile } from "fs/promises";
|
||||
import path from "path";
|
||||
import express from "express";
|
||||
import helmet from "helmet";
|
||||
import http from "http";
|
||||
import createRammerhead from "rammerhead/src/server/index.js";
|
||||
import wisp from "wisp-server-node";
|
||||
import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
|
||||
import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
|
||||
import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
|
||||
import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
|
||||
import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
|
||||
// import { createBareServer } from "@tomphttp/bare-server-node";
|
||||
|
||||
const config = JSON.parse(
|
||||
await readFile(new URL("./config.json", import.meta.url))
|
||||
),
|
||||
{ pages, text404 } = pkg,
|
||||
__dirname = path.resolve(),
|
||||
port = process.env.PORT || config.port,
|
||||
app = express(),
|
||||
router = express.Router(),
|
||||
// bare = createBareServer("/bare/"),
|
||||
rh = createRammerhead();
|
||||
|
||||
const rammerheadScopes = [
|
||||
"/rammerhead.js",
|
||||
"/hammerhead.js",
|
||||
"/transport-worker.js",
|
||||
"/task.js",
|
||||
"/iframe-task.js",
|
||||
"/worker-hammerhead.js",
|
||||
"/messaging",
|
||||
"/sessionexists",
|
||||
"/deletesession",
|
||||
"/newsession",
|
||||
"/editsession",
|
||||
"/needpassword",
|
||||
"/syncLocalStorage",
|
||||
"/api/shuffleDict",
|
||||
"/mainport",
|
||||
];
|
||||
|
||||
const rammerheadSession = /^\/[a-z0-9]{32}/,
|
||||
|
||||
shouldRouteRh = req => {
|
||||
const url = new URL(req.url, "http://0.0.0.0");
|
||||
return (
|
||||
rammerheadScopes.includes(url.pathname) ||
|
||||
rammerheadSession.test(url.pathname)
|
||||
);
|
||||
},
|
||||
|
||||
routeRhRequest = (req, res) => {
|
||||
rh.emit("request", req, res);
|
||||
},
|
||||
|
||||
routeRhUpgrade = (req, socket, head) => {
|
||||
rh.emit("upgrade", req, socket, head);
|
||||
},
|
||||
|
||||
server = http.createServer((req, res) => {
|
||||
/*
|
||||
if (bare.shouldRoute(req)) {
|
||||
bare.routeRequest(req, res);
|
||||
} else
|
||||
*/
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhRequest(req, res);
|
||||
} else {
|
||||
app(req, res);
|
||||
}
|
||||
});
|
||||
|
||||
server.on("upgrade", (req, socket, head) => {
|
||||
/*
|
||||
if (bare.shouldRoute(req)) {
|
||||
bare.routeUpgrade(req, socket, head);
|
||||
} else
|
||||
*/
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhUpgrade(req, socket, head);
|
||||
} else if (req.url.endsWith("/wisp/")) {
|
||||
wisp.routeRequest(req, socket, head);
|
||||
}
|
||||
});
|
||||
|
||||
// Apply Helmet middleware for security
|
||||
app.use(
|
||||
helmet({
|
||||
contentSecurityPolicy: false, // Disable CSP
|
||||
})
|
||||
);
|
||||
|
||||
// All website files are stored in the /views directory.
|
||||
// This takes one of those files and displays it for a site visitor.
|
||||
// Query strings like /?j are converted into paths like /views/hidden.html
|
||||
// back here. Which query string converts to what is defined in routes.mjs.
|
||||
router.get("/", async (req, res) =>
|
||||
res.send(
|
||||
paintSource(
|
||||
loadTemplates(
|
||||
tryReadFile(
|
||||
path.join(__dirname,
|
||||
"views",
|
||||
// Return the error page if the query is not found in
|
||||
// routes.mjs. Also set index as the default page.
|
||||
"/?".indexOf(req.url) ? pages[Object.keys(req.query)[0]] || "error.html" : pages.index
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
app.use(router);
|
||||
app.use(express.static(path.join(__dirname, "views")));
|
||||
app.use("/uv/", express.static(uvPath));
|
||||
app.use("/epoxy/", express.static(epoxyPath));
|
||||
app.use("/libcurl/", express.static(libcurlPath));
|
||||
app.use("/bareasmodule/", express.static(bareModulePath));
|
||||
app.use("/baremux/", express.static(baremuxPath));
|
||||
|
||||
app.disable("x-powered-by");
|
||||
|
||||
// Redundant code since 404 is handled elsewhere; left here as insurance.
|
||||
app.use((req, res) => {
|
||||
res.status(404).send(paintSource(loadTemplates(text404)));
|
||||
});
|
||||
|
||||
server.listen(port);
|
||||
console.log("Holy Unblocker is listening on port " + port + ".");
|
||||
114
src/fastify.mjs
114
src/fastify.mjs
|
|
@ -1,114 +0,0 @@
|
|||
import Fastify from 'fastify';
|
||||
import { createServer } from 'node:http';
|
||||
import wisp from 'wisp-server-node';
|
||||
import createRammerhead from "rammerhead/src/server/index.js";
|
||||
import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
|
||||
import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
|
||||
import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
|
||||
import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
|
||||
import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
|
||||
import fastifyHelmet from '@fastify/helmet';
|
||||
import fastifyStatic from '@fastify/static';
|
||||
import pkg from "./routes.mjs";
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { paintSource, tryReadFile } from './randomization.mjs';
|
||||
import loadTemplates from './templates.mjs';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { existsSync } from 'node:fs';
|
||||
const config = JSON.parse(await readFile(new URL("./config.json", import.meta.url))), { pages, text404 } = pkg;
|
||||
const __dirname = path.resolve();
|
||||
const port = process.env.PORT || config.port;
|
||||
|
||||
const rh = createRammerhead();
|
||||
const rammerheadScopes = [
|
||||
"/rammerhead.js",
|
||||
"/hammerhead.js",
|
||||
"/transport-worker.js",
|
||||
"/task.js",
|
||||
"/iframe-task.js",
|
||||
"/worker-hammerhead.js",
|
||||
"/messaging",
|
||||
"/sessionexists",
|
||||
"/deletesession",
|
||||
"/newsession",
|
||||
"/editsession",
|
||||
"/needpassword",
|
||||
"/syncLocalStorage",
|
||||
"/api/shuffleDict",
|
||||
"/mainport",
|
||||
];
|
||||
const rammerheadSession = /^\/[a-z0-9]{32}/;
|
||||
const shouldRouteRh = req => {
|
||||
const url = new URL(req.url, "http://0.0.0.0");
|
||||
return (
|
||||
rammerheadScopes.includes(url.pathname) ||
|
||||
rammerheadSession.test(url.pathname)
|
||||
);
|
||||
}
|
||||
const routeRhRequest = (req, res) => {
|
||||
rh.emit("request", req, res);
|
||||
}
|
||||
const routeRhUpgrade = (req, socket, head) => {
|
||||
rh.emit("upgrade", req, socket, head);
|
||||
}
|
||||
|
||||
//create a server factory for RH, and wisp (and bare if you please)
|
||||
const serverFactory = (handler) => {
|
||||
return createServer()
|
||||
.on('request', (req, res) => {
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhRequest(req, res);
|
||||
}
|
||||
else {
|
||||
handler(req, res);
|
||||
}
|
||||
})
|
||||
.on('upgrade', (req, socket, head) => {
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhUpgrade(req, socket, head);
|
||||
}
|
||||
else if (req.url.endsWith('/wisp/')) {
|
||||
wisp.routeRequest(req, socket, head);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//set logger to true for logs
|
||||
const app = Fastify({ logger: false, serverFactory: serverFactory });
|
||||
app.register(fastifyStatic, {
|
||||
root: fileURLToPath(new URL('../views', import.meta.url)),
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: uvPath,
|
||||
//due to how Fastify works, we have to have the uvPath live on a different prefix then the one in /views/
|
||||
prefix: "/uv-static/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: epoxyPath,
|
||||
prefix: "/epoxy/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: libcurlPath,
|
||||
prefix: "/libcurl/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: bareModulePath,
|
||||
prefix: "/bareasmodule/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: baremuxPath,
|
||||
prefix: "/baremux/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.get("/", function(req, reply) {
|
||||
reply.type('html');
|
||||
reply.send(paintSource(loadTemplates(tryReadFile(path.join(__dirname, "views", "/?".indexOf(req.url) ? pages[Object.keys(req.query)[0]] || "error.html" : pages.index)))))
|
||||
});
|
||||
|
||||
//host is set as to avoid just being on localhost
|
||||
app.listen({ port: port, host: '0.0.0.0' });
|
||||
182
src/server.mjs
182
src/server.mjs
|
|
@ -1,31 +1,26 @@
|
|||
import { paintSource, tryReadFile } from "./randomization.mjs";
|
||||
import loadTemplates from "./templates.mjs";
|
||||
import pkg from "./routes.mjs";
|
||||
import { readFile } from "fs/promises";
|
||||
import path from "path";
|
||||
import express from "express";
|
||||
import helmet from "helmet";
|
||||
import http from "http";
|
||||
import Fastify from 'fastify';
|
||||
import { createServer } from 'node:http';
|
||||
import wisp from 'wisp-server-node';
|
||||
import createRammerhead from "rammerhead/src/server/index.js";
|
||||
import wisp from "wisp-server-node";
|
||||
import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
|
||||
import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
|
||||
import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
|
||||
import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
|
||||
import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
|
||||
// import { createBareServer } from "@tomphttp/bare-server-node";
|
||||
|
||||
const config = JSON.parse(
|
||||
await readFile(new URL("./config.json", import.meta.url))
|
||||
),
|
||||
{ pages, text404 } = pkg,
|
||||
__dirname = path.resolve(),
|
||||
port = process.env.PORT || config.port,
|
||||
app = express(),
|
||||
router = express.Router(),
|
||||
// bare = createBareServer("/bare/"),
|
||||
rh = createRammerhead();
|
||||
import fastifyHelmet from '@fastify/helmet';
|
||||
import fastifyStatic from '@fastify/static';
|
||||
import pkg from "./routes.mjs";
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { paintSource, tryReadFile } from './randomization.mjs';
|
||||
import loadTemplates from './templates.mjs';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { existsSync } from 'node:fs';
|
||||
const config = JSON.parse(await readFile(new URL("./config.json", import.meta.url))), { pages, text404 } = pkg;
|
||||
const __dirname = path.resolve();
|
||||
const port = process.env.PORT || config.port;
|
||||
|
||||
const rh = createRammerhead();
|
||||
const rammerheadScopes = [
|
||||
"/rammerhead.js",
|
||||
"/hammerhead.js",
|
||||
|
|
@ -43,94 +38,77 @@ const rammerheadScopes = [
|
|||
"/api/shuffleDict",
|
||||
"/mainport",
|
||||
];
|
||||
|
||||
const rammerheadSession = /^\/[a-z0-9]{32}/,
|
||||
|
||||
shouldRouteRh = req => {
|
||||
const rammerheadSession = /^\/[a-z0-9]{32}/;
|
||||
const shouldRouteRh = req => {
|
||||
const url = new URL(req.url, "http://0.0.0.0");
|
||||
return (
|
||||
rammerheadScopes.includes(url.pathname) ||
|
||||
rammerheadSession.test(url.pathname)
|
||||
);
|
||||
},
|
||||
|
||||
routeRhRequest = (req, res) => {
|
||||
}
|
||||
const routeRhRequest = (req, res) => {
|
||||
rh.emit("request", req, res);
|
||||
},
|
||||
|
||||
routeRhUpgrade = (req, socket, head) => {
|
||||
}
|
||||
const routeRhUpgrade = (req, socket, head) => {
|
||||
rh.emit("upgrade", req, socket, head);
|
||||
},
|
||||
}
|
||||
|
||||
server = http.createServer((req, res) => {
|
||||
/*
|
||||
if (bare.shouldRoute(req)) {
|
||||
bare.routeRequest(req, res);
|
||||
} else
|
||||
*/
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhRequest(req, res);
|
||||
} else {
|
||||
app(req, res);
|
||||
}
|
||||
//create a server factory for RH, and wisp (and bare if you please)
|
||||
const serverFactory = (handler) => {
|
||||
return createServer()
|
||||
.on('request', (req, res) => {
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhRequest(req, res);
|
||||
}
|
||||
else {
|
||||
handler(req, res);
|
||||
}
|
||||
})
|
||||
.on('upgrade', (req, socket, head) => {
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhUpgrade(req, socket, head);
|
||||
}
|
||||
else if (req.url.endsWith('/wisp/')) {
|
||||
wisp.routeRequest(req, socket, head);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//set logger to true for logs
|
||||
const app = Fastify({ logger: false, serverFactory: serverFactory });
|
||||
app.register(fastifyStatic, {
|
||||
root: fileURLToPath(new URL('../views', import.meta.url)),
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: uvPath,
|
||||
//due to how Fastify works, we have to have the uvPath live on a different prefix then the one in /views/
|
||||
prefix: "/uv-static/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: epoxyPath,
|
||||
prefix: "/epoxy/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: libcurlPath,
|
||||
prefix: "/libcurl/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: bareModulePath,
|
||||
prefix: "/bareasmodule/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.register(fastifyStatic, {
|
||||
root: baremuxPath,
|
||||
prefix: "/baremux/",
|
||||
decorateReply: false
|
||||
});
|
||||
app.get("/", function(req, reply) {
|
||||
reply.type('html');
|
||||
reply.send(paintSource(loadTemplates(tryReadFile(path.join(__dirname, "views", "/?".indexOf(req.url) ? pages[Object.keys(req.query)[0]] || "error.html" : pages.index)))))
|
||||
});
|
||||
|
||||
server.on("upgrade", (req, socket, head) => {
|
||||
/*
|
||||
if (bare.shouldRoute(req)) {
|
||||
bare.routeUpgrade(req, socket, head);
|
||||
} else
|
||||
*/
|
||||
if (shouldRouteRh(req)) {
|
||||
routeRhUpgrade(req, socket, head);
|
||||
} else if (req.url.endsWith("/wisp/")) {
|
||||
wisp.routeRequest(req, socket, head);
|
||||
}
|
||||
});
|
||||
|
||||
// Apply Helmet middleware for security
|
||||
app.use(
|
||||
helmet({
|
||||
contentSecurityPolicy: false, // Disable CSP
|
||||
})
|
||||
);
|
||||
|
||||
// All website files are stored in the /views directory.
|
||||
// This takes one of those files and displays it for a site visitor.
|
||||
// Query strings like /?j are converted into paths like /views/hidden.html
|
||||
// back here. Which query string converts to what is defined in routes.mjs.
|
||||
router.get("/", async (req, res) =>
|
||||
res.send(
|
||||
paintSource(
|
||||
loadTemplates(
|
||||
tryReadFile(
|
||||
path.join(__dirname,
|
||||
"views",
|
||||
// Return the error page if the query is not found in
|
||||
// routes.mjs. Also set index as the default page.
|
||||
"/?".indexOf(req.url) ? pages[Object.keys(req.query)[0]] || "error.html" : pages.index
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
app.use(router);
|
||||
app.use(express.static(path.join(__dirname, "views")));
|
||||
app.use("/uv/", express.static(uvPath));
|
||||
app.use("/epoxy/", express.static(epoxyPath));
|
||||
app.use("/libcurl/", express.static(libcurlPath));
|
||||
app.use("/bareasmodule/", express.static(bareModulePath));
|
||||
app.use("/baremux/", express.static(baremuxPath));
|
||||
|
||||
app.disable("x-powered-by");
|
||||
|
||||
// Redundant code since 404 is handled elsewhere; left here as insurance.
|
||||
app.use((req, res) => {
|
||||
res.status(404).send(paintSource(loadTemplates(text404)));
|
||||
});
|
||||
|
||||
server.listen(port);
|
||||
console.log("Holy Unblocker is listening on port " + port + ".");
|
||||
//host is set as to avoid just being on localhost
|
||||
app.listen({ port: port, host: '0.0.0.0' });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue