Skip to content

Commit 6d07877

Browse files
Only allow pnpm, setInterval is now a minute, use latest commit version of epoxytransport for error stuff
1 parent a0ee691 commit 6d07877

5 files changed

Lines changed: 14 additions & 4 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "epoxytransport"]
2+
path = epoxytransport
3+
url = https://github.com/mercuryworkshop/epoxytransport

epoxytransport

Submodule epoxytransport added at c5ed7e2

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
"license": "AGPL-3.0-only",
66
"author": "Ruby Network",
77
"scripts": {
8+
"preinstall": "npx -y only-allow pnpm",
89
"dev": "bundle exec rerun --ignore 'src/public/css/*' --signal 'TERM' -c -w 5 --no-notify -- puma",
910
"start": "bundle exec puma -e production",
10-
"install": "bundle install",
11+
"install": "pnpm run build && bundle install",
1112
"build:rh": "tsc -p ./rammerhead/tsconfig.json",
13+
"build:epoxytransport": "cd ./epoxytransport/ && npm run build",
14+
"build": "pnpm run build:rh && pnpm run build:epoxytransport",
1215
"cli": "bundle exec ruby ./cli/cli.rb"
1316
},
1417
"engines": {
@@ -19,7 +22,7 @@
1922
"@fastify/http-proxy": "^9.2.1",
2023
"@fastify/middie": "^8.3.0",
2124
"@mercuryworkshop/bare-mux": "^1.0.4",
22-
"@mercuryworkshop/epoxy-transport": "^1.0.2",
25+
"@mercuryworkshop/epoxy-transport": "workspace:*",
2326
"@nebula-services/dynamic": "^0.7.2-patch.2",
2427
"@titaniumnetwork-dev/ultraviolet": "^3.0.0",
2528
"@tomphttp/bare-server-node": "^2.0.0",

pnpm-workspace.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
packages:
2+
- 'epoxytransport'
3+
- 'bare-as-module3'

src/public/js/transports.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ function recreateTransports() {
2626
setTransports();
2727
}
2828

29-
//run recreateTransports every 2 minutes
30-
setInterval(recreateTransports, 120000);
29+
//run recreateTransports every 1 minute to update transport setting
30+
setInterval(recreateTransports, 60000);
3131

3232
function setEpoxyTransport() {
3333
BareMux.SetTransport('EpxMod.EpoxyClient', { wisp: localStorage.getItem('wispUrl') || wispUrl });

0 commit comments

Comments
 (0)