matter-all-in-one-addon 2.3.12 → 2.3.13
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 +16 -8
- package/dist/camera/ai/camera-ai-detector.js +2 -1
- package/dist/camera/ai/camera-ai-detector.js.map +1 -1
- package/dist/camera/camera-source-resolver.js +5 -3
- package/dist/camera/camera-source-resolver.js.map +1 -1
- package/dist/camera/cameraui/cameraui-client.js +91 -30
- package/dist/camera/cameraui/cameraui-client.js.map +1 -1
- package/dist/camera/cameraui/cameraui-homekit-bridge.js +11 -4
- package/dist/camera/cameraui/cameraui-homekit-bridge.js.map +1 -1
- package/dist/camera/cameraui/cameraui-storage.js.map +1 -1
- package/dist/camera/cameraui/ha-camera-entity.js +5 -2
- package/dist/camera/cameraui/ha-camera-entity.js.map +1 -1
- package/dist/camera/homekit/ffmpeg-helper.js.map +1 -1
- package/dist/camera/homekit/hevc/fmp4-hevc.js +3 -1
- package/dist/camera/homekit/hevc/fmp4-hevc.js.map +1 -1
- package/dist/camera/homekit/hevc/hevc-recording.js +10 -8
- package/dist/camera/homekit/hevc/hevc-recording.js.map +1 -1
- package/dist/camera/homekit/hevc/multi-tier-rtp.js +15 -8
- package/dist/camera/homekit/hevc/multi-tier-rtp.js.map +1 -1
- package/dist/camera/homekit/hevc/sframe-rtp.js +13 -4
- package/dist/camera/homekit/hevc/sframe-rtp.js.map +1 -1
- package/dist/camera/homekit/hevc/sframe.js +67 -10
- package/dist/camera/homekit/hevc/sframe.js.map +1 -1
- package/dist/camera/homekit/hevc/types.js +81 -9
- package/dist/camera/homekit/hevc/types.js.map +1 -1
- package/dist/camera/homekit/hevc/webrtc-session.js +41 -16
- package/dist/camera/homekit/hevc/webrtc-session.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-recording.delegate.js +10 -4
- package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
- package/dist/camera/homekit/tuya-hap-talkback.js +1 -3
- package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
- package/dist/camera/motion/ffmpeg-motion-detector.js +27 -13
- package/dist/camera/motion/ffmpeg-motion-detector.js.map +1 -1
- package/dist/camera/nest/nest-camera-adapter.js +9 -5
- package/dist/camera/nest/nest-camera-adapter.js.map +1 -1
- package/dist/camera/ptz/ptz-capabilities.js +3 -1
- package/dist/camera/ptz/ptz-capabilities.js.map +1 -1
- package/dist/camera/ptz/ptz-legacy-discovery.js.map +1 -1
- package/dist/camera/ptz/ptz-mqtt-publisher.js +50 -12
- package/dist/camera/ptz/ptz-mqtt-publisher.js.map +1 -1
- package/dist/camera/ptz/ptz-zones-manager.js +6 -1
- package/dist/camera/ptz/ptz-zones-manager.js.map +1 -1
- package/dist/camera/scrypted/scrypted-camera-card.js +3 -1
- package/dist/camera/scrypted/scrypted-camera-card.js.map +1 -1
- package/dist/camera/scrypted/scrypted-camera-discovery-adapter.js +7 -5
- package/dist/camera/scrypted/scrypted-camera-discovery-adapter.js.map +1 -1
- package/dist/camera/scrypted/scrypted-client-discovery-adapter.js.map +1 -1
- package/dist/camera/scrypted/scrypted-client.js +6 -5
- package/dist/camera/scrypted/scrypted-client.js.map +1 -1
- package/dist/camera/scrypted/scrypted-discovery-provider.js.map +1 -1
- package/dist/camera/scrypted/scrypted-homekit-bridge.js +6 -4
- package/dist/camera/scrypted/scrypted-homekit-bridge.js.map +1 -1
- package/dist/camera/scrypted/scrypted-reconnect-manager.js.map +1 -1
- package/dist/camera/scrypted/scrypted-runtime-facade.js +2 -2
- package/dist/camera/scrypted/scrypted-runtime-facade.js.map +1 -1
- package/dist/camera/scrypted/scrypted-runtime-ingest.js +3 -1
- package/dist/camera/scrypted/scrypted-runtime-ingest.js.map +1 -1
- package/dist/camera/scrypted/scrypted-storage.js +12 -6
- package/dist/camera/scrypted/scrypted-storage.js.map +1 -1
- package/dist/camera/scrypted/scrypted-stream-validator.js +25 -7
- package/dist/camera/scrypted/scrypted-stream-validator.js.map +1 -1
- package/dist/camera/tuya-webrtc-session.js +6 -2
- package/dist/camera/tuya-webrtc-session.js.map +1 -1
- package/dist/converters/sensor.converter.js +4 -1
- package/dist/converters/sensor.converter.js.map +1 -1
- package/dist/device-profiles.js +3 -1
- package/dist/device-profiles.js.map +1 -1
- package/dist/entities/air_quality.entity.js +3 -1
- package/dist/entities/air_quality.entity.js.map +1 -1
- package/dist/entities/base.entity.js +45 -17
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/camera.entity.js +6 -2
- package/dist/entities/camera.entity.js.map +1 -1
- package/dist/entities/composite-device.entity.js +37 -13
- package/dist/entities/composite-device.entity.js.map +1 -1
- package/dist/entities/energy_tariff.entity.js.map +1 -1
- package/dist/entities/vacuum.entity.js +16 -5
- package/dist/entities/vacuum.entity.js.map +1 -1
- package/dist/hap/hap-generic-accessory.js +308 -138
- package/dist/hap/hap-generic-accessory.js.map +1 -1
- package/dist/homeAssistant.js +14 -5
- package/dist/homeAssistant.js.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/mqtt/mqtt-client.js.map +1 -1
- package/dist/mqtt/mqtt.entity.js +41 -17
- package/dist/mqtt/mqtt.entity.js.map +1 -1
- package/dist/platform.d.ts +4 -4
- package/dist/platform.js +237 -96
- package/dist/platform.js.map +1 -1
- package/dist/utils/atomic-json-store.js +5 -1
- package/dist/utils/atomic-json-store.js.map +1 -1
- package/dist/utils/ha-state.js +3 -1
- package/dist/utils/ha-state.js.map +1 -1
- package/dist/utils/light-color.js +3 -5
- package/dist/utils/light-color.js.map +1 -1
- package/dist/utils/matter-command-response.js.map +1 -1
- package/dist/utils/matter-firmware.js +1 -2
- package/dist/utils/matter-firmware.js.map +1 -1
- package/dist/utils/matter-protocol.d.ts +1 -0
- package/dist/utils/matter-protocol.js +30 -0
- package/dist/utils/matter-protocol.js.map +1 -0
- package/package.json +26 -17
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Matter All-in-One Chrisalvir — complemento v2.3.
|
|
1
|
+
# Matter All-in-One Chrisalvir — complemento v2.3.13
|
|
2
2
|
|
|
3
3
|
<div align="center">
|
|
4
4
|
<img src="https://raw.githubusercontent.com/chrisalvir1/matter-all-in-one-chrisalvir/main/matter-all-in-one-addon/logo.png" alt="Matter All In One Logo" width="300" />
|
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
|
|
7
7
|
**Compatible a nivel de código con Home Assistant 2026.10 y preparado para Home Assistant 2026.11 beta.** Esta última versión todavía requiere validación en una instalación real.
|
|
8
8
|
|
|
9
|
-
Puente **Matter 1.6.1** basado en **Matterbridge 3.11.
|
|
9
|
+
Puente **Matter 1.6.1** basado en **Matterbridge 3.11.1** con publicación independiente **HomeKit HAP/HKSV** para cámaras y accesorios compatibles. Incluye integración con Omni Tuya Local, Camera.UI, Scrypted y el inventario de Home Assistant.
|
|
10
10
|
|
|
11
|
-
##
|
|
11
|
+
## Historial v2.3.0 — 28 de octubre de 2026
|
|
12
12
|
|
|
13
13
|
1. **Home Assistant 2026.11:** soporte defensivo de nombres contextuales mediante nombres del registro y del dispositivo, preservando `entity_id`, `device_id` y los vínculos con sensores de movimiento.
|
|
14
14
|
2. **Omni Tuya Local:** métricas separadas por cámara para asignaciones RTSP efímeras, con intentos, reintentos, duración y errores agregados, sin guardar URLs ni credenciales.
|
|
@@ -40,7 +40,7 @@ Añade este repositorio de aplicaciones en Home Assistant:
|
|
|
40
40
|
https://github.com/Chrisalvir1/matter-all-in-one-chrisalvir
|
|
41
41
|
```
|
|
42
42
|
|
|
43
|
-
Instala **Matter All-in-one (Chrisalvir)** y elige la versión **2.3.
|
|
43
|
+
Instala **Matter All-in-one (Chrisalvir)** y elige la versión **2.3.13** cuando la imagen `amd64` / `aarch64` esté publicada. La distribución se realiza desde GHCR, con verificaciones previas de tipos, compilación, pruebas y disponibilidad pública de la imagen.
|
|
44
44
|
|
|
45
45
|
Antes de actualizar, realiza una copia de seguridad de la configuración y el almacenamiento persistente. No es necesario ni recomendable borrar las fabrics Matter ni volver a emparejar una cámara estable.
|
|
46
46
|
|
|
@@ -77,12 +77,12 @@ Se requiere una prueba física separada, sin actualizar el Home Assistant princi
|
|
|
77
77
|
|
|
78
78
|
```yaml
|
|
79
79
|
project: matter-all-in-one-chrisalvir
|
|
80
|
-
version: "2.3.
|
|
80
|
+
version: "2.3.13"
|
|
81
81
|
home_assistant: "2026.10; 2026.11-beta contract tested, hardware validation pending"
|
|
82
82
|
spec: "Matter 1.6.1"
|
|
83
83
|
engine: matterbridge
|
|
84
|
-
engine_version: "3.11.
|
|
85
|
-
node_image: "node:
|
|
84
|
+
engine_version: "3.11.1"
|
|
85
|
+
node_image: "node:26.13.0-alpine3.24"
|
|
86
86
|
ha_integration: websocket
|
|
87
87
|
plugin_mode: dynamic
|
|
88
88
|
persistent_data: /data/.matterbridge
|
|
@@ -94,10 +94,18 @@ diagnostics: opt-in read-only
|
|
|
94
94
|
## Más información
|
|
95
95
|
|
|
96
96
|
- [README principal del proyecto](../README.md)
|
|
97
|
-
- [Notas de publicación v2.3.
|
|
97
|
+
- [Notas de publicación v2.3.13](../docs/RELEASE_NOTES_2.3.13.md)
|
|
98
98
|
- [Guía técnica de compatibilidad con HA 2026.11](../docs/home-assistant-2026-11-readiness.md)
|
|
99
99
|
- [Compatibilidad HomeKit](docs/homekit-compatibility.md)
|
|
100
100
|
- [Thread en Home Assistant](docs/thread-setup.md)
|
|
101
101
|
- [Cambios del complemento](CHANGELOG.md)
|
|
102
102
|
|
|
103
103
|
**Licencia:** Apache-2.0. **Autor:** Chrisalvir.
|
|
104
|
+
|
|
105
|
+
### Entorno reproducible de desarrollo
|
|
106
|
+
|
|
107
|
+
La versión 2.3.13 valida Node **26.13.0 LTS**, npm **12.2.1** y Matterbridge **3.11.1**. Las versiones Node están en `.node-version` y `.nvmrc`; después de cambiar de runtime, reinstalar con `npm ci --legacy-peer-deps` en `matter-all-in-one-addon`. No reutilizar `node_modules` de Node 24, de otra arquitectura o de macOS dentro de Alpine Linux.
|
|
108
|
+
|
|
109
|
+
`npm run check:toolchain` comprueba sincronía entre runtime local, npm, Docker, build.yaml y CI; `npm run check:runtime` comprueba imports y versiones reales contra el lockfile. Las imágenes base están fijadas por digest. El devcontainer usa la rama estable npm fijada de Matterbridge, no `dev`, y falla si su imagen Node 26 cambia a una versión distinta a la validada. No arranca ni registra el puente automáticamente. Docker ejecuta el chequeo de producción durante la compilación; CI añade ejecución aislada sin red y FFmpeg/ffprobe en amd64/arm64.
|
|
110
|
+
|
|
111
|
+
No hace falta cambiar el Node de Home Assistant Core: el add-on lleva su runtime dentro del contenedor. Tras publicar en otro paso habrá que recrear el contenedor con la imagen nueva, conservando `/data` y fabrics. Reconstruir y verificar primero; no actualizar Alpine/FFmpeg, targets TypeScript o HA Core solo por cambiar el major de Node.
|
|
@@ -279,7 +279,8 @@ export class CameraAiDetector extends EventEmitter {
|
|
|
279
279
|
const cuiAccessories = bridge.getAllAccessories();
|
|
280
280
|
for (const [id, acc] of cuiAccessories) {
|
|
281
281
|
if (id === cameraId ||
|
|
282
|
-
id.replace(/^cameraui_/, "") ===
|
|
282
|
+
id.replace(/^cameraui_/, "") ===
|
|
283
|
+
cameraId.replace(/^cameraui_/, "") ||
|
|
283
284
|
cuiAccessories.size === 1) {
|
|
284
285
|
hkAccessory = acc;
|
|
285
286
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-ai-detector.js","sourceRoot":"","sources":["../../../src/camera/ai/camera-ai-detector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"camera-ai-detector.js","sourceRoot":"","sources":["../../../src/camera/ai/camera-ai-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,8 +191,7 @@ export class CameraSourceResolver {
|
|
|
191
191
|
};
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
-
const canAttemptStream = hasStreamSupport ||
|
|
195
|
-
attrs.frontend_stream_type === "hls";
|
|
194
|
+
const canAttemptStream = hasStreamSupport || attrs.frontend_stream_type === "hls";
|
|
196
195
|
// 1. Check state.attributes.stream_source
|
|
197
196
|
const streamSourceAttr = attrs.stream_source;
|
|
198
197
|
if (typeof streamSourceAttr === "string" &&
|
|
@@ -277,7 +276,10 @@ export class CameraSourceResolver {
|
|
|
277
276
|
snapshotUrl,
|
|
278
277
|
supportsPassthrough: true,
|
|
279
278
|
requiresBridge: false,
|
|
280
|
-
metadata: {
|
|
279
|
+
metadata: {
|
|
280
|
+
isNest: entityId.includes("nest"),
|
|
281
|
+
frontendStreamType: "webrtc",
|
|
282
|
+
},
|
|
281
283
|
};
|
|
282
284
|
}
|
|
283
285
|
// 4. HA Native stream via WebSocket (camera/stream)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-source-resolver.js","sourceRoot":"","sources":["../../src/camera/camera-source-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,OAAO,oBAAoB;IAC/B;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAChD,QAAa,EACb,QAAgB,EAChB,KAA4B,EAC5B,mBAA4B;QAE5B,IAAI,CAAC,mBAAmB,IAAI,QAAQ,EAAE,EAAE,EAAE,2BAA2B,EAAE,CAAC;YACtE,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;gBACpE,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzD,OAAO;wBACL,UAAU,EAAE,MAAM;wBAClB,GAAG;wBACH,WAAW,EAAE,qBAAqB,QAAQ,EAAE;wBAC5C,mBAAmB,EAAE,IAAI;wBACzB,cAAc,EAAE,KAAK;wBACrB,QAAQ,EAAE;4BACR,gBAAgB,EAAE,IAAI;4BACtB,oBAAoB,EAAE,QAAQ;yBAC/B;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,oDAAoD;YACtD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,uBAAuB,CACzC,QAAa,EACb,QAAgB,EAChB,KAAiB,EACjB,OAAO,GAAmC,EAAE;QAE5C,MAAM,KAAK,GAAG,KAAK,EAAE,UAAU,IAAI,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC;QACxD,MAAM,WAAW,GAAG,QAAQ;YAC1B,CAAC,CAAC,GAAG,QAAQ,qBAAqB,QAAQ,EAAE;YAC5C,CAAC,CAAC,qBAAqB,QAAQ,EAAE,CAAC;QAEpC,IAAI,QAAQ,EAAE,EAAE,EAAE,mBAAmB,EAAE,CAAC;YACtC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAC5D,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9C,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CACnB,0BAA0B,QAAQ,kFAAkF,CACrH,CAAC;oBACF,OAAO;wBACL,UAAU,EAAE,KAAK;wBACjB,GAAG;wBACH,WAAW;wBACX,mBAAmB,EAAE,IAAI;wBACzB,cAAc,EAAE,IAAI;wBACpB,QAAQ,EAAE;4BACR,kBAAkB,EAAE,IAAI;4BACxB,oBAAoB,EAAE,QAAQ;yBAC/B;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,mDAAmD;YACrD,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"camera-source-resolver.js","sourceRoot":"","sources":["../../src/camera/camera-source-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,9 @@ export function extractRawCameras(json) {
|
|
|
71
71
|
if (Array.isArray(json.items))
|
|
72
72
|
return json.items;
|
|
73
73
|
// Check dictionary inside json.cameras
|
|
74
|
-
if (json.cameras &&
|
|
74
|
+
if (json.cameras &&
|
|
75
|
+
typeof json.cameras === "object" &&
|
|
76
|
+
!Array.isArray(json.cameras)) {
|
|
75
77
|
const dictValues = Object.entries(json.cameras)
|
|
76
78
|
.map(([key, val]) => {
|
|
77
79
|
if (val && typeof val === "object") {
|
|
@@ -84,7 +86,9 @@ export function extractRawCameras(json) {
|
|
|
84
86
|
return dictValues;
|
|
85
87
|
}
|
|
86
88
|
// Check dictionary inside json.result
|
|
87
|
-
if (json.result &&
|
|
89
|
+
if (json.result &&
|
|
90
|
+
typeof json.result === "object" &&
|
|
91
|
+
!Array.isArray(json.result)) {
|
|
88
92
|
const dictValues = Object.entries(json.result)
|
|
89
93
|
.map(([key, val]) => {
|
|
90
94
|
if (val && typeof val === "object") {
|
|
@@ -101,7 +105,12 @@ export function extractRawCameras(json) {
|
|
|
101
105
|
.map(([key, val]) => {
|
|
102
106
|
if (val &&
|
|
103
107
|
typeof val === "object" &&
|
|
104
|
-
(val.sources ||
|
|
108
|
+
(val.sources ||
|
|
109
|
+
val.videoConfig ||
|
|
110
|
+
val.name ||
|
|
111
|
+
val.id ||
|
|
112
|
+
val._id ||
|
|
113
|
+
val.uuid)) {
|
|
105
114
|
return { name: val.name || key, ...val };
|
|
106
115
|
}
|
|
107
116
|
return null;
|
|
@@ -193,7 +202,10 @@ export class CameraUiClient {
|
|
|
193
202
|
}
|
|
194
203
|
const baseUrl = targetBaseUrl || this.getBaseUrl();
|
|
195
204
|
if (!baseUrl) {
|
|
196
|
-
return {
|
|
205
|
+
return {
|
|
206
|
+
ok: false,
|
|
207
|
+
message: "URL del servidor Camera.UI no configurada",
|
|
208
|
+
};
|
|
197
209
|
}
|
|
198
210
|
const authEndpoints = ["/api/auth/login", "/api/login", "/auth/login"];
|
|
199
211
|
const pwd = this.config.password;
|
|
@@ -216,7 +228,10 @@ export class CameraUiClient {
|
|
|
216
228
|
password: pwd,
|
|
217
229
|
kind: "web",
|
|
218
230
|
persistent: true,
|
|
219
|
-
device: {
|
|
231
|
+
device: {
|
|
232
|
+
id: "matter-all-in-one",
|
|
233
|
+
name: "Matter All-in-One Bridge",
|
|
234
|
+
},
|
|
220
235
|
}),
|
|
221
236
|
signal: AbortSignal.timeout(5000),
|
|
222
237
|
});
|
|
@@ -247,7 +262,10 @@ export class CameraUiClient {
|
|
|
247
262
|
async testConnection() {
|
|
248
263
|
const candidates = this.getCandidateUrls();
|
|
249
264
|
if (candidates.length === 0) {
|
|
250
|
-
return {
|
|
265
|
+
return {
|
|
266
|
+
ok: false,
|
|
267
|
+
message: "URL del servidor Camera.UI no configurada",
|
|
268
|
+
};
|
|
251
269
|
}
|
|
252
270
|
let lastError = "";
|
|
253
271
|
let authFailureMessage;
|
|
@@ -291,7 +309,9 @@ export class CameraUiClient {
|
|
|
291
309
|
}
|
|
292
310
|
catch { }
|
|
293
311
|
this.resolvedBaseUrl = baseUrl;
|
|
294
|
-
const countMsg = count > 0
|
|
312
|
+
const countMsg = count > 0
|
|
313
|
+
? ` (${count} cámara${count === 1 ? "" : "s"} detectada${count === 1 ? "" : "s"})`
|
|
314
|
+
: "";
|
|
295
315
|
return {
|
|
296
316
|
ok: true,
|
|
297
317
|
message: `Conexión exitosa con Camera.UI en ${baseUrl}${countMsg}`,
|
|
@@ -353,7 +373,9 @@ export class CameraUiClient {
|
|
|
353
373
|
signal: AbortSignal.timeout(6000),
|
|
354
374
|
});
|
|
355
375
|
// If 401, token might have expired, re-login once and retry
|
|
356
|
-
if (res.status === 401 &&
|
|
376
|
+
if (res.status === 401 &&
|
|
377
|
+
this.config.username &&
|
|
378
|
+
this.config.password) {
|
|
357
379
|
const loginRes = await this.login(baseUrl);
|
|
358
380
|
if (loginRes.ok) {
|
|
359
381
|
res = await this.request(`${baseUrl}${ep}`, {
|
|
@@ -409,9 +431,12 @@ export class CameraUiClient {
|
|
|
409
431
|
s.role === "high" ||
|
|
410
432
|
s.role === "main" ||
|
|
411
433
|
s.role === "stream1" ||
|
|
412
|
-
(typeof s.name === "string" &&
|
|
434
|
+
(typeof s.name === "string" &&
|
|
435
|
+
/main|stream1|hq|primary/i.test(s.name))) ||
|
|
413
436
|
sources.find((s) => {
|
|
414
|
-
const u = Array.isArray(s.urls)
|
|
437
|
+
const u = Array.isArray(s.urls)
|
|
438
|
+
? s.urls[0]
|
|
439
|
+
: s.url || s.stream || "";
|
|
415
440
|
return /stream1|main|ch0|h264preview.*main/i.test(u);
|
|
416
441
|
}) ||
|
|
417
442
|
sources.find((s) => s.role !== "sub" && s.role !== "low" && s.role !== "snapshot") ||
|
|
@@ -465,13 +490,16 @@ export class CameraUiClient {
|
|
|
465
490
|
}
|
|
466
491
|
}
|
|
467
492
|
// Legacy fallback to videoConfig
|
|
468
|
-
let rtspUrl = mainSourceUrl ||
|
|
469
|
-
this.cleanStreamUrl(videoConfig.
|
|
470
|
-
this.cleanStreamUrl(
|
|
471
|
-
|
|
493
|
+
let rtspUrl = mainSourceUrl ||
|
|
494
|
+
this.cleanStreamUrl(videoConfig.source) ||
|
|
495
|
+
this.cleanStreamUrl(videoConfig.rtspUrl) ||
|
|
496
|
+
this.cleanStreamUrl(item.rtspUrl) ||
|
|
497
|
+
this.cleanStreamUrl(item.streamUrl) ||
|
|
498
|
+
this.cleanStreamUrl(item.stream);
|
|
499
|
+
let subRtspUrl = subSourceUrl ||
|
|
500
|
+
this.cleanStreamUrl(videoConfig.subSource) ||
|
|
472
501
|
this.cleanStreamUrl(videoConfig.subRtspUrl);
|
|
473
|
-
let snapshotUrl = snapshotSourceUrl ||
|
|
474
|
-
this.cleanStreamUrl(videoConfig.stillImageSource);
|
|
502
|
+
let snapshotUrl = snapshotSourceUrl || this.cleanStreamUrl(videoConfig.stillImageSource);
|
|
475
503
|
// Ensure rtspUrl strictly prioritizes Stream 1 / Main (Full 100% Quality / Native Max Stream)
|
|
476
504
|
if (rtspUrl) {
|
|
477
505
|
const isWyze = /wyze/i.test(name) ||
|
|
@@ -485,7 +513,9 @@ export class CameraUiClient {
|
|
|
485
513
|
if (rtspUrl.includes("/stream1")) {
|
|
486
514
|
rtspUrl = rtspUrl.replace("/stream1", "/stream0");
|
|
487
515
|
}
|
|
488
|
-
if (subRtspUrl &&
|
|
516
|
+
if (subRtspUrl &&
|
|
517
|
+
subRtspUrl.includes("/stream0") &&
|
|
518
|
+
!rtspUrl.includes("/stream0")) {
|
|
489
519
|
const temp = rtspUrl;
|
|
490
520
|
rtspUrl = subRtspUrl;
|
|
491
521
|
subRtspUrl = temp;
|
|
@@ -493,27 +523,37 @@ export class CameraUiClient {
|
|
|
493
523
|
}
|
|
494
524
|
else if (isVimtag) {
|
|
495
525
|
// Vimtag cameras: /live/ch0, /onvif1 or /ch0 is High Quality main stream; /live/ch1, /onvif2 or /ch1 is sub
|
|
496
|
-
if ((rtspUrl.includes("/live/ch1") ||
|
|
526
|
+
if ((rtspUrl.includes("/live/ch1") ||
|
|
527
|
+
rtspUrl.includes("/ch1") ||
|
|
528
|
+
rtspUrl.includes("/onvif2")) &&
|
|
497
529
|
subRtspUrl &&
|
|
498
|
-
(subRtspUrl.includes("/live/ch0") ||
|
|
530
|
+
(subRtspUrl.includes("/live/ch0") ||
|
|
531
|
+
subRtspUrl.includes("/ch0") ||
|
|
532
|
+
subRtspUrl.includes("/onvif1"))) {
|
|
499
533
|
const temp = rtspUrl;
|
|
500
534
|
rtspUrl = subRtspUrl;
|
|
501
535
|
subRtspUrl = temp;
|
|
502
536
|
}
|
|
503
|
-
else if (rtspUrl.includes("/stream1") ||
|
|
537
|
+
else if (rtspUrl.includes("/stream1") ||
|
|
538
|
+
rtspUrl.includes("/stream2")) {
|
|
504
539
|
// Replace invalid generic /stream1 or /stream2 with Vimtag native /live/ch0
|
|
505
540
|
rtspUrl = rtspUrl.replace(/\/stream[12]/, "/live/ch0");
|
|
506
541
|
}
|
|
507
|
-
else if (/:\d+\/?$/.test(rtspUrl) ||
|
|
542
|
+
else if (/:\d+\/?$/.test(rtspUrl) ||
|
|
543
|
+
!rtspUrl.split("://")[1]?.includes("/")) {
|
|
508
544
|
// No path specified for Vimtag: append default /live/ch0
|
|
509
545
|
rtspUrl = rtspUrl.replace(/\/?$/, "/live/ch0");
|
|
510
546
|
}
|
|
511
547
|
}
|
|
512
548
|
else {
|
|
513
549
|
// Standard cameras (Tapo, ONVIF, Reolink): /stream1, /main, /ch0 is High Quality, /stream2 or /sub is 360p
|
|
514
|
-
if ((rtspUrl.includes("/stream2") ||
|
|
550
|
+
if ((rtspUrl.includes("/stream2") ||
|
|
551
|
+
rtspUrl.includes("_sub") ||
|
|
552
|
+
rtspUrl.includes("/sub/")) &&
|
|
515
553
|
subRtspUrl &&
|
|
516
|
-
(subRtspUrl.includes("/stream1") ||
|
|
554
|
+
(subRtspUrl.includes("/stream1") ||
|
|
555
|
+
subRtspUrl.includes("_main") ||
|
|
556
|
+
subRtspUrl.includes("/main/"))) {
|
|
517
557
|
const temp = rtspUrl;
|
|
518
558
|
rtspUrl = subRtspUrl;
|
|
519
559
|
subRtspUrl = temp;
|
|
@@ -560,11 +600,24 @@ export class CameraUiClient {
|
|
|
560
600
|
snapshotUrl = `${effectiveBaseUrl}/api/cameras/${encodeURIComponent(name)}/snapshot`;
|
|
561
601
|
}
|
|
562
602
|
// Extract width & height from sources, videoConfig, resolution string, or model heuristics
|
|
563
|
-
let width = Number(videoConfig.maxWidth ||
|
|
564
|
-
|
|
565
|
-
|
|
603
|
+
let width = Number(videoConfig.maxWidth ||
|
|
604
|
+
videoConfig.width ||
|
|
605
|
+
item.width ||
|
|
606
|
+
(sources[0] && sources[0].width) ||
|
|
607
|
+
0);
|
|
608
|
+
let height = Number(videoConfig.maxHeight ||
|
|
609
|
+
videoConfig.height ||
|
|
610
|
+
item.height ||
|
|
611
|
+
(sources[0] && sources[0].height) ||
|
|
612
|
+
0);
|
|
613
|
+
const resString = String(sources[0]?.resolution ||
|
|
614
|
+
item.resolution ||
|
|
615
|
+
videoConfig.resolution ||
|
|
616
|
+
"");
|
|
566
617
|
if ((!width || !height) && resString.includes("x")) {
|
|
567
|
-
const [rw, rh] = resString
|
|
618
|
+
const [rw, rh] = resString
|
|
619
|
+
.split("x")
|
|
620
|
+
.map((s) => Number(s.trim()));
|
|
568
621
|
if (rw && rh) {
|
|
569
622
|
width = rw;
|
|
570
623
|
height = rh;
|
|
@@ -610,14 +663,20 @@ export class CameraUiClient {
|
|
|
610
663
|
(sources[0] && (sources[0].codec || sources[0].vcodec)) ||
|
|
611
664
|
"").toLowerCase();
|
|
612
665
|
const isHevcDetected = rawCodec.includes("hevc") || rawCodec.includes("265");
|
|
613
|
-
const videoCodec = isHevcDetected
|
|
666
|
+
const videoCodec = isHevcDetected
|
|
667
|
+
? "hevc"
|
|
668
|
+
: rawCodec.includes("h264")
|
|
669
|
+
? "h264"
|
|
670
|
+
: undefined;
|
|
614
671
|
const strategy = isHevcDetected ? "passthrough_hevc" : "passthrough_h264";
|
|
615
672
|
results.push({
|
|
616
673
|
id: `cameraui_${safeId}`,
|
|
617
674
|
name,
|
|
618
675
|
manufacturer: item.info?.manufacturer || item.manufacturer || "Camera.UI",
|
|
619
676
|
model: item.info?.model || item.model || "Network Camera",
|
|
620
|
-
serialNumber: item.info?.serialNumber ||
|
|
677
|
+
serialNumber: item.info?.serialNumber ||
|
|
678
|
+
item.serialNumber ||
|
|
679
|
+
`CUI-${safeId.toUpperCase()}`,
|
|
621
680
|
rtspUrl,
|
|
622
681
|
subRtspUrl,
|
|
623
682
|
snapshotUrl,
|
|
@@ -710,7 +769,9 @@ export class CameraUiClient {
|
|
|
710
769
|
signal: AbortSignal.timeout(2500),
|
|
711
770
|
});
|
|
712
771
|
// If unauthorized, attempt re-login once with baseUrl
|
|
713
|
-
if (res.status === 401 &&
|
|
772
|
+
if (res.status === 401 &&
|
|
773
|
+
this.config.username &&
|
|
774
|
+
this.config.password) {
|
|
714
775
|
const loginRes = await this.login(baseUrl);
|
|
715
776
|
if (loginRes.ok) {
|
|
716
777
|
res = await this.request(`${baseUrl}${ep}`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cameraui-client.js","sourceRoot":"","sources":["../../../src/camera/cameraui/cameraui-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cameraui-client.js","sourceRoot":"","sources":["../../../src/camera/cameraui/cameraui-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,8 @@ export class CameraUiHomeKitBridge {
|
|
|
99
99
|
return cand;
|
|
100
100
|
}
|
|
101
101
|
for (const [candId, candState] of states.entries()) {
|
|
102
|
-
if (!candId.startsWith("binary_sensor.") &&
|
|
102
|
+
if (!candId.startsWith("binary_sensor.") &&
|
|
103
|
+
!candId.startsWith("event."))
|
|
103
104
|
continue;
|
|
104
105
|
const fn = (candState?.attributes?.friendly_name || "").toLowerCase();
|
|
105
106
|
const candIdLower = candId.toLowerCase();
|
|
@@ -119,7 +120,9 @@ export class CameraUiHomeKitBridge {
|
|
|
119
120
|
fn.includes("persona") ||
|
|
120
121
|
fn.includes("celda") ||
|
|
121
122
|
fn.includes("detect");
|
|
122
|
-
if (hasC120Token &&
|
|
123
|
+
if (hasC120Token &&
|
|
124
|
+
hasMotionToken &&
|
|
125
|
+
this.hasUsableMotionEntity(platform, candId)) {
|
|
123
126
|
return candId;
|
|
124
127
|
}
|
|
125
128
|
}
|
|
@@ -351,7 +354,9 @@ export class CameraUiHomeKitBridge {
|
|
|
351
354
|
// binary_sensors are linked entities and must never be sent to the
|
|
352
355
|
// camera proxy (that endpoint returns 404 for them).
|
|
353
356
|
try {
|
|
354
|
-
if (haEntityId &&
|
|
357
|
+
if (haEntityId &&
|
|
358
|
+
!resolvedSourceUrl &&
|
|
359
|
+
platform.ha?.requestCameraStream) {
|
|
355
360
|
resolvedSourceUrl = await platform.ha.requestCameraStream(haEntityId);
|
|
356
361
|
if (resolvedSourceUrl) {
|
|
357
362
|
resolvedSourceType = "hls";
|
|
@@ -361,7 +366,9 @@ export class CameraUiHomeKitBridge {
|
|
|
361
366
|
catch (err) {
|
|
362
367
|
platform.log?.debug?.(`[CameraUiHomeKitBridge] requestCameraStream note for ${haEntityId}: ${err}`);
|
|
363
368
|
}
|
|
364
|
-
if (haEntityId &&
|
|
369
|
+
if (haEntityId &&
|
|
370
|
+
!resolvedSourceUrl &&
|
|
371
|
+
platform.ha?.getCameraProxyStreamUrl) {
|
|
365
372
|
resolvedSourceUrl = platform.ha.getCameraProxyStreamUrl(haEntityId);
|
|
366
373
|
if (resolvedSourceUrl) {
|
|
367
374
|
resolvedSourceType = "ha_proxy";
|