gamerpc 9.0.1 → 9.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gamerpc",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "author": "bookmansoft <ceo@920.cc>",
   "contributors": [
     "bookmansoft <ceo@920.cc>"

package/src/authConn.js

@@ -1,5 +1,5 @@
 /**
- * authConn - 授权式连接器 (V7.1.3)
+ * authConn - 授权式连接器
  *
  * 完整封装了客户端通过授权模式访问远程全节点的方法，仅仅依赖 create-hmac
  * 可以直接用于 node 环境下的服务端程序，来访问远程全节点丰富的API接口
@@ -7,7 +7,8 @@
  */
 
 const assert = require('./utils/assert')
-const {io, signHMAC, Base64, now, CommStatus, createHmac, ReturnCode, CommMode, NotifyType, encrypt, decrypt, stringify} = require('./utils/util');
+const io = require('socket.io-client');
+const {signHMAC, Base64, now, CommStatus, createHmac, ReturnCode, CommMode, NotifyType, encrypt, decrypt, stringify} = require('./utils/util');
 let {sha1, hash160, hash256, verifyData, generateKey, signObj, verifyObj, verifyAddress} = require('./utils/verifyData');
 const Secret = require('./utils/secret')
 

package/src/remote.js

@@ -5,7 +5,8 @@
  * 支持 Notify、JSONP、Watching 等报文通讯模式。
  * 支持 LBS 重定向功能和 HTTPS 协议。
  */
-const { stringify, NotifyType, extendObj, CommStatus, clone, ReturnCodeName, ReturnCode, CommMode, io } = require('./utils/util');
+const { stringify, NotifyType, extendObj, CommStatus, clone, ReturnCodeName, ReturnCode, CommMode } = require('./utils/util');
+const io = require('socket.io-client');
 const EventEmitter = require('events').EventEmitter;
 const Indicator = require('./utils/Indicator');
 

package/test/game/auto.js

@@ -0,0 +1,231 @@
+/**
+ * CoreOfKow GEO 压力测试 — 双模式 (WS / POST)
+ * 用法: node test/game/auto.js --bots=100 --tick=5000
+ *
+ * 顶部 MODE 变量切换连接模式:
+ *   'ws'   — WebSocket 长连接 (使用 gamerpc gameconn)
+ *   'post' — HTTP POST 短连接
+ */
+const MODE = 'ws'; // ← 切换点: 'ws' | 'post'
+
+const readline = require('readline');
+
+const CFG = { host: "127.0.0.1", port: 9901, domain: 'CoreOfKow' };
+const argv = {};
+process.argv.slice(2).forEach(a => { const m = a.match(/^--(\w+)=(.+)$/); if (m) argv[m[1]] = isNaN(m[2]) ? m[2] : parseInt(m[2]); });
+const GEO = { bots: argv.bots || 100, tick: argv.tick || 5000 };
+console.log('[GEO]', JSON.stringify(GEO), 'MODE:', MODE);
+
+// ============================================================
+// POST 模式工具 (仅 POST 模式使用)
+// ============================================================
+const fetch = MODE === 'post' ? require('node-fetch') : null;
+let POST = {};
+if (MODE === 'post') {
+    POST.lHost = "127.0.0.1"; POST.lPort = 9301;
+
+    POST.getServerInfo = async function (oem) {
+        try {
+            const r = await fetch(`http://${CFG.host}:${CFG.port}/index.html`, {
+                method: 'POST', headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ control: 'lb', func: 'getServerInfo', oemInfo: oem })
+            });
+            if (r.status === 200) { const j = await r.json(); if (j.code === 0 && j.data) { POST.lHost = j.data.ip; POST.lPort = j.data.port; } }
+        } catch (_) {}
+    };
+
+    POST.req = async function (body) {
+        try {
+            const r = await fetch(`http://${POST.lHost}:${POST.lPort}/index.html`, {
+                method: 'POST', headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(body)
+            });
+            if (r.status === 200) { const j = await r.json(); return typeof j.code === 'undefined' ? { code: 0, data: j } : j; }
+        } catch (e) { return { code: -1, msg: String(e).slice(0, 40) }; }
+        return { code: -1 };
+    };
+
+    POST.oemFor = (openid) => ({ domain: CFG.domain, openid, auth: { openid, token: openid } });
+}
+
+// ============================================================
+// WS 模式工具 (仅 WS 模式使用)
+// ============================================================
+const { gameconn } = MODE === 'ws' ? require('../../src/index') : { gameconn: null };
+
+// ============================================================
+// 统一 Bot 工厂 — 两种模式对外暴露相同的 { request, oem, close }
+// ============================================================
+async function createBot(openid) {
+    if (MODE === 'ws') {
+        const conn = new gameconn({
+            UrlHead: "http",
+            webserver: { host: CFG.host, port: CFG.port },
+        })
+            .setFetch(require('node-fetch'))
+            .setmode('webSocket');
+
+        const ok = await conn.login({ domain: CFG.domain, openid, auth: {} });
+        const oem = { domain: CFG.domain, openid };
+
+        return {
+            conn,       // 内部引用 (world 快照用)
+            oem,
+            active: ok,
+            async request(params) { return conn.fetching(params); },
+            close() { conn.close(); },
+        };
+    } else {
+        const oem = POST.oemFor(openid);
+        await POST.getServerInfo(oem);
+        const ret = await POST.req({ control: 'index', func: 'login', oemInfo: oem });
+        return {
+            oem,
+            active: ret && ret.code === 0,
+            async request(params) { return POST.req({ ...params, oemInfo: this.oem }); },
+            close() {},
+        };
+    }
+}
+
+// ============================================================
+// 统计
+// ============================================================
+const S = { actions: 0, errors: 0, lat: [], by: {}, ts: Date.now(),
+    rec(act, ms, e) { this.lat.push(ms); if (this.lat.length > 500) this.lat.shift(); if (!this.by[act]) this.by[act] = { ok: 0, err: 0 }; if (e) { this.errors++; this.by[act].err++; } else { this.actions++; this.by[act].ok++; } return this.actions + this.errors; },
+    avg() { const a = this.lat; return a.length ? (a.reduce((x, y) => x + y, 0) / a.length).toFixed(0) : 0; },
+};
+
+// ============================================================
+// 世界快照
+// ============================================================
+async function world(bot) {
+    const [pop, atk, defend, ally, me] = await Promise.all([
+        bot.request({ control: 'P601001', func: 'Execute', oper: 91 }),
+        bot.request({ control: 'P601001', func: 'Execute', oper: 92 }),
+        bot.request({ control: 'P601001', func: 'Execute', oper: 93 }),
+        bot.request({ control: 'P601001', func: 'Execute', oper: 94 }),
+        bot.request({ control: 'P200001', func: 'query' }),
+    ]);
+    const top = (d, k) => d?.data?.list ? d.data.list.slice(0, 3).map(x => x[k] || x.username || x.AllyName || '?').join(', ') : '—';
+    const m = me?.data || {};
+    return `🏆人口:${top(pop, 'VillageName')} | ⚔攻击:${top(atk, 'VillageName')} | 🛡防御:${top(defend, 'VillageName')} | 🏰联盟:${top(ally, 'AllyName')} | 👤你:人口${m.people || '?'} 金币${m.gold || '?'} 钻石${m.diamond || '?'}`;
+}
+
+// ============================================================
+// 行为池 — 统一通过 bot.request() 发送
+// ============================================================
+const A = (ctrl, fn, extra) => bot => bot.request({ control: ctrl, func: fn, ...(extra || {}) });
+
+const B_k = [
+    { w: 8,  e: '👤 ', d: '个人信息',     f: A('P200001', 'query') },
+    { w: 4,  e: '🏆 ', d: '人口排名',     f: A('P601001', 'Execute', { oper: 91 }) },
+    { w: 3,  e: '⚔️ ', d: '攻击排名',     f: A('P601001', 'Execute', { oper: 92 }) },
+    { w: 2,  e: '🛡️ ', d: '防御排名',     f: A('P601001', 'Execute', { oper: 93 }) },
+    { w: 2,  e: '🏰 ', d: '联盟排名',     f: A('P601001', 'Execute', { oper: 94 }) },
+    { w: 1,  e: '👑 ', d: '地区排名',     f: A('P601001', 'Execute', { oper: 95 }) },
+    { w: 2,  e: '👤🔍',d:'查看玩家',      f: A('P500001', 'Execute', { uid: 90 }) },
+    { w: 5,  e: '🗺️ ', d: '大地图',       f: A('P100001', 'Execute', { params: { oper: 'bigmap', d: 0, size: 5 } }) },
+    { w: 3,  e: '🏠 ', d: '回主村',       f: A('P100001', 'Execute', { params: { oper: 'goHome', size: 5 } }) },
+    { w: 4,  e: '🏗️ ', d: '建造升级',     f: A('P200001', 'buildingOper', { oper: 'upgrade' }) },
+    { w: 3,  e: '🏘️ ', d: '开分村',       f: A('P200001', 'createVillage') },
+    { w: 2,  e: '🎪 ', d: '举办庆典',     f: A('P200001', 'partyAction') },
+    { w: 2,  e: '🗼 ', d: '图腾查询',     f: A('P200001', 'totemQuery') },
+    { w: 2,  e: '🐉 ', d: '怪物查询',     f: A('P200001', 'monsterQuery') },
+    { w: 2,  e: '🏰🔍',d:'查看村庄',      f: A('P200001', 'queryThird') },
+    { w: 1,  e: '📜🔍',d:'村庄事件',      f: A('P200001', 'getVillageEvents') },
+    { w: 2,  e: '🤝 ', d: '创建联盟',     f: A('P400001', 'Execute', { oper: 'createAlly', aName: 'GEO_' + Date.now().toString(36), intro: 'test' }) },
+    { w: 2,  e: '🏛️ ', d: '副本列表',     f: A('P100002', 'cityOper', { params: { a: 6 } }) },
+    { w: 2,  e: '🎒 ', d: '道具列表',     f: A('P501001', 'list') },
+    { w: 2,  e: '⚡ ', d: '购买体力',     f: A('P900001', 'purchaseAction') },
+    { w: 3,  e: '🦸 ', d: '英雄列表',     f: A('P502001', 'Execute', { oper: 1 }) },
+];
+
+const ROLE_W = {
+    builder:    [ 8, 4,3,2,2,1, 0,  5,3,  6,6, 4,4,2,2,1,  0, 0, 3,2, 4 ],
+    warlord:    [ 8, 4,5,3,3,1, 2,  5,3,  3,3, 2,2,3,3,1,  5, 0, 3,2, 3 ],
+    trader:     [ 8, 4,2,2,2,1, 0,  3,2,  2,2, 2,2,2,2,1,  0, 0, 4,4, 2 ],
+    adventurer: [ 8, 4,2,2,2,1, 0,  5,3,  2,3, 1,2,4,4,1,  0, 5, 3,2, 3 ],
+    diplomat:   [ 8, 2,2,2,4,1, 2,  3,2,  2,2, 2,2,2,2,1,  8, 0, 3,2, 2 ],
+    raider:     [ 8, 2,5,2,2,1, 2,  5,3,  2,3, 2,2,3,3,1,  2, 0, 3,2, 3 ],
+};
+const ROLE_RATIO = { builder: 2, warlord: 3, trader: 2, adventurer: 1, diplomat: 1, raider: 1 };
+
+function buildPool(weights) {
+    const pool = B_k.map((b, i) => ({ ...b, w: weights[i] || b.w })).filter(b => b.w > 0);
+    let c = 0; pool.forEach(b => { b._min = c; c += b.w; b._max = c; }); return pool;
+}
+function pick(pool) { const r = Math.random() * pool[pool.length - 1]._max; for (const b of pool) if (r >= b._min && r < b._max) return b; return pool[0]; }
+function assignRole() { const r = Math.random() * 10; let c = 0; for (const [k, v] of Object.entries(ROLE_RATIO)) { c += v; if (r <= c) return k; } return 'warlord'; }
+function fmt(ret, ms) { if (!ret) return `❌ ${ms}ms`; return ret.code === 0 ? `✅ ${ms}ms` : `❌ code=${ret.code} ${ms}ms`; }
+
+// ============================================================
+// 主流程
+// ============================================================
+async function main() {
+    const modeLabel = MODE === 'ws' ? 'WS 长连接' : 'HTTP POST';
+    console.log(`\n═══ GEO 压力测试 (${modeLabel}) ═══`);
+    console.log(`bots: ${GEO.bots}  tick: ${GEO.tick}ms  行为: ${B_k.length}种  角色: ${Object.keys(ROLE_RATIO).length}种\n`);
+
+    console.log(`[注册] ${GEO.bots} bots (${modeLabel})...`);
+    const bots = []; const ts = Date.now().toString(36);
+    for (let i = 0; i < GEO.bots; i++) {
+        const openid = `bxs.g${ts}.${i}`;
+        const role = assignRole();
+        const bot = await createBot(openid);
+        bot.role = role;
+        bot.pool = buildPool(ROLE_W[role]);
+        bots.push(bot);
+
+        if ((i + 1) % 50 === 0 || i === GEO.bots - 1) {
+            const okCount = bots.filter(b => b.active).length;
+            const pct = ((i + 1) / GEO.bots * 100).toFixed(0);
+            process.stdout.write(`\r  [${'█'.repeat(pct / 5)}${'░'.repeat(20 - pct / 5)}] ${i + 1}/${GEO.bots}  ✅${okCount}  ❌${i + 1 - okCount}`);
+        }
+    }
+    const ok = bots.filter(b => b.active).length;
+    console.log(`\n  完成! ${ok}/${GEO.bots}`);
+    const rc = {}; bots.forEach(b => { if (!rc[b.role]) rc[b.role] = 0; rc[b.role]++; });
+    console.log('  角色: ' + Object.entries(rc).map(([r, c]) => `${r}×${c}`).join('  ') + '\n');
+    if (!ok) { console.log('登录全部失败'); process.exit(1); }
+
+    console.log('[初始世界快照]\n  ' + await world(bots[0]) + '\n');
+
+    let total = 0, tickNum = 0;
+    const timer = setInterval(async () => {
+        tickNum++;
+        const active = bots.filter(b => b.active);
+        for (let i = active.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)); [active[i], active[j]] = [active[j], active[i]]; }
+        for (const bot of active) {
+            if (Math.random() > 0.35) continue;
+            const act = pick(bot.pool); const st = Date.now();
+            try {
+                const ret = await act.f(bot); const ms = Date.now() - st;
+                total = S.rec(act.e, ms, !ret || ret.code !== 0);
+                if (tickNum <= 2 || Math.random() < 0.008) {
+                    const id = (MODE === 'ws' ? bot.conn?.userInfo?.openid : bot.oem?.openid) || '';
+                    console.log(`  ${act.e}${act.d} [${id.slice(-6)}:${bot.role}] → ${fmt(ret, ms)}`);
+                }
+            } catch (e) { total = S.rec(act.e, Date.now() - st, true); }
+        }
+        if (tickNum % 6 === 0) {
+            const el = ((Date.now() - S.ts) / 1000).toFixed(0);
+            console.log(`\n─── tick#${tickNum}  ${el}s  ${total}请求(${(total / el).toFixed(1)}/s)  err:${S.errors}  avg:${S.avg()}ms ───`);
+            console.log('  ' + Object.entries(S.by).map(([k, v]) => `${k}${v.ok}/${v.ok + v.err}`).join('  '));
+            console.log('  ' + await world(bots[0]));
+        }
+    }, GEO.tick);
+
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.on('line', async (input) => {
+        if (input.trim() === 's') { console.log('\n' + await world(bots[0]) + `\n在线: ${bots.filter(b => b.active).length}/${GEO.bots}`); }
+        else if (input.trim() === 'q') {
+            clearInterval(timer);
+            bots.forEach(b => b.close());
+            console.log(`\n结束 ${total}请求 ${S.errors}错误`);
+            rl.close(); process.exit(0);
+        }
+    });
+    console.log('[交互] s=快照  q=退出\n');
+}
+main().catch(e => { console.error(e); process.exit(1); });