dotenvを廃止しconfig.tsへ・天気の分割数をconfigで変更できるように・デバッグ用のサンプルログを.gitignoreに追加・地震情報解析の修正

scripts/earthquakeNotice.ts

@@ -1,11 +1,10 @@
 import WebSocket from "ws";
-import * as dotenv from "dotenv";
 
-dotenv.config();
+import config from "../config.js";
 
 class P2PEarthquakeClient {
   private ws: WebSocket | null = null;
-  private reconnectInterval: number = 5000;
+  private reconnectInterval: number = config.earthquake.reconnectTimes;
   private reconnectTimer: NodeJS.Timeout | null = null;
   private isConnecting: boolean = false;
 
@@ -21,7 +20,7 @@ class P2PEarthquakeClient {
     console.log("P2P地震情報に接続中");
 
     try {
-      this.ws = new WebSocket("wss://api.p2pquake.net/v2/ws");
+      this.ws = new WebSocket(config.earthquake.websocketUrl);
 
       this.ws.on("open", () => {
         console.log("P2P地震情報に接続しました");
@@ -119,9 +118,7 @@ class P2PEarthquakeClient {
 
 // 地名オブジェクトマッピング
 async function areaMap(): Promise<Record<number, string>> {
-  const res = await fetch(
-    "https://raw.githubusercontent.com/p2pquake/epsp-specifications/master/epsp-area.csv",
-  );
+  const res = await fetch(config.earthquake.areasCsvUrl);
 
   const text = await res.text();
 
@@ -244,42 +241,39 @@ async function event(earthquakeInfo: any): Promise<void> {
     }
 
     // 最大震度
-    let maxScale;
+    let maxScale: string = "最大深度：";
 
-    if (earthquakeInfo.earthquake.maxScale === -1) {
+    if (
+      earthquakeInfo.earthquake.maxScale === -1 ||
+      earthquakeInfo.earthquake.maxScale === null
+    ) {
       maxScale = "最大震度情報なし";
     } else if (earthquakeInfo.earthquake.maxScale === 10) {
-      maxScale = "震度1";
+      maxScale += "震度1";
     } else if (earthquakeInfo.earthquake.maxScale === 20) {
-      maxScale = "震度2";
+      maxScale += "震度2";
     } else if (earthquakeInfo.earthquake.maxScale === 30) {
-      maxScale = "震度3";
+      maxScale += "震度3";
     } else if (earthquakeInfo.earthquake.maxScale === 40) {
-      maxScale = "震度4";
+      maxScale += "震度4";
     } else if (earthquakeInfo.earthquake.maxScale === 45) {
-      maxScale = "震度5弱";
+      maxScale += "震度5弱";
     } else if (earthquakeInfo.earthquake.maxScale === 50) {
-      maxScale = "震度5強";
+      maxScale += "震度5強";
     } else if (earthquakeInfo.earthquake.maxScale === 55) {
-      maxScale = "震度6弱";
+      maxScale += "震度6弱";
     } else if (earthquakeInfo.earthquake.maxScale === 60) {
-      maxScale = "震度6強";
+      maxScale += "震度6強";
     } else if (earthquakeInfo.earthquake.maxScale === 70) {
-      maxScale = "震度7";
+      maxScale += "震度7";
     }
 
     // 対象地域
     let areas: string = "";
 
     if (earthquakeInfo.points !== null) {
-      const areaMaps: any = await areaMap();
-
       const areaNames: Array<string> = Array.from(
-        new Set(
-          earthquakeInfo.points.map((i: any) => {
-            areaMaps[i.addr].filter(Boolean);
-          }),
-        ),
+        new Set(earthquakeInfo.points.map((i: any) => i.addr).filter(Boolean)),
       );
 
       areas = `対象地域：${areaNames.join("・")}`;
@@ -297,7 +291,7 @@ async function event(earthquakeInfo: any): Promise<void> {
     【地震発生】
     時刻：${earthquakeInfo.time}
     ${description}
-    最大深度：${maxScale}
+    ${maxScale}
     ${areas}
     国内の津波：${domesticTsunami}
     `);
@@ -328,10 +322,10 @@ async function event(earthquakeInfo: any): Promise<void> {
 }
 
 async function ueuse(text: string) {
-  const res = await fetch(`https://${process.env.SERVER}/api/ueuse/create`, {
+  const res = await fetch(`https://${config.uwuzuServer}/api/ueuse/create`, {
     method: "POST",
     body: JSON.stringify({
-      token: process.env.TOKEN,
+      token: config.apiToken,
       text: text,
     }),
   });

scripts/followBack.ts

@@ -1,13 +1,11 @@
-import * as dotenv from "dotenv";
+import type * as types from "types/types";
 
-import type * as types from "../types";
-
-dotenv.config();
+import config from "../config.js";
 
 export default async function followBack() {
   // フォロワーを取得
   const resMe = await fetch(
-    `https://${process.env.SERVER}/api/me?token=${process.env.TOKEN}`,
+    `https://${config.uwuzuServer}/api/me?token=${config.apiToken}`,
     {
       method: "GET",
       // uwuzu.netで/api/meのPOSTが死んでいるため簡易的にGET
@@ -25,11 +23,11 @@ export default async function followBack() {
     const followerItem = followers[i];
 
     const resFollow = await fetch(
-      `https://${process.env.SERVER}/api/users/follow`,
+      `https://${config.uwuzuServer}/api/users/follow`,
       {
         method: "POST",
         body: JSON.stringify({
-          token: process.env.TOKEN,
+          token: config.apiToken,
           userid: followerItem,
         }),
       },

scripts/timeNotice.ts

@@ -1,9 +1,8 @@
-import * as dotenv from "dotenv";
 import { format } from "date-fns";
 
-import type * as types from "../types";
+import type * as types from "types/types";
 
-dotenv.config();
+import config from "../config.js";
 
 export default async function timeNotice() {
   // 現在時刻を取得
@@ -11,11 +10,11 @@ export default async function timeNotice() {
 
   // 投稿
   const resUeuse = await fetch(
-    `https://${process.env.SERVER}/api/ueuse/create`,
+    `https://${config.uwuzuServer}/api/ueuse/create`,
     {
       method: "POST",
       body: JSON.stringify({
-        token: process.env.TOKEN,
+        token: config.apiToken,
         text: `${now}になりました`,
       }),
     },

scripts/weatherNotice.ts

@@ -1,17 +1,17 @@
-import * as dotenv from "dotenv";
 import { cityList } from "../src/weatherId.js";
-import type * as types from "../types";
 
-dotenv.config();
+import type * as types from "types/types.js";
+
+import config from "../config.js";
 
 export default async function weatherNotice() {
   // 仮投稿
   const resUeuse = await fetch(
-    `https://${process.env.SERVER}/api/ueuse/create`,
+    `https://${config.uwuzuServer}/api/ueuse/create`,
     {
       method: "POST",
       body: JSON.stringify({
-        token: process.env.TOKEN,
+        token: config.apiToken,
         text: `
         本日の天気
         ※タイムラインが埋まるため返信に記載しています
@@ -24,102 +24,96 @@ export default async function weatherNotice() {
 
   console.log(JSON.stringify(ueuseData));
 
-  // 3分割処理
+
+  // インデックス
+  const splitCount = config.weather.splitCount;
   const total = cityList.length;
-  const firstLength = Math.trunc(total / 3);
-  const secondLength = Math.trunc((total - firstLength) / 2);
-  const thirdLength = total - firstLength - secondLength;
+  const chunkSizes = Array(splitCount).fill(0).map((_, i) =>
+    Math.floor((total + i) / splitCount)
+  );
 
-  // インデックス作成
-  const firstStart = 0;
-  const firstEnd = firstStart + firstLength;
-  const secondStart = firstEnd;
-  const secondEnd = secondStart + secondLength;
-  const thirdStart = secondEnd;
-  const thirdEnd = total;
+  // 分割インデックス
+  let start = 0;
+  const ranges = chunkSizes.map(size => {
+    const range = [start, start + size];
+    start += size;
+    return range;
+  });
 
-  let weatherResults = ["", "", ""];
+  // 配列作成
+  const weatherResults = Array(splitCount).fill("");
 
-  // 投稿1
-  for (let i = firstStart; i < firstEnd; i++) {
-    const res = await fetch(
-      `https://weather.tsukumijima.net/api/forecast/city/${cityList[i]}`,
-    );
-    const data = await res.json();
-    const today = data.forecasts[0];
+  // 天気取得
+  for (let chunkIndex = 0; chunkIndex < splitCount; chunkIndex++) {
+    const [chunkStart, chunkEnd] = ranges[chunkIndex];
 
-    const weather = today.telop ?? "取得できませんでした";
-    const maxTemp = today.temperature.max?.celsius ?? "取得できませんでした";
-    const minTemp = today.temperature.min?.celsius ?? "取得できませんでした";
-    const chanceOfRain = data.chanceOfRain?.["T06_12"] ?? "取得できませんでした";
+    for (let i = chunkStart; i < chunkEnd; i++) {
+      const res = await fetch(
+        `https://weather.tsukumijima.net/api/forecast/city/${cityList[i]}`,
+      );
 
-    weatherResults[0] += `
-    【${data.location.city}】\n
-    天気：${weather}\n
-    最高気温：${maxTemp}℃\n
-    最低気温：${minTemp}℃\n
-    降水確率：${chanceOfRain}\n
-    `;
+      const data = await res.json();
+      const today = data.forecasts[0];
+
+      // 天気
+      const weather = today.telop ?? "取得できませんでした";
+
+      // 最高気温
+      let maxTemp: string;
+
+      if (today.temperature.max.celsius !== null) {
+        maxTemp = `${today.temperature.max.celsius}℃`;
+      } else {
+        maxTemp = "取得できませんでした";
+      }
+
+      // 最低気温
+      let minTemp: string;
+
+      if (today.temperature.min.celsius !== null) {
+        minTemp = `${today.temperature.min.celsius}℃`;
+      } else {
+        minTemp = "取得できませんでした";
+      }
+
+      // 降水確率
+      let chanceOfRain: string;
+
+      if (
+        today.chanceOfRain.T06_12 !== null ||
+        today.chanceOfRain.T06_12 !== "--%"
+      ) {
+        chanceOfRain = `${today.chanceOfRain.T06_12}%`;
+      } else {
+        chanceOfRain = "取得できませんでした";
+      }
+
+      weatherResults[chunkIndex] += `
+      【${data.location.city}】
+      天気：${weather}
+      最高気温：${maxTemp}
+      最低気温：${minTemp}
+      降水確率：${chanceOfRain}
+      `;
+    }
   }
 
-  // 投稿2
-  for (let i = secondStart; i < secondEnd; i++) {
-    const res = await fetch(
-      `https://weather.tsukumijima.net/api/forecast/city/${cityList[i]}`,
-    );
-    const data = await res.json();
-    const today = data.forecasts[0];
-
-    const weather = today.telop ?? "取得できませんでした";
-    const maxTemp = today.temperature.max?.celsius ?? "取得できませんでした";
-    const minTemp = today.temperature.min?.celsius ?? "取得できませんでした";
-    const chanceOfRain = data.chanceOfRain?.["T06_12"] ?? "取得できませんでした";
-
-    weatherResults[1] += `
-    【${data.location.city}】\n
-    天気：${weather}\n
-    最高気温：${maxTemp}℃\n
-    最低気温：${minTemp}℃\n
-    降水確率：${chanceOfRain}\n
-    `;
-  }
-
-  // 投稿3
-  for (let i = thirdStart; i < thirdEnd; i++) {
-    const res = await fetch(
-      `https://weather.tsukumijima.net/api/forecast/city/${cityList[i]}`,
-    );
-    const data = await res.json();
-    const today = data.forecasts[0];
-
-    const weather = today.telop ?? "取得できませんでした";
-    const maxTemp = today.temperature.max?.celsius ?? "取得できませんでした";
-    const minTemp = today.temperature.min?.celsius ?? "取得できませんでした";
-    const chanceOfRain = data.chanceOfRain?.["T06_12"] ?? "取得できませんでした";
-
-    weatherResults[2] += `
-    【${data.location.city}】\n
-    天気：${weather}\n
-    最高気温：${maxTemp}℃\n
-    最低気温：${minTemp}℃\n
-    降水確率：${chanceOfRain}\n
-    `;
-  }
-
-  // 3分割投稿
-  for (let i = 0; i < 3; i++) {
+  // 分割投稿
+  for (let i = 0; i < splitCount; i++) {
     const resReply = await fetch(
-      `https://${process.env.SERVER}/api/ueuse/create`,
+      `https://${config.uwuzuServer}/api/ueuse/create`,
       {
         method: "POST",
         body: JSON.stringify({
-          token: process.env.TOKEN,
+          token: config.apiToken,
           text: weatherResults[i],
           replyid: ueuseData.uniqid
         }),
       },
     );
+
     const replyData: types.ueuseCreateApi = await resReply.json();
+
     console.log(JSON.stringify(replyData));
   }
 }