From 15c6fce6483756cbcfb0b161e98e2a5797462951 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sun, 4 Aug 2024 12:52:52 -0500 Subject: [PATCH] Remove duplicate dependency ms --- server/libs/jsonwebtoken/lib/timespan.js | 17 ++- server/libs/ms/LICENSE | 21 ---- server/libs/ms/index.js | 153 ----------------------- 3 files changed, 8 insertions(+), 183 deletions(-) delete mode 100644 server/libs/ms/LICENSE delete mode 100644 server/libs/ms/index.js diff --git a/server/libs/jsonwebtoken/lib/timespan.js b/server/libs/jsonwebtoken/lib/timespan.js index 4d4574c2..4ef58513 100644 --- a/server/libs/jsonwebtoken/lib/timespan.js +++ b/server/libs/jsonwebtoken/lib/timespan.js @@ -1,18 +1,17 @@ -var ms = require('../../ms'); +const ms = require('ms') module.exports = function (time, iat) { - var timestamp = iat || Math.floor(Date.now() / 1000); + var timestamp = iat || Math.floor(Date.now() / 1000) if (typeof time === 'string') { - var milliseconds = ms(time); + var milliseconds = ms(time) if (typeof milliseconds === 'undefined') { - return; + return } - return Math.floor(timestamp + milliseconds / 1000); + return Math.floor(timestamp + milliseconds / 1000) } else if (typeof time === 'number') { - return timestamp + time; + return timestamp + time } else { - return; + return } - -}; \ No newline at end of file +} diff --git a/server/libs/ms/LICENSE b/server/libs/ms/LICENSE deleted file mode 100644 index 69b61253..00000000 --- a/server/libs/ms/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Zeit, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/server/libs/ms/index.js b/server/libs/ms/index.js deleted file mode 100644 index 31a3ec72..00000000 --- a/server/libs/ms/index.js +++ /dev/null @@ -1,153 +0,0 @@ -// -// used by jsonwebtoken -// Source: https://github.com/vercel/ms -// - -var s = 1000; -var m = s * 60; -var h = m * 60; -var d = h * 24; -var y = d * 365.25; - -/** - * Parse or format the given `val`. - * - * Options: - * - * - `long` verbose formatting [false] - * - * @param {String|Number} val - * @param {Object} [options] - * @throws {Error} throw an error if val is not a non-empty string or a number - * @return {String|Number} - * @api public - */ - -module.exports = function (val, options) { - options = options || {}; - var type = typeof val; - if (type === 'string' && val.length > 0) { - return parse(val); - } else if (type === 'number' && isNaN(val) === false) { - return options.long ? fmtLong(val) : fmtShort(val); - } - throw new Error( - 'val is not a non-empty string or a valid number. val=' + - JSON.stringify(val) - ); -}; - -/** - * Parse the given `str` and return milliseconds. - * - * @param {String} str - * @return {Number} - * @api private - */ - -function parse(str) { - str = String(str); - if (str.length > 100) { - return; - } - var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec( - str - ); - if (!match) { - return; - } - var n = parseFloat(match[1]); - var type = (match[2] || 'ms').toLowerCase(); - switch (type) { - case 'years': - case 'year': - case 'yrs': - case 'yr': - case 'y': - return n * y; - case 'days': - case 'day': - case 'd': - return n * d; - case 'hours': - case 'hour': - case 'hrs': - case 'hr': - case 'h': - return n * h; - case 'minutes': - case 'minute': - case 'mins': - case 'min': - case 'm': - return n * m; - case 'seconds': - case 'second': - case 'secs': - case 'sec': - case 's': - return n * s; - case 'milliseconds': - case 'millisecond': - case 'msecs': - case 'msec': - case 'ms': - return n; - default: - return undefined; - } -} - -/** - * Short format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtShort(ms) { - if (ms >= d) { - return Math.round(ms / d) + 'd'; - } - if (ms >= h) { - return Math.round(ms / h) + 'h'; - } - if (ms >= m) { - return Math.round(ms / m) + 'm'; - } - if (ms >= s) { - return Math.round(ms / s) + 's'; - } - return ms + 'ms'; -} - -/** - * Long format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtLong(ms) { - return plural(ms, d, 'day') || - plural(ms, h, 'hour') || - plural(ms, m, 'minute') || - plural(ms, s, 'second') || - ms + ' ms'; -} - -/** - * Pluralization helper. - */ - -function plural(ms, n, name) { - if (ms < n) { - return; - } - if (ms < n * 1.5) { - return Math.floor(ms / n) + ' ' + name; - } - return Math.ceil(ms / n) + ' ' + name + 's'; -}