gamerpc 7.1.2 → 8.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gamerpc",
-  "version": "7.1.2",
+  "version": "8.0.1",
   "author": "bookmansoft <ceo@920.cc>",
   "contributors": [
     "bookmansoft <ceo@920.cc>"
@@ -18,7 +18,7 @@
     "cloud"
   ],
   "description": "connector for gamecloud & gamegold",
-  "main": "./lib/gamerpc7.1.2.js",
+  "main": "index.js",
   "scripts": {
     "test": "mocha",
     "build": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env NODE_ENV=production webpack ./src/index.js --mode=production"
@@ -32,13 +32,10 @@
   },
   "homepage": "https://github.com/bookmansoft/gamegoldtoolkit#readme",
   "dependencies": {
-    "create-hmac": "1.1.7",
-    "elliptic": "^6.5.4",
-    "node-fetch": "^2.6.1",
+    "gamerpc": "^8.0.0",
     "socket.io-client": "^4.7.2"
   },
   "devDependencies": {
-    "mocha": "^10.2.0",
     "babel": "^6.23.0",
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.5",
@@ -47,6 +44,10 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "cross-env": "^5.2.1",
+    "mocha": "^10.2.0",
+    "create-hmac": "1.1.7",
+    "elliptic": "^6.5.4",
+    "node-fetch": "^2.6.1",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.2"
   }

package/src/gameConn.js

