koishi-plugin-disaster-warning 0.1.1 → 0.1.2

package/lib/index.js

@@ -15,8 +15,8 @@ exports.Config = koishi_1.Schema.object({
         .default([])
         .description('推送目标群号列表，直接填写群号即可，例如 123456789'),
     data_types: koishi_1.Schema.object({
-        earthquake_warning: koishi_1.Schema.boolean().default(true).description('地震预警（实时速报，震前预警）'),
-        earthquake_info: koishi_1.Schema.boolean().default(true).description('地震信息（震后测定报告）'),
+        earthquake_warning: koishi_1.Schema.boolean().default(true).description('地震预警（实时速报，震前预警，会持续推送刷屏）'),
+        earthquake_info: koishi_1.Schema.boolean().default(true).description('地震信息（震后测定报告，同一事件只推一次）'),
         tsunami_warning: koishi_1.Schema.boolean().default(true).description('海啸预警'),
         weather_alarm: koishi_1.Schema.boolean().default(false).description('气象预警（中国）'),
     }).description('接收的灾害类型'),

package/lib/models.d.ts

@@ -106,14 +106,21 @@ export interface DisasterEvent {
 }
 /**
  * 跨数据源事件去重器
- * 用 place+magnitude+分钟桶 作为指纹，窗口期内同一事件只推一次
+ * 地震预警按报次去重，允许后续修正继续推送；震后测定按内容去重，同一事件只推一次。
  */
 export declare class EventDeduplicator {
     private seen;
-    private windowMs;
-    constructor(windowMs?: number);
+    private warningWindowMs;
+    private earthquakeInfoWindowMs;
+    constructor(warningWindowMs?: number, earthquakeInfoWindowMs?: number);
     /** 返回 true 表示已见过（应丢弃），false 表示首次（应推送） */
     isDuplicate(event: DisasterEvent): boolean;
     private fingerprint;
+    private ttlFor;
+    private earthquakeInfoFingerprint;
+    private fallbackEarthquakeId;
+    private normalizeLocation;
+    private normalizeTime;
+    private normalizeNumber;
     private evict;
 }

package/lib/models.js

@@ -55,13 +55,14 @@ function getDataSourceFromId(id) {
 }
 /**
  * 跨数据源事件去重器
- * 用 place+magnitude+分钟桶 作为指纹，窗口期内同一事件只推一次
+ * 地震预警按报次去重，允许后续修正继续推送；震后测定按内容去重，同一事件只推一次。
  */
 class EventDeduplicator {
-    constructor(windowMs = 8 * 60 * 1000) {
-        // fingerprint -> first-seen timestamp (ms)
+    constructor(warningWindowMs = 8 * 60 * 1000, earthquakeInfoWindowMs = 7 * 24 * 60 * 60 * 1000) {
+        // fingerprint -> expire timestamp (ms)
         this.seen = new Map();
-        this.windowMs = windowMs;
+        this.warningWindowMs = warningWindowMs;
+        this.earthquakeInfoWindowMs = earthquakeInfoWindowMs;
     }
     /** 返回 true 表示已见过（应丢弃），false 表示首次（应推送） */
     isDuplicate(event) {
@@ -69,26 +70,65 @@ class EventDeduplicator {
         const fp = this.fingerprint(event);
         if (this.seen.has(fp))
             return true;
-        this.seen.set(fp, Date.now());
+        this.seen.set(fp, Date.now() + this.ttlFor(event));
         return false;
     }
     fingerprint(event) {
         const data = event.data;
-        if (event.disaster_type === DisasterType.EARTHQUAKE || event.disaster_type === DisasterType.EARTHQUAKE_WARNING) {
-            // 优先用 event_id，相同机构的多数据源共享同一 event_id
-            if (data.event_id)
-                return `eq:${data.event_id}`;
-            // 降级：地点 + 震级 + 分钟桶
-            const bucket = data.shock_time ? data.shock_time.slice(0, 16) : 'unknown';
-            return `eq:${data.place_name}|${data.magnitude?.toFixed(1)}|${bucket}`;
+        if (event.disaster_type === DisasterType.EARTHQUAKE_WARNING) {
+            const eventId = data.event_id || this.fallbackEarthquakeId(data);
+            const revision = data.revision ?? data.report_num ?? data.serial ?? data.updates ?? 'unknown';
+            const status = data.is_cancel ? 'cancel' : data.is_final ? 'final' : 'update';
+            return `eqw:${eventId}|${revision}|${status}`;
+        }
+        if (event.disaster_type === DisasterType.EARTHQUAKE) {
+            return `eq:${this.earthquakeInfoFingerprint(data)}`;
         }
         // 海啸/气象用 id 即可
         return `${event.disaster_type}:${event.id}`;
     }
+    ttlFor(event) {
+        return event.disaster_type === DisasterType.EARTHQUAKE
+            ? this.earthquakeInfoWindowMs
+            : this.warningWindowMs;
+    }
+    earthquakeInfoFingerprint(data) {
+        const originTime = this.normalizeTime(data.shock_time);
+        const location = this.normalizeLocation(data);
+        const magnitude = this.normalizeNumber(data.magnitude, 1);
+        const depth = this.normalizeNumber(data.depth, 1);
+        const intensity = this.normalizeNumber(data.intensity, 1);
+        const scale = this.normalizeNumber(data.scale, 1);
+        return `${location}|${originTime}|M${magnitude}|D${depth}|I${intensity}|S${scale}`;
+    }
+    fallbackEarthquakeId(data) {
+        const originTime = this.normalizeTime(data.shock_time);
+        const location = this.normalizeLocation(data);
+        return `${location}|${data.magnitude?.toFixed(1)}|${originTime}`;
+    }
+    normalizeLocation(data) {
+        const place = data.place_name?.replace(/\s+/g, '').trim();
+        if (place)
+            return place;
+        const lat = Number.isFinite(data.latitude) ? data.latitude.toFixed(2) : 'unknown';
+        const lon = Number.isFinite(data.longitude) ? data.longitude.toFixed(2) : 'unknown';
+        return `${lat},${lon}`;
+    }
+    normalizeTime(time) {
+        if (!time)
+            return 'unknown';
+        const date = new Date(time);
+        if (isNaN(date.getTime()))
+            return time.slice(0, 19);
+        return date.toISOString().slice(0, 19);
+    }
+    normalizeNumber(value, digits) {
+        return Number.isFinite(value) ? value.toFixed(digits) : 'unknown';
+    }
     evict() {
-        const cutoff = Date.now() - this.windowMs;
-        for (const [fp, ts] of this.seen) {
-            if (ts < cutoff)
+        const now = Date.now();
+        for (const [fp, expiresAt] of this.seen) {
+            if (expiresAt < now)
                 this.seen.delete(fp);
         }
     }

package/lib/pusher.js

@@ -60,9 +60,9 @@ class MessagePushManager {
     }
     formatEarthquake(data) {
         const type = data.disaster_type === models_1.DisasterType.EARTHQUAKE_WARNING ? '🚨 地震预警' : '📋 地震信息';
-        const finalStr = data.is_final ? '【最终报】' : `【第${data.updates}报】`;
+        const finalStr = data.is_final ? ' 【最终报】' : '';
         const cancelStr = data.is_cancel ? '【已取消】' : '';
-        let msg = `${cancelStr}${type} ${finalStr}\n`;
+        let msg = `${cancelStr}${type}${finalStr}\n`;
         msg += `📍 震源：${data.place_name}\n`;
         msg += `🕐 时间：${this.formatTime(data.shock_time)}\n`;
         msg += `📊 震级：M${data.magnitude?.toFixed(1) || '未知'}\n`;

package/package.json

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