Compare commits

...

79 Commits

Author SHA1 Message Date
5e9b145066 version bump 2025-09-08 22:54:43 -04:00
7d45a36f93 fix div bug 2025-09-08 22:54:10 -04:00
fb3f567a5b bugs bashed 2025-09-08 22:45:42 -04:00
41bd1fce38 add brainmade logo 2025-09-08 21:29:19 -04:00
ed42c831de [wip] gameplay works but config not respected 2025-09-07 23:31:19 -04:00
ae6a79aadd [wip] configs are synced but gameplay is broken 2025-09-07 22:56:56 -04:00
46002403c8 really solid 2025-09-06 23:22:58 -04:00
b854fec9e5 [wip] extractProperty proper typing with union types 2025-09-06 17:30:47 -04:00
bedafb0b7c portal to decorate players by ref instead of ID 2025-09-06 16:54:03 -04:00
9e3697ffef better plumbing for games frontend 2025-09-04 23:48:49 -04:00
b3e040f03f errors 2025-09-03 22:50:32 -04:00
46e7b60ade deploy 2025-09-03 21:16:19 -04:00
ce29ab72ae scaling 2025-09-03 21:14:54 -04:00
d203fe4141 better fanned hands 2025-09-02 23:21:48 -04:00
67fdf66cd4 depth for card piles 2025-09-02 22:38:04 -04:00
9919b97931 hotfix: version bump 2025-09-01 22:55:01 -04:00
fd342e7d47 no db 2025-09-01 22:53:57 -04:00
b433a26fc6 result states 2025-08-31 22:23:30 -04:00
0ea16ead64 hotfix: font size in em 2025-08-31 10:06:46 -04:00
11f21221ee we did it 2025-08-30 22:30:31 -04:00
01a12ec58a [wip] so close; check the ws messages 2025-08-30 18:24:08 -04:00
782dd738cc [wip] im tired boss 2025-08-30 15:49:55 -04:00
5e33e33cce [wip] kefir cleanup 2025-08-29 23:50:23 -04:00
90be478e9a css cleanup 2025-08-29 21:57:03 -04:00
f38a5a69df package -> pkg 2025-08-29 20:54:18 -04:00
0d6d3d6d32 starting to abstract the game 2025-08-28 22:20:24 -04:00
d69336027a holding cards, kinda 2025-08-27 23:04:49 -04:00
686529507e basic hand viewing 2025-08-26 21:42:44 -04:00
aeb7d9174b quitting working but suspiciously 2025-08-26 19:13:09 -04:00
e5f432dc98 housekeeping 2025-08-26 18:37:27 -04:00
0f015841ff when in doubt make it a property I guess 2025-08-25 22:37:42 -04:00
6c45e7b114 bug fixes 2025-08-25 18:36:59 -04:00
a117f6703f lots of necessary plumbing 2025-08-24 22:04:29 -04:00
4bcf071668 fix multi tab presence 2025-08-24 15:09:58 -04:00
6c64886f2a super minor 2025-08-24 14:03:55 -04:00
9b918b1c6a hotfix 2025-08-24 13:59:16 -04:00
3347452ec4 end to end! 2025-08-23 20:33:52 -04:00
a2e8887a0b lots more kefir tinkering 2025-08-23 17:34:50 -04:00
cc53470ddf deep in kefir lore 2025-08-22 00:19:40 -04:00
7d8ac0db76 around the table 2025-08-21 00:27:58 -04:00
35a5af154f cooking with kefir 2025-08-20 21:56:23 -04:00
265aad4522 checkpoint 2025-08-19 22:19:24 -04:00
287c19fc0d cooking with websockets 2025-08-18 23:31:28 -04:00
3f1635880a tokens fr 2025-08-18 17:47:39 -04:00
601e3660d3 has to be a new version 2025-08-17 22:43:01 -04:00
f5de37523a better logging 2025-08-17 22:26:41 -04:00
e30adf8d82 track migrations, whoops 2025-08-17 22:15:31 -04:00
00779b6515 use the right url 2025-08-17 21:47:29 -04:00
e58b702bc4 idk cors 2025-08-17 20:50:15 -04:00
ac48d43827 less restrictive cors 2025-08-17 20:33:14 -04:00
0484ca6fc1 force redeploy 2025-08-17 20:13:20 -04:00
ef5a5e059a ""auth"" working nicely 2025-08-17 19:57:55 -04:00
c755b83d3d can change name 2025-08-16 00:15:07 -05:00
1c915d1713 some proper auth 2025-08-15 15:27:24 -05:00
4419dd7acc style cleanup 2025-08-12 19:42:30 -04:00
01d1571b0e works I guess? 2025-08-11 23:41:48 -04:00
bfb4fd3a63 Merge branch 'prod' into dev 2025-08-11 22:31:10 -04:00
e12def2e10 use older vite 2025-08-10 21:22:41 -04:00
eed6db3373 build ready (I hope) 2025-08-10 18:53:00 -04:00
a8a6d02cc7 build ready (I hope) 2025-08-10 18:46:45 -04:00
32c516bf37 working e2e 2025-08-10 12:40:02 -04:00
5e8978c550 closer 2025-08-09 15:48:14 -04:00
2ff5d781fd wip but I need to sleep 2025-08-09 01:40:42 -04:00
a7e339a8ce prisma experiment 2025-08-08 23:31:07 -04:00
96df75972a elysia is the truth 2025-08-08 22:44:39 -04:00
fb204e8869 housekeeping 2025-08-08 21:44:08 -04:00
eb064273ed full e2e behavior, nice 2025-08-08 00:04:46 -04:00
9d4b17b762 lets fuckin go 2025-08-07 22:44:33 -04:00
a90a914d2f works! 2025-08-07 19:16:57 -04:00
e9b8258fd9 getting there 2025-08-06 23:44:06 -04:00
839d596b55 basic shape 2025-08-06 23:29:55 -04:00
3891e8b85b deployment 2025-08-06 00:08:18 -04:00
2ce46088d5 cooking with sqlite 2025-08-05 23:49:13 -04:00
9277089e04 remove arangojs 2025-08-05 19:33:18 -04:00
0263ee9a4f setup prisma<>sqlite 2025-08-05 19:31:41 -04:00
5fd0df8135 arangodb 2025-08-05 00:26:05 -04:00
5527506cb9 something 2025-08-04 00:16:33 -04:00
0dc0a9ce62 can put them back 2025-08-03 22:16:19 -04:00
5f05eb4adf favicon 2025-08-03 17:59:25 -04:00
75 changed files with 4456 additions and 5085 deletions

View File

@@ -1,9 +0,0 @@
node_modules
Dockerfile
Makefile
README.md
.output
.vinxi
.git
.gitignore
.dockerignore

3
.gitignore vendored
View File

@@ -1,5 +1,8 @@
.output .output
.vinxi .vinxi
*.db
.DS_STORE
# ---> Node # ---> Node
# Logs # Logs

1
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1 @@
{}

View File

@@ -1,11 +0,0 @@
FROM node:22-alpine
WORKDIR /app
EXPOSE 3000
COPY package.json ./
RUN --mount=type=cache,target=/root/.npm npm install
COPY . .
RUN --mount=type=cache,target=/app/.vinxi npm run build
CMD ["npm", "run", "start"]

View File

@@ -1,40 +0,0 @@
FROM arm64v8/node:22 AS base
ENV SHARP_IGNORE_GLOBAL_CLI_BINARIES=1
ENV VIPS_DISABLE_DEPS=1
ENV PNPM_SCRIPT_RUNNER_ALLOW_BUILD=true
RUN corepack enable
WORKDIR /app
FROM base AS builder
COPY package.json pnpm-lock.yaml ./
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --dangerously-allow-all-builds
COPY . .
# ^ copy source code
RUN --mount=type=cache,target=/app/.vinxi pnpm run build
# ^ produces .output (build artifact) and .vinxi (build cache)
FROM base AS production_builder
RUN apt-get update && apt-get install -y jq
COPY --from=builder /app/package.json ./
RUN jq 'del(.devDependencies)' package.json > package.prod.json
COPY --from=builder /app/pnpm-lock.yaml ./
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile --dangerously-allow-all-builds
# Prod image
FROM arm64v8/node:22-alpine
ENV SHARP_IGNORE_GLOBAL_CLI_BINARIES=1
ENV VIPS_DISABLE_DEPS=1
ENV PNPM_SCRIPT_RUNNER_ALLOW_BUILD=true
RUN corepack enable
WORKDIR /app
COPY --from=production_builder /app/package.prod.json ./package.json
COPY --from=production_builder /app/pnpm-lock.yaml ./pnpm-lock.yaml
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
COPY --from=builder /app/.output ./.output
EXPOSE 3000
CMD ["npm", "run", "start"]

