@sayue_ltr/fleq 1.50.1 → 2.0.0

package/dist/engine/messages/telegram-stats.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TelegramStats = void 0;
+exports.routeToCategory = routeToCategory;
+/** Route → StatsCategory 変換 */
+function routeToCategory(route) {
+    switch (route) {
+        case "eew": return "eew";
+        case "earthquake":
+        case "seismicText":
+        case "lgObservation": return "earthquake";
+        case "tsunami": return "tsunami";
+        case "volcano": return "volcano";
+        case "nankaiTrough": return "nankaiTrough";
+        default: return "other";
+    }
+}
+/** 最大震度 headType → priority マッピング */
+const MAX_INT_PRIORITY = {
+    VXSE53: 3,
+    VXSE61: 2,
+    VXSE51: 1,
+};
+/** Set/Map のサイズ上限 */
+const MAX_EVENT_ENTRIES = 1000;
+/** 上限超過時に削除するエントリ数 (バッチ削除で頻繁な削除を回避) */
+const EVICT_BATCH_SIZE = 100;
+/** Set のサイズ上限を適用する。超過時は挿入順で古い方から削除する。 */
+function evictOldestFromSet(set, maxSize) {
+    if (set.size <= maxSize)
+        return;
+    let toRemove = set.size - maxSize + EVICT_BATCH_SIZE;
+    for (const item of set) {
+        if (toRemove <= 0)
+            break;
+        set.delete(item);
+        toRemove--;
+    }
+}
+/** Map のサイズ上限を適用する。超過時は挿入順で古い方から削除する。 */
+function evictOldestFromMap(map, maxSize) {
+    if (map.size <= maxSize)
+        return;
+    let toRemove = map.size - maxSize + EVICT_BATCH_SIZE;
+    for (const key of map.keys()) {
+        if (toRemove <= 0)
+            break;
+        map.delete(key);
+        toRemove--;
+    }
+}
+/** セッション中の電文受信統計を管理する */
+class TelegramStats {
+    startTime;
+    countByType = new Map();
+    categoryByType = new Map();
+    eewEventIds = new Set();
+    earthquakeMaxIntByEvent = new Map();
+    constructor(startTime) {
+        this.startTime = startTime ?? new Date();
+    }
+    /** headType カウント加算。EEW の場合は eventId を Set に追加 */
+    record(rec) {
+        this.countByType.set(rec.headType, (this.countByType.get(rec.headType) ?? 0) + 1);
+        // headType → category の対応は固定なので初回のみ登録する
+        if (!this.categoryByType.has(rec.headType)) {
+            this.categoryByType.set(rec.headType, rec.category);
+        }
+        if (rec.category === "eew" && rec.eventId != null) {
+            this.eewEventIds.add(rec.eventId);
+            evictOldestFromSet(this.eewEventIds, MAX_EVENT_ENTRIES);
+        }
+    }
+    /**
+     * 地震イベントの代表最大震度を更新する。
+     * 認識する headType: VXSE53 (priority 3), VXSE61 (priority 2), VXSE51 (priority 1)。
+     * 未知の headType は priority 0 として扱う。
+     */
+    updateMaxInt(eventId, maxInt, headType) {
+        const priority = MAX_INT_PRIORITY[headType] ?? 0;
+        const existing = this.earthquakeMaxIntByEvent.get(eventId);
+        if (existing == null || priority >= existing.priority) {
+            this.earthquakeMaxIntByEvent.set(eventId, { maxInt, priority });
+            evictOldestFromMap(this.earthquakeMaxIntByEvent, MAX_EVENT_ENTRIES);
+        }
+    }
+    /** 表示用の読み取り専用スナップショットを返す */
+    getSnapshot() {
+        let totalCount = 0;
+        for (const count of this.countByType.values()) {
+            totalCount += count;
+        }
+        return {
+            startTime: new Date(this.startTime),
+            countByType: new Map(this.countByType),
+            categoryByType: new Map(this.categoryByType),
+            eewEventCount: this.eewEventIds.size,
+            earthquakeMaxIntByEvent: new Map([...this.earthquakeMaxIntByEvent.entries()].map(([k, v]) => [k, v.maxInt])),
+            totalCount,
+        };
+    }
+}
+exports.TelegramStats = TelegramStats;

package/dist/engine/messages/volcano-route-handler.js

