homebridge-echonet-lite-plus 0.7.0

package/CHANGELOG.md

@@ -0,0 +1,64 @@
+# Changelog
+
+## 0.7.0
+
+- Kept disabled devices out of Apple Home while retaining the complete discovered-device registry in the settings UI.
+- Newly discovered devices now remain disabled until the user explicitly publishes them to HomeKit.
+- Added bilingual per-device publication, naming and property controls to the custom configuration UI.
+- Added reliable rediscovery handling with save/restart guidance and cached-list fallbacks.
+- Added regression coverage for all-devices-off operation and Apple Home/extended meter-mode transitions.
+- Removed routine custom-UI diagnostic logging and no longer reports a missing first-run device cache as an error.
+
+## 0.6.6
+
+- Aligned custom UI server loading with the current `@homebridge/plugin-ui-utils` 2.2.5 dynamic-import pattern used by the reference plugins.
+- Added an IPC integration test that starts the real UI server and verifies a seven-device `/devices` response.
+- Added a cache integration test that verifies all seven detected devices are written even when some are not published to HomeKit.
+
+## 0.6.5
+
+- Fixed a regression where opt-in filtering ran before the settled ECHONET facility list was saved, causing disabled devices to disappear from the settings page.
+- Kept every detected device in the configuration list while applying opt-in filtering only to HomeKit publication.
+- Added an Info log with the number of devices written to the detected-device cache.
+
+## 0.6.4
+
+- Added server-pushed device-list and restart-status events for Homebridge UI environments where custom request responses do not resolve reliably.
+- Pushed the refreshed device cache to the settings page automatically after rediscovery.
+
+## 0.6.3
+
+- Preserved the complete configured device list when the live UI device-cache request is delayed or unavailable.
+- Merged saved device settings, Homebridge accessory cache and live discovery results instead of falling back to published accessories only.
+
+## 0.6.2
+
+- Prevented the custom settings page from waiting indefinitely for UI-server status requests.
+- Rendered the settings form immediately and loaded restart/discovery status asynchronously with explicit timeouts.
+
+## 0.6.1
+
+- Changed newly discovered devices to opt-in: they remain off until explicitly enabled for HomeKit.
+- Blocked rediscovery while saved settings are waiting for a child bridge restart.
+- Added bilingual guidance for saving and restarting after changing meter compatibility or device publication settings.
+
+## 0.6.0
+
+- Added periodic GET polling for devices that do not send state-change notifications.
+- Added HomeKit mappings for air-conditioning ventilators, shutters, water heaters, bathroom heater/dryers, floor heating, hybrid water heaters and JEM-A/HA switches.
+- Added read-only extended measurements for residential solar generation and EV charge/discharge equipment.
+- Kept non-standard meter and energy values hidden in Apple Home compatible mode instead of representing them as unrelated HomeKit sensor types.
+- Added safe handling for detected but unmapped device classes.
+- Improved MRA decoding and encoding when a device defines multiple release-specific schemas for the same EPC.
+
+## 0.5.6
+
+- Added direct ECHONET Lite communication over UDP/3610 without MQTT.
+- Added MRA 1.4.0 based property discovery, decoding and encoding.
+- Added HomeKit mappings for air conditioners, lighting, temperature and humidity sensors, locks and fans.
+- Added Apple Home compatible and extended display modes for electricity, distribution board, water and gas meters.
+- Added a bilingual English/Japanese custom configuration UI with device discovery and per-device property selection.
+- Limited frequent INF/push packet logging to Debug level.
+- Prevented repeated disk and Homebridge cache writes for unchanged push data.
+- Fixed ECHONET property-map parsing, empty SET response handling and air-conditioner target-temperature conversion.
+- Added automated tests for MRA conversion, property maps, meter compatibility and SET response handling.

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Homebridge ECHONET Lite Plus contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,75 @@
+# Homebridge ECHONET Lite Plus
+
+[GitHub](https://github.com/sylpied/homebridge-echonet-lite-plus) · [Issues](https://github.com/sylpied/homebridge-echonet-lite-plus/issues) · [ECHONET公式MRA](https://echonet.jp/spec_mra_rr3/)
+
+LAN内の ECHONET Lite 機器と直接通信し、HomeKit に公開するHomebridge動的プラットフォームです。MQTTブローカーは不要です。
+
+ECHONET ConsortiumのMachine Readable Appendix Version 1.4.0を同梱し、EPCの名称、アクセス規則、数値型、符号、倍率、状態enumの読書きをMRAから解決します。HomeKitサービスへの割当ては、MRAで変換したプロパティ名を使用します。
+
+MRAはECHONET Consortiumが公開する参考データです。本プラグインのMITライセンスはMRA自体の著作権や利用条件を変更するものではありません。
+
+## 動作要件とインストール
+
+- Node.js 18以降
+- Homebridge 1.6以降（Homebridge 2.xを含む）
+- HomebridgeとECHONET Lite機器が同じLANからUDP/3610で通信できること
+
+Homebridge UIのプラグイン検索から `homebridge-echonet-lite-plus` をインストールします。npmを直接使用する場合は次のコマンドです。
+
+```sh
+npm install -g homebridge-echonet-lite-plus
+```
+
+インストール後、プラグイン設定を開いて対象ネットワークを確認し、Child Bridgeを再起動してください。既存バージョンから更新する場合も設定は引き継がれます。
+
+## 対応方針
+
+ECHONET Liteの機器クラスとプロパティを、意味が一致するHomeKitサービスへ割り当てます。HomeKitに対応する型がない計測値を、照度や湿度など別の値へ偽装することはありません。
+
+| ECHONET Lite機器 | EOJ | HomeKitでの扱い |
+| --- | --- | --- |
+| 家庭用エアコン | `0130` | Heater/Cooler、運転、モード、室温、設定温度 |
+| 換気扇・空調換気扇・空気清浄機 | `0133` / `0134` / `0135` | Fan |
+| 電動雨戸・シャッター | `0263` | Window Covering、開閉、停止、開度（機器が対応する場合） |
+| 電気温水器・瞬間式給湯器 | `026B` / `0272` | 風呂自動Switch |
+| 電気錠 | `026F` | Lock Mechanism |
+| 浴室暖房乾燥機 | `0273` | Fan、換気・予備暖房・暖房・乾燥・涼風Switch |
+| 床暖房 | `027B` | Thermostat、運転、現在温度、設定温度 |
+| ハイブリッド給湯機 | `02A6` | 自動沸き上げSwitch |
+| JEM-A/HA対応スイッチ | `05FD` | Switch |
+| 一般・単機能照明 | `0290` / `0291` | Lightbulb、電源、明るさ |
+| 温度・湿度センサー | `0011` / `0012` | 専用センサー |
+| 電力量計・分電盤・スマートメーター | `0280` / `0287` / `0288` | Eve互換の電力・電流・積算電力量 |
+| 住宅用太陽光発電 | `0279` | 拡張モードで発電電力・積算発電量・積算売電量（読み取り専用） |
+| 電気自動車充放電器 | `027E` | 拡張モードで充放電電力・残量・使用電力量（読み取り専用） |
+| 水流量メーター | `0281` | 積算水道使用量、検針データ異常、標準Leak Sensorによる異常通知 |
+| ガスメーター | `0282` | 積算ガス使用量 |
+
+Appleのホームアプリには電力・発電量・EV残量・水道・ガス使用量の標準表示がありません。既定のAppleホーム互換モードでは、意味の異なるタイルへ偽装せず非表示にします。拡張モードでは正しい単位のカスタムCharacteristicとして公開し、Eveなど対応するHomeKitアプリから参照できます。
+
+ECHONET Liteとして存在していても、HomeKit上で安全かつ自然に表現できない機器クラスは検出一覧にのみ表示し、対応マッピングを実装するまでHomeKitへは公開しません。
+
+## 構成
+
+HomebridgeをECHONET Lite機器と同じLANで動かし、設定画面で自動探索を有効にします。複数NIC環境では対象ネットワークを指定してください。
+
+## 設定
+
+- `targetNetwork`: 使用するIPv4ネットワーク。複数NIC環境で指定します。
+- `autoDiscovery`: マルチキャストによる機器探索です。
+- `knownDeviceIps`: 自動探索へ応答しない機器のIPアドレスです。
+- `includeDevices` / `excludeDevices`: IP、EOJ、内部識別子によるフィルターです。
+- `deviceSettings`: 検出済み機器ごとのHomeKit公開、表示名、表示・操作項目の選択です。通常はカスタムUIから設定します。
+- `meterDisplayMode`: `appleHome`（推奨）はAppleホーム非対応の計測タイルを隠し、`extended`はEveなど対応アプリ向けのカスタム計測値を公開します。
+- `pollInterval`: INF通知を送らない機器の状態を定期取得します。既定は60秒、最短は30秒です。大量の機器がある場合は5分または無効を選べます。
+- `logLevel`: 通常は `info` を推奨します。
+
+通常ログでは接続、機器追加、HomeKitからの操作、警告、エラーだけを表示します。ECHONET LiteのINF由来を含む頻繁なpushデータと検出詳細は `debug` を選んだ場合だけ表示します。
+
+項目のチェックを外すと、そのEPCとの同期・操作を止めます。ただしHomeKitサービスで必須のCharacteristicはタイル上に残る場合があります。表示名の変更はChild Bridge再起動後に反映されますが、Appleホーム側で変更済みの名前は保持されることがあります。
+
+新しく検出した機器は安全のため初期状態で「HomeKitに表示」がOFFです。追加したい機器だけをONにして設定を保存し、Child Bridgeを再起動してください。設定変更から再起動までの間は、稼働中の設定との食い違いを防ぐため「機器を再探索」を実行できません。
+
+## 実機なしでの確認
+
+ECHONET Liteエミュレーターを同じLANまたはローカル環境で動かし、探索、Get、SetC、INFを確認します。実機確認時は、機器ごとのプロパティマップに含まれる読み書き可能EPCだけを利用してください。

package/config.schema.json

@@ -0,0 +1,36 @@
+{
+  "pluginAlias": "ECHONETLitePlus",
+  "pluginType": "platform",
+  "singular": true,
+  "customUi": true,
+  "customUiPath": "./homebridge-ui",
+  "headerDisplay": "## ECHONET Lite Plus\nDirectly discovers ECHONET Lite devices on your LAN and exposes them to HomeKit. MQTT is not required.  \nLAN内のECHONET Lite機器を直接探索し、HomeKitへ追加します。MQTTは不要です。",
+  "footerDisplay": "Set **Log Level / ログレベル** to Debug only while troubleshooting, then return it to Info.  \n問題調査時だけDebugへ変更し、確認後はInfoへ戻してください。",
+  "schema": {
+    "type": "object",
+    "properties": {
+      "name": { "title": "Platform Name / プラットフォーム名", "type": "string", "default": "ECHONET Lite", "required": true },
+      "targetNetwork": { "title": "Network Interface / 使用ネットワーク", "description": "Optional IPv4 interface address for hosts with multiple adapters. / 複数NIC環境で使用するIPv4インターフェースアドレス。", "type": "string", "placeholder": "192.168.1.10" },
+      "autoDiscovery": { "title": "Automatic Discovery / 自動探索", "description": "Discover devices using ECHONET Lite multicast. / マルチキャストで機器を探索します。", "type": "boolean", "default": true },
+      "knownDeviceIps": { "title": "Known Device IP Addresses / 既知の機器IP", "description": "Devices that do not respond to multicast discovery. / 自動探索へ応答しない機器を直接探索します。", "type": "array", "uniqueItems": true, "default": [], "items": { "title": "IP Address / IPアドレス", "type": "string", "placeholder": "192.168.1.100" } },
+      "includeDevices": { "title": "Include Devices / 追加する機器", "description": "Optional extra filter by IP, EOJ, or internal ID. Discovered devices must also be enabled explicitly. / IP、EOJ、内部IDによる追加フィルターです。検出機器は個別に有効化する必要があります。", "type": "array", "uniqueItems": true, "default": [], "items": { "title": "Device / 機器", "type": "string" } },
+      "excludeDevices": { "title": "Exclude Devices / 除外する機器", "description": "Specify an IP, EOJ, or internal ID. / IP、EOJ、内部IDを指定します。", "type": "array", "uniqueItems": true, "default": [], "items": { "title": "Device / 機器", "type": "string" } },
+      "deviceSettings": { "title": "Discovered Device Settings / 検出機器設定", "type": "array", "default": [], "items": { "type": "object", "properties": { "id": { "type": "string" }, "name": { "type": "string" }, "enabled": { "type": "boolean", "default": false }, "properties": { "type": "array", "items": { "type": "string" } } }, "required": ["id"] } },
+      "meterDisplayMode": { "title": "Meter Display / メーター表示", "type": "string", "default": "appleHome", "oneOf": [{"title":"Apple Home Compatible / Appleホーム互換","enum":["appleHome"]},{"title":"Extended Apps (Eve) / 拡張アプリ（Eve）","enum":["extended"]}] },
+      "pollInterval": { "title": "State Update Interval / 状態更新間隔", "description": "Periodically requests selected readable properties. / 選択した読取可能プロパティを定期取得します。", "type": "number", "default": 60, "oneOf": [{"title":"Off / 無効","enum":[0]},{"title":"30 seconds / 30秒","enum":[30]},{"title":"60 seconds (Recommended) / 60秒（推奨）","enum":[60]},{"title":"5 minutes / 5分","enum":[300]}] },
+      "logLevel": { "title": "Log Level / ログレベル", "description": "Push packets are shown only at Debug level. Info is recommended. / push電文はDebugでのみ表示します。通常はInfoを推奨します。", "type": "string", "default": "info", "oneOf": [
+        { "title": "Error / エラーのみ", "enum": ["error"] },
+        { "title": "Warning / 警告以上", "enum": ["warn"] },
+        { "title": "Info (Recommended) / 通常（推奨）", "enum": ["info"] },
+        { "title": "Debug / デバッグ（全push表示）", "enum": ["debug"] }
+      ] }
+    },
+    "required": ["name"]
+  },
+  "layout": [
+    { "key": "name" },
+    { "type": "fieldset", "title": "Network & Discovery / ネットワークと探索", "expandable": true, "expanded": true, "items": ["targetNetwork", "autoDiscovery", "knownDeviceIps", "meterDisplayMode"] },
+    { "type": "fieldset", "title": "Device Filters / 機器フィルター", "expandable": true, "expanded": false, "items": ["includeDevices", "excludeDevices"] },
+    { "type": "fieldset", "title": "Updates & Logging / 更新とログ", "expandable": true, "expanded": false, "items": ["pollInterval", "logLevel"] }
+  ]
+}

package/dist/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const platform_1 = require("./platform");
+const settings_1 = require("./settings");
+exports.default = (api) => api.registerPlatform(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, platform_1.EchonetLitePlatform);

package/dist/logger.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginLogger = void 0;
+const weight = { error: 0, warn: 1, info: 2, debug: 3 };
+class PluginLogger {
+    log;
+    level;
+    constructor(log, level = 'info') {
+        this.log = log;
+        this.level = level;
+    }
+    enabled(level) { return weight[level] <= weight[this.level]; }
+    error(message, ...args) { if (this.enabled('error'))
+        this.log.error(message, ...args); }
+    warn(message, ...args) { if (this.enabled('warn'))
+        this.log.warn(message, ...args); }
+    info(message, ...args) { if (this.enabled('info'))
+        this.log.info(message, ...args); }
+    debug(message, ...args) { if (this.enabled('debug'))
+        this.log.debug(message, ...args); }
+}
+exports.PluginLogger = PluginLogger;

package/dist/mra.js

@@ -0,0 +1,91 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MraRepository = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const adm_zip_1 = __importDefault(require("adm-zip"));
+class MraRepository {
+    devices = new Map();
+    definitions;
+    constructor(zipPath = node_path_1.default.resolve(__dirname, '../work/MRA_v1.4.0.zip')) {
+        const zip = new adm_zip_1.default(zipPath);
+        const json = (name) => JSON.parse(zip.readAsText(name));
+        this.definitions = json('MRA_v1.4.0/definitions/definitions.json').definitions;
+        for (const entry of zip.getEntries().filter(e => /^MRA_v1\.4\.0\/devices\/0x[0-9A-Fa-f]{4}\.json$/.test(e.entryName))) {
+            const device = JSON.parse(entry.getData().toString('utf8'));
+            this.devices.set(device.eoj.toLowerCase().replace(/^0x/, ''), device);
+        }
+    }
+    device(eoj) { return this.devices.get(eoj.slice(0, 4).toLowerCase()); }
+    candidates(eoj, epc) { return this.device(eoj)?.elProperties.filter(p => p.epc.toLowerCase() === `0x${epc.toLowerCase()}`) ?? []; }
+    describe(eoj, epc) {
+        const property = this.candidates(eoj, epc)[0];
+        return property ? { name: property.shortName, ja: property.propertyName.ja, en: property.propertyName.en } : undefined;
+    }
+    isReadable(eoj, epc) { return this.candidates(eoj, epc).some(p => p.accessRule.get !== 'notApplicable'); }
+    isWritable(eoj, epc) { return this.candidates(eoj, epc).some(p => p.accessRule.set !== 'notApplicable'); }
+    decode(eoj, epc, raw) {
+        const candidates = this.candidates(eoj, epc);
+        if (!candidates.length)
+            return undefined;
+        const matched = candidates.map(property => ({ property, decoded: this.tryDecodeSchema(property.data, raw) })).find(x => x.decoded.matched);
+        const property = matched?.property ?? candidates[0];
+        return { epc, name: property.shortName, value: matched?.decoded.value ?? raw, raw, readable: candidates.some(p => p.accessRule.get !== 'notApplicable'), writable: candidates.some(p => p.accessRule.set !== 'notApplicable'), observable: candidates.some(p => p.accessRule.inf !== 'notApplicable') };
+    }
+    encode(eoj, propertyName, value) {
+        for (const property of this.device(eoj)?.elProperties.filter(p => p.shortName === propertyName && p.accessRule.set !== 'notApplicable') ?? []) {
+            const schema = this.resolve(property.data);
+            for (const state of this.schemasOfType(schema, 'state')) {
+                const match = state.enum?.find(e => e.name === String(value));
+                if (match)
+                    return { epc: property.epc.slice(2), edt: match.edt.slice(2) };
+            }
+            if (typeof value === 'number' && Number.isFinite(value)) {
+                for (const number of this.schemasOfType(schema, 'number')) {
+                    const multiple = number.multiple ?? 1, size = this.sizeOf(number.format), signed = number.format?.startsWith('int') ?? false;
+                    const n = Math.round(value / multiple);
+                    if ((number.minimum !== undefined && n < number.minimum) || (number.maximum !== undefined && n > number.maximum))
+                        continue;
+                    const min = signed ? -(2 ** (size * 8 - 1)) : 0, max = signed ? 2 ** (size * 8 - 1) - 1 : 2 ** (size * 8) - 1;
+                    if (n < min || n > max)
+                        continue;
+                    const encoded = n < 0 ? 2 ** (size * 8) + n : n;
+                    return { epc: property.epc.slice(2), edt: encoded.toString(16).padStart(size * 2, '0') };
+                }
+            }
+        }
+        return undefined;
+    }
+    resolve(schema) { if (schema.$ref)
+        return this.resolve(this.definitions[schema.$ref.split('/').pop()] ?? schema); return schema; }
+    schemasOfType(schema, type) { schema = this.resolve(schema); return [...(schema.type === type ? [schema] : []), ...(schema.oneOf ?? []).flatMap(item => this.schemasOfType(item, type))]; }
+    tryDecodeSchema(schema, raw) {
+        schema = this.resolve(schema);
+        if (schema.oneOf) {
+            for (const item of schema.oneOf) {
+                const decoded = this.tryDecodeSchema(item, raw);
+                if (decoded.matched)
+                    return decoded;
+            }
+            return { matched: false };
+        }
+        if (schema.type === 'state') {
+            const found = schema.enum?.find(e => e.edt.slice(2).toLowerCase() === raw.toLowerCase());
+            return found ? { matched: true, value: found.name } : { matched: false };
+        }
+        if (schema.type === 'number') {
+            const size = this.sizeOf(schema.format);
+            if (!new RegExp(`^[0-9a-f]{${size * 2}}$`, 'i').test(raw))
+                return { matched: false };
+            const unsigned = parseInt(raw, 16), signed = schema.format?.startsWith('int') && unsigned >= 2 ** (size * 8 - 1) ? unsigned - 2 ** (size * 8) : unsigned;
+            if ((schema.minimum !== undefined && signed < schema.minimum) || (schema.maximum !== undefined && signed > schema.maximum))
+                return { matched: false };
+            return { matched: true, value: signed * (schema.multiple ?? 1) };
+        }
+        return { matched: true, value: raw };
+    }
+    sizeOf(format) { const bits = Number(format?.match(/\d+/)?.[0] ?? 8); return Math.max(1, bits / 8); }
+}
+exports.MraRepository = MraRepository;

package/dist/platform.js

@@ -0,0 +1,618 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EchonetLitePlatform = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const EL = __importStar(require("echonet-lite"));
+const settings_1 = require("./settings");
+const logger_1 = require("./logger");
+const mra_1 = require("./mra");
+/** Direct ECHONET Lite platform. MQTT is intentionally not involved. */
+class EchonetLitePlatform {
+    config;
+    api;
+    cached = new Map();
+    pendingRemoval = [];
+    meterState = new Map();
+    logger;
+    mra = new mra_1.MraRepository();
+    rediscoveryTimer;
+    facilitySyncTimer;
+    deviceCacheTimer;
+    statePollTimer;
+    lastRediscovery = 0;
+    discovered = new Map();
+    constructor(log, config, api) {
+        this.config = config;
+        this.api = api;
+        this.logger = new logger_1.PluginLogger(log, config.logLevel ?? 'info');
+        api.on('didFinishLaunching', () => void this.start());
+        api.on('shutdown', () => {
+            if (this.rediscoveryTimer)
+                clearInterval(this.rediscoveryTimer);
+            if (this.facilitySyncTimer)
+                clearTimeout(this.facilitySyncTimer);
+            if (this.deviceCacheTimer)
+                clearTimeout(this.deviceCacheTimer);
+            if (this.statePollTimer)
+                clearInterval(this.statePollTimer);
+            try {
+                EL.release();
+            }
+            catch (error) {
+                this.logger.debug(`ECHONET Lite終了処理エラー: ${String(error)}`);
+            }
+        });
+    }
+    configureAccessory(a) {
+        const id = a.context?.ip && a.context?.eoj ? `${a.context.ip}-${a.context.eoj}` : '';
+        if (id && !this.allowed(id, a.context.ip, a.context.eoj)) {
+            this.pendingRemoval.push(a);
+            return;
+        }
+        this.cached.set(a.UUID, a);
+    }
+    async start() {
+        try {
+            // The running child bridge has now loaded the saved configuration.
+            // Clearing this marker lets the custom UI safely enable rediscovery.
+            try {
+                node_fs_1.default.rmSync(node_path_1.default.join(this.api.user.storagePath(), 'echonet-lite-plus-restart-required'), { force: true });
+            }
+            catch { /* UI marker is optional */ }
+            if (this.pendingRemoval.length) {
+                this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, this.pendingRemoval);
+                this.logger.info(`設定により${this.pendingRemoval.length}台をHomeKitから除外しました`);
+                this.pendingRemoval.length = 0;
+            }
+            this.logger.info('ECHONET Lite直接通信を開始します（UDP/3610）');
+            EL.initialize(['05ff01'], ((r, e, error) => {
+                if (error) {
+                    this.logger.warn(`ECHONET Lite受信処理エラー: ${String(error)}`);
+                    return;
+                }
+                if (!e)
+                    return;
+                try {
+                    this.receive(r, e);
+                }
+                catch (receiveError) {
+                    this.logger.error(`ECHONET Lite機器の処理に失敗しました: ${String(receiveError)}`);
+                }
+            }), 4, {
+                v4: this.config.targetNetwork, ignoreMe: true, autoGetProperties: false, debugMode: false,
+            });
+            for (const ip of this.config.knownDeviceIps ?? [])
+                EL.sendOPC1(ip, '05ff01', '0ef001', EL.GET, 'd6', '');
+            if (this.config.autoDiscovery !== false) {
+                this.logger.info('ECHONET Lite機器を探索しています');
+                EL.search();
+            }
+            this.watchRediscoveryRequests();
+            this.startStatePolling();
+        }
+        catch (e) {
+            this.logger.error(`ECHONET Liteの初期化に失敗しました: ${String(e)}`);
+        }
+    }
+    watchRediscoveryRequests() {
+        const marker = node_path_1.default.join(this.api.user.storagePath(), 'echonet-lite-plus-rediscover.json');
+        try {
+            this.lastRediscovery = JSON.parse(node_fs_1.default.readFileSync(marker, 'utf8')).requestedAt ?? 0;
+        }
+        catch { /* no previous request */ }
+        this.rediscoveryTimer = setInterval(() => {
+            try {
+                const request = JSON.parse(node_fs_1.default.readFileSync(marker, 'utf8'));
+                if ((request.requestedAt ?? 0) > this.lastRediscovery) {
+                    this.lastRediscovery = request.requestedAt;
+                    this.rediscover();
+                    node_fs_1.default.rmSync(marker, { force: true });
+                }
+            }
+            catch { /* The marker is created by the UI on first use. */ }
+        }, 1000);
+    }
+    rediscover() {
+        this.logger.info('UIからECHONET Lite機器の再探索を開始しました');
+        for (const ip of this.config.knownDeviceIps ?? [])
+            EL.sendOPC1(ip, '05ff01', '0ef001', EL.GET, 'd6', '');
+        EL.search();
+        this.scheduleFacilitySync();
+    }
+    startStatePolling() {
+        const seconds = Number(this.config.pollInterval ?? 60);
+        if (!Number.isFinite(seconds) || seconds <= 0)
+            return;
+        const interval = Math.max(30, seconds);
+        this.logger.info(`ECHONET Lite機器の状態を${interval}秒間隔で更新します`);
+        this.statePollTimer = setInterval(() => this.pollDeviceStates(), interval * 1000);
+    }
+    pollDeviceStates() {
+        for (const device of this.discovered.values()) {
+            if (!this.allowed(device.id, device.ip, device.eoj))
+                continue;
+            const selected = this.config.deviceSettings?.find(x => x.id === device.id)?.properties;
+            const epcs = (Array.isArray(selected) ? selected : Object.keys(device.properties)).map(epc => epc.toLowerCase()).filter(epc => !['9d', '9e', '9f'].includes(epc) && this.mra.isReadable(device.eoj, epc));
+            for (let offset = 0; offset < epcs.length; offset += 10) {
+                const details = epcs.slice(offset, offset + 10).map(epc => ({ [epc]: '' }));
+                if (details.length)
+                    try {
+                        EL.sendDetails(device.ip, '05ff01', device.eoj, EL.GET, details);
+                    }
+                    catch (error) {
+                        this.logger.debug(`状態更新要求の送信に失敗しました: ${device.ip} / ${device.eoj}: ${String(error)}`);
+                    }
+            }
+        }
+    }
+    receive(r, e) {
+        // INF/GET_RESは非常に多いため受信電文そのものはdebugに限定する。
+        this.logger.debug(`recv ${r.address} ${e.SEOJ} ESV=${e.ESV} ${JSON.stringify(e.DETAILs)}`);
+        if (e.SEOJ === '0ef001') {
+            const list = e.DETAILs?.d6;
+            if (typeof list === 'string' && list.length >= 2) {
+                const count = parseInt(list.slice(0, 2), 16);
+                for (let i = 0; i < count; i++) {
+                    const eoj = list.slice(2 + i * 6, 8 + i * 6);
+                    if (/^[0-9a-f]{6}$/i.test(eoj))
+                        EL.sendDetails(r, '05ff01', eoj, EL.GET, [{ '9d': '' }, { '9e': '' }, { '9f': '' }]);
+                }
+            }
+            this.scheduleFacilitySync();
+            return;
+        }
+        const map = e.DETAILs?.['9f'];
+        if (typeof map === 'string') {
+            const details = this.propertyRequests(map);
+            if (Object.keys(details).length)
+                EL.sendDetails(r, '05ff01', e.SEOJ, EL.GET, details);
+        }
+        this.recordDevice(r.address, e.SEOJ, e.DETAILs);
+        const id = `${r.address}-${e.SEOJ}`;
+        if (!this.allowed(id, r.address, e.SEOJ)) {
+            this.logger.debug(`機器をフィルターにより除外しました: ${r.address} / ${e.SEOJ}`);
+            return;
+        }
+        this.logger.debug(`ECHONET Lite機器を検出しました: ${r.address} / ${e.SEOJ}`);
+        const a = this.accessory(id, r.address, e.SEOJ);
+        this.cacheDetectedProperties(a, id);
+        this.apply(a, r.address, e.SEOJ, this.selectedDetails(id, e.DETAILs));
+    }
+    recordDevice(ip, eoj, details) {
+        const id = `${ip}-${eoj}`, existing = this.discovered.get(id), current = existing ?? { id, ip, eoj, name: this.className(eoj), properties: {} };
+        let changed = !existing;
+        for (const epc of Object.keys(details))
+            if (!['9d', '9e', '9f'].includes(epc.toLowerCase())) {
+                const description = this.mra.describe(eoj, epc) ?? { name: epc.toUpperCase(), ja: `EPC ${epc.toUpperCase()}`, en: `EPC ${epc.toUpperCase()}` };
+                if (JSON.stringify(current.properties[epc]) !== JSON.stringify(description)) {
+                    current.properties[epc] = description;
+                    changed = true;
+                }
+            }
+        this.discovered.set(id, current);
+        if (changed)
+            this.scheduleDeviceCacheWrite();
+    }
+    scheduleDeviceCacheWrite() {
+        if (this.deviceCacheTimer)
+            clearTimeout(this.deviceCacheTimer);
+        this.deviceCacheTimer = setTimeout(() => this.writeDeviceCache(), 250);
+    }
+    writeDeviceCache() {
+        const file = node_path_1.default.join(this.api.user.storagePath(), 'echonet-lite-plus-devices.json'), temporary = `${file}.tmp`;
+        try {
+            const devices = [...this.discovered.values()], payload = { updatedAt: Date.now(), devices };
+            node_fs_1.default.writeFileSync(temporary, JSON.stringify(payload));
+            node_fs_1.default.renameSync(temporary, file);
+            const carriers = [...this.cached.values()];
+            for (const accessory of carriers)
+                accessory.context.echonetDiscoveredDevices = devices;
+            if (carriers.length)
+                this.api.updatePlatformAccessories(carriers);
+            this.logger.info(`検出機器一覧を更新しました: ${this.discovered.size}台`);
+        }
+        catch (error) {
+            this.logger.debug(`機器一覧の保存に失敗しました: ${String(error)}`);
+        }
+    }
+    selectedDetails(id, details) {
+        const selected = this.config.deviceSettings?.find(x => x.id === id)?.properties;
+        if (!Array.isArray(selected))
+            return details;
+        const dependencies = new Set(selected);
+        if (selected.includes('e0')) {
+            dependencies.add('d3');
+            dependencies.add('e1');
+        }
+        return Object.fromEntries(Object.entries(details).filter(([epc]) => dependencies.has(epc)));
+    }
+    cacheDetectedProperties(a, id) {
+        const properties = this.discovered.get(id)?.properties;
+        if (!properties)
+            return;
+        if (JSON.stringify(a.context.detectedProperties) === JSON.stringify(properties))
+            return;
+        a.context.detectedProperties = properties;
+        this.api.updatePlatformAccessories([a]);
+    }
+    propertyRequests(map) {
+        const bytes = map.match(/../g)?.map(v => parseInt(v, 16)) ?? [];
+        const epcs = [];
+        if (bytes[0] <= 15) {
+            for (let i = 1; i <= bytes[0] && i < bytes.length; i++)
+                epcs.push(bytes[i].toString(16).padStart(2, '0'));
+        }
+        else
+            for (let i = 0; i < 16; i++)
+                for (let bit = 0; bit < 8; bit++)
+                    if ((bytes[i + 1] ?? 0) & (1 << bit))
+                        epcs.push(((bit + 8) * 16 + i).toString(16));
+        return Object.fromEntries(epcs.filter(epc => !['d6', '9d', '9e', '9f'].includes(epc)).map(epc => [epc, '']));
+    }
+    scheduleFacilitySync() {
+        if (this.facilitySyncTimer)
+            clearTimeout(this.facilitySyncTimer);
+        this.facilitySyncTimer = setTimeout(() => this.syncFacilities(), 5500);
+    }
+    syncFacilities() {
+        for (const [ip, objects] of Object.entries(EL.facilities ?? {}))
+            for (const [eoj, details] of Object.entries(objects)) {
+                if (eoj.toLowerCase() === '0ef001')
+                    continue;
+                this.recordDevice(ip, eoj, details);
+                const id = `${ip}-${eoj}`;
+                if (!this.allowed(id, ip, eoj))
+                    continue;
+                const a = this.accessory(id, ip, eoj);
+                this.cacheDetectedProperties(a, id);
+                this.apply(a, ip, eoj, this.selectedDetails(id, details));
+            }
+    }
+    allowed(id, ip, eoj) {
+        const keys = [id, ip, eoj];
+        return this.supportedClass(eoj) && this.meterAllowed(eoj) && this.config.deviceSettings?.find(x => x.id === id)?.enabled === true && (!this.config.includeDevices?.length || keys.some(k => this.config.includeDevices.includes(k))) && !keys.some(k => this.config.excludeDevices?.includes(k));
+    }
+    supportedClass(eoj) { return new Set(['0011', '0012', '0130', '0133', '0134', '0135', '0263', '026b', '026f', '0272', '0273', '0279', '027b', '027e', '0280', '0281', '0282', '0287', '0288', '0290', '0291', '02a6', '05fd']).has(eoj.slice(0, 4).toLowerCase()); }
+    meterAllowed(eoj) { const cls = eoj.slice(0, 4).toLowerCase(); return (this.config.meterDisplayMode ?? 'appleHome') === 'extended' || !['0279', '027e', '0280', '0282', '0287', '0288'].includes(cls); }
+    accessory(id, ip, eoj) {
+        const uuid = this.api.hap.uuid.generate(`echonet-lite:${id}`);
+        let a = this.cached.get(uuid);
+        const setting = this.config.deviceSettings?.find(x => x.id === id);
+        if (!a) {
+            a = new this.api.platformAccessory(setting?.name || this.className(eoj), uuid);
+            a.context = { ip, eoj };
+            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [a]);
+            this.cached.set(uuid, a);
+            this.logger.info(`機器を追加しました: ${ip} / ${eoj}`);
+        }
+        const displayName = setting?.name?.trim() || this.className(eoj);
+        a.displayName = displayName;
+        const info = a.getService(this.api.hap.Service.AccessoryInformation);
+        info.setCharacteristic(this.api.hap.Characteristic.Name, displayName)
+            .setCharacteristic(this.api.hap.Characteristic.Manufacturer, 'ECHONET Lite')
+            .setCharacteristic(this.api.hap.Characteristic.Model, `EOJ ${eoj.slice(0, 4).toUpperCase()}`)
+            .setCharacteristic(this.api.hap.Characteristic.SerialNumber, id);
+        return a;
+    }
+    className(eoj) { const device = this.mra.device(eoj); return device?.className.ja ?? device?.className.en ?? `ECHONET Lite ${eoj}`; }
+    service(a, eoj) {
+        const S = this.api.hap.Service;
+        const cls = eoj.slice(0, 4).toLowerCase();
+        const name = a.displayName || this.className(eoj);
+        if (cls === '0290' || cls === '0291')
+            return a.getService(S.Lightbulb) ?? a.addService(S.Lightbulb, name);
+        if (cls === '0011')
+            return a.getService(S.TemperatureSensor) ?? a.addService(S.TemperatureSensor, name);
+        if (cls === '0012')
+            return a.getService(S.HumiditySensor) ?? a.addService(S.HumiditySensor, name);
+        if (cls === '0130')
+            return a.getService(S.HeaterCooler) ?? a.addService(S.HeaterCooler, name);
+        if (cls === '0133' || cls === '0134' || cls === '0135')
+            return a.getService(S.Fanv2) ?? a.addService(S.Fanv2, name);
+        if (cls === '0263')
+            return a.getService(S.WindowCovering) ?? a.addService(S.WindowCovering, name);
+        if (cls === '026b' || cls === '0272')
+            return a.getServiceById(S.Switch, 'automatic-bath') ?? a.addService(S.Switch, `${name} 風呂自動`, 'automatic-bath');
+        if (cls === '026f')
+            return a.getService(S.LockMechanism) ?? a.addService(S.LockMechanism, name);
+        if (cls === '0273')
+            return a.getService(S.Fanv2) ?? a.addService(S.Fanv2, name);
+        if (cls === '027b')
+            return a.getService(S.Thermostat) ?? a.addService(S.Thermostat, name);
+        if (cls === '0279' || cls === '027e' || cls === '0280' || cls === '0287' || cls === '0288')
+            return this.energyService(a, name);
+        if (cls === '0281' && (this.config.meterDisplayMode ?? 'appleHome') === 'appleHome') {
+            const extended = a.services.find(service => service.UUID === '7A8C3201-3D84-4B4E-9A9E-000000002811');
+            if (extended)
+                a.removeService(extended);
+            return a.getServiceById(S.LeakSensor, 'water-meter-alarm') ?? a.addService(S.LeakSensor, name, 'water-meter-alarm');
+        }
+        if (cls === '0281') {
+            const leak = a.getServiceById(S.LeakSensor, 'water-meter-alarm');
+            if (leak)
+                a.removeService(leak);
+            return this.utilityMeterService(a, name, cls);
+        }
+        if (cls === '0282')
+            return this.utilityMeterService(a, name, cls);
+        if (cls === '02a6')
+            return a.getServiceById(S.Switch, 'automatic-water-heating') ?? a.addService(S.Switch, `${name} 自動沸き上げ`, 'automatic-water-heating');
+        if (cls === '05fd')
+            return a.getService(S.Switch) ?? a.addService(S.Switch, name);
+        throw new Error(`HomeKitサービス未対応の機器クラスです: ${cls}`);
+    }
+    apply(a, ip, eoj, d) {
+        const s = this.service(a, eoj), C = this.api.hap.Characteristic, cls = eoj.slice(0, 4).toLowerCase();
+        // SET_RES can contain an EPC with an empty EDT. It acknowledges the write,
+        // but does not carry a value and must not overwrite the HomeKit state.
+        const decoded = this.decodedDetails(eoj, d);
+        const on = decoded.operationStatus === true || decoded.operationStatus === 'true';
+        if (cls === '0290' || cls === '0291') {
+            if ('operationStatus' in decoded)
+                this.writable(s, C.On, on, v => this.setMra(ip, eoj, 'operationStatus', String(Boolean(v))));
+            if ('lightLevel' in decoded)
+                this.writable(s, C.Brightness, this.clamp(Number(decoded.lightLevel), 0, 100), v => this.setMra(ip, eoj, 'lightLevel', Number(v)));
+        }
+        else if (cls === '0130') {
+            if ('operationStatus' in decoded)
+                this.writable(s, C.Active, on ? C.Active.ACTIVE : C.Active.INACTIVE, v => this.setMra(ip, eoj, 'operationStatus', String(v === C.Active.ACTIVE)));
+            if ('roomTemperature' in decoded)
+                s.getCharacteristic(C.CurrentTemperature).updateValue(Number(decoded.roomTemperature));
+            if ('targetTemperature' in decoded) {
+                const temperature = Number(decoded.targetTemperature);
+                // ECHONET B3 is a shared target temperature. HomeKit gives its heating
+                // and cooling thresholds different defaults, so align both with B3.
+                s.getCharacteristic(C.CoolingThresholdTemperature).setProps({ minValue: 0, maxValue: 50, minStep: 1 });
+                s.getCharacteristic(C.HeatingThresholdTemperature).setProps({ minValue: 0, maxValue: 50, minStep: 1 });
+                this.writable(s, C.CoolingThresholdTemperature, temperature, v => this.setMra(ip, eoj, 'targetTemperature', Number(v)));
+                this.writable(s, C.HeatingThresholdTemperature, temperature, v => this.setMra(ip, eoj, 'targetTemperature', Number(v)));
+            }
+            const mode = decoded.operationMode;
+            if ('operationMode' in decoded) {
+                const target = mode === 'cooling' ? C.TargetHeaterCoolerState.COOL : mode === 'heating' ? C.TargetHeaterCoolerState.HEAT : C.TargetHeaterCoolerState.AUTO;
+                this.writable(s, C.TargetHeaterCoolerState, target, v => this.setMra(ip, eoj, 'operationMode', v === C.TargetHeaterCoolerState.COOL ? 'cooling' : v === C.TargetHeaterCoolerState.HEAT ? 'heating' : 'auto'));
+            }
+            const current = !on ? C.CurrentHeaterCoolerState.INACTIVE : mode === 'cooling' ? C.CurrentHeaterCoolerState.COOLING : mode === 'heating' ? C.CurrentHeaterCoolerState.HEATING : C.CurrentHeaterCoolerState.IDLE;
+            s.getCharacteristic(C.CurrentHeaterCoolerState).updateValue(current);
+        }
+        else if (cls === '0133' || cls === '0134' || cls === '0135') {
+            if ('operationStatus' in decoded)
+                this.writable(s, C.Active, on ? C.Active.ACTIVE : C.Active.INACTIVE, v => this.setMra(ip, eoj, 'operationStatus', String(v === C.Active.ACTIVE)));
+        }
+        else if (cls === '0263') {
+            const degree = Number(decoded.degreeOfOpening);
+            if (Number.isFinite(degree))
+                s.getCharacteristic(C.CurrentPosition).updateValue(this.clamp(degree, 0, 100));
+            const status = decoded.openCloseStatus;
+            if (status === 'fullyOpen') {
+                s.getCharacteristic(C.CurrentPosition).updateValue(100);
+                s.getCharacteristic(C.TargetPosition).updateValue(100);
+            }
+            else if (status === 'fullyClosed') {
+                s.getCharacteristic(C.CurrentPosition).updateValue(0);
+                s.getCharacteristic(C.TargetPosition).updateValue(0);
+            }
+            const positionState = status === 'opening' ? C.PositionState.INCREASING : status === 'closing' ? C.PositionState.DECREASING : C.PositionState.STOPPED;
+            s.getCharacteristic(C.PositionState).updateValue(positionState);
+            const target = s.getCharacteristic(C.TargetPosition);
+            target.removeOnSet();
+            target.onSet(value => {
+                const requested = this.clamp(Number(value), 0, 100);
+                if ('degreeOfOpening' in decoded)
+                    this.setMra(ip, eoj, 'degreeOfOpening', requested);
+                else
+                    this.setMra(ip, eoj, 'openCloseOperation', requested > Number(s.getCharacteristic(C.CurrentPosition).value ?? 0) ? 'open' : 'close');
+            });
+            const hold = s.getCharacteristic(C.HoldPosition);
+            hold.removeOnSet();
+            hold.onSet(value => { if (Boolean(value))
+                this.setMra(ip, eoj, 'openCloseOperation', 'stop'); });
+        }
+        else if (cls === '026b' || cls === '0272') {
+            if ('automaticBathOperation' in decoded)
+                this.writable(s, C.On, decoded.automaticBathOperation === 'true' || decoded.automaticBathOperation === true, v => this.setMra(ip, eoj, 'automaticBathOperation', String(Boolean(v))));
+        }
+        else if (cls === '026f') {
+            if ('e0' in d) {
+                const secured = d['e0'].toLowerCase() === '41';
+                s.getCharacteristic(C.LockCurrentState).updateValue(secured ? C.LockCurrentState.SECURED : C.LockCurrentState.UNSECURED);
+                this.writable(s, C.LockTargetState, secured ? C.LockTargetState.SECURED : C.LockTargetState.UNSECURED, v => this.set(ip, eoj, 'e0', v === C.LockTargetState.SECURED ? '41' : '42'));
+            }
+        }
+        else if (cls === '0273') {
+            this.applyBathroomDryer(a, s, ip, eoj, decoded);
+        }
+        else if (cls === '027b') {
+            s.getCharacteristic(C.TargetHeatingCoolingState).setProps({ validValues: [C.TargetHeatingCoolingState.OFF, C.TargetHeatingCoolingState.HEAT] });
+            if ('operationStatus' in decoded) {
+                s.getCharacteristic(C.CurrentHeatingCoolingState).updateValue(on ? C.CurrentHeatingCoolingState.HEAT : C.CurrentHeatingCoolingState.OFF);
+                this.writable(s, C.TargetHeatingCoolingState, on ? C.TargetHeatingCoolingState.HEAT : C.TargetHeatingCoolingState.OFF, v => this.setMra(ip, eoj, 'operationStatus', String(v !== C.TargetHeatingCoolingState.OFF)));
+            }
+            if (typeof decoded.measuredRoomTemperature === 'number')
+                s.getCharacteristic(C.CurrentTemperature).updateValue(decoded.measuredRoomTemperature);
+            else if (typeof decoded.measuredFloorTemperature === 'number')
+                s.getCharacteristic(C.CurrentTemperature).updateValue(decoded.measuredFloorTemperature);
+            if (typeof decoded.targetTemperature1 === 'number')
+                this.writable(s, C.TargetTemperature, decoded.targetTemperature1, v => this.setMra(ip, eoj, 'targetTemperature1', Number(v)));
+            s.getCharacteristic(C.TemperatureDisplayUnits).updateValue(C.TemperatureDisplayUnits.CELSIUS);
+        }
+        else if (cls === '0279')
+            this.applySolar(s, decoded);
+        else if (cls === '027e')
+            this.applyEvCharger(s, decoded);
+        else if (cls === '0280' || cls === '0287' || cls === '0288')
+            this.applyEnergy(a, s, cls, d);
+        else if (cls === '0281' || cls === '0282')
+            this.applyUtilityMeter(a, s, cls, d);
+        else if (cls === '0011' && 'value' in decoded)
+            s.getCharacteristic(C.CurrentTemperature).updateValue(Number(decoded.value));
+        else if (cls === '0012' && 'value' in decoded)
+            s.getCharacteristic(C.CurrentRelativeHumidity).updateValue(this.clamp(Number(decoded.value), 0, 100));
+        else if (cls === '02a6' && 'automaticWaterHeating' in decoded) {
+            const enabled = decoded.automaticWaterHeating !== 'manualNotHeating';
+            this.writable(s, C.On, enabled, v => this.setMra(ip, eoj, 'automaticWaterHeating', Boolean(v) ? 'auto' : 'manualNotHeating'));
+        }
+        else if (cls === '05fd' && 'operationStatus' in decoded)
+            this.writable(s, C.On, on, v => this.setMra(ip, eoj, 'operationStatus', String(Boolean(v))));
+    }
+    decodedDetails(eoj, d) {
+        return Object.fromEntries(Object.entries(d).filter(([, raw]) => typeof raw === 'string' && raw.length > 0 && raw.length % 2 === 0 && /^[0-9a-f]+$/i.test(raw)).map(([epc, raw]) => { const p = this.mra.decode(eoj, epc, raw); return [p?.name ?? epc, p?.value ?? raw]; }));
+    }
+    writable(s, type, value, setter) { const c = s.getCharacteristic(type); c.updateValue(value); c.removeOnSet(); c.onSet(setter); }
+    applyBathroomDryer(a, s, ip, eoj, decoded) {
+        const C = this.api.hap.Characteristic, S = this.api.hap.Service, mode = String(decoded.operationSetting ?? 'stop');
+        this.writable(s, C.Active, mode === 'stop' ? C.Active.INACTIVE : C.Active.ACTIVE, value => this.setMra(ip, eoj, 'operationSetting', value === C.Active.ACTIVE ? 'ventilation' : 'stop'));
+        const modes = [['ventilation', '換気'], ['prewarming', '予備暖房'], ['heating', '暖房'], ['drying', '乾燥'], ['circulation', '涼風']];
+        for (const [value, label] of modes) {
+            const service = a.getServiceById(S.Switch, `bathroom-${value}`) ?? a.addService(S.Switch, `${a.displayName} ${label}`, `bathroom-${value}`);
+            this.writable(service, C.On, mode === value, on => { if (Boolean(on))
+                this.setMra(ip, eoj, 'operationSetting', value);
+            else if (mode === value)
+                this.setMra(ip, eoj, 'operationSetting', 'stop'); });
+        }
+    }
+    clamp(value, min, max) { return Math.min(max, Math.max(min, value)); }
+    hexNumber(v) { const n = parseInt(v, 16); return Number.isFinite(n) ? n : 0; }
+    signedShort(v) { const n = this.hexNumber(v.slice(-4)); return n > 32767 ? n - 65536 : n; }
+    energyService(a, name) {
+        const uuid = 'E863F117-079E-48FF-8F27-9C2605A29F52';
+        const current = a.services.find(s => s.UUID === uuid);
+        if (current)
+            return current;
+        const service = new this.api.hap.Service(name, uuid, 'energy');
+        a.addService(service);
+        return service;
+    }
+    utilityMeterService(a, name, cls) {
+        const uuid = cls === '0281' ? '7A8C3201-3D84-4B4E-9A9E-000000002811' : '7A8C3201-3D84-4B4E-9A9E-000000002821';
+        const current = a.services.find(s => s.UUID === uuid);
+        if (current)
+            return current;
+        const service = new this.api.hap.Service(name, uuid, cls);
+        a.addService(service);
+        return service;
+    }
+    meterCharacteristic(s, name, uuid, unit) {
+        let c = s.characteristics.find(x => x.UUID === uuid);
+        if (!c) {
+            c = new this.api.hap.Characteristic(name, uuid, { format: "float" /* this.api.hap.Formats.FLOAT */, perms: ["pr" /* this.api.hap.Perms.PAIRED_READ */, "ev" /* this.api.hap.Perms.NOTIFY */], unit });
+            s.addCharacteristic(c);
+        }
+        return c;
+    }
+    applyEnergy(a, s, cls, d) {
+        const key = a.UUID, state = this.meterState.get(key) ?? { coefficient: 1, unit: 1 };
+        if ('d3' in d)
+            state.coefficient = this.hexNumber(d['d3']) || 1;
+        if ('e1' in d)
+            state.unit = this.energyUnit(d['e1']);
+        this.meterState.set(key, state);
+        // Smart meter: E7=instantaneous W, E8=R/T current (0.1A), E0=cumulative value.
+        if ('e7' in d)
+            this.meterCharacteristic(s, '現在の消費電力', 'E863F10D-079E-48FF-8F27-9C2605A29F52', 'W').updateValue(this.signedInt(d['e7']));
+        if ('e8' in d) {
+            const r = this.signedShort(d['e8'].slice(0, 4)) / 10, t = this.signedShort(d['e8'].slice(4, 8)) / 10;
+            this.meterCharacteristic(s, '電流', 'E863F126-079E-48FF-8F27-9C2605A29F52', 'A').updateValue(t >= 0 && t < 3276.6 ? r + t : r);
+        }
+        if ('e0' in d)
+            this.meterCharacteristic(s, '積算電力量', 'E863F10C-079E-48FF-8F27-9C2605A29F52', 'kWh').updateValue(this.hexNumber(d['e0']) * state.coefficient * state.unit);
+        // Distribution board: B7 is the channel list of instantaneous power values.
+        if (cls === '0287' && 'b7' in d) {
+            const values = this.channelValues(d['b7']);
+            const total = values.reduce((sum, v) => sum + v, 0);
+            this.meterCharacteristic(s, '現在の消費電力', 'E863F10D-079E-48FF-8F27-9C2605A29F52', 'W').updateValue(total);
+        }
+    }
+    applySolar(s, decoded) {
+        if (typeof decoded.instantaneousElectricPowerGeneration === 'number')
+            this.meterCharacteristic(s, '現在の発電電力', '7A8C3279-3D84-4B4E-9A9E-000000000001', 'W').updateValue(decoded.instantaneousElectricPowerGeneration);
+        if (typeof decoded.cumulativeElectricEnergyOfGeneration === 'number')
+            this.meterCharacteristic(s, '積算発電電力量', '7A8C3279-3D84-4B4E-9A9E-000000000002', 'kWh').updateValue(decoded.cumulativeElectricEnergyOfGeneration);
+        if (typeof decoded.cumulativeElectricEnergySold === 'number')
+            this.meterCharacteristic(s, '積算売電電力量', '7A8C3279-3D84-4B4E-9A9E-000000000003', 'kWh').updateValue(decoded.cumulativeElectricEnergySold);
+    }
+    applyEvCharger(s, decoded) {
+        if (typeof decoded.instantaneousElectricPower === 'number')
+            this.meterCharacteristic(s, '充放電電力', '7A8C327E-3D84-4B4E-9A9E-000000000001', 'W').updateValue(decoded.instantaneousElectricPower);
+        if (typeof decoded.remainingCapacity1 === 'number')
+            this.meterCharacteristic(s, '充放電可能残量', '7A8C327E-3D84-4B4E-9A9E-000000000002', 'Wh').updateValue(decoded.remainingCapacity1);
+        if (typeof decoded.usedCapacity1 === 'number')
+            this.meterCharacteristic(s, '使用電力量', '7A8C327E-3D84-4B4E-9A9E-000000000003', 'Wh').updateValue(decoded.usedCapacity1);
+    }
+    signedInt(v) { const n = this.hexNumber(v.slice(-8)); return n > 0x7fffffff ? n - 0x100000000 : n; }
+    energyUnit(v) { return { '00': 1, '01': 0.1, '02': 0.01, '03': 0.001, '04': 0.0001, '0a': 10, '0b': 100, '0c': 1000, '0d': 10000 }[v.slice(-2).toLowerCase()] ?? 1; }
+    channelValues(v) { const range = this.hexNumber(v.slice(2, 4)); const result = []; for (let i = 0; i < range; i++) {
+        const raw = v.slice(4 + i * 8, 12 + i * 8);
+        if (raw.length === 8 && raw.toLowerCase() !== 'fffffffe')
+            result.push(this.signedInt(raw));
+    } return result; }
+    applyUtilityMeter(a, s, cls, d) {
+        if (cls === '0281') {
+            const appleMode = (this.config.meterDisplayMode ?? 'appleHome') === 'appleHome';
+            const unit = 'e1' in d ? this.waterUnit(d['e1']) : 1;
+            if (!appleMode && 'e0' in d)
+                this.meterCharacteristic(s, '積算水道使用量', '7A8C3210-3D84-4B4E-9A9E-000000002811', 'm³').updateValue(this.hexNumber(d['e0']) * unit);
+            if ('e3' in d) {
+                const abnormal = d['e3'].slice(-2).toLowerCase() === '41';
+                if (!appleMode)
+                    this.meterCharacteristic(s, '検針データ異常', '7A8C3211-3D84-4B4E-9A9E-000000002811', '').updateValue(abnormal ? 1 : 0);
+                const leak = appleMode ? s : (a.getServiceById(this.api.hap.Service.LeakSensor, 'water-meter-alarm') ?? a.addService(this.api.hap.Service.LeakSensor, '水道メーター異常', 'water-meter-alarm'));
+                leak.getCharacteristic(this.api.hap.Characteristic.LeakDetected).updateValue(abnormal ? this.api.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.api.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED);
+            }
+        }
+        else if ('e0' in d)
+            this.meterCharacteristic(s, '積算ガス使用量', '7A8C3220-3D84-4B4E-9A9E-000000002821', 'm³').updateValue(this.hexNumber(d['e0']) * 0.001);
+    }
+    waterUnit(v) { return { '00': 0.001, '01': 0.01, '02': 0.1, '03': 1, '04': 10, '05': 100, '06': 1000 }[v.slice(-2).toLowerCase()] ?? 1; }
+    set(ip, eoj, epc, edt) {
+        this.logger.info(`操作を送信: ${ip} ${eoj} EPC=${epc}`);
+        try {
+            EL.sendOPC1(ip, '05ff01', eoj, EL.SETC, epc, String(edt));
+        }
+        catch (error) {
+            this.logger.error(`ECHONET Lite操作の送信に失敗しました: ${String(error)}`);
+        }
+    }
+    setMra(ip, eoj, name, value) { const encoded = this.mra.encode(eoj, name, value); if (!encoded) {
+        this.logger.warn(`MRAで書込値を変換できません: ${eoj}.${name}`);
+        return;
+    } this.set(ip, eoj, encoded.epc, encoded.edt); }
+}
+exports.EchonetLitePlatform = EchonetLitePlatform;