View File

@@ -1,13 +1,15 @@
SHELL := /bin/bash SHELL := /bin/bash
build: build:
sudo docker buildx build --load \ pnpm install
--cache-from=type=local,src=/var/cache/docker-build \ pnpm run -F client build
--cache-to=type=local,dest=/var/cache/docker-build \ pnpm run -F server dbdeploy
--platform linux/arm64 \ pnpm run -F server dbtypes
--progress=plain \
--tag games .
start: start:
sudo docker run -p $(PORT):3000 -t games PORT=$(PORT) pnpm start
note:
./notes/newfile
# touch ./notes/$$file.md
# code -r ./notes/$$file.md

View File

@@ -1,32 +1 @@
# SolidStart games!!!
Everything you need to build a Solid project, powered by [`solid-start`](https://start.solidjs.com);
## Creating a project
```bash
# create a new project in the current directory
npm init solid@latest
# create a new project in my-app
npm init solid@latest my-app
```
## Developing
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
```bash
npm run dev
# or start the server and open the app in a new browser tab
npm run dev -- --open
```
## Building
Solid apps are built with _presets_, which optimise your project for deployment to different environments.
By default, `npm run build` will generate a Node app that you can run with `npm start`. To use a different preset, add it to the `devDependencies` in `package.json` and specify in your `app.config.js`.
## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)

View File

@@ -1,3 +0,0 @@
import { defineConfig } from "@solidjs/start/config";
export default defineConfig({});

BIN
assets/sources/cards.png LFS Normal file

Binary file not shown.

View File

@@ -1 +0,0 @@
../sources/Card_back_01.svg

View File

@@ -1 +0,0 @@
../sources/Vector-Cards-Version-3.2/FACES (BORDERED)/STANDARD BORDERED/Single Cards (One Per FIle)/

7
deploy Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
branch=$(git branch --show-current)
git switch prod
git merge $branch
git push
git switch $branch

7
notes/newfile Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
ts=$(date +"%Y-%m-%d-%H%M%S")
file=./notes/$ts.md
touch $file
echo -e "# $ts\n" > $file
echo "$file:end"
code --goto "$file:2"

View File

@@ -1,19 +1,21 @@
{ {
"name": "games", "name": "games",
"type": "module", "type": "module",
"version": "0.0.2", "version": "0.0.10",
"scripts": { "scripts": {
"dev": "vinxi dev", "dev": "pnpm --parallel dev",
"build": "vinxi build", "build": "pnpm run -F client build",
"start": "vinxi start" "start": "pnpm run -F server start"
}, },
"dependencies": { "pnpm": {
"@solidjs/router": "^0.15.3", "overrides": {
"@solidjs/start": "^1.1.0", "object-hash": "^3.0.0"
"solid-js": "^1.9.5", },
"vinxi": "^0.5.7" "onlyBuiltDependencies": [
"esbuild"
]
}, },
"engines": { "devDependencies": {
"node": ">=22" "@types/object-hash": "^3.0.6"
} }
} }

9
pkg/client/index.html Normal file
View File

@@ -0,0 +1,9 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
<script type="module" src="/src/app.tsx"></script>
</head>
<body />
</html>

32
pkg/client/package.json Normal file
View File

@@ -0,0 +1,32 @@
{
"name": "@games/client",
"type": "module",
"version": "0.0.4",
"scripts": {
"dev": "vite --port 3000",
"build": "vite build"
},
"dependencies": {
"@elysiajs/eden": "^1.3.2",
"@solid-primitives/memo": "^1.4.3",
"@solid-primitives/scheduled": "^1.5.2",
"@solid-primitives/storage": "^4.3.3",
"@solidjs/router": "^0.15.3",
"color2k": "^2.0.3",
"js-cookie": "^3.0.5",
"kefir": "^3.8.8",
"kefir-bus": "^2.3.1",
"object-hash": "^3.0.0",
"solid-js": "^1.9.5"
},
"devDependencies": {
"@iconify-json/solar": "^1.2.4",
"@types/js-cookie": "^3.0.6",
"@types/kefir": "^3.8.11",
"@unocss/preset-icons": "^66.4.2",
"@unocss/preset-wind4": "^66.4.2",
"unocss": "^66.4.2",
"vite": "^4.4.9",
"vite-plugin-solid": "^2.11.8"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@@ -0,0 +1 @@
../../../../assets/sources/Card_back_01.svg

View File

@@ -0,0 +1 @@
../../../../assets/sources/Vector-Cards-Version-3.2/FACES (BORDERED)/STANDARD BORDERED/Single Cards (One Per FIle)

14
pkg/client/src/api.ts Normal file
View File

@@ -0,0 +1,14 @@
import { treaty } from "@elysiajs/eden";
import { fromEvents } from "kefir";
import { type Api } from "@games/server/src/api";
const { api } = treaty<Api>(
import.meta.env.DEV ? "http://localhost:5001" : window.location.origin,
{
fetch: { credentials: "include" },
}
);
export default api;
export const fromWebsocket = <T>(ws: any) =>
fromEvents(ws, "message").map((evt) => (evt as unknown as { data: T }).data);

59
pkg/client/src/app.tsx Normal file
View File

@@ -0,0 +1,59 @@
import { makePersisted } from "@solid-primitives/storage";
import { Route, Router } from "@solidjs/router";
import pkg from "^/package.json";
import { createSignal, lazy, Suspense } from "solid-js";
import { render } from "solid-js/web";
import "virtual:uno.css";
import "./style.css";
import { name, setName } from "./profile";
const Profile = () => {
let dialogRef!: HTMLDialogElement;
return (
<>
<div
onClick={() => dialogRef.showModal()}
class="i-solar-user-circle-bold button s-10 m-2 cursor-pointer fixed tr"
/>
<dialog ref={dialogRef} closedby="any">
<div class="fixed tr bg-emerald-100 m-2 p-4 rounded-xl border-2 shadow-md shadow-black">
Name:{" "}
<input
value={name()}
onChange={(e) => {
dialogRef.close();
setName(e.target.value);
}}
class="bg-emerald-200 border-1.5 rounded-full px-4"
/>
</div>
</dialog>
</>
);
};
const App = () => {
return (
<Router
root={(props) => (
<>
<Suspense>{props.children}</Suspense>
<Profile />
<span class="fixed br m-2 font-mono text-xs">
{"v" + pkg.version}
</span>
</>
)}
>
<Route path="/" component={lazy(() => import("./routes/index"))} />
<Route
path="/t/:tableKey"
component={lazy(() => import("./routes/[table]"))}
/>
</Router>
);
};
render(App, document.getElementsByTagName("body")[0]);

View File

@@ -0,0 +1,54 @@
import { Component, Suspense } from "solid-js";
import type { Card } from "@games/shared/cards";
import { Clickable, Scalable, Stylable } from "./toolbox";
const cardToSvgFilename = (card: Card) => {
if (card.kind == "joker") {
return `JOKER-${card.color == "black" ? "2" : "3"}`;
}
const value =
{ ace: 1, jack: 11, queen: 12, king: 13 }[
card.rank as "ace" | "jack" | "queen" | "king" // fuck you typescript
] ?? (card.rank as number);
return `${card.suit.toUpperCase()}-${value}${
value >= 11 ? "-" + (card.rank as string).toUpperCase() : ""
}`;
};
export const CARD_RATIO = 1.456730769;
export const BASE_CARD_WIDTH = 100;
export default ((props) => {
const width = () => BASE_CARD_WIDTH * (props.scale ?? 1);
const height = () => width() * CARD_RATIO;
return (
<Suspense>
<img
onClick={props.onClick}
draggable={false}
class={props.class}
style={props.style}
width={`${width()}px`}
height={`${height()}px`}
src={
props.face == "down"
? "/views/back.svg"
: `/views/cards/${cardToSvgFilename(props.card)}.svg`
}
/>
</Suspense>
);
}) satisfies Component<
(
| {
card: Card;
face?: "up";
}
| { card?: Card; face: "down" }
) &
Stylable &
Clickable &
Scalable
>;

View File

@@ -0,0 +1,30 @@
import type { Hand } from "@games/shared/cards";
import { For } from "solid-js";
import Card from "./Card";
import { Stylable } from "./toolbox";
export default (props: { handCount: number } & Stylable) => {
return (
<For each={Array(props.handCount)}>
{(_, i) => {
const midOffset = i() + 0.5 - props.handCount / 2;
return (
<Card
face="down"
scale={0.4}
style={{
"margin-left": "-12px",
"margin-right": "-12px",
transform: `translate(0px, ${Math.pow(
Math.abs(midOffset),
2
)}px) rotate(${midOffset * 0.12}rad)`,
"min-width": "40px",
"box-shadow": "-4px 4px 6px rgba(0, 0, 0, 0.6)",
}}
/>
);
}}
</For>
);
};

View File

@@ -0,0 +1,17 @@
.hand {
height: 160px;
background: radial-gradient(var(--sweet-green), var(--dark-green));
min-width: 100px;
width: fit-content;
max-width: 90%;
border: 2px dashed var(--light);
border-radius: 12px;
margin-bottom: 50px;
padding: 10px;
overflow: scroll;
scrollbar-width: none;
display: flex;
gap: 5px;
}

View File

@@ -0,0 +1,26 @@
import { Component, For } from "solid-js";
import type { Card as TCard, Hand as THand } from "@games/shared/cards";
import Card from "./Card";
import { Stylable } from "./toolbox";
import "./Hand.css";
export default ((props) => {
return (
<div class={"hand " + props.class} style={props.style}>
<For each={props.hand}>
{(card, i) => (
<Card
card={card}
style={{
cursor: "pointer",
}}
onClick={() => props.onClickCard?.(card, i())}
/>
)}
</For>
</div>
);
}) satisfies Component<
{ hand: THand; onClickCard?: (card: TCard, i: number) => any } & Stylable
>;

View File

@@ -0,0 +1,63 @@
import { Component, createMemo, For, JSX, Show } from "solid-js";
import Card, { BASE_CARD_WIDTH, CARD_RATIO } from "./Card";
import { desaturate } from "color2k";
import { Clickable, hashColor, Scalable, Stylable } from "./toolbox";
const cardOffset = 0.35; // Small offset for the stack effect
export default ((props) => {
const cards = createMemo(() => {
const numCards = Math.max(0, props.count - 1); // Subtract 1 for the top card
return Array.from({ length: numCards }, (_, i) => i).toReversed();
});
const width = () => BASE_CARD_WIDTH * (props.scale ?? 1);
const height = () => width() * CARD_RATIO;
const offset = () => cardOffset * (props.scale ?? 1);
return (
<Show when={props.count > 0}>
<div
style={{
...props.style,
}}
class={props.class}
>
<svg
class="absolute z-[-1]"
width={width() + cards().length * offset()}
height={height() + cards().length * offset()}
viewBox={`0 0 ${width() + cards().length * offset()} ${
height() + cards().length * offset()
}`}
xmlns="http://www.w3.org/2000/svg"
>
<For each={cards()}>
{(i) => {
const xOffset = (i * offset()) / 2;
const yOffset = i * offset();
const color = desaturate(hashColor(i), 0.9);
return (
<rect
x={xOffset}
y={yOffset}
width={width()}
height={height()}
rx="5" // Rounded corners
ry="5"
fill={color}
/>
);
}}
</For>
</svg>
<Card onClick={props.onClick} face="down" scale={props.scale} />
</div>
</Show>
);
}) satisfies Component<
{
count: number;
} & Stylable &
Clickable &
Scalable
>;

View File

@@ -0,0 +1,28 @@
import { onMount, useContext } from "solid-js";
import { playerColor } from "~/profile";
import { TableContext } from "./Table";
import { Stylable } from "./toolbox";
export default (props: { playerKey: string } & Stylable) => {
const table = useContext(TableContext);
return (
<div
ref={(e) => table?.setPlayers(props.playerKey, { ref: e })}
style={{
...props.style,
"background-color": playerColor(props.playerKey),
...(table?.view() == null && table?.players[props.playerKey].ready
? {
border: "10px solid green",
}
: {}),
}}
class={`${props.class} w-20 h-20 rounded-full flex justify-center items-center`}
>
<p class="font-[1em] text-align-center">
{table?.players[props.playerKey].name}
</p>
</div>
);
};

View File

@@ -0,0 +1,199 @@
import type { TWsIn, TWsOut } from "@games/server/src/table";
import games from "@games/shared/games/index";
import { pool, Property, Stream } from "kefir";
import {
Accessor,
createContext,
createEffect,
createSignal,
For,
onCleanup,
onMount,
Setter,
Show,
} from "solid-js";
import { createStore, SetStoreFunction, Store } from "solid-js/store";
import { Dynamic } from "solid-js/web";
import api, { fromWebsocket } from "~/api";
import { createObservable, createSynced, cx, extractProperty } from "~/fn";
import { me, name } from "~/profile";
import GAMES from "./games";
import Player from "./Player";
type PlayerStore = Store<{
[key: string]: {
name: string;
ready: boolean;
ref?: HTMLDivElement;
};
}>;
export const TableContext = createContext<{
wsEvents: Stream<TWsOut, any>;
sendWs: (msg: TWsIn) => void;
tableRef: HTMLDivElement;
gameConfig: Accessor<any>;
setGameConfig: Setter<any>;
players: PlayerStore;
setPlayers: SetStoreFunction<PlayerStore>;
view: Accessor<any>;
}>();
export default (props: { tableKey: string }) => {
// #region Websocket declaration
let ws: ReturnType<ReturnType<typeof api.ws>["subscribe"]> | undefined =
undefined;
const wsEvents = pool<TWsOut, any>();
const sendWs = (msg: TWsIn) => ws?.send(msg);
// #endregion
// #region inbound table properties
const [players, setPlayers] = createStore<PlayerStore>({});
wsEvents
.thru(extractProperty("playersPresent"))
.onValue((P) =>
setPlayers(
Object.fromEntries(
P.map((p) => [
p,
p in players ? players[p] : { name: "", ready: false },
])
)
)
);
wsEvents.thru(extractProperty("playerNames")).onValue((P) =>
Object.entries(P)
.filter(([player]) => player in players)
.map(([player, name]) => setPlayers(player, "name", name))
);
wsEvents.thru(extractProperty("playersReady")).onValue((P) =>
Object.entries(P)
.filter(([player]) => player in players)
.map(([player, ready]) => setPlayers(player, "ready", ready))
);
// #endregion
// #region inbound game properties
const [gameConfig, setGameConfig] = createSynced({
ws: wsEvents.thru(extractProperty("gameConfig")) as Property<
{ game: string; players: string[] },
any
>,
sendWs: (gameConfig) => sendWs({ gameConfig }),
});
const view = wsEvents.thru(extractProperty("view")).thru(createObservable);
// #endregion
const [ready, setReady] = createSignal(false);
onMount(() => {
ws = api.ws(props).subscribe();
ws.on("open", () => {
wsEvents.plug(fromWebsocket<TWsOut>(ws));
// TODO: these need to be in a tracking scope to be disposed
createEffect(() => sendWs({ ready: ready() }));
createEffect(() => sendWs({ name: name() }));
});
onCleanup(() => ws?.close());
});
const GamePicker = () => {
return (
<div class="absolute tc mt-8 flex gap-4">
<select value={gameConfig()?.game}>
<For each={Object.entries(games)}>
{([gameId]) => <option value={gameId}>{gameId}</option>}
</For>
</select>
<button onClick={() => setReady((prev) => !prev)} class="button p-1 ">
{ready() ? "Not Ready" : "Ready"}
</button>
</div>
);
};
let tableRef!: HTMLDivElement;
return (
<TableContext.Provider
value={{
wsEvents,
sendWs,
tableRef,
players,
setPlayers,
gameConfig,
setGameConfig,
view,
}}
>
{/* Player avatars around the table */}
<div class="flex justify-around p-t-14">
<For each={gameConfig()?.players.filter((p) => p != me())}>
{(player, i) => {
const verticalOffset = () => {
const N = gameConfig()!.players.length - 1;
const x = Math.abs((2 * i() + 1) / (N * 2) - 0.5);
const y = Math.sqrt(1 - x * x);
return 1 - y;
};
return (
<Player
playerKey={player}
style={{
transform: `translate(0, ${verticalOffset() * 150}vh)`,
}}
/>
);
}}
</For>
</div>
{/* The table body itself */}
<div
ref={tableRef}
class={cx(
"fixed",
"bg-radial",
"from-orange-950",
"to-stone-950",
"border-4",
"border-neutral-950",
"shadow-lg",
"top-40",
"bottom-20",
"left-[2%]",
"right-[2%]"
)}
style={{
"border-radius": "50%",
}}
>
<Show when={view() == null}>
<GamePicker />
</Show>
</div>
{/* The game being played */}
<Dynamic
component={
gameConfig()?.game ?? "" in GAMES
? GAMES[gameConfig()!.game as keyof typeof GAMES]
: undefined
}
/>
</TableContext.Provider>
);
};

View File

@@ -0,0 +1,5 @@
import simple from "./simple";
export default {
simple,
};

View File

@@ -0,0 +1,149 @@
import type {
SimpleAction,
SimplePlayerView,
} from "@games/shared/games/simple";
import { Accessor, createEffect, For, Show, useContext } from "solid-js";
import { Portal } from "solid-js/web";
import { me } from "~/profile";
import { createObservable, extractProperty } from "../../fn";
import FannedHand from "../FannedHand";
import Hand from "../Hand";
import Pile from "../Pile";
import { TableContext } from "../Table";
export default () => {
const table = useContext(TableContext)!;
const view = table.view as Accessor<SimplePlayerView>;
const Configuration = () => (
<Show when={view() == null}>
<Portal mount={table.tableRef}>
<div class="absolute center grid grid-cols-2 gap-col-2 text-xl">
<label for="allow discards" style={{ "text-align": "right" }}>
Allow discards
</label>
<input
type="checkbox"
id="allow discards"
style={{ width: "50px" }}
checked={table.gameConfig()?.["can discard"] ?? false}
onChange={(evt) =>
table.setGameConfig({
...table.gameConfig(),
"can discard": evt.target.checked,
})
}
/>
<label for="to win" style={{ "text-align": "right" }}>
Cards to win
</label>
<input
type="number"
id="to win"
style={{
"text-align": "center",
width: "50px",
color: "var(--yellow)",
}}
value={table.gameConfig()["cards to win"]}
onChange={(evt) =>
table.setGameConfig({
...table.gameConfig(),
"cards to win": Number.parseInt(evt.target.value),
})
}
/>
</div>
</Portal>
</Show>
);
const submitAction = (action: SimpleAction) => table.sendWs({ action });
const ActiveGame = () => (
<Show when={view() != null}>
{/* Main pile in the middle of the table */}
<Pile
count={view().deckCount}
scale={0.8}
class="cursor-pointer fixed center"
onClick={() => submitAction({ type: "draw" })}
/>
{/* Your own hand */}
<Hand
class="fixed bc"
hand={view().myHand}
onClickCard={(card) => submitAction({ type: "discard", card })}
/>
{/* Other players' hands */}
<For
each={Object.entries(view().playerHandCounts).filter(
([key, _]) => key in table.players
)}
>
{([playerKey, handCount], i) => (
<Portal
mount={table.players[playerKey].ref}
ref={(ref) => {
const midOffset =
i() + 0.5 - Object.values(view().playerHandCounts).length / 2;
ref.style = `position: absolute; display: flex; justify-content: center; top: 65%;`;
}}
>
<FannedHand handCount={handCount} />
</Portal>
)}
</For>
{/* Turn indicator */}
<div
class="absolute tc text-align-center"
style={{
"background-color":
view().playerTurn == me() ? "var(--yellow)" : "transparent",
color: view().playerTurn == me() ? "var(--dark)" : "var(--light)",
}}
>
It's{" "}
<span class="font-bold">
{view().playerTurn == me()
? "your"
: table.players[view().playerTurn].name + "'s"}
</span>{" "}
turn
</div>
{/* Quit button */}
<button
class="button fixed tl m-4 p-1"
onClick={() => {
table.sendWs({ quit: true });
}}
>
Quit
</button>
</Show>
);
const results = table.wsEvents
.thru(extractProperty("results"))
.thru(createObservable);
const Results = () => (
<Show when={results() != null}>
<span class="bg-[var(--light)] text-[var(--dark)] rounded-[24px] border-2 border-[var(--dark)] absolute center p-4 shadow-lg text-[4em] text-center">
{table.players[results()!].name} won!
</span>
</Show>
);
return (
<>
<Configuration />
<ActiveGame />
<Results />
</>
);
};

View File

@@ -0,0 +1,23 @@
import hash, { NotUndefined } from "object-hash";
import { JSX } from "solid-js";
export type Stylable = {
class?: string;
style?: JSX.CSSProperties;
};
export type Clickable = {
onClick?:
| JSX.EventHandlerUnion<
HTMLDivElement,
MouseEvent,
JSX.EventHandler<HTMLDivElement, MouseEvent>
>
| undefined;
};
export type Scalable = {
scale?: number;
};
export const hashColor = (obj: NotUndefined) => `#${hash(obj).substring(0, 6)}`;

70
pkg/client/src/fn.ts Normal file
View File

@@ -0,0 +1,70 @@
import { createLatest } from "@solid-primitives/memo";
import { Observable, Property, Stream } from "kefir";
import { Accessor, createEffect, createSignal } from "solid-js";
import { createStore } from "solid-js/store";
import type { ExtractPropertyType, UnionKeys } from "@games/shared/types";
declare global {
interface Array<T> {
thru<S>(fn: (arr: T[]) => S): S;
}
}
Array.prototype.thru = function <T, S>(this: T[], fn: (arr: T[]) => S) {
return fn(this);
};
export const clone = <T>(o: T): T => JSON.parse(JSON.stringify(o));
export type ApiType<T extends () => Promise<{ data: any }>> = Awaited<
ReturnType<T>
>["data"];
export type WSEvent<
T extends { subscribe: (handler: (...args: any[]) => any) => any }
> = Parameters<Parameters<T["subscribe"]>[0]>[0];
export const createObservable = <T>(obs: Observable<T, any>) => {
const [signal, setSignal] = createSignal<T>();
obs.onValue((val) => setSignal(() => val));
return signal;
};
export const createObservableWithInit = <T>(
obs: Observable<T, any>,
init: T
) => {
const [signal, setSignal] = createSignal<T>(init);
obs.onValue((val) => setSignal(() => val));
return signal;
};
export const cx = (...classes: string[]) => classes.join(" ");
export const createObservableStore =
<T extends object = {}>(init: T) =>
(obs: Observable<T, any>) => {
const [store, setStore] = createStore<T>(init);
obs.onValue((val) => setStore(val));
return store;
};
export const extractProperty =
<T extends object, P extends UnionKeys<T>>(property: P) =>
(obs: Observable<T, any>): Property<ExtractPropertyType<T, P>, any> =>
obs
.filter((o) => property in o)
.map(
(o) => (o as { [K in P]: any })[property] as ExtractPropertyType<T, P>
)
.toProperty();
export const createSynced = <T>(p: {
ws: Stream<T, any>;
sendWs: (o: T) => void;
}) => {
const [local, setLocal] = createSignal<T>();
const remote = createObservable(p.ws.toProperty());
createEffect(() => local() !== undefined && p.sendWs(local()!));
return [createLatest([local, remote]), setLocal] as const;
};

14
pkg/client/src/profile.ts Normal file
View File

@@ -0,0 +1,14 @@
import { makePersisted } from "@solid-primitives/storage";
import hash from "object-hash";
import { createResource, createSignal } from "solid-js";
import api from "./api";
export const mePromise = api.whoami.post().then((r) => r.data);
export const [me] = createResource(() => mePromise);
export const playerColor = (humanKey: string) =>
"#" + hash(humanKey).substring(0, 6);
export const [name, setName] = makePersisted(createSignal("__name__"), {
name: "name",
});

View File

@@ -0,0 +1,15 @@
import { A, useParams } from "@solidjs/router";
import Table from "~/components/Table";
import { Show } from "solid-js";
import { me } from "~/profile";
export default () => {
const { tableKey } = useParams();
return (
<Show when={me() != null}>
<Table tableKey={tableKey} />
</Show>
);
};

View File

@@ -0,0 +1,46 @@
import { A } from "@solidjs/router";
export default () => {
const randomTablePath = `/t/abcd`;
return (
<>
<div class="flex flex-col absolute center">
<h1>Welcome to games.drm.dev!</h1>
<p>
This website is a real-time multiplayer platform for playing card
games online.
</p>
<br />
<p>
Games happen at <strong>tables</strong>. A table is any url of the
form{" "}
<span class="font-mono text-[var(--light-purple)]">
games.drm.dev/t/
<span class="text-[var(--yellow)]">*</span>
</span>
</p>
<br />
<p>Go to the same one as your friend and you will find them there!</p>
<br />
<p>
If you have a table key in mind (the part after /t/), then plug it in
to your URL bar! Or, here's a couple links to random tables:
</p>
<br />
<p>
With no one in it:{" "}
<A href={randomTablePath}>
https://www.games.drm.dev{randomTablePath}
</A>
</p>
</div>
<a href="https://brainmade.org" target="_blank">
<img
src="https://brainmade.org/white-logo.svg"
class="fixed bl m-2"
width="80"
/>
</a>
</>
);
};

47
pkg/client/src/style.css Normal file
View File

@@ -0,0 +1,47 @@
body {
--purple: rgb(138, 156, 255);
--light-purple: rgb(200, 150, 223);
--light: seashell;
--dark: #0a180e;
--green: rgb(24, 82, 65);
--dark-green: rgb(1, 42, 16);
--sweet-green: rgb(23, 138, 125);
--yellow: rgb(252, 220, 103);
height: 100vh;
color: var(--light);
background: radial-gradient(rgb(24, 82, 65), rgb(1, 42, 16));
font-family: "Trebuchet MS";
}
h1 {
font-size: 2em;
font-family: Garamond;
}
p {
font-size: 1em;
font-family: Garamond;
}
a {
font-family: monospace;
color: var(--purple);
}
a:visited {
color: var(--light-purple);
}
.button {
cursor: pointer;
background-color: var(--light);
color: var(--dark);
box-shadow: 0px 5px 10px var(--dark);
transition: background-color 0.15s, color 0.15s, transform 0.15s;
}
.button:hover {
background-color: var(--sweet-green);
color: var(--light);
transform: scale(1.1);
}
strong {
color: var(--yellow);
}

22
pkg/client/tsconfig.json Normal file
View File

@@ -0,0 +1,22 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"target": "ESNext",
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"allowJs": true,
"strict": true,
"noEmit": true,
"isolatedModules": true,
"paths": {
"^/*": ["./*"],
"@games/*": ["./pkg/*"],
"$/*": ["./pkg/client/*"],
"~/*": ["./pkg/client/src/*"]
}
}
}

46
pkg/client/uno.config.ts Normal file
View File

@@ -0,0 +1,46 @@
import presetWind4 from "@unocss/preset-wind4";
import { defineConfig } from "unocss";
import { presetIcons } from "unocss";
import {} from "@iconify-json/solar";
export default defineConfig({
presets: [
presetWind4(),
presetIcons({
collections: {
solar: () =>
import("@iconify-json/solar/icons.json").then(
(i) => i.default as any
),
},
}),
],
shortcuts: [[/^s-(\d+)$/, ([, d]) => `w-${d} h-${d}`]],
rules: [
["tl", { top: 0, left: 0 }],
["tr", { top: 0, right: 0 }],
["bl", { bottom: 0, left: 0 }],
["br", { bottom: 0, right: 0 }],
[
"bc",
{
bottom: 0,
left: "50%",
transform: "translateX(-50%)",
},
],
[
"tc",
{
top: 0,
left: "50%",
transform: "translateX(-50%)",
},
],
[
"center",
{ top: "50%", left: "50%", transform: "translate(-50%, -50%)" },
],
],
});

20
pkg/client/vite.config.ts Normal file
View File

@@ -0,0 +1,20 @@
import { defineConfig } from "vite";
import solidPlugin from "vite-plugin-solid";
import UnoCSS from "unocss/vite";
import path from "path";
export default defineConfig({
plugins: [solidPlugin(), UnoCSS()],
build: {
outDir: "../server/public",
emptyOutDir: true,
},
resolve: {
alias: {
"^": path.resolve(__dirname, "../../"),
"@games": path.resolve(__dirname, "../"),
$: path.resolve(__dirname, "./"),
"~": path.resolve(__dirname, "./src"),
},
},
});

3
pkg/server/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
# deps
node_modules/
public

29
pkg/server/package.json Normal file
View File

@@ -0,0 +1,29 @@
{
"name": "@games/server",
"scripts": {
"dev": "NODE_ENV=development PORT=5001 bun run --hot src/index.ts",
"start": "NODE_ENV=production bun run src/index.ts"
},
"dependencies": {
"@elysiajs/cors": "^1.3.3",
"@elysiajs/static": "^1.3.0",
"@games/shared": "workspace:*",
"@prisma/client": "6.13.0",
"dayjs": "^1.11.13",
"elysia": "^1.3.8",
"elysia-ip": "^1.0.10",
"elysia-rate-limit": "^4.4.0",
"kefir": "^3.8.8",
"kefir-bus": "^2.3.1",
"lodash": "^4.17.21",
"object-hash": "^3.0.0"
},
"devDependencies": {
"@types/bun": "latest",
"@types/kefir": "^3.8.11",
"@types/lodash": "^4.17.20",
"concurrently": "^9.2.0",
"prisma": "6.13.0",
"ts-xor": "^1.3.0"
}
}

83
pkg/server/src/api.ts Normal file
View File

@@ -0,0 +1,83 @@
import dayjs from "dayjs";
import { Elysia } from "elysia";
import { generateTokenAndKey, resolveToken } from "./human";
import { err } from "./logging";
import { liveTable, WsIn, WsOut } from "./table";
import type { ExtractPropertyType, UnionKeys } from "@games/shared/types";
const api = new Elysia({ prefix: "/api" })
.post("/whoami", async ({ cookie: { token } }) => {
let key: string | undefined;
if (token.value == null || (key = resolveToken(token.value)) == null) {
const [newToken, newKey] = generateTokenAndKey();
token.set({
value: newToken,
expires: dayjs().add(1, "year").toDate(),
httpOnly: true,
});
return newKey;
}
return key;
})
.derive(async ({ cookie: { token }, status }) => {
const humanKey = token.value && resolveToken(token.value);
return humanKey != null ? { humanKey } : status(401);
})
.ws("/ws/:tableKey", {
body: WsIn,
response: WsOut,
open({
data: {
params: { tableKey },
humanKey,
},
send,
}) {
const table = liveTable(tableKey);
table.inputs.connectionChanges.emit({
humanKey,
presence: "joined",
});
Object.entries({
...table.outputs.global,
...(table.outputs.player[humanKey] ?? {}),
}).forEach(([type, stream]) =>
// @ts-ignore
stream.onValue((v) => send({ [type]: v }))
);
},
message(
{
data: {
humanKey,
params: { tableKey },
},
},
body
) {
liveTable(tableKey).inputs.messages.emit({ ...body, humanKey });
},
close({
data: {
params: { tableKey },
humanKey,
},
}) {
liveTable(tableKey).inputs.connectionChanges.emit({
humanKey,
presence: "left",
});
},
error(error) {
err(error);
},
});
export default api;
export type Api = typeof api;

17
pkg/server/src/human.ts Normal file
View File

@@ -0,0 +1,17 @@
const tokenToHumanKey: { [token: string]: string } = {};
const playerKeys: Set<string> = new Set();
export const generateTokenAndKey = () => {
let token: string, key: string;
do {
[token, key] = [crypto.randomUUID(), crypto.randomUUID()];
tokenToHumanKey[token] = key;
playerKeys.add(key);
} while (!(token in tokenToHumanKey || playerKeys.has(key)));
return [token, key];
};
export const resolveToken = (token: string) =>
tokenToHumanKey[token] as string | undefined;
export const tokenExists = (token: string) => token in tokenToHumanKey;
export const keyExists = (key: string) => playerKeys.has(key);

27
pkg/server/src/index.ts Normal file
View File

@@ -0,0 +1,27 @@
import { cors } from "@elysiajs/cors";
import { Elysia, env } from "elysia";
import api from "./api";
import staticFiles from "./static";
import * as log from "./logging";
const port = env.PORT || 5001;
new Elysia()
.use(
cors({
origin: [
"http://localhost:3000", // dev
"https://games.drm.dev", // prod
],
})
)
// .onError(({ error }) => console.error(error))
.get("/ping", () => "pong")
.use(api)
.use(staticFiles)
.listen(port);
console.log(`server started on ${port}`);

16
pkg/server/src/logging.ts Normal file
View File

@@ -0,0 +1,16 @@
import { combine, pool } from "kefir";
import Bus from "kefir-bus";
export const LogPool = pool();
const LogBus = Bus();
const LogStream = combine([LogPool, LogBus]);
export const log = (value: unknown) => LogBus.emit(value);
export const err = (value: unknown) =>
LogBus.emitEvent({ type: "error", value });
// LogStream.log();
// LogStream.onError((err) => {
// console.error(err);
// });

12
pkg/server/src/static.ts Normal file
View File

@@ -0,0 +1,12 @@
import staticPlugin from "@elysiajs/static";
import Elysia from "elysia";
export default new Elysia()
.get("/*", () => Bun.file("./public/index.html"))
.use(
staticPlugin({
assets: "public",
prefix: "/",
alwaysStatic: true,
})
);

318
pkg/server/src/table.ts Normal file
View File

@@ -0,0 +1,318 @@
import GAMES, { Game, GameKey } from "@games/shared/games";
import {
invert,
isEmpty,
multiScan,
partition,
set,
setDiff,
ValueWithin,
} from "@games/shared/kefirs";
import { t } from "elysia";
import { combine, constant, merge, Observable, pool, Property } from "kefir";
import Bus, { type Bus as TBus } from "kefir-bus";
import { log } from "./logging";
import simple from "@games/shared/games/simple";
const DEFAULT_GAME_CONFIG = simple.defaultConfig;
export const WsOut = t.Union([
t.Object({ playersPresent: t.Array(t.String()) }),
t.Object({ playerNames: t.Record(t.String(), t.String()) }),
t.Object({ playersReady: t.Record(t.String(), t.Boolean()) }),
t.Object({
gameConfig: t.Object({ game: t.String(), players: t.Array(t.String()) }),
}),
t.Object({ view: t.Any() }),
t.Object({ results: t.Any() }),
]);
export type TWsOut = typeof WsOut.static;
export const WsIn = t.Union([
t.Object({ name: t.String() }),
t.Object({
gameConfig: t.Object({ game: t.String(), players: t.Array(t.String()) }),
}),
t.Object({ ready: t.Boolean() }),
t.Object({ action: t.Any() }),
t.Object({ quit: t.Literal(true) }),
]);
export type TWsIn = typeof WsIn.static;
type Attributed = { humanKey: string };
type TablePayload<
GameConfig = unknown,
GameView = unknown,
GameAction = unknown,
GameResult = unknown
> = {
inputs: {
connectionChanges: TBus<
Attributed & {
presence: "joined" | "left";
},
never
>;
messages: TBus<Attributed & TWsIn, any>;
};
outputs: {
global: {
playersPresent: Property<string[], any>;
playersReady: Property<
{
[key: string]: boolean;
} | null,
any
>;
gameConfig: Property<GameConfig | null, any>;
results: Property<GameResult, any>;
playerNames: Property<{ [key: string]: string }, any>;
};
player: {
[key: string]: {
view: Property<GameView | null, any>;
};
};
};
};
const tables: {
[key: string]: TablePayload;
} = {};
export const liveTable = <
GameConfig extends {
game: GameKey;
players: string[];
},
GameState,
GameAction extends Attributed,
GameView,
GameResult
>(
key: string
) => {
if (!(key in tables)) {
const inputs: TablePayload<
GameConfig,
GameState,
GameAction,
GameResult
>["inputs"] = {
connectionChanges: Bus(),
messages: Bus(),
};
const { connectionChanges, messages } = inputs;
// =======
// players who have at least one connection to the room
const playersPresent = connectionChanges
.scan((prev, evt) => {
if (evt.presence == "left" && prev[evt.humanKey] == 1) {
const { [evt.humanKey]: _, ...rest } = prev;
return rest;
}
return {
...prev,
[evt.humanKey]:
(prev[evt.humanKey] ?? 0) + (evt.presence == "joined" ? 1 : -1),
};
}, {} as { [key: string]: number })
.map((counts) => Object.keys(counts))
.toProperty();
const playerStreams: {
[key: string]: { view: Property<GameView | null, any> };
} = {};
playersPresent
.map(set)
.slidingWindow(2, 2)
.map(([prev, cur]) => setDiff([prev, cur]))
.onValue(({ added, removed }) => {
added.forEach((p) => {
playerStreams[p] = {
view: withGame(gameState)
.map(
([state, game]) =>
state && (game.getView({ state, humanKey: p }) as GameView)
)
.toProperty(),
};
});
removed.forEach((p) => {
delete playerStreams[p];
});
});
const {
name,
ready,
action,
quit,
gameConfig: clientGameConfigs,
} = partition(
["name", "ready", "action", "quit", "gameConfig"],
messages
) as unknown as {
// yuck
name: Observable<Attributed & { name: string }, any>;
ready: Observable<Attributed & { ready: boolean }, any>;
action: Observable<Attributed & { action: GameAction }, any>;
quit: Observable<Attributed, any>;
gameConfig: Observable<Attributed & { gameConfig: GameConfig }, any>;
};
const gameEnds = quit.map((_) => null);
const gameIsActivePool = pool<boolean, any>();
const gameIsActive = merge([
constant(false),
gameIsActivePool,
]).toProperty();
const playersReady = multiScan(
null as {
[key: string]: boolean;
} | null,
[
playersPresent.filterBy(invert(gameIsActive)),
(prev, players: ValueWithin<typeof playersPresent>) =>
Object.fromEntries(players.map((p) => [p, prev?.[p] ?? false])),
],
[
ready.filterBy(invert(gameIsActive)),
(prev, evt: ValueWithin<typeof ready>) =>
prev?.[evt.humanKey] != null
? {
...prev,
[evt.humanKey]: evt.ready,
}
: prev,
],
[gameEnds, () => null],
[
playersPresent.sampledBy(gameEnds),
(_, players: ValueWithin<typeof playersPresent>) =>
Object.fromEntries(players.map((p) => [p, false])),
]
).toProperty();
const playerNames = name
.scan(
(prev, n) => ({ ...prev, [n.humanKey]: n.name }),
{} as { [key: string]: string }
)
.toProperty();
const gameStarts = playersReady
.filter(
(pr) =>
Object.values(pr ?? {}).length > 0 &&
Object.values(pr!).every((ready) => ready)
)
.map((_) => null);
const gameConfigPool = pool<GameConfig, any>();
const gameConfig = gameConfigPool.toProperty();
const gameImpl = gameConfig
.filter((cfg) => cfg.game in GAMES)
.map((config) => GAMES[config.game as GameKey].impl(config))
.toProperty();
const withGame = <T>(obs: Observable<T, any>) =>
combine([obs], [gameImpl], (o, game) => [o, game] as const);
const resultsPool = pool<GameResult | null, any>();
const results = merge([constant(null), resultsPool]).toProperty();
const gameState = multiScan(
null as GameState | null,
[
// initialize game state when started
gameImpl.sampledBy(gameStarts).filterBy(invert(gameIsActive)),
(prev, game: ValueWithin<typeof gameImpl>) =>
prev || (game.init() as GameState),
],
[
// handle actions from players
action.filterBy(gameIsActive).thru(withGame),
(
prev,
[{ action, humanKey }, game]: [
Attributed & { action: GameAction },
ReturnType<Game["impl"]>
]
) =>
prev &&
(game.resolveAction({
state: prev,
action,
humanKey,
}) as GameState),
],
[results.filterBy(gameIsActive), () => null], // handle game ending criteria
[quit, () => null] // handle players leaving the room
).toProperty();
resultsPool.plug(
gameState
.filter((state) => state != null)
.thru(withGame)
.map(([state, game]) => game.getResult(state) as unknown as GameResult)
.filter((result) => result != null)
.merge(quit.map(() => null))
);
gameIsActivePool.plug(
combine([gameState, results])
.map(([state, result]) => state != null && result == null)
.skipDuplicates()
.toProperty()
);
gameConfigPool.plug(
multiScan(
DEFAULT_GAME_CONFIG,
[
playersPresent.filterBy(gameIsActive.thru(invert)),
(prev, players) => ({
...prev,
players,
}),
],
[
clientGameConfigs.filterBy(gameIsActive.thru(invert)),
// @ts-ignore
(prev, { gameConfig }) => ({ ...gameConfig, players: prev.players }),
]
) as unknown as Observable<GameConfig, any>
);
tables[key] = {
inputs,
outputs: {
global: {
playersPresent,
playersReady,
gameConfig,
results,
playerNames,
},
player: playerStreams,
},
};
// cleanup: delete the room if no one is in it for 30 seconds
tables[key].outputs.global.playersPresent
.skip(1) // don't consider the empty room upon creation
.debounce(30000)
.filter(isEmpty)
.onValue(() => {
log("DELETING LIVE TABLE");
delete tables[key];
});
}
return tables[key] as TablePayload<GameConfig, GameState, GameAction>;
};

9
pkg/server/tsconfig.json Normal file
View File

@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"strict": true,
"jsx": "react-jsx",
"jsxImportSource": "hono/jsx",
"esModuleInterop": true
}
}

