Skip to content

Commit f1a90d8

Browse files
Hotfix: fix uv
1 parent d6fe5b6 commit f1a90d8

File tree

9 files changed

+25
-5
lines changed

9 files changed

+25
-5
lines changed

.bundle/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
BUNDLE_PATH: "vendor/"
3-
BUNDLE_WITHOUT: "development"
3+
BUNDLE_WITH: "development"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ pnpm-lock.yaml
55
Gemfile.lock
66
.env
77
settings.yml
8-
.bundle/
8+
.bundle/config
99
vendor/
1010
.ruby-version

node-server/server-dev.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const settings = YAML.parse(fs.readFileSync(path.join(__dirname, '/config/settin
1313
import chalk from 'chalk';
1414
import compile from './compile.js';
1515
import wisp from 'wisp-server-node';
16+
import fastifyCaching from '@fastify/caching'
1617
//import getLatestRelease from './version.js';
1718
let rubyPort = process.argv.find((arg) => arg.startsWith('--ruby-port')).split('=')[1] || 9292;
1819
let nodePort = process.argv.find((arg) => arg.startsWith('--node-port')).split('=')[1] || 9293;
@@ -57,7 +58,10 @@ const proxyHandler = (handler, opts) => {
5758
};
5859

5960
const app = Fastify({ logger: false, serverFactory: proxyHandler })
60-
await app
61+
await app
62+
.register(fastifyCaching, {
63+
privacy: fastifyCaching.privacy.NOCACHE
64+
})
6165
.register(fastifyHttpProxy, {
6266
upstream: 'http://localhost:9292',
6367
prefix: '/',

node-server/server.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import chalk from 'chalk';
1414
import compile from './compile.js';
1515
import getLatestRelease from './version.js';
1616
import wisp from 'wisp-server-node';
17+
import fastifyCaching from '@fastify/caching';
1718
let rubyPort = process.argv.find((arg) => arg.startsWith('--ruby-port')).split('=')[1] || 9292;
1819
let nodePort = process.argv.find((arg) => arg.startsWith('--node-port')).split('=')[1] || 9293;
1920

@@ -58,6 +59,9 @@ const proxyHandler = (handler, opts) => {
5859

5960
const app = Fastify({ logger: false, serverFactory: proxyHandler })
6061
await app
62+
.register(fastifyCaching, {
63+
privacy: fastifyCaching.privacy.NOCACHE
64+
})
6165
.register(fastifyHttpProxy, {
6266
upstream: 'http://localhost:9292',
6367
prefix: '/',

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"node": ">=18.0.0"
1616
},
1717
"dependencies": {
18+
"@fastify/caching": "^8.3.0",
1819
"@fastify/http-proxy": "^9.2.1",
1920
"@fastify/middie": "^8.3.0",
2021
"@mercuryworkshop/bare-mux": "^1.0.4",

src/public/css/style.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/public/js/register.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//uv SW
55
await navigator.serviceWorker.register('/js/sw/uv.js', { scope: '/js/sw/service/uv/' })
66
await navigator.serviceWorker.register('/js/sw/dynamic.js', { scope: '/js/sw/service/dynamic/' })
7+
BareMux.registerRemoteListener(navigator.serviceWorker.controller);
78
setDefaultTransport();
89
});
910
function regSW() {

src/public/js/transports.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,18 @@ function setDefaultTransport() {
1717
localStorage.setItem('transports', 'epoxy');
1818
setEpoxyTransport();
1919
}
20+
else {
21+
setTransports();
22+
}
23+
}
24+
25+
function recreateTransports() {
26+
setTransports();
2027
}
2128

29+
//run recreateTransports every ten minutes
30+
setInterval(recreateTransports, 600000);
31+
2232
function setEpoxyTransport() {
2333
BareMux.SetTransport('EpxMod.EpoxyClient', { wisp: localStorage.getItem('wispUrl') || wispUrl });
2434
}

src/public/sass/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
flex-direction: row;
300300
flex-wrap: wrap;
301301
gap: 20px;
302-
height: calc(100vh + 20%);
302+
height: calc(100vh + 30%);
303303
#tile-container {
304304
display: flex;
305305
align-items: center;

0 commit comments

Comments
 (0)