package/dist/settings.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PLATFORM_NAME = exports.PLUGIN_NAME = void 0;
+exports.PLUGIN_NAME = 'homebridge-echonet-lite-plus';
+exports.PLATFORM_NAME = 'ECHONETLitePlus';

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/homebridge-ui/public/index.html

@@ -0,0 +1,103 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <link rel="stylesheet" href="style.css?v=0.7.0">
+</head>
+<body>
+  <div class="elsp-shell">
+  <div class="elsp-heading"><div><h3>ECHONET Lite Plus</h3><p id="intro" class="text-muted"></p></div><div><label id="languageLabel" for="language" class="visually-hidden"></label><select id="language" class="form-select elsp-language"><option value="auto">Auto</option><option value="ja">日本語</option><option value="en">English</option></select></div></div>
+  <details class="elsp-section" open><summary id="basicTitle"></summary><div class="elsp-section-body elsp-grid">
+    <div class="elsp-field"><label id="nameLabel"></label><input id="name"></div>
+    <div class="elsp-field"><label id="networkLabel"></label><input id="targetNetwork" placeholder="192.168.1.10"><span class="help" id="networkHelp"></span></div>
+    <div class="elsp-field"><label id="meterModeLabel"></label><select id="meterDisplayMode"><option value="appleHome"></option><option value="extended"></option></select><span class="help" id="meterModeHelp"></span></div>
+  </div></details>
+  <details class="elsp-section" open><summary id="networkTitle"></summary><div class="elsp-section-body elsp-grid">
+    <div class="elsp-field check"><input id="autoDiscovery" type="checkbox"><label id="discoveryLabel" for="autoDiscovery"></label></div>
+    <div class="elsp-field"><label id="ipsLabel"></label><input id="knownDeviceIps" placeholder="192.168.1.100, 192.168.1.101"><span class="help" id="ipsHelp"></span></div>
+    <div class="elsp-actions"><button id="rediscover" type="button" class="btn btn-outline-primary btn-sm"></button><span id="restartRequired" class="help" hidden></span></div>
+  </div></details>
+  <details class="elsp-section" open><summary id="devicesTitle"></summary><div class="elsp-section-body">
+    <p class="help" id="devicesHelp"></p>
+    <div id="deviceList" class="elsp-device-list"></div>
+  </div></details>
+  <details class="elsp-section" open><summary id="filterTitle"></summary><div class="elsp-section-body">
+    <div class="elsp-field"><label id="includeLabel"></label><input id="includeDevices"><span class="help" id="filterHelp"></span></div>
+    <div class="elsp-field"><label id="excludeLabel"></label><input id="excludeDevices"></div>
+  </div></details>
+  <details class="elsp-section"><summary id="loggingTitle"></summary><div class="elsp-section-body elsp-grid">
+    <div class="elsp-field"><label id="pollLabel"></label><select id="pollInterval"><option value="0"></option><option value="30"></option><option value="60"></option><option value="300"></option></select><span class="help" id="pollHelp"></span></div>
+    <div class="elsp-field"><label id="logLabel"></label><select id="logLevel"><option value="error">Error</option><option value="warn">Warning</option><option value="info">Info</option><option value="debug">Debug</option></select><span class="help" id="logHelp"></span></div>
+  </div></details>
+  </div>
+  <script>
+    const text={
+      en:{intro:'Directly discover ECHONET Lite devices on your LAN. MQTT is not required.',languageLabel:'UI Language',basicTitle:'Basic Settings',networkTitle:'Device Discovery',devicesTitle:'Discovered Devices',devicesHelp:'New devices are off by default. Enable only the devices to publish to HomeKit, then save and restart the child bridge.',emptyDevices:'No devices discovered yet. Run device discovery first.',published:'Show in HomeKit',hiddenByMode:'Hidden in Apple Home Compatible mode',displayName:'HomeKit Name',properties:'Synchronized / controllable properties',meterModeLabel:'Meter Display Compatibility',meterModeHelp:'Apple Home hides unsupported meter tiles. Extended mode publishes measurements for apps such as Eve. Save and restart the child bridge after changing this mode.',meterApple:'Apple Home Compatible (Recommended)',meterExtended:'Extended Apps (Eve)',nameLabel:'Platform Name',networkLabel:'Network Interface',networkHelp:'Optional IPv4 interface address for hosts with multiple adapters.',discoveryLabel:'Enable automatic multicast discovery',ipsLabel:'Known Device IP Addresses',ipsHelp:'Comma-separated addresses for devices that do not respond to multicast.',filterTitle:'Advanced Device Filters',includeLabel:'Include Devices',excludeLabel:'Exclude Devices',filterHelp:'Optional comma-separated filter by IP address, EOJ, or internal ID. Devices must also be enabled above.',loggingTitle:'Updates & Logging',pollLabel:'State Update Interval',pollHelp:'Periodically requests selected readable properties from devices that do not send notifications.',pollOptions:['Off','30 seconds','60 seconds (Recommended)','5 minutes'],logLabel:'Log Level',logHelp:'Info is recommended. Push packets are shown only at Debug level.',rediscover:'Re-discover Devices',restartNotice:'Discovery request accepted. The device list will refresh shortly.',restartRequired:'Save the settings and restart the child bridge before rediscovery.',restartRequiredToast:'Settings have changed. Save and restart the child bridge before rediscovery.'},
+      ja:{intro:'LAN内のECHONET Lite機器を直接探索します。MQTTは不要です。',languageLabel:'UI言語',basicTitle:'基本設定',networkTitle:'機器探索',devicesTitle:'検出された機器',devicesHelp:'新しく検出した機器は初期状態でOFFです。HomeKitへ追加する機器だけをONにし、設定を保存してChild Bridgeを再起動してください。',emptyDevices:'機器はまだ検出されていません。先に機器を再探索してください。',published:'HomeKitに表示',hiddenByMode:'Appleホーム互換モードでは非表示',displayName:'HomeKit表示名',properties:'同期・操作する項目',meterModeLabel:'メーター表示互換性',meterModeHelp:'Appleホーム互換では非対応タイルを隠します。拡張モードはEveなどへ測定値を公開します。変更後は設定を保存してChild Bridgeを再起動してください。',meterApple:'Appleホーム互換（推奨）',meterExtended:'拡張アプリ（Eve）',nameLabel:'プラットフォーム名',networkLabel:'使用ネットワーク',networkHelp:'複数NIC環境で使用するIPv4インターフェースアドレスを指定します。',discoveryLabel:'マルチキャストによる自動探索を有効にする',ipsLabel:'既知の機器IP',ipsHelp:'自動探索へ応答しない機器をカンマ区切りで指定します。',filterTitle:'高度な機器フィルター',includeLabel:'追加する機器',excludeLabel:'除外する機器',filterHelp:'IP、EOJ、内部IDによる追加フィルターです。上の検出機器も個別にONにしてください。',loggingTitle:'更新とログ',pollLabel:'状態更新間隔',pollHelp:'通知を送らない機器から、選択した読取可能項目を定期取得します。',pollOptions:['無効','30秒','60秒（推奨）','5分'],logLabel:'ログレベル',logHelp:'通常はInfoを推奨します。push電文はDebugでのみ表示します。',rediscover:'機器を再探索',restartNotice:'再探索要求を受け付けました。機器一覧はしばらくすると更新されます。',restartRequired:'設定を保存してChild Bridgeを再起動してから再探索してください。',restartRequiredToast:'設定が変更されています。保存してChild Bridgeを再起動してから再探索してください。'}
+    };
+    text.en.notSupported='Detected (HomeKit mapping not supported yet)';
+    text.ja.notSupported='検出済み（HomeKit割り当て未対応）';
+    const ids=['intro','languageLabel','basicTitle','networkTitle','devicesTitle','devicesHelp','nameLabel','networkLabel','networkHelp','meterModeLabel','meterModeHelp','discoveryLabel','ipsLabel','ipsHelp','filterTitle','includeLabel','excludeLabel','filterHelp','loggingTitle','pollLabel','pollHelp','logLabel','logHelp','rediscover'];
+    const effective=()=>language.value==='auto'?(navigator.language.toLowerCase().startsWith('ja')?'ja':'en'):language.value;
+    function render(){const t=text[effective()];ids.forEach(id=>document.getElementById(id).textContent=t[id]);meterDisplayMode.options[0].textContent=t.meterApple;meterDisplayMode.options[1].textContent=t.meterExtended;[...pollInterval.options].forEach((option,index)=>option.textContent=t.pollOptions[index]);restartRequired.textContent=t.restartRequired;restartRequired.hidden=!needsRestart;if(discoveredDevices.length)renderDevices();homebridge.fixScrollHeight?.();}
+    const array=v=>v.split(',').map(x=>x.trim()).filter(Boolean);
+    const request=(route,timeout=3000)=>Promise.race([homebridge.request(route),new Promise((_,reject)=>setTimeout(()=>reject(new Error(`${route} timed out`)),timeout))]);
+    const defaults={platform:'ECHONETLitePlus',name:'ECHONET Lite',language:'auto',autoDiscovery:true,knownDeviceIps:[],includeDevices:[],excludeDevices:[],deviceSettings:[],meterDisplayMode:'appleHome',pollInterval:60,logLevel:'info'};
+    let discoveredDevices=[];
+    let baseConfig={};
+    let needsRestart=false;
+    async function load(){
+      const configs=await homebridge.getPluginConfig();
+      const missing=configs.length===0;
+      const c=missing?{...defaults}:{...defaults,...configs[0]};
+      baseConfig={...c};
+      if(missing)await homebridge.updatePluginConfig([baseConfig]);
+      language.value=c.language||'auto';name.value=c.name||'ECHONET Lite';targetNetwork.value=c.targetNetwork||'';meterDisplayMode.value=c.meterDisplayMode||'appleHome';pollInterval.value=String(c.pollInterval??60);autoDiscovery.checked=c.autoDiscovery!==false;knownDeviceIps.value=(c.knownDeviceIps||[]).join(', ');includeDevices.value=(c.includeDevices||[]).join(', ');excludeDevices.value=(c.excludeDevices||[]).join(', ');logLevel.value=c.logLevel||'info';render();homebridge.hideSpinner();request('/settings-status').then(status=>{needsRestart=Boolean(status?.restartRequired);render();}).catch(e=>console.warn(e));loadDevices().catch(e=>{console.error(e);renderDevices();});
+    }
+    language.addEventListener('change',()=>{render();update().catch(e=>homebridge.toast.error(String(e)));});
+    meterDisplayMode.addEventListener('change',render);
+    async function config(){return {...baseConfig,platform:'ECHONETLitePlus',name:name.value||'ECHONET Lite',language:language.value,targetNetwork:targetNetwork.value.trim()||undefined,meterDisplayMode:meterDisplayMode.value,pollInterval:Number(pollInterval.value),autoDiscovery:autoDiscovery.checked,knownDeviceIps:array(knownDeviceIps.value),includeDevices:array(includeDevices.value),excludeDevices:array(excludeDevices.value),deviceSettings:baseConfig.deviceSettings||[],logLevel:logLevel.value};}
+    async function update(){baseConfig=await config();await homebridge.updatePluginConfig([baseConfig]);homebridge.fixScrollHeight?.();}
+    function markRestartRequired(){if(needsRestart)return;needsRestart=true;render();request('/settings-changed').catch(e=>console.warn(e));}
+    let updateTimer;document.body.addEventListener('input',event=>{if(event.target.id==='language')return;markRestartRequired();clearTimeout(updateTimer);updateTimer=setTimeout(()=>update().catch(e=>homebridge.toast.error(String(e))),150);});
+    const esc=value=>String(value).replace(/[&<>"']/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c]));
+    const auxiliaryNames=new Set(['coefficient','unitForCumulativeElectricEnergy']);
+    function visibleProperties(device){return Object.entries(device.properties||{}).filter(([,meta])=>!auxiliaryNames.has(typeof meta==='string'?meta:meta.name));}
+    function propertyLabel(meta){if(typeof meta==='string')return meta;return meta?.[effective()]||meta?.name||'';}
+    function setting(device){let value=(baseConfig.deviceSettings||[]).find(x=>x.id===device.id);if(!value){value={id:device.id,name:device.name,enabled:false};const keys=visibleProperties(device).map(([epc])=>epc);if(keys.length)value.properties=keys;baseConfig.deviceSettings=[...(baseConfig.deviceSettings||[]),value];}return value;}
+    function hiddenByAppleMode(device){return meterDisplayMode.value==='appleHome'&&['0279','027e','0280','0282','0287','0288'].includes(String(device.eoj).slice(0,4).toLowerCase());}
+    function homeKitSupported(device){return ['0011','0012','0130','0133','0134','0135','0263','026b','026f','0272','0273','0279','027b','027e','0280','0281','0282','0287','0288','0290','0291','02a6','05fd'].includes(String(device.eoj).slice(0,4).toLowerCase());}
+    function renderDevices(){const t=text[effective()];deviceList.innerHTML=discoveredDevices.length?discoveredDevices.map((device,index)=>{const value=setting(device),properties=visibleProperties(device),selected=Array.isArray(value.properties)?value.properties:properties.map(([epc])=>epc),hidden=hiddenByAppleMode(device),supported=homeKitSupported(device),disabled=hidden||!supported,status=!supported?t.notSupported:hidden?t.hiddenByMode:t.published;return `<article class="elsp-device${disabled?' elsp-disabled':''}"><div class="elsp-device-head"><div><strong>${esc(device.name)}</strong><div class="help">${esc(device.ip)} · ${esc(device.eoj)}</div></div><label class="elsp-toggle"><input type="checkbox" data-device="${index}" data-role="enabled" ${value.enabled===true?'checked':''} ${disabled?'disabled':''}> ${status}</label></div><label>${t.displayName}<input data-device="${index}" data-role="name" value="${esc(value.name||device.name)}"></label>${properties.length?`<fieldset><legend>${t.properties}</legend><div class="elsp-properties">${properties.map(([epc,meta])=>`<label><input type="checkbox" data-device="${index}" data-property="${esc(epc)}" ${selected.includes(epc)?'checked':''}> ${esc(propertyLabel(meta))} <small>EPC ${esc(epc.toUpperCase())}</small></label>`).join('')}</div></fieldset>`:''}</article>`}).join(''):`<p class="help">${t.emptyDevices}</p>`;homebridge.fixScrollHeight?.();}
+    async function mergeDevices(liveDevices=[]){
+      const configured=(baseConfig.deviceSettings||[]).map(setting=>{const match=String(setting.id||'').match(/^(.*)-([0-9a-f]{6})$/i);return match?{id:setting.id,ip:match[1],eoj:match[2],name:setting.name||match[2],properties:{}}:null;}).filter(Boolean);
+      const cached=await homebridge.getCachedAccessories().catch(()=>[]);
+      const cachedDevices=(cached||[]).filter(a=>a.context?.ip&&a.context?.eoj).map(a=>({id:`${a.context.ip}-${a.context.eoj}`,ip:a.context.ip,eoj:a.context.eoj,name:a.displayName||a.context.eoj,properties:a.context.detectedProperties||{}}));
+      const cachedDiscovery=(cached||[]).flatMap(a=>Array.isArray(a.context?.echonetDiscoveredDevices)?a.context.echonetDiscoveredDevices:[]);
+      const merged=new Map();
+      for(const device of [...configured,...cachedDevices,...cachedDiscovery,...(Array.isArray(liveDevices)?liveDevices:[])])merged.set(device.id,{...(merged.get(device.id)||{}),...device,properties:{...(merged.get(device.id)?.properties||{}),...(device.properties||{})}});
+      discoveredDevices=[...merged.values()];
+      renderDevices();
+    }
+    async function loadDevices(retry=true){
+      let result;
+      try{result=await request('/devices',4000);}catch(error){console.warn(error);if(retry)setTimeout(()=>loadDevices(false).catch(e=>console.warn(e)),5000);}
+      const liveDevices=Array.isArray(result)?result:Array.isArray(result?.devices)?result.devices:Array.isArray(result?.data?.devices)?result.data.devices:[];
+      await mergeDevices(liveDevices);
+    }
+    deviceList.addEventListener('change',event=>{const input=event.target,index=Number(input.dataset.device),device=discoveredDevices[index];if(!device)return;const value=setting(device);if(input.dataset.role==='enabled')value.enabled=input.checked;else if(input.dataset.role==='name')value.name=input.value;else if(input.dataset.property){value.properties=value.properties||[];value.properties=input.checked?[...new Set([...value.properties,input.dataset.property])]:value.properties.filter(x=>x!==input.dataset.property);}update().catch(e=>homebridge.toast.error(String(e)));});
+    rediscover.addEventListener('click',async()=>{
+      if(needsRestart){homebridge.toast.error(text[effective()].restartRequiredToast);return;}
+      try{await update();}catch(e){homebridge.toast.error(String(e));return;}
+      homebridge.request('/rediscover')
+        .then(async result=>{if(result?.restartRequired){needsRestart=true;render();homebridge.toast.error(text[effective()].restartRequiredToast);return;}homebridge.toast.success(text[effective()].restartNotice);setTimeout(()=>loadDevices().catch(e=>homebridge.toast.error(String(e))),6500);})
+        .catch(e=>homebridge.toast.error(String(e)));
+      setTimeout(()=>loadDevices(false).catch(e=>console.warn(e)),6500);
+      homebridge.toast.info(text[effective()].restartNotice);
+    });
+    homebridge.addEventListener('echonet-devices',event=>mergeDevices(event.data?.devices).catch(e=>console.warn(e)));
+    homebridge.addEventListener('echonet-settings-status',event=>{needsRestart=Boolean(event.data?.restartRequired);render();});
+    homebridge.showSpinner();load().catch(e=>{homebridge.hideSpinner();render();renderDevices();homebridge.toast.error(String(e));});
+  </script>
+</body>
+</html>

package/homebridge-ui/public/style.css

@@ -0,0 +1,16 @@
+.elsp-shell{padding:.25rem}
+.elsp-heading{align-items:flex-start;display:flex;gap:1rem;justify-content:space-between;margin-bottom:1rem}
+.elsp-heading h3{margin-bottom:.25rem}.elsp-language{flex:0 0 9rem}
+.elsp-section{border:1px solid var(--bs-border-color,#ddd);border-radius:.5rem;margin-bottom:.75rem;overflow:hidden}
+.elsp-section summary{cursor:pointer;font-size:1.05rem;font-weight:600;padding:.9rem 1rem;user-select:none}
+.elsp-section-body{border-top:1px solid var(--bs-border-color,#ddd);padding:1rem}
+.elsp-grid{display:grid;gap:.9rem;grid-template-columns:minmax(0,1fr)}
+.elsp-field{display:block;margin:0;min-width:0;width:100%}.elsp-field label{display:block;font-weight:600;margin-bottom:.35rem}
+.elsp-field input:not([type=checkbox]),.elsp-field select{box-sizing:border-box;display:block;width:100%;padding:.5rem .75rem;border:1px solid var(--bs-border-color,#ced4da);border-radius:.375rem;background:var(--bs-body-bg,transparent);color:inherit}
+.elsp-field.check{align-items:center;display:flex}.elsp-field.check input{flex:0 0 auto;margin:0 .5rem 0 0}.elsp-field.check label{display:inline;margin:0}
+.help{display:block;font-size:.84rem;margin-top:.25rem;opacity:.7}
+.elsp-actions{display:flex;justify-content:flex-start;margin-top:.1rem}
+#rediscover{display:inline-block;margin:0;padding:.4rem .85rem;width:auto}
+.elsp-device-list{display:grid;gap:.8rem;margin-top:.8rem}.elsp-device{border:1px solid var(--bs-border-color,#ddd);border-radius:.5rem;padding:.85rem}.elsp-device-head{align-items:flex-start;display:flex;gap:1rem;justify-content:space-between;margin-bottom:.75rem}.elsp-device label{display:block;font-weight:600}.elsp-device input[type=text],.elsp-device input:not([type=checkbox]){box-sizing:border-box;display:block;margin-top:.3rem;width:100%;padding:.45rem .65rem}.elsp-toggle{white-space:nowrap}.elsp-device fieldset{border:0;margin:.8rem 0 0;padding:0}.elsp-device legend{font-size:.9rem;font-weight:600;margin-bottom:.4rem}.elsp-properties{display:grid;gap:.35rem;grid-template-columns:repeat(2,minmax(0,1fr))}.elsp-properties label{font-weight:400}.elsp-properties small{opacity:.6}
+.elsp-disabled{opacity:.65}.elsp-disabled .elsp-toggle{white-space:normal}
+@media(max-width:640px){.elsp-heading{display:block}.elsp-language{margin-top:.75rem;width:100%}.elsp-device-head{display:block}.elsp-toggle{margin-top:.5rem}.elsp-properties{grid-template-columns:1fr}}

package/homebridge-ui/server.js

@@ -0,0 +1,61 @@
+const fs = require('node:fs')
+const path = require('node:path')
+;(async () => {
+  const { HomebridgePluginUiServer } = await import('@homebridge/plugin-ui-utils')
+  class EchonetLiteUiServer extends HomebridgePluginUiServer {
+    constructor() {
+      super()
+      const storagePath = () => {
+        if (!this.homebridgeStoragePath) throw new Error('Homebridge storage path is unavailable')
+        return this.homebridgeStoragePath
+      }
+      const restartMarker = () => path.join(storagePath(), 'echonet-lite-plus-restart-required')
+      const deviceFile = () => path.join(storagePath(), 'echonet-lite-plus-devices.json')
+      const readDevices = () => {
+        const file = deviceFile()
+        try {
+          const result = JSON.parse(fs.readFileSync(file, 'utf8'))
+          if (!Array.isArray(result?.devices)) throw new Error('devices is not an array')
+          return result
+        } catch (error) {
+          if (error?.code === 'ENOENT') return { devices: [], updatedAt: 0 }
+          console.error(`ECHONET Lite device cache could not be read: ${file}: ${String(error)}`)
+          return { devices: [], updatedAt: 0 }
+        }
+      }
+      const pushDevices = () => this.pushEvent('echonet-devices', readDevices())
+      this.onRequest('/settings-changed', async () => {
+        fs.writeFileSync(restartMarker(), String(Date.now()))
+        this.pushEvent('echonet-settings-status', { restartRequired: true })
+        return { restartRequired: true }
+      })
+      this.onRequest('/settings-status', async () => {
+        const status = { restartRequired: fs.existsSync(restartMarker()) }
+        this.pushEvent('echonet-settings-status', status)
+        return status
+      })
+      this.onRequest('/rediscover', async () => {
+        if (fs.existsSync(restartMarker())) {
+          this.pushEvent('echonet-settings-status', { restartRequired: true })
+          return { accepted: false, restartRequired: true }
+        }
+        fs.writeFileSync(path.join(storagePath(), 'echonet-lite-plus-rediscover.json'), JSON.stringify({ requestedAt: Date.now() }))
+        setTimeout(pushDevices, 6500)
+        return { accepted: true }
+      })
+      this.onRequest('/devices', async () => {
+        const result = readDevices()
+        // Send the normal request response first, then provide the same list as
+        // a stream event. Some Homebridge UI/browser combinations have lost a
+        // request response while keeping the custom UI process alive.
+        setTimeout(() => this.pushEvent('echonet-devices', result), 0)
+        return result
+      })
+      this.ready()
+    }
+  }
+  new EchonetLiteUiServer()
+})().catch(error => {
+  console.error(error)
+  process.exitCode = 1
+})

package/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "homebridge-echonet-lite-plus",
+  "version": "0.7.0",
+  "description": "Expose ECHONET Lite devices directly to HomeKit",
+  "author": "ECHONET Lite Plus contributors",
+  "license": "MIT",
+  "homepage": "https://github.com/sylpied/homebridge-echonet-lite-plus#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sylpied/homebridge-echonet-lite-plus.git"
+  },
+  "bugs": {
+    "url": "https://github.com/sylpied/homebridge-echonet-lite-plus/issues"
+  },
+  "main": "dist/index.js",
+  "files": [
+    "dist",
+    "homebridge-ui",
+    "config.schema.json",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE",
+    "work/MRA_v1.4.0.zip"
+  ],
+  "keywords": [
+    "homebridge-plugin",
+    "echonet-lite",
+    "homekit",
+    "hems"
+  ],
+  "engines": {
+    "node": ">=18",
+    "homebridge": ">=1.6.0"
+  },
+  "scripts": {
+    "build": "rimraf dist && tsc",
+    "test": "jest --runInBand"
+  },
+  "dependencies": {
+    "@homebridge/plugin-ui-utils": "^2.2.5",
+    "adm-zip": "^0.5.16",
+    "echonet-lite": "^2.19.0"
+  },
+  "devDependencies": {
+    "@types/adm-zip": "^0.5.7",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.3",
+    "homebridge": "^1.11.0",
+    "jest": "^29.7.0",
+    "rimraf": "^6.0.1",
+    "ts-jest": "^29.3.2",
+    "typescript": "^5.8.3"
+  }
+}