Skip to content

Commit c9ab053

Browse files
committed
Removed obsolete env configs
1 parent 5d8dd0e commit c9ab053

File tree

8 files changed

+9
-41
lines changed

8 files changed

+9
-41
lines changed

client/build/prod.config.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

client/public/static/config.example

Lines changed: 0 additions & 3 deletions
This file was deleted.

client/src/bootstrap.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import alerts from "~brixi/controllers/alerts";
22

33
(async () => {
4-
// @ts-ignore
5-
const { ENV } = await import("/static/config.js");
6-
if (ENV === "production"){
4+
if (location.host == "tabletopper.app"){
75
let update = false;
86
await new Promise<void>(resolve => {
97
navigator.serviceWorker.register("/service-worker.js", { scope: "/" });

client/src/controllers/ws.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ let socket:WebSocket;
55
let connected = false;
66
let wasReconnection = false;
77

8+
let SOCKET_URL:string = "ws://ws.tabletopper.local";
9+
if (location.host == "tabletopper.app") {
10+
SOCKET_URL = "wss://ws.tabletopper.app";
11+
}
12+
813
let offlineQueue = [];
914
function flushOfflineQueue(){
1015
while (offlineQueue.length > 0){
@@ -17,8 +22,7 @@ async function connect() {
1722
if (connected){
1823
return;
1924
}
20-
// @ts-expect-error
21-
const { SOCKET_URL } = await import("/static/config.js");
25+
2226
socket = new WebSocket(SOCKET_URL);
2327
socket.addEventListener("message", async (event) => {
2428
try {

wss/.env.example

Lines changed: 0 additions & 4 deletions
This file was deleted.

wss/package-lock.json

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wss/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"typescript": "^4.5.4"
77
},
88
"dependencies": {
9-
"dotenv": "^10.0.0",
109
"uuid": "^8.3.2"
1110
},
1211
"scripts": {

wss/src/index.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
import * as uws from "../uws/uws.js";
2-
import dotenv from "dotenv";
32
import gm from "./game.js";
43
import { TextDecoder } from "util";
54

65
const decoder = new TextDecoder("utf-8");
7-
dotenv.config();
8-
const port = process.env.PORT;
9-
let app;
10-
if (process.env.ENV === "dev"){
11-
// @ts-ignore
12-
app = uws.App();
13-
}
14-
else {
15-
// @ts-ignore
16-
app = uws.SSLApp({
17-
key_file_name: process.env.KEY,
18-
cert_file_name: process.env.CERT,
19-
});
20-
}
6+
let app = uws.App();
217

228
app.ws("/*", {
239
// @ts-ignore
@@ -40,4 +26,4 @@ app.ws("/*", {
4026
},
4127
});
4228

43-
app.listen("127.0.0.1", port, {}, (token) => {});
29+
app.listen("127.0.0.1", 8080, {}, (token) => {});

0 commit comments

Comments
 (0)