very basic websocket setup

12 files changed, 63 insertions, 70 deletions

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7ad3e25
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+## jumpstorm
diff --git a/client/README.md b/client/README.md
deleted file mode 100644
index e6cd94f..0000000
--- a/client/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Svelte + TS + Vite
-
-This template should help get you started developing with Svelte and TypeScript in Vite.
-
-## Recommended IDE Setup
-
-[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
-
-## Need an official Svelte framework?
-
-Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more.
-
-## Technical considerations
-
-**Why use this over SvelteKit?**
-
-- It brings its own routing solution which might not be preferable for some users.
-- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
-
-This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
-
-Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
-
-**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
-
-Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
-
-**Why include `.vscode/extensions.json`?**
-
-Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
-
-**Why enable `allowJs` in the TS template?**
-
-While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant.
-
-**Why is HMR not preserving my local component state?**
-
-HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr).
-
-If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
-
-```ts
-// store.ts
-// An extremely simple external store
-import { writable } from 'svelte/store'
-export default writable(0)
-```
diff --git a/client/src/JumpStorm.ts b/client/src/JumpStorm.ts
index 45ea163..d1d1013 100644
--- a/client/src/JumpStorm.ts
+++ b/client/src/JumpStorm.ts
@@ -11,9 +11,16 @@ import {
 
 export class JumpStorm {
   private game: Game;
+  private socket: WebSocket;
 
   constructor(ctx: CanvasRenderingContext2D) {
     this.game = new Game();
+    this.socket = new WebSocket("ws://localhost:8080");
+
+    this.socket.onopen = () => {
+      this.socket.send("gaming");
+      console.log("OPENED SOCKET");
+    };
 
     [
       this.createInputSystem(),
diff --git a/client/src/routes/Home.svelte b/client/src/routes/Home.svelte
index 935ed69..9ada10e 100644
--- a/client/src/routes/Home.svelte
+++ b/client/src/routes/Home.svelte
@@ -2,8 +2,11 @@
   import GameCanvas from "../components/GameCanvas.svelte";
   import LeaderBoard from "../components/LeaderBoard.svelte";
 
-  let width: number = 600;
-  let height: number = 800;
+  import { Miscellaneous } from "@engine/config";
+  
+  let width: number = Miscellaneous.WIDTH;
+  let height: number = Miscellaneous.HEIGHT;
+  
 </script>
 
 <div class="centered-game">
diff --git a/engine/Game.ts b/engine/Game.ts
index c2a2c4f..3682fbd 100644
--- a/engine/Game.ts
+++ b/engine/Game.ts
@@ -55,6 +55,7 @@ export class Game {
     const dt = timeStamp - this.lastTimeStamp;
     this.lastTimeStamp = timeStamp;
 
+    // rebuild the Component -> { Entity } map
     this.componentEntities.clear();
     this.entities.forEach((entity) =>
       entity.getComponents().forEach((component) => {
diff --git a/engine/config/constants.ts b/engine/config/constants.ts
index 27c8160..9a3169b 100644
--- a/engine/config/constants.ts
+++ b/engine/config/constants.ts
@@ -32,3 +32,8 @@ export namespace PhysicsConstants {
   export const PLAYER_JUMP_ACC = -0.01;
   export const PLAYER_JUMP_INITIAL_VEL = -0.9;
 }
+
+export namespace Miscellaneous {
+  export const WIDTH = 600;
+  export const HEIGHT = 800;
+}
diff --git a/engine/systems/Collision.ts b/engine/systems/Collision.ts
index 4fcb906..846a95a 100644
--- a/engine/systems/Collision.ts
+++ b/engine/systems/Collision.ts
@@ -42,8 +42,8 @@ export class Collision extends System {
 
     Collision.COLLIDABLE_COMPONENT_NAMES.map((componentName) =>
       game.componentEntities.get(componentName)
-    ).forEach((entityIds: Set<number>) =>
-      entityIds.forEach((id) => {
+    ).forEach((entityIds?: Set<number>) =>
+      entityIds?.forEach((id) => {
         const entity = game.entities.get(id);
         if (!entity.hasComponent(ComponentNames.BoundingBox)) {
           return;
diff --git a/server/README.md b/server/README.md
deleted file mode 100644
index 84286d5..0000000
--- a/server/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# server
-
-To install dependencies:
-
-```bash
-bun install
-```
-
-To run:
-
-```bash
-bun run index.ts
-```
-
-This project was created using `bun init` in bun v0.6.14. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.
diff --git a/server/index.ts b/server/index.ts
deleted file mode 100644
index e69de29..0000000
--- a/server/index.ts
+++ /dev/null
diff --git a/server/package.json b/server/package.json
index 0bb97a9..17d3c25 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "module": "src/index.ts",
+  "module": "src/server.ts",
   "type": "module",
   "devDependencies": {
     "bun-types": "^0.6.14"
diff --git a/server/src/index.ts b/server/src/index.ts
deleted file mode 100644
index 138762b..0000000
--- a/server/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Game } from "../../engine/Game";
-
-console.log(Game);
diff --git a/server/src/server.ts b/server/src/server.ts
new file mode 100644
index 0000000..f699ea9
--- /dev/null
+++ b/server/src/server.ts
@@ -0,0 +1,41 @@
+import { Game } from "../../engine/Game";
+import { Floor, Player } from "../../engine/entities";
+import {
+  WallBounds,
+  FacingDirection,
+  Physics,
+  Input,
+  Collision,
+} from "../../engine/systems";
+import { Miscellaneous } from "../../engine/config";
+
+const TICK_RATE = 60 / 1000;
+
+const game = new Game();
+
+[new Physics(), new Collision(), new WallBounds(Miscellaneous.WIDTH)].forEach(
+  (system) => game.addSystem(system)
+);
+
+[new Floor(160), new Player()].forEach((entity) => game.addEntity(entity));
+
+game.start();
+setInterval(() => {
+  game.doGameLoop(performance.now());
+}, TICK_RATE);
+
+const server = Bun.serve<>({
+  port: 8080,
+  fetch(req, server) {
+    server.upgrade(req, {
+      data: {},
+    });
+  },
+  websocket: {
+    // handler called when a message is received
+    async message(ws, message) {
+      console.log(`Received ${message}`);
+    },
+  },
+});
+console.log(`Listening on localhost:${server.port}`);