From 007e11a8b452f773eb045fb6ce53752ac8a03970 Mon Sep 17 00:00:00 2001
From: Russell2259 <russell2259@tuta.io>
Date: Fri, 26 Jan 2024 20:26:45 +0000
Subject: [PATCH] sync

---
 package-lock.json | 34 +++++++++++++++++++++++++++++++---
 package.json      |  2 +-
 server/index.js   | 14 +++++++++-----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b69cc80..83e1bb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,8 @@
             "version": "1.2.1",
             "license": "GNU-3.0-or-later",
             "dependencies": {
-                "@tomphttp/bare-server-node": "github:Skoolgq/bare-server-node-modified",
+                "@Skoolgq/bare-server-node-modified": "github:Skoolgq/bare-server-node-modified",
+                "@tomphttp/bare-server-node": "^2.0.1",
                 "cors": "*",
                 "easyviolet": "github:Russell2259/Easyviolet",
                 "express": "*",
@@ -45,6 +46,27 @@
                 "node": ">=4.0"
             }
         },
+        "node_modules/@Skoolgq/bare-server-node-modified": {
+            "name": "@tomphttp/bare-server-node",
+            "version": "2.0.1",
+            "resolved": "git+ssh://git@github.com/Skoolgq/bare-server-node-modified.git#1e1a1cd12e8487156f859de4a1d2d10a7c71c11c",
+            "license": "GPL-3.0",
+            "dependencies": {
+                "async-exit-hook": "^2.0.1",
+                "commander": "^10.0.1",
+                "dotenv": "^16.0.3",
+                "http-errors": "^2.0.0",
+                "ipaddr.js": "^2.0.1",
+                "source-map-support": "^0.5.21",
+                "ws": "^8.13.0"
+            },
+            "bin": {
+                "bare-server-node": "bin.js"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
         "node_modules/@titaniumnetwork-dev/ultraviolet": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/@titaniumnetwork-dev/ultraviolet/-/ultraviolet-2.0.0.tgz",
@@ -68,12 +90,13 @@
         },
         "node_modules/@tomphttp/bare-server-node": {
             "version": "2.0.1",
-            "resolved": "git+ssh://git@github.com/Skoolgq/bare-server-node-modified.git#1e1a1cd12e8487156f859de4a1d2d10a7c71c11c",
-            "license": "GPL-3.0",
+            "resolved": "https://registry.npmjs.org/@tomphttp/bare-server-node/-/bare-server-node-2.0.1.tgz",
+            "integrity": "sha512-L42TC/AldYRFBRZSxhkI0FC5TL8EC/NAsepNC/cWYTTiHQJ7mGg/vdTqNz8ShTYHr6LTHYkuD3/81nhX55SYtA==",
             "dependencies": {
                 "async-exit-hook": "^2.0.1",
                 "commander": "^10.0.1",
                 "dotenv": "^16.0.3",
+                "headers-polyfill": "^3.1.2",
                 "http-errors": "^2.0.0",
                 "ipaddr.js": "^2.0.1",
                 "source-map-support": "^0.5.21",
@@ -911,6 +934,11 @@
                 "he": "bin/he"
             }
         },
+        "node_modules/headers-polyfill": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-3.3.0.tgz",
+            "integrity": "sha512-5e57etwBpNcDc0b6KCVWEh/Ro063OxPvzVimUdM0/tsYM/T7Hfy3kknIGj78SFTOhNd8AZY41U8mOHoO4LzmIQ=="
+        },
         "node_modules/html-encoding-sniffer": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
diff --git a/package.json b/package.json
index d9954c7..6a3f214 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "author": "Polaris Development Group",
     "license": "GNU-3.0-or-later",
     "dependencies": {
-        "@Skoolgq/bare-server-node-modified": "github:Skoolgq/bare-server-node-modified",
+        "@tomphttp/bare-server-node": "^2.0.1",
         "cors": "*",
         "easyviolet": "github:Russell2259/Easyviolet",
         "express": "*",
diff --git a/server/index.js b/server/index.js
index 05d8c14..fb39204 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,4 +1,4 @@
-import { createBareServer } from '@Skoolgq/bare-server-node-modified';
+import { createBareServer } from '@tomphttp/bare-server-node';
 import express from 'express';
 import mime from 'mime';
 import cors from 'cors';
@@ -132,13 +132,17 @@ app.use(async (req, res, next) => {
 });
 
 server.on('request', (req, res) => {
-    if (bareServer.shouldRoute(req)) bareServer.routeRequest(req, res);
-    else app(req, res);
+    if (bareServer.shouldRoute(req)) {
+        //console.log('request', req.headers['x-bare-url']);
+        bareServer.routeRequest(req, res);
+    } else app(req, res);
 });
 
 server.on('upgrade', (req, socket, head) => {
-    if (bareServer.shouldRoute(req)) bareServer.routeUpgrade(req, socket, head);
-    else socket.end();
+    if (bareServer.shouldRoute(req)) {
+        //console.log('upgrade', req.headers['x-bare-url']);
+        bareServer.routeUpgrade(req, socket, head);
+    } else socket.end();
 });
 
 server.listen(config.port, () => console.log(`Polaris running\n\nPort: ${server.address().port}\nVersion: ${packageFile.version + (Number(packageFile.version.split('.')[0]) <= 1 ? ' Beta' : '') || 'Unknown'} ${childProcess.execSync('git rev-parse HEAD').toString().trim().slice(0, 7) || 'Unknown'}\nMode: ${config.mode === 'dev' ? 'development' : 'production'}\nAPI Server: ${config.options.api.domain}\nNode.js: ${process.version}`));
\ No newline at end of file