@myvillage/cli 2.8.0 → 2.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/assets/game-toolkit/myvillage-game.js

@@ -136,9 +136,13 @@ function requestHostContext(timeoutMs) {
 // `npm run dev` or the Studio preview — there is no platform session, so it
 // runs in DEV MODE against the public staging match server: open two browser
 // tabs and use the same code (or both press quick match) to play yourself.
+// Inside a host that doesn't provide a session (mode 'unavailable'), every
+// call fails with code 'host_unavailable' — real players never land on the
+// dev server.
 
 const DEFAULT_DEV_SERVER = 'https://myvillage-realtime-staging.myvillage-realtime.workers.dev';
-const CODE_ALPHABET = 'ABCDEFGHJKMNPQRSTUVWXYZ23456789';
+// No vowels (or look-alikes), so random codes can't spell words.
+const CODE_ALPHABET = 'BCDFGHJKMNPQRSTVWXZ23456789';
 
 export class MultiplayerError extends Error {
   constructor(code, message, status) {
@@ -175,40 +179,51 @@ function devPlayerId() {
 
 class Multiplayer {
   constructor(ctx, options) {
-    this.mode = ctx ? 'platform' : 'dev';
+    this.mode = ctx ? 'platform' : standalone ? 'dev' : 'unavailable';
     this._ctx = ctx;
     this._opts = options;
     this._net = null;
     this._ticket = null;
     /** The current match (see MatchView in the platform docs), or null. */
     this.match = null;
-    this.me = { displayName: ctx ? ctx.player.displayName : options.name || 'Player ' + randomCode().slice(0, 3) };
+    // Digits only: random letters can spell words.
+    this.me = { displayName: ctx ? ctx.player.displayName : options.name || 'Player ' + (100 + Math.floor(Math.random() * 900)) };
   }
 
   // ── lobby plumbing ──
 
   /** Host a match. visibility: 'private' (code only) or 'village' (listed + quick match). */
   async host({ visibility = 'private', maxPlayers, lobby } = {}) {
+    this._requireAvailable();
     if (this.mode === 'dev') return this._devMatch(randomCode(), true, lobby);
     return this._enter(await this._api('POST', `/api/v1/games/${this._game()}/matches`, { visibility, maxPlayers, lobby, platform: this._ctx.platform }));
   }
 
   /** Join a match by its code (forgiving: "abc-234" works). */
   async join(code) {
+    this._requireAvailable();
     if (this.mode === 'dev') return this._devMatch(normalizeCode(code), false);
     return this._enter(await this._api('POST', `/api/v1/games/${this._game()}/matches/join`, { code, platform: this._ctx.platform }));
   }
 
   /** Join the fullest open match in the player's villages, or host one. */
   async quickMatch({ lobby } = {}) {
+    this._requireAvailable();
     // Finished match rooms can't be reused, so dev quick match rotates rooms
-    // every 10 minutes; tabs that press it within the same window meet.
-    if (this.mode === 'dev') return this._devMatch('QUICK' + Math.floor(Date.now() / 600000).toString(36).toUpperCase(), false, lobby);
+    // every 10 minutes, and connect() steps through numbered rooms in that
+    // window past any that are finished or full. Tabs follow the same
+    // sequence, so they still meet.
+    if (this.mode === 'dev') {
+      this._devQuickBase = 'QUICK' + Math.floor(Date.now() / 600000).toString(36).toUpperCase();
+      this._devQuickTry = 0;
+      return this._devMatch(this._devQuickBase, false, lobby);
+    }
     return this._enter(await this._api('POST', `/api/v1/games/${this._game()}/matches/quick`, { platform: this._ctx.platform, lobby }));
   }
 
   /** Open village matches the player can join, plus matches they're in. */
   async list() {
+    this._requireAvailable();
     if (this.mode === 'dev') return this.match ? [this.match] : [];
     return (await this._api('GET', `/api/v1/games/${this._game()}/matches`)).matches;
   }
@@ -285,11 +300,25 @@ class Multiplayer {
    * (src/myvillage-realtime.js). Call again after a disconnect to rejoin.
    */
   async connect() {
+    this._requireAvailable();
     if (!this.match) throw new MultiplayerError('no_match', 'Host, join or quick match first.');
-    const ticket = await this._freshTicket();
     const { ArenaClient } = await import('./myvillage-realtime.js');
-    const net = new ArenaClient({ wsUrl: ticket.wsUrl, ticket: ticket.ticket });
-    await net.connect();
+    let net;
+    for (;;) {
+      const ticket = await this._freshTicket();
+      net = new ArenaClient({ wsUrl: ticket.wsUrl, ticket: ticket.ticket });
+      try {
+        await net.connect();
+        break;
+      } catch (err) {
+        // Dev quick match: that room is finished or full — try the next one.
+        const devQuick = this.mode === 'dev' && this._devQuickBase && this.match.code.startsWith(this._devQuickBase);
+        if (!devQuick || this._devQuickTry >= 20 || !/finished|full/i.test(String(err && err.message))) throw err;
+        this._devQuickTry++;
+        this._ticket = null;
+        this._devMatch(this._devQuickBase + '-' + this._devQuickTry, false, this.match.lobby);
+      }
+    }
     this._ticket = null; // single use: a reconnect fetches a fresh one
     this._net = net;
     return net;
@@ -297,6 +326,12 @@ class Multiplayer {
 
   // ── internals ──
 
+  _requireAvailable() {
+    if (this.mode === 'unavailable') {
+      throw new MultiplayerError('host_unavailable', "Multiplayer isn't available here yet.");
+    }
+  }
+
   _game() {
     return encodeURIComponent(this._ctx.game);
   }
@@ -320,9 +355,29 @@ class Multiplayer {
   _enter(result) {
     this.match = result.match;
     this._ticket = result.realtime;
+    this._leaveOnUnload();
     return this.match;
   }
 
+  // Closing the page (or the host's Exit) frees the player's seat in the lobby
+  // straight away rather than when the lobby expires.
+  _leaveOnUnload() {
+    if (this._unloadHooked || !hasWindow) return;
+    this._unloadHooked = true;
+    window.addEventListener('pagehide', () => {
+      if (!this.match || this.mode !== 'platform') return;
+      try {
+        fetch(this._ctx.apiBase + '/api/v1/matches/' + this.match.id + '/leave', {
+          method: 'POST',
+          keepalive: true,
+          headers: { Authorization: 'Bearer ' + this._ctx.playToken },
+        });
+      } catch (_) {
+        // best effort
+      }
+    });
+  }
+
   async _update(body) {
     if (!this.match) throw new MultiplayerError('no_match', 'Not in a match.');
     if (this.mode === 'dev') {
@@ -421,7 +476,7 @@ export const MyVillageGame = {
    *   devServer  — dev-mode match server (defaults to the MyVillage staging server)
    */
   async multiplayer(options = {}) {
-    const ctx = await requestHostContext(standalone ? 300 : 3000);
+    const ctx = await requestHostContext(standalone ? 300 : 10000);
     return new Multiplayer(ctx, options);
   },
 };

package/src/assets/templates/arena/src/lobby.js

@@ -86,6 +86,8 @@ function friendlyError(err) {
       return 'That match has already started.';
     case 'not_in_village':
       return 'You can only play with people from your village.';
+    case 'host_unavailable':
+      return "Multiplayer isn't available in this player yet.";
     case 'no_village':
       return 'Join a village to play multiplayer — you play with your village.';
     default: