koishi-plugin-chatluna-affinity 0.3.0-beta.2 → 0.3.0-beta.3

package/lib/index.js

@@ -1284,6 +1284,190 @@ async function fetchGroupMemberIds(session, log) {
   }
 }
 
+// src/services/affinity/calculator.ts
+function normalizeAction(action) {
+  const text = typeof action === "string" ? action.toLowerCase() : "";
+  if (text === "increase" || text === "decrease") return text;
+  return "increase";
+}
+function resolveShortTermConfig(config) {
+  const cfg = config?.affinityDynamics?.shortTerm || {};
+  const defaults = AFFINITY_DYNAMICS_DEFAULTS.shortTerm;
+  const promoteRaw = Number(cfg.promoteThreshold);
+  const demoteRaw = Number(cfg.demoteThreshold);
+  let promoteThreshold = Number.isFinite(promoteRaw) ? Math.round(promoteRaw) : defaults.promoteThreshold;
+  let demoteThreshold = Number.isFinite(demoteRaw) ? Math.round(demoteRaw) : defaults.demoteThreshold;
+  if (promoteThreshold <= demoteThreshold) {
+    const midpoint = Math.round((promoteThreshold + demoteThreshold) / 2) || 0;
+    promoteThreshold = midpoint + 15;
+    demoteThreshold = midpoint - 15;
+  }
+  const promoteStepRaw = Number(cfg.longTermPromoteStep);
+  const demoteStepRaw = Number(cfg.longTermDemoteStep);
+  const longTermPromoteStep = Math.max(
+    1,
+    Math.round(
+      Math.abs(
+        Number.isFinite(promoteStepRaw) ? promoteStepRaw : Number.isFinite(cfg.longTermStep) ? cfg.longTermStep : defaults.longTermPromoteStep
+      )
+    )
+  );
+  const longTermDemoteStep = Math.max(
+    1,
+    Math.round(
+      Math.abs(
+        Number.isFinite(demoteStepRaw) ? demoteStepRaw : Number.isFinite(cfg.longTermStep) ? cfg.longTermStep : defaults.longTermDemoteStep
+      )
+    )
+  );
+  return {
+    promoteThreshold,
+    demoteThreshold,
+    longTermPromoteStep,
+    longTermDemoteStep
+  };
+}
+function resolveActionWindowConfig(config) {
+  const cfg = config?.affinityDynamics?.actionWindow || {};
+  const defaults = AFFINITY_DYNAMICS_DEFAULTS.actionWindow;
+  const windowHoursRaw = Number(cfg.windowHours);
+  const windowHours = Math.max(
+    1,
+    Number.isFinite(windowHoursRaw) ? windowHoursRaw : defaults.windowHours
+  );
+  const increaseBonus = Number.isFinite(cfg.increaseBonus) ? cfg.increaseBonus : defaults.increaseBonus;
+  const decreaseBonus = Number.isFinite(cfg.decreaseBonus) ? cfg.decreaseBonus : defaults.decreaseBonus;
+  const bonusChatThresholdRaw = Number(cfg.bonusChatThreshold);
+  const bonusChatThreshold = Math.max(
+    0,
+    Number.isFinite(bonusChatThresholdRaw) ? Math.round(bonusChatThresholdRaw) : defaults.bonusChatThreshold
+  );
+  const maxEntriesRaw = Number(cfg.maxEntries);
+  const maxEntries = Math.max(
+    10,
+    Number.isFinite(maxEntriesRaw) ? Math.round(maxEntriesRaw) : defaults.maxEntries
+  );
+  return {
+    windowHours,
+    windowMs: windowHours * 3600 * 1e3,
+    increaseBonus,
+    decreaseBonus,
+    bonusChatThreshold,
+    maxEntries
+  };
+}
+function resolveCoefficientConfig(config) {
+  const cfg = config?.affinityDynamics?.coefficient || {};
+  const defaults = AFFINITY_DYNAMICS_DEFAULTS.coefficient;
+  const base = Number.isFinite(cfg.base) ? cfg.base : defaults.base;
+  const maxDrop = Math.max(
+    0,
+    Number.isFinite(cfg.maxDrop) ? cfg.maxDrop : defaults.maxDrop
+  );
+  const maxBoost = Math.max(
+    0,
+    Number.isFinite(cfg.maxBoost) ? cfg.maxBoost : defaults.maxBoost
+  );
+  const decayPerDay = Math.max(
+    0,
+    Number.isFinite(cfg.decayPerDay) ? cfg.decayPerDay : defaults.decayPerDay
+  );
+  const boostPerDay = Math.max(
+    0,
+    Number.isFinite(cfg.boostPerDay) ? cfg.boostPerDay : defaults.boostPerDay
+  );
+  const min = base - maxDrop;
+  const max = base + maxBoost;
+  return { base, maxDrop, maxBoost, decayPerDay, boostPerDay, min, max };
+}
+function summarizeActionEntries(rawEntries, windowMs, nowMs) {
+  const fallback = {
+    entries: [],
+    counts: { increase: 0, decrease: 0 },
+    total: 0
+  };
+  if (!Array.isArray(rawEntries)) return fallback;
+  const cutoff = nowMs - windowMs;
+  const entries = [];
+  const counts = { increase: 0, decrease: 0 };
+  for (const entry of rawEntries) {
+    if (!entry) continue;
+    const ts = Number(entry.timestamp);
+    if (!Number.isFinite(ts) || ts < cutoff) continue;
+    const normalizedAction = normalizeAction(entry.action);
+    entries.push({ action: normalizedAction, timestamp: ts });
+    counts[normalizedAction] += 1;
+  }
+  return { entries, counts, total: counts.increase + counts.decrease };
+}
+function appendActionEntry(entries, action, nowMs, maxEntries) {
+  const next = Array.isArray(entries) ? [...entries] : [];
+  next.push({ action: normalizeAction(action), timestamp: nowMs });
+  if (next.length > maxEntries) next.splice(0, next.length - maxEntries);
+  return next;
+}
+function computeShortTermReset() {
+  return 0;
+}
+function dayNumber2(date) {
+  return Math.floor(date.getTime() / 864e5);
+}
+function computeDailyStreak(previousStreak, lastInteractionAt, now) {
+  const last = lastInteractionAt instanceof Date ? lastInteractionAt : null;
+  const currentDay = dayNumber2(now);
+  const previousDay = last ? dayNumber2(last) : null;
+  if (previousDay === null) return 1;
+  if (previousDay === currentDay) return Math.max(1, previousStreak || 1);
+  if (previousDay === currentDay - 1)
+    return Math.max(1, (previousStreak || 0) + 1);
+  return 1;
+}
+function computeCoefficientValue(coefConfig, streak, lastInteractionAt, now, todayIncreaseCount = 0, todayDecreaseCount = 0) {
+  const lastMs = lastInteractionAt instanceof Date ? lastInteractionAt.getTime() : null;
+  const nowMs = now.getTime();
+  const inactivityDays = lastMs ? Math.max(0, Math.floor((nowMs - lastMs) / 864e5)) : 0;
+  const hasInteractedToday = inactivityDays === 0;
+  const isPositiveDay = todayIncreaseCount > todayDecreaseCount;
+  const isNegativeDay = todayDecreaseCount > todayIncreaseCount;
+  let decayPenalty = 0;
+  let streakBoost = 0;
+  if (!hasInteractedToday || isNegativeDay) {
+    if (!hasInteractedToday) {
+      decayPenalty = Math.min(
+        coefConfig.maxDrop,
+        inactivityDays * coefConfig.decayPerDay
+      );
+    } else if (isNegativeDay) {
+      decayPenalty = Math.min(coefConfig.maxDrop, coefConfig.decayPerDay);
+    }
+  }
+  if (hasInteractedToday && isPositiveDay && streak > 0) {
+    streakBoost = Math.min(
+      coefConfig.maxBoost,
+      Math.max(0, (Math.max(1, streak) - 1) * coefConfig.boostPerDay)
+    );
+  }
+  const coefficient = clampFloat(
+    coefConfig.base - decayPenalty + streakBoost,
+    coefConfig.min,
+    coefConfig.max
+  );
+  return { coefficient, decayPenalty, streakBoost, inactivityDays };
+}
+function composeState(longTerm, shortTerm, clampFn) {
+  return {
+    affinity: clampFn(longTerm),
+    longTermAffinity: clampFn(longTerm),
+    shortTermAffinity: Math.round(shortTerm)
+  };
+}
+function formatActionCounts(counts) {
+  const safe = counts || {};
+  const increase = Number(safe.increase) || 0;
+  const decrease = Number(safe.decrease) || 0;
+  return `\u63D0\u5347 ${increase} / \u964D\u4F4E ${decrease}`;
+}
+
 // src/services/affinity/store.ts
 function createAffinityStore(options) {
   const { ctx, config } = options;
@@ -1513,6 +1697,18 @@ function createAffinityStore(options) {
     );
     const existing = await load(scopeId, normalizedUserId);
     if (!existing) return null;
+    const parsedCoefficientState = extractState(existing).coefficientState;
+    const now = /* @__PURE__ */ new Date();
+    const nextStreak = computeDailyStreak(
+      parsedCoefficientState?.streak,
+      parsedCoefficientState?.lastInteractionAt || existing.lastInteractionAt,
+      now
+    );
+    const nextCoefficientState = {
+      ...parsedCoefficientState,
+      streak: nextStreak,
+      lastInteractionAt: now
+    };
     return save(
       { ...seed, scopeId, userId: normalizedUserId },
       Number.NaN,
@@ -1521,7 +1717,8 @@ function createAffinityStore(options) {
         longTermAffinity: existing.longTermAffinity ?? existing.affinity,
         shortTermAffinity: existing.shortTermAffinity ?? 0,
         chatCount: Math.max(0, Number(existing.chatCount || 0)) + 1,
-        lastInteractionAt: /* @__PURE__ */ new Date()
+        coefficientState: nextCoefficientState,
+        lastInteractionAt: now
       }
     );
   };
