dou-cl 1.0.0 → 1.0.2

package/src/app.js

@@ -127,7 +127,7 @@ function askHuman(io, engine, state, seat, key) {
           if (skin) printStealthHelp(); else printHelp(key);
           return step();
         }
-        if (low === 'skins' || low === 'skin' ) { printSkinHelp(); return step(); }
+        if (low === 'skins' || low === 'skin') { printSkinHelp(); return step(); }
         if (low === 'quit' || low === 'exit') {
           if (!skin) io.say(colors.dim('已退出本局。'));
           io.close();
@@ -258,11 +258,8 @@ function showMenu(io, opts) {
     io.say('    ' + colors.bold(m[0]) + '  ' + m[2] + '  ' + colors.dim(m[3]));
   });
   io.say('');
-  io.say('   ' + colors.bold('联机'));
-  io.say('    ' + colors.bold('4') + '  创建房间        ' +
-    colors.bold('5') + '  加入房间');
-  io.say('    ' + colors.bold('6') + '  快速匹配        ' +
-    colors.bold('7') + '  本机开服务器');
+  io.say('   ' + colors.bold('联机') + colors.dim('（一个 ip:port 就是一个房间）'));
+  io.say('    ' + colors.bold('4') + '  加入房间          ' + colors.bold('5') + '  开一个房间');
   io.say('');
   io.say('    ' + colors.bold('0') + '  退出');
   io.say('  ' + '\u2500'.repeat(58));
@@ -277,14 +274,14 @@ function showMenu(io, opts) {
         .catch(function (e) { io.say(colors.red('出错: ' + e.message)); showMenu(io, opts); });
       return;
     }
-    if (c === '4' || c === '5' || c === '6') {
-      onlineFlow(io, String(Number(c) - 3), opts).catch(function (e) {
+    if (c === '4') {
+      joinFlow(io, opts).catch(function (e) {
         io.say(colors.red('出错: ' + e.message));
         showMenu(io, opts);
       });
       return;
     }
-    if (c === '7') { startServerFlow(io, opts.port); return; }
+    if (c === '5') { startServerFlow(io, opts); return; }
     io.say(colors.red('没有这个选项：' + c));
     setTimeout(function () { showMenu(io, opts); }, 600);
   });
@@ -296,50 +293,40 @@ function ask(io, prompt) {
   });
 }
 
