gamerpc 8.0.8 → 9.0.1

package/src/utils/util.js

@@ -5,16 +5,11 @@
 
 'use strict';
 
-//const assert = require('assert');
-//const nodeUtil = require('util');
-// 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');
-}
+const assert = require('assert');
+const nodeUtil = require('util');
+const aes = require('./aes');
+const createHmac = require('create-hmac/browser');
+const Buffer = require('safe-buffer').Buffer
 
 /**
  * @exports utils/util
@@ -86,6 +81,73 @@ 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.
@@ -196,10 +258,9 @@ 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;
 }
@@ -413,39 +474,39 @@ util.isSafeAddition = function isSafeAddition(a, b) {
  * @return {String}
  */
 
-// util.inspectify = function inspectify(obj, color) {
-//   if (typeof obj === 'string')
-//     return obj;
+util.inspectify = function inspectify(obj, color) {
+  if (typeof obj === 'string')
+    return obj;
 
-//   inspectOptions.colors = color !== false;
+  inspectOptions.colors = color !== false;
 
-//   return nodeUtil.inspect(obj, inspectOptions);
-// };
+  return nodeUtil.inspect(obj, inspectOptions);
+};
 
-// /**
-//  * Format a string.
-//  * @function
-//  * @param {...String} args
-//  * @returns {String}
-//  */
+/**
+ * Format a string.
+ * @function
+ * @param {...String} args
+ * @returns {String}
+ */
 
-// util.fmt = nodeUtil.format;
+util.fmt = nodeUtil.format;
 
-// /**
-//  * Format a string.
-//  * @param {Array} args
-//  * @param {Boolean?} color
-//  * @return {String}
-//  */
+/**
+ * Format a string.
+ * @param {Array} args
+ * @param {Boolean?} color
+ * @return {String}
+ */
 
-// util.format = function format(args, color) {
-//   if (args.length > 0 && args[0] && typeof args[0] === 'object') {
-//     if (color == null)
-//       color = Boolean(process.stdout && process.stdout.isTTY);
-//     return util.inspectify(args[0], color);
-//   }
-//   return util.fmt(...args);
-// };
+util.format = function format(args, color) {
+  if (args.length > 0 && args[0] && typeof args[0] === 'object') {
+    if (color == null)
+      color = Boolean(process.stdout && process.stdout.isTTY);
+    return util.inspectify(args[0], color);
+  }
+  return util.fmt(...args);
+};
 
 /**
  * Write a message to stdout (console in browser).
@@ -594,40 +655,40 @@ util.random = function random(min, max) {
 /**
  * Create a 32 or 64 bit nonce.
  * @param {Number} size
- * @returns {*}
+ * @returns {Buffer}
  */
 
-// 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 {*} a
- * @param {*} b
+ * @param {Buffer} a
+ * @param {Buffer} b
  * @returns {Number} -1, 1, or 0.
  */
 
@@ -662,26 +723,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
@@ -1223,7 +1284,7 @@ const CommMode = {
  */
 const NotifyType = {
     none: 0,            //测试消息
-    test: 9999,            //测试消息
+    test: 9999,         //测试消息
 };
 
 function Base64() {
@@ -1329,6 +1390,17 @@ 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)复制不会成功
@@ -1444,13 +1516,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('钱包注册登录测试', () => {
+describe.only('钱包注册登录测试', () => {
     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('CRM注册登录', () => {
+describe.only('CRM注册登录', () => {
     it('用户注册 - 通过两阶段认证模式实现', async () => {
     //当用户点击'获取验证码'时执行如下流程：
     let ret = await remote.init(/*初始化连接器，只保留原始配置信息*/).login({

package/test/test.html

@@ -1,43 +1,61 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="../lib/gamerpc1.7.8.js"></script>
+	<meta charset="UTF-8">
+	<title>gamerpc V9.0.0 - 统一工具包测试</title>
+	<script src="../lib/gamerpc9.0.0.js"></script>
 </head>
 <body>
-	<div id='content'></div>
+	<h1>gamerpc V9.0.0 浏览器测试</h1>
+	<div id='content'>加载中...</div>
 	<script>
-		//获取授权式连接器
-		let remote = new toolkit.conn();
+		// V9.0.0 统一入口，通过全局 toolkit 对象访问所有功能
+		console.log('toolkit:', toolkit);
 
-		let gameHelper = new toolkit.gameconn();
+		// 1. 区块链授权式连接器 (V7.1.3 API)
+		var blockchainConn = new toolkit.conn();
+		// 或: new toolkit.authConn();
 
-		//测试签名算法
-		let key = toolkit.generateKey();
-		let obj = {msg:'hello world'};
-		let sg = toolkit.signObj(obj, key.private);
-		let ver = toolkit.verifyObj(obj, sg, key.public);
-		console.log(ver);
+		// 2. 游戏云连接器 (V8.0.8 API)
+		var gameHelper = new toolkit.gameconn();
+		// 或: new toolkit.gameConn();
 
-		//设置连接参数
-		remote.setup({
-			type:   'testnet',            //对等网络类型，分为 testnet 和 main
-			ip:     '127.0.0.1',          //远程全节点地址
-			apiKey: '',        		  	  //远程全节点基本校验密码
-			id:     'primary',            //默认访问的钱包编号
-			cid:    'xxxxxxxx-vallnet-root-xxxxxxxxxxxxxx', //授权节点编号，用于访问远程钱包时的认证
-			token:  '', 									//授权节点令牌固定量，用于访问远程钱包时的认证
-		});
+		// 3. 密码学工具 - 测试签名算法
+		var key = toolkit.generateKey();
+		var obj = {msg: 'hello world'};
+		var sg = toolkit.signObj(obj, key.private);
+		var ver = toolkit.verifyObj(obj, sg, key.public);
+		console.log('签名验证结果:', ver);
+
+		// 4. AES 加解密测试
+		var encKey = '$-._s1ZshKZ6WissH5gOs1ZshKZ6Wiss';
+		var encIv = '$-._aB9601152555';
+		var testData = 'hello gamerpc V9.0.0';
+		var encrypted = toolkit.encrypt(encKey, encIv, testData);
+		var decrypted = toolkit.decrypt(encKey, encIv, encrypted);
+		console.log('加解密测试:', testData === decrypted ? '通过' : '失败');
 
-		(async () => {
-			//查询账户余额
-			let ret = await remote.execute('balance.all', []);
-			document.getElementById('content').innerHTML = JSON.stringify(ret);
-		})();
+		document.getElementById('content').innerHTML = 
+			'<p>版本: <strong>gamerpc V9.0.0</strong></p>' +
+			'<p>签名验证: <strong>' + (ver ? '通过' : '失败') + '</strong></p>' +
+			'<p>AES加解密: <strong>' + (testData === decrypted ? '通过' : '失败') + '</strong></p>' +
+			'<p>连接器: gameconn(游戏云) + authConn(区块链)</p>';
+
+		// 5. 设置区块链连接参数
+		blockchainConn.setup({
+			type:   'testnet',
+			ip:     '127.0.0.1',
+			apiKey: '',
+			id:     'primary',
+			cid:    'xxxxxxxx-vallnet-root-xxxxxxxxxxxxxx',
+			token:  '',
+		});
 
-		gameHelper.events.on('hello', msg=>{
-			console.log(msg);
+		// 6. 事件模型测试
+		gameHelper.events.on('hello', function(msg) {
+			console.log('收到事件:', msg);
 		});
-		gameHelper.events.emit('hello', {id:3});
+		gameHelper.events.emit('hello', {id: 3, msg: 'V9.0.0 ready!'});
 	</script>
 </body>
-</html>
+</html>