koishi-plugin-disaster-warning 0.1.0 → 0.1.1

package/lib/handlers/fanstudio.d.ts

@@ -3,7 +3,9 @@ import { DisasterEvent } from '../models';
 export declare class FanStudioHandler extends BaseDataHandler {
     constructor();
     parseMessage(data: any): DisasterEvent | null;
-    private detectSource;
+    private parseUpdate;
+    private parseInitialAll;
+    private dispatchBySource;
     private parseEarthquakeWarning;
     private parseEarthquakeInfo;
     private parseWeather;

package/lib/handlers/fanstudio.js

@@ -3,33 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FanStudioHandler = void 0;
 const base_1 = require("./base");
 const models_1 = require("../models");
+/**
+ * FanStudio WebSocket /all 端点消息解析器
+ *
+ * 协议格式：
+ *   { type: "update",       source: "<src>", Data: { ... } }
+ *   { type: "initial_all",  "<src>": { ... }, ... }
+ *
+ * source 取值：cea | cenc | jma | cwa | cwa-eew | usgs | weatheralarm | tsunami | cea-pr
+ */
+const FS_SOURCE_MAP = {
+    'cea': models_1.DataSource.FAN_STUDIO_CEA,
+    'cea-pr': models_1.DataSource.FAN_STUDIO_CEA,
+    'cenc': models_1.DataSource.FAN_STUDIO_CENC,
+    'jma': models_1.DataSource.FAN_STUDIO_JMA,
+    'cwa': models_1.DataSource.FAN_STUDIO_CWA,
+    'cwa-eew': models_1.DataSource.FAN_STUDIO_CWA,
+    'usgs': models_1.DataSource.FAN_STUDIO_USGS,
+    'weatheralarm': models_1.DataSource.FAN_STUDIO_WEATHER,
+    'tsunami': models_1.DataSource.FAN_STUDIO_TSUNAMI,
+};
 class FanStudioHandler extends base_1.BaseDataHandler {
     constructor() {
         super('fan_studio');
     }
     parseMessage(data) {
         try {
-            // FanStudio data usually comes in a 'Data' or 'data' field, or just the object itself
-            const msgData = data.Data || data.data || data;
-            if (!msgData)
-                return null;
-            // Detect data source based on message content
-            const source = this.detectSource(msgData);
-            // Earthquake Warning (CEA, CWA, JMA EEW)
-            if (msgData.epiIntensity !== undefined || (msgData.magnitude !== undefined && msgData.isFinal !== undefined)) {
-                return this.parseEarthquakeWarning(msgData, source);
-            }
-            // Earthquake Info (CENC, USGS, JMA Info)
-            if (msgData.eventId && msgData.magnitude !== undefined && msgData.epiIntensity === undefined) {
-                return this.parseEarthquakeInfo(msgData, source);
-            }
-            // Weather
-            if (msgData.headline && msgData.description) {
-                return this.parseWeather(msgData);
+            if (data.type === 'update') {
+                return this.parseUpdate(data);
             }
-            // Tsunami
-            if (msgData.warningInfo || (msgData.title && msgData.level && msgData.forecasts)) {
-                return this.parseTsunami(msgData);
+            else if (data.type === 'initial_all') {
+                return this.parseInitialAll(data);
             }
             return null;
         }
@@ -38,51 +42,63 @@ class FanStudioHandler extends base_1.BaseDataHandler {
             return null;
         }
     }
-    detectSource(data) {
-        // Check for explicit type field
-        if (data.type) {
-            const typeMap = {
-                'cenc_eew': models_1.DataSource.FAN_STUDIO_CEA,
-                'cwa_eew': models_1.DataSource.FAN_STUDIO_CWA,
-                'jma_eew': models_1.DataSource.FAN_STUDIO_JMA,
-                'cenc_eq': models_1.DataSource.FAN_STUDIO_CENC,
-                'usgs_eq': models_1.DataSource.FAN_STUDIO_USGS,
-                'weather': models_1.DataSource.FAN_STUDIO_WEATHER,
-                'tsunami': models_1.DataSource.FAN_STUDIO_TSUNAMI,
-            };
-            if (typeMap[data.type])
-                return typeMap[data.type];
-        }
-        // Check for source field
-        if (data.source) {
-            const sourceStr = String(data.source).toLowerCase();
-            if (sourceStr.includes('cenc'))
-                return models_1.DataSource.FAN_STUDIO_CENC;
-            if (sourceStr.includes('cwa') || sourceStr.includes('taiwan'))
-                return models_1.DataSource.FAN_STUDIO_CWA;
-            if (sourceStr.includes('jma') || sourceStr.includes('japan'))
-                return models_1.DataSource.FAN_STUDIO_JMA;
-            if (sourceStr.includes('usgs'))
-                return models_1.DataSource.FAN_STUDIO_USGS;
-        }
-        // Check province for Taiwan
-        if (data.province && String(data.province).includes('台湾')) {
-            return models_1.DataSource.FAN_STUDIO_CWA;
-        }
-        // Check for Japan-specific fields (scale instead of intensity)
-        if (data.scale !== undefined && data.epiIntensity === undefined) {
-            return models_1.DataSource.FAN_STUDIO_JMA;
+    parseUpdate(msg) {
+        const src = String(msg.source || '').toLowerCase();
+        const source = FS_SOURCE_MAP[src];
+        if (!source)
+            return null;
+        const payload = msg.Data || msg.data;
+        if (!payload)
+            return null;
+        return this.dispatchBySource(source, src, payload);
+    }
+    parseInitialAll(msg) {
+        // initial_all 包含多个数据源快照，取第一个有效的推送
+        for (const [key, payload] of Object.entries(msg)) {
+            if (key === 'type')
+                continue;
+            const src = key.toLowerCase();
+            const source = FS_SOURCE_MAP[src];
+            if (!source || !payload)
+                continue;
+            const event = this.dispatchBySource(source, src, payload);
+            if (event)
+                return event;
         }
-        // Check for USGS fields
-        if (data.net === 'us' || data.properties?.net === 'us') {
-            return models_1.DataSource.FAN_STUDIO_USGS;
+        return null;
+    }
+    dispatchBySource(source, src, data) {
+        switch (source) {
+            case models_1.DataSource.FAN_STUDIO_CEA:
+                return this.parseEarthquakeWarning(data, source);
+            case models_1.DataSource.FAN_STUDIO_CWA:
+                // cwa-eew 是预警，cwa 是地震报告
+                if (src === 'cwa-eew')
+                    return this.parseEarthquakeWarning(data, source);
+                return this.parseEarthquakeInfo(data, source);
+            case models_1.DataSource.FAN_STUDIO_JMA:
+                // jma 消息既有 EEW 也有地震信息，通过 isFinal/epiIntensity 判断
+                if (data.epiIntensity !== undefined || data.isFinal !== undefined) {
+                    return this.parseEarthquakeWarning(data, source);
+                }
+                return this.parseEarthquakeInfo(data, source);
+            case models_1.DataSource.FAN_STUDIO_CENC:
+                return this.parseEarthquakeInfo(data, source);
+            case models_1.DataSource.FAN_STUDIO_USGS:
+                return this.parseEarthquakeInfo(data, source);
+            case models_1.DataSource.FAN_STUDIO_WEATHER:
+                return this.parseWeather(data);
+            case models_1.DataSource.FAN_STUDIO_TSUNAMI:
+                return this.parseTsunami(data);
+            default:
+                return null;
         }
-        // Default to CEA for Chinese earthquake warnings
-        return models_1.DataSource.FAN_STUDIO_CEA;
     }
     parseEarthquakeWarning(data, source) {
+        if (!data.id && !data.eventId)
+            return null;
         const earthquake = {
-            id: data.id || '',
+            id: data.id || data.eventId || '',
             event_id: data.eventId || data.id || '',
             source: source,
             disaster_type: models_1.DisasterType.EARTHQUAKE_WARNING,
@@ -91,7 +107,7 @@ class FanStudioHandler extends base_1.BaseDataHandler {
             longitude: Number(data.longitude) || 0,
             depth: Number(data.depth),
             magnitude: Number(data.magnitude),
-            intensity: Number(data.epiIntensity),
+            intensity: data.epiIntensity !== undefined ? Number(data.epiIntensity) : undefined,
             scale: data.scale !== undefined ? Number(data.scale) : undefined,
             place_name: data.placeName || '',
             province: data.province,
@@ -111,18 +127,20 @@ class FanStudioHandler extends base_1.BaseDataHandler {
         };
     }
     parseEarthquakeInfo(data, source) {
-        // Determine if USGS or CENC based on source detection
-        const finalSource = source === models_1.DataSource.FAN_STUDIO_CEA ? models_1.DataSource.FAN_STUDIO_CENC : source;
+        if (!data.id && !data.eventId)
+            return null;
         const earthquake = {
-            id: data.id || '',
+            id: data.id || data.eventId || '',
             event_id: data.eventId || data.id || '',
-            source: finalSource,
+            source: source,
             disaster_type: models_1.DisasterType.EARTHQUAKE,
             shock_time: this.parseDateTime(data.shockTime) || new Date().toISOString(),
             latitude: Number(data.latitude) || 0,
             longitude: Number(data.longitude) || 0,
             depth: Number(data.depth),
             magnitude: Number(data.magnitude),
+            intensity: data.epiIntensity !== undefined ? Number(data.epiIntensity) : undefined,
+            scale: data.scale !== undefined ? Number(data.scale) : undefined,
             place_name: data.placeName || '',
             updates: 1,
             is_final: true,
@@ -132,7 +150,7 @@ class FanStudioHandler extends base_1.BaseDataHandler {
         return {
             id: earthquake.id,
             data: earthquake,
-            source: finalSource,
+            source: source,
             disaster_type: models_1.DisasterType.EARTHQUAKE,
             receive_time: new Date().toISOString(),
             push_count: 0,
@@ -140,12 +158,14 @@ class FanStudioHandler extends base_1.BaseDataHandler {
         };
     }
     parseWeather(data) {
+        if (!data.headline && !data.title)
+            return null;
         const weather = {
             id: data.id || `weather_${Date.now()}`,
             source: models_1.DataSource.FAN_STUDIO_WEATHER,
-            headline: data.headline,
-            title: data.title || data.headline,
-            description: data.description,
+            headline: data.headline || data.title || '',
+            title: data.title || data.headline || '',
+            description: data.description || '',
             type: data.type || 'unknown',
             effective_time: this.parseDateTime(data.effectiveTime) || new Date().toISOString(),
             disaster_type: models_1.DisasterType.WEATHER_ALARM,
@@ -164,6 +184,8 @@ class FanStudioHandler extends base_1.BaseDataHandler {
         };
     }
     parseTsunami(data) {
+        if (!data.title && !data.warningInfo)
+            return null;
         const tsunami = {
             id: data.id || `tsunami_${Date.now()}`,
             code: data.code || '',

package/lib/handlers/global_quake.d.ts

@@ -1,5 +1,13 @@
 import { BaseDataHandler } from './base';
 import { DisasterEvent } from '../models';
+/**
+ * GlobalQuake WebSocket 消息解析器
+ *
+ * JSON 格式字段（来自 astrbot 参考实现）：
+ *   id, latitude, longitude, depth, magnitude, region,
+ *   originTimeIso / origin_time_iso / origin_time_ms,
+ *   revisionId / revision_id
+ */
 export declare class GlobalQuakeHandler extends BaseDataHandler {
     constructor();
     parseMessage(data: any): DisasterEvent | null;

package/lib/handlers/global_quake.js

@@ -3,35 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalQuakeHandler = void 0;
 const base_1 = require("./base");
 const models_1 = require("../models");
+/**
+ * GlobalQuake WebSocket 消息解析器
+ *
+ * JSON 格式字段（来自 astrbot 参考实现）：
+ *   id, latitude, longitude, depth, magnitude, region,
+ *   originTimeIso / origin_time_iso / origin_time_ms,
+ *   revisionId / revision_id
+ */
 class GlobalQuakeHandler extends base_1.BaseDataHandler {
     constructor() {
         super('global_quake');
     }
     parseMessage(data) {
         try {
-            // Assuming GlobalQuake format based on typical JSON structure or inferring from usage
-            // Since I didn't see explicit GlobalQuake handler code in the file list (maybe I missed it or it's simple)
-            // I'll assume a generic structure or try to find it.
-            // Wait, `global_sources.py` might contain it.
-            // For now, let's implement a placeholder or basic structure.
-            // If data has 'magnitude' and 'latitude', it's likely an earthquake.
-            if (!data.uuid || !data.magnitude)
+            const id = data.id;
+            if (!id || data.magnitude == null)
                 return null;
+            const lat = Number(data.latitude);
+            const lon = Number(data.longitude);
+            if (isNaN(lat) || isNaN(lon))
+                return null;
+            const originTime = data.originTimeIso ||
+                data.origin_time_iso ||
+                (data.origin_time_ms ? new Date(data.origin_time_ms).toISOString() : null);
             const earthquake = {
-                id: data.uuid,
-                event_id: data.uuid,
+                id: String(id),
+                event_id: String(id),
                 source: models_1.DataSource.GLOBAL_QUAKE,
-                disaster_type: models_1.DisasterType.EARTHQUAKE_WARNING, // GQ is usually real-time
-                shock_time: this.parseDateTime(data.origin) || new Date().toISOString(),
-                latitude: Number(data.lat),
-                longitude: Number(data.lon),
-                depth: Number(data.depth),
+                disaster_type: models_1.DisasterType.EARTHQUAKE_WARNING,
+                shock_time: (originTime && this.parseDateTime(originTime)) || new Date().toISOString(),
+                latitude: lat,
+                longitude: lon,
+                depth: data.depth != null ? Number(data.depth) : undefined,
                 magnitude: Number(data.magnitude),
-                place_name: data.region || 'Unknown',
-                updates: data.revision || 1,
-                is_final: false, // GQ updates frequently
+                place_name: data.region || 'Global',
+                updates: data.revisionId ?? data.revision_id ?? 1,
+                is_final: false,
                 is_cancel: false,
-                max_pga: data.maxPGA,
                 raw_data: data
             };
             return {

package/lib/handlers/p2p.js

@@ -196,9 +196,10 @@ class P2PHandler extends base_1.BaseDataHandler {
         };
     }
     convertP2PScale(scale) {
+        // 46 = "5弱以上（暫定）"，显示同 5弱（4.5）
         const mapping = {
             10: 1.0, 20: 2.0, 30: 3.0, 40: 4.0,
-            45: 4.5, 46: 4.6, 50: 5.0, 55: 5.5,
+            45: 4.5, 46: 4.5, 50: 5.0, 55: 5.5,
             60: 6.0, 70: 7.0
         };
         return mapping[scale];

package/lib/handlers/wolfx.js

@@ -251,6 +251,7 @@ class WolfxHandler extends base_1.BaseDataHandler {
     parseJMAScale(scaleStr) {
         if (!scaleStr)
             return undefined;
+        // JMA 震度映射：5弱→4.5, 5強→5.0, 6弱→5.5, 6強→6.0
         const match = scaleStr.match(/(\d+)(弱|強)?/);
         if (match) {
             const base = parseInt(match[1]);
@@ -258,7 +259,7 @@ class WolfxHandler extends base_1.BaseDataHandler {
             if (suffix === '弱')
                 return base - 0.5;
             if (suffix === '強')
-                return base + 0.5;
+                return base; // 5強=5.0, 6強=6.0
             return base;
         }
         return undefined;

package/lib/index.d.ts

@@ -5,7 +5,6 @@ export declare const inject: {
     optional: string[];
 };
 export interface Config {
-    enabled: boolean;
     target_groups: string[];
     data_types: {
         earthquake_warning: boolean;
@@ -19,12 +18,6 @@ export interface Config {
         japan: boolean;
         global: boolean;
     };
-    data_sources: {
-        fan_studio: boolean;
-        wolfx: boolean;
-        p2p: boolean;
-        global_quake: boolean;
-    };
     filter: {
         min_magnitude_absolute: number;
         min_magnitude_for_push: number;

package/lib/index.js

@@ -11,7 +11,6 @@ exports.inject = {
     optional: ['database']
 };
 exports.Config = koishi_1.Schema.object({
-    enabled: koishi_1.Schema.boolean().default(true).description('启用灾害预警插件'),
     target_groups: koishi_1.Schema.array(koishi_1.Schema.string())
         .default([])
         .description('推送目标群号列表，直接填写群号即可，例如 123456789'),
@@ -22,17 +21,11 @@ exports.Config = koishi_1.Schema.object({
         weather_alarm: koishi_1.Schema.boolean().default(false).description('气象预警（中国）'),
     }).description('接收的灾害类型'),
     regions: koishi_1.Schema.object({
-        china: koishi_1.Schema.boolean().default(true).description('中国大陆'),
-        taiwan: koishi_1.Schema.boolean().default(true).description('台湾'),
-        japan: koishi_1.Schema.boolean().default(true).description('日本'),
-        global: koishi_1.Schema.boolean().default(false).description('全球（USGS / GlobalQuake）'),
-    }).description('接收的地区'),
-    data_sources: koishi_1.Schema.object({
-        fan_studio: koishi_1.Schema.boolean().default(true).description('FAN Studio（中国预警/台湾/USGS/日本/气象/海啸）'),
-        wolfx: koishi_1.Schema.boolean().default(true).description('Wolfx（中国/台湾/日本 EEW，以及中国/日本地震列表）'),
-        p2p: koishi_1.Schema.boolean().default(true).description('P2P地震情報（日本 EEW / 地震情报 / 海啸）'),
-        global_quake: koishi_1.Schema.boolean().default(false).description('GlobalQuake（全球实时地震，流量较大）'),
-    }).description('数据源开关（可单独禁用某个来源）'),
+        china: koishi_1.Schema.boolean().default(true).description('中国大陆（CEA预警 / CENC地震台网 / 气象 / 海啸）'),
+        taiwan: koishi_1.Schema.boolean().default(true).description('台湾（CWA预警与地震报告）'),
+        japan: koishi_1.Schema.boolean().default(true).description('日本（JMA EEW / P2P地震情报 / 海啸）'),
+        global: koishi_1.Schema.boolean().default(false).description('全球（USGS 地震信息 / GlobalQuake 实时预警）'),
+    }).description('接收的地区（数据源连接将依据此项自动开启）'),
     filter: koishi_1.Schema.object({
         min_magnitude_absolute: koishi_1.Schema.number().default(3.0).description('绝对过滤震级：低于此震级直接丢弃（不推送）'),
         min_magnitude_for_push: koishi_1.Schema.number().default(4.0).description('推送震级门槛：震级达到此值则推送'),

package/lib/models.js

@@ -58,7 +58,7 @@ function getDataSourceFromId(id) {
  * 用 place+magnitude+分钟桶 作为指纹，窗口期内同一事件只推一次
  */
 class EventDeduplicator {
-    constructor(windowMs = 5 * 60 * 1000) {
+    constructor(windowMs = 8 * 60 * 1000) {
         // fingerprint -> first-seen timestamp (ms)
         this.seen = new Map();
         this.windowMs = windowMs;

package/lib/service.js

@@ -7,12 +7,12 @@ const models_1 = require("./models");
 const handlers_1 = require("./handlers");
 const pusher_1 = require("./pusher");
 const logger = new koishi_1.Logger('disaster-warning');
-// Wolfx HTTP 列表获取间隔（5 分钟）
+// Wolfx HTTP 列表轮询间隔（5 分钟）
 const WOLFX_HTTP_INTERVAL_MS = 5 * 60 * 1000;
 // FanStudio 备用服务器
 const FAN_STUDIO_PRIMARY = 'wss://ws.fanstudio.tech/all';
 const FAN_STUDIO_BACKUP = 'wss://ws.fanstudio.hk/all';
-// WebSocket 重连延迟（秒），超过 MAX_RETRY 次后切备用服务器
+// WebSocket 重连延迟，超过阈值次数后切换到备用服务器
 const RECONNECT_DELAY_MS = 10000;
 const FALLBACK_RETRY_THRESHOLD = 5;
 class DisasterWarningService {
@@ -32,8 +32,6 @@ class DisasterWarningService {
         this.wolfxHandler = new handlers_1.WolfxHandler('wolfx_all');
     }
     async start() {
-        if (!this.config.enabled)
-            return;
         this.stopped = false;
         logger.info('Disaster Warning Service starting...');
         this.connectAll();
@@ -60,37 +58,33 @@ class DisasterWarningService {
     }
     // ---- 连接调度 --------------------------------------------------------
     connectAll() {
-        const { regions, data_types, data_sources } = this.config;
-        // FAN Studio — 单连接 /all，覆盖中国/台湾/USGS/日本/气象/海啸
-        if (data_sources.fan_studio) {
-            const needFanStudio = (regions.china && (data_types.earthquake_warning || data_types.earthquake_info || data_types.weather_alarm || data_types.tsunami_warning)) ||
-                (regions.taiwan && (data_types.earthquake_warning || data_types.earthquake_info)) ||
-                (regions.japan && (data_types.earthquake_warning || data_types.earthquake_info)) ||
-                (regions.global && data_types.earthquake_info);
-            if (needFanStudio) {
-                this.openConnection('fan_studio', FAN_STUDIO_PRIMARY, FAN_STUDIO_BACKUP, (data) => {
-                    this.handleEvent(this.handlers.fanStudio.parseMessage(data));
-                });
-            }
+        const { regions, data_types } = this.config;
+        // FanStudio /all：覆盖中国(CEA/CENC/气象/海啸)、台湾(CWA)、日本(JMA)、全球(USGS)
+        const needFanStudio = (regions.china && (data_types.earthquake_warning || data_types.earthquake_info || data_types.weather_alarm || data_types.tsunami_warning)) ||
+            (regions.taiwan && (data_types.earthquake_warning || data_types.earthquake_info)) ||
+            (regions.japan && (data_types.earthquake_warning || data_types.earthquake_info)) ||
+            (regions.global && data_types.earthquake_info);
+        if (needFanStudio) {
+            this.openConnection('fan_studio', FAN_STUDIO_PRIMARY, FAN_STUDIO_BACKUP, (data) => {
+                this.handleEvent(this.handlers.fanStudio.parseMessage(data));
+            });
         }
-        // P2P — 日本 EEW / 地震情报 / 海啸
-        if (data_sources.p2p && regions.japan &&
+        // P2P：日本 EEW / 地震情报 / 海啸
+        if (regions.japan &&
             (data_types.earthquake_warning || data_types.earthquake_info || data_types.tsunami_warning)) {
             this.openConnection('p2p', 'wss://api.p2pquake.net/v2/ws', undefined, (data) => {
                 this.handleEvent(this.handlers.p2p.parseMessage(data));
             });
         }
-        // Wolfx — /all_eew 合并端点，接收中国/台湾/日本 EEW
-        // eqlist 改为 HTTP 轮询（见 startWolfxHttpPoller）
-        if (data_sources.wolfx &&
-            (data_types.earthquake_warning) &&
+        // Wolfx /all_eew：中国/台湾/日本 EEW（仅预警类型）
+        if (data_types.earthquake_warning &&
             (regions.china || regions.taiwan || regions.japan)) {
             this.openConnection('wolfx_eew', 'wss://ws-api.wolfx.jp/all_eew', undefined, (data) => {
                 this.handleEvent(this.wolfxHandler.parseMessage(data));
             });
         }
-        // GlobalQuake — 全球实时预警
-        if (data_sources.global_quake && regions.global && data_types.earthquake_warning) {
+        // GlobalQuake：全球实时预警
+        if (regions.global && data_types.earthquake_warning) {
             this.openConnection('global_quake', 'wss://gqm.aloys233.top/ws', undefined, (data) => {
                 this.handleEvent(this.handlers.globalQuake.parseMessage(data));
             });
@@ -145,20 +139,23 @@ class DisasterWarningService {
             logger.error(`[${name}] Error:`, err);
         });
     }
-    // ---- Wolfx HTTP 轮询（地震列表） -------------------------------------
+    // ---- Wolfx HTTP 轮询（地震列表）------------------------------------
     startWolfxHttpPoller() {
-        if (!this.config.data_sources.wolfx || !this.config.data_types.earthquake_info)
+        const { regions, data_types } = this.config;
+        if (!data_types.earthquake_info)
+            return;
+        if (!regions.china && !regions.japan)
             return;
         const poll = async () => {
             if (this.stopped)
                 return;
             try {
-                if (this.config.regions.china) {
+                if (regions.china) {
                     const data = await this.ctx.http.get('https://api.wolfx.jp/cenc_eqlist.json');
                     if (data)
                         this.handleEvent(this.wolfxHandler.parseEqList(data, 'cenc'));
                 }
-                if (this.config.regions.japan) {
+                if (regions.japan) {
                     const data = await this.ctx.http.get('https://api.wolfx.jp/jma_eqlist.json');
                     if (data)
                         this.handleEvent(this.wolfxHandler.parseEqList(data, 'jma'));
@@ -168,8 +165,8 @@ class DisasterWarningService {
                 logger.warn('[wolfx_http] Fetch failed:', e);
             }
         };
-        // 立即执行一次，然后每 5 分钟轮询
-        poll();
+        // 延迟首次拉取，避免重启时将旧地震当新事件推送
+        // 去重窗口（8分钟）> 轮询间隔（5分钟），不会漏报
         this.wolfxHttpTimer = setInterval(poll, WOLFX_HTTP_INTERVAL_MS);
     }
     // ---- 事件处理 --------------------------------------------------------
@@ -199,14 +196,10 @@ class DisasterWarningService {
         if (isWeather && !data_types.weather_alarm)
             return false;
         const src = event.source;
-        const japanSources = [
-            models_1.DataSource.P2P_EEW, models_1.DataSource.P2P_EARTHQUAKE, models_1.DataSource.P2P_TSUNAMI,
-            models_1.DataSource.WOLFX_JMA_EEW, models_1.DataSource.WOLFX_JMA_EQ, models_1.DataSource.FAN_STUDIO_JMA
-        ];
-        const chinaSources = [
-            models_1.DataSource.FAN_STUDIO_CEA, models_1.DataSource.FAN_STUDIO_CENC, models_1.DataSource.FAN_STUDIO_WEATHER,
-            models_1.DataSource.FAN_STUDIO_TSUNAMI, models_1.DataSource.WOLFX_CENC_EEW, models_1.DataSource.WOLFX_CENC_EQ
-        ];
+        const japanSources = [models_1.DataSource.P2P_EEW, models_1.DataSource.P2P_EARTHQUAKE, models_1.DataSource.P2P_TSUNAMI,
+            models_1.DataSource.WOLFX_JMA_EEW, models_1.DataSource.WOLFX_JMA_EQ, models_1.DataSource.FAN_STUDIO_JMA];
+        const chinaSources = [models_1.DataSource.FAN_STUDIO_CEA, models_1.DataSource.FAN_STUDIO_CENC, models_1.DataSource.FAN_STUDIO_WEATHER,
+            models_1.DataSource.FAN_STUDIO_TSUNAMI, models_1.DataSource.WOLFX_CENC_EEW, models_1.DataSource.WOLFX_CENC_EQ];
         const taiwanSources = [models_1.DataSource.FAN_STUDIO_CWA, models_1.DataSource.WOLFX_CWA_EEW];
         const globalSources = [models_1.DataSource.FAN_STUDIO_USGS, models_1.DataSource.GLOBAL_QUAKE];
         if (japanSources.includes(src) && !regions.japan)
@@ -229,7 +222,6 @@ class DisasterWarningService {
                 url: entry.url
             };
         }
-        // Wolfx HTTP poller 状态
         result['wolfx_http_poller'] = {
             connected: this.wolfxHttpTimer !== null,
             retryCount: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-disaster-warning",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Koishi 灾害预警插件，支持多数据源（地震、海啸、气象预警）",
     "contributors": [
         "lumia.wang <fenglian19980510@gmail.com>"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
+}