View File

@@ -26,10 +26,11 @@ export type Card =
} }
| { kind: "joker"; color: "red" | "black" }; | { kind: "joker"; color: "red" | "black" };
export type Pile = Card[]; export type vCard = Card | null | number;
export type Stack = Card[]; export type Pile<C extends vCard = Card> = C[];
export type Hand = Card[]; export type Stack<C extends vCard = Card> = C[];
export type Board = Card[]; export type Hand<C extends vCard = Card> = C[];
export type Board<C extends vCard = Card> = C[];
export const newDeck = (withJokers = false): Pile => export const newDeck = (withJokers = false): Pile =>
suits suits

34
pkg/shared/games/index.ts Normal file
View File

@@ -0,0 +1,34 @@
import simple from "./simple";
export type Game<
S = unknown, // state
A = unknown, // action
E = unknown, // error
V = unknown, // view
R = unknown, // results
C extends { game: string; players: string[] } = {
game: string;
players: string[];
}
> = {
impl: (config: C) => {
title: string;
rules: string;
init: () => S;
resolveAction: (p: { state: S; action: A; humanKey: string }) => S | E;
getView: (p: { state: S; humanKey: string }) => V;
resolveQuit: (p: { state: S; humanKey: string }) => S;
getResult: (state: S) => R | undefined;
};
defaultConfig: C;
};
export const GAMES: {
[key: string]: Game;
} = {
// renaissance,
simple,
};
export default GAMES;
export type GameKey = string;

