Skip to content

Commit

Permalink
avoid Buffer deprecation warnings; 1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
andrasq committed Nov 5, 2019
1 parent 0475502 commit 0f5a042
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion lib/qrpc-message.js
Expand Up @@ -9,6 +9,10 @@

var qinvoke = require('qinvoke');

// fromBuf adapted from `qibl`. Wrapped in eval() for test coverage.
var nodeMajor = parseInt(process.versions.node);
var fromBuf = eval('nodeMajor >= 6 ? Buffer.from : Buffer');

/**
* qrpc message coder
* Options:
Expand Down Expand Up @@ -112,7 +116,7 @@ QrpcMessage.prototype = {
if (ret.e) ret.e = this._extractError(ret.e)
if (m !== undefined) ret.m = m
if (b) ret.b = b
if (ret.b) ret.b = new Buffer(ret.b, 'base64')
if (ret.b) ret.b = fromBuf(ret.b, 'base64')
return ret
},

Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "qrpc",
"version": "1.1.7",
"version": "1.1.8",
"description": "very fast nodejs remote procedure call",
"main": "index.js",
"author": "Andras",
Expand All @@ -20,7 +20,7 @@
],
"scripts": {
"test": "qnit test",
"coverage": "nyc --reporter text --reporter lcov qnit test*",
"coverage": "nyc --reporter text --reporter lcov qnit test/test-*",
"clean": "rm -rf .nyc_output coverage/"
},
"bugs": {
Expand Down
3 changes: 2 additions & 1 deletion test/benchmark.js
Expand Up @@ -10,6 +10,7 @@ if (process.argv[1] && process.argv[1].indexOf('nit') > 0) return

assert = require('assert')
cluster = require('cluster')
qibl = require('qibl');
qrpc = require('../index')
json = { }
//try { json = require('json-simple') } catch (err) { }
Expand Down Expand Up @@ -95,7 +96,7 @@ if (isMaster) {
var data = 1
var data = [1, 2, 3, 4, 5]
var data = {a:1, b:2, c:3, d:4, e:5}
var buf = new Buffer(4000)
var buf = qibl.allocBuf(4000)
var data1k = {}; for (var i=1; i<122; i++) data1k[i] = i; // 1002 byte json string
var logline200 = "200 byte logline string xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n"
var logline2000 = new Array(10+1).join(logline200)
Expand Down

0 comments on commit 0f5a042

Please sign in to comment.