Compare commits

...

2 Commits

Author SHA1 Message Date
Last2014 600626d071 v3.5.5 2025-07-03 07:57:08 +09:00
Last2014 5c0c34bbb4 ゆずねっと向け早急対処 2025-07-03 07:56:57 +09:00
4 changed files with 33 additions and 16 deletions

View File

@ -6,6 +6,8 @@ const config: configTypes = {
reconnectTimes: 5000, reconnectTimes: 5000,
websocketUrl: "wss://api.p2pquake.net/v2/ws", websocketUrl: "wss://api.p2pquake.net/v2/ws",
areasCsvUrl: "https://raw.githubusercontent.com/p2pquake/epsp-specifications/master/epsp-area.csv", areasCsvUrl: "https://raw.githubusercontent.com/p2pquake/epsp-specifications/master/epsp-area.csv",
maxScaleMax: 30,
rateLimit: 10,
}, },
weather: { weather: {
splitCount: 4, splitCount: 4,

View File

@ -1,6 +1,6 @@
{ {
"name": "noticeuwuzu", "name": "noticeuwuzu",
"version": "v3.5.3@uwuzu1.5.4", "version": "v3.5.5@uwuzu1.5.4",
"description": "uwuzu Notice Bot", "description": "uwuzu Notice Bot",
"main": "dist/main.js", "main": "dist/main.js",
"scripts": { "scripts": {

View File

@ -1,7 +1,10 @@
import WebSocket from "ws"; import WebSocket from "ws";
import { differenceInMinutes } from "date-fns";
import config from "../config.js"; import config from "../config.js";
let rateLimit: Date;
class P2PEarthquakeClient { class P2PEarthquakeClient {
private ws: WebSocket | null = null; private ws: WebSocket | null = null;
private reconnectInterval: number = config.earthquake.reconnectTimes; private reconnectInterval: number = config.earthquake.reconnectTimes;
@ -178,9 +181,7 @@ async function event(earthquakeInfo: any): Promise<void> {
if (earthquakeInfo.areas !== null) { if (earthquakeInfo.areas !== null) {
const areaNames: Array<string> = Array.from( const areaNames: Array<string> = Array.from(
new Set( new Set(
earthquakeInfo.areas earthquakeInfo.areas.map((point: any) => point.name).filter(Boolean),
.map((point: any) => point.name)
.filter(Boolean)
), ),
); );
areas = `対象地域:${areaNames.join("・")}`; areas = `対象地域:${areaNames.join("・")}`;
@ -242,6 +243,10 @@ async function event(earthquakeInfo: any): Promise<void> {
// 最大震度 // 最大震度
let maxScale: string = "最大深度:"; let maxScale: string = "最大深度:";
if (earthquakeInfo.earthquake.maxScale < config.earthquake.maxScaleMax) {
return;
}
if ( if (
earthquakeInfo.earthquake.maxScale === -1 || earthquakeInfo.earthquake.maxScale === -1 ||
earthquakeInfo.earthquake.maxScale === null earthquakeInfo.earthquake.maxScale === null
@ -273,9 +278,7 @@ async function event(earthquakeInfo: any): Promise<void> {
if (earthquakeInfo.points !== null) { if (earthquakeInfo.points !== null) {
const areaNames: Array<string> = Array.from( const areaNames: Array<string> = Array.from(
new Set( new Set(
earthquakeInfo.points earthquakeInfo.points.map((point: any) => point.addr).filter(Boolean),
.map((point: any) => point.addr)
.filter(Boolean)
), ),
); );
areas = `対象地域:${areaNames.join("・")}`; areas = `対象地域:${areaNames.join("・")}`;
@ -301,25 +304,35 @@ async function event(earthquakeInfo: any): Promise<void> {
// 地域情報更新の場合 // 地域情報更新の場合
else if (earthquakeInfo.code === 555) { else if (earthquakeInfo.code === 555) {
if (rateLimit === null) {
rateLimit = new Date();
}
// 対象地域マッピング // 対象地域マッピング
const areaMaps: any = await areaMap(); const areaMaps: any = await areaMap();
const areaNames: Array<string> = Array.from( const areaNames: Array<string> = Array.from(
new Set( new Set(
earthquakeInfo.areas.map((i: any) => { earthquakeInfo.areas
.map((i: any) => {
return areaMaps[i.id]; return areaMaps[i.id];
}).filter(Boolean) })
.filter(Boolean),
), ),
); );
const areas = areaNames.join("・"); const areas = areaNames.join("・");
if (differenceInMinutes(new Date(), rateLimit) <= config.earthquake.rateLimit) {
ueuse(` ueuse(`
==== ====
${earthquakeInfo.time} ${earthquakeInfo.time}
${areas} ${areas}
`); `);
rateLimit = new Date();
}
} }
} }

2
types/config.d.ts vendored
View File

@ -2,6 +2,8 @@ interface earthquakeTypes {
reconnectTimes: number; reconnectTimes: number;
websocketUrl: string; websocketUrl: string;
areasCsvUrl: string; areasCsvUrl: string;
maxScaleMax: number;
rateLimit: number;
} }
interface weatherTypes { interface weatherTypes {