befly 3.62.0 → 3.64.0

package/utils/userAgent.js

@@ -5,168 +5,293 @@ const WINDOWS_VERSION_MAP = {
     6.1: "7"
 };
 
-function getMatchedVersion(userAgent, regexp) {
-    const matched = regexp.exec(userAgent);
-    return matched ? matched[1].replace(/_/g, ".") : "";
+function firstMatch(text, regexp) {
+    const matched = regexp.exec(text);
+
+    if (!matched) {
+        return null;
+    }
+
+    for (let index = 1; index < matched.length; index++) {
+        if (matched[index]) {
+            return matched[index];
+        }
+    }
+
+    return null;
 }
 
-function getBrowserData(userAgent) {
-    const browserRules = [
-        ["WeChat", /MicroMessenger\/([\d.]+)/],
-        ["Edge", /Edg(?:e|A|iOS)?\/([\d.]+)/],
-        ["Opera", /OPR\/([\d.]+)/],
-        ["Firefox", /FxiOS\/([\d.]+)|Firefox\/([\d.]+)/],
-        ["Chrome", /CriOS\/([\d.]+)|Chrome\/([\d.]+)/],
-        ["Safari", /Version\/([\d.]+).*Safari/],
-        ["IE", /MSIE\s([\d.]+)|Trident\/.*rv:([\d.]+)/]
+function firstNonEmptyMatch(text, regexp) {
+    const matched = regexp.exec(text);
+
+    if (!matched) {
+        return null;
+    }
+
+    for (let index = 1; index < matched.length; index++) {
+        if (matched[index]) {
+            return matched[index];
+        }
+    }
+
+    return null;
+}
+
+function hasMatch(text, regexp) {
+    return regexp.test(text) ? "" : null;
+}
+
+function normalizeVersion(version) {
+    return String(version || "").replace(/_/g, ".");
+}
+
+function majorVersion(version) {
+    const parts = String(version || "").split(".");
+    return parts[0] || "";
+}
+
+function matchBrowser(text) {
+    const rules = [
+        { name: "wxwork", regexp: /wxwork\/([\d.]+)/ },
+        { name: "WeChat", regexp: /MicroMessenger\/([\d.]+)/ },
+        { name: "DingTalk", regexp: /DingTalk\/([\d.]+)/ },
+        { name: "Alipay", regexp: /AlipayClient\/([\d.]+)/ },
+        { name: "Taobao", regexp: /(?:TaoBao|AliApp\(TB|WindVane)/, match: hasMatch },
+        { name: "Jingdong", regexp: /jdapp/i, match: hasMatch },
+        { name: "Weibo", regexp: /Weibo|__weibo__/, match: hasMatch },
+        { name: "Douyin", regexp: /(?:aweme|Trill|Douyin)/i, match: hasMatch },
+        { name: "Lark", regexp: /(?:Lark|Feishu)\S*?\/([\d.]+)/ },
+        { name: "QQ Browser", regexp: /(?:MQQBrowser|QQBrowser)\/([\d.]+)/ },
+        { name: "UC Browser", regexp: /UCBrowser\/([\d.]+)/ },
+        { name: "Quark", regexp: /Quark\/([\d.]+)/ },
+        { name: "Baidu", regexp: /(?:baiduboxapp|baiduapp|BaiduBrowser|FlyFlow)\S*?\/([\d.]+)/i },
+        { name: "Sogou", regexp: /(?:SogouMobileBrowser|SogouMSE|MetaSr)\S*?\/([\d.]+)/i },
+        { name: "360", regexp: /(?:360SE|360EE|QHBrowser|QihooBrowser)\S*?(?:\s|v|\/)([\d.]+)/i },
+        { name: "Huawei Browser", regexp: /HuaweiBrowser\/([\d.]+)/ },
+        { name: "MiuiBrowser", regexp: /MiuiBrowser\/([\d.]+)/ },
+        { name: "HeyTapBrowser", regexp: /HeyTapBrowser\/([\d.]+)/ },
+        { name: "VivoBrowser", regexp: /VivoBrowser\/([\d.]+)/ },
+        { name: "Samsung Browser", regexp: /SamsungBrowser\/([\d.]+)/ },
+        { name: "Maxthon", regexp: /Maxthon\/([\d.]+)/ },
+        { name: "Edge", regexp: /Edg(?:e|A|iOS)?\/([\d.]+)/ },
+        { name: "Opera", regexp: /(?:OPR|Opera)\/([\d.]+)/ },
+        { name: "Firefox", regexp: /(?:FxiOS|Firefox)\/([\d.]+)/ },
+        { name: "Chrome", regexp: /(?:CriOS|Chrome)\/([\d.]+)/ },
+        { name: "Safari", regexp: /Version\/([\d.]+).*Safari/ },
+        { name: "IE", regexp: /(?:MSIE\s([\d.]+)|Trident\/.*rv:([\d.]+))/, match: firstNonEmptyMatch }
     ];
 
-    for (const [name, regexp] of browserRules) {
-        const matched = regexp.exec(userAgent);
-        if (matched) {
-            return {
-                browserName: name === "Safari" && /iPhone|iPad|iPod/i.test(userAgent) ? "Mobile Safari" : name,
-                browserVersion: matched[1] || matched[2] || ""
-            };
+    for (const rule of rules) {
+        const matcher = rule.match || firstMatch;
+        const version = matcher(text, rule.regexp);
+
+        if (version !== null) {
+            const name = rule.name === "Safari" && /iPhone|iPad|iPod/i.test(text) ? "Mobile Safari" : rule.name;
+
+            return { name: name, version: version };
         }
     }
 
-    return {
-        browserName: "",
-        browserVersion: ""
-    };
+    return { name: "", version: "" };
+}
+
+function matchEngine(text) {
+    if (/AppleWebKit/i.test(text) && /iPhone|iPad|iPod/i.test(text)) {
+        return { name: "WebKit", version: firstMatch(text, /AppleWebKit\/([\d.]+)/) };
+    }
+
+    const rules = [
+        { name: "Blink", regexp: /Chrome\/([\d.]+)/ },
+        { name: "Blink", regexp: /CriOS\/([\d.]+)/ },
+        { name: "Blink", regexp: /Edg(?:e|A|iOS)?\/([\d.]+)/ },
+        { name: "Blink", regexp: /OPR\/([\d.]+)/ },
+        { name: "Gecko", regexp: /Firefox\/([\d.]+)/ },
+        { name: "Gecko", regexp: /FxiOS\/([\d.]+)/ },
+        { name: "WebKit", regexp: /AppleWebKit\/([\d.]+)/ },
+        { name: "Trident", regexp: /Trident\/([\d.]+)/ },
+        { name: "Trident", regexp: /MSIE\s([\d.]+)/ }
+    ];
+
+    for (const rule of rules) {
+        const version = firstMatch(text, rule.regexp);
+
+        if (version) {
+            return { name: rule.name, version: version };
+        }
+    }
+
+    return { name: "", version: "" };
 }
 
-function getOsData(userAgent) {
-    const androidVersion = getMatchedVersion(userAgent, /Android\s([\d.]+)/);
+function matchOs(text) {
+    const androidVersion = firstMatch(text, /Android\s([\d.]+)/);
+
     if (androidVersion) {
-        return {
-            osName: "Android",
-            osVersion: androidVersion
-        };
+        return { name: "Android", version: androidVersion };
     }
 
-    const iosVersion = getMatchedVersion(userAgent, /(?:iPhone|iPad|iPod).*OS\s([\d_]+)/);
+    const iosVersion = firstMatch(text, /(?:iPhone|iPad|iPod).*OS\s([\d_]+)/);
+
     if (iosVersion) {
-        return {
-            osName: "iOS",
-            osVersion: iosVersion
-        };
+        return { name: "iOS", version: normalizeVersion(iosVersion) };
     }
 
-    const windowsVersion = getMatchedVersion(userAgent, /Windows NT\s([\d.]+)/);
+    const windowsVersion = firstMatch(text, /Windows NT\s([\d.]+)/);
+
     if (windowsVersion) {
-        return {
-            osName: "Windows",
-            osVersion: WINDOWS_VERSION_MAP[windowsVersion] || windowsVersion
-        };
+        return { name: "Windows", version: WINDOWS_VERSION_MAP[windowsVersion] || windowsVersion };
     }
 
-    const macVersion = getMatchedVersion(userAgent, /Mac OS X\s([\d_]+)/);
+    const macVersion = firstMatch(text, /Mac OS X\s([\d_]+)/);
+
     if (macVersion) {
-        return {
-            osName: "macOS",
-            osVersion: macVersion
-        };
+        return { name: "macOS", version: normalizeVersion(macVersion) };
     }
 
-    if (/Linux/i.test(userAgent)) {
-        return {
-            osName: "Linux",
-            osVersion: ""
-        };
+    if (/HarmonyOS/i.test(text)) {
+        return { name: "HarmonyOS", version: "" };
     }
 
-    return {
-        osName: "",
-        osVersion: ""
-    };
+    if (/Linux/i.test(text)) {
+        return { name: "Linux", version: "" };
+    }
+
+    if (/CrOS/i.test(text)) {
+        return { name: "Chrome OS", version: "" };
+    }
+
+    return { name: "", version: "" };
 }
 
-function getDeviceType(userAgent) {
-    if (/iPad|Tablet|PlayBook|Silk/i.test(userAgent) || (/Android/i.test(userAgent) && !/Mobile/i.test(userAgent))) {
+function getDeviceType(text) {
+    if (/iPad|Tablet|PlayBook|Silk/i.test(text) || (/Android/i.test(text) && !/Mobile/i.test(text))) {
         return "tablet";
     }
-    if (/Mobi|iPhone|iPod|Android|Windows Phone/i.test(userAgent)) {
+
+    if (/PlayStation|Xbox|Nintendo|CrKey|Roku|AppleTV|SmartTV|TV/i.test(text)) {
+        return "console";
+    }
+
+    if (/bot|crawler|spider|googlebot|bingbot|baiduspider|slurp|yandex|duckduckgo/i.test(text)) {
+        return "bot";
+    }
+
+    if (/Mobi|iPhone|iPod|Phone\s*\d|Android.*Mobile|Windows Phone/i.test(text)) {
+        return "mobile";
+    }
+
+    if (/HarmonyOS/i.test(text) && !/Pad|Tablet/i.test(text)) {
         return "mobile";
     }
+
+    if (/HarmonyOS/i.test(text)) {
+        return "tablet";
+    }
+
     return "desktop";
 }
 
-function getAndroidDeviceModel(userAgent) {
-    const matched = /Android[\d.\s]*;\s*([^;)]+?)(?:\s+Build\/|;|\))/i.exec(userAgent);
+function matchAndroidModel(text) {
+    const matched = /Android[\d.\s]*;\s*([^;)]+?)(?:\s+Build\/|;|\))/i.exec(text);
     return matched ? matched[1].trim() : "";
 }
 
-function getDeviceData(userAgent) {
-    const deviceType = getDeviceType(userAgent);
-    if (/iPhone/i.test(userAgent)) {
-        return {
-            deviceType: deviceType,
-            deviceVendor: "Apple",
-            deviceModel: "iPhone"
-        };
-    }
-    if (/iPad/i.test(userAgent)) {
-        return {
-            deviceType: deviceType,
-            deviceVendor: "Apple",
-            deviceModel: "iPad"
-        };
+function matchVendor(text) {
+    if (/(iPhone|iPad|iPod|Macintosh)\b/i.test(text)) {
+        return "Apple";
     }
 
-    return {
-        deviceType: deviceType,
-        deviceVendor: "",
-        deviceModel: getAndroidDeviceModel(userAgent)
-    };
-}
+    if (/Samsung|SM-\w+/i.test(text)) {
+        return "Samsung";
+    }
 
-function getEngineName(userAgent) {
-    if (/Chrome|CriOS|Edg|OPR/i.test(userAgent)) {
-        return "Blink";
+    if (/Huawei|HUAWEI|Honor|HONOR/i.test(text)) {
+        return "Huawei";
     }
-    if (/Firefox|FxiOS/i.test(userAgent)) {
-        return "Gecko";
+
+    if (/Xiaomi|Redmi|Mi\s|MI\s|M200|M201|M202|M210|M211|M220|M221|M230|M231|M240/i.test(text)) {
+        return "Xiaomi";
     }
-    if (/AppleWebKit|Safari/i.test(userAgent)) {
-        return "WebKit";
+
+    if (/OPPO|PB[A-Z]|PCHM\d+|PCAM\d+/i.test(text)) {
+        return "OPPO";
     }
-    if (/Trident|MSIE/i.test(userAgent)) {
-        return "Trident";
+
+    if (/vivo|V\d{4}[A-Z]/i.test(text)) {
+        return "vivo";
     }
+
     return "";
 }
 
-function getCpuArchitecture(userAgent) {
-    if (/x86_64|Win64|x64|amd64/i.test(userAgent)) {
+function matchDevice(text) {
+    const type = getDeviceType(text);
+
+    if (/iPad/i.test(text)) {
+        return { vendor: "Apple", model: "iPad", type: type };
+    }
+
+    if (/iPod/i.test(text)) {
+        return { vendor: "Apple", model: "iPod", type: type };
+    }
+
+    if (/iPhone/i.test(text)) {
+        return { vendor: "Apple", model: "iPhone", type: type };
+    }
+
+    return { vendor: matchVendor(text), model: matchAndroidModel(text), type: type };
+}
+
+function matchCpuArchitecture(text) {
+    if (/x86_64|Win64|x64|amd64/i.test(text)) {
         return "amd64";
     }
-    if (/arm64|aarch64/i.test(userAgent)) {
+
+    if (/arm64|aarch64/i.test(text)) {
         return "arm64";
     }
-    if (/arm/i.test(userAgent)) {
+
+    if (/arm/i.test(text)) {
         return "arm";
     }
+
     return "";
 }
 
 export function parseUserAgent(userAgent) {
     const text = String(userAgent || "");
-    const browserData = getBrowserData(text);
-    const osData = getOsData(text);
-    const deviceData = getDeviceData(text);
+    const browser = matchBrowser(text);
+    const engine = matchEngine(text);
+    const os = matchOs(text);
+    const device = matchDevice(text);
+    const cpu = { architecture: matchCpuArchitecture(text) };
 
     return {
         userAgent: text,
-        browserName: browserData.browserName,
-        browserVersion: browserData.browserVersion,
-        osName: osData.osName,
-        osVersion: osData.osVersion,
-        deviceType: deviceData.deviceType,
-        deviceVendor: deviceData.deviceVendor,
-        deviceModel: deviceData.deviceModel,
-        engineName: getEngineName(text),
-        cpuArchitecture: getCpuArchitecture(text)
+        browserName: browser.name,
+        browserVersion: browser.version,
+        osName: os.name,
+        osVersion: os.version,
+        deviceType: device.type,
+        deviceVendor: device.vendor,
+        deviceModel: device.model,
+        engineName: engine.name,
+        engineVersion: engine.version,
+        cpuArchitecture: cpu.architecture,
+        browser: { name: browser.name, version: browser.version, major: majorVersion(browser.version) },
+        engine: engine,
+        os: os,
+        device: device,
+        cpu: cpu
     };
 }
+
+export function getUserAgentFields(userAgent) {
+    const text = typeof userAgent === "string" ? userAgent.trim() : "";
+
+    if (text.length === 0) {
+        return null;
+    }
+
+    return parseUserAgent(text);
+}

package/apis/tongJi/_daily.js

@@ -1,159 +0,0 @@
-import { DAY_MS } from "#befly/utils/datetime.js";
-
-const DEFAULT_TIME_ZONE = "Asia/Shanghai";
-
-function getTimeZoneDateParts(timestamp, timeZone) {
-    const formatter = new Intl.DateTimeFormat("en-CA", {
-        timeZone: timeZone,
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit"
-    });
-    const parts = formatter.formatToParts(timestamp);
-    const result = {};
-
-    for (const part of parts) {
-        if (part.type !== "literal") {
-            result[part.type] = Number(part.value);
-        }
-    }
-
-    return result;
-}
-
-function buildYmdNumber(year, month, day) {
-    return year * 10000 + month * 100 + day;
-}
-
-function normalizeTimeZone(timeZone) {
-    return typeof timeZone === "string" && timeZone.trim().length > 0 ? timeZone.trim() : DEFAULT_TIME_ZONE;
-}
-
-function findTimestampInDay(targetYmd, timeZone) {
-    const year = Math.floor(targetYmd / 10000);
-    const month = Math.floor((targetYmd % 10000) / 100);
-    const day = targetYmd % 100;
-    // 取当天正午作为锚点，再向前/后逐小时修正，确保落在目标日期内
-    let utc = Date.UTC(year, month - 1, day, 12, 0, 0, 0);
-    const ymdAtUtc = getDailyDateYmdNumber(utc, timeZone);
-
-    if (ymdAtUtc === targetYmd) {
-        return utc;
-    }
-
-    const step = ymdAtUtc < targetYmd ? 3600000 : -3600000;
-
-    do {
-        utc += step;
-    } while (getDailyDateYmdNumber(utc, timeZone) !== targetYmd);
-
-    return utc;
-}
-
-function getWeekdayIndex(timestamp, timeZone) {
-    const formatter = new Intl.DateTimeFormat("en-US", {
-        timeZone: timeZone,
-        weekday: "short"
-    });
-    const parts = formatter.formatToParts(timestamp);
-    const shortWeekday = parts.find((item) => item.type === "weekday").value;
-    const map = {
-        Sun: 0,
-        Mon: 1,
-        Tue: 2,
-        Wed: 3,
-        Thu: 4,
-        Fri: 5,
-        Sat: 6
-    };
-
-    return map[shortWeekday] ?? 0;
-}
-
-export function getDailyDateYmdNumber(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
-    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
-
-    return buildYmdNumber(parts.year, parts.month, parts.day);
-}
-
-export function getDailyDayStartTime(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
-    const zone = normalizeTimeZone(timeZone);
-    const targetYmd = getDailyDateYmdNumber(timestamp, zone);
-    const timestampInDay = findTimestampInDay(targetYmd, zone);
-    let low = timestampInDay - DAY_MS;
-    let high = timestampInDay + DAY_MS;
-
-    while (getDailyDateYmdNumber(low, zone) >= targetYmd) {
-        low -= DAY_MS;
-    }
-
-    while (getDailyDateYmdNumber(high, zone) <= targetYmd) {
-        high += DAY_MS;
-    }
-
-    while (low + 1 < high) {
-        const mid = Math.floor((low + high) / 2);
-
-        if (getDailyDateYmdNumber(mid, zone) < targetYmd) {
-            low = mid;
-        } else {
-            high = mid;
-        }
-    }
-
-    return high;
-}
-
-export function getDailyMonthStartDate(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
-    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
-
-    return buildYmdNumber(parts.year, parts.month, 1);
-}
-
-export function getDailyWeekStartDate(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
-    const zone = normalizeTimeZone(timeZone);
-    let dayStart = getDailyDayStartTime(timestamp, zone);
-
-    while (getWeekdayIndex(dayStart, zone) !== 1) {
-        dayStart = getDailyDayStartTime(dayStart - DAY_MS, zone);
-    }
-
-    return getDailyDateYmdNumber(dayStart, zone);
-}
-
-export function getDailyRecentDateList(timestamp = Date.now(), limit = 30, timeZone = DEFAULT_TIME_ZONE) {
-    const zone = normalizeTimeZone(timeZone);
-    const dayStart = getDailyDayStartTime(timestamp, zone);
-    const list = [];
-
-    for (let i = limit - 1; i >= 0; i -= 1) {
-        list.push(getDailyDateYmdNumber(dayStart - i * DAY_MS, zone));
-    }
-
-    return list;
-}
-
-export function getDailyDayStartTimeForYmd(reportDate, timeZone = DEFAULT_TIME_ZONE) {
-    return getDailyDayStartTime(findTimestampInDay(reportDate, normalizeTimeZone(timeZone)), timeZone);
-}
-
-export function getDailyDateRangeList(startDateYmd, endDateYmd, timeZone = DEFAULT_TIME_ZONE) {
-    const zone = normalizeTimeZone(timeZone);
-    const startDayStart = getDailyDayStartTimeForYmd(startDateYmd, zone);
-    const endDayStart = getDailyDayStartTimeForYmd(endDateYmd, zone);
-    const list = [];
-
-    for (let t = startDayStart; t <= endDayStart; t += DAY_MS) {
-        list.push(getDailyDateYmdNumber(t, zone));
-    }
-
-    return list;
-}
-
-export function getDailyStatsDayMembersKey(reportDate) {
-    return `daily:day:${reportDate}:members`;
-}
-
-export function getDailyStatsDayProductMembersKey(reportDate, productCode) {
-    return `daily:day:${reportDate}:product:${encodeURIComponent(productCode)}:members`;
-}