gamerpc 6.0.6 → 7.1.0

package/package.json

@@ -1,52 +1,53 @@
-{
-  "name": "gamerpc",
-  "version": "6.0.6",
-  "author": "bookmansoft <ceo@920.cc>",
-  "contributors": [
-    "bookmansoft <ceo@920.cc>"
-  ],
-  "license": "ISC",
-  "keywords": [
-    "vallnet",
-    "bitcoin",
-    "gamegold",
-    "gamecloud",
-    "gameserver",
-    "gamelogic",
-    "cryptcurrency",
-    "rpc",
-    "cloud"
-  ],
-  "description": "connector for gamecloud & gamegold",
-  "main": "index.js",
-  "scripts": {
-    "test": "mocha",
-    "build": "cross-env NODE_ENV=production webpack src/index.js --mode=production"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bookmansoft/gamegoldtoolkit.git"
-  },
-  "bugs": {
-    "url": "https://github.com/bookmansoft/gamegoldtoolkit/issues"
-  },
-  "homepage": "https://github.com/bookmansoft/gamegoldtoolkit#readme",
-  "dependencies": {
-    "create-hmac": "1.1.7",
-    "elliptic": "^6.5.4",
-    "node-fetch": "^2.6.1",
-    "socket.io-client": "^2.4.0"
-  },
-  "devDependencies": {
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.2",
-    "babel": "^6.23.0",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "cross-env": "^5.2.0"
-  }
-}
+{
+  "name": "gamerpc",
+  "version": "7.1.0",
+  "author": "bookmansoft <ceo@920.cc>",
+  "contributors": [
+    "bookmansoft <ceo@920.cc>"
+  ],
+  "license": "ISC",
+  "keywords": [
+    "vallnet",
+    "bitcoin",
+    "gamegold",
+    "gamecloud",
+    "gameserver",
+    "gamelogic",
+    "cryptcurrency",
+    "rpc",
+    "cloud"
+  ],
+  "description": "connector for gamecloud & gamegold",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env NODE_ENV=production webpack ./src/index.js --mode=production"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bookmansoft/gamegoldtoolkit.git"
+  },
+  "bugs": {
+    "url": "https://github.com/bookmansoft/gamegoldtoolkit/issues"
+  },
+  "homepage": "https://github.com/bookmansoft/gamegoldtoolkit#readme",
+  "dependencies": {
+    "create-hmac": "1.1.7",
+    "elliptic": "^6.5.4",
+    "node-fetch": "^2.6.1",
+    "socket.io-client": "^4.2.0"
+  },
+  "devDependencies": {
+    "mocha": "^10.2.0",
+    "babel": "^6.23.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
+    "cross-env": "^5.2.0",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.2"
+  }
+}

package/src/authConn.js

@@ -4,8 +4,10 @@
  * 通过合适的打包程序，也可以用于浏览器环境
  */
 
