時報休止期間を修正・package.jsonの情報を修正・v4.2

の停止期間設定機能を追加・地震発生お知らせにマグニチュード/深さを追加・天気お知らせに%が2つ付く問題を修正・地域情報更新が正常に発信されない問題を修正・地域情報更新のレート制限のデフォルト設定を30分に一回に・v4.0

examples/config.ts

@@ -2,17 +2,28 @@ import type { configTypes } from "types/config";
 
 // READMEの設定項目を参照
 const config: configTypes = {
+  // 時報設定
+  time: {
+    // 時報休止期間
+    stopTimes: {
+      start: 23, // 開始
+      stop: 6, // 停止
+    }
+  },
+  // 地震速報設定
   earthquake: {
-    reconnectTimes: 5000,
-    websocketUrl: "wss://api.p2pquake.net/v2/ws",
-    areasCsvUrl: "https://raw.githubusercontent.com/p2pquake/epsp-specifications/master/epsp-area.csv",
+    reconnectTimes: 5000, // 再接続時間(ミリ秒)
+    websocketUrl: "wss://api.p2pquake.net/v2/ws", // WebSocketのURL
+    areasCsvUrl: "https://raw.githubusercontent.com/p2pquake/epsp-specifications/master/epsp-area.csv",  // 対象地域CSVファイルのURL
+    maxScaleMin: 30, // 地震発生の際の最低震度(10-70)
+    rateLimit: 30, // 地域情報更新のレート制限(分)
   },
   weather: {
-    splitCount: 4,
+    splitCount: 4, // 返信の分割数
   },
 
-  apiToken: "TOKEN_EXAMPLE",
-  uwuzuServer: "uwuzu.example.com",
+  apiToken: "TOKEN_EXAMPLE", // BOTアカウントのAPIトークン
+  uwuzuServer: "uwuzu.example.com", // uwuzuのサーバー
 };
 
 export default config;

main.ts

@@ -26,4 +26,4 @@ cron.schedule("1 7 * * *", () => {
 });
 
 // コンソールで表示
-console.log("サーバーが起動しました");
+console.log("BOTサーバーが起動しました");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noticeuwuzu",
-  "version": "v3.5.2@uwuzu1.5.4",
+  "version": "v4.2@uwuzu1.5.4",
   "description": "uwuzu Notice Bot",
   "main": "dist/main.js",
   "scripts": {
@@ -12,16 +12,17 @@
     "uwuzu",
     "bot",
     "cron",
+    "notice",
+    "weather",
     "time",
-    "timenotice",
-    "notice"
+    "earthquake"
   ],
   "author": {
     "name": "Last2014",
     "url": "https://last2014.com",
     "email": "info@last2014.com"
   },
