From 1fb7d3c6fc87c0df9aecb6cd460fb008834f0d73 Mon Sep 17 00:00:00 2001 From: CountBleck Date: Sun, 4 Sep 2022 20:38:04 -0700 Subject: [PATCH 1/4] Switch Cyclone's prefix from /service to /service/next If a user navigates to a UV link directly, without the service worker registered, Cyclone's bare server will take over and interpret the URL as http://go/..., which you definitely didn't want, unless you happen to work at Google :P --- static/customBare.mjs | 2 +- static/resources/nebula.bundle.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/customBare.mjs b/static/customBare.mjs index bc14db5..e5bb0dc 100644 --- a/static/customBare.mjs +++ b/static/customBare.mjs @@ -7,7 +7,7 @@ import filter from './cyclone/filter.cyclone.mjs'; import * as security from './cyclone/security.cyclone.mjs'; const config = { - prefix: "/service", + prefix: "/service/next", requireSSL: true, // Requires SSL? defaultHeaders: { 'X-Content-Type-Options': 'no-sniff', diff --git a/static/resources/nebula.bundle.js b/static/resources/nebula.bundle.js index ea45401..300199e 100644 --- a/static/resources/nebula.bundle.js +++ b/static/resources/nebula.bundle.js @@ -77,7 +77,7 @@ window.addEventListener('load', () => { let url = value.trim(); if (!isUrl(url)) url = 'www.google.com/search?q=' + url; if (!(url.startsWith('https://') || url.startsWith('http://'))) url = 'http://' + url; - let redirectTo = '/service/' + url; + let redirectTo = '/service/next/' + url; const option = localStorage.getItem('nogg'); if (option === 'on') { stealthEngine(redirectTo); From 762d8d7d39efd4f3de8b0b5f696c7adc1928095c Mon Sep 17 00:00:00 2001 From: CountBleck Date: Tue, 13 Sep 2022 19:06:37 -0700 Subject: [PATCH 2/4] Add max-age value to serve-static This change may improve caching for static assets. However, most HTTP requests are directed to the Bare server, so the improvement the max-age value makes may be negligible. --- app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 239ba84..2b0c093 100644 --- a/app.js +++ b/app.js @@ -14,7 +14,10 @@ const bareServer = createBareServer('/bare/', { const serve = serveStatic(join( dirname(fileURLToPath(import.meta.url)), 'static/' -), {fallthrough: false}); +), { + fallthrough: false, + maxAge: 5 * 60 * 1000 +}); const server = http.createServer(); From 06debb1891280e1271ca96987e74bd033e932c3d Mon Sep 17 00:00:00 2001 From: CountBleck Date: Tue, 13 Sep 2022 19:29:12 -0700 Subject: [PATCH 3/4] Remove outdated, redundant bare server dependency The removed "bare-server-node" dependency is discouraged in favor of the better "@tomphttp/bare-server-node" package. This commit closes #10 as a result. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 551ac83..103c760 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "license": "MIT", "dependencies": { "@tomphttp/bare-server-node": "^1.0.2-beta-readme5", - "bare-server-node": "github:tomphttp/bare-server-node", "crypto-js": "4.1.1", "css-tree": "^2.1.0", "node-fetch": "^3.2.6", From ce9ba1e1cd35266c6712b4e972d1524b85889034 Mon Sep 17 00:00:00 2001 From: CountBleck Date: Tue, 13 Sep 2022 19:14:53 -0700 Subject: [PATCH 4/4] Bump lockfile --- package-lock.json | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f77346..3a00fea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "@tomphttp/bare-server-node": "^1.0.2-beta-readme5", - "bare-server-node": "github:tomphttp/bare-server-node", "crypto-js": "4.1.1", "css-tree": "^2.1.0", "node-fetch": "^3.2.6", @@ -35,24 +34,6 @@ "node": ">=16.0.0" } }, - "node_modules/bare-server-node": { - "name": "@tomphttp/bare-server-node", - "version": "1.0.3-deps2", - "resolved": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c5a87ef6c063c4728bb88a362db9581f26be2225", - "license": "GPL-3.0", - "dependencies": { - "commander": "^9.0.0", - "dotenv": "^16.0.1", - "headers-polyfill": "^3.0.10", - "http-errors": "^2.0.0" - }, - "bin": { - "bare-server-node": "scripts/cli.js" - }, - "engines": { - "node": ">=16.0.0" - } - }, "node_modules/commander": { "version": "9.4.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", @@ -118,9 +99,9 @@ } }, "node_modules/dotenv": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", - "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==", + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.2.tgz", + "integrity": "sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==", "engines": { "node": ">=12" } @@ -407,16 +388,6 @@ "http-errors": "^2.0.0" } }, - "bare-server-node": { - "version": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c5a87ef6c063c4728bb88a362db9581f26be2225", - "from": "bare-server-node@github:tomphttp/bare-server-node", - "requires": { - "commander": "^9.0.0", - "dotenv": "^16.0.1", - "headers-polyfill": "^3.0.10", - "http-errors": "^2.0.0" - } - }, "commander": { "version": "9.4.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", @@ -467,9 +438,9 @@ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "dotenv": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", - "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==" + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.2.tgz", + "integrity": "sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==" }, "ee-first": { "version": "1.1.1",