View File

@@ -0,0 +1 @@
export default {};

158
pkg/shared/games/simple.ts Normal file
View File

@@ -0,0 +1,158 @@
import { Card, Hand, newDeck, Pile, shuffle, vCard } from "@games/shared/cards";
import { heq } from "@games/shared/utils";
import type { Game } from ".";
import { XOR } from "ts-xor";
export type SimpleConfiguration = {
game: "simple";
players: string[];
"can discard": boolean;
"cards to win": number;
};
// omniscient game state
export type SimpleGameState = {
deck: Pile;
turnIdx: number;
playerHands: { [humanKey: string]: Hand };
};
// a particular player's point of view in the game
export type SimplePlayerView = {
deckCount: number;
playerTurn: string;
playerHandCounts: { [humanKey: string]: number };
myHand: Hand<Card>;
};
export type SimpleAction = { type: "draw" } | { type: "discard"; card: Card };
export const newSimpleGameState = (
config: SimpleConfiguration
): SimpleGameState => {
const { players } = config;
return {
deck: shuffle(newDeck()),
turnIdx: 0,
playerHands: Object.fromEntries(players.map((humanKey) => [humanKey, []])),
};
};
export const getSimplePlayerView = (
config: SimpleConfiguration,
state: SimpleGameState,
humanKey: string
): SimplePlayerView => ({
deckCount: state.deck.length,
playerTurn: config.players[state.turnIdx],
myHand: state.playerHands[humanKey] as Hand,
playerHandCounts: Object.fromEntries(
Object.entries(state.playerHands)
.filter(([id]) => id != humanKey)
.map(([id, hand]) => [id, hand.length])
),
});
// type SimpleError = XOR<
// { "go away": string },
// { chill: string },
// { "ah ah": string }
// >;
type SimpleError = {
class: "go away" | "chill" | "ah ah";
message: string;
};
export const resolveSimpleAction = ({
config,
state,
action,
humanKey,
}: {
config: SimpleConfiguration;
state: SimpleGameState;
action: SimpleAction;
humanKey: string;
}): SimpleGameState => {
const playerHand = state.playerHands[humanKey];
if (playerHand == null) {
throw {
message: "You are not a part of this game!",
class: "go away",
} satisfies SimpleError;
}
if (humanKey != config.players[state.turnIdx]) {
throw {
message: "It's not your turn!",
class: "chill",
} satisfies SimpleError;
}
const numPlayers = Object.keys(state.playerHands).length;
const newTurnIdx = (state.turnIdx + 1) % numPlayers;
if (action.type == "draw") {
const [drawn, ...rest] = state.deck;
return {
deck: rest,
playerHands: {
...state.playerHands,
[humanKey]: [drawn, ...playerHand],
},
turnIdx: newTurnIdx,
};
} else {
// action.type == discard
if (config["can discard"] == false) {
throw {
message: "You're not allowed to discard!",
class: "ah ah",
} satisfies SimpleError;
}
const cardIndex = playerHand.findIndex(heq(action.card));
return {
deck: [action.card, ...state.deck],
playerHands: {
...state.playerHands,
[humanKey]: playerHand
.slice(0, cardIndex)
.concat(playerHand.slice(cardIndex + 1)),
},
turnIdx: newTurnIdx,
};
}
};
export type SimpleResult = string;
export default {
defaultConfig: {
game: "simple",
players: [],
"can discard": true,
"cards to win": 5,
},
impl: (config: SimpleConfiguration) => ({
title: "Simple",
rules: "You can draw, or you can discard. Then your turn is up.",
init: () => newSimpleGameState(config),
resolveAction: (p) => resolveSimpleAction({ ...p, config }),
getView: ({ state, humanKey }) =>
getSimplePlayerView(config, state, humanKey),
resolveQuit: () => null,
getResult: (state) =>
Object.entries(state.playerHands).find(
([_, hand]) => hand.length === config["cards to win"]
)?.[0],
}),
} satisfies Game<
SimpleGameState,
SimpleAction,
SimpleError,
SimplePlayerView,
SimpleResult,
SimpleConfiguration
>;