@@ -1562,190 +1759,6 @@ function createAffinityCache() {
   };
 }
 
-// src/services/affinity/calculator.ts
-function normalizeAction(action) {
-  const text = typeof action === "string" ? action.toLowerCase() : "";
-  if (text === "increase" || text === "decrease") return text;
-  return "increase";
-}
-function resolveShortTermConfig(config) {
-  const cfg = config?.affinityDynamics?.shortTerm || {};
-  const defaults = AFFINITY_DYNAMICS_DEFAULTS.shortTerm;
-  const promoteRaw = Number(cfg.promoteThreshold);
-  const demoteRaw = Number(cfg.demoteThreshold);
-  let promoteThreshold = Number.isFinite(promoteRaw) ? Math.round(promoteRaw) : defaults.promoteThreshold;
-  let demoteThreshold = Number.isFinite(demoteRaw) ? Math.round(demoteRaw) : defaults.demoteThreshold;
-  if (promoteThreshold <= demoteThreshold) {
-    const midpoint = Math.round((promoteThreshold + demoteThreshold) / 2) || 0;
-    promoteThreshold = midpoint + 15;
-    demoteThreshold = midpoint - 15;
-  }
-  const promoteStepRaw = Number(cfg.longTermPromoteStep);
-  const demoteStepRaw = Number(cfg.longTermDemoteStep);
-  const longTermPromoteStep = Math.max(
-    1,
-    Math.round(
-      Math.abs(
-        Number.isFinite(promoteStepRaw) ? promoteStepRaw : Number.isFinite(cfg.longTermStep) ? cfg.longTermStep : defaults.longTermPromoteStep
-      )
-    )
-  );
-  const longTermDemoteStep = Math.max(
-    1,
-    Math.round(
-      Math.abs(
-        Number.isFinite(demoteStepRaw) ? demoteStepRaw : Number.isFinite(cfg.longTermStep) ? cfg.longTermStep : defaults.longTermDemoteStep
-      )
-    )
-  );
-  return {
-    promoteThreshold,
-    demoteThreshold,
-    longTermPromoteStep,
-    longTermDemoteStep
-  };
-}
-function resolveActionWindowConfig(config) {
-  const cfg = config?.affinityDynamics?.actionWindow || {};
-  const defaults = AFFINITY_DYNAMICS_DEFAULTS.actionWindow;
-  const windowHoursRaw = Number(cfg.windowHours);
-  const windowHours = Math.max(
-    1,
-    Number.isFinite(windowHoursRaw) ? windowHoursRaw : defaults.windowHours
-  );
-  const increaseBonus = Number.isFinite(cfg.increaseBonus) ? cfg.increaseBonus : defaults.increaseBonus;
-  const decreaseBonus = Number.isFinite(cfg.decreaseBonus) ? cfg.decreaseBonus : defaults.decreaseBonus;
-  const bonusChatThresholdRaw = Number(cfg.bonusChatThreshold);
-  const bonusChatThreshold = Math.max(
-    0,
-    Number.isFinite(bonusChatThresholdRaw) ? Math.round(bonusChatThresholdRaw) : defaults.bonusChatThreshold
-  );
-  const maxEntriesRaw = Number(cfg.maxEntries);
-  const maxEntries = Math.max(
-    10,
-    Number.isFinite(maxEntriesRaw) ? Math.round(maxEntriesRaw) : defaults.maxEntries
-  );
-  return {
-    windowHours,
-    windowMs: windowHours * 3600 * 1e3,
-    increaseBonus,
-    decreaseBonus,
-    bonusChatThreshold,
-    maxEntries
-  };
-}
-function resolveCoefficientConfig(config) {
-  const cfg = config?.affinityDynamics?.coefficient || {};
-  const defaults = AFFINITY_DYNAMICS_DEFAULTS.coefficient;
-  const base = Number.isFinite(cfg.base) ? cfg.base : defaults.base;
-  const maxDrop = Math.max(
-    0,
-    Number.isFinite(cfg.maxDrop) ? cfg.maxDrop : defaults.maxDrop
-  );
-  const maxBoost = Math.max(
-    0,
-    Number.isFinite(cfg.maxBoost) ? cfg.maxBoost : defaults.maxBoost
-  );
-  const decayPerDay = Math.max(
-    0,
-    Number.isFinite(cfg.decayPerDay) ? cfg.decayPerDay : defaults.decayPerDay
-  );
-  const boostPerDay = Math.max(
-    0,
-    Number.isFinite(cfg.boostPerDay) ? cfg.boostPerDay : defaults.boostPerDay
-  );
-  const min = base - maxDrop;
-  const max = base + maxBoost;
-  return { base, maxDrop, maxBoost, decayPerDay, boostPerDay, min, max };
-}
-function summarizeActionEntries(rawEntries, windowMs, nowMs) {
-  const fallback = {
-    entries: [],
-    counts: { increase: 0, decrease: 0 },
-    total: 0
-  };
-  if (!Array.isArray(rawEntries)) return fallback;
-  const cutoff = nowMs - windowMs;
-  const entries = [];
-  const counts = { increase: 0, decrease: 0 };
-  for (const entry of rawEntries) {
-    if (!entry) continue;
-    const ts = Number(entry.timestamp);
-    if (!Number.isFinite(ts) || ts < cutoff) continue;
-    const normalizedAction = normalizeAction(entry.action);
-    entries.push({ action: normalizedAction, timestamp: ts });
-    counts[normalizedAction] += 1;
-  }
-  return { entries, counts, total: counts.increase + counts.decrease };
-}
-function appendActionEntry(entries, action, nowMs, maxEntries) {
-  const next = Array.isArray(entries) ? [...entries] : [];
-  next.push({ action: normalizeAction(action), timestamp: nowMs });
-  if (next.length > maxEntries) next.splice(0, next.length - maxEntries);
-  return next;
-}
-function computeShortTermReset() {
-  return 0;
-}
-function dayNumber2(date) {
-  return Math.floor(date.getTime() / 864e5);
-}
-function computeDailyStreak(previousStreak, lastInteractionAt, now) {
-  const last = lastInteractionAt instanceof Date ? lastInteractionAt : null;
-  const currentDay = dayNumber2(now);
-  const previousDay = last ? dayNumber2(last) : null;
-  if (previousDay === null) return 1;
-  if (previousDay === currentDay) return Math.max(1, previousStreak || 1);
-  if (previousDay === currentDay - 1)
-    return Math.max(1, (previousStreak || 0) + 1);
-  return 1;
-}
-function computeCoefficientValue(coefConfig, streak, lastInteractionAt, now, todayIncreaseCount = 0, todayDecreaseCount = 0) {
-  const lastMs = lastInteractionAt instanceof Date ? lastInteractionAt.getTime() : null;
-  const nowMs = now.getTime();
-  const inactivityDays = lastMs ? Math.max(0, Math.floor((nowMs - lastMs) / 864e5)) : 0;
-  const hasInteractedToday = inactivityDays === 0;
-  const isPositiveDay = todayIncreaseCount > todayDecreaseCount;
-  const isNegativeDay = todayDecreaseCount > todayIncreaseCount;
-  let decayPenalty = 0;
-  let streakBoost = 0;
-  if (!hasInteractedToday || isNegativeDay) {
-    if (!hasInteractedToday) {
-      decayPenalty = Math.min(
-        coefConfig.maxDrop,
-        inactivityDays * coefConfig.decayPerDay
-      );
-    } else if (isNegativeDay) {
-      decayPenalty = Math.min(coefConfig.maxDrop, coefConfig.decayPerDay);
-    }
-  }
-  if (hasInteractedToday && isPositiveDay && streak > 0) {
-    streakBoost = Math.min(
-      coefConfig.maxBoost,
-      Math.max(0, (Math.max(1, streak) - 1) * coefConfig.boostPerDay)
-    );
-  }
-  const coefficient = clampFloat(
-    coefConfig.base - decayPenalty + streakBoost,
-    coefConfig.min,
-    coefConfig.max
-  );
-  return { coefficient, decayPenalty, streakBoost, inactivityDays };
-}
-function composeState(longTerm, shortTerm, clampFn) {
-  return {
-    affinity: clampFn(longTerm),
-    longTermAffinity: clampFn(longTerm),
-    shortTermAffinity: Math.round(shortTerm)
-  };
-}
-function formatActionCounts(counts) {
-  const safe = counts || {};
-  const increase = Number(safe.increase) || 0;
-  const decrease = Number(safe.decrease) || 0;
-  return `\u63D0\u5347 ${increase} / \u964D\u4F4E ${decrease}`;
-}
-
 // src/services/message/history.ts
 function createMessageHistory(options) {
   const { ctx, config, log } = options;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "koishi-plugin-chatluna-affinity",
   "description": "ChatLuna Character 好感度系统，提供 {好感度}、{关系}、{黑名单} 变量与工具，并支持 XML 工具调用，仅支持 onebot 平台。",
-  "version": "0.3.0-beta.2",
+  "version": "0.3.0-beta.3",
   "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "types": "lib/index.d.ts",
   "files": [
     "lib",
     "dist",
@@ -43,20 +43,18 @@
   },
   "devDependencies": {
     "@koishijs/client": "^5.30.0",
-    "@types/node": "^20.11.0",
+    "@types/node": "^22.10.1",
     "@vitejs/plugin-vue": "^6.0.2",
     "rimraf": "^5.0.5",
     "sass": "^1.77.0",
     "tsup": "^8.0.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.7.2",
     "vite": "^6.0.0"
   },
-  "dependencies": {
-    "koishi-plugin-chatluna": "*"
-  },
   "scripts": {
     "build": "tsup && vite build",
     "watch": "tsup --watch",
-    "clean": "rimraf lib dist"
+    "clean": "rimraf lib dist",
+    "test": "node --test --test-name-pattern='.*' test/*.test.js"
   }
 }