@@ -0,0 +1,122 @@
+"use strict";
+/**
+ * 火山電文のルーティング処理を一元管理するハンドラ。
+ *
+ * 火山は VFVO53 アグリゲータによるバッチ集約があるため、
+ * 他ドメインの processMessage() → outcome → display の線形フローとは異なる。
+ * このハンドラが火山の パース → キャッシュ → 集約 → 通知 → 表示 を担当する。
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VolcanoRouteHandler = void 0;
+const volcano_parser_1 = require("../../dmdata/volcano-parser");
+const volcano_vfvo53_aggregator_1 = require("./volcano-vfvo53-aggregator");
+const volcano_presentation_1 = require("../notification/volcano-presentation");
+const process_volcano_1 = require("../presentation/processors/process-volcano");
+// ── 定数 ──
+const VOLCANO_CACHE_TTL_MS = 10 * 60 * 1000; // 10分
+// ── 本体 ──
+class VolcanoRouteHandler {
+    volcanoState;
+    notifier;
+    runDisplayPipeline;
+    display;
+    aggregator;
+    msgCache = new Map();
+    constructor(deps) {
+        this.volcanoState = deps.volcanoState;
+        this.notifier = deps.notifier;
+        this.runDisplayPipeline = deps.runDisplayPipeline;
+        this.display = deps.display;
+        this.aggregator = new volcano_vfvo53_aggregator_1.VolcanoVfvo53Aggregator((info, opts) => this.emitSingle(info, opts), (batch, opts) => this.emitBatch(batch, opts));
+    }
+    /**
+     * 火山電文を処理する。
+     * @returns パース成功なら ParsedVolcanoInfo (統計記録用)、失敗なら null。
+     */
+    handle(msg) {
+        this.pruneMsgCache();
+        const volcanoInfo = (0, volcano_parser_1.parseVolcanoTelegram)(msg);
+        if (!volcanoInfo)
+            return null;
+        this.msgCache.set(volcanoInfo.volcanoCode, { msg, cachedAt: Date.now() });
+        this.aggregator.handle(volcanoInfo);
+        return volcanoInfo;
+    }
+    /** 保留中の火山バッファを flush してリソースを破棄する */
+    flushAndDispose() {
+        this.aggregator.flushAndDispose();
+    }
+    // ── private: emit callbacks ──
+    emitSingle(info, opts) {
+        const cacheEntry = this.msgCache.get(info.volcanoCode);
+        const cachedMsg = cacheEntry?.msg;
+        const outcome = cachedMsg
+            ? (0, process_volcano_1.buildVolcanoOutcome)(cachedMsg, info, this.volcanoState)
+            : null;
+        const presentation = (0, volcano_presentation_1.resolveVolcanoPresentation)(info, this.volcanoState);
+        this.volcanoState.update(info);
+        // 通知は filter 非適用
+        if (opts?.notify !== false) {
+            this.notifier.notifyVolcano(info, presentation);
+        }
+        // PresentationEvent パイプライン
+        if (outcome) {
+            this.runDisplayPipeline(outcome, () => this.display?.displayVolcano(info, presentation));
+        }
+        else {
+            // msg キャッシュがない場合はフォールバック表示
+            this.display?.displayVolcano(info, presentation);
+        }
+        this.msgCache.delete(info.volcanoCode);
+    }
+    emitBatch(batch, opts) {
+        const presentation = (0, volcano_presentation_1.resolveVolcanoBatchPresentation)(batch);
+        if (opts.notify) {
+            this.notifier.notifyVolcanoBatch(batch, presentation);
+        }
+        const firstItem = batch.items[0];
+        const cacheEntry = firstItem ? this.msgCache.get(firstItem.volcanoCode) : undefined;
+        const cachedMsg = cacheEntry?.msg;
+        if (cachedMsg) {
+            const batchOutcome = {
+                domain: "volcano",
+                msg: cachedMsg,
+                headType: cachedMsg.head.type,
+                statsCategory: "volcano",
+                parsed: batch.items,
+                isBatch: true,
+                volcanoPresentation: presentation,
+                batchReportDateTime: batch.reportDateTime,
+                batchIsTest: batch.isTest,
+                stats: {
+                    shouldRecord: false,
+                },
+                presentation: {
+                    frameLevel: presentation.frameLevel,
+                    soundLevel: presentation.soundLevel,
+                    notifyCategory: "volcano",
+                },
+            };
+            this.runDisplayPipeline(batchOutcome, () => this.display?.displayVolcanoBatch(batch, presentation));
+        }
+        else {
+            this.display?.displayVolcanoBatch(batch, presentation);
+        }
+        this.cleanupBatchCache(batch);
+    }
+    // ── private: cache management ──
+    pruneMsgCache() {
+        const now = Date.now();
+        for (const [key, entry] of this.msgCache) {
+            if (now - entry.cachedAt > VOLCANO_CACHE_TTL_MS) {
+                this.msgCache.delete(key);
+            }
+        }
+    }
+    cleanupBatchCache(batch) {
+        for (const item of batch.items) {
+            this.msgCache.delete(item.volcanoCode);
+        }
+    }
+}
+exports.VolcanoRouteHandler = VolcanoRouteHandler;

