feat: 無限ループを停止する

nana4rider · Jan 17, 2025 · bf6ed4a · bf6ed4a
1 parent 5006140
commit bf6ed4a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wisun2mqtt",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "type": "module",
   "homepage": "https://github.com/nana4rider/wisun2mqtt",

diff --git a/src/index.ts b/src/index.ts
@@ -8,19 +8,22 @@ async function main() {
   logger.info("start");
 
   const smartMeterClient = await initializeSmartMeterClient();
-  const mqtt = await setupMqttDeviceManager(smartMeterClient);
+  const { mqtt, stopAutoRequest } =
+    await setupMqttDeviceManager(smartMeterClient);
   const http = await initializeHttpServer();
   const {
     device: { deviceId, entities },
   } = smartMeterClient;
   const availability = setupAvailability(deviceId, entities, mqtt);
 
   const handleShutdown = async () => {
-    logger.info("shutdown");
+    logger.info("shutdown start");
+    await stopAutoRequest();
     availability.close();
     await mqtt.close(true);
     await http.close();
     await smartMeterClient.close();
+    logger.info("shutdown finished");
     process.exit(0);
   };
 

diff --git a/src/manager/mqttDeviceManager.ts b/src/manager/mqttDeviceManager.ts
@@ -33,8 +33,9 @@ export default async function setupMqttDeviceManager(
   });
 
   // 定期的にエンティティの状態を更新
-  void (async () => {
-    while (true) {
+  let isAutoRequestRunning = true;
+  const autoRequestTask = (async () => {
+    while (isAutoRequestRunning) {
       logger.info("Starting periodic ECHONET property fetch...");
       try {
         const echonetData = await smartMeterClient.fetchData(
@@ -44,7 +45,7 @@ export default async function setupMqttDeviceManager(
         echonetData.properties.forEach((property) => {
           const entity = entities.find((entity) => entity.epc === property.epc);
           if (entity === undefined) {
-            logger.warn(
+            logger.error(
               `エンティティに存在しないプロパティ: epc=${property.epc} edt=${property.edt}`,
             );
             return;
@@ -65,5 +66,10 @@ export default async function setupMqttDeviceManager(
     }
   })();
 
-  return mqtt;
+  const stopAutoRequest = async () => {
+    isAutoRequestRunning = false;
+    await autoRequestTask;
+  };
+
+  return { mqtt, stopAutoRequest };
 }