colyseus · endel · Jul 12, 2021 · May 3, 2021 · May 4, 2021 · May 5, 2021
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -1,25 +1,37 @@
-## How to contribute to Colyseus
+# How to contribute to Colyseus
 
-#### **Did you find a bug?**
+## Working on Colyseus source files
 
-* **Do not open up a GitHub issue if the bug is a security vulnerability in Colyseus**, and instead send us an email at [endel@gamestd.io](mailto:endel@gamestd.io).
+- Clone the repository: `git clone git@github.com:colyseus/colyseus.git`
+- Install its dependencies: `npm install`
+- To run the test suite: `npm test`
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/gamestdio/colyseus/issues).
+Observations:
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/gamestdio/colyseus/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+- The Colyseus project has multiple packages. They are all under `packages/` folder.
+- We use [Lerna](https://github.com/lerna/lerna) for managing the multiple packages.
+- Packages that have a `"build"` script are not going to be built with `rollup` (e.g. @colyseus/monitor)
 
-#### **Did you write a patch that fixes a bug?**
+---
 
-* Open a new GitHub pull request with the patch.
+## **Reporting an issue**
 
-* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+- **Do not open up a GitHub issue if the bug is a security vulnerability in Colyseus**, and instead send us an email at [endel@lucidsight.com](endel@lucidsight.com).
+- **Ensure the issue was not already reported** by searching on GitHub under [Issues](https://github.com/colyseus/colyseus/issues).
+- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/colyseus/colyseus/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
-* Before submitting, make sure the tests are still passing, by running `npm test`.
+## **Did you write a patch that fixes a bug?**
 
-#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
+- Open a new GitHub pull request with the patch.
+- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+- Before submitting, make sure the tests are still passing, by running `npm test`.
+
+## **Did you fix whitespace, format code, or make a purely cosmetic patch?**
 
 Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of Colyseus will generally not be accepted.
 
-#### **Do you have questions about the source code?**
+## **Do you have questions about the source code?**
+
+- Ask any question about how to use Colyseus on our [Discord Community](https://discord.gg/RY8rRS7).
 
-* Ask any question about how to use Colyseus on our [Discord Server](https://discord.gg/RY8rRS7).
+---
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,9 @@ node_modules
 yarn.lock
 /lib
 .DS_Store
+build/
 
 .nyc_output
 coverage
 esm
+dump.rdb
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2015 Endel Dreyer
+Copyright (c) 2021 Lucid Sight
+Copyright (c) 2015-2021 Endel Dreyer
 
 MIT License:
 

diff --git a/README.md b/README.md
@@ -31,6 +31,8 @@ for any kind of project you can think of!
 You're encouraged to take a look on [some games being developed with
 it](https://discuss.colyseus.io/category/5/showcase) and make your own!
 
+> ⭐️ Enjoying Colyseus? Show your support by starring the project on GitHub ⭐️
+
 ## What Colyseus provides to you:
 
 - WebSocket-based communication

diff --git a/bundles/colyseus/package.json b/bundles/colyseus/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "colyseus",
+  "version": "0.14.17",
+  "description": "Multiplayer Framework for Node.js.",
+  "input": "./src/index.ts",
+  "main": "./build/index.js",
+  "module": "./build/index.mjs",
+  "typings": "./build/index.d.ts",
+  "scripts": {
+    "test": "TS_NODE_PROJECT=../../tsconfig/tsconfig.test.json COLYSEUS_SEAT_RESERVATION_TIME=0.3 COLYSEUS_PRESENCE_SHORT_TIMEOUT=300 c8 mocha --require ts-node/register test/**Test.ts test/**/**Test.ts --exit --timeout 15000"
+  },
+  "author": "Endel Dreyer",
+  "license": "MIT",
+  "keywords": [
+    "colyseus",
+    "multiplayer",
+    "netcode",
+    "realtime",
+    "networking",
+    "websockets"
+  ],
+  "files": [
+    "build"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/colyseus/colyseus.git"
+  },
+  "homepage": "https://colyseus.io/",
+  "engines": {
+    "node": ">= 12.x"
+  },
+  "dependencies": {
+    "@colyseus/core": "^0.14.17",
+    "@colyseus/mongoose-driver": "^0.14.17",
+    "@colyseus/redis-presence": "^0.14.17",
+    "@colyseus/ws-transport": "^0.14.17&
10000
quot;
+  },
+  "gitHead": "320a0325f01eff3cd7afa8fb2efa80077ebdbf4a"
+}
diff --git a/bundles/colyseus/src/index.ts b/bundles/colyseus/src/index.ts
@@ -0,0 +1,13 @@
+export * from "@colyseus/core";
+
+//
+// 0.14.x compatibility:
+// each "presence", "transport", and "driver" implementation have been extracted from the core.
+//
+import { Server } from '@colyseus/core';
+import { WebSocketTransport } from '@colyseus/ws-transport';
+Server.prototype['getDefaultTransport'] = function(options: any) {
+    return new WebSocketTransport(options);
+}
+export { RedisPresence } from '@colyseus/redis-presence';
+export { MongooseDriver } from '@colyseus/mongoose-driver';
diff --git a/bundles/colyseus/test/DriverTest.ts b/bundles/colyseus/test/DriverTest.ts
@@ -0,0 +1,62 @@
+import assert from "assert";
+import { generateId, IRoomListingData, MatchMakerDriver } from "../src";
+
+import { DRIVERS } from "./utils";
+
+describe("Driver implementations", () => {
+  for (let i = 0; i < DRIVERS.length; i++) {
+    let driver: MatchMakerDriver;
+
+    describe(`Driver:${DRIVERS[i].name}`, () => {
+      beforeEach(async () => {
+        driver = new DRIVERS[i]();
+        await driver.clear();
+      });
+
+      afterEach(async () => {
+        await driver.shutdown();
+      });
+
+      async function createAndSave(data: Partial<IRoomListingData>) {
+        const cache = driver.createInstance(data);
+        await cache.save();
+        return cache;
+      }
+
+      it("createInstance, save, find", async () => {
+        const cache = await createAndSave({ roomId: generateId(), name: "one", locked: false, clients: 0, maxClients: 2 });
+        assert.strictEqual(0, cache.clients);
+        assert.strictEqual(false, cache.locked);
+        assert.strictEqual(2, cache.maxClients);
+
+        const entries = await driver.find({ name: "one" });
+        const cachedEntry = entries[0];
+        assert.strictEqual(1, entries.length);
+        assert.strictEqual(0, cachedEntry.clients);
+        assert.strictEqual(false, cachedEntry.locked);
+        assert.strictEqual(2, cachedEntry.maxClients);
+      });
+
+      it("find / findOne", async () => {
+        await createAndSave({ roomId: generateId(), name: "one", locked: false, clients: 1, maxClients: 2, });
+        await createAndSave({ roomId: generateId(), name: "one", locked: true, clients: 2, maxClients: 2, });
+        await createAndSave({ roomId: generateId(), name: "one", locked: false, clients: 3, maxClients: 4, });
+        const lastEntry = await createAndSave({ roomId: generateId(), name: "one", locked: true, clients: 4, maxClients: 4, });
+
+        const entries = await driver.find({});
+        assert.strictEqual(4, entries.length);
+
+        lastEntry.clients = 3;
+        lastEntry.locked = false;
+        lastEntry.name = "hello";
+        await lastEntry.save();
+
+        const lastEntryCached = await driver.findOne({ name: "hello" })
+        assert.strictEqual("hello", lastEntryCached.name);
+        assert.strictEqual(3, lastEntryCached.clients);
+        assert.strictEqual(false, lastEntryCached.locked);
+      });
+
+    });
+  }
+});
diff --git a/test/IPCTest.ts → bundles/colyseus/test/IPCTest.ts b/test/IPCTest.ts → bundles/colyseus/test/IPCTest.ts
@@ -1,11 +1,11 @@
 import assert from "assert";
 
 import { PRESENCE_IMPLEMENTATIONS } from "./utils";
-import { subscribeIPC, requestFromIPC } from "../src/IPC";
+import { subscribeIPC, requestFromIPC } from "@colyseus/core/build/IPC";
 
 describe("Inter-process Communication", () => {
   for (let i = 0; i < PRESENCE_IMPLEMENTATIONS.length; i++) {
-    const presence = PRESENCE_IMPLEMENTATIONS[i];
+    const presence = new PRESENCE_IMPLEMENTATIONS[i]();
 
     describe(`Using presence: ${presence.constructor.name}`, () => {