matter-all-in-one-addon 2.3.13 → 2.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -12
- package/dist/camera/browser-preview.js +12 -10
- package/dist/camera/browser-preview.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-recording.delegate.d.ts +5 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js +14 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-stream.delegate.d.ts +8 -2
- package/dist/camera/homekit/homekit-camera-stream.delegate.js +113 -49
- package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera.accessory.js +17 -3
- package/dist/camera/homekit/homekit-camera.accessory.js.map +1 -1
- package/dist/camera/homekit/tuya-hap-talkback.d.ts +1 -0
- package/dist/camera/homekit/tuya-hap-talkback.js +11 -8
- package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
- package/dist/camera/matter/camera-endpoint.builder.js +31 -18
- package/dist/camera/matter/camera-endpoint.builder.js.map +1 -1
- package/dist/converters/binary_sensor.converter.d.ts +1 -1
- package/dist/converters/binary_sensor.converter.js +2 -2
- package/dist/converters/climate.converter.d.ts +14 -1
- package/dist/converters/climate.converter.js +44 -2
- package/dist/converters/climate.converter.js.map +1 -1
- package/dist/converters/sensor.converter.js +6 -6
- package/dist/converters/sensor.converter.js.map +1 -1
- package/dist/device-profiles.js +33 -2
- package/dist/device-profiles.js.map +1 -1
- package/dist/device-registry.js +12 -0
- package/dist/device-registry.js.map +1 -1
- package/dist/entities/air_quality.entity.js +24 -1
- package/dist/entities/air_quality.entity.js.map +1 -1
- package/dist/entities/base.entity.js +25 -5
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/climate.entity.d.ts +23 -0
- package/dist/entities/climate.entity.js +174 -0
- package/dist/entities/climate.entity.js.map +1 -0
- package/dist/entities/closure.entity.js +24 -1
- package/dist/entities/closure.entity.js.map +1 -1
- package/dist/entities/composite-device.entity.js +23 -7
- package/dist/entities/composite-device.entity.js.map +1 -1
- package/dist/entities/cooktop.entity.d.ts +1 -0
- package/dist/entities/cooktop.entity.js +18 -3
- package/dist/entities/cooktop.entity.js.map +1 -1
- package/dist/entities/energy_tariff.entity.js +16 -4
- package/dist/entities/energy_tariff.entity.js.map +1 -1
- package/dist/entities/humidifier.entity.d.ts +3 -0
- package/dist/entities/humidifier.entity.js +61 -45
- package/dist/entities/humidifier.entity.js.map +1 -1
- package/dist/entities/lock.entity.js +9 -5
- package/dist/entities/lock.entity.js.map +1 -1
- package/dist/entities/oven.entity.d.ts +2 -0
- package/dist/entities/oven.entity.js +50 -8
- package/dist/entities/oven.entity.js.map +1 -1
- package/dist/entities/soil_sensor.entity.js +2 -1
- package/dist/entities/soil_sensor.entity.js.map +1 -1
- package/dist/entities/vacuum.entity.js +4 -4
- package/dist/entities/vacuum.entity.js.map +1 -1
- package/dist/entities/valve.entity.js +29 -5
- package/dist/entities/valve.entity.js.map +1 -1
- package/dist/frontend/assets/CameraConfigModal-DnDZbkpj.js +6 -0
- package/dist/frontend/assets/CameraUiModal-DVCgRtyT.js +1 -0
- package/dist/frontend/assets/DeviceModal-DFgXDEzB.js +5 -0
- package/dist/frontend/assets/QRCodeDisplay-B3RFLtWz.js +8 -0
- package/dist/frontend/assets/ScryptedModal-DZ4B2NLt.js +1 -0
- package/dist/frontend/assets/SettingsModal-BBflJWuJ.js +2 -0
- package/dist/frontend/assets/clipboard-CnKYMNaq.js +1 -0
- package/dist/frontend/assets/index-CONl6ATp.js +10 -0
- package/dist/frontend/index.html +1 -1
- package/dist/hap/hap-generic-accessory.d.ts +6 -0
- package/dist/hap/hap-generic-accessory.js +641 -26
- package/dist/hap/hap-generic-accessory.js.map +1 -1
- package/dist/homeAssistant.d.ts +1 -0
- package/dist/homeAssistant.js +40 -1
- package/dist/homeAssistant.js.map +1 -1
- package/dist/mqtt/mqtt-client.d.ts +2 -0
- package/dist/mqtt/mqtt-client.js +44 -2
- package/dist/mqtt/mqtt-client.js.map +1 -1
- package/dist/mqtt/mqtt.entity.d.ts +12 -0
- package/dist/mqtt/mqtt.entity.js +231 -82
- package/dist/mqtt/mqtt.entity.js.map +1 -1
- package/dist/platform.d.ts +2 -0
- package/dist/platform.js +111 -37
- package/dist/platform.js.map +1 -1
- package/dist/proxy.js +13 -1
- package/dist/proxy.js.map +1 -1
- package/dist/utils/hap-firmware.js +1 -1
- package/dist/utils/hap-firmware.js.map +1 -1
- package/dist/utils/matter-command-response.js +64 -44
- package/dist/utils/matter-command-response.js.map +1 -1
- package/dist/utils/matter-reset-storage.d.ts +2 -0
- package/dist/utils/matter-reset-storage.js +74 -0
- package/dist/utils/matter-reset-storage.js.map +1 -0
- package/dist/utils/measurements.d.ts +8 -0
- package/dist/utils/measurements.js +42 -0
- package/dist/utils/measurements.js.map +1 -0
- package/package.json +17 -17
- package/dist/frontend/assets/index-1k-iTL-m.js +0 -26
package/dist/platform.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { stageMatterReset } from "./utils/matter-reset-storage.js";
|
|
1
2
|
import { loadBridgeProtocol } from "./utils/matter-protocol.js";
|
|
2
3
|
import { BrowserPreview } from "./camera/browser-preview.js";
|
|
3
4
|
/**
|
|
@@ -35,6 +36,7 @@ import { EnergyTariffEntity } from "./entities/energy_tariff.entity.js";
|
|
|
35
36
|
import { VacuumEntity } from "./entities/vacuum.entity.js";
|
|
36
37
|
import { PetFeederEntity } from "./entities/pet_feeder.entity.js";
|
|
37
38
|
import { HumidifierEntity } from "./entities/humidifier.entity.js";
|
|
39
|
+
import { ClimateEntity } from "./entities/climate.entity.js";
|
|
38
40
|
import { OvenEntity } from "./entities/oven.entity.js";
|
|
39
41
|
import { CooktopEntity } from "./entities/cooktop.entity.js";
|
|
40
42
|
import { MediaPlayerEntity } from "./entities/media-player.entity.js";
|
|
@@ -112,6 +114,7 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
112
114
|
deviceGroupingConfigs = [];
|
|
113
115
|
mqttManager;
|
|
114
116
|
mqttEntities = new Map();
|
|
117
|
+
mqttActivations = new Map();
|
|
115
118
|
ptzManager = PtzZonesManager.getInstance();
|
|
116
119
|
ptzMqttPublisher = null;
|
|
117
120
|
uiServer;
|
|
@@ -2741,12 +2744,22 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
2741
2744
|
});
|
|
2742
2745
|
this.mqttManager.onStateChanged((topic, payload) => {
|
|
2743
2746
|
for (const entity of this.mqttEntities.values()) {
|
|
2744
|
-
|
|
2747
|
+
entity.handleTopicState(topic, payload);
|
|
2748
|
+
if (entity.availabilityTopic === topic &&
|
|
2749
|
+
entity.availabilityTopic !== entity.stateTopic) {
|
|
2750
|
+
if (entity.handleAvailabilityUpdate(payload)) {
|
|
2751
|
+
this.broadcastSseMessage("state_changed", {
|
|
2752
|
+
entityId: entity.entityId,
|
|
2753
|
+
state: entity.getStateString(),
|
|
2754
|
+
});
|
|
2755
|
+
}
|
|
2756
|
+
}
|
|
2757
|
+
else if (entity.stateTopic === topic) {
|
|
2745
2758
|
entity.handleStateUpdate(payload);
|
|
2746
|
-
this.broadcastSseMessage("
|
|
2747
|
-
origin: "mqtt",
|
|
2759
|
+
this.broadcastSseMessage("state_changed", {
|
|
2748
2760
|
entityId: entity.entityId,
|
|
2749
|
-
state:
|
|
2761
|
+
state: entity.getStateString(),
|
|
2762
|
+
attributes: entity.attributes,
|
|
2750
2763
|
});
|
|
2751
2764
|
}
|
|
2752
2765
|
}
|
|
@@ -3319,6 +3332,19 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3319
3332
|
"moisture",
|
|
3320
3333
|
"power",
|
|
3321
3334
|
"energy",
|
|
3335
|
+
"voltage",
|
|
3336
|
+
"pressure",
|
|
3337
|
+
"atmospheric_pressure",
|
|
3338
|
+
"volume_flow_rate",
|
|
3339
|
+
"carbon_dioxide",
|
|
3340
|
+
"co2",
|
|
3341
|
+
"pm1",
|
|
3342
|
+
"pm25",
|
|
3343
|
+
"pm10",
|
|
3344
|
+
"volatile_organic_compounds",
|
|
3345
|
+
"voc",
|
|
3346
|
+
"aqi",
|
|
3347
|
+
"air_quality",
|
|
3322
3348
|
].includes(deviceClass ?? ""))
|
|
3323
3349
|
return;
|
|
3324
3350
|
if (domain === "binary_sensor" &&
|
|
@@ -3360,7 +3386,10 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3360
3386
|
let entityInstance;
|
|
3361
3387
|
// Instantiation based on mapped device type
|
|
3362
3388
|
if (domain === "cover" &&
|
|
3363
|
-
[
|
|
3389
|
+
[
|
|
3390
|
+
MatterDeviceTypes.windowCovering.code,
|
|
3391
|
+
MatterDeviceTypes.closure.code,
|
|
3392
|
+
].includes(deviceType.code)) {
|
|
3364
3393
|
entityInstance = new ClosureEntity(this, state, deviceType);
|
|
3365
3394
|
}
|
|
3366
3395
|
else if (domain === "lock") {
|
|
@@ -3375,7 +3404,8 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3375
3404
|
else if (domain === "sensor" &&
|
|
3376
3405
|
(deviceClass === "monetary" ||
|
|
3377
3406
|
deviceClass === "power" ||
|
|
3378
|
-
deviceClass === "energy"
|
|
3407
|
+
deviceClass === "energy" ||
|
|
3408
|
+
deviceClass === "voltage")) {
|
|
3379
3409
|
entityInstance = new EnergyTariffEntity(this, state, deviceType);
|
|
3380
3410
|
}
|
|
3381
3411
|
else if (domain === "valve" || deviceType.name === "WaterValve") {
|
|
@@ -3393,6 +3423,9 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3393
3423
|
"voc",
|
|
3394
3424
|
"aqi",
|
|
3395
3425
|
"air_quality",
|
|
3426
|
+
"tvoc",
|
|
3427
|
+
"ozone",
|
|
3428
|
+
"radon",
|
|
3396
3429
|
].includes(deviceClass ?? "")) {
|
|
3397
3430
|
entityInstance = new AirQualityEntity(this, state, deviceType);
|
|
3398
3431
|
}
|
|
@@ -3403,6 +3436,19 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3403
3436
|
deviceType.name === "RoboticVacuumCleaner")) {
|
|
3404
3437
|
entityInstance = new VacuumEntity(this, state, deviceType);
|
|
3405
3438
|
}
|
|
3439
|
+
else if (override === "Oven" || deviceType.name === "Oven") {
|
|
3440
|
+
entityInstance = new OvenEntity(this, state, deviceType);
|
|
3441
|
+
}
|
|
3442
|
+
else if (override === "Cooktop" || deviceType.name === "Cooktop") {
|
|
3443
|
+
entityInstance = new CooktopEntity(this, state, deviceType);
|
|
3444
|
+
}
|
|
3445
|
+
else if (domain === "climate" ||
|
|
3446
|
+
deviceType.name === "Thermostat" ||
|
|
3447
|
+
effectiveProfile === "thermostat" ||
|
|
3448
|
+
override === "thermostat" ||
|
|
3449
|
+
override === "Thermostat") {
|
|
3450
|
+
entityInstance = new ClimateEntity(this, state, deviceType);
|
|
3451
|
+
}
|
|
3406
3452
|
else if (domain === "humidifier") {
|
|
3407
3453
|
entityInstance = new HumidifierEntity(this, state, deviceType);
|
|
3408
3454
|
}
|
|
@@ -3413,12 +3459,6 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3413
3459
|
else if (override === "PetFeeder" || domain === "button") {
|
|
3414
3460
|
entityInstance = new PetFeederEntity(this, state, deviceType);
|
|
3415
3461
|
}
|
|
3416
|
-
else if (override === "Oven" || deviceType.name === "Oven") {
|
|
3417
|
-
entityInstance = new OvenEntity(this, state, deviceType);
|
|
3418
|
-
}
|
|
3419
|
-
else if (override === "Cooktop" || deviceType.name === "Cooktop") {
|
|
3420
|
-
entityInstance = new CooktopEntity(this, state, deviceType);
|
|
3421
|
-
}
|
|
3422
3462
|
else {
|
|
3423
3463
|
// General base fallback or standard converters will wrap this
|
|
3424
3464
|
entityInstance = new BaseEntity(this, state, deviceType);
|
|
@@ -3785,13 +3825,34 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
3785
3825
|
}
|
|
3786
3826
|
/** Create an MQTT bridged endpoint and let Matterbridge own its lifecycle. */
|
|
3787
3827
|
async activateMqttEntity(entityId) {
|
|
3788
|
-
|
|
3789
|
-
|
|
3828
|
+
const previous = this.mqttActivations.get(entityId);
|
|
3829
|
+
const activation = (previous ?? Promise.resolve())
|
|
3830
|
+
.catch(() => undefined)
|
|
3831
|
+
.then(() => this.activateDiscoveredMqttEntity(entityId));
|
|
3832
|
+
this.mqttActivations.set(entityId, activation);
|
|
3833
|
+
try {
|
|
3834
|
+
await activation;
|
|
3835
|
+
}
|
|
3836
|
+
finally {
|
|
3837
|
+
if (this.mqttActivations.get(entityId) === activation) {
|
|
3838
|
+
this.mqttActivations.delete(entityId);
|
|
3839
|
+
}
|
|
3840
|
+
}
|
|
3841
|
+
}
|
|
3842
|
+
async activateDiscoveredMqttEntity(entityId) {
|
|
3790
3843
|
const entity = this.mqttEntities.get(entityId);
|
|
3791
3844
|
if (!entity)
|
|
3792
3845
|
throw new Error(`MQTT Entity ${entityId} was not discovered.`);
|
|
3846
|
+
const activeEndpoint = this.matterbridgeDevices.get(entityId);
|
|
3847
|
+
if (activeEndpoint && activeEndpoint === entity.endpoint)
|
|
3848
|
+
return;
|
|
3793
3849
|
try {
|
|
3794
3850
|
const endpoint = await entity.createEndpoint();
|
|
3851
|
+
if (activeEndpoint) {
|
|
3852
|
+
entity.adoptEndpoint(activeEndpoint);
|
|
3853
|
+
await entity.syncInitialState();
|
|
3854
|
+
return;
|
|
3855
|
+
}
|
|
3795
3856
|
this.installMatterCommandResponsePolicy(endpoint, entityId);
|
|
3796
3857
|
const existingEndpoint = endpoint.uniqueId
|
|
3797
3858
|
? this.getDeviceByUniqueId(endpoint.uniqueId)
|
|
@@ -4632,7 +4693,7 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
4632
4693
|
if (!entity)
|
|
4633
4694
|
return { success: false, error: "Device not found in discovery." };
|
|
4634
4695
|
const [domain] = entityId.split(".");
|
|
4635
|
-
if (!getExportProfile(domain, profileId) ||
|
|
4696
|
+
if (!getExportProfile(domain, profileId, entity.state.attributes?.device_class) ||
|
|
4636
4697
|
!MatterDeviceTypes[profileId]) {
|
|
4637
4698
|
return {
|
|
4638
4699
|
success: false,
|
|
@@ -5148,6 +5209,7 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
5148
5209
|
return { generatedAt: new Date().toISOString(), cameras };
|
|
5149
5210
|
}
|
|
5150
5211
|
startUiServer() {
|
|
5212
|
+
let resettingMatter = false;
|
|
5151
5213
|
const server = http.createServer(async (req, res) => {
|
|
5152
5214
|
const urlObj = new URL(req.url ?? "", `http://${req.headers.host ?? "localhost"}`);
|
|
5153
5215
|
// If requested at the base Ingress URL without a trailing slash,
|
|
@@ -5180,7 +5242,8 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
5180
5242
|
}
|
|
5181
5243
|
this.log.debug(`[UI Server] ${req.method} ${pathname} (raw: ${urlObj.pathname})`);
|
|
5182
5244
|
const adminToken = process.env.MATTER_AIO_ADMIN_TOKEN;
|
|
5183
|
-
|
|
5245
|
+
const isMutation = ["POST", "PUT", "PATCH", "DELETE"].includes(req.method ?? "");
|
|
5246
|
+
if (isMutation &&
|
|
5184
5247
|
adminToken &&
|
|
5185
5248
|
req.headers["x-matter-aio-token"] !== adminToken) {
|
|
5186
5249
|
res.writeHead(403, {
|
|
@@ -5189,6 +5252,11 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
5189
5252
|
res.end(JSON.stringify({ success: false, error: "Forbidden" }));
|
|
5190
5253
|
return;
|
|
5191
5254
|
}
|
|
5255
|
+
if (resettingMatter && isMutation) {
|
|
5256
|
+
res.writeHead(409, { "Content-Type": "application/json" });
|
|
5257
|
+
res.end(JSON.stringify({ error: "Ya hay un restablecimiento en curso." }));
|
|
5258
|
+
return;
|
|
5259
|
+
}
|
|
5192
5260
|
try {
|
|
5193
5261
|
// An opt-in, read-only integration point for an external MCP adapter.
|
|
5194
5262
|
// No diagnostics API is available until a dedicated secret is configured.
|
|
@@ -8418,30 +8486,36 @@ export class HomeAssistantPlatform extends MatterbridgeDynamicPlatform {
|
|
|
8418
8486
|
return;
|
|
8419
8487
|
}
|
|
8420
8488
|
if (req.method === "POST" && pathname === "/api/custom/factoryreset") {
|
|
8421
|
-
|
|
8422
|
-
|
|
8423
|
-
|
|
8489
|
+
resettingMatter = true;
|
|
8490
|
+
let staging;
|
|
8491
|
+
try {
|
|
8492
|
+
staging = await stageMatterReset("/data");
|
|
8493
|
+
}
|
|
8494
|
+
catch (error) {
|
|
8495
|
+
resettingMatter = false;
|
|
8496
|
+
this.log.error(`Matter reset failed: ${error}`);
|
|
8497
|
+
res.writeHead(500, { "Content-Type": "application/json" });
|
|
8498
|
+
res.end(JSON.stringify({
|
|
8499
|
+
error: "No se pudo restablecer Matter. Revisa los registros.",
|
|
8500
|
+
}));
|
|
8501
|
+
return;
|
|
8502
|
+
}
|
|
8503
|
+
let cleanupPending = false;
|
|
8504
|
+
try {
|
|
8505
|
+
await fs.rm(staging, { recursive: true, force: true });
|
|
8506
|
+
}
|
|
8507
|
+
catch (error) {
|
|
8508
|
+
cleanupPending = true;
|
|
8509
|
+
this.log.error(`Matter reset cleanup failed: ${error}`);
|
|
8510
|
+
}
|
|
8511
|
+
res.writeHead(200, { "Content-Type": "application/json" });
|
|
8424
8512
|
res.end(JSON.stringify({
|
|
8425
8513
|
success: true,
|
|
8426
|
-
message:
|
|
8514
|
+
message: cleanupPending
|
|
8515
|
+
? "Matter restablecido. Hay archivos pendientes de limpiar."
|
|
8516
|
+
: "Matter restablecido. Reiniciando el servicio…",
|
|
8427
8517
|
}));
|
|
8428
|
-
|
|
8429
|
-
setTimeout(async () => {
|
|
8430
|
-
try {
|
|
8431
|
-
const { rm } = await import("fs/promises");
|
|
8432
|
-
await rm("/data/device-overrides.json", { force: true });
|
|
8433
|
-
await rm("/data/exported-devices.json", { force: true });
|
|
8434
|
-
// A Matter factory reset must also remove Matterbridge's
|
|
8435
|
-
// persistent fabrics and commissioning data. Leaving this
|
|
8436
|
-
// directory behind makes a failed pairing look commissioned
|
|
8437
|
-
// and causes the old QR/node identity to be reused.
|
|
8438
|
-
await rm("/data/.matterbridge", { recursive: true, force: true });
|
|
8439
|
-
}
|
|
8440
|
-
catch (err) {
|
|
8441
|
-
this.log.error(`Failed to wipe storage: ${err}`);
|
|
8442
|
-
}
|
|
8443
|
-
process.exit(0);
|
|
8444
|
-
}, 1000);
|
|
8518
|
+
setTimeout(() => process.exit(0), 250);
|
|
8445
8519
|
return;
|
|
8446
8520
|
}
|
|
8447
8521
|
// GET /api/custom/events - Server-Sent Events for real-time UI push
|