titaniumnet-mirror/Nebula
1
0
Fork 0
mirror of https://github.com/NebulaServices/Nebula.git synced 2025-05-17 05:20:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'NebulaServices:main' into main

Browse source
This commit is contained in:
tgt 2024-01-01 18:08:11 -05:00 • committed by GitHub
commit f45fe3e089
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -13,8 +13,8 @@
"dependencies": {
"@fastify/compress": "^6.5.0",
"@fastify/static": "^6.12.0",
"@nebula-services/dynamic": "0.7.2-patch.1",
"@nebula-services/ultraviolet": "1.0.1-1.patch",
"@nebula-services/dynamic": "0.7.2-patch.2",
"@nebula-services/ultraviolet": "1.0.1-1.patch.5",
"@tomphttp/bare-server-node": "^2.0.1",
"classnames": "^2.3.2",
"fastify": "^4.25.1",

17
pnpm-lock.yaml generated
View file

@ -12,11 +12,11 @@ dependencies:
specifier: ^6.12.0
version: 6.12.0
'@nebula-services/dynamic':
specifier: 0.7.2-patch.1
version: 0.7.2-patch.1
specifier: 0.7.2-patch.2
version: 0.7.2-patch.2
'@nebula-services/ultraviolet':
specifier: 1.0.1-1.patch
version: 1.0.1-1.patch
specifier: 1.0.1-1.patch.5
version: 1.0.1-1.patch.5
'@tomphttp/bare-server-node':
specifier: ^2.0.1
version: 2.0.1
@ -989,8 +989,8 @@ packages:
resolution: {integrity: sha512-n3/+wko8WFd/fbiPCOuBB6HfKL6hTcygFEZ/MpmvpMRbgDSdlNMopDFGjsoTYqCbzTVTX9TL/StXco4yx2v58Q==}
dev: true
/@nebula-services/dynamic@0.7.2-patch.1:
resolution: {integrity: sha512-hN40+RQ1LoxOJos2x891y9/0fumbTTrsbVY/84028tar/c2WSv4YueyD9ZGDLQjsiGiO0vdlByB04ExSxmzJvg==}
/@nebula-services/dynamic@0.7.2-patch.2:
resolution: {integrity: sha512-0g1ygwVNS0dmT38NIeZYc2Z5HiZKHT3tP7ZagIeWC/VlcZjINIPR4ThNndWVaGiZey2Y2JS2807ABb41OSYTrw==}
dependencies:
'@dynamic-pkg/mime': 1.0.1
'@dynamic-pkg/mutation': 1.0.0
@ -1002,6 +1002,7 @@ packages:
astring: 1.8.6
chalk: 5.3.0
cookie: 0.5.0
crypto-js: 4.2.0
domhandler: 5.0.3
esbuild: 0.19.10
fastify: 4.25.1
@ -1017,8 +1018,8 @@ packages:
- utf-8-validate
dev: false
/@nebula-services/ultraviolet@1.0.1-1.patch:
resolution: {integrity: sha512-ZBD6stHsQW7oZm1Y5tiQLymknQfpUmPK0DjRKYzpEj7+Jx9FA4lylLR+P0UmOmKyKM0TdWAcjDGPER+DtLEzeg==}
/@nebula-services/ultraviolet@1.0.1-1.patch.5:
resolution: {integrity: sha512-EDwbh+AXPg+JxPcPhRHJh6crLh1AHSodcAgfO47ug4paoLkWXE0ELU5Tm0Um38kguTBHzTOPFSzNULpaFbhFLw==}
dependencies:
'@tomphttp/bare-client': 1.1.2-beta.3
crypto-js: 4.2.0

2
public/dynamic/dynamic.config.js
View file

@ -2,7 +2,7 @@
self.__dynamic$config = {
prefix: '/~/dynamic/',
encoding: 'plain',
encoding: 'aes',
mode: 'production',
logLevel: 0,
bare: {

8
src/pages/ProxyFrame.tsx
View file

@ -47,7 +47,9 @@ export function ProxyFrame(props: { url: string }) {
window.__uv$config.encodeUrl(decodedUrl);
} else if (localProxy === "dynamic") {
result =
window.__dynamic$config.prefix + encodeURIComponent(decodedUrl);
window.__dynamic$config.prefix +
"route?url=" +
encodeURIComponent(decodedUrl);
} else {
// automatic. use SiteSupport.json to determine proxy support
const matchingKey = Object.keys(SiteSupport).find((key) =>
@ -60,7 +62,9 @@ export function ProxyFrame(props: { url: string }) {
window.__uv$config.encodeUrl(decodedUrl);
} else if (SiteSupport[matchingKey] === "dynamic") {
result =
window.__dynamic$config.prefix + encodeURIComponent(decodedUrl);
window.__dynamic$config.prefix +
"route?url=" +
encodeURIComponent(decodedUrl);
} else if (SiteSupport[matchingKey] === "rammerhead") {
result = await RammerheadEncode(decodedUrl);
} else {