@nka212bg/backend-utils 0.1.22 → 0.1.23

package/misc.js

@@ -113,31 +113,22 @@ exports.handlebars = ({ template, ...params } = {}) => {
     return template;
 };
 
-exports.shortCount = (value, type) => {
+exports.shortCount = (value, bites) => {
     value = Number(value);
-    if (isNaN(value)) return value;
+    if (!value) return "";
 
     let units = {
-        trillion: "T",
-        billion: "B",
-        million: "M",
-        thousand: "K",
+        trillion: bites ? "tb" : "T",
+        billion: bites ? "gb" : "B",
+        million: bites ? "mb" : "M",
+        thousand: bites ? "kb" : "K",
     };
 
-    if (type == "disk") {
-        units = {
-            trillion: " tb",
-            billion: " gb",
-            million: " mb",
-            thousand: " kb",
-        };
-    }
-
-    if (value > 1000000000000) return (value / 1000000000000).toFixed(1) + units.trillion;
-    if (value > 1000000000) return (value / 1000000000).toFixed(1) + units.billion;
-    if (value > 1000000) return (value / 1000000).toFixed(1) + units.million;
-    if (value > 1000) return (value / 1000).toFixed(1) + units.thousand;
-    return value + (type == "disk" ? " bites" : "");
+    if (value >= 1000000000000) return (value / 1000000000000).toFixed(1) + units.trillion;
+    if (value >= 1000000000) return (value / 1000000000).toFixed(1) + units.billion;
+    if (value >= 1000000) return (value / 1000000).toFixed(1) + units.million;
+    if (value >= 1000) return (value / 1000).toFixed(1) + units.thousand;
+    return value + (bites ? "bit" : "");
 };
 
 exports.saveFile = (file, destinationPath, callback) => {
@@ -385,26 +376,37 @@ exports.crypto = ({ salt, embedSalt } = {}) => {
     }
 };
 
-exports.secToTime = (seconds) => {
-    if (!(seconds = parseInt(seconds))) return;
-
-    const years = seconds / 60 / 60 / 24 / 30.5 / 12;
-    const months = seconds / 60 / 60 / 24 / 30.5;
-    const days = seconds / 60 / 60 / 24;
-    const hours = seconds / 60 / 60;
-    const minutes = seconds / 60;
-    seconds = parseInt(seconds % 60);
-
-    if (years >= 1) return parseInt(years) + "y " + parseInt(months % 12) + "m " + parseInt(days % 30.5) + "d";
-    if (months >= 1) return parseInt(months) + "m " + parseInt(days % 30.5) + "d " + parseInt(hours % 24) + "h";
-    if (days >= 1) return parseInt(days) + "d " + parseInt(hours % 24) + "h";
-    if (hours >= 1) return parseInt(hours) + "h " + doMinutes(minutes) + "min";
-    return parseInt(minutes) + "min " + (seconds < 10 ? "0" + seconds : seconds) + "s";
-
-    function doMinutes(minutes) {
-        minutes = parseInt(minutes % 60);
-        return minutes < 10 ? "0" + minutes : minutes;
-    }
+exports.secToTime = (sec) => {
+    sec = parseInt(sec);
+    if (!sec) return;
+
+    const SEC_IN_MIN = 60;
+    const SEC_IN_HOUR = 3600;
+    const SEC_IN_DAY = 86400;
+    const SEC_IN_MONTH = SEC_IN_DAY * 30.5;
+    const SEC_IN_YEAR = SEC_IN_MONTH * 12;
+
+    const years = Math.floor(sec / SEC_IN_YEAR);
+    sec %= SEC_IN_YEAR;
+
+    const months = Math.floor(sec / SEC_IN_MONTH);
+    sec %= SEC_IN_MONTH;
+
+    const days = Math.floor(sec / SEC_IN_DAY);
+    sec %= SEC_IN_DAY;
+
+    const hours = Math.floor(sec / SEC_IN_HOUR);
+    sec %= SEC_IN_HOUR;
+
+    const minutes = Math.floor(sec / SEC_IN_MIN);
+    const seconds = sec % SEC_IN_MIN;
+
+    if (years > 0) return `${years}y ${months}m ${days}d`;
+    if (months > 0) return `${months}m ${days}d ${hours}h`;
+    if (days > 0) return `${days}d ${hours}h`;
+    if (hours > 0) return `${hours}h ${String(minutes).padStart(2, "0")}min`;
+
+    return `${minutes}min ${String(seconds).padStart(2, "0")}s`;
 };
 
 exports.urlMetadata = async ({ url }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.22",
+    "version": "0.1.23",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",