54
pkg/shared/kefirs.ts Normal file
View File

@@ -0,0 +1,54 @@
import { merge, Observable } from "kefir";
import Bus from "kefir-bus";
export type ValueWithin<O extends Observable<any, any>> = Parameters<
Parameters<O["map"]>[0]
>[0];
type Mutation<A, O extends Observable<any, any>> = [
O,
(prev: A, value: ValueWithin<O>) => A
];
export const multiScan = <A, M extends Mutation<A, any>[]>(
initValue: A,
...mutations: M
): Observable<A, any> =>
merge(
mutations.map(([source, mutation]) =>
source.map((event) => ({ event, mutation }))
)
).scan((prev, { event, mutation }) => mutation(prev, event), initValue);
export const partition = <
C extends readonly [...string[]],
T extends { [key: string]: any },
E
>(
classes: C,
obs: Observable<T, E>
) => {
const classBuses = Object.fromEntries(classes.map((c) => [c, Bus()]));
obs.onValue((v) => {
for (const _class of classes) {
if (_class in v) {
classBuses[_class].emit(v);
return;
}
}
});
return classBuses;
};
export const isEmpty = (container: { length: number }) => container.length == 0;
export const setDiff = <T>(
sets: [Set<T>, s2: Set<T>]
): { added: T[]; removed: T[] } => ({
added: [...sets[1].difference(sets[0])],
removed: [...sets[0].difference(sets[1])],
});
export const set = <T>(arr: T[]) => new Set<T>(arr);
export const invert = <E>(obs: Observable<boolean, E>) => obs.map((o) => !o);

