koishi-plugin-disaster-warning 0.0.8 → 0.0.10

package/lib/index.d.ts

@@ -20,6 +20,9 @@ export interface Config {
         global: boolean;
     };
     source_priority: 'auto' | 'wolfx' | 'fanstudio' | 'p2p';
+    min_magnitude: number;
+    min_intensity: number;
+    min_scale: number;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -31,6 +31,9 @@ exports.Config = koishi_1.Schema.object({
         koishi_1.Schema.const('fanstudio').description('优先使用 FAN Studio'),
         koishi_1.Schema.const('p2p').description('优先使用 P2P地震情報'),
     ]).default('auto').description('数据源优先级'),
+    min_magnitude: koishi_1.Schema.number().default(4.0).description('最小推送震级（M）'),
+    min_intensity: koishi_1.Schema.number().default(4.0).description('最小推送烈度（中国标准）'),
+    min_scale: koishi_1.Schema.number().default(3.0).description('最小推送震度（日本标准，3.0=震度3）'),
 });
 function apply(ctx, config) {
     const service = new service_1.DisasterWarningService(ctx, config);

package/lib/pusher.js

@@ -7,9 +7,6 @@ const logger = new koishi_1.Logger('disaster-pusher');
 // Hardcoded filter thresholds - no user configuration needed
 const FILTER_THRESHOLDS = {
     MIN_MAGNITUDE_ABSOLUTE: 3.0, // Always ignore earthquakes below M3.0
-    MIN_MAGNITUDE_FOR_PUSH: 4.0, // Push if magnitude >= 4.0
-    MIN_INTENSITY_FOR_PUSH: 4.0, // Or push if intensity >= 4.0 (China)
-    MIN_SCALE_FOR_PUSH: 4.0, // Or push if shindo scale >= 4 (Japan)
 };
 class MessagePushManager {
     constructor(ctx, config) {
@@ -33,25 +30,26 @@ class MessagePushManager {
             return false; // Don't filter tsunami/weather
         }
         const data = event.data;
-        const { MIN_MAGNITUDE_ABSOLUTE, MIN_MAGNITUDE_FOR_PUSH, MIN_INTENSITY_FOR_PUSH, MIN_SCALE_FOR_PUSH } = FILTER_THRESHOLDS;
+        const { MIN_MAGNITUDE_ABSOLUTE } = FILTER_THRESHOLDS;
+        const { min_magnitude, min_intensity, min_scale } = this.config;
         // Always filter out very small earthquakes
         if (data.magnitude !== undefined && data.magnitude < MIN_MAGNITUDE_ABSOLUTE) {
             return true;
         }
         // Pass if magnitude is significant
-        if (data.magnitude !== undefined && data.magnitude >= MIN_MAGNITUDE_FOR_PUSH) {
+        if (data.magnitude !== undefined && data.magnitude >= min_magnitude) {
             return false;
         }
         // Pass if intensity is significant (Chinese sources)
-        if (data.intensity !== undefined && data.intensity >= MIN_INTENSITY_FOR_PUSH) {
+        if (data.intensity !== undefined && data.intensity >= min_intensity) {
             return false;
         }
         // Pass if scale is significant (Japanese sources)
-        if (data.scale !== undefined && data.scale >= MIN_SCALE_FOR_PUSH) {
+        if (data.scale !== undefined && data.scale >= min_scale) {
             return false;
         }
-        // If magnitude is between 3.0-4.0 and no significant intensity/scale, filter out
-        if (data.magnitude !== undefined && data.magnitude >= MIN_MAGNITUDE_ABSOLUTE && data.magnitude < MIN_MAGNITUDE_FOR_PUSH) {
+        // If magnitude is between 3.0 and min_magnitude, and no significant intensity/scale, filter out
+        if (data.magnitude !== undefined && data.magnitude >= MIN_MAGNITUDE_ABSOLUTE && data.magnitude < min_magnitude) {
             // Only filter if we don't have intensity/scale data that would make it significant
             if (data.intensity === undefined && data.scale === undefined) {
                 return true;

package/lib/service.d.ts

@@ -6,6 +6,7 @@ export declare class DisasterWarningService {
     private reconnectTimers;
     private pusher;
     private ctx;
+    private stopped;
     private handlers;
     private wolfxHandlers;
     constructor(ctx: Context, config: Config);

package/lib/service.js

@@ -11,6 +11,7 @@ class DisasterWarningService {
     constructor(ctx, config) {
         this.connections = {};
         this.reconnectTimers = {};
+        this.stopped = false; // Flag to prevent reconnection after stop
         this.wolfxHandlers = {};
         this.ctx = ctx;
         this.config = config;
@@ -29,17 +30,28 @@ class DisasterWarningService {
     async start() {
         if (!this.config.enabled)
             return;
+        this.stopped = false; // Reset stopped flag on start
         logger.info('Disaster Warning Service starting...');
         this.connectBasedOnConfig();
     }
     async stop() {
         logger.info('Disaster Warning Service stopping...');
-        for (const key in this.connections) {
-            this.connections[key].close();
-        }
+        this.stopped = true; // Set stopped flag to prevent reconnection
+        // Clear all reconnect timers first
         for (const key in this.reconnectTimers) {
             clearTimeout(this.reconnectTimers[key]);
+            delete this.reconnectTimers[key];
+        }
+        // Close all connections
+        for (const key in this.connections) {
+            const ws = this.connections[key];
+            // Remove all listeners to prevent any further events
+            ws.removeAllListeners();
+            // Force close the connection
+            ws.terminate();
+            delete this.connections[key];
         }
+        logger.info('Disaster Warning Service stopped.');
     }
     connectBasedOnConfig() {
         const { regions, data_types, source_priority } = this.config;
@@ -90,7 +102,11 @@ class DisasterWarningService {
         }
     }
     connectWebSocket(name, url, onMessage) {
+        // Don't connect if service is stopped
+        if (this.stopped)
+            return;
         if (this.connections[name]) {
+            this.connections[name].removeAllListeners('close');
             this.connections[name].close();
         }
         logger.info(`Connecting to ${name} at ${url}...`);
@@ -99,6 +115,8 @@ class DisasterWarningService {
             logger.info(`Connected to ${name}`);
         });
         ws.on('message', (data) => {
+            if (this.stopped)
+                return;
             try {
                 const parsed = JSON.parse(data.toString());
                 onMessage(parsed);
@@ -108,11 +126,14 @@ class DisasterWarningService {
             }
         });
         ws.on('close', () => {
-            logger.warn(`Disconnected from ${name}, reconnecting in 10s...`);
-            delete this.connections[name];
-            this.reconnectTimers[name] = setTimeout(() => {
-                this.connectWebSocket(name, url, onMessage);
-            }, 10000);
+            // Only reconnect if service is not stopped
+            if (!this.stopped) {
+                logger.warn(`Disconnected from ${name}, reconnecting in 10s...`);
+                delete this.connections[name];
+                this.reconnectTimers[name] = setTimeout(() => {
+                    this.connectWebSocket(name, url, onMessage);
+                }, 10000);
+            }
         });
         ws.on('error', (err) => {
             logger.error(`Error in ${name} connection:`, err);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-disaster-warning",
-    "version": "0.0.8",
+    "version": "0.0.10",
     "description": "Koishi 灾害预警插件，支持多数据源（地震、海啸、气象预警）",
     "contributors": [
         "lumia.wang <fenglian19980510@gmail.com>"
@@ -34,12 +34,14 @@
     "peerDependencies": {
         "koishi": "^4.18.0"
     },
+    "dependencies": {
+        "ws": "^8.18.0"
+    },
     "devDependencies": {
         "@types/node": "^20.0.0",
         "@types/ws": "^8.5.10",
         "koishi": "^4.18.0",
-        "typescript": "^5.0.0",
-        "ws": "^8.18.0"
+        "typescript": "^5.0.0"
     },
     "koishi": {
         "description": {