befly 3.69.0 → 3.71.0

package/apis/admin/insert.js

@@ -1,5 +1,5 @@
 import adminTable from "#befly/tables/admin.json";
-import { isString } from "#befly/utils/is.js";
+import { hashPassword } from "#befly/utils/crypto.js";
 
 export default {
     name: "添加管理员",
@@ -43,9 +43,7 @@ export default {
             return befly.tool.No("角色不存在");
         }
 
-        const passwordSource = isString(ctx.body.password) ? ctx.body.password.toLowerCase() : "";
-        const isSha256Hex = /^[a-f0-9]{64}$/.test(passwordSource);
-        const hashedPassword = isSha256Hex ? befly.tool.sha256(passwordSource) : befly.tool.sha256(befly.tool.sha256(ctx.body.password));
+        const hashedPassword = await hashPassword(ctx.body.password);
 
         const adminId = await befly.mysql.insData({
             table: "beflyAdmin",

package/apis/admin/update.js

@@ -1,4 +1,5 @@
 import adminTable from "#befly/tables/admin.json";
+import { hashPassword } from "#befly/utils/crypto.js";
 
 export default {
     name: "更新管理员",
@@ -74,7 +75,9 @@ export default {
         if (ctx.body.email !== undefined) updateData.email = ctx.body.email;
         if (ctx.body.lastLoginIp !== undefined) updateData.lastLoginIp = ctx.body.lastLoginIp;
         if (ctx.body.lastLoginTime !== undefined) updateData.lastLoginTime = ctx.body.lastLoginTime;
-        if (ctx.body.password !== undefined) updateData.password = ctx.body.password;
+        if (ctx.body.password !== undefined) {
+            updateData.password = await hashPassword(ctx.body.password);
+        }
         if (ctx.body.phone !== undefined) updateData.phone = ctx.body.phone;
         if (ctx.body.roleType !== undefined) updateData.roleType = ctx.body.roleType;
         if (ctx.body.username !== undefined) updateData.username = ctx.body.username;

package/apis/auth/login.js

@@ -1,5 +1,6 @@
 import adminTable from "#befly/tables/admin.json";
 import loginLogTable from "#befly/tables/loginLog.json";
+import { verifyPassword } from "#befly/utils/crypto.js";
 import { toSessionTtlSeconds } from "#befly/utils/util.js";
 
 export default {
@@ -79,7 +80,7 @@ export default {
         logData.username = admin.data.username;
         logData.nickname = admin.data.nickname;
 
-        if (befly.tool.sha256(ctx.body.password) !== admin.data.password) {
+        if (!(await verifyPassword(ctx.body.password, admin.data.password))) {
             logData.failReason = "密码错误";
             await befly.mysql.insData({ table: "beflyLoginLog", data: logData });
             return befly.tool.No("账号或密码错误");

package/apis/tongJi/todayOnline.js

@@ -0,0 +1,47 @@
+import { getTongJiDateYmdNumber } from "./_tongJi.js";
+
+async function getTodayCount(befly, reportDate, productCode) {
+    if (!befly.redis) {
+        return 0;
+    }
+
+    return Number(await befly.redis.scard(`daily:day:${reportDate}:members:${productCode}`)) || 0;
+}
+
+async function loadProjects(befly) {
+    if (!befly.mysql) {
+        return [];
+    }
+
+    const result = await befly.mysql.getAll({
+        table: "beflyProject",
+        fields: ["code"],
+        where: { state: 1 }
+    });
+
+    return result.data?.lists || [];
+}
+
+export default {
+    name: "获取今日在线总数",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly, _ctx) => {
+        const reportDate = getTongJiDateYmdNumber(Date.now(), befly.config?.tz);
+        const projects = await loadProjects(befly);
+        let total = 0;
+
+        for (const item of projects) {
+            total += await getTodayCount(befly, reportDate, item.code);
+        }
+
+        return befly.tool.Yes("获取成功", {
+            today: {
+                count: total
+            }
+        });
+    }
+};

package/lib/dbHelper.js

@@ -79,10 +79,6 @@ function safeStringify(value) {
 }
 
 function getExecuteErrorMessage(error) {
-    if (error instanceof Error && typeof error.message === "string" && error.message.trim().length > 0) {
-        return error.message.trim();
-    }
-
     if (!error || typeof error !== "object") {
         return String(error);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.69.0",
+    "version": "3.71.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/plugins/tool.js

@@ -103,53 +103,13 @@ export function Raw(ctx, data, options = {}) {
     });
 }
 
-/**
- * 计算 md5（hex）
- * @param value 输入字符串
- * @returns md5 hex
- */
-export function md5(value) {
-    if (!isString(value) || value.length < 1) {
-        throw new Error("md5 输入必须是非空字符串", {
-            cause: null,
-            code: "validation",
-            subsystem: "tool",
-            operation: "md5"
-        });
-    }
-    const hasher = new Bun.CryptoHasher("md5");
-    hasher.update(value);
-    return hasher.digest("hex");
-}
-
-/**
- * 计算 sha256（hex）
- * @param value 输入字符串
- * @returns sha256 hex
- */
-export function sha256(value) {
-    if (!isString(value) || value.length < 1) {
-        throw new Error("sha256 输入必须是非空字符串", {
-            cause: null,
-            code: "validation",
-            subsystem: "tool",
-            operation: "sha256"
-        });
-    }
-    const hasher = new Bun.CryptoHasher("sha256");
-    hasher.update(value);
-    return hasher.digest("hex");
-}
-
 export default {
     order: 3,
     handler: () => {
         return {
             Yes: Yes,
             No: No,
-            Raw: Raw,
-            md5: md5,
-            sha256: sha256
+            Raw: Raw
         };
     }
 };

package/sync/dev.js

@@ -1,3 +1,4 @@
+import { hashPassword } from "../utils/crypto.js";
 import { isNumber } from "../utils/is.js";
 
 const MENU_TABLE_NAME = "beflyMenu";
@@ -72,7 +73,7 @@ export async function syncDev(ctx) {
             });
         }
 
-        const password = ctx.tool.sha256(ctx.tool.sha256(ctx.config.devPassword));
+        const password = await hashPassword(ctx.config.devPassword);
 
         const devAdminData = {
             nickname: "开发者",

package/utils/crypto.js

@@ -0,0 +1,62 @@
+/**
+ * 通用加密/哈希工具
+ */
+
+import { isString } from "./is.js";
+
+/**
+ * 计算 md5（hex）
+ * @param value 输入字符串
+ * @returns md5 hex
+ */
+export function md5(value) {
+    if (!isString(value) || value.length < 1) {
+        throw new Error("md5 输入必须是非空字符串", {
+            cause: null,
+            code: "validation",
+            subsystem: "crypto",
+            operation: "md5"
+        });
+    }
+    const hasher = new Bun.CryptoHasher("md5");
+    hasher.update(value);
+    return hasher.digest("hex");
+}
+
+/**
+ * 计算 sha256（hex）
+ * @param value 输入字符串
+ * @returns sha256 hex
+ */
+export function sha256(value) {
+    if (!isString(value) || value.length < 1) {
+        throw new Error("sha256 输入必须是非空字符串", {
+            cause: null,
+            code: "validation",
+            subsystem: "crypto",
+            operation: "sha256"
+        });
+    }
+    const hasher = new Bun.CryptoHasher("sha256");
+    hasher.update(value);
+    return hasher.digest("hex");
+}
+
+/**
+ * 使用 bcrypt 对密码进行哈希
+ * @param password 原始密码
+ * @returns bcrypt hash 字符串
+ */
+export async function hashPassword(password) {
+    return Bun.password.hash(password, { algorithm: "bcrypt" });
+}
+
+/**
+ * 校验密码与 bcrypt hash 是否匹配
+ * @param password 原始密码
+ * @param hashedPassword 数据库中存储的 bcrypt hash
+ * @returns 是否匹配
+ */
+export async function verifyPassword(password, hashedPassword) {
+    return Bun.password.verify(password, hashedPassword);
+}

package/utils/userAgent.js

@@ -1,297 +0,0 @@
-const WINDOWS_VERSION_MAP = {
-    "10.0": "10",
-    6.3: "8.1",
-    6.2: "8",
-    6.1: "7"
-};
-
-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 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 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 { 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 matchOs(text) {
-    const androidVersion = firstMatch(text, /Android\s([\d.]+)/);
-
-    if (androidVersion) {
-        return { name: "Android", version: androidVersion };
-    }
-
-    const iosVersion = firstMatch(text, /(?:iPhone|iPad|iPod).*OS\s([\d_]+)/);
-
-    if (iosVersion) {
-        return { name: "iOS", version: normalizeVersion(iosVersion) };
-    }
-
-    const windowsVersion = firstMatch(text, /Windows NT\s([\d.]+)/);
-
-    if (windowsVersion) {
-        return { name: "Windows", version: WINDOWS_VERSION_MAP[windowsVersion] || windowsVersion };
-    }
-
-    const macVersion = firstMatch(text, /Mac OS X\s([\d_]+)/);
-
-    if (macVersion) {
-        return { name: "macOS", version: normalizeVersion(macVersion) };
-    }
-
-    if (/HarmonyOS/i.test(text)) {
-        return { name: "HarmonyOS", version: "" };
-    }
-
-    if (/Linux/i.test(text)) {
-        return { name: "Linux", version: "" };
-    }
-
-    if (/CrOS/i.test(text)) {
-        return { name: "Chrome OS", version: "" };
-    }
-
-    return { name: "", version: "" };
-}
-
-function getDeviceType(text) {
-    if (/iPad|Tablet|PlayBook|Silk/i.test(text) || (/Android/i.test(text) && !/Mobile/i.test(text))) {
-        return "tablet";
-    }
-
-    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 matchAndroidModel(text) {
-    const matched = /Android[\d.\s]*;\s*([^;)]+?)(?:\s+Build\/|;|\))/i.exec(text);
-    return matched ? matched[1].trim() : "";
-}
-
-function matchVendor(text) {
-    if (/(iPhone|iPad|iPod|Macintosh)\b/i.test(text)) {
-        return "Apple";
-    }
-
-    if (/Samsung|SM-\w+/i.test(text)) {
-        return "Samsung";
-    }
-
-    if (/Huawei|HUAWEI|Honor|HONOR/i.test(text)) {
-        return "Huawei";
-    }
-
-    if (/Xiaomi|Redmi|Mi\s|MI\s|M200|M201|M202|M210|M211|M220|M221|M230|M231|M240/i.test(text)) {
-        return "Xiaomi";
-    }
-
-    if (/OPPO|PB[A-Z]|PCHM\d+|PCAM\d+/i.test(text)) {
-        return "OPPO";
-    }
-
-    if (/vivo|V\d{4}[A-Z]/i.test(text)) {
-        return "vivo";
-    }
-
-    return "";
-}
-
-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(text)) {
-        return "arm64";
-    }
-
-    if (/arm/i.test(text)) {
-        return "arm";
-    }
-
-    return "";
-}
-
-export function parseUserAgent(userAgent) {
-    const text = String(userAgent || "");
-    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: 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);
-}