Skip to content

Commit ff8e039

Browse files
petersirkapetersirka
committed
Update deprecated methods in Node v7.
1 parent 261fef0 commit ff8e039

8 files changed

Lines changed: 81 additions & 69 deletions

File tree

‎bin/tpm‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
'use strict';
44

5-
const VERSION = 'v2.2.0';
5+
const VERSION = 'v3.0.0';
66
const PADDING = 120;
77

88
const Fs = require('fs');
@@ -15,6 +15,7 @@ const Os = require('os');
1515
const EOF = Os.platform() === 'win32' ? '\r\n' : '\n';
1616
const REG_EMPTY = /\s/g;
1717
const isWindows = Os.platform().substring(0, 3).toLowerCase() === 'win';
18+
const NODEVERSION = parseFloat(process.version.toString().replace('v', '').replace(/\./g, ''));
1819

1920
var $type = 0;
2021
var settings = {};
@@ -23,6 +24,15 @@ var colors = { reset: '\x1b[0m', underscore: '\x1b[4m', dim: '\x1b[33m', reverse
2324
var current_repository = 'default';
2425
var current_package = '';
2526

27+
if (NODEVERSION > 699) {
28+
global.createBufferSize = (size) => Buffer.alloc(size || 0);
29+
global.createBuffer = (val, type) => Buffer.from(val || '', type);
30+
} else {
31+
global.createBufferSize = (size) => new Buffer(size || 0);
32+
global.createBuffer = (val, type) => new Buffer(val || '', type);
33+
}
34+
35+
2636
String.prototype.padRight = function(max, c) {
2737
var self = this;
2838
return self + new Array(Math.max(0, max - self.length + 1)).join(c || ' ');
@@ -35,9 +45,9 @@ function Backup() {
3545
this.filename = '';
3646
this.pending = 0;
3747

38-
this.read = { key: new Buffer(0), value: new Buffer(0), status: 0 };
39-
this.bufKey = new Buffer(':');
40-
this.bufNew = new Buffer('\n');
48+
this.read = { key: createBufferSize(), createBufferSize(), status: 0 };
49+
this.bufKey = createBuffer(':');
50+
this.bufNew = createBuffer('\n');
4151

4252
this.complete = function() {};
4353
this.filter = () => true;
@@ -300,8 +310,8 @@ Backup.prototype.restoreValue = function(data) {
300310
self.restoreFile(read.key.toString('utf8').replace(REG_EMPTY, ''), read.value.toString('utf8').replace(REG_EMPTY, ''));
301311

302312
read.status = 0;
303-
read.value = new Buffer(0);
304-
read.key = new Buffer(0);
313+
read.value = createBufferSize();
314+
read.key = createBufferSize();
305315

306316
self.restoreKey(data.slice(index + 1));
307317
};
@@ -364,7 +374,7 @@ Backup.prototype.restoreFile = function(key, value) {
364374
p && self.createDirectory(p);
365375
}
366376

367-
var buffer = new Buffer(value, 'base64');
377+
var buffer = createBuffer(value, 'base64');
368378
self.pending++;
369379

370380
Zlib.gunzip(buffer, function(err, data) {

‎builders.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3516,7 +3516,7 @@ RESTBuilder.prototype.maxlength = function(number) {
35163516
};
35173517

35183518
RESTBuilder.prototype.auth = function(user, password) {
3519-
this.$headers['authorization'] = 'Basic ' + new Buffer(user + ':' + password).toString('base64');
3519+
this.$headers['authorization'] = 'Basic ' + framework_utils.createBuffer(user + ':' + password).toString('base64');
35203520
return this;
35213521
};
35223522

‎changes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- updated: `dependencies` supports up-to-date features e.g. `module (1 day) : https://......js`
2323
- updated: `F.findConnections([path])` a `path` argument is optional
2424
- updated: `U.streamer(beg, [end], function, [skip])` add a new argument `skip`
25+
- updated: deprecated methods in Node.js v7
2526

2627
- removed: behaviours
2728
- removed: restrictions

‎index.js‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6069,10 +6069,10 @@ Framework.prototype.responseContent = function(req, res, code, contentBody, cont
60696069
} else {
60706070
if (gzip) {
60716071
res.writeHead(code, returnHeaders);
6072-
Zlib.gzip(new Buffer(contentBody || ''), (err, data) => res.end(data, ENCODING));
6072+
Zlib.gzip(framework_utils.createBuffer(contentBody), (err, data) => res.end(data, ENCODING));
60736073
} else {
60746074
res.writeHead(code, returnHeaders);
6075-
res.end(contentBody || '', ENCODING);
6075+
res.end(contentBody, ENCODING);
60766076
}
60776077
}
60786078

@@ -6658,7 +6658,7 @@ Framework.prototype._request_continue = function(req, res, headers, protocol) {
66586658
var method = req.method;
66596659
var first = method[0];
66606660
if (first === 'P' || first === 'D') {
6661-
req.buffer_data = new Buffer('');
6661+
req.buffer_data = framework_utils.createBuffer();
66626662
var index = multipart.lastIndexOf(';');
66636663
var tmp = multipart;
66646664
if (index !== -1)
@@ -7481,7 +7481,7 @@ Framework.prototype.testing = function(stop, callback) {
74817481
var buf;
74827482

74837483
if (test.data && test.data.length) {
7484-
buf = new Buffer(test.data, ENCODING);
7484+
buf = framework_utils.createBuffer(test.data, ENCODING);
74857485
test.headers[RESPONSE_HEADER_CONTENTLENGTH] = buf.length;
74867486
}
74877487

@@ -9735,8 +9735,7 @@ Subscribe.prototype.doParsepost = function(chunk) {
97359735
return self;
97369736

97379737
req.buffer_exceeded = true;
9738-
req.buffer_data = new Buffer('');
9739-
9738+
req.buffer_data = framework_utils.createBuffer();
97409739
return self;
97419740
};
97429741

@@ -13313,7 +13312,7 @@ function WebSocketClient(req, socket, head) {
1331313312
this.req = req;
1331413313
// this.isClosed = false;
1331513314
this.errors = 0;
13316-
this.buffer = new Buffer(0);
13315+
this.buffer = framework_utils.createBufferSize();
1331713316
this.length = 0;
1331813317

1331913318
// 1 = raw - not implemented
@@ -13418,7 +13417,7 @@ WebSocketClient.prototype.prepare = function(flags, protocols, allow, length, ve
1341813417
return false;
1341913418

1342013419
var header = protocols.length ? SOCKET_RESPONSE_PROTOCOL.format(self._request_accept_key(self.req), protocols.join(', ')) : SOCKET_RESPONSE.format(self._request_accept_key(self.req));
13421-
self.socket.write(new Buffer(header, 'binary'));
13420+
self.socket.write(framework_utils.createBuffer(header, 'binary'));
1342213421

1342313422
self._id = (self.ip || '').replace(/\./g, '') + U.GUID(20);
1342413423
self.id = self._id;
@@ -13485,13 +13484,13 @@ WebSocketClient.prototype._ondata = function(data) {
1348513484
case 0x09:
1348613485
// ping, response pong
1348713486
self.socket.write(U.getWebSocketFrame(0, '', 0x0A));
13488-
self.buffer = new Buffer(0);
13487+
self.buffer = framework_utils.createBufferSize();
1348913488
self.$ping = true;
1349013489
break;
1349113490
case 0x0a:
1349213491
// pong
1349313492
self.$ping = true;
13494-
self.buffer = new Buffer(0);
13493+
self.buffer = framework_utils.createBufferSize();
1349513494
break;
1349613495
}
1349713496
};
@@ -13510,11 +13509,10 @@ WebSocketClient.prototype.parse = function() {
1351013509
var index = (self.buffer[1] & 0x7f);
1351113510

1351213511
index = (index == 126) ? 4 : (index == 127 ? 10 : 2);
13513-
1351413512
if ((index + length + 4) > (self.buffer.length))
1351513513
return self;
1351613514

13517-
var mask = new Buffer(4);
13515+
var mask = framework_utils.createBufferSize(4);
1351813516
self.buffer.copy(mask, 0, index, index + 4);
1351913517

1352013518
// TEXT
@@ -13537,33 +13535,27 @@ WebSocketClient.prototype.parse = function() {
1353713535
} else
1353813536
self.container.emit('message', self, self.container.config['default-websocket-encodedecode'] === true ? $decodeURIComponent(output) : output);
1353913537
} else {
13540-
var binary = new Buffer(length);
13538+
var binary = framework_utils.createBufferSize(length);
1354113539
for (var i = 0; i < length; i++)
1354213540
binary[i] = self.buffer[index + 4 + i] ^ mask[i % 4];
1354313541
self.container.emit('message', self, new Uint8Array(binary).buffer);
1354413542
}
1354513543

1354613544
self.buffer = self.buffer.slice(index + length + 4, self.buffer.length);
13547-
13548-
if (self.buffer.length >= 2 && U.getMessageLength(self.buffer, F.isLE))
13549-
self.parse();
13550-
13545+
self.buffer.length >= 2 && U.getMessageLength(self.buffer, F.isLE) && self.parse();
1355113546
return self;
1355213547
};
1355313548

1355413549
WebSocketClient.prototype._onerror = function(err) {
1355513550
var self = this;
13556-
1355713551
if (!self || self.isClosed)
1355813552
return;
1355913553

1356013554
if (REG_WEBSOCKET_ERROR.test(err.stack)) {
1356113555
self.isClosed = true;
1356213556
self._onclose();
13563-
return;
13564-
}
13565-
13566-
self.container.emit('error', err, self);
13557+
} else
13558+
self.container.emit('error', err, self);
1356713559
};
1356813560

1356913561
WebSocketClient.prototype._onclose = function() {
@@ -13656,13 +13648,13 @@ function Backup() {
1365613648
this.file = [];
1365713649
this.directory = [];
1365813650
this.path = '';
13659-
this.read = { key: new Buffer(0), value: new Buffer(0), status: 0 };
13651+
this.read = { key: framework_utils.createBufferSize(), value: framework_utils.createBufferSize(), status: 0 };
1366013652
this.pending = 0;
1366113653
this.cache = {};
1366213654
this.complete = NOOP;
1366313655
this.filter = () => true;
13664-
this.bufKey = new Buffer(':');
13665-
this.bufNew = new Buffer('\n');
13656+
this.bufKey = framework_utils.createBuffer(':');
13657+
this.bufNew = framework_utils.createBuffer('\n');
1366613658
}
1366713659

1366813660
Backup.prototype.restoreKey = function(data) {
@@ -13716,8 +13708,8 @@ Backup.prototype.restoreValue = function(data) {
1371613708
self.restoreFile(read.key.toString('utf8').replace(REG_EMPTY, ''), read.value.toString('utf8').replace(REG_EMPTY, ''));
1371713709

1371813710
read.status = 0;
13719-
read.value = new Buffer(0);
13720-
read.key = new Buffer(0);
13711+
read.value = framework_utils.createBufferSize();
13712+
read.key = framework_utils.createBufferSize();
1372113713

1372213714
self.restoreKey(data.slice(index + 1));
1372313715
};
@@ -13780,7 +13772,7 @@ Backup.prototype.restoreFile = function(key, value) {
1378013772
p && self.createDirectory(p);
1378113773
}
1378213774

13783-
var buffer = new Buffer(value, 'base64');
13775+
var buffer = framework_utils.createBuffer(value, 'base64');
1378413776
self.pending++;
1378513777

1378613778
Zlib.gunzip(buffer, function(err, data) {
@@ -13986,7 +13978,7 @@ http.ServerResponse.prototype.send = function(code, body, type) {
1398613978
return self;
1398713979
}
1398813980

13989-
var buffer = new Buffer(body);
13981+
var buffer = framework_utils.createBuffer(body);
1399013982
Zlib.gzip(buffer, function(err, data) {
1399113983

1399213984
if (err) {
@@ -14327,7 +14319,7 @@ http.IncomingMessage.prototype.authorization = function() {
1432714319
var result = { user: '', password: '', empty: true };
1432814320

1432914321
try {
14330-
var arr = new Buffer(authorization.replace('Basic ', '').trim(), 'base64').toString(ENCODING).split(':');
14322+
var arr = framework_utils.createBuffer(authorization.replace('Basic ', '').trim(), 'base64').toString(ENCODING).split(':');
1433114323
result.user = arr[0] || '';
1433214324
result.password = arr[1] || '';
1433314325
result.empty = !result.user || !result.password;

‎internal.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ exports.parseMULTIPART = function(req, contentType, route, tmpDirectory, subscri
115115
parser.onPartBegin = function() {
116116
// Temporary data
117117
tmp = new HttpFile();
118-
tmp.$data = new Buffer('');
118+
tmp.$data = framework_utils.createBufferSize();
119119
tmp.$step = 0;
120120
tmp.$is = false;
121121
tmp.length = 0;
@@ -1308,10 +1308,10 @@ MultipartParser.stateToString = function(stateNumber) {
13081308

13091309
MultipartParser.prototype.initWithBoundary = function(str) {
13101310
var self = this;
1311-
self.boundary = new Buffer(str.length + 4);
1311+
self.boundary = framework_utils.createBufferSize(str.length + 4);
13121312
self.boundary.write('\r\n--', 0, 'ascii');
13131313
self.boundary.write(str, 4, 'ascii');
1314-
self.lookbehind = new Buffer(self.boundary.length + 8);
1314+
self.lookbehind = framework_utils.createBufferSize(self.boundary.length + 8);
13151315
self.state = S.START;
13161316
self.boundaryChars = {};
13171317
for (var i = 0; i < self.boundary.length; i++)

‎mail.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ Mailer.prototype._writemessage = function(obj, buffer) {
581581
message.push('Content-Type: ' + (msg.body.indexOf('<') !== -1 && msg.body.lastIndexOf('>') !== -1 ? 'text/html' : 'text/plain') + '; charset=utf-8');
582582
message.push('Content-Transfer-Encoding: base64');
583583
message.push('');
584-
message.push(prepareBASE64(new Buffer(msg.body.replace(REG_WINLINE, '\n').replace(REG_NEWLINE, CRLF)).toString('base64')));
584+
message.push(prepareBASE64(framework_utils.createBuffer(msg.body.replace(REG_WINLINE, '\n').replace(REG_NEWLINE, CRLF)).toString('base64')));
585585

586586
obj.message = message.join(CRLF);
587587
obj.messagecallback = msg.$callback;
@@ -685,10 +685,10 @@ Mailer.prototype._send = function(obj, options, autosend) {
685685
isAuthorization = true;
686686
if (line.indexOf('XOAUTH') === -1) {
687687
auth.push('AUTH LOGIN');
688-
auth.push(new Buffer(options.user).toString('base64'));
689-
auth.push(new Buffer(options.password).toString('base64'));
688+
auth.push(framework_utils.createBuffer(options.user).toString('base64'));
689+
auth.push(framework_utils.createBuffer(options.password).toString('base64'));
690690
} else
691-
auth.push('AUTH PLAIN ' + new Buffer('\0'+ options.user + '\0' + options.password).toString('base64'));
691+
auth.push('AUTH PLAIN ' + framework_utils.createBuffer('\0'+ options.user + '\0' + options.password).toString('base64'));
692692
}
693693
}
694694

@@ -843,7 +843,7 @@ function prepareBASE64(value) {
843843
}
844844

845845
function unicode_encode(val) {
846-
return val ? '=?utf-8?B?' + new Buffer(val.toString()).toString('base64') + '?=' : '';
846+
return val ? '=?utf-8?B?' + framework_utils.createBuffer(val.toString()).toString('base64') + '?=' : '';
847847
}
848848

849849
// ======================================================

‎nosql.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,7 +2213,7 @@ Binary.prototype.insert = function(name, buffer, callback) {
22132213
}
22142214

22152215
if (typeof(buffer) === 'string')
2216-
buffer = new Buffer(buffer, 'base64');
2216+
buffer = framework_utils.createBuffer(buffer, 'base64');
22172217
else if (buffer.resume)
22182218
return self.insert_stream(null, name, type, buffer, callback);
22192219

@@ -2243,7 +2243,7 @@ Binary.prototype.insert = function(name, buffer, callback) {
22432243
dimension = { width: 0, height: 0 };
22442244

22452245
var h = { name: name, size: size, type: type, width: dimension.width, height: dimension.height, created: F.created };
2246-
var header = new Buffer(BINARY_HEADER_LENGTH);
2246+
var header = framework_utils.createBufferSize(BINARY_HEADER_LENGTH);
22472247
header.fill(' ');
22482248
header.write(JSON.stringify(h));
22492249

@@ -2265,7 +2265,7 @@ Binary.prototype.insert_stream = function(id, name, type, stream, callback) {
22652265
self.check();
22662266

22672267
var h = { name: name, size: 0, type: type, width: 0, height: 0 };
2268-
var header = new Buffer(BINARY_HEADER_LENGTH);
2268+
var header = framework_utils.createBufferSize(BINARY_HEADER_LENGTH);
22692269
header.fill(' ');
22702270
header.write(JSON.stringify(h));
22712271

@@ -2300,7 +2300,7 @@ Binary.prototype.update = function(id, name, buffer, callback) {
23002300
}
23012301

23022302
if (typeof(buffer) === 'string')
2303-
buffer = new Buffer(buffer, 'base64');
2303+
buffer = framework_utils.createBuffer(buffer, 'base64');
23042304

23052305
if (buffer.resume)
23062306
return this.insert_stream(id, name, type, buffer, callback);
@@ -2332,7 +2332,7 @@ Binary.prototype.update = function(id, name, buffer, callback) {
23322332
dimension = { width: 0, height: 0 };
23332333

23342334
var h = { name: name, size: size, type: type, width: dimension.width, height: dimension.height, created: F.datetime };
2335-
var header = new Buffer(BINARY_HEADER_LENGTH);
2335+
var header = framework_utils.createBufferSize(BINARY_HEADER_LENGTH);
23362336
var key = self.db.name + '#' + id;
23372337

23382338
header.fill(' ');
@@ -2361,7 +2361,7 @@ Binary.prototype.read = function(id, callback) {
23612361

23622362
stream.on('error', err => callback(err));
23632363
stream.on('data', function(buffer) {
2364-
var json = new Buffer(buffer, 'binary').toString('utf8').replace(REG_CLEAN, '');
2364+
var json = framework_utils.createBuffer(buffer, 'binary').toString('utf8').replace(REG_CLEAN, '');
23652365
stream = Fs.createReadStream(filename, { start: BINARY_HEADER_LENGTH });
23662366
callback(null, stream, JSON.parse(json));
23672367
});
@@ -2449,7 +2449,7 @@ Binary.prototype.all = function(callback) {
24492449
var stream = Fs.createReadStream(target + '/' + item, { start: 0, end: BINARY_HEADER_LENGTH - 1, encoding: 'binary' });
24502450

24512451
stream.on('data', function(buffer) {
2452-
var json = new Buffer(buffer, 'binary').toString('utf8').replace(REG_CLEAN, '').parseJSON();
2452+
var json = framework_utils.createBuffer(buffer, 'binary').toString('utf8').replace(REG_CLEAN, '').parseJSON();
24532453
if (json) {
24542454
json.id = item.substring(l, item.length - le);
24552455
output.push(json);

0 commit comments

Comments
 (0)