@@ -1,10 +1,10 @@
-const {stringify, NotifyType, encrypt, decrypt, extendObj, CommStatus, clone, ReturnCodeName, ReturnCode, CommMode, createHmac} = require('./utils/util');
+//const {encrypt, decrypt, createHmac} = require('./utils/util');
+const {stringify, NotifyType, extendObj, CommStatus, clone, ReturnCodeName, ReturnCode, CommMode, io} = 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')
-const ioclient = require('./utils/socket.io.min.js');
+// const assert = require('./utils/assert')
+// let {sha1, hash160, hash256, verifyData, generateKey, signObj, verifyObj, verifyAddress} = require('./utils/verifyData');
+// const Secret = require('./utils/secret')
 
 /**
  * RPC控件
@@ -58,7 +58,7 @@ class Remote {
 
         this.close();
 
-        this.socket = ioclient(`${this.config.UrlHead}://${ip}:${port}`, {'force new connection': true});
+        this.socket = io(`${this.config.UrlHead}://${ip}:${port}`, {'force new connection': true});
         this.socket.on('notify', ret => {//监听推送消息
             if(this.notifyHandles[ret.type]) {
                 this.notifyHandles[ret.type](ret.info);
@@ -684,22 +684,22 @@ class Remote {
 }
 
 Remote.prototype.CommMode = CommMode;
-Remote.prototype.createHmac = createHmac;
-Remote.prototype.assert = assert;
+// 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.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;
+// Remote.prototype.Secret = Secret;
+// Remote.prototype.hash256 = hash256;
+// Remote.prototype.hash160 = hash160;
+// Remote.prototype.sha1 = sha1;
 
 module.exports = Remote;

package/src/index.js

@@ -13,37 +13,35 @@ Array.prototype.randObj = function() {
     }
 }
 
-const assert = require('./utils/assert')
-const {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')
+//const assert = require('./utils/assert')
+const {CommStatus, ReturnCode, CommMode, NotifyType, stringify} = require('./utils/util');
+//const {createHmac, encrypt, decrypt} = require('./utils/util');
+// let {sha1, hash160, hash256, verifyData, generateKey, signObj, verifyObj, verifyAddress} = require('./utils/verifyData');
+// const Secret = require('./utils/secret')
 
 const toolkit = exports;
 
-//主网连接器
-toolkit.conn = require('./authConn');
-
 //游戏云连接器
 toolkit.gameconn = require('./gameConn');
 
 //实用函数列表
-toolkit.assert = assert;
+//toolkit.assert = assert;
 toolkit.stringify = stringify;
-toolkit.encrypt = encrypt;
-toolkit.decrypt = decrypt;
-toolkit.verifyData = verifyData;
-toolkit.generateKey = generateKey;
-toolkit.signObj = signObj;
-toolkit.verifyObj = verifyObj;
-toolkit.verifyAddress = verifyAddress;
+// toolkit.encrypt = encrypt;
+// toolkit.decrypt = decrypt;
+// toolkit.verifyData = verifyData;
+// toolkit.generateKey = generateKey;
+// toolkit.signObj = signObj;
+// toolkit.verifyObj = verifyObj;
+// toolkit.verifyAddress = verifyAddress;
 toolkit.CommMode = CommMode;
 toolkit.CommStatus = CommStatus;
 toolkit.ReturnCode = ReturnCode;
 toolkit.NotifyType = NotifyType;
-toolkit.createHmac = createHmac;
-toolkit.Secret = Secret;
-toolkit.hash256 = hash256;
-toolkit.hash160 = hash160;
-toolkit.sha1 = sha1;
+// toolkit.createHmac = createHmac;
+// toolkit.Secret = Secret;
+// toolkit.hash256 = hash256;
+// toolkit.hash160 = hash160;
+// toolkit.sha1 = sha1;
 
 global.toolkit = toolkit;

package/src/utils/util.js

@@ -5,11 +5,16 @@
 
 'use strict';
 
-const assert = require('assert');
+//const assert = require('assert');
 const nodeUtil = require('util');
-const aes = require('./aes');
-const createHmac = require('create-hmac/browser');
-const Buffer = require('safe-buffer').Buffer
+// const aes = require('./aes');
+// const createHmac = require('create-hmac/browser');
+const io = require('socket.io-client');
+// const Buffer = require('safe-buffer').Buffer
+
+function assert(ok) {
+  throw new Error('something wrong');
+}
 
 /**
  * @exports utils/util
@@ -81,73 +86,6 @@ util.sprintf = function sprintf() {
   return o.join('');
 }
 
-/**
-* 加密方法
-* @param key    加密key
-* @param iv     向量
-* @param data   需要加密的数据
-* @returns string
-*/
-util.encrypt = function encrypt(key, iv, data) {
-    if(!Buffer.isBuffer(key)) {
-        assert(typeof key === 'string');
-        key = Buffer.from(key, 'binary')
-    }
-
-    if(!Buffer.isBuffer(iv)) {
-        assert(typeof iv === 'string');
-        iv = Buffer.from(iv, 'binary')
-    }
-
-    if(!Buffer.isBuffer(data)) {
-        assert(typeof data === 'string');
-        data = Buffer.from(data, 'binary')
-    }
-
-    var crypted = aes.encipher(data, key, iv);
-
-    crypted = Buffer.from(crypted, 'binary');
-    
-    let ret = Buffer.alloc(crypted.length*2);
-    for(let i = 0; i < crypted.length; i++){
-        ret[2*i] = (crypted[i] >> 4) + 97;
-        ret[2*i+1] = (crypted[i] & 0x0F) + 97;
-    }
-    return ret.toString('binary');
-};
-
-/**
-* 解密方法
-* @param key    解密的key
-* @param iv     向量
-* @param data   密文
-* @returns string
-*/
-util.decrypt = function decrypt(key, iv, data) {
-    if(!Buffer.isBuffer(key)) {
-        assert(typeof key === 'string');
-        key = Buffer.from(key, 'binary')
-    }
-
-    if(!Buffer.isBuffer(iv)) {
-        assert(typeof iv === 'string');
-        iv = Buffer.from(iv, 'binary')
-    }
-
-    if(!Buffer.isBuffer(data)) {
-        assert(typeof data === 'string');
-        data = Buffer.from(data, 'binary')
-    }
-
-    let ret = Buffer.alloc(data.length/2);
-    for(let i = 0; i < ret.length; i++){
-        ret[i] = ((data[i*2]-97)<<4) | (data[i*2+1]-97);
-    }
-
-    var decoded = aes.decipher(ret, key, iv);
-    return decoded.toString('binary');
-};
-
 /**
  * Test whether a number is Number,
  * finite, and below MAX_SAFE_INTEGER.
@@ -258,9 +196,10 @@ util.stringify = function(data, exclude) {
       }
     });
     return base;
-  } else if(Buffer.isBuffer(data)) {
-    return data.toString('base64');
   }
+  // else if(Buffer.isBuffer(data)) {
+  //   return data.toString('base64');
+  // }
   
   return data;
 }
@@ -655,40 +594,40 @@ util.random = function random(min, max) {
 /**
  * Create a 32 or 64 bit nonce.
  * @param {Number} size
- * @returns {Buffer}
+ * @returns {*}
  */
 
-util.nonce = function nonce(size) {
-  let n, data;
-
-  if (!size)
-    size = 8;
-
-  switch (size) {
-    case 8:
-      data = Buffer.allocUnsafe(8);
-      n = util.random(0, 0x100000000);
-      data.writeUInt32LE(n, 0, true);
-      n = util.random(0, 0x100000000);
-      data.writeUInt32LE(n, 4, true);
-      break;
-    case 4:
-      data = Buffer.allocUnsafe(4);
-      n = util.random(0, 0x100000000);
-      data.writeUInt32LE(n, 0, true);
-      break;
-    default:
-      assert(false, 'Bad nonce size.');
-      break;
-  }
-
-  return data;
-};
+// util.nonce = function nonce(size) {
+//   let n, data;
+
+//   if (!size)
+//     size = 8;
+
+//   switch (size) {
+//     case 8:
+//       data = Buffer.allocUnsafe(8);
+//       n = util.random(0, 0x100000000);
+//       data.writeUInt32LE(n, 0, true);
+//       n = util.random(0, 0x100000000);
+//       data.writeUInt32LE(n, 4, true);
+//       break;
+//     case 4:
+//       data = Buffer.allocUnsafe(4);
+//       n = util.random(0, 0x100000000);
+//       data.writeUInt32LE(n, 0, true);
+//       break;
+//     default:
+//       assert(false, 'Bad nonce size.');
+//       break;
+//   }
+
+//   return data;
+// };
 
 /**
  * String comparator (memcmp + length comparison).
- * @param {Buffer} a
- * @param {Buffer} b
+ * @param {*} a
+ * @param {*} b
  * @returns {Number} -1, 1, or 0.
  */
 
