Merge pull request #26 from Ruby-Network/bare

Add bare support

Author: MotorTruck1221

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "epoxytransport"]
 	path = epoxytransport
 	url = https://github.com/mercuryworkshop/epoxytransport
+[submodule "bare-as-module3"]
+	path = bare-as-module3
+	url = https://github.com/motortruck1221/bare-as-module3

Makefile

@@ -0,0 +1,6 @@
+SHELL := bash
+
+bare-module:
+	@echo "Building bare as module 3"
+	@cd bare-as-module3 && pnpm run build 
+	@cp bare-as-module3/dist/bare.cjs src/public/js/bareTransport/bareMod.js

bare-as-module3

@@ -9,6 +9,7 @@ RUN gem install bundler
 # Installing pnpm
 RUN npm install -g pnpm
 RUN pnpm install
+RUN make bare-module 
 # Setup a basic configuration
 RUN cp config/settings.example.yml config/settings.yml
 # Mount config/settings.yml as a volume

docker/Dockerfile

@@ -21,11 +21,12 @@
         "@fastify/caching": "^8.3.0",
         "@fastify/http-proxy": "^9.4.0",
         "@fastify/middie": "^8.3.0",
-        "@mercuryworkshop/bare-mux": "^1.0.4",
+        "@mercuryworkshop/bare-mux": "^1.0.5",
         "@mercuryworkshop/epoxy-transport": "workspace:*",
-        "@mercuryworkshop/libcurl-transport": "^1.2.0",
+        "@mercuryworkshop/libcurl-transport": "^1.2.1",
         "@nebula-services/dynamic": "0.7.2-patch.2",
         "@titaniumnetwork-dev/ultraviolet": "^3.0.0",
+        "@tomphttp/bare-client": "workspace:*",
         "@tomphttp/bare-server-node": "^2.0.3",
         "chalk": "^5.3.0",
         "fastify": "^4.26.2",

package.json

@@ -20,13 +20,16 @@ function bareChange(value) {
         description : 'Ruby Config for things in sw'
     });
     localforage.setItem('bare', value).then(function (value) {
-        if (!value.endsWith('/')) { value += '/'; localforage.setItem('bare', value); localStorage.setItem('bare', value); }
+        if (value === "") { value = window.location.origin + '/bare/'; localforage.setItem('bare', value); localStorage.setItem('bare', value); }
+        if (!value.endsWith('/')) { value += '/'; localforage.setItem('bare', value); localStorage.setItem('bare', value);}
         if (!value.startsWith('http://') && !value.startsWith('https://') && value !== '/bare/' && value !== '/bare') { value = 'https://' + value; localforage.setItem('bare', value); localStorage.setItem('bare', value); }
         if (value === '/bare/' || value === '/bare') { value = window.location.origin + value; localforage.setItem('bare', value); localStorage.setItem('bare', value); }
+        setBareTransport(localStorage.getItem('bare'));
+        setItems();
     }).catch(function(err) {
         console.log(err);
     });
-    uninstallAllSW()
+    //uninstallAllSW()
 }
 
 function uninstallAllSW() {