-async function onlineFlow(io, choice, opts) {
+/** 联机 · 加入房间：问昵称 + 地址，地址本身就是房间 */
+async function joinFlow(io, opts) {
   io.clear();
   io.say('');
-  const name = await ask(io, ' 你的昵称 > ') || '玩家';
-
-  if (choice === '1') {
-    io.say('');
-    io.say(' 选择玩法： 1 斗地主   2 跑得快   3 510K');
-    const g = await ask(io, ' > ');
-    const key = ({ '1': 'doudizhu', '2': 'paodekuai', '3': 'fivek' })[g.trim()] || 'doudizhu';
-    const srv = await ask(io, ' 服务器地址（直接回车 = 本机 ' + opts.server + '） > ') || opts.server;
-    io.close();
-    const client = require('./net/client');
-    await client.runClient(new ui.IO(), { mode: 'create', game: key, name: name, server: srv }, opts);
-    return;
-  }
-
-  if (choice === '2') {
-    const code = await ask(io, ' 房间号（4 位） > ');
-    const srv = await ask(io, ' 服务器地址（直接回车 = 本机 ' + opts.server + '） > ') || opts.server;
-    io.close();
-    const client = require('./net/client');
-    await client.runClient(new ui.IO(), { mode: 'join', code: code.toUpperCase(), name: name, server: srv }, opts);
-    return;
-  }
-
+  io.say(' ' + colors.bold('加入房间') + colors.dim('   填对方的 ip:port 就行'));
   io.say('');
-  io.say(' 选择玩法： 1 斗地主   2 跑得快   3 510K');
-  const g = await ask(io, ' > ');
-  const key = ({ '1': 'doudizhu', '2': 'paodekuai', '3': 'fivek' })[g.trim()] || 'doudizhu';
-  const srv = await ask(io, ' 服务器地址（直接回车 = 本机 ' + opts.server + '） > ') || opts.server;
+  const name = (await ask(io, ' 你的昵称 > ')) || '玩家';
+  const srv = (await ask(io, ' 房间地址 ip:port（回车 = ' + opts.server + '） > ')) || opts.server;
   io.close();
   const client = require('./net/client');
-  await client.runClient(new ui.IO(), { mode: 'match', game: key, name: name, server: srv }, opts);
+  await client.runClient(new ui.IO(), { server: srv, name: name }, opts);
 }
 
-function startServerFlow(io, port) {
+/** 联机 · 本机开一个房间（服务器自己不占座位，别人用 --join 连进来） */
+async function startServerFlow(io, opts) {
   io.clear();
   io.say('');
-  io.say('  启动服务器…（Ctrl+C 停止）');
+  io.say(' ' + colors.bold('开一个房间') + colors.dim('   本机起一个房间，别人连进来'));
+  io.say('');
+  io.say(' 玩法： ' + colors.bold('1') + ' 斗地主   ' + colors.bold('2') + ' 跑得快   ' + colors.bold('3') + ' 510K');
+  const g = await ask(io, ' > ');
+  const key = ({ '1': 'doudizhu', '2': 'paodekuai', '3': 'fivek' })[g.trim()] || 'doudizhu';
+  const p = await ask(io, ' 端口（回车 = ' + opts.port + '） > ');
+  const port = Number(p) || opts.port;
+
+  const rules = rulesMod.get(key);
   const server = require('./net/server');
-  server.createServer({ port: port || 8080 });
-  io.say(colors.dim('  本机 IP 可以用 ipconfig 查，别人执行： npx dou-cl --join <你的IP>:' + (port || 8080)));
-  io.say(colors.dim('  也可以让别人快速匹配： npx dou-cl --match doudizhu --server <你的IP>:' + (port || 8080)));
+  server.createServers({ game: key, ports: [port] });
+
+  io.say('');
+  io.say(colors.dim(' 房间玩法：' + rules.name + '   端口：' + port));
+  io.say(colors.dim(' 把地址发给朋友： npx dou-cl --join <你的IP>:' + port));
+  io.say(colors.dim(' 本机 IP 用 ipconfig 查；服务端自己不占座位。'));
+  io.say(colors.dim(' Ctrl+C 停止。'));
   io.handler = null;
 }
 

package/src/net/client.js

@@ -1,13 +1,26 @@
 'use strict';
 
+/*
+ * 联网客户端 —— 连上一个地址就是进入那个房间。
+ *
+ *   npx dou-cl --join 192.168.1.10:8080
+ *
+ * 规则：**只有「出牌」需要服务器**。
+ * 换皮肤 / reveal / redraw / 帮助 / 退出这些都是纯本地的，任何时刻都能用 ——
+ * 哪怕是别人的回合、你正在等他们出牌。
+ */
+
 const WebSocket = require('ws');
 const ui = require('../ui');
 const bot = require('../bot');
-const gamesMod = require('../games');
 const rulesMod = require('../core/rules');
+const comboMod = require('../core/combo');
+const skinsMod = require('../skins');
 
 const colors = ui.colors;
 
+/* ------------------------------------------------------------------ */
+
 function hintIds(view, seat) {
   const act = bot.hintFromView(view, seat);
   if (act && act.type === 'play' && act.ids && act.ids.length) return act.ids;
@@ -18,245 +31,370 @@ function asciiName(s, fallback) {
   return /^[\x20-\x7e]*$/.test(s || '') ? s : fallback;
 }
 
-async function runClient(io, opts) {
-  const url = (opts.server.indexOf('ws://') === 0 || opts.server.indexOf('wss://') === 0)
-    ? opts.server
-    : 'ws://' + opts.server;
+function toUrl(s) {
+  let v = String(s || '').trim();
+  if (!v) v = '127.0.0.1:8080';
+  if (v.indexOf('ws://') === 0 || v.indexOf('wss://') === 0) return v;
+  if (v.indexOf(':') < 0) v += ':8080';
+  return 'ws://' + v;
+}
+
+/* ------------------------------------------------------------------ */
 
+async function runClient(io, opts) {
+  const url = toUrl(opts.server);
+  const addr = url.replace(/^wss?:\/\//, '');
   const skin0 = ui.skinActive();
-  if (!skin0) io.say(colors.dim('连接中 ' + url + ' …'));
-  else io.block(ui.skinMessage('connect svc=deck-sync addr=' + url));
+
+  if (skin0) io.block(ui.skinMessage('connect svc=deck-sync addr=' + url));
+  else io.say(colors.dim('连接中 ' + addr + ' …'));
 
   const ws = new WebSocket(url);
   let mySeat = -1;
   let lastView = null;
+  let roomInfo = null;
+  let gameKey = opts.game || 'doudizhu';
+  let leaveSent = false;
+  let sigHandler = null;
 
   function sendMsg(o) {
     if (ws.readyState === 1) ws.send(JSON.stringify(o));
   }
 
-  function notify(text) {
-    const m = ui.skinMessage(text);
+  /** 摸鱼模式下只输出 ASCII —— 有 en 就用 en，避免漏出中文 */
+  function pick(msg, en) {
+    return (ui.skinActive() && en) ? en : msg;
+  }
+
+  function notify(msg, en) {
+    const body = pick(msg, en);
+    const m = ui.skinMessage(body);
     if (m !== null) io.block(m);
-    else io.say(colors.dim('· ' + text));
+    else io.say(colors.dim('· ' + body));
   }
 
-  function complain(msg) {
-    if (ui.skinActive()) io.block(ui.skinMessage(msg));
-    else io.say(colors.red(msg));
+  function complain(msg, en) {
+    const body = pick(msg, en);
+    if (ui.skinActive()) io.block(ui.skinMessage('! ' + body));
+    else io.say(colors.red(body));
   }
 
-  function promptTurn(view) {
+  function quit() {
+    if (leaveSent) return;
+    leaveSent = true;
+    sendMsg({ t: 'leave' });
+    try { ws.close(); } catch (e) { /* ignore */ }
+  }
+
+  function isQuit(line) {
+    const low = (line || '').trim().toLowerCase();
+    return low === 'q' || low === 'quit' || low === 'exit' || low === 'leave';
+  }
+
+  /* ---- Ctrl+C：先说一声再走（别人 / 服务器立刻知道） ---- */
+
+  sigHandler = function () {
+    if (leaveSent) { process.exit(0); return; }
+    leaveSent = true;
+    sendMsg({ t: 'leave' });
+    // 给 socket 一点时间把这句话送出去，再退出
+    setTimeout(function () { process.exit(0); }, 150);
+  };
+  process.on('SIGINT', sigHandler);
+
+  function dropSigint() {
+    if (sigHandler) { process.removeListener('SIGINT', sigHandler); sigHandler = null; }
+  }
+
+  /* ---- 帮助 ---- */
+
+  function printHelp(key) {
+    const r = rulesMod.get(key || gameKey);
+    const lines = [r.name + '   ' + r.tagline].concat(r.help || []);
+    lines.push('');
+    lines.push('出牌：34567 或 3 4 5 6 7 ；带花色 5s 5h 5c');
+    lines.push('p=不要  h=提示  ?=帮助  q=离开');
     if (ui.skinActive()) {
-      io.ask(ui.skinPrompt(), function (line) { handleInput(line, view); });
-      return;
+      const s = ui.skinHelp(lines);
+      if (s !== null) { process.stdout.write(s); return; }
     }
-    const prompt = view.phase === 'bid'
-      ? '\n叫分 (0=不叫 1/2/3=叫分, ?=帮助) > '
-      : '\n出牌 (例: 34567 或 5 5 5 6 / p 不要 / h 提示 / ? 帮助) > ';
-    io.ask(prompt, function (line) { handleInput(line, view); });
+    io.say('');
+    lines.forEach(function (l) { io.say('  ' + l); });
+    io.say('');
   }
 
-  function handleInput(line, view) {
-    const low = line.toLowerCase();
+  /* ---- 纯本地命令：任何时刻都该能用 ---- */
+
+  /** @returns true 表示这条输入已经被本地处理掉，不要当作出牌 */
+  function localCommand(line, view) {
+    const low = (line || '').trim().toLowerCase();
     const skin = ui.skinActive();
-    if (!line) { promptTurn(view); return; }
 
     if (skin) {
       if (low === 'reveal' || low === 'real') {
-        process.stdout.write(ui.renderTable(view, mySeat, {}) + '\n');
-        promptTurn(view);
-        return;
+        process.stdout.write(ui.renderTable(view || lastView, mySeat, {}) + '\n');
+        return true;
       }
       if (low === 'redraw' || low === 'rr') {
-        io.block(ui.renderSkin(view, mySeat, {}));
-        promptTurn(view);
-        return;
+        if (view || lastView) io.block(ui.renderSkin(view || lastView, mySeat, {}));
+        return true;
       }
       if (low.indexOf('skin') === 0) {
         const k = low.split(/\s+/)[1];
         if (!k) {
-          ui.skinList().forEach(function (s) { notify(s.key + '  — ' + s.desc); });
+          notify('skins: ' + ui.skinList().map(function (s) { return s.key; }).join(' '),
+            'skins: ' + ui.skinList().map(function (s) { return s.key; }).join(' '));
         } else {
-          try { ui.setSkin(k); notify('skin -> ' + ui.skinKey()); }
-          catch (e) { notify(e.message); }
+          try { ui.setSkin(k); notify('skin -> ' + ui.skinKey(), 'skin -> ' + ui.skinKey()); }
+          catch (e) { notify('no such skin: ' + k, 'no such skin: ' + k); }
         }
-        promptTurn(view);
-        return;
+        return true;
       }
     }
+    if (low === 'help' || low === '?' || low === 'rules') { printHelp(view && view.key); return true; }
+    return false;
+  }
+
+  /* ---- 等待界面 ---- */
+
+  function askWaiting() {
+    const skin = ui.skinActive();
+    const more = !roomInfo || roomInfo.humans < roomInfo.seats;
+    const hint = more ? '[s] 用电脑补齐先开局   [q] 退出' : '[q] 退出';
+    io.ask(skin ? ui.skinPrompt() : '\n' + colors.dim(hint) + ' > ', function (line) {
+      const low = (line || '').trim().toLowerCase();
+      if (isQuit(low)) { quit(); return; }
+      if (low === 's' || low === 'start') { sendMsg({ t: 'start' }); return; }
+      if (low === '?' || low === 'help') { printHelp(roomInfo && roomInfo.game); }
+      askWaiting();
+    });
+  }
+
+  function renderLobby(room) {
+    roomInfo = room;
+    gameKey = room.game;
+    const skin = ui.skinActive();
 
-    if (low === 'help' || low === '?' || low === 'rules') { printHelp(view.key); promptTurn(view); return; }
-    if (low === 'quit' || low === 'exit' || low === 'leave') {
-      sendMsg({ t: 'leave' });
-      if (!skin) io.say('已离开房间。');
-      ws.close();
+    if (skin) {
+      notify('room=' + addr + ' svc=deck-sync game=' + room.game +
+        ' seats=' + room.seats + ' ready=' + room.humans + '/' + room.seats);
+      const nodes = [];
+      for (let i = 0; i < room.seats; i++) {
+        const p = room.players[i];
+        if (!p) nodes.push('slot' + i + '=empty');
+        else if (p.bot) nodes.push('slot' + i + '=worker-' + i);
+        else if (i === mySeat) nodes.push('slot' + i + '=self');
+        else nodes.push('slot' + i + '=' + asciiName(p.name, 'peer' + i));
+      }
+      notify('nodes=[' + nodes.join(' ') + ']');
+      if (room.humans < room.seats) notify('waiting for peers ... (s=fill workers, q=leave)');
+      else notify('lobby ready, starting ...');
+      askWaiting();
       return;
     }
+
+    io.clear();
+    io.say('');
+    io.say(colors.bold(' 房间 ' + addr) + '   ' + colors.dim(room.gameName + ' · ' + room.seats + ' 人'));
+    io.say(' ' + '\u2500'.repeat(52));
+    for (let i = 0; i < room.seats; i++) {
+      const p = room.players[i];
+      let who;
+      if (!p) who = colors.dim('空 · 等待加入');
+      else if (p.bot) who = colors.dim(p.name + '（电脑）');
+      else if (i === mySeat) who = colors.green(p.name + '（你）');
+      else who = p.name;
+      io.say('  ' + (i + 1) + ' 号位   ' + who);
+    }
+    io.say(' ' + '\u2500'.repeat(52));
+    if (room.humans < room.seats) {
+      io.say(colors.dim(' 等待玩家 ' + room.humans + '/' + room.seats +
+        '    朋友加入： npx dou-cl --join ' + addr));
+    } else {
+      io.say(colors.dim(' 人齐了，马上开始…'));
+    }
+    askWaiting();
+  }
+
+  /* ---- 牌局 ---- */
+
+  function promptTurn(view) {
+    if (ui.skinActive()) {
+      io.ask(ui.skinPrompt(), function (line) { onTurnInput(line, view); });
+      return;
+    }
+    const prompt = view.phase === 'bid'
+      ? '\n叫分 (0=不叫 1/2/3=叫分, ?=帮助) > '
+      : '\n出牌 (例: 34567 或 5 5 5 6 / p 不要 / h 提示 / ? 帮助) > ';
+    io.ask(prompt, function (line) { onTurnInput(line, view); });
+  }
+
+  /** 轮到我：本地命令优先，其余当作出牌 */
+  function onTurnInput(line, view) {
+    if (!line) { promptTurn(view); return; }
+    if (isQuit(line)) { quit(); return; }
+    if (localCommand(line, view)) { promptTurn(view); return; }
+    playInput(line, view);
+  }
+
+  /** 不是我的回合：本地命令照样能用，想打牌就告诉他还没轮到你 */
+  function askIdle(view) {
+    const prompt = ui.skinActive() ? ui.skinPrompt()
+      : '\n' + colors.dim('[q] 退出   本地命令随时可用： reveal / redraw / skin <名> / ?') + ' > ';
+    io.ask(prompt, function (line) {
+      if (isQuit(line)) { quit(); return; }
+      if (localCommand(line, view)) { askIdle(view); return; }
+      if ((line || '').trim()) {
+        const hint = ui.skinActive()
+          ? 'not your turn yet  (local: reveal / redraw / skin <name> / help)'
+          : '还没轮到你。本地命令随时可用： reveal / redraw / skin <名> / ?';
+        notify(hint, hint);
+      }
+      askIdle(view);
+    });
+  }
+
+  function playInput(line, view) {
+    const low = line.toLowerCase();
+    const skin = ui.skinActive();
+
     if (view.phase === 'bid') {
       const v = parseInt(line, 10);
-      if (isNaN(v) || v < 0 || v > 3) { complain('叫分只能是 0/1/2/3'); promptTurn(view); return; }
+      if (isNaN(v) || v < 0 || v > 3) {
+        complain('叫分只能是 0/1/2/3', 'bid must be 0 / 1 / 2 / 3');
+        promptTurn(view);
+        return;
+      }
       sendMsg({ t: 'act', action: { type: 'bid', score: v } });
       return;
     }
-    if (low === 'p' || low === 'pass' || line === '不要' || line === '过') {
-      if (!view.canPass) { complain('你是先手，必须出牌'); promptTurn(view); return; }
+    if (low === 'p' || low === 'pass' || line === '不要' || line === '过' || line === '不出') {
+      if (!view.canPass) {
+        complain('你是先手，必须出牌', 'you lead this round, must play');
+        promptTurn(view);
+        return;
+      }
       sendMsg({ t: 'act', action: { type: 'pass' } });
       return;
     }
     if (low === 'h' || low === 'hint' || line === '提示') {
       const ids = hintIds(view, mySeat);
       if (!ids || !ids.length) {
-        complain('没有能管上的牌，只能不要（pass）');
+        complain('没有能管上的牌，只能不要（pass）', 'nothing beats it, must pass');
       } else {
         const cards = view.hand.filter(function (c) { return ids.indexOf(c.id) >= 0; });
-        const combo = require('../core/combo');
-        const co = combo.analyze(cards, rulesMod.get(view.key));
-        const txt = 'hint: ' + ui.handText(cards) + '  [' + (co ? combo.typeName(co.type) : '') + ']';
-        if (skin) io.block(ui.skinMessage(txt)); else io.say(txt);
+        const co = comboMod.analyze(cards, rulesMod.get(view.key));
+        if (skin) {
+          const txt = 'hint ' + cards.map(function (c) { return skinsMod.packet.cardCode(c); }).join(' ') +
+            '  [' + (co ? co.type : '') + ']';
+          io.block(ui.skinMessage(txt));
+        } else {
+          io.say('hint: ' + ui.handText(cards) + '  [' + (co ? comboMod.typeName(co.type) : '') + ']');
+        }
       }
       promptTurn(view);
       return;
     }
 
     const parsed = ui.parseCardInput(line, view.hand);
-    if (!parsed.ok) { complain(parsed.err); promptTurn(view); return; }
+    if (!parsed.ok) { complain(parsed.err, parsed.en); promptTurn(view); return; }
     sendMsg({ t: 'act', action: { type: 'play', ids: parsed.ids } });
   }
 
-  function printHelp(key) {
-    const r = rulesMod.get(key);
-    const lines = [r.name + '   ' + r.tagline].concat(r.help);
-    lines.push('');
-    lines.push('出牌：34567 或 3 4 5 6 7 ；带花色 5s 5h 5c');
-    lines.push('p=不要  h=提示  ?=帮助  quit=离开');
-    if (ui.skinActive()) {
-      const s = ui.skinHelp(lines);
-      if (s !== null) { process.stdout.write(s); return; }
-    }
-    io.say('');
-    lines.forEach(function (l) { io.say('  ' + l); });
-    io.say('');
-  }
-
   function renderState(view) {
     lastView = view;
     const skin = ui.skinActive();
     const skinned = ui.renderSkin(view, mySeat, {});
-    if (skinned !== null) {
-      io.block(skinned);
-    } else {
-      io.clear();
-      process.stdout.write(ui.renderTable(view, mySeat, {}) + '\n');
+    if (skinned !== null) io.block(skinned);
+    else { io.clear(); process.stdout.write(ui.renderTable(view, mySeat, {}) + '\n'); }
+
+    if (view.over) {
+      const txt = (view.result && view.result.text) || '';
+      if (skin) notify('round done  next round soon (q=leave)', 'round done  next round soon (q=leave)');
+      else io.say(colors.dim(' 本局结束，马上开始下一局…（q 退出）'));
+      askIdle(view);
+      return;
     }
-    if (view.over) { askAgain(); return; }
     if (view.turn === mySeat && view.phase !== 'over') {
       promptTurn(view);
     } else {
-      io.handler = null;
       const who = view.seats[view.turn] ? view.seats[view.turn].name : '?';
-      if (skin) io.block(ui.skinMessage('waiting for ' + asciiName(who, 'peer') + ' ...'));
+      if (skin) notify('waiting for ' + asciiName(who, 'peer') + ' ...',
+        'waiting for ' + asciiName(who, 'peer') + ' ...');
       else process.stdout.write(colors.dim(' 等待 ' + who + (view.phase === 'bid' ? ' 叫分…' : ' 出牌…')) + '\n');
+      askIdle(view);
     }
   }
 
-  function askAgain() {
-    io.ask(ui.skinActive() ? ui.skinPrompt() : '\n再来一局？(y/n) > ', function (line) {
-      sendMsg({ t: 'again', yes: /^y/i.test(line.trim()) });
-    });
-  }
-
-  function renderLobby(room) {
-    if (ui.skinActive()) {
-      notify('pool=' + room.code + ' svc=deck-sync game=' + room.game + ' seats=' + room.seats);
-      const nodes = [];
-      for (let i = 0; i < room.seats; i++) {
-        const p = room.players[i];
-        if (!p) nodes.push('slot' + i + '=empty');
-        else if (p.bot) nodes.push('slot' + i + '=worker-' + i);
-        else nodes.push('slot' + i + '=' + asciiName(p.name, i === room.hostSeat ? 'self' : ('peer' + i)));
-      }
-      notify('nodes=[' + nodes.join(' ') + ']');
-      return;
-    }
-    io.clear();
-    io.say('');
-    io.say(colors.bold(' 房间 ' + room.code) + '  ' + colors.dim(room.gameName + ' · ' + room.seats + ' 人'));
-    io.say(' ' + '\u2500'.repeat(50));
-    for (let i = 0; i < room.seats; i++) {
-      const p = room.players[i];
-      io.say('  ' + (i + 1) + '号位  ' + (p ? (p.bot ? colors.dim(p.name + '(电脑)') : p.name) : colors.dim('空')));
-    }
-    io.say(' ' + '\u2500'.repeat(50));
-    io.say(colors.dim(' 把房间号发给朋友，或让他们执行： npx dou-cl --join <地址> --code ' + room.code));
-  }
+  /* ---- 连接 ---- */
 
   ws.on('open', function () {
-    if (!ui.skinActive()) { io.clear(); io.say(colors.green('已连上服务器。')); }
-    if (opts.mode === 'match') sendMsg({ t: 'match', game: opts.game, name: opts.name });
-    else if (opts.mode === 'join') sendMsg({ t: 'join', code: opts.code, name: opts.name });
-    else sendMsg({ t: 'create', game: opts.game, name: opts.name, public: false });
+    if (!ui.skinActive()) { io.clear(); io.say(colors.green('已连上 ' + addr + '，正在进入房间…')); }
+    sendMsg({ t: 'join', name: opts.name });
   });
 
   ws.on('message', function (raw) {
     let m;
     try { m = JSON.parse(String(raw)); } catch (e) { return; }
 
-    if (m.t === 'hello') { opts.games = m.games; return; }
+    if (m.t === 'hello') { gameKey = m.game; return; }
 
-    if (m.t === 'joined') {
+    if (m.t === 'seated') {
       mySeat = m.seat;
-      notify('joined pool=' + m.code + ' slot=' + m.seat);
+      if (ui.skinActive()) notify('seated room=' + addr + ' slot=' + m.seat + ' game=' + gameKey);
       return;
     }
 
-    if (m.t === 'room' || m.t === 'lobby') {
-      if (lastView && !lastView.over) return;
+    if (m.t === 'lobby') {
+      if (lastView && lastView.over) lastView = null;
+      if (m.room.started) return;   // 已经开局了，等 state
       renderLobby(m.room);
-      const isHost = mySeat >= 0 && m.room.hostSeat === mySeat;
-      if (isHost) {
-        io.ask(ui.skinActive() ? ui.skinPrompt()
-          : '\n' + colors.bold('按 Enter 开始游戏（不足的位置由电脑补上）> '),
-        function (line) {
-          const low = line.trim().toLowerCase();
-          if (low === 'q' || low === 'quit') { sendMsg({ t: 'leave' }); ws.close(); return; }
-          sendMsg({ t: 'start' });
-        });
-      } else {
-        io.handler = null;
-        if (ui.skinActive()) io.block(ui.skinMessage('waiting for host ...'));
-        else io.say(colors.dim(' 等房主开始…（输入 quit 离开）'));
-      }
       return;
     }
 
     if (m.t === 'state') { renderState(m.view); return; }
-    if (m.t === 'notice') { notify(m.msg); return; }
+    if (m.t === 'notice') { notify(m.msg, m.en); return; }
+
     if (m.t === 'chat') {
       if (ui.skinActive()) notify(m.who + ': ' + m.msg);
       else io.say(colors.cyan('[' + m.who + '] ') + m.msg);
       return;
     }
+
+    if (m.t === 'full') {
+      complain(m.msg, m.en);
+      if (!ui.skinActive()) {
+        io.say(colors.dim(' 换一个端口，或稍后再来（房间空了就能进）。'));
+      }
+      setTimeout(function () { try { ws.close(); } catch (e) { /* ignore */ } }, 150);
+      return;
+    }
+
     if (m.t === 'error') {
-      complain(m.msg.indexOf('!') === 0 ? m.msg : ('! ' + m.msg));
-      if (mySeat < 0) ws.close();
-      else if (lastView) promptTurn(lastView);
+      complain(m.msg, m.en);
+      if (mySeat < 0) setTimeout(function () { try { ws.close(); } catch (e) { /* ignore */ } }, 150);
+      else if (lastView && !lastView.over) promptTurn(lastView);
       return;
     }
   });
 
   ws.on('close', function () {
+    dropSigint();
     if (!ui.skinActive()) io.say(colors.dim('与服务器的连接已断开。'));
     io.close();
   });
 
   ws.on('error', function (e) {
+    dropSigint();
     if (!ui.skinActive()) {
       io.say(colors.red('连接失败: ' + e.message));
-      io.say(colors.dim('请确认地址/端口正确，且服务端已启动（npx dou-cl --serve）。'));
+      io.say(colors.dim('确认地址/端口正确，且那边已经开了房间（npx dou-cl --serve --port ' +
+        (addr.split(':')[1] || '8080') + '）。'));
+    } else {
+      io.block(ui.skinMessage('! connect failed: ' + e.message));
     }
     io.close();
   });
 }
 
-module.exports = { runClient: runClient };
+module.exports = { runClient: runClient, toUrl: toUrl };