13
pkg/shared/package.json Normal file
View File

@@ -0,0 +1,13 @@
{
"name": "@games/shared",
"version": "1.0.0",
"dependencies": {
"kefir": "^3.8.8",
"kefir-bus": "^2.3.1",
"object-hash": "^3.0.0"
},
"devDependencies": {
"@types/kefir": "^3.8.11",
"ts-xor": "^1.3.0"
}
}

9
pkg/shared/tsconfig.json Normal file
View File

@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"esModuleInterop": true,
"target": "esnext",
"moduleResolution": "nodenext",
"module": "nodenext"
}
}

9
pkg/shared/types.ts Normal file
View File

@@ -0,0 +1,9 @@
export type UnionKeys<T> = T extends any ? keyof T : never;
export type ExtractPropertyType<
T,
P extends string | number | symbol
> = T extends {
[K in P]: any;
}
? T[P]
: never;

3
pkg/shared/utils.ts Normal file
View File

@@ -0,0 +1,3 @@
import hash, { NotUndefined } from "object-hash";
export const heq = (a: NotUndefined) => (b: NotUndefined) => hash(a) == hash(b);

7274
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

5
pnpm-workspace.yaml Normal file
View File

@@ -0,0 +1,5 @@
onlyBuiltDependencies:
- "@parcel/watcher"
- esbuild
packages:
- "pkg/*"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 664 B

