Switch to Baremux v2

Author: MotorTruck1221

main.rb

@@ -69,10 +69,6 @@
 set :uvPath, File.join(settings.root, 'node_modules', '@titaniumnetwork-dev', 'ultraviolet', 'dist')
 uvPath()
 
-# Dynamic "middleware"
-set :dynamicPath, File.join(settings.root, 'node_modules', '@nebula-services', 'dynamic', 'dist')
-dynamicPath()
-
 set :epoxyPath, File.join(settings.root, 'node_modules', '@mercuryworkshop', 'epoxy-transport', 'dist')
 epoxyPath()
 
@@ -82,6 +78,12 @@
 set :baremuxPath, File.join(settings.root, 'node_modules', '@mercuryworkshop', 'bare-mux', 'dist')
 baremuxPath()
 
+set :rammerheadPath, File.join(settings.root, 'node_modules', '@rubynetwork', 'rammerhead-browser', 'dist')
+rammerheadPath()
+
+set :baremodulePath, File.join(settings.root, 'node_modules', '@mercuryworkshop', 'bare-as-module3', 'dist')
+baremodulePath()
+
 mime_type :wasm, 'application/wasm'
 
 $latestRelease = getLatestRelease()

nodeJS/server.js

@@ -2,7 +2,7 @@ import Fastify from 'fastify';
 import fastifyMiddie from '@fastify/middie';
 import fastifyHttpProxy from '@fastify/http-proxy';
 import { createBareServer } from '@tomphttp/bare-server-node';
-import createRammerhead from "@rubynetwork/rammerhead/src/server/index.js";
+import { createRammerhead, shouldRouteRh, routeRhRequest, routeRhUpgrade } from "@rubynetwork/rammerhead";
 import { createServer } from 'http';
 import path from 'path';
 const __dirname = path.resolve();
@@ -11,40 +11,31 @@ import wisp from 'wisp-server-node';
 import fastifyCaching from '@fastify/caching';
 let nodePort = process.argv.find((arg) => arg.startsWith('--node-port')).split('=')[1] || 9294;
 const bare = createBareServer('/bare/');
-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}/;
-function shouldRouteRh(req) {
-  const url = new URL(req.url, "http://0.0.0.0");
-  return (rammerheadScopes.includes(url.pathname) || rammerheadSession.test(url.pathname))
-}
-function routeRhRequest(req, res) { rh.emit("request", req, res) }
-function routeRhUpgrade(req, socket, head) { rh.emit("upgrade", req, socket, head) }
+const rh = createRammerhead({
+    reverseProxy: true,
+    disableHttp2: false,
+    disableLocalStorageSync: false,
+    logLevel: 'debug'
+});
 
 const proxyHandler = (handler, opts) => {
     return createServer().on('request', (req, res) => {
-        if (req.url.startsWith('/rammer')) {
-            req.url = req.url.replace('/rammer', '');
-        }
         if (bare.shouldRoute(req)) {
             bare.routeRequest(req, res);
         }
         else if (shouldRouteRh(req)) {
-            routeRhRequest(req, res);
+            routeRhRequest(rh, req, res);
         }
         else {
             handler(req, res);
         }
     })
     .on('upgrade', (req, socket, head) => {
-        if (req.url.startsWith('/rammer')) {
-            req.url = req.url.replace('/rammer', '');
-        }
         if (bare.shouldRoute(req)) {
             bare.routeUpgrade(req, socket, head);
         }
         else if (shouldRouteRh(req)) {
-            routeRhUpgrade(req, socket, head);
+            routeRhUpgrade(rh, req, socket, head);
         }
         else if (req.url.endsWith('/wisp/')) {
             wisp.routeRequest(req, socket, head);

package.json

@@ -26,8 +26,9 @@
         "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@rubynetwork/rammerhead": "^1.3.1",
+        "@rubynetwork/rammerhead-browser": "^1.0.9",
         "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
-        "@tomphttp/bare-server-node": "^2.0.4",
+        "@tomphttp/bare-server-node": "2.0.3",
         "chalk": "^5.3.0",
         "fastify": "^4.28.1",
         "progress-estimator": "^0.3.1",