fix: use hash for custom URLs

cfoust · Nov 1, 2024 · 21f0541 · 21f0541
1 parent 9abb0fe
commit 21f0541
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/client/build b/client/build
@@ -5,5 +5,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 yarn install
 
-trap 'kill $(jobs -p)' EXIT
 yarn serve
diff --git a/client/scripts/serve b/client/scripts/serve
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIST_DIR="$SCRIPT_DIR/../dist"
 SRC_DIR="$SCRIPT_DIR/../src"
@@ -14,17 +16,18 @@ ensure_link() {
   fi
 }
 
-ensure_link "$SRC_DIR/index.html" "$DIST_DIR/index.html"
-ensure_link "$SRC_DIR/favicon.ico" "$DIST_DIR/favicon.ico"
-ensure_link "$SRC_DIR/background.png" "$DIST_DIR/background.png"
-if [ -z "$IN_DOCKER" ]; then
-  ensure_link "$SRC_DIR/../../../build/game" "$DIST_DIR/game"
-  ensure_link "$SRC_DIR/../../../build/assets" "$DIST_DIR/assets"
+SITE_DIR="$SCRIPT_DIR/../../pkg/server/static/site"
+
+if [ -d "$SITE_DIR" ]; then
+  rm -rf "$SITE_DIR"
 fi
+mkdir -p "$SITE_DIR"
+
 cd "$SCRIPT_DIR/../"
+yarn build
 
-export SOUR_CONFIG="$(cat $SCRIPT_DIR/../../../config/config.json | jq '.client')"
-yarn serve:site &
-cd dist
-trap 'kill $(jobs -p)' EXIT
-cat
+cp "$SRC_DIR/index.html" "$SITE_DIR/index.html"
+cp "$SRC_DIR/favicon.ico" "$SITE_DIR/favicon.ico"
+cp "$SRC_DIR/background.png" "$SITE_DIR/background.png"
+cp -r "$SRC_DIR/../../game/dist/game" "$SITE_DIR"
+cp "$DIST_DIR"/* "$SITE_DIR"
diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -129,9 +129,9 @@ const DELAY_AFTER_LOAD: CubeMessageType[] = [
   CubeMessageType.N_SPAWN,
 ]
 
-const SERVER_URL_REGEX = /\/server\/([\w.]+)\/?(\d+)?/
-const MAP_URL_REGEX = /\/map\/(\w+)/
-const DEMO_URL_REGEX = /\/demo\/(\w+)/
+const SERVER_URL_REGEX = /#\/server\/([\w.]+)\/?(\d+)?/
+const MAP_URL_REGEX = /#\/map\/(\w+)/
+const DEMO_URL_REGEX = /#\/demo\/(\w+)/
 
 let loadedMods: string[] = []
 let failedMods: string[] = []
@@ -597,11 +597,11 @@ function App() {
       }
 
       const {
-        location: { search: params, pathname, hash },
+        location: { search: params, hash },
       } = window
 
-      const serverDestination = SERVER_URL_REGEX.exec(pathname)
-      const mapDestination = MAP_URL_REGEX.exec(pathname)
+      const serverDestination = SERVER_URL_REGEX.exec(hash)
+      const mapDestination = MAP_URL_REGEX.exec(hash)
       if (serverDestination != null) {
         const [, hostname, port] = serverDestination
         if (port == null) {
@@ -612,14 +612,14 @@ function App() {
       } else if (mapDestination != null) {
         const [, mapId] = mapDestination
         BananaBread.execute(`map ${mapId}`)
-      } else if (pathname.startsWith('/demo/')) {
+      } else if (hash.startsWith('/demo/')) {
         // First check the fragment for a URL
         if (hash.length !== 0) {
           const url = hash.slice(1)
           remoteConnected = true
           playDemoURL(url, 'from-url')
         } else {
-          const demoDestination = DEMO_URL_REGEX.exec(pathname)
+          const demoDestination = DEMO_URL_REGEX.exec(hash)
           if (demoDestination != null) {
             const [, demoId] = demoDestination
             const [serverURL] = CONFIG.servers
@@ -628,12 +628,12 @@ function App() {
             remoteConnected = true
             playDemoURL(demoURL, demoId)
           } else {
-            pushURLState('/')
+            pushURLState('#')
           }
         }
       } else {
         // It should not be anything else
-        pushURLState('/')
+        pushURLState('#')
       }
 
       const parsedParams = new URLSearchParams(params)
@@ -658,11 +658,11 @@ function App() {
     const updateServerURL = (name: string, port: number) => {
       // Sour server
       if (port === 0) {
-        pushURLState(`/server/${name}`)
+        pushURLState(`#/server/${name}`)
         return
       }
 
-      pushURLState(`/server/${name}/${port}`)
+      pushURLState(`#/server/${name}/${port}`)
     }
 
     Module.onConnect = () => {}
@@ -673,7 +673,7 @@ function App() {
 
     Module.loadedMap = (name: string) => {
       if (remoteConnected) return
-      pushURLState(`/map/${name}`)
+      pushURLState(`#/map/${name}`)
     }
 
     let lastPointer: number = 0