View File

@@ -1,60 +0,0 @@
html {
height: 100vh;
}
body {
margin: 0;
font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
"Lucida Sans", Arial, sans-serif;
color: white;
height: 100%;
}
body::before {
z-index: -1;
content: "";
font-size: 28px;
position: absolute;
width: 100%;
height: 100%;
}
#app {
height: 100%;
background: radial-gradient(rgb(24, 82, 65), rgb(1, 42, 16));
}
.full {
height: 100%;
width: 100%;
}
.w-full {
width: 100%;
}
.center {
display: flex;
justify-content: center;
align-items: center;
}
.column {
display: flex;
flex-direction: column;
}
.free {
position: absolute;
top: 0;
left: 0;
}
.fixed-br {
position: fixed;
bottom: 0;
right: 0;
}
.clear {
pointer-events: none;
}

View File

@@ -1,36 +0,0 @@
import "./app.css";
import { Router } from "@solidjs/router";
import { FileRoutes } from "@solidjs/start/router";
import { Suspense } from "solid-js";
import pkg from "~/../package.json";
const Version = () => (
<div class="full free clear">
<span
style={{
margin: "5px",
"font-size": "0.8rem",
"font-family": "monospace",
"pointer-events": "all",
}}
class="fixed-br"
>
v{pkg.version}
</span>
</div>
);
export default function App() {
return (
<Router
root={(props) => (
<>
<Suspense>{props.children}</Suspense>
<Version />
</>
)}
>
<FileRoutes />
</Router>
);
}