-  "license": "ISC",
+  "license": "Apache-2.0",
   "type": "module",
   "dependencies": {
     "@types/date-fns": "^2.5.3",

scripts/earthquakeNotice.ts

@@ -1,7 +1,10 @@
 import WebSocket from "ws";
+import { differenceInMinutes, subMinutes } from "date-fns";
 
 import config from "../config.js";
 
+let rateLimit: Date | null = null;
+
 class P2PEarthquakeClient {
   private ws: WebSocket | null = null;
   private reconnectInterval: number = config.earthquake.reconnectTimes;
@@ -60,6 +63,8 @@ class P2PEarthquakeClient {
   }
 
   private handleMessage(message: any): void {
+    console.log("----------------");
+
     switch (message.code) {
       case 551: // 地震情報
         console.log("地震情報を受信しました");
@@ -69,12 +74,12 @@ class P2PEarthquakeClient {
         console.log("緊急地震速報を受信しました");
         this.executeEventFunc(message);
         break;
-      case 555: // 震度情報
-        console.log("震度情報を受信しました");
+      case 555: // 地域情報更新情報
+        console.log("地域情報更新情報を受信しました");
         this.executeEventFunc(message);
         break;
       default:
-        console.log(`その他の情報 (コード: ${message.code})`);
+        console.log(`未対応の情報を受信しました(コード: ${message.code})`);
         break;
     }
   }
@@ -141,7 +146,7 @@ async function areaMap(): Promise<Record<number, string>> {
 
 // 情報受信
 async function event(earthquakeInfo: any): Promise<void> {
-  console.log(JSON.stringify(earthquakeInfo));
+  console.log(`受信データ：${JSON.stringify(earthquakeInfo)}`);
 
   // ----処理----
 
@@ -178,12 +183,9 @@ async function event(earthquakeInfo: any): Promise<void> {
     if (earthquakeInfo.areas !== null) {
       const areaNames: Array<string> = Array.from(
         new Set(
-          earthquakeInfo.areas.map((i: any) => {
-            earthquakeInfo.areas[i].name;
-          }),
+          earthquakeInfo.areas.map((point: any) => point.name).filter(Boolean),
         ),
       );
-
       areas = `対象地域：${areaNames.join("・")}`;
     }
 
@@ -243,6 +245,11 @@ async function event(earthquakeInfo: any): Promise<void> {
     // 最大震度
     let maxScale: string = "最大深度：";
 
+    if (earthquakeInfo.earthquake.maxScale < config.earthquake.maxScaleMin) {
+      console.log("最低震度に満たしていないため投稿されませんでした");
+      return;
+    }
+
     if (
       earthquakeInfo.earthquake.maxScale === -1 ||
       earthquakeInfo.earthquake.maxScale === null
@@ -274,9 +281,7 @@ async function event(earthquakeInfo: any): Promise<void> {
     if (earthquakeInfo.points !== null) {
       const areaNames: Array<string> = Array.from(
         new Set(
-          earthquakeInfo.points
-            .map((point: any) => point.addr)
-            .filter(Boolean)
+          earthquakeInfo.points.map((point: any) => point.addr).filter(Boolean),
         ),
       );
       areas = `対象地域：${areaNames.join("・")}`;
@@ -289,11 +294,37 @@ async function event(earthquakeInfo: any): Promise<void> {
       description = `この地震について：${earthquakeInfo.comments.freeFormComment}`;
     }
 
+    // 深さ
+    let depth: string = "";
+
+    if (
+      earthquakeInfo.earthquake.hypocenter.depth !== null ||
+      earthquakeInfo.earthquake.hypocenter.depth !== -1
+    ) {
+      if (earthquakeInfo.earthquake.hypocenter.depth === 0) {
+        depth = "深さ：ごく浅い";
+      } else {
+        depth = `深さ：${earthquakeInfo.hypocenter.depth}km`;
+      }
+    }
+
+    // マグニチュード
+    let magnitude: string = "";
+
+    if(
+      earthquakeInfo.earthquake.hypocenter.magnitude !== null ||
+      earthquakeInfo.earthquake.hypocenter.magnitude !== -1
+    ) {
+      magnitude = `マグニチュード：${earthquakeInfo.earthquake.hypocenter.magnitude}`;
+    }
+
     ueuse(`
     ==地震情報==
     【地震発生】
     時刻：${earthquakeInfo.time}
     ${description}
+    ${magnitude}
+    ${depth}
     ${maxScale}
     ${areas}
     国内の津波：${domesticTsunami}
@@ -302,25 +333,35 @@ async function event(earthquakeInfo: any): Promise<void> {
 
   // 地域情報更新の場合
   else if (earthquakeInfo.code === 555) {
+    if (rateLimit === null) {
+      rateLimit = subMinutes(new Date(), 15);
+    }
+
     // 対象地域マッピング
     const areaMaps: any = await areaMap();
 
     const areaNames: Array<string> = Array.from(
       new Set(
-        earthquakeInfo.areas.map((i: any) => {
+        earthquakeInfo.areas
+          .map((i: any) => {
             return areaMaps[i.id];
-        }).filter(Boolean)
+          })
+          .filter(Boolean),
       ),
     );
 
     const areas = areaNames.join("・");
 
+    if (Math.abs(differenceInMinutes(rateLimit, new Date())) >= config.earthquake.rateLimit) {
       ueuse(`
       ==地震情報==
       【地域情報更新】
       時刻：${earthquakeInfo.time}
       対象地域：${areas}
       `);
+
+      rateLimit = new Date();
+    }
   }
 }
 

scripts/timeNotice.ts

@@ -1,13 +1,29 @@
 import { format } from "date-fns";
 
 import type * as types from "types/types";
-
 import config from "../config.js";
 
-export default async function timeNotice() {
-  // 現在時刻を取得
-  const now = format(new Date(), "HH:mm");
 
+// 停止時間
+// 時刻取得
+const start = config.time.stopTimes.start;
+const stop = config.time.stopTimes.stop;
+
+// 現在の時間を取得
+const nowHour = new Date().getHours();
+
+// 停止時刻内かどうかの判定
+let inRange: boolean = false;
+
+if (start < stop) {
+  inRange = nowHour >= start && nowHour < stop;
+} else {
+  inRange = nowHour >= start || nowHour < stop;
+}
+
+
+export default async function timeNotice() {
+  if (inRange === false) {
     // 投稿
     const resUeuse = await fetch(
       `https://${config.uwuzuServer}/api/ueuse/create`,
@@ -15,7 +31,7 @@ export default async function timeNotice() {
         method: "POST",
         body: JSON.stringify({
           token: config.apiToken,
-        text: `${now}になりました`,
+          text: `${format(new Date(), "HH:mm")}になりました`,
         }),
       },
     );
@@ -23,4 +39,5 @@ export default async function timeNotice() {
     const ueuseData: types.ueuseCreateApi = await resUeuse.json();
 
     console.log(JSON.stringify(ueuseData));
+  }
 }

scripts/weatherNotice.ts

@@ -83,7 +83,7 @@ export default async function weatherNotice() {
         today.chanceOfRain.T06_12 !== null ||
         today.chanceOfRain.T06_12 !== "--%"
       ) {
-        chanceOfRain = `${today.chanceOfRain.T06_12}%`;
+        chanceOfRain = today.chanceOfRain.T06_12;
       } else {
         chanceOfRain = "取得できませんでした";
       }

types/config.d.ts

@@ -2,13 +2,25 @@ interface earthquakeTypes {
   reconnectTimes: number;
   websocketUrl: string;
   areasCsvUrl: string;
+  maxScaleMin: number;
+  rateLimit: number;
 }
 
 interface weatherTypes {
   splitCount: number;
 }
 
+interface stopsTypes {
+  start: number;
+  stop: number;
+}
+
+interface timeTypes {
+  stopTimes: stopsTypes;
+}
+
 export interface configTypes {
+  time: timeTypes,
   earthquake: earthquakeTypes;
   weather: weatherTypes;