feat: エンティティのデフォルト更新間隔を3分に変更

__tests__/manager/mqttDeviceManager.spec.ts

@@ -0,0 +1,221 @@
+import { EchonetData } from "@/echonet/EchonetData";
+import { Entity } from "@/entity";
+import env from "@/env";
+import logger from "@/logger";
+import setupMqttDeviceManager from "@/manager/mqttDeviceManager";
+import { buildDevice, buildEntity, buildOrigin } from "@/payload/builder";
+import initializeMqttClient from "@/service/mqtt";
+import { SmartMeterClient } from "@/service/smartMeter";
+
+jest.mock("@/payload/builder", () => ({
+  buildEntity: jest.fn(),
+  buildDevice: jest.fn(),
+  buildOrigin: jest.fn(),
+}));
+
+jest.mock("@/service/mqtt", () => jest.fn());
+
+describe("setupMqttDeviceManager", () => {
+  let mockMqttClient: { publish: jest.Mock };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    mockMqttClient = {
+      publish: jest.fn(),
+    };
+
+    (initializeMqttClient as jest.Mock).mockResolvedValue(mockMqttClient);
+    (buildOrigin as jest.Mock).mockResolvedValue({ origin: "test-origin" });
+    (buildDevice as jest.Mock).mockReturnValue({ device: "test-device" });
+    (buildEntity as jest.Mock).mockImplementation(
+      (deviceId: string, entity: Entity) => ({
+        unique_id: `wisun2mqtt_${deviceId}_${entity.id}`,
+        name: entity.name,
+      }),
+    );
+  });
+
+  test("Home Assistantにデバイス情報が送信される", async () => {
+    const mockFetchData = jest.fn();
+    const smartMeterClient = {
+      device: {
+        deviceId: "deviceId",
+        manufacturer: "manufacturer",
+        entities: [
+          {
+            id: "entity1",
+            name: "name1",
+            domain: "sensor",
+          },
+        ],
+      },
+      fetchData: mockFetchData,
+    } as unknown as SmartMeterClient;
+    mockFetchData.mockResolvedValue([]);
+
+    const { stopAutoRequest } = await setupMqttDeviceManager(smartMeterClient);
+    await stopAutoRequest();
+
+    expect(mockMqttClient.publish).toHaveBeenCalledWith(
+      `${env.HA_DISCOVERY_PREFIX}/sensor/wisun2mqtt_deviceId_entity1/config`,
+      JSON.stringify({
+        unique_id: "wisun2mqtt_deviceId_entity1",
+        name: "name1",
+        device: "test-device",
+        origin: "test-origin",
+      }),
+      { qos: 1, retain: true },
+    );
+  });
+
+  test("定期的な自動取得が呼び出される", async () => {
+    const mockFetchData = jest.fn();
+    const smartMeterClient = {
+      device: {
+        deviceId: "deviceId",
+        manufacturer: "manufacturer",
+        entities: [
+          {
+            id: "entity1",
+            name: "name1",
+            domain: "sensor",
+            epc: 0x88,
+          },
+          {
+            id: "entity2",
+            name: "name2",
+            domain: "sensor",
+            epc: 0x99,
+          },
+        ] as Entity[],
+      },
+      fetchData: mockFetchData,
+    } as unknown as SmartMeterClient;
+    mockFetchData.mockResolvedValue(
+      EchonetData.create({
+        seoj: 0x05ff01,
+        deoj: 0x028801,
+        esv: 0x62,
+        tid: 0x99,
+        properties: [],
+      }),
+    );
+
+    const { stopAutoRequest } = await setupMqttDeviceManager(smartMeterClient);
+    await stopAutoRequest();
+
+    expect(mockFetchData).toHaveBeenCalledWith([0x88, 0x99]);
+  });
+
+  test("エンティティに存在しないepcは無視する", async () => {
+    const mockFetchData = jest.fn();
+    const mockConverter = jest.fn();
+
+    const smartMeterClient = {
+      device: {
+        deviceId: "deviceId",
+        manufacturer: "manufacturer",
+        entities: [
+          {
+            id: "entity1",
+            name: "name1",
+            domain: "sensor",
+            epc: 0x88,
+            converter: mockConverter,
+          },
+        ] as unknown as Entity[],
+      },
+      fetchData: mockFetchData,
+    } as unknown as SmartMeterClient;
+    mockFetchData.mockResolvedValue(
+      EchonetData.create({
+        seoj: 0x05ff01,
+        deoj: 0x028801,
+        esv: 0x62,
+        tid: 0x99,
+        properties: [{ epc: 0xff }],
+      }),
+    );
+
+    const { stopAutoRequest } = await setupMqttDeviceManager(smartMeterClient);
+    await stopAutoRequest();
+
+    expect(mockConverter).not.toHaveBeenCalled();
+  });
+
+  test("エンティティに存在するepcは更新する", async () => {
+    const mockFetchData = jest.fn();
+    const mockConverter = jest.fn().mockReturnValue("999");
+
+    const smartMeterClient = {
+      device: {
+        deviceId: "deviceId",
+        manufacturer: "manufacturer",
+        entities: [
+          {
+            id: "entity1",
+            name: "name1",
+            domain: "sensor",
+            epc: 0x88,
+            converter: mockConverter,
+          },
+        ] as unknown as Entity[],
+      },
+      fetchData: mockFetchData,
+    } as unknown as SmartMeterClient;
+    mockFetchData.mockResolvedValue(
+      EchonetData.create({
+        seoj: 0x05ff01,
+        deoj: 0x028801,
+        esv: 0x62,
+        tid: 0x99,
+        properties: [{ epc: 0x88 }],
+      }),
+    );
+
+    const { stopAutoRequest } = await setupMqttDeviceManager(smartMeterClient);
+    await stopAutoRequest();
+
+    expect(mockConverter).toHaveBeenCalled();
+    expect(mockMqttClient.publish).toHaveBeenCalledWith(
+      "wisun2mqtt/deviceId/entity1/state",
+      "999",
+      {
+        retain: true,
+      },
+    );
+  });
+
+  test("自動リクエスト中にエラーが発生した場合ログに記録される", async () => {
+    const mockFetchData = jest.fn();
+    const mockConverter = jest.fn().mockReturnValue("999");
+
+    const smartMeterClient = {
+      device: {
+        deviceId: "deviceId",
+        manufacturer: "manufacturer",
+        entities: [
+          {
+            id: "entity1",
+            name: "name1",
+            domain: "sensor",
+            epc: 0x88,
+            converter: mockConverter,
+          },
+        ] as unknown as Entity[],
+      },
+      fetchData: mockFetchData,
+    } as unknown as SmartMeterClient;
+    mockFetchData.mockRejectedValue(new Error("test error"));
+
+    const logErrorSpy = jest.spyOn(logger, "warn");
+    const { stopAutoRequest } = await setupMqttDeviceManager(smartMeterClient);
+    await stopAutoRequest();
+
+    expect(logErrorSpy).toHaveBeenCalledWith(
+      "Failed to fetch ECHONET properties",
+      expect.any(Error),
+    );
+  });
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wisun2mqtt",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "main": "dist/index.js",
   "type": "module",
   "homepage": "https://github.com/nana4rider/wisun2mqtt",

src/env.ts

@@ -26,7 +26,7 @@ const env = cleanEnv(process.env, {
   }),
   AUTO_REQUEST_INTERVAL: num({
     desc: "エンティティの更新間隔",
-    default: 60000,
+    default: 180000,
   }),
   ECHONET_GET_TIMEOUT: num({
     desc: "GET要求のタイムアウト",