package/dist/engine/monitor/monitor.js

@@ -47,14 +47,21 @@ const formatter_1 = require("../../ui/formatter");
 const repl_coordinator_1 = require("./repl-coordinator");
 const shutdown_1 = require("./shutdown");
 const log = __importStar(require("../../logger"));
-async function startMonitor(config) {
-    const { handler: routeMessage, eewLogger, notifier, tsunamiState, volcanoState, flushAndDisposeVolcanoBuffer } = (0, message_router_1.createMessageHandler)();
+const summary_interval_formatter_1 = require("../../ui/summary-interval-formatter");
+const summary_tracker_1 = require("../messages/summary-tracker");
+async function startMonitor(config, pipelineController) {
+    // display adapter は遅延ロードで ui 依存を monitor 側に限定する
+    const { createDisplayAdapter } = await Promise.resolve().then(() => __importStar(require("../../ui/display-adapter")));
+    const display = createDisplayAdapter();
+    const pipeline = pipelineController?.getPipeline();
+    const { handler: routeMessage, eewLogger, notifier, tsunamiState, volcanoState, stats, summaryTracker, flushAndDisposeVolcanoBuffer } = (0, message_router_1.createMessageHandler)({ pipeline: pipeline ?? undefined, display });
     // EEW ログ設定を反映
     eewLogger.setEnabled(config.eewLog);
     eewLogger.setFields(config.eewLogFields);
     let disconnectedAt = null;
     let isFirstConnection = true;
     let replHandler = null;
+    let summaryTimerControl = null;
     const manager = new multi_connection_manager_1.MultiConnectionManager(config, {
         onData: (msg) => {
             (0, repl_coordinator_1.withReplDisplay)(replHandler, () => routeMessage(msg));
@@ -69,7 +76,7 @@ async function startMonitor(config) {
             }
             log.info(chalk_1.default.green("リアルタイム受信中..."));
             if (isFirstConnection) {
-                log.info(chalk_1.default.gray("help でコマンド一覧を表示"));
+                log.info(chalk_1.default.gray("commands (短縮: cmds) でコマンド一覧を表示"));
                 isFirstConnection = false;
             }
             (0, repl_coordinator_1.updateReplConnectionState)(replHandler, true);
@@ -88,11 +95,15 @@ async function startMonitor(config) {
         getReplHandler: () => replHandler,
         resetTerminalTitle: cli_run_1.resetTerminalTitle,
         flushAndDisposeVolcanoBuffer,
+        stopSummaryTimer: () => summaryTimerControl?.stop(),
     });
     // REPL ハンドラ (遅延ロード)
     const { ReplHandler } = await Promise.resolve().then(() => __importStar(require("../../ui/repl")));
-    replHandler = new ReplHandler(config, manager, notifier, eewLogger, shutdown, [tsunamiState, volcanoState], [tsunamiState, volcanoState]);
+    replHandler = new ReplHandler(config, manager, notifier, eewLogger, shutdown, stats, [tsunamiState, volcanoState], [tsunamiState, volcanoState], pipelineController, summaryTracker);
     (0, shutdown_1.registerShutdownSignals)(shutdown);
+    // 定期要約タイマー
+    summaryTimerControl = createSummaryTimerControl(config, summaryTracker, () => replHandler);
+    replHandler.setSummaryTimerControl(summaryTimerControl);
     // REPL を先に起動 (接続中もコマンド入力可能にする)
     replHandler.start();
     // 起動時: 最新の津波・火山警報状態を復元 (WebSocket 接続前に実行)
@@ -116,3 +127,40 @@ async function startMonitor(config) {
         log.info("retry コマンドで再接続を試みることができます。");
     }
 }
+/** 定期要約タイマーの制御オブジェクトを生成する。初期値が設定済みなら自動起動する。 */
+function createSummaryTimerControl(config, tracker, getReplHandler) {
+    let timer = null;
+    function showOutput(intervalMinutes) {
+        const snapshot = tracker.getSnapshot();
+        const output = (0, summary_interval_formatter_1.formatSummaryInterval)(snapshot, intervalMinutes, true);
+        (0, repl_coordinator_1.withReplDisplay)(getReplHandler(), () => {
+            console.log(output);
+        });
+    }
+    const control = {
+        start(intervalMinutes) {
+            // 既存タイマーを停止してから再起動
+            control.stop();
+            const intervalMs = intervalMinutes * 60_000;
+            timer = setInterval(() => showOutput(intervalMinutes), intervalMs);
+            timer.unref();
+        },
+        stop() {
+            if (timer != null) {
+                clearInterval(timer);
+                timer = null;
+            }
+        },
+        isRunning() {
+            return timer != null;
+        },
+        showNow() {
+            showOutput(summary_tracker_1.WINDOW_MINUTES);
+        },
+    };
+    // 初期値が設定されていれば自動起動
+    if (config.summaryInterval != null) {
+        control.start(config.summaryInterval);
+    }
+    return control;
+}

package/dist/engine/monitor/shutdown.js

@@ -84,6 +84,7 @@ function createShutdownHandler(ctx) {
             return;
         shuttingDown = true;
         log.info("シャットダウン中...");
+        ctx.stopSummaryTimer?.();
         ctx.flushAndDisposeVolcanoBuffer?.();
         ctx.eewLogger.closeAll();
         try {

package/dist/engine/notification/notifier.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Notifier = exports.NOTIFY_CATEGORY_LABELS = void 0;
+exports.clearIconPathCache = clearIconPathCache;
 exports.resolveIconPath = resolveIconPath;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -55,12 +56,24 @@ const CATEGORY_ICON_PREFIX = {
     lgObservation: "lg-observation",
     volcano: "volcano",
 };
+/** resolveIconPath の結果キャッシュ。キー: "{category}:{level|''}" */
+const iconPathCache = new Map();
+/**
+ * resolveIconPath のキャッシュをクリアする (テスト用)。
+ */
+function clearIconPathCache() {
+    iconPathCache.clear();
+}
 /**
  * カテゴリとレベルからアイコンパスを解決する。
  * 3段フォールバック: {prefix}-{level}.png → {prefix}.png → default.png
- * いずれも見つからなければ undefined を返す。
+ * いずれも見つからなければ undefined を返す。結果はキャッシュして再利用する。
  */
 function resolveIconPath(category, level) {
+    const cacheKey = `${category}:${level ?? ""}`;
+    if (iconPathCache.has(cacheKey)) {
+        return iconPathCache.get(cacheKey);
+    }
     const prefix = CATEGORY_ICON_PREFIX[category];
     const candidates = [];
     if (level) {
@@ -70,9 +83,11 @@ function resolveIconPath(category, level) {
     candidates.push(path.join(ICONS_DIR, "default.png"));
     for (const candidate of candidates) {
         if (fs.existsSync(candidate)) {
+            iconPathCache.set(cacheKey, candidate);
             return candidate;
         }
     }
+    iconPathCache.set(cacheKey, undefined);
     return undefined;
 }
 /** 通知アプリ名 */
@@ -158,10 +173,12 @@ class Notifier {
     notifyEew(info, result) {
         if (!this.settings.eew)
             return;
-        // 通知条件: 第1報 / 予報→警報切替 / 取消報 / 最終報
-        const isUpgradeToWarning = result.previousInfo?.isWarning === false && info.isWarning === true;
+        // 抑制された報は通知しない
+        if (result.isSuppressed)
+            return;
+        // 通知条件: 第1報 / 警報昇格 / 取消報 / 最終報
         const isFinal = info.nextAdvisory != null;
-        if (!result.isNew && !isUpgradeToWarning && !result.isCancelled && !isFinal) {
+        if (!result.isNew && !result.isUpgradeToWarning && !result.isCancelled && !isFinal) {
             return;
         }
         if (result.isCancelled) {