change folder structure

UPDATE_LEAN.sh

@@ -9,10 +9,10 @@ cd adam
 lake update
 
 cp lake-packages/mathlib/lean-toolchain lean-toolchain
-cp lake-packages/mathlib/lean-toolchain ../leanserver/lean-toolchain
+cp lake-packages/mathlib/lean-toolchain ../lean-toolchain
 cp lake-packages/mathlib/lean-toolchain ../nng/lean-toolchain
 
-cd ../leanserver
+cd ../
 lake update
 
 cd ../nng

package.json

@@ -58,7 +58,7 @@
   },
   "scripts": {
     "start": "concurrently -n server,client -c blue,green \"npm run start_server\" \"npm run start_client\"",
-    "start_server": "cd server && (cd leanserver && lake build) && (cd adam && lake exe cache get && lake build)  && (cd nng && lake build) && NODE_ENV=development nodemon -e mjs --exec \"node ./index.mjs\"",
+    "start_server": "cd server && lake build && (cd adam && lake exe cache get && lake build)  && (cd nng && lake build) && NODE_ENV=development nodemon -e mjs --exec \"node ./index.mjs\"",
     "start_client": "NODE_ENV=development webpack-dev-server --hot",
     "build": "npm run build_server && npm run build_client",
     "build_server": "server/build.sh",

server/.gitignore

@@ -0,0 +1,3 @@
+build
+adam
+nng

server/GameServer/RpcHandlers.lean

@@ -28,7 +28,7 @@ def levelIdFromFileName? (initParams : Lsp.InitializeParams) (fileName : String)
   return none
 
 def gameDirFromInitParams (initParams : Lsp.InitializeParams) : Option String :=
-  (splitRootUri initParams 0).map (s!"../../../{·}")
+  (splitRootUri initParams 0).map (s!"../../{·}")
 
 def getLevelByFileName? [Monad m] [MonadEnv m] (initParams : Lsp.InitializeParams) (fileName : String) : m (Option GameLevel) := do
   let some levelId := levelIdFromFileName? initParams fileName

server/GameServer/Watchdog.lean

@@ -99,7 +99,7 @@ def initAndRunWatchdog (args : List String) (i o e : FS.Stream) : IO Unit := do
     throwServerError s!"Expected 3 command line arguments in addition to `--server`:
       game directory, the name of the main module, and the name of the game"
   let gameId := args[1]!
-  let gameDir := s!"../../../{gameId}"
+  let gameDir := s!"../../{gameId}"
   let module := args[2]!
   let gameName := args[3]!
   let workerPath := "./gameserver"

server/index.mjs

@@ -43,7 +43,7 @@ function startServerProcess(gameId) {
     const serverProcess = isDevelopment
         ? cp.spawn("./gameserver",
             ["--server", gameId, games[gameId].module, games[gameId].name],
-            { cwd: "./leanserver/build/bin/" })
+            { cwd: "./build/bin/" })
         : cp.spawn("docker",
             ["run", "--runtime=runsc", "--network=none", "--rm", "-i", `${gameId}:latest`,
               "./gameserver", "--server", gameId, games[gameId].module, games[gameId].name],

server/leanserver/.gitignore

@@ -1 +0,0 @@
-build

server/server.Dockerfile

@@ -4,12 +4,16 @@ FROM elan:latest
 WORKDIR /
 
 # Copy lean files
-COPY leanserver ./leanserver
+COPY GameServer ./GameServer
+COPY Main ./Main
+COPY lakefile.lean ./lakefile.lean
+COPY lake-manifest.lean ./lake-manifest.lean
+COPY lean-toolchain ./lean-toolchain
 COPY $GAME_DIR ./$GAME_DIR
 # TODO: make `adam` a build argument
 
-WORKDIR /leanserver
+WORKDIR /
 RUN rm -f ./build/bin/gameserver
 RUN lake build
 
-WORKDIR /leanserver/build/bin/
+WORKDIR /build/bin/