Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(webapp): turn off remote multiplayer mode in production #331

Merged
merged 1 commit into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions packages/webapp/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,23 +85,7 @@ body {
overflow-x: hidden;
}

body {
color: rgb(var(--foreground-rgb));
background: linear-gradient(
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb));
}

a {
color: inherit;
text-decoration: none;
}

@media (prefers-color-scheme: dark) {
html {
color-scheme: dark;
}
}
230 changes: 0 additions & 230 deletions packages/webapp/src/app/page.module.css

This file was deleted.

50 changes: 10 additions & 40 deletions packages/webapp/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,46 +1,16 @@
import Image from "next/image";
import styles from "./page.module.css";
import DevView from "@/components/DevView";

export default function Home() {
return (
<main className={styles.main}>
<div className={styles.description}>
<p>
Get started by editing&nbsp;
<code className={styles.code}>src/app/page.tsx</code>
</p>
<div>
<a
href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
By{" "}
<Image
src="/vercel.svg"
alt="Vercel Logo"
className={styles.vercelLogo}
width={100}
height={24}
priority
/>
</a>
</div>
</div>

<div className={styles.center}>
<Image
className={styles.logo}
src="/next.svg"
alt="Next.js Logo"
width={180}
height={37}
priority
/>
</div>
const getIsLocal = async () => {
'use server'
// Production is not ready for remote multiplayer yet.
return process.env.NODE_ENV === 'production';
}

<DevView />
export default async function Home() {
const isLocal = await getIsLocal();
return (
<main>
<DevView isLocal={isLocal} />
</main>
);
}
16 changes: 10 additions & 6 deletions packages/webapp/src/components/BoardGame.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Client, BoardProps } from 'boardgame.io/react';
import { SocketIO } from 'boardgame.io/multiplayer'
import { SocketIO, Local } from 'boardgame.io/multiplayer'
import { OpenStarTerVillage } from '@/game';
import Table from '@/components/Table/Table';
import Players from '@/components/Players/Players';
Expand All @@ -15,10 +15,14 @@ const Board: React.FC<BoardProps<OpenStarTerVillageType.State.Root>> = (props) =
);
}

const Boardgame = Client({
game: OpenStarTerVillage,
board: Board,
multiplayer: SocketIO({ server: 'localhost:8000' }),
});
const Boardgame: React.FC<{ isLocal: boolean} & React.ComponentProps<ReturnType<typeof Client>>> = ({ isLocal, ...props }) => {
const multiplayer = isLocal ? Local() : SocketIO({ server: 'localhost:8000' });

const BoardgameComponent = Client({ game:OpenStarTerVillage,
board: Board,
multiplayer,
})
return <BoardgameComponent {...props} />;
}

export default Boardgame;
8 changes: 4 additions & 4 deletions packages/webapp/src/components/DevView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
import { Box, Typography } from '@mui/material';
import Boardgame from '@/components/BoardGame';

function DevView() {
function DevView({ isLocal }: { isLocal: boolean }) {
return (
<>
<Box ml={2} mt={2}>
<Typography variant="h4">Player 0 view</Typography>
<Boardgame playerID="0" />
<Boardgame isLocal={isLocal} playerID="0" />
</Box>
<Box ml={2} mt={2}>
<Typography variant="h4">Player 1 view</Typography>
<Boardgame playerID="1" />
<Boardgame isLocal={isLocal} playerID="1" />
</Box>
<Box ml={2} mt={2}>
<Typography variant="h4">Observer view</Typography>
<Boardgame />
<Boardgame isLocal={isLocal} />
</Box>
</>
);
Expand Down
15 changes: 5 additions & 10 deletions packages/webapp/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { OpenStarTerVillage } from "./game";

async function serve() {
const port = Number(process.env.PORT) || 8000;
const apiPort = Number(process.env.API_PORT) || 8080;
const dev = process.env.NODE_ENV !== "production";

console.log(`Starting server on port ${port} in ${dev ? 'dev' : 'production'} mode...`);

const server = Server({
games: [OpenStarTerVillage],
Expand All @@ -12,19 +14,12 @@ async function serve() {
Origins.LOCALHOST_IN_DEVELOPMENT,
],
});
const mainServerConfig = {
const config = {
port,
callback: () => console.log(`Main server running on port ${port}...`),
};
const lobbyConfig = {
apiPort,
apiCallback: () => console.log(`Lobby api running on port ${apiPort}`),
};

server.run({
...mainServerConfig,
lobbyConfig,
});
server.run(config);
}

serve();
Loading