homegames-common 1.5.0 → 1.5.2

package/docker-helper.js

@@ -101,7 +101,7 @@ const runGameContainer = async ({
     saveDataPath,
     assetCachePath = null,
     imageName = 'homegames-runner',
-    memoryLimit = '256m',
+    memoryLimit = '128m',
     cpuLimit = '1',
     gameEntryRelative = null,
     noFrame = false,
@@ -148,7 +148,9 @@ const runGameContainer = async ({
     if (assetCachePath) {
         const resolved = path.resolve(assetCachePath);
         if (!fs.existsSync(resolved)) {
-            fs.mkdirSync(resolved, { recursive: true });
+            fs.mkdirSync(resolved, { recursive: true, mode: 0o777 });
+        } else {
+            fs.chmodSync(resolved, 0o777);
         }
         binds.push(`${resolved}:/root/.homegames/asset-cache:rw`);
     }
@@ -178,7 +180,7 @@ const runGameContainer = async ({
             PidsLimit: 64,
             CapDrop: ['ALL'],
             Tmpfs: {
-                '/tmp': 'rw,size=64m',
+                '/tmp': 'rw,size=160m',
             },
             ExtraHosts: extraHosts,
         },

package/game-loader.js

@@ -32,6 +32,7 @@ const squishMap = {
     '130': 'squish-130',
     '135': 'squish-135',
     '136': 'squish-136',
+    '138': 'squish-138',
 };
 
 const DEFAULT_SQUISH_VERSION = '135';
@@ -47,7 +48,7 @@ const parseSquishVersion = (codePath) => {
     const parsed = Parser.parse(code, { ecmaVersion: 'latest', sourceType: 'script' });
 
     const foundGameClasses = parsed.body.filter(
-        n => n.type === 'ClassDeclaration' && n.superClass && n.superClass.name === 'Game'
+        n => n.type === 'ClassDeclaration' && n.superClass && (n.superClass.name === 'Game' || n.superClass.name === 'ViewableGame')
     );
 
     if (foundGameClasses.length !== 1) {

package/game-session-manager.js

@@ -313,6 +313,7 @@ class GameSessionManager {
             try {
                 squishVersion = parseSquishVersion(gamePath);
             } catch (err) {
+                console.log(err);
                 squishVersion = DEFAULT_SQUISH_VERSION;
             }
         } else if (input.versionId) {
@@ -360,11 +361,11 @@ class GameSessionManager {
                     }
                 }
             }
-
+            
             const child = fork(this.childServerPath, [], {
                 env,
                 stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
-                execArgv: ['--max-old-space-size=256'],
+                execArgv: ['--max-old-space-size=64'],
             });
 
             child.send(JSON.stringify({

package/game-session.js

@@ -91,6 +91,7 @@ class GameSession {
         this.squisher.addListener(() => this._broadcastState());
 
         this.gameMetadata = (typeof game.constructor.metadata === 'function') ? game.constructor.metadata() : {};
+        this.maxPlayers = this.gameMetadata.maxPlayers || 64;
         this.aspectRatio = this.gameMetadata.aspectRatio || { x: 16, y: 9 };
 
         // Player / spectator maps  —  values are raw WebSocket objects
@@ -128,6 +129,12 @@ class GameSession {
     // -----------------------------------------------------------------------
 
     addPlayer(playerId, ws, playerOpts = {}) {
+        // Reject if the game is at capacity
+        if (Object.keys(this.players).length >= this.maxPlayers) {
+            try { ws.close(); } catch (e) {}
+            throw new Error('Game is full');
+        }
+
         // If this ID is already connected, disconnect the old one first
         if (this.players[playerId]) {
             this.removePlayer(playerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homegames-common",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Homegames common tools",
   "main": "index.js",
   "scripts": {