diff --git a/web/assets/js/langs.js b/web/assets/js/langs.js index 823160ad..8681761c 100644 --- a/web/assets/js/langs.js +++ b/web/assets/js/langs.js @@ -62,20 +62,20 @@ const supportLangs = [ ]; function getLang() { - let lang = getCookie("lang"); + let lang = CookieManager.getCookie("lang"); if (!lang) { if (window.navigator) { lang = window.navigator.language || window.navigator.userLanguage; if (isSupportLang(lang)) { - setCookie("lang", lang, 150); + CookieManager.setCookie("lang", lang, 150); } else { - setCookie("lang", "en-US", 150); + CookieManager.setCookie("lang", "en-US", 150); window.location.reload(); } } else { - setCookie("lang", "en-US", 150); + CookieManager.setCookie("lang", "en-US", 150); window.location.reload(); } } @@ -88,7 +88,7 @@ function setLang(lang) { lang = "en-US"; } - setCookie("lang", lang, 150); + CookieManager.setCookie("lang", lang, 150); window.location.reload(); } diff --git a/web/assets/js/model/dbinbound.js b/web/assets/js/model/dbinbound.js index aeae1a75..45301ddd 100644 --- a/web/assets/js/model/dbinbound.js +++ b/web/assets/js/model/dbinbound.js @@ -25,11 +25,11 @@ class DBInbound { } get totalGB() { - return toFixed(this.total / ONE_GB, 2); + return NumberFormatter.toFixed(this.total / SizeFormatter.ONE_GB, 2); } set totalGB(gb) { - this.total = toFixed(gb * ONE_GB, 0); + this.total = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0); } get isVMess() { diff --git a/web/assets/js/model/inbound.js b/web/assets/js/model/inbound.js index 49fc8a7b..5c3235e1 100644 --- a/web/assets/js/model/inbound.js +++ b/web/assets/js/model/inbound.js @@ -1837,11 +1837,11 @@ Inbound.VmessSettings.VMESS = class extends XrayCommonClass { } } get _totalGB() { - return toFixed(this.totalGB / ONE_GB, 2); + return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2); } set _totalGB(gb) { - this.totalGB = toFixed(gb * ONE_GB, 0); + this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0); } }; @@ -1947,11 +1947,11 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass { } } get _totalGB() { - return toFixed(this.totalGB / ONE_GB, 2); + return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2); } set _totalGB(gb) { - this.totalGB = toFixed(gb * ONE_GB, 0); + this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0); } }; Inbound.VLESSSettings.Fallback = class extends XrayCommonClass { @@ -2099,11 +2099,11 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass { } } get _totalGB() { - return toFixed(this.totalGB / ONE_GB, 2); + return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2); } set _totalGB(gb) { - this.totalGB = toFixed(gb * ONE_GB, 0); + this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0); } }; @@ -2263,11 +2263,11 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass { } } get _totalGB() { - return toFixed(this.totalGB / ONE_GB, 2); + return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2); } set _totalGB(gb) { - this.totalGB = toFixed(gb * ONE_GB, 0); + this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0); } }; diff --git a/web/assets/js/util/common.js b/web/assets/js/util/common.js deleted file mode 100644 index 9ad2e01f..00000000 --- a/web/assets/js/util/common.js +++ /dev/null @@ -1,183 +0,0 @@ -const ONE_KB = 1024; -const ONE_MB = ONE_KB * 1024; -const ONE_GB = ONE_MB * 1024; -const ONE_TB = ONE_GB * 1024; -const ONE_PB = ONE_TB * 1024; - -function sizeFormat(size) { - if (size <= 0) return "0 B"; - - if (size < ONE_KB) { - return size.toFixed(0) + " B"; - } else if (size < ONE_MB) { - return (size / ONE_KB).toFixed(2) + " KB"; - } else if (size < ONE_GB) { - return (size / ONE_MB).toFixed(2) + " MB"; - } else if (size < ONE_TB) { - return (size / ONE_GB).toFixed(2) + " GB"; - } else if (size < ONE_PB) { - return (size / ONE_TB).toFixed(2) + " TB"; - } else { - return (size / ONE_PB).toFixed(2) + " PB"; - } -} - -function cpuSpeedFormat(speed) { - if (speed > 1000) { - const GHz = speed / 1000; - return GHz.toFixed(2) + " GHz"; - } else { - return speed.toFixed(2) + " MHz"; - } -} - -function cpuCoreFormat(cores) { - if (cores === 1) { - return "1 Core"; - } else { - return cores + " Cores"; - } -} - -function formatSecond(second) { - if (second < 60) { - return second.toFixed(0) + 's'; - } else if (second < 3600) { - return (second / 60).toFixed(0) + 'm'; - } else if (second < 3600 * 24) { - return (second / 3600).toFixed(0) + 'h'; - } else { - day = Math.floor(second / 3600 / 24); - remain = ((second / 3600) - (day * 24)).toFixed(0); - return day + 'd' + (remain > 0 ? ' ' + remain + 'h' : ''); - } -} - -function addZero(num) { - if (num < 10) { - return "0" + num; - } else { - return num; - } -} - -function toFixed(num, n) { - n = Math.pow(10, n); - return Math.floor(num * n) / n; -} - -function debounce(fn, delay) { - var timeoutID = null; - return function () { - clearTimeout(timeoutID); - var args = arguments; - var that = this; - timeoutID = setTimeout(function () { - fn.apply(that, args); - }, delay); - }; -} - -function getCookie(cname) { - let name = cname + '='; - let ca = document.cookie.split(';'); - for (let i = 0; i < ca.length; i++) { - let c = ca[i]; - while (c.charAt(0) == ' ') { - c = c.substring(1); - } - if (c.indexOf(name) == 0) { - // decode cookie value only - return decodeURIComponent(c.substring(name.length, c.length)); - } - } - return ''; -} - - -function setCookie(cname, cvalue, exdays) { - const d = new Date(); - d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000); - let expires = 'expires=' + d.toUTCString(); - // encode cookie value - document.cookie = cname + '=' + encodeURIComponent(cvalue) + ';' + expires + ';path=/'; -} - -function usageColor(data, threshold, total) { - switch (true) { - case data === null: - return "purple"; - case total < 0: - return "green"; - case total == 0: - return "purple"; - case data < total - threshold: - return "green"; - case data < total: - return "orange"; - default: - return "red"; - } -} - -function clientUsageColor(clientStats, trafficDiff) { - switch (true) { - case !clientStats || clientStats.total == 0: - return "#7a316f"; // purple - case clientStats.up + clientStats.down < clientStats.total - trafficDiff: - return "#008771"; // Green - case clientStats.up + clientStats.down < clientStats.total: - return "#f37b24"; // Orange - default: - return "#cf3c3c"; // Red - } -} - -function userExpiryColor(threshold, client, isDark = false) { - if (!client.enable) { - return isDark ? '#2c3950' : '#bcbcbc'; - } - now = new Date().getTime(), - expiry = client.expiryTime; - switch (true) { - case expiry === null: - return "#7a316f"; // purple - case expiry < 0: - return "#008771"; // Green - case expiry == 0: - return "#7a316f"; // purple - case now < expiry - threshold: - return "#008771"; // Green - case now < expiry: - return "#f37b24"; // Orange - default: - return "#cf3c3c"; // Red - } -} - -function doAllItemsExist(array1, array2) { - for (let i = 0; i < array1.length; i++) { - if (!array2.includes(array1[i])) { - return false; - } - } - return true; -} - -function buildURL({ host, port, isTLS, base, path }) { - if (!host || host.length === 0) host = window.location.hostname; - if (!port || port.length === 0) port = window.location.port; - - if (isTLS === undefined) isTLS = window.location.protocol === "https:"; - - const protocol = isTLS ? "https:" : "http:"; - - port = String(port); - if (port === "" || (isTLS && port === "443") || (!isTLS && port === "80")) { - port = ""; - } else { - port = `:${port}`; - } - - return `${protocol}//${host}${port}${base}${path}`; -} diff --git a/web/assets/js/util/date-util.js b/web/assets/js/util/date-util.js index 50efd6fe..9b4b0f81 100644 --- a/web/assets/js/util/date-util.js +++ b/web/assets/js/util/date-util.js @@ -108,14 +108,14 @@ Date.prototype.setMaxTime = function () { * Formatting date */ Date.prototype.formatDate = function () { - return this.getFullYear() + "-" + addZero(this.getMonth() + 1) + "-" + addZero(this.getDate()); + return this.getFullYear() + "-" + NumberFormatter.addZero(this.getMonth() + 1) + "-" + NumberFormatter.addZero(this.getDate()); }; /** * Format time */ Date.prototype.formatTime = function () { - return addZero(this.getHours()) + ":" + addZero(this.getMinutes()) + ":" + addZero(this.getSeconds()); + return NumberFormatter.addZero(this.getHours()) + ":" + NumberFormatter.addZero(this.getMinutes()) + ":" + NumberFormatter.addZero(this.getSeconds()); }; /** diff --git a/web/assets/js/util/utils.js b/web/assets/js/util/index.js similarity index 76% rename from web/assets/js/util/utils.js rename to web/assets/js/util/index.js index ab7c977a..8a6a4703 100644 --- a/web/assets/js/util/utils.js +++ b/web/assets/js/util/index.js @@ -527,4 +527,146 @@ class Base64 { static decode(content = "") { return window.atob(content) } +} + +class SizeFormatter { + static ONE_KB = 1024; + static ONE_MB = this.ONE_KB * 1024; + static ONE_GB = this.ONE_MB * 1024; + static ONE_TB = this.ONE_GB * 1024; + static ONE_PB = this.ONE_TB * 1024; + + static sizeFormat(size) { + if (size <= 0) return "0 B"; + if (size < this.ONE_KB) return size.toFixed(0) + " B"; + if (size < this.ONE_MB) return (size / this.ONE_KB).toFixed(2) + " KB"; + if (size < this.ONE_GB) return (size / this.ONE_MB).toFixed(2) + " MB"; + if (size < this.ONE_TB) return (size / this.ONE_GB).toFixed(2) + " GB"; + if (size < this.ONE_PB) return (size / this.ONE_TB).toFixed(2) + " TB"; + return (size / this.ONE_PB).toFixed(2) + " PB"; + } +} + +class CPUFormatter { + static cpuSpeedFormat(speed) { + return speed > 1000 ? (speed / 1000).toFixed(2) + " GHz" : speed.toFixed(2) + " MHz"; + } + + static cpuCoreFormat(cores) { + return cores === 1 ? "1 Core" : cores + " Cores"; + } +} + +class TimeFormatter { + static formatSecond(second) { + if (second < 60) return second.toFixed(0) + 's'; + if (second < 3600) return (second / 60).toFixed(0) + 'm'; + if (second < 3600 * 24) return (second / 3600).toFixed(0) + 'h'; + let day = Math.floor(second / 3600 / 24); + let remain = ((second / 3600) - (day * 24)).toFixed(0); + return day + 'd' + (remain > 0 ? ' ' + remain + 'h' : ''); + } +} + +class NumberFormatter { + static addZero(num) { + return num < 10 ? "0" + num : num; + } + + static toFixed(num, n) { + n = Math.pow(10, n); + return Math.floor(num * n) / n; + } +} + +class Utils { + static debounce(fn, delay) { + let timeoutID = null; + return function () { + clearTimeout(timeoutID); + let args = arguments; + let that = this; + timeoutID = setTimeout(() => fn.apply(that, args), delay); + }; + } +} + +class CookieManager { + static getCookie(cname) { + let name = cname + '='; + let ca = document.cookie.split(';'); + for (let c of ca) { + c = c.trim(); + if (c.indexOf(name) === 0) { + return decodeURIComponent(c.substring(name.length, c.length)); + } + } + return ''; + } + + static setCookie(cname, cvalue, exdays) { + const d = new Date(); + d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000); + let expires = 'expires=' + d.toUTCString(); + document.cookie = cname + '=' + encodeURIComponent(cvalue) + ';' + expires + ';path=/'; + } +} + +class ColorUtils { + static usageColor(data, threshold, total) { + switch (true) { + case data === null: return "purple"; + case total < 0: return "green"; + case total == 0: return "purple"; + case data < total - threshold: return "green"; + case data < total: return "orange"; + default: return "red"; + } + } + + static clientUsageColor(clientStats, trafficDiff) { + switch (true) { + case !clientStats || clientStats.total == 0: return "#7a316f"; + case clientStats.up + clientStats.down < clientStats.total - trafficDiff: return "#008771"; + case clientStats.up + clientStats.down < clientStats.total: return "#f37b24"; + default: return "#cf3c3c"; + } + } + + static userExpiryColor(threshold, client, isDark = false) { + if (!client.enable) return isDark ? '#2c3950' : '#bcbcbc'; + let now = new Date().getTime(), expiry = client.expiryTime; + switch (true) { + case expiry === null: return "#7a316f"; + case expiry < 0: return "#008771"; + case expiry == 0: return "#7a316f"; + case now < expiry - threshold: return "#008771"; + case now < expiry: return "#f37b24"; + default: return "#cf3c3c"; + } + } +} + +class ArrayUtils { + static doAllItemsExist(array1, array2) { + return array1.every(item => array2.includes(item)); + } +} + +class URLBuilder { + static buildURL({ host, port, isTLS, base, path }) { + if (!host || host.length === 0) host = window.location.hostname; + if (!port || port.length === 0) port = window.location.port; + if (isTLS === undefined) isTLS = window.location.protocol === "https:"; + + const protocol = isTLS ? "https:" : "http:"; + port = String(port); + if (port === "" || (isTLS && port === "443") || (!isTLS && port === "80")) { + port = ""; + } else { + port = `:${port}`; + } + + return `${protocol}//${host}${port}${base}${path}`; + } } \ No newline at end of file diff --git a/web/html/common/js.html b/web/html/common/js.html index 301b1df7..2d93935f 100644 --- a/web/html/common/js.html +++ b/web/html/common/js.html @@ -5,9 +5,8 @@ - - +