koishi-plugin-monetary-bourse 1.1.0 → 1.1.1

package/lib/index.d.ts

@@ -71,9 +71,6 @@ export interface Config {
     freezeCostPerMinute: number;
     minFreezeTime: number;
     maxFreezeTime: number;
-    enableManualControl: boolean;
-    manualTargetPrice: number;
-    manualDuration: number;
     marketStatus: 'open' | 'close' | 'auto';
 }
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -51,12 +51,7 @@ var Config = import_koishi.Schema.intersect([
     freezeCostPerMinute: import_koishi.Schema.number().min(1).default(100).description("每多少货币计为1分钟冻结时间"),
     minFreezeTime: import_koishi.Schema.number().min(0).default(10).description("最小冻结时间(分钟)"),
     maxFreezeTime: import_koishi.Schema.number().min(0).default(1440).description("最大交易冻结时间(分钟)")
-  }).description("冻结机制"),
-  import_koishi.Schema.object({
-    enableManualControl: import_koishi.Schema.boolean().default(false).description("开启手动宏观调控(覆盖自动)"),
-    manualTargetPrice: import_koishi.Schema.number().min(0.01).default(1e3).description("手动目标价格"),
-    manualDuration: import_koishi.Schema.number().min(1).default(24).description("手动调控周期(小时)")
-  }).description("手动宏观调控")
+  }).description("冻结机制")
 ]);
 function apply(ctx, config) {
   ctx.model.extend("bourse_holding", {
@@ -106,10 +101,17 @@ function apply(ctx, config) {
     }
   });
   let wasMarketOpen = false;
+  let dailyOpenPrice = null;
+  let macroWaveCount = 7;
+  let macroWeeklyAmplitudeRatio = 0.08;
+  let nextMacroSwitchTime = null;
   ctx.setInterval(async () => {
     const isOpen = await isMarketOpen();
     if (isOpen && !wasMarketOpen) {
       switchKLinePattern("自动开市");
+      dailyOpenPrice = currentPrice;
+      const hours = 6 + Math.floor(Math.random() * 19);
+      nextMacroSwitchTime = new Date(Date.now() + hours * 3600 * 1e3);
     }
     wasMarketOpen = isOpen;
     if (!isOpen) return;
@@ -366,65 +368,45 @@ function apply(ctx, config) {
       if (!state.endTime) state.endTime = new Date(state.lastCycleStart.getTime() + 7 * 24 * 3600 * 1e3);
       if (!(state.endTime instanceof Date)) state.endTime = new Date(state.endTime);
     }
-    if (config.enableManualControl) {
-      if (!state || state.mode !== "manual" || Math.abs(state.targetPrice - config.manualTargetPrice) > 0.01) {
-        const durationHours = config.manualDuration;
-        const targetPrice = config.manualTargetPrice;
-        const endTime = new Date(now.getTime() + durationHours * 3600 * 1e3);
-        const minutes = durationHours * 60;
-        const trendFactor = (targetPrice - currentPrice) / minutes;
-        const newState = {
-          key: "macro_state",
-          lastCycleStart: now,
-          startPrice: currentPrice,
-          targetPrice,
-          trendFactor,
-          mode: "manual",
-          endTime
-        };
-        if (!state) await ctx.database.create("bourse_state", newState);
-        else {
-          const { key, ...updateFields } = newState;
-          await ctx.database.set("bourse_state", { key: "macro_state" }, updateFields);
-        }
-        state = newState;
-      }
-    }
     let needNewState = false;
-    if (!config.enableManualControl) {
-      if (!state) {
-        needNewState = true;
-      } else {
-        const endTime = state.endTime || new Date(state.lastCycleStart.getTime() + 7 * 24 * 3600 * 1e3);
-        if (now > endTime) {
-          needNewState = true;
-        }
-      }
-      if (needNewState) {
-        const durationHours = 7 * 24;
-        const fluctuation = 0.3;
-        const targetRatio = 1 + (Math.random() * 2 - 1) * fluctuation;
-        const targetPrice = currentPrice * targetRatio;
-        const endTime = new Date(now.getTime() + durationHours * 3600 * 1e3);
-        const minutes = durationHours * 60;
-        const trendFactor = (targetPrice - currentPrice) / minutes;
-        const newState = {
-          key: "macro_state",
-          lastCycleStart: now,
-          startPrice: currentPrice,
-          targetPrice,
-          trendFactor,
-          mode: "auto",
-          endTime
-        };
-        if (!state) {
-          await ctx.database.create("bourse_state", newState);
-        } else {
-          const { key, ...updateFields } = newState;
-          await ctx.database.set("bourse_state", { key: "macro_state" }, updateFields);
-        }
-        state = newState;
+    if (!state) {
+      needNewState = true;
+    } else {
+      const endTime = state.endTime || new Date(state.lastCycleStart.getTime() + 7 * 24 * 3600 * 1e3);
+      if (state.mode !== "manual" && now > endTime) needNewState = true;
+    }
+    const createAutoState = /* @__PURE__ */ __name(async () => {
+      const durationHours = 7 * 24;
+      const fluctuation = 0.3;
+      const targetRatio = 1 + (Math.random() * 2 - 1) * fluctuation;
+      const targetPrice = currentPrice * targetRatio;
+      const endTime = new Date(now.getTime() + durationHours * 3600 * 1e3);
+      const minutes = durationHours * 60;
+      const trendFactor = (targetPrice - currentPrice) / minutes;
+      macroWaveCount = 5 + Math.floor(Math.random() * 6);
+      macroWeeklyAmplitudeRatio = 0.06 + Math.random() * 0.06;
+      const hours = 6 + Math.floor(Math.random() * 19);
+      nextMacroSwitchTime = new Date(now.getTime() + hours * 3600 * 1e3);
+      const newState = {
+        key: "macro_state",
+        lastCycleStart: now,
+        startPrice: currentPrice,
+        targetPrice,
+        trendFactor,
+        mode: "auto",
+        endTime
+      };
+      if (!state) await ctx.database.create("bourse_state", newState);
+      else {
+        const { key, ...updateFields } = newState;
+        await ctx.database.set("bourse_state", { key: "macro_state" }, updateFields);
       }
+      state = newState;
+    }, "createAutoState");
+    if (needNewState) {
+      await createAutoState();
+    } else if (state.mode === "auto" && nextMacroSwitchTime && now >= nextMacroSwitchTime) {
+      await createAutoState();
     }
     const timeSinceLastSwitch = now.getTime() - lastPatternSwitchTime.getTime();
     const forceSwitchDuration = 30 * 3600 * 1e3;
@@ -447,8 +429,8 @@ function apply(ctx, config) {
     const totalDuration = state.endTime.getTime() - state.lastCycleStart.getTime();
     const elapsed = now.getTime() - state.lastCycleStart.getTime();
     const prevElapsed = elapsed - 2 * 60 * 1e3;
-    const waveCount = 7;
-    const weeklyAmplitude = state.startPrice * 0.08;
+    const waveCount = macroWaveCount;
+    const weeklyAmplitude = state.startPrice * macroWeeklyAmplitudeRatio;
     const getWaveValue = /* @__PURE__ */ __name((t) => {
       const progress = t / totalDuration;
       return weeklyAmplitude * (Math.sin(2 * Math.PI * waveCount * progress) * 0.7 + Math.sin(2 * Math.PI * waveCount * 2.5 * progress) * 0.3);
@@ -456,6 +438,11 @@ function apply(ctx, config) {
     const waveDelta = getWaveValue(elapsed) - getWaveValue(prevElapsed);
     let newPrice = currentPrice + trend + volatility + patternDelta + waveDelta;
     if (newPrice < 1) newPrice = 1;
+    const dayBase = dailyOpenPrice ?? state.startPrice;
+    const upperLimit = Math.min(state.startPrice * 1.5, dayBase * 1.5);
+    const lowerLimit = Math.max(state.startPrice * 0.5, dayBase * 0.5);
+    if (newPrice > upperLimit) newPrice = upperLimit;
+    if (newPrice < lowerLimit) newPrice = lowerLimit;
     newPrice = Number(newPrice.toFixed(2));
     currentPrice = newPrice;
     await ctx.database.create("bourse_history", { stockId, price: newPrice, time: /* @__PURE__ */ new Date() });
@@ -701,12 +688,17 @@ function apply(ctx, config) {
     const now = /* @__PURE__ */ new Date();
     const endTime = new Date(now.getTime() + duration * 3600 * 1e3);
     const minutes = duration * 60;
-    const trendFactor = (price - currentPrice) / minutes;
+    const baseStart = (await ctx.database.get("bourse_state", { key: "macro_state" }))[0]?.startPrice ?? currentPrice;
+    const dayBase = dailyOpenPrice ?? baseStart;
+    const upper = Math.min(baseStart * 1.5, dayBase * 1.5);
+    const lower = Math.max(baseStart * 0.5, dayBase * 0.5);
+    const targetPriceClamped = Math.max(lower, Math.min(upper, price));
+    const trendFactor = (targetPriceClamped - currentPrice) / minutes;
     const newState = {
       key: "macro_state",
       lastCycleStart: now,
       startPrice: currentPrice,
-      targetPrice: price,
+      targetPrice: targetPriceClamped,
       trendFactor,
       mode: "manual",
       endTime
@@ -715,10 +707,12 @@ function apply(ctx, config) {
     if (existing.length === 0) {
       await ctx.database.create("bourse_state", newState);
     } else {
-      await ctx.database.set("bourse_state", "macro_state", newState);
+      const { key, ...updateFields } = newState;
+      await ctx.database.set("bourse_state", { key: "macro_state" }, updateFields);
     }
+    const hint = targetPriceClamped !== price ? `（已按±50%限幅从${price}调整为${Number(targetPriceClamped.toFixed(2))}）` : "";
     return `宏观调控已设置：
-目标价格：${price}
+目标价格：${Number(targetPriceClamped.toFixed(2))}${hint}
 期限：${duration}小时
 模式：手动干预
 到期后将自动切回随机调控。`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-monetary-bourse",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -19,7 +19,14 @@
 
 ## 更新记录
 
-- 1.1.0：
+- **1.1.1（Alpha.4）**：
+  - 新增：硬性涨跌幅上限规则（±50%），同时约束日内与周内视角。随机与手动调控的结果均会在应用前进行限幅。
+  - 新增：更随机的自动宏观调控——随机刷新宏观目标（约每 6–24 小时），并随机调整周波浪频率与幅度（波浪段数约 5–10、周幅度约 6%–12%）。
+  - 修复：手动宏观调控命令更新状态时，严格排除主键字段，避免 `TypeError: cannot modify primary key`。
+  - 变更：移除配置项中的手动宏观调控相关字段（`enableManualControl`、`manualTargetPrice`、`manualDuration`），改为仅通过管理员指令进行宏观调控。
+  - 新增：开发测试命令方便快速验证逻辑（`bourse.test.price`、`bourse.test.clamp`），默认注释不启用，若需要请手动修改代码打开调试。
+
+- **1.1.0**：
   - Alpha.3版本转为正式版。
 
 - **Alpha.3**：
@@ -72,9 +79,7 @@
 - **maxFreezeTime**: 最大冻结时间（分钟，默认 `1440` 即24小时）。
 
 ### 宏观调控
-- **enableManualControl**: 是否开启手动强力调控模式（覆盖自动波动）。
-- **manualTargetPrice**: 手动模式下的目标价格。
-- **manualDuration**: 手动调控周期（小时）。
+- 已移除配置项中的手动宏观调控字段；请使用管理员指令进行宏观调控。
 
 ## 🎮 指令说明
 
@@ -103,7 +108,7 @@
 
 - **`stock.control <price> [hours]`**
   - 设置宏观调控目标。
-  - 说明：强行引导股价在指定时间内向目标价格移动。
+  - 说明：强行引导股价在指定时间内向目标价格移动。若目标涨跌超出±50%限幅，会自动调整至限幅边界后再应用。
   - 示例：`stock.control 5000 12` (在12小时内让股价涨/跌到5000)。
 
 - **`stock.pattern`** *(Alpha 2 新增)*
@@ -115,6 +120,14 @@
   - 参数 `status`: `open` (开启), `close` (关闭), `auto` (自动)。
   - 说明：手动开市时会自动重置并切换一个新的日内 K 线形态。
 
+- **`bourse.test.price [ticks]`**
+  - 开发测试：推进价格更新若干次并返回当前价格。
+  - 参数 `ticks`: 推进次数，默认 1，最大 500。
+
+- **`bourse.test.clamp <percent>`**
+  - 开发测试：尝试目标涨跌幅并查看限幅结果。
+  - 参数 `percent`: 期望涨跌百分比，例如 `60` 或 `-40`。
+
 ## 💡 常见问题
 
 **Q: 为什么买了股票没有立刻到账？**
@@ -126,3 +139,5 @@ A: 股价由四部分叠加而成：
 2. **周级波浪**：7天为一个大周期的正弦复合波浪。
 3. **日内形态**：每天随机从 12 种剧本中选择多种（如 V 型、倒 V 型、阶梯上涨等）。
 4. **随机噪音**：微小的随机波动。
+
+此外，为保证市场稳定性，应用了**涨跌幅硬性限制**：相对于周周期起始价与当日开盘价的双重基准，股价的涨跌幅不得超过 ±50%。当随机或手动设置的目标超出限幅时，将自动截断至限幅边界。