@sayue_ltr/fleq 1.50.1 → 2.0.0

package/dist/dmdata/telegram-parser.js

@@ -41,6 +41,7 @@ exports.parseXml = parseXml;
 exports.dig = dig;
 exports.str = str;
 exports.first = first;
+exports.extractBaseReport = extractBaseReport;
 exports.parseEarthquakeTelegram = parseEarthquakeTelegram;
 exports.parseEewTelegram = parseEewTelegram;
 exports.parseTsunamiTelegram = parseTsunamiTelegram;
@@ -151,10 +152,15 @@ function extractEarthquake(earthquake) {
     const area = first(dig(hypo, "Area"));
     const name = str(dig(area, "Name"));
     // 座標パース: "+35.7+139.8-10000/" 形式
-    const coordStr = str(dig(area, "jmx_eb:Coordinate", "#text") ||
-        dig(area, "Coordinate", "#text") ||
-        dig(area, "jmx_eb:Coordinate") ||
-        dig(area, "Coordinate"));
+    // VXSE61 等では jmx_eb:Coordinate が複数 (十進度 + 度分) 存在し配列になる。
+    // type="震源位置（度分）" を除外して十進度を優先選択する。
+    const rawCoord = dig(area, "jmx_eb:Coordinate") || dig(area, "Coordinate");
+    const coordNode = Array.isArray(rawCoord)
+        ? rawCoord.find((c) => str(dig(c, "@_type")) !== "震源位置（度分）") ?? rawCoord[0]
+        : rawCoord;
+    const coordStr = str(coordNode != null && typeof coordNode === "object"
+        ? dig(coordNode, "#text")
+        : coordNode);
     const { lat, lon, depth } = parseCoordinate(coordStr);
     const magRaw = str(dig(earthquake, "jmx_eb:Magnitude", "#text") ||
         dig(earthquake, "Magnitude", "#text") ||
@@ -237,6 +243,54 @@ function extractTsunami(body) {
     return { text };
 }
 // ── EEW ヘルパー ──
+/** Headline Information の Kind Code に警報コード (31) が含まれるか */
+function hasWarningHeadlineCode(head) {
+    const headline = dig(head, "Headline");
+    const informations = dig(headline, "Information");
+    const infoList = Array.isArray(informations) ? informations : informations ? [informations] : [];
+    for (const info of infoList) {
+        const items = dig(info, "Item");
+        const itemList = Array.isArray(items) ? items : items ? [items] : [];
+        for (const item of itemList) {
+            const kinds = dig(item, "Kind");
+            const kindList = Array.isArray(kinds) ? kinds : kinds ? [kinds] : [];
+            for (const kind of kindList) {
+                const code = parseInt(str(dig(kind, "Code")), 10);
+                if (code === 31)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+/** 予測地域の Category Kind Code に警報コード (10-19) が含まれるか */
+function hasWarningAreaKind(body) {
+    const forecast = dig(body, "Intensity", "Forecast");
+    if (!forecast)
+        return false;
+    const prefs = dig(forecast, "Pref");
+    if (!Array.isArray(prefs))
+        return false;
+    for (const pref of prefs) {
+        const areas = dig(pref, "Area");
+        if (!Array.isArray(areas))
+            continue;
+        for (const area of areas) {
+            const categories = dig(area, "Category");
+            const catList = Array.isArray(categories) ? categories : categories ? [categories] : [];
+            for (const cat of catList) {
+                const kinds = dig(cat, "Kind");
+                const kindList = Array.isArray(kinds) ? kinds : kinds ? [kinds] : [];
+                for (const kind of kindList) {
+                    const code = parseInt(str(dig(kind, "Code")), 10);
+                    if (code >= 10 && code <= 19)
+                        return true;
+                }
+            }
+        }
+    }
+    return false;
+}
 function parseMaxIntChangeReason(body) {
     const raw = str(dig(body, "Intensity", "Forecast", "Appendix", "MaxIntChangeReason"));
     if (!raw)
@@ -384,22 +438,32 @@ function extractLgObservationDetails(body) {
     }
     return result;
 }
+// ── 共通前処理 ──
+/** decodeBody → parseXml → Report/Head/Body を抽出する共通前処理 */
+function extractBaseReport(msg) {
+    const xmlStr = decodeBody(msg);
+    const parsed = parseXml(xmlStr);
+    const report = dig(parsed, "Report") ||
+        dig(parsed, "jmx:Report") ||
+        dig(parsed, "jmx_seis:Report");
+    if (!report) {
+        log.debug("Report ノードが見つかりません");
+        return null;
+    }
+    return {
+        report,
+        head: dig(report, "Head"),
+        body: dig(report, "Body"),
+    };
+}
 // ── 公開API ──
 /** 地震関連電文(VXSE51/52/53等)をパース */
 function parseEarthquakeTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        // Report > Body を探す
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report) {
-            log.debug("Report ノードが見つかりません");
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        }
-        const body = dig(report, "Body");
-        const head = dig(report, "Head");
+        const { head, body } = base;
         const info = {
             type: msg.head.type,
             infoType: str(dig(head, "InfoType")),
@@ -407,6 +471,7 @@ function parseEarthquakeTelegram(msg) {
             reportDateTime: str(dig(head, "ReportDateTime")),
             headline: str(dig(head, "Headline", "Text")) || null,
             publishingOffice: msg.xmlReport?.control?.publishingOffice || "",
+            eventId: str(dig(head, "EventID")) || null,
             isTest: msg.head.test,
         };
         // 震源
@@ -432,15 +497,10 @@ function parseEarthquakeTelegram(msg) {
 /** EEW電文をパース */
 function parseEewTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report)
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        const head = dig(report, "Head");
-        const body = dig(report, "Body");
+        const { head, body } = base;
         // 仮定震源要素の検出
         const earthquake = dig(body, "Earthquake");
         const earthquakeCondition = str(dig(earthquake, "Condition"));
@@ -455,7 +515,7 @@ function parseEewTelegram(msg) {
             serial: str(dig(head, "Serial")) || null,
             eventId: str(dig(head, "EventID")) || null,
             isTest: msg.head.test,
-            isWarning: msg.classification === "eew.warning",
+            isWarning: false, // 仮値 — 後で XML から判定
             isAssumedHypocenter: false,
         };
         info.maxIntChangeReason = parseMaxIntChangeReason(body);
@@ -474,6 +534,25 @@ function parseEewTelegram(msg) {
             (info.maxIntChangeReason === 9 || hasPlumArea);
         info.isAssumedHypocenter =
             assumedHypocenterByCondition || assumedHypocenterByFallback;
+        // isWarning: XML ベース主判定 + classification を安全側フォールバック
+        // xmlWarning / classWarning を先に変数化し、判定と観測ログで同じ値を共用する。
+        const xmlWarning = msg.head.type === "VXSE43" ||
+            hasWarningAreaKind(body) ||
+            hasWarningHeadlineCode(head);
+        const classWarning = msg.classification === "eew.warning";
+        info.isWarning = xmlWarning || classWarning;
+        // 観測ログ (仕様不整合の検知用):
+        // (1) classification=eew.warning だが XML ベース判定で警報条件を検出できない
+        // (2) VXSE43 電文なのに classification が eew.warning ではない（契約差分・仕様変更の兆候）
+        // 逆方向の一般形 (xmlWarning && !classWarning) は VXSE44/VXSE45 警報相当の正常パターンなのでログしない。
+        if (classWarning && !xmlWarning) {
+            log.warn(`EEW classification=eew.warning だが XML ベース判定で警報条件を検出できず: ` +
+                `type=${msg.head.type} EventID=${str(dig(head, "EventID"))}`);
+        }
+        else if (msg.head.type === "VXSE43" && !classWarning) {
+            log.warn(`EEW VXSE43 電文だが classification=${msg.classification} (eew.warning ではない): ` +
+                `EventID=${str(dig(head, "EventID"))}`);
+        }
         // NextAdvisory (最終報)
         const nextAdvisory = str(dig(body, "NextAdvisory"));
         if (nextAdvisory) {
@@ -489,17 +568,10 @@ function parseEewTelegram(msg) {
 /** 津波電文(VTSE41/51/52)をパース */
 function parseTsunamiTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report) {
-            log.debug("Report ノードが見つかりません");
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        }
-        const head = dig(report, "Head");
-        const body = dig(report, "Body");
+        const { head, body } = base;
         const warningComment = dig(body, "Comments", "WarningComment");
         const warningCommentText = Array.isArray(warningComment)
             ? str(dig(warningComment[0], "Text"))
@@ -566,17 +638,10 @@ function parseTsunamiTelegram(msg) {
 /** 地震活動テキスト電文(VXSE56/VXSE60/VZSE40)をパース */
 function parseSeismicTextTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report) {
-            log.debug("Report ノードが見つかりません");
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        }
-        const head = dig(report, "Head");
-        const body = dig(report, "Body");
+        const { head, body } = base;
         const info = {
             type: msg.head.type,
             infoType: str(dig(head, "InfoType")),
@@ -597,17 +662,10 @@ function parseSeismicTextTelegram(msg) {
 /** 南海トラフ関連電文(VYSE50/51/52/VYSE60)をパース */
 function parseNankaiTroughTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report) {
-            log.debug("Report ノードが見つかりません");
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        }
-        const head = dig(report, "Head");
-        const body = dig(report, "Body");
+        const { head, body } = base;
         const info = {
             type: msg.head.type,
             infoType: str(dig(head, "InfoType")),
@@ -651,17 +709,10 @@ function parseNankaiTroughTelegram(msg) {
 /** 長周期地震動観測情報(VXSE62)をパース */
 function parseLgObservationTelegram(msg) {
     try {
-        const xmlStr = decodeBody(msg);
-        const parsed = parseXml(xmlStr);
-        const report = dig(parsed, "Report") ||
-            dig(parsed, "jmx:Report") ||
-            dig(parsed, "jmx_seis:Report");
-        if (!report) {
-            log.debug("Report ノードが見つかりません");
+        const base = extractBaseReport(msg);
+        if (!base)
             return null;
-        }
-        const head = dig(report, "Head");
-        const body = dig(report, "Body");
+        const { head, body } = base;
         const info = {
             type: msg.head.type,
             infoType: str(dig(head, "InfoType")),

package/dist/dmdata/ws-client.js

@@ -90,6 +90,8 @@ class WebSocketManager {
     /** 接続を開始する */
     async connect() {
         this.shouldRun = true;
+        // 既存の再接続タイマーと CONNECTING 中のソケットを中止してから新規接続する
+        this.cancelInflight();
         const seq = ++this.connectSeq;
         await this.doConnect(seq);
     }
@@ -123,13 +125,46 @@ class WebSocketManager {
             this.heartbeatTimer = null;
         }
     }
+    /** 再接続タイマーと CONNECTING 中のソケットを中止する */
+    cancelInflight() {
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        // CONNECTING 中のソケットがあれば閉じて孤立を防止
+        if (this.ws && this.ws.readyState !== ws_1.default.OPEN) {
+            try {
+                this.ws.close();
+            }
+            catch {
+                // close() 自体の失敗は無視
+            }
+            this.ws = null;
+        }
+    }
+    /** close/error 共通の切断後処理 */
+    onDisconnect(reason) {
+        this.clearTimers();
+        this.ws = null;
+        this.previousSocketId = this.socketId;
+        this.socketId = null;
+        this.heartbeatDeadlineAt = null;
+        this.endpointSelector.recordDisconnected();
+        this.events.onDisconnected(reason);
+        this.scheduleReconnect();
+    }
     async doConnect(seq) {
         try {
+            // REST API 呼び出し前に世代チェック — 古い再接続タイマーやシャットダウン後の呼び出しを弾く
+            if (!this.shouldRun || seq !== this.connectSeq) {
+                log.debug("接続中断(pre-API): shouldRun=false または世代不一致");
+                return;
+            }
             log.info("Socket Start を実行中...");
             const startRes = await (0, rest_client_1.prepareAndStartSocket)(this.config, this.previousSocketId ?? undefined);
-            // close() が呼ばれていたら接続を中断
+            // REST API 完了後に再度世代チェック — API 呼び出し中に close() や新しい connect() が来た場合を検出
             if (!this.shouldRun || seq !== this.connectSeq) {
-                log.debug("接続中断: close() が呼ばれたため新しいソケットを作成しません");
+                log.debug("接続中断(post-API): close() または新しい connect() が呼ばれたため新しいソケットを作成しません");
                 return;
             }
             if (!startRes.websocket) {
@@ -137,6 +172,11 @@ class WebSocketManager {
             }
             const wsUrl = this.endpointSelector.resolveUrl(startRes.websocket.url);
             log.info(`WebSocket に接続中: ${wsUrl.replace(/ticket=.*/, "ticket=***")}`);
+            // WebSocket 作成前に最終チェック
+            if (!this.shouldRun || seq !== this.connectSeq) {
+                log.debug("接続中断(pre-WS): close() または新しい connect() が呼ばれたため WebSocket を作成しません");
+                return;
+            }
             const socket = new ws_1.default(wsUrl, ["dmdata.v2"]);
             this.ws = socket;
             socket.on("open", () => {
@@ -161,14 +201,7 @@ class WebSocketManager {
                     return;
                 const reasonStr = reason.toString() || `code=${code}`;
                 log.warn(`WebSocket 切断: ${reasonStr}`);
-                this.clearTimers();
-                this.ws = null;
-                this.previousSocketId = this.socketId;
-                this.socketId = null;
-                this.heartbeatDeadlineAt = null;
-                this.endpointSelector.recordDisconnected();
-                this.events.onDisconnected(reasonStr);
-                this.scheduleReconnect();
+                this.onDisconnect(reasonStr);
             });
             socket.on("error", (err) => {
                 log.error(`WebSocket エラー: ${err.message}`);
@@ -181,14 +214,7 @@ class WebSocketManager {
                 catch {
                     // close() 自体の失敗は無視
                 }
-                this.clearTimers();
-                this.ws = null;
-                this.previousSocketId = this.socketId;
-                this.socketId = null;
-                this.heartbeatDeadlineAt = null;
-                this.endpointSelector.recordDisconnected();
-                this.events.onDisconnected(`error: ${err.message}`);
-                this.scheduleReconnect();
+                this.onDisconnect(`error: ${err.message}`);
             });
         }
         catch (err) {
@@ -329,6 +355,11 @@ class WebSocketManager {
         const currentSeq = this.connectSeq;
         this.reconnectTimer = setTimeout(async () => {
             this.reconnectTimer = null;
+            // タイマー発火時に世代が変わっていたら（手動 retry や close() があった）何もしない
+            if (!this.shouldRun || currentSeq !== this.connectSeq) {
+                log.debug("再接続タイマー発火をスキップ: shouldRun=false または世代不一致");
+                return;
+            }
             await this.doConnect(currentSeq);
         }, delay);
     }

package/dist/engine/cli/cli-run.js

@@ -39,6 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runMonitor = runMonitor;
 exports.resetTerminalTitle = resetTerminalTitle;
 const chalk_1 = __importDefault(require("chalk"));
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
 const rest_client_1 = require("../../dmdata/rest-client");
 const monitor_1 = require("../monitor/monitor");
 const formatter_1 = require("../../ui/formatter");
@@ -46,6 +48,7 @@ const theme_1 = require("../../ui/theme");
 const config_resolver_1 = require("../startup/config-resolver");
 const updateChecker = __importStar(require("../startup/update-checker"));
 const log = __importStar(require("../../logger"));
+const pipeline_controller_1 = require("../filter-template/pipeline-controller");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version: VERSION } = require("../../../package.json");
 async function runMonitor(opts) {
@@ -84,6 +87,11 @@ async function runMonitor(opts) {
     for (const w of themeWarnings) {
         log.warn(w);
     }
+    // ナイトモード (resolveConfig で解決済み: CLI --night > Config > デフォルト)
+    if (config.nightMode) {
+        (0, theme_1.setNightMode)(true);
+        log.info("ナイトモード: ON");
+    }
     // formatter キャッシュ初期化
     if (config.tableWidth != null) {
         (0, formatter_1.setFrameWidth)(config.tableWidth);
@@ -92,9 +100,71 @@ async function runMonitor(opts) {
     (0, formatter_1.setDisplayMode)(config.displayMode);
     (0, formatter_1.setMaxObservations)(config.maxObservations);
     (0, formatter_1.setTruncation)(config.truncation);
-    printBanner(config);
+    // Filter / Template コンパイル
+    const pipelineController = new pipeline_controller_1.PipelineController();
+    if (opts.filter && opts.filter.length > 0) {
+        try {
+            // 複数フィルタは括弧付きで AND 結合
+            const combined = opts.filter.map((e) => `(${e})`).join(" and ");
+            pipelineController.setFilter(combined);
+            log.info(`フィルタ: ${opts.filter.join(" AND ")}`);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                log.error(`フィルタのコンパイルに失敗しました:\n${err.message}`);
+            }
+            process.exit(1);
+        }
+    }
+    if (opts.template) {
+        try {
+            let tplSource = opts.template;
+            if (tplSource.startsWith("@")) {
+                const filePath = tplSource.slice(1).replace(/^~/, os.homedir());
+                const MAX_TEMPLATE_SIZE = 1024 * 1024; // 1MB
+                const stat = fs.statSync(filePath);
+                if (stat.size > MAX_TEMPLATE_SIZE) {
+                    log.error(`テンプレートファイルが大きすぎます (${stat.size} bytes, 上限 ${MAX_TEMPLATE_SIZE} bytes): ${filePath}`);
+                    process.exit(1);
+                }
+                tplSource = fs.readFileSync(filePath, "utf-8").trim();
+            }
+            pipelineController.setTemplate(tplSource);
+            log.info("テンプレート: カスタム");
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                log.warn(`テンプレートのコンパイルに失敗しました:\n${err.message}`);
+            }
+            // template エラーは警告のみ — 通常表示にフォールバック
+        }
+    }
+    if (opts.focus) {
+        try {
+            pipelineController.setFocus(opts.focus);
+            log.info(`フォーカス: ${opts.focus}`);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                log.error(`フォーカスのコンパイルに失敗しました:\n${err.message}`);
+            }
+            process.exit(1);
+        }
+    }
+    // summaryInterval (CLI > Config > デフォルト, 0 = 無効化)
+    if (opts.summaryInterval != null) {
+        if (opts.summaryInterval === 0) {
+            config.summaryInterval = null;
+            log.info("定期要約: 無効");
+        }
+        else {
+            config.summaryInterval = opts.summaryInterval;
+            log.info(`定期要約: ${opts.summaryInterval}分間隔`);
+        }
+    }
+    await printBanner(config);
     updateChecker.checkForUpdates("fleq", VERSION);
-    await (0, monitor_1.startMonitor)(config);
+    await (0, monitor_1.startMonitor)(config, pipelineController);
 }
 /** ターミナルタイトルを設定する (ANSI OSC sequence) */
 function setTerminalTitle(title) {
@@ -110,12 +180,27 @@ function resetTerminalTitle() {
     }
 }
 /** 起動バナー表示 */
-function printBanner(config) {
+async function printBanner(config) {
     log.info(`受信区分: ${config.classifications.join(", ")}`);
     log.info(`テストモード: ${config.testMode}`);
     if (config.displayMode !== "normal") {
         log.info(`表示モード: ${config.displayMode}`);
     }
+    // 音声バックエンド状態 (起動バナー末尾、Linux は実再生プローブ)
+    try {
+        const { checkSoundBackend } = await Promise.resolve().then(() => __importStar(require("../notification/sound-player")));
+        const result = await checkSoundBackend();
+        // CUD パレット: blueGreen = RGB(0, 158, 115), vermillion = RGB(213, 94, 0)
+        const line = result.ok
+            ? chalk_1.default.rgb(0, 158, 115)(`音声: ${result.label} OK`)
+            : chalk_1.default.rgb(213, 94, 0)(`音声: ${result.label} NG${result.reason ? ` (${result.reason})` : ""}`);
+        console.log(line);
+    }
+    catch (err) {
+        if (err instanceof Error) {
+            log.warn(`音声バックエンド確認エラー: ${err.message}`);
+        }
+    }
     log.info("接続を開始します...");
     console.log();
 }

package/dist/engine/cli/cli.js

@@ -51,6 +51,18 @@ function buildProgram() {
         .option("--keep-existing", "既存のWebSocket接続を維持します（互換オプション。現在はこちらがデフォルトです）")
         .option("--close-others", "同一APIキーの既存 open socket を閉じてから接続します")
         .option("--mode <mode>", '表示モードを指定します: "normal" | "compact"')
+        .option("--filter <expr>", "条件式で電文を絞り込みます (複数指定で AND 結合)", (val, prev) => [...prev, val], [])
+        .option("--template <template>", "電文の1行要約テンプレートを指定します (@ でファイル読込)")
+        .option("--focus <expr>", "条件に一致しない電文を dim 表示に落とします")
+        .option("--summary-interval [minutes]", "N分ごとに受信要約を表示 (デフォルト10分, 0で無効化)", (val) => {
+        if (val === undefined || val === "true")
+            return 10;
+        const n = parseInt(val, 10);
+        if (n === 0)
+            return 0;
+        return Number.isFinite(n) && n > 0 ? n : 10;
+    })
+        .option("--night", "ナイトモードを有効にします")
         .option("--debug", "デバッグログを表示します", false)
         .action(async (opts) => {
         const { runMonitor } = await Promise.resolve().then(() => __importStar(require("./cli-run")));

package/dist/engine/eew/eew-tracker.js

@@ -118,6 +118,8 @@ class EewTracker {
                 isNew: true,
                 isDuplicate: false,
                 isCancelled: info.infoType === "取消",
+                isSuppressed: false,
+                isUpgradeToWarning: false,
                 activeCount: this.getActiveCount(),
                 colorIndex: 0,
             };
@@ -125,56 +127,80 @@ class EewTracker {
         const serialRaw = parseInt(info.serial || "", 10);
         const serial = Number.isFinite(serialRaw) ? serialRaw : null;
         const isCancelled = info.infoType === "取消";
+        const headType = info.type;
         const existing = this.events.get(eventId);
         if (existing) {
-            // 既知のイベント — 報数チェック
-            if (!isCancelled && serial != null && serial > 0 && serial <= existing.lastSerial) {
-                // 同じか古い報数 → 重複
+            const typeState = existing.byType.get(headType);
+            // 同一 type 内の重複判定
+            if (!isCancelled && serial != null && serial > 0 && typeState && serial <= typeState.lastSerial) {
                 return {
                     isNew: false,
                     isDuplicate: true,
                     isCancelled: false,
+                    isSuppressed: false,
+                    isUpgradeToWarning: false,
                     activeCount: this.getActiveCount(),
                     colorIndex: existing.colorIndex,
                 };
             }
-            // 差分計算
-            const diff = existing.previousInfo ? computeDiff(existing.previousInfo, info) : undefined;
-            const previousInfo = existing.previousInfo;
-            // 状態更新
-            if (serial != null) {
-                existing.lastSerial = Math.max(existing.lastSerial, serial);
+            // 抑制判定: VXSE45 受信済みなら VXSE43/44 は抑制
+            const isSuppressed = existing.hasSeen45 && (headType === "VXSE43" || headType === "VXSE44");
+            // type 状態の更新 (抑制されても serial・lastUpdate は更新する)
+            const previousInfo = typeState?.previousInfo;
+            if (!typeState) {
+                existing.byType.set(headType, { lastSerial: serial ?? 0, previousInfo: info });
+            }
+            else {
+                if (serial != null) {
+                    typeState.lastSerial = Math.max(typeState.lastSerial, serial);
+                }
+                typeState.previousInfo = info;
+            }
+            // hasSeen45 更新
+            if (headType === "VXSE45") {
+                existing.hasSeen45 = true;
+            }
+            // 差分計算: 同一 type 内の連続更新でのみ (初めての type では diff なし)
+            const diff = previousInfo ? computeDiff(previousInfo, info) : undefined;
+            // 警報昇格判定 (イベント単位)
+            const isUpgradeToWarning = !isSuppressed && !existing.hasWarningIssued && info.isWarning;
+            if (!isSuppressed) {
+                existing.hasWarningIssued = existing.hasWarningIssued || info.isWarning;
             }
-            existing.isWarning = existing.isWarning || info.isWarning;
             existing.isCancelled = isCancelled;
             existing.lastUpdate = new Date();
-            existing.previousInfo = info;
             return {
                 isNew: false,
                 isDuplicate: false,
                 isCancelled,
+                isSuppressed,
+                isUpgradeToWarning,
                 activeCount: this.getActiveCount(),
-                diff,
+                diff: isSuppressed ? undefined : diff,
                 previousInfo,
                 colorIndex: existing.colorIndex,
             };
         }
         // 新規イベント
         const colorIndex = this.nextColorIndex();
+        const byType = new Map();
+        byType.set(headType, { lastSerial: serial ?? 0, previousInfo: info });
         this.events.set(eventId, {
             eventId,
-            lastSerial: serial ?? 0,
-            isWarning: info.isWarning,
+            byType,
+            hasSeen45: headType === "VXSE45",
+            hasWarningIssued: info.isWarning,
             isCancelled,
             isFinalized: false,
             lastUpdate: new Date(),
-            previousInfo: info,
             colorIndex,
         });
         return {
             isNew: true,
             isDuplicate: false,
             isCancelled,
+            isSuppressed: false,
+            isUpgradeToWarning: false,
             activeCount: this.getActiveCount(),
             colorIndex,
         };

package/dist/engine/filter/compile-filter.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileFilter = compileFilter;
+const tokenizer_1 = require("./tokenizer");
+const parser_1 = require("./parser");
+const type_checker_1 = require("./type-checker");
+const compiler_1 = require("./compiler");
+/**
+ * フィルタ式文字列を受け取り、tokenize → parse → typeCheck → compile の
+ * パイプラインを通して FilterPredicate を返す公開 API。
+ *
+ * @throws FilterSyntaxError — 構文エラー
+ * @throws FilterFieldError  — 未知フィールド
+ * @throws FilterTypeError   — 型不整合
+ */
+function compileFilter(expr) {
+    const tokens = (0, tokenizer_1.tokenize)(expr);
+    const ast = (0, parser_1.parse)(tokens, expr);
+    (0, type_checker_1.typeCheck)(ast, expr);
+    return (0, compiler_1.compile)(ast);
+}