koishi-plugin-echo-cave 1.24.2 → 1.24.3

package/lib/index.cjs

@@ -909,34 +909,29 @@ var PREDEFINED_PERIODS = [
 ];
 var TIME_UNITS = {
   m: 30 * 24 * 60 * 60 * 1e3,
-  // 月（按约 30 天算）
   w: 7 * 24 * 60 * 60 * 1e3,
-  // 周
   d: 24 * 60 * 60 * 1e3,
-  // 天
   h: 60 * 60 * 1e3
-  // 小时
 };
 function parseCustomTime(timeStr) {
+  if (!timeStr || typeof timeStr !== "string") return null;
+  const s = timeStr.toLowerCase();
+  if (!/^(\d+(m|w|d|h))+$/i.test(s)) return null;
   const regex = /(\d+)([mwdh])/g;
   let match;
   let totalMs = 0;
-  let lastUnit = "";
   const unitOrder = ["m", "w", "d", "h"];
-  if (!/^(\d+[mwdh])+$/i.test(timeStr)) {
-    return null;
-  }
-  while ((match = regex.exec(timeStr)) !== null) {
-    const [, value, unit] = match;
-    const num = parseInt(value, 10);
+  let lastIndex = -1;
+  while ((match = regex.exec(s)) !== null) {
+    const value = parseInt(match[1], 10);
+    const unit = match[2].toLowerCase();
     const currentIndex = unitOrder.indexOf(unit);
-    const lastIndex = unitOrder.indexOf(lastUnit);
-    if (lastUnit && currentIndex < 0) return null;
-    if (lastUnit && currentIndex > lastIndex) {
+    if (currentIndex === -1) return null;
+    if (lastIndex !== -1 && currentIndex < lastIndex) {
       return null;
     }
-    totalMs += num * TIME_UNITS[unit];
-    lastUnit = unit;
+    totalMs += value * (TIME_UNITS[unit] ?? 0);
+    lastIndex = currentIndex;
   }
   return totalMs;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.24.2",
+  "version": "1.24.3",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",