From 61bb7b918cb3feaac923ae6dc34817339ed4c12c Mon Sep 17 00:00:00 2001 From: Tchoupinax Date: Wed, 27 Nov 2019 21:38:49 +0100 Subject: [PATCH] lib: replace Date.now function by primordial DateNow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/30689 Reviewed-By: Anna Henningsen Reviewed-By: Michaƫl Zasso Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: David Carlier --- lib/internal/fs/utils.js | 3 ++- lib/readline.js | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js index c43f1528c1343f..e90df6aec81953 100644 --- a/lib/internal/fs/utils.js +++ b/lib/internal/fs/utils.js @@ -2,6 +2,7 @@ const { ArrayIsArray, + DateNow, ObjectSetPrototypeOf, ReflectOwnKeys, } = primordials; @@ -487,7 +488,7 @@ function toUnixTimestamp(time, name = 'time') { } if (Number.isFinite(time)) { if (time < 0) { - return Date.now() / 1000; + return DateNow() / 1000; } return time; } diff --git a/lib/readline.js b/lib/readline.js index e9a0c9d305a3e3..6cbbaca860baee 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -28,6 +28,7 @@ 'use strict'; const { + DateNow, MathCeil, MathFloor, MathMax, @@ -438,7 +439,7 @@ Interface.prototype._normalWrite = function(b) { } let string = this._decoder.write(b); if (this._sawReturnAt && - Date.now() - this._sawReturnAt <= this.crlfDelay) { + DateNow() - this._sawReturnAt <= this.crlfDelay) { string = string.replace(/^\n/, ''); this._sawReturnAt = 0; } @@ -451,7 +452,7 @@ Interface.prototype._normalWrite = function(b) { this._line_buffer = null; } if (newPartContainsEnding) { - this._sawReturnAt = string.endsWith('\r') ? Date.now() : 0; + this._sawReturnAt = string.endsWith('\r') ? DateNow() : 0; // Got one or more newlines; process into "line" events const lines = string.split(lineEnding); @@ -834,14 +835,14 @@ function _ttyWriteDumb(s, key) { switch (key.name) { case 'return': // Carriage return, i.e. \r - this._sawReturnAt = Date.now(); + this._sawReturnAt = DateNow(); this._line(); break; case 'enter': // When key interval > crlfDelay if (this._sawReturnAt === 0 || - Date.now() - this._sawReturnAt > this.crlfDelay) { + DateNow() - this._sawReturnAt > this.crlfDelay) { this._line(); } this._sawReturnAt = 0; @@ -1015,14 +1016,14 @@ Interface.prototype._ttyWrite = function(s, key) { switch (key.name) { case 'return': // Carriage return, i.e. \r - this._sawReturnAt = Date.now(); + this._sawReturnAt = DateNow(); this._line(); break; case 'enter': // When key interval > crlfDelay if (this._sawReturnAt === 0 || - Date.now() - this._sawReturnAt > this.crlfDelay) { + DateNow() - this._sawReturnAt > this.crlfDelay) { this._line(); } this._sawReturnAt = 0;