@@ -723,26 +662,26 @@ util.mb = function mb(size) {
 
 /**
  * Find index of a buffer in an array of buffers.
- * @param {Buffer[]} items
- * @param {Buffer} data - Target buffer to find.
+ * @param {buffer[]} items
+ * @param {buffer} data - Target buffer to find.
  * @returns {Number} Index (-1 if not found).
  */
 
-util.indexOf = function indexOf(items, data) {
-  assert(Array.isArray(items));
-  assert(Buffer.isBuffer(data));
+// util.indexOf = function indexOf(items, data) {
+//   assert(Array.isArray(items));
+//   assert(Buffer.isBuffer(data));
 
-  for (let i = 0; i < items.length; i++) {
-    const item = items[i];
+//   for (let i = 0; i < items.length; i++) {
+//     const item = items[i];
 
-    assert(Buffer.isBuffer(item));
+//     assert(Buffer.isBuffer(item));
 
-    if (item.equals(data))
-      return i;
-  }
+//     if (item.equals(data))
+//       return i;
+//   }
 
-  return -1;
-};
+//   return -1;
+// };
 
 /**
  * Convert a number to a padded uint8
@@ -1284,7 +1223,7 @@ const CommMode = {
  */
 const NotifyType = {
     none: 0,            //测试消息
-    test: 9999,         //测试消息
+    test: 9999,            //测试消息
 };
 
 function Base64() {
@@ -1390,17 +1329,6 @@ function Base64() {
 	}
 }
 
-/**
- * 利用HMAC算法，以及令牌固定量和令牌随机量，计算访问令牌
- * @param {*} token
- * @param {*} random
- */
-function signHMAC(token, random) {
-    var hmac = createHmac('sha256', random);
-    let sig = hmac.update(token).digest('hex');
-    return sig;
-}
-
 /**
  * 扩展对象，用于多个对象之间的属性注入
  * @note 对属性(get set)复制不会成功
@@ -1516,13 +1444,13 @@ function clone(obj) {
     throw new Error("Unable to copy obj! Its type isn't supported.");
 }
 
+util.io = io;
 util.Base64 = Base64;
-util.signHMAC = signHMAC;
 util.ReturnCode = ReturnCode;
 util.ReturnCodeName = ReturnCodeName;
 util.CommMode = CommMode;
 util.NotifyType = NotifyType;
-util.createHmac = createHmac;
+// util.createHmac = createHmac;
 util.extendObj = extendObj;
 util.clone = clone;
 util.CommStatus = CommStatus;

package/test/game/auth.js

@@ -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/kow.js

@@ -0,0 +1,43 @@
+/**
+ * 联机单元测试：游戏登录测试流程
+ */
+
+//连接配置信息
+const config = {
+  UrlHead: "http",              //协议选择: http/https
+  webserver: { 
+      "host": "127.0.0.1",      //远程主机地址
+      "port": 9901              //远程主机端口
+  },
+  logicserver: {},
+  oemInfo: {                    //模拟用户信息
+    domain: 'CoreOfKow',        //指定访问的逻辑服务器类型
+    openid: `bxs.15699999936`,  //用户标识
+    token: '',                  //用户令牌，由920客户端向920服务端索取并填充于此
+  },
+}
+
+//长连接中，下行通告的类型定义
+const NotifyType = {
+  action: 1,          //体力数值推送
+};  
+
+//引入长连接组件
+let {gameconn} = require('../../index');
+let connector = new gameconn(config)
+  .setFetch(require('node-fetch'));      //设置node服务端环境下兼容的fetch函数，**注意只在node服务端环境下需要，浏览器环境中系统自带 fetch 函数**
+
+connector.setmode(connector.CommMode.ws).watch(msg => {
+    console.log('收到下行消息', msg);
+}, NotifyType.action);
+
+(async function() {
+  console.log('start login...');
+  try {
+    let ret = await connector.login(config.oemInfo);
+    console.log('end login...');
+    console.log(config.oemInfo, ret);
+  } catch(e) {
+    console.log(e);
+  }
+})();

package/test/game/mgr.js

@@ -0,0 +1,80 @@
+d:\workshop\gitee\vallnetserver\test\kow.socket.js/**
+ * 联机单元测试：远程管理
+ */
+
+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);
+        }
+    });
+});