-const {io, signHMAC, Base64, CommMode, now} = require('./utils/util')
-const {generateKey, signObj, hash256} = require('./utils/verifyData')
+const assert = require('./utils/assert')
+const {io, 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')
 
 /**
  * 终端配置管理
@@ -567,7 +569,27 @@ class AuthConn
   }
 }
 
+AuthConn.prototype.CommMode = CommMode;
+AuthConn.prototype.createHmac = createHmac;
+AuthConn.prototype.assert = assert;
+AuthConn.prototype.stringify = stringify;
+AuthConn.prototype.encrypt = encrypt;
+AuthConn.prototype.decrypt = decrypt;
+AuthConn.prototype.verifyData = verifyData;
+AuthConn.prototype.generateKey = generateKey;
+AuthConn.prototype.signObj = signObj;
+AuthConn.prototype.verifyObj = verifyObj;
+AuthConn.prototype.verifyAddress = verifyAddress;
+AuthConn.prototype.CommMode = CommMode;
+AuthConn.prototype.CommStatus = CommStatus;
+AuthConn.prototype.ReturnCode = ReturnCode;
+AuthConn.prototype.NotifyType = NotifyType;
+AuthConn.prototype.Secret = Secret;
+AuthConn.prototype.hash256 = hash256;
+AuthConn.prototype.hash160 = hash160;
+AuthConn.prototype.sha1 = sha1;
+
 /**
- * 访问游戏金节点的远程调用函数
+ * 访问全节点的远程调用函数
  */
 module.exports = AuthConn;

package/src/gameConn.js

@@ -1,6 +1,9 @@
-const {extendObj, CommStatus, clone, ReturnCodeName, io, ReturnCode, CommMode, NotifyType} = require('./utils/util');
+const {stringify, NotifyType, encrypt, decrypt, extendObj, CommStatus, clone, ReturnCodeName, io, ReturnCode, CommMode, createHmac} = require('./utils/util');
 const EventEmitter = require('events').EventEmitter;
 const Indicator = require('./utils/Indicator');
+const assert = require('./utils/assert')
+let {sha1, hash160, hash256, verifyData, generateKey, signObj, verifyObj, verifyAddress} = require('./utils/verifyData');
+const Secret = require('./utils/secret')
 
 /**
  * RPC控件
@@ -124,7 +127,7 @@ class Remote {
     async getSign() {
         console.log('gameconn: getSign');
         //此处根据实际需要，发起了基于HTTP请求的认证访问，和本身创建时指定的通讯模式无关。
-        let router = this.userInfo.domain.split('.')[0]; //domain一般由代表验证模式的前缀，加上代表节点类型的后缀组成, 获取签名接口的路由路径默认等于其前缀
+        let router = this.userInfo.openid.split('.')[0]; //openid一般由代表验证模式的前缀，加上代表节点类型的后缀组成, 获取签名接口的路由路径默认等于其前缀
         let msg = await this.getRequest({}, router);
 
         //客户端从模拟网关取得了签名集
@@ -249,8 +252,19 @@ class Remote {
         }
 
         if(options.domain) {
-            let authmode = options.domain.split('.')[0];
+            let authmode = options.openid.split('.')[0];
             switch(authmode) {
+                case 'bxs': { //新增一种验证模式
+                    this.setUserInfo({
+                        domain: options.domain,     //认证模式
+                        openid: options.openid,     //用户证书
+                        openkey: options.openkey,   //中间证书，经由Auth服务器转换成 openid 下发给客户端
+                        auth: options.auth,         //验证信息
+                    }, CommStatus.reqLb);
+
+                    break;
+                }
+
                 case 'authwx': {
                     this.setUserInfo({
                         domain: options.domain,     //认证模式
@@ -668,4 +682,23 @@ class Remote {
     }
 }
 
+Remote.prototype.CommMode = CommMode;
+Remote.prototype.createHmac = createHmac;
+Remote.prototype.assert = assert;
+Remote.prototype.stringify = stringify;
+Remote.prototype.encrypt = encrypt;
+Remote.prototype.decrypt = decrypt;
+Remote.prototype.verifyData = verifyData;
+Remote.prototype.generateKey = generateKey;
+Remote.prototype.signObj = signObj;
+Remote.prototype.verifyObj = verifyObj;
+Remote.prototype.verifyAddress = verifyAddress;
+Remote.prototype.CommStatus = CommStatus;
+Remote.prototype.ReturnCode = ReturnCode;
+Remote.prototype.NotifyType = NotifyType;
+Remote.prototype.Secret = Secret;
+Remote.prototype.hash256 = hash256;
+Remote.prototype.hash160 = hash160;
+Remote.prototype.sha1 = sha1;
+
 module.exports = Remote;

package/src/index.js

@@ -46,42 +46,4 @@ toolkit.hash256 = hash256;
 toolkit.hash160 = hash160;
 toolkit.sha1 = sha1;
 
-toolkit.conn.prototype.assert = assert;
-toolkit.conn.prototype.stringify = stringify;
-toolkit.conn.prototype.encrypt = encrypt;
-toolkit.conn.prototype.decrypt = decrypt;
-toolkit.conn.prototype.verifyData = verifyData;
-toolkit.conn.prototype.generateKey = generateKey;
-toolkit.conn.prototype.signObj = signObj;
-toolkit.conn.prototype.verifyObj = verifyObj;
-toolkit.conn.prototype.verifyAddress = verifyAddress;
-toolkit.conn.prototype.CommMode = CommMode;
-toolkit.conn.prototype.CommStatus = CommStatus;
-toolkit.conn.prototype.ReturnCode = ReturnCode;
-toolkit.conn.prototype.NotifyType = NotifyType;
-toolkit.conn.prototype.createHmac = createHmac;
-toolkit.conn.prototype.Secret = Secret;
-toolkit.conn.prototype.hash256 = hash256;
-toolkit.conn.prototype.hash160 = hash160;
-toolkit.conn.prototype.sha1 = sha1;
-
-toolkit.gameconn.prototype.assert = assert;
-toolkit.gameconn.prototype.stringify = stringify;
-toolkit.gameconn.prototype.encrypt = encrypt;
-toolkit.gameconn.prototype.decrypt = decrypt;
-toolkit.gameconn.prototype.verifyData = verifyData;
-toolkit.gameconn.prototype.generateKey = generateKey;
-toolkit.gameconn.prototype.signObj = signObj;
-toolkit.gameconn.prototype.verifyObj = verifyObj;
-toolkit.gameconn.prototype.verifyAddress = verifyAddress;
-toolkit.gameconn.prototype.CommMode = CommMode;
-toolkit.gameconn.prototype.CommStatus = CommStatus;
-toolkit.gameconn.prototype.ReturnCode = ReturnCode;
-toolkit.gameconn.prototype.NotifyType = NotifyType;
-toolkit.gameconn.prototype.createHmac = createHmac;
-toolkit.gameconn.prototype.Secret = Secret;
-toolkit.gameconn.prototype.hash256 = hash256;
-toolkit.gameconn.prototype.hash160 = hash160;
-toolkit.gameconn.prototype.sha1 = sha1;
-
 global.toolkit = toolkit;

package/test/blockchain/test.js

@@ -38,12 +38,16 @@ describe('模拟测试', () => {
         console.log(ret);
     });
 
+    after(()=>{
+        remote.close();
+    });
+
     it('WS模式监听消息', async () => {
         await remote.setmode(remote.CommMode.ws);
 
         //通过监听收到消息
         remote.watch(msg => {
-            console.log(msg);
+            console.log('客户端收到订阅消息', msg);
         }, 'tx.client');
 
         //获得一个新的地址

package/test/game/auth.js

@@ -18,7 +18,7 @@ const remote = new gameconn({
         //注意：如果需要负载均衡，这里一般指定负载均衡服务器地址，否则直接填写业务主机地址
         "host": "127.0.0.1",        //远程主机地址
         "authPort": 9601,           //签证主机端口
-        "port": 9901                //远程主机端口
+        "port": 2102                //远程主机端口
     },
 }).setFetch(require('node-fetch')); //设置node环境下兼容的fetch函数
 
@@ -32,7 +32,7 @@ let phone_wx = ((Math.random() * 100000000) | 0).toString();
 //用于验证后期绑定成功的用户证书缓存变量
 let authUser = '';
 
-describe.only('钱包注册登录测试', () => {
+describe('钱包注册登录测试', () => {
     it('用户注册并登录 - 使用两阶段认证模式', async () => {
         //执行登录操作，通过配置对象传入用户信息，并指定签证方式为两阶段认证
         let ret = await remote.init(/*初始化连接器，只保留原始配置信息*/).login({

package/test/game/crm.js

@@ -22,7 +22,7 @@ let username = `${(Math.random()*1000000)|0}@vallnet.cn`;
 let password = crypto.createHash("sha1").update(((Math.random()*1000000)|0).toString() + salt).digest("hex");  
 let mobilephone = `139${((Math.random()*100000000)|0).toString()}`;
 
-describe.only('CRM注册登录', () => {
+describe('CRM注册登录', () => {
     it('用户注册 - 通过两阶段认证模式实现', async () => {
     //当用户点击'获取验证码'时执行如下流程：
     let ret = await remote.init(/*初始化连接器，只保留原始配置信息*/).login({

package/test/game/mgr.js

@@ -0,0 +1,80 @@
+/**
+ * 联机单元测试：远程管理
+ */
+
+const assert = require('assert')
+
+//引入游戏云连接器，创建连接器对象
+const {gameconn} = require('../../src/')
+const remote = new gameconn({
+    "UrlHead": "http",              //协议选择: http/https
+    "webserver": { 
+        //注意：如果需要负载均衡，这里一般指定负载均衡服务器地址，否则直接填写业务主机地址
+        "host": "127.0.0.1",        //远程主机地址
+        "authPort": 9601,           //签证主机端口
+        "port": 9901                //远程主机端口
+    },
+}).setFetch(require('node-fetch')); //设置node环境下兼容的fetch函数
+
+//切换为长连模式
+//remote.setmode(remote.CommMode.ws);
+
+//这里需要填充管理员登录信息
+let admin = {
+    openid: '',
+    openkey: '',
+}
+
+describe('远程管理', () => {
+    it.skip('执行索引服远程指令 remote.printInfo', async () => {
+        await remote.init(/*初始化连接器，只保留原始配置信息*/).login({
+            domain: 'CoreOfIndex',
+            openid: admin.openid,
+            openkey: admin.openkey,
+        });
+    
+        let msg = await remote.fetching({func: "remote.printInfo"});
+        console.log(msg);
+    });
+    
+    it.skip('透过索引服执行业务服远程指令 remote.command printInfo', async () => {
+        await remote.init(/*初始化连接器，只保留原始配置信息*/).login({
+            domain: 'CoreOfIndex',
+            openid: admin.openid,
+            openkey: admin.openkey,
+        });
+    
+        let msg = await remote.fetching({func: "remote.command", data: ['printInfo', 'CoreOfChickIOS', '1']});
+        console.log(msg);
+    });
+
+    it('模拟用户注册并登录', async () => {
+        //执行登录操作，通过配置对象传入用户信息，并指定签证方式为两阶段认证
+        let auth = {
+            cpId: 'c376af60-cab5-11ed-90e8-25399b14218a',
+            addr: '10000000',
+            name: 'bookman',
+            bonus: '',
+            time: Date.now(),
+        };
+
+        //需要正确填充 auth.sign, 此处采用模拟命令填充, 注意命令 testSign 只在测试模式下开启
+        await remote.init().login({
+            domain: 'CoreOfIndex',
+            openid: admin.openid,
+            openkey: admin.openkey,
+        });
+        let msg = await remote.fetching({func: "remote.command", data: ['testSign', 'CoreOfChickIOS', '1', auth]});
+        auth.sign = msg['CoreOfChickIOS.1'].sign;
+
+        let ret = await remote.init().login({
+            domain: 'CoreOfChickIOS',      //登录域
+            openid: `bxs.${auth.addr}`,    //用户登录标识，含验证方式
+            auth,
+        });
+        if(!!ret) {
+            ret = await remote.fetching({func: "test.echo"});
+            assert(ret.code == 0);
+        }
+    });
+});