View File

@@ -1,49 +0,0 @@
import { Component, createResource, JSX, Suspense } from "solid-js";
import { Card } from "../types/cards";
const cardToSvgFilename = (card: Card) => {
if (card.kind == "joker") {
return `JOKER-${card.color == "black" ? "2" : "3"}`;
}
const value =
{ ace: 1, jack: 11, queen: 12, king: 13 }[
card.rank as "ace" | "jack" | "queen" | "king" // fuck you typescript
] ?? (card.rank as number);
return `${card.suit.toUpperCase()}-${value}${
value >= 11 ? "-" + (card.rank as string).toUpperCase() : ""
}`;
};
export default ((props) => {
const [svgPath] = createResource(() =>
props.face == "down"
? // @ts-ignore
import("~/../assets/views/back.svg")
: import(
`~/../assets/views/cards/${cardToSvgFilename(
props.card
)}.svg`
)
);
return (
<Suspense>
<img
draggable={false}
class={props.class}
style={{
"border-radius": "5px",
...props.style,
}}
width="100px"
src={svgPath()?.default}
/>
</Suspense>
);
}) satisfies Component<{
class?: string;
style?: JSX.CSSProperties;
card: Card;
face?: "up" | "down";
}>;

View File

@@ -1,40 +0,0 @@
import { createContext, JSX } from "solid-js";
import Card from "./Card";
import Hand from "./Hand";
import Pile from "./Pile";
import { newDeck, shuffle, Hand as THand } from "../types/cards";
import { createStore, produce } from "solid-js/store";
const GameContext = createContext();
export default () => {
const [gameState, setGameState] = createStore({
pile: shuffle(newDeck()),
hand: [] as THand,
});
return (
<GameContext.Provider value={{ gameState, setGameState }}>
<div
onClick={() => {}}
class="full column"
style={{ "row-gap": "20px", "font-size": "32px" }}
>
<div class="full center">
<Pile
pile={gameState.pile}
style={{ cursor: "pointer" }}
onClick={() =>
setGameState(
produce((state) => {
state.hand.push(state.pile.pop()!);
})
)
}
/>
</div>
<Hand hand={gameState.hand} />
</div>
</GameContext.Provider>
);
};

View File

@@ -1,24 +0,0 @@
import { Component, For } from "solid-js";
import Card from "./Card";
import { Hand } from "../types/cards";
export default ((props) => {
return (
<div
style={{
border: "2px dashed white",
"border-radius": "12px",
margin: "10px",
"margin-bottom": "25px",
padding: "10px",
height: "200px",
overflow: "scroll",
"scrollbar-width": "none",
display: "flex",
gap: "5px",
}}
>
<For each={props.hand}>{(card) => <Card card={card} />}</For>
</div>
);
}) satisfies Component<{ hand: Hand }>;

View File

@@ -1,44 +0,0 @@
import { Component, For, JSX } from "solid-js";
import Card from "./Card";
import { Pile } from "../types/cards";
export default ((props) => {
return (
<div
class="center"
style={{ width: "200px", height: "400px", ...props.style }}
onClick={props.onClick}
>
<For each={props.pile}>
{(card, i) => (
<Card
card={card}
face="down"
style={{
position: "absolute",
transform: `translate(${i() * 0.8}px, ${
-i() * 0.4
}px)`,
"z-index": 100 - i(),
border: `0.1px solid rgb(${
60 - i() + Math.random() * 10
}, ${60 - i() + Math.random() * 10}, ${
60 - i() + Math.random() * 10
});`,
}}
/>
)}
</For>
</div>
);
}) satisfies Component<{
pile: Pile;
style?: JSX.CSSProperties;
onClick?:
| JSX.EventHandlerUnion<
HTMLDivElement,
MouseEvent,
JSX.EventHandler<HTMLDivElement, MouseEvent>
>
| undefined;
}>;

View File

@@ -1,4 +0,0 @@
// @refresh reload
import { mount, StartClient } from "@solidjs/start/client";
mount(() => <StartClient />, document.getElementById("app")!);

View File

@@ -1,21 +0,0 @@
// @refresh reload
import { createHandler, StartServer } from "@solidjs/start/server";
export default createHandler(() => (
<StartServer
document={({ assets, children, scripts }) => (
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
{assets}
</head>
<body>
<div id="app">{children}</div>
{scripts}
</body>
</html>
)}
/>
));

View File

@@ -1,9 +0,0 @@
declare global {
interface Array<T> {
thru<S>(fn: (arr: T[]) => S): S;
}
}
Array.prototype.thru = function <T, S>(this: T[], fn: (arr: T[]) => S) {
return fn(this);
};
export const clone = <T>(o: T): T => JSON.parse(JSON.stringify(o));

View File

@@ -1,5 +0,0 @@
import Game from "../components/Game";
export default () => {
return <Game />;
};

View File

@@ -1,19 +1,8 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ESNext", "baseUrl": ".",
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"allowJs": true,
"strict": true,
"noEmit": true,
"types": ["vinxi/types/client"],
"isolatedModules": true,
"paths": { "paths": {
"~/*": ["./src/*"] "@games/*": ["pkg/*"]
} }
} }
} }