befly 3.24.20 → 3.26.0

package/apis/tongJi/errorList.js

@@ -32,15 +32,15 @@ export default {
             });
         }
 
-        const keyword = String(ctx.body.keyword || "").trim();
-        const errorType = String(ctx.body.errorType || "").trim();
-        const source = String(ctx.body.source || "").trim();
-        const productName = String(ctx.body.productName || "").trim();
-        const productCode = String(ctx.body.productCode || "").trim();
-        const productVersion = String(ctx.body.productVersion || "").trim();
-        const deviceType = String(ctx.body.deviceType || "").trim();
-        const browserName = String(ctx.body.browserName || "").trim();
-        const osName = String(ctx.body.osName || "").trim();
+        const keyword = ctx.body.keyword ?? "";
+        const errorType = ctx.body.errorType ?? "";
+        const source = ctx.body.source ?? "";
+        const productName = ctx.body.productName ?? "";
+        const productCode = ctx.body.productCode ?? "";
+        const productVersion = ctx.body.productVersion ?? "";
+        const deviceType = ctx.body.deviceType ?? "";
+        const browserName = ctx.body.browserName ?? "";
+        const osName = ctx.body.osName ?? "";
         const where = {};
 
         if (keyword) {

package/apis/tongJi/infoStats.js

@@ -201,7 +201,7 @@ export default {
         const reportDate = getDateYmdNumber(now);
         const weekStartDate = getTongJiWeekStartDate(now);
         const monthStartDate = getTongJiMonthStartDate(now);
-        const productName = String(ctx?.body?.productName || "").trim();
+        const productName = ctx?.body?.productName ?? "";
         const hasProductFilter = productName.length > 0;
 
         if (befly.redis && !hasProductFilter) {

package/apis/tongJi/onlineReport.js

@@ -13,7 +13,7 @@ function getOnlineStatsMember(ctx) {
         return `user:${ctx.userId}`;
     }
 
-    const clientId = String(ctx.body.clientId || "").trim();
+    const clientId = ctx.body.clientId ?? "";
 
     if (clientId) {
         return `client:${clientId}`;
@@ -23,22 +23,20 @@ function getOnlineStatsMember(ctx) {
 }
 
 async function updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt) {
-    const normalizedProductName = String(productName || "").trim();
-
-    if (!normalizedProductName) {
+    if (!productName) {
         return;
     }
 
     const memberProductKey = `online:active:member:${encodeURIComponent(member)}:product`;
     const previousProductName = String((await befly.redis.getString(memberProductKey)) || "").trim();
 
-    if (previousProductName && previousProductName !== normalizedProductName) {
+    if (previousProductName && previousProductName !== productName) {
         await befly.redis.zrem(`online:active:product:${encodeURIComponent(previousProductName)}`, [member]);
     }
 
-    const activeProductKey = `online:active:product:${encodeURIComponent(normalizedProductName)}`;
+    const activeProductKey = `online:active:product:${encodeURIComponent(productName)}`;
 
-    await befly.redis.setString(memberProductKey, normalizedProductName, ONLINE_STATS_ONLINE_TTL_SECONDS);
+    await befly.redis.setString(memberProductKey, productName, ONLINE_STATS_ONLINE_TTL_SECONDS);
     await befly.redis.zadd(activeProductKey, [
         {
             score: expireAt,
@@ -115,7 +113,7 @@ export default {
         const weekStartDate = getTongJiWeekStartDate(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const member = getOnlineStatsMember(ctx);
-        const productName = String(ctx.body.productName || "").trim();
+        const productName = ctx.body.productName ?? "";
 
         await updateOnlineStatsActiveMember(befly, member, now, productName);
 

package/apis/tongJi/onlineStats.js

@@ -190,7 +190,7 @@ export default {
         const weekStartDate = getTongJiWeekStartDate(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const recentDateList = getTongJiRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
-        const productName = String(ctx?.body?.productName || "").trim();
+        const productName = ctx?.body?.productName ?? "";
         const hasProductFilter = productName.length > 0;
         const days = hasProductFilter ? await buildOnlineStatsProductDays(befly, recentDateList, productName) : await buildOnlineStatsDays(befly, recentDateList);
 

package/hooks/validator.js

@@ -1,6 +1,6 @@
 // 相对导入
 import { Validator } from "../lib/validator.js";
-import { isPlainObject } from "../utils/is.js";
+import { isPlainObject, isString } from "../utils/is.js";
 import { ErrorResponse } from "../utils/response.js";
 import { snakeCase } from "../utils/util.js";
 
@@ -25,6 +25,10 @@ export default {
                 }
             }
 
+            if (isString(value)) {
+                value = value.trim();
+            }
+
             if (value !== undefined) {
                 nextBody[field] = value;
             }

package/lib/validator.js

@@ -38,6 +38,28 @@ function checkJsonLeaves(value, rule) {
     return false;
 }
 
+function convertStringNumber(value, error, integer = false) {
+    if (!isString(value)) {
+        return { value: null, error: error };
+    }
+
+    const normalized = value.trim();
+    if (normalized.length === 0) {
+        return { value: null, error: error };
+    }
+
+    const num = Number(normalized);
+    if (!Number.isFinite(num)) {
+        return { value: null, error: error };
+    }
+
+    if (integer && !Number.isInteger(num)) {
+        return { value: null, error: error };
+    }
+
+    return { value: num, error: null };
+}
+
 /**
  * 验证器类
  */
@@ -188,20 +210,12 @@ export class Validator {
         switch (input) {
             case "number": {
                 if (isFiniteNumber(value)) return { value: value, error: null };
-                if (isString(value)) {
-                    const num = Number(value);
-                    return Number.isFinite(num) ? { value: num, error: null } : { value: null, error: "必须是数字" };
-                }
-                return { value: null, error: "必须是数字" };
+                return convertStringNumber(value, "必须是数字");
             }
 
             case "integer": {
                 if (isIntegerNumber(value)) return { value: value, error: null };
-                if (isString(value)) {
-                    const num = Number(value);
-                    return Number.isFinite(num) && Number.isInteger(num) ? { value: num, error: null } : { value: null, error: "必须是整数" };
-                }
-                return { value: null, error: "必须是整数" };
+                return convertStringNumber(value, "必须是整数", true);
             }
 
             case "string": {
@@ -249,20 +263,12 @@ export class Validator {
 
             case "enumNumber": {
                 if (isFiniteNumber(value)) return { value: value, error: null };
-                if (isString(value)) {
-                    const num = Number(value);
-                    return Number.isFinite(num) ? { value: num, error: null } : { value: null, error: "必须是数字" };
-                }
-                return { value: null, error: "必须是数字" };
+                return convertStringNumber(value, "必须是数字");
             }
 
             case "enumInteger": {
                 if (isIntegerNumber(value)) return { value: value, error: null };
-                if (isString(value)) {
-                    const num = Number(value);
-                    return Number.isFinite(num) && Number.isInteger(num) ? { value: num, error: null } : { value: null, error: "必须是整数" };
-                }
-                return { value: null, error: "必须是整数" };
+                return convertStringNumber(value, "必须是整数", true);
             }
 
             default: {

package/package.json

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