Update Bare server, Ultraviolet and fixes

.dockerignore

@@ -0,0 +1,22 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:18-alpine
+
+WORKDIR /app
+
+COPY package*.json .
+
+RUN npm install
+
+COPY static static/
+COPY src/index.js src/
+
+EXPOSE 8080
+
+CMD ["npm", "start"]

package.json

@@ -8,16 +8,29 @@
     "install-webretro-linux": "chmod u+x ./src/webretro.sh && ./src/webretro.sh",
     "install-webretro-win": "echo \"Error: not finshed\" && exit 1"
   },
-  "files": ["static", "src", "ssl", ".gitignore", "app.json"],
+  "files": [
+    "static",
+    "src",
+    "ssl",
+    ".gitignore",
+    "app.json"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/amethystnetwork-dev/Incognito"
   },
-  "keywords": ["unoffical", "ultraviolet", "unblock", "titaniumnetwork", "bypass-filter", "amethystnetwork-dev"],
+  "keywords": [
+    "unoffical",
+    "ultraviolet",
+    "unblock",
+    "titaniumnetwork",
+    "bypass-filter",
+    "amethystnetwork-dev"
+  ],
   "author": "",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "@tomphttp/bare-server-node": "^1.2.2",
+    "@tomphttp/bare-server-node": "^1.2.3",
     "serve-static": "^1.15.0"
   },
   "engines": {

static/gs.json

@@ -129,7 +129,7 @@
   },
   {
     "img": "./img/gs/fnf.jpg",
-    "location": "./source/fnf/",
+    "location": "./source/fridaynightfunkin/",
     "category": "web",
     "title": "Friday Night Funkin"
   },
@@ -229,6 +229,12 @@
     "title": "Vex 5",
     "category": "web"
   },
+  {
+    "img": "./img/gs/vex6.jpg",
+    "location": "./source/vex6/",
+    "title": "Vex 6",
+    "category": "web"
+  },
   {
     "img": "./img/gs/warfare1917.png",
     "location": "./source/swfs/#warfare1917",

static/load.html

@@ -90,9 +90,6 @@
                 let url = atob(decodeURIComponent(window.location.hash.slice(1)));
                 let search;
                 switch (localStorage.getItem('incog||search')) {
-                    case 'google':
-                        search = 'https://google.com/search?q='
-                        break;
                     case 'ddg':
                         search = 'https://duckduckgo.com/?q='
                         break;
@@ -104,7 +101,10 @@
                         break;
                     default:
                         localStorage.setItem('incog||search', 'google')
+                        // fall through to next option
+                    case 'google':
                         search = 'https://google.com/search?q='
+                    break;
                 };
                 if (url) {
                     if (!isUrl(url)) url = search + url;

static/script/home.js

@@ -79,35 +79,24 @@ function access(app) {
 
             clearTimeout(app.timeout);
             app.timeout = setTimeout(async () => {
+                const { bare } = app;
                 var mode = localStorage.getItem('incog||suggestions') || 'ddg';
-                var path;
                 var host;
                 var prefix;
                 var array;
                 if(mode == 'none') {} else {
                     switch(mode) {
                         case 'ddg':
-                            host = 'duckduckgo.com'
-                            path = '/ac/?q='
+                            host = 'https://duckduckgo.com/ac/?q='
                             prefix = 'phrase'
                             array = false
                             break;
                         case 'brave':
-                            host = 'search.brave.com'
-                            path = '/api/suggest?q='
+                            host = 'https://search.brave.com/api/suggest?q='
                             array = true
                             break;
                     }
-                    const res = await fetch(__uv$config.bare + 'v1/', {
-                        headers: {
-                            'x-bare-host': host,
-                            'x-bare-protocol': 'https:',
-                            'x-bare-path': path + encodeURIComponent(event.target.value),
-                            'x-bare-port': '443',
-                            'x-bare-headers': JSON.stringify({ Host: host }),
-                            'x-bare-forward-headers': '[]'
-                        }
-                    })
+                    const res = await bare.fetch(host + encodeURIComponent(event.target.value))
                     const json = await res.json();
                     var suggestions = [];