homebridge-config-ui-x 5.11.2-beta.2 → 5.11.2-beta.4
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/CHANGELOG.md +19 -2
- package/dist/core/auth/auth.controller.d.ts +4 -0
- package/dist/core/config/config.interfaces.d.ts +14 -0
- package/dist/core/config/config.service.d.ts +6 -0
- package/dist/core/config/config.service.js +8 -0
- package/dist/core/config/config.service.js.map +1 -1
- package/dist/core/config/config.startup.js +48 -17
- package/dist/core/config/config.startup.js.map +1 -1
- package/dist/core/feature-flags/feature-flags.registry.js +5 -0
- package/dist/core/feature-flags/feature-flags.registry.js.map +1 -1
- package/dist/core/homebridge-ipc/homebridge-ipc.service.js +1 -0
- package/dist/core/homebridge-ipc/homebridge-ipc.service.js.map +1 -1
- package/dist/core/spa/spa-html.service.d.ts +5 -0
- package/dist/core/spa/spa-html.service.js +32 -0
- package/dist/core/spa/spa-html.service.js.map +1 -0
- package/dist/core/spa/spa.filter.d.ts +3 -0
- package/dist/core/spa/spa.filter.js +22 -2
- package/dist/core/spa/spa.filter.js.map +1 -1
- package/dist/core/ssl/ssl-cert-generator.service.d.ts +15 -0
- package/dist/core/ssl/ssl-cert-generator.service.js +125 -0
- package/dist/core/ssl/ssl-cert-generator.service.js.map +1 -0
- package/dist/globalDefaults.js +3 -0
- package/dist/globalDefaults.js.map +1 -1
- package/dist/main.js +18 -4
- package/dist/main.js.map +1 -1
- package/dist/modules/accessories/accessories.controller.d.ts +1 -1
- package/dist/modules/accessories/accessories.interfaces.d.ts +94 -0
- package/dist/modules/accessories/accessories.interfaces.js +2 -0
- package/dist/modules/accessories/accessories.interfaces.js.map +1 -0
- package/dist/modules/accessories/accessories.module.js +2 -0
- package/dist/modules/accessories/accessories.module.js.map +1 -1
- package/dist/modules/accessories/accessories.service.d.ts +21 -3
- package/dist/modules/accessories/accessories.service.js +280 -17
- package/dist/modules/accessories/accessories.service.js.map +1 -1
- package/dist/modules/child-bridges/child-bridges.interfaces.d.ts +9 -0
- package/dist/modules/config-editor/config-editor.controller.d.ts +4 -0
- package/dist/modules/config-editor/config-editor.controller.js +64 -0
- package/dist/modules/config-editor/config-editor.controller.js.map +1 -1
- package/dist/modules/config-editor/config-editor.service.d.ts +6 -1
- package/dist/modules/config-editor/config-editor.service.js +45 -1
- package/dist/modules/config-editor/config-editor.service.js.map +1 -1
- package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js +1 -1
- package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js.map +1 -1
- package/dist/modules/plugins/plugins.service.js +15 -0
- package/dist/modules/plugins/plugins.service.js.map +1 -1
- package/dist/modules/server/server.controller.d.ts +50 -0
- package/dist/modules/server/server.controller.js +201 -2
- package/dist/modules/server/server.controller.js.map +1 -1
- package/dist/modules/server/server.service.d.ts +48 -0
- package/dist/modules/server/server.service.js +502 -14
- package/dist/modules/server/server.service.js.map +1 -1
- package/dist/modules/status/status.gateway.d.ts +2 -0
- package/dist/modules/status/status.interfaces.d.ts +11 -0
- package/dist/modules/status/status.service.d.ts +4 -1
- package/dist/modules/status/status.service.js +21 -2
- package/dist/modules/status/status.service.js.map +1 -1
- package/docs/matter-todo.md +15 -0
- package/docs/ssl-upload-pr.md +103 -0
- package/package.json +3 -1
- package/public/3rdpartylicenses.txt +595 -621
- package/public/assets/matter.svg +8 -0
- package/public/assets/plugin-ui-utils/ui.js +3 -0
- package/public/assets/plugin-ui-utils/ui.js.map +1 -1
- package/public/chunk-2TQEV57U.js +2 -0
- package/public/chunk-2Y6QBPFY.js +1 -0
- package/public/chunk-3LKYOCGJ.js +1 -0
- package/public/chunk-3YTNATAH.js +1 -0
- package/public/chunk-42Y35W3J.js +2 -0
- package/public/chunk-47QTMPRY.js +1 -0
- package/public/chunk-4KXPUEE3.js +4 -0
- package/public/chunk-4PQ5WRGK.js +1 -0
- package/public/chunk-4TAGCB7R.js +1 -0
- package/public/chunk-4VLAXCSY.js +1 -0
- package/public/chunk-5K3S6ZXB.js +1 -0
- package/public/chunk-6BRZAIW2.js +3 -0
- package/public/chunk-6QJUZNZL.js +1 -0
- package/public/chunk-6ZOSTYPR.js +1 -0
- package/public/{chunk-ZV26JTV7.js → chunk-7JNVXXNR.js} +1 -1
- package/public/chunk-7PPGGAHV.js +1 -0
- package/public/chunk-AM5CKSLZ.js +1 -0
- package/public/chunk-B4AJQJMI.js +1 -0
- package/public/chunk-BBRC6PRL.js +1 -0
- package/public/chunk-BGCYR25X.js +1 -0
- package/public/chunk-BHA7V2NQ.js +1 -0
- package/public/{chunk-KI6BE77G.js → chunk-BMOLDRJ3.js} +1 -1
- package/public/chunk-BVJS76CN.js +1 -0
- package/public/chunk-CNUIQJSO.js +1 -0
- package/public/chunk-CPECPTSN.js +1 -0
- package/public/{chunk-75KR2TK6.js → chunk-DBMKB5Z2.js} +1 -1
- package/public/chunk-DEM3FH7C.js +1 -0
- package/public/chunk-E35SHTFY.js +1 -0
- package/public/chunk-EAYA44IV.js +1 -0
- package/public/chunk-EBHP3YOF.js +1 -0
- package/public/chunk-EMF6ZINV.js +4 -0
- package/public/chunk-FJB6YCFU.js +1 -0
- package/public/chunk-FKJY3Z2V.js +1 -0
- package/public/chunk-FQDRGOO5.js +1 -0
- package/public/chunk-FRMRAPF2.js +1 -0
- package/public/chunk-FYHEIYSO.js +5 -0
- package/public/chunk-GEQRIXEF.js +1 -0
- package/public/chunk-GJ42U6LP.js +16 -0
- package/public/chunk-GT2YL2TI.js +1 -0
- package/public/chunk-GTIVJH6Y.js +1 -0
- package/public/chunk-GYMWB5SQ.js +1 -0
- package/public/chunk-H2D3SCVU.js +1 -0
- package/public/{chunk-OMFNURQZ.js → chunk-H7F7H5MW.js} +1 -1
- package/public/chunk-HKOUIAFO.js +1 -0
- package/public/chunk-I5V7VF5M.js +1 -0
- package/public/chunk-IBFLM7UM.js +1 -0
- package/public/chunk-IZHFI46L.js +2 -0
- package/public/chunk-JNSPIONO.js +1 -0
- package/public/chunk-JUCPYKUR.js +1 -0
- package/public/chunk-KJH2IPMR.js +1 -0
- package/public/chunk-KPSGNAPN.js +1 -0
- package/public/chunk-LH4WRTR2.js +1 -0
- package/public/chunk-LHXNE56J.js +1 -0
- package/public/chunk-LOEOVQRM.js +1 -0
- package/public/chunk-LRB7FQNQ.js +1 -0
- package/public/chunk-LTYAICHT.js +1 -0
- package/public/chunk-LVBVUIJY.js +12 -0
- package/public/chunk-MKV5RAJQ.js +4 -0
- package/public/chunk-MPQEE6FH.js +1 -0
- package/public/chunk-MRPQNEON.js +35 -0
- package/public/chunk-MS4K4KAK.js +5 -0
- package/public/chunk-N6AN65NK.js +3 -0
- package/public/chunk-NCLG2ZY5.js +1 -0
- package/public/chunk-OHJQJ73S.js +1 -0
- package/public/chunk-P3DOEH3R.js +1 -0
- package/public/chunk-PEOTW7KR.js +1 -0
- package/public/chunk-PQM33D72.js +1 -0
- package/public/chunk-Q4PUZM2R.js +1 -0
- package/public/chunk-QBG7SKRK.js +68 -0
- package/public/chunk-QGLAR7UC.js +1 -0
- package/public/chunk-QK4CWVVD.js +1 -0
- package/public/chunk-QPGHC7OK.js +1 -0
- package/public/chunk-RAG53DHZ.js +1 -0
- package/public/chunk-RHJRKBK2.js +1 -0
- package/public/chunk-RQ42YKAP.js +1 -0
- package/public/chunk-S4BMZ4C4.js +1 -0
- package/public/chunk-S4O5HRCM.js +1 -0
- package/public/chunk-SE6AXFTZ.js +1 -0
- package/public/chunk-SIODBMHU.js +1 -0
- package/public/chunk-SS725Q7L.js +1 -0
- package/public/chunk-STXA2UWR.js +1 -0
- package/public/chunk-SVEGWVQJ.js +1 -0
- package/public/chunk-T472BWYK.js +1 -0
- package/public/chunk-TPGJVI7J.js +1 -0
- package/public/chunk-TRDYZJYI.js +1 -0
- package/public/chunk-TTX3XSDC.js +1 -0
- package/public/chunk-TVEZZ2CK.js +1 -0
- package/public/chunk-UDXPJS32.js +1 -0
- package/public/chunk-UO7KCTHV.js +1 -0
- package/public/chunk-UOOJPKZJ.js +1 -0
- package/public/chunk-VAD47NOZ.js +1 -0
- package/public/chunk-VBQ2CSUE.js +1 -0
- package/public/chunk-VWBS6KRT.js +1 -0
- package/public/chunk-VYAAI7PY.js +1 -0
- package/public/chunk-WBTFILXV.js +19 -0
- package/public/chunk-WO6QHRQI.js +1 -0
- package/public/chunk-WOMMYJV2.js +1 -0
- package/public/chunk-WOXYSKNU.js +1 -0
- package/public/{chunk-BKCIVF4W.js → chunk-WX345PMX.js} +52 -2
- package/public/chunk-XGK5YFH6.js +19 -0
- package/public/chunk-XLJ6VVK3.js +8 -0
- package/public/chunk-XPSIQPO4.js +1 -0
- package/public/chunk-XQXAVYM6.js +1 -0
- package/public/chunk-YBGB3IOQ.js +1 -0
- package/public/chunk-YHH6UACV.js +1 -0
- package/public/chunk-YLRX4V4V.js +1 -0
- package/public/chunk-YM6RL7NW.js +1 -0
- package/public/chunk-YMEXNW5V.js +1 -0
- package/public/chunk-YSJHLHJ6.js +1 -0
- package/public/chunk-ZCGZM7LU.js +1 -0
- package/public/chunk-ZDUAXPNP.js +1 -0
- package/public/index.html +2 -2
- package/public/main-SPPQL5YI.js +1 -0
- package/public/media/matter-P563JGDL.svg +8 -0
- package/public/polyfills-34U4WL3Z.js +1 -0
- package/public/styles-CT2LPGES.css +1 -0
- package/scripts/extract-plugin-alias.js +53 -2
- package/public/chunk-2VYCMFLK.js +0 -1
- package/public/chunk-337WAYBF.js +0 -1
- package/public/chunk-3F6KNL45.js +0 -5
- package/public/chunk-3GUIMBZA.js +0 -50
- package/public/chunk-4BH7J5ZU.js +0 -1
- package/public/chunk-4MSKGZXZ.js +0 -1
- package/public/chunk-4STYOKXR.js +0 -1
- package/public/chunk-5GRM2PNI.js +0 -8
- package/public/chunk-6C5CYDDU.js +0 -1
- package/public/chunk-6T52JN5R.js +0 -1
- package/public/chunk-7EKDGIG7.js +0 -1
- package/public/chunk-7O3SPIWC.js +0 -1
- package/public/chunk-ACK5QKZR.js +0 -1
- package/public/chunk-ADJ6TEYQ.js +0 -5
- package/public/chunk-ADWZU2CD.js +0 -1
- package/public/chunk-AGDDSLXN.js +0 -1
- package/public/chunk-ASZKPQUN.js +0 -1
- package/public/chunk-AZY2DNUN.js +0 -1
- package/public/chunk-B6MBMYJR.js +0 -1
- package/public/chunk-BBLJIMXX.js +0 -1
- package/public/chunk-BON2K2BD.js +0 -2
- package/public/chunk-BRP3EHP7.js +0 -1
- package/public/chunk-C5VP7CRC.js +0 -1
- package/public/chunk-C6X7E5CS.js +0 -1
- package/public/chunk-CM3N3C3W.js +0 -1
- package/public/chunk-CV2KW5FI.js +0 -1
- package/public/chunk-EDQF53QR.js +0 -1
- package/public/chunk-EZJQ5APU.js +0 -1
- package/public/chunk-FRNPHIV3.js +0 -1
- package/public/chunk-GBTKBQ2X.js +0 -16
- package/public/chunk-HDF4JHFI.js +0 -4
- package/public/chunk-JEUVQW5P.js +0 -1
- package/public/chunk-KWAS7MXI.js +0 -1
- package/public/chunk-KWC5QURK.js +0 -8
- package/public/chunk-KXNC6WH6.js +0 -1
- package/public/chunk-MMBLECEN.js +0 -1
- package/public/chunk-NQB7BEZZ.js +0 -1
- package/public/chunk-OKAPP6YO.js +0 -1
- package/public/chunk-OM7GHRRK.js +0 -1
- package/public/chunk-OOM2PIRM.js +0 -5
- package/public/chunk-OZKGVJ4N.js +0 -1
- package/public/chunk-PT24GQ5K.js +0 -1
- package/public/chunk-QPI2YWGC.js +0 -1
- package/public/chunk-QQRM2O4S.js +0 -3
- package/public/chunk-QXD4RXA4.js +0 -1
- package/public/chunk-QZU43P2A.js +0 -1
- package/public/chunk-R3Y3VSF7.js +0 -4
- package/public/chunk-R7Q4CXAE.js +0 -1
- package/public/chunk-RAG7VYNH.js +0 -40
- package/public/chunk-RY3E4AUI.js +0 -1
- package/public/chunk-SCWBTFUY.js +0 -1
- package/public/chunk-SRFINKMY.js +0 -1
- package/public/chunk-TRDROX2J.js +0 -1
- package/public/chunk-UH7ZNLL5.js +0 -19
- package/public/chunk-V2WJ2SKN.js +0 -1
- package/public/chunk-VZ3XY34I.js +0 -2
- package/public/chunk-W663VLRG.js +0 -1
- package/public/chunk-WDXU4PPN.js +0 -1
- package/public/chunk-WEXOQCVG.js +0 -1
- package/public/chunk-XDFBUXFD.js +0 -1
- package/public/chunk-XPGJPK66.js +0 -4
- package/public/chunk-YXLLPJEL.js +0 -1
- package/public/chunk-ZXUIFQS4.js +0 -51
- package/public/main-YD5INHXP.js +0 -1
- package/public/polyfills-5KWHJ7II.js +0 -2
- package/public/styles-7EFV5QBG.css +0 -1
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
var SslCertGeneratorService_1;
|
|
11
|
+
import { Buffer } from 'node:buffer';
|
|
12
|
+
import { existsSync } from 'node:fs';
|
|
13
|
+
import { readFile, writeFile } from 'node:fs/promises';
|
|
14
|
+
import { homedir } from 'node:os';
|
|
15
|
+
import { join, resolve } from 'node:path';
|
|
16
|
+
import process from 'node:process';
|
|
17
|
+
import { Injectable } from '@nestjs/common';
|
|
18
|
+
import { ensureDir } from 'fs-extra/esm';
|
|
19
|
+
import forge from 'node-forge';
|
|
20
|
+
import { Logger } from '../logger/logger.service.js';
|
|
21
|
+
let SslCertGeneratorService = SslCertGeneratorService_1 = class SslCertGeneratorService {
|
|
22
|
+
logger = new Logger(SslCertGeneratorService_1.name);
|
|
23
|
+
certDir;
|
|
24
|
+
privateKeyPath;
|
|
25
|
+
certificatePath;
|
|
26
|
+
constructor() {
|
|
27
|
+
const storagePath = process.env.UIX_STORAGE_PATH || resolve(homedir(), '.homebridge');
|
|
28
|
+
this.certDir = join(storagePath, 'ssl-certs');
|
|
29
|
+
this.privateKeyPath = join(this.certDir, 'private-key.pem');
|
|
30
|
+
this.certificatePath = join(this.certDir, 'certificate.pem');
|
|
31
|
+
}
|
|
32
|
+
async generateOrLoadCertificate(hostnames = ['localhost']) {
|
|
33
|
+
if (existsSync(this.privateKeyPath) && existsSync(this.certificatePath)) {
|
|
34
|
+
try {
|
|
35
|
+
const privateKey = await readFile(this.privateKeyPath);
|
|
36
|
+
const certificate = await readFile(this.certificatePath);
|
|
37
|
+
this.logger.log('Loaded existing self-signed certificate');
|
|
38
|
+
return { privateKey, certificate };
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
this.logger.warn('Failed to load existing certificate, generating new one:', error.message);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return this.generateCertificate(hostnames);
|
|
45
|
+
}
|
|
46
|
+
async generateCertificate(hostnames) {
|
|
47
|
+
this.logger.log('Generating self-signed certificate...');
|
|
48
|
+
try {
|
|
49
|
+
await ensureDir(this.certDir);
|
|
50
|
+
const keys = forge.pki.rsa.generateKeyPair(2048);
|
|
51
|
+
const cert = forge.pki.createCertificate();
|
|
52
|
+
cert.publicKey = keys.publicKey;
|
|
53
|
+
cert.serialNumber = '01';
|
|
54
|
+
cert.validity.notBefore = new Date();
|
|
55
|
+
cert.validity.notAfter = new Date('2050-01-01T00:00:00Z');
|
|
56
|
+
const attrs = [
|
|
57
|
+
{ name: 'commonName', value: hostnames[0] || 'localhost' },
|
|
58
|
+
{ name: 'countryName', value: 'US' },
|
|
59
|
+
{ shortName: 'ST', value: 'State' },
|
|
60
|
+
{ name: 'localityName', value: 'City' },
|
|
61
|
+
{ name: 'organizationName', value: 'Homebridge' },
|
|
62
|
+
{ shortName: 'OU', value: 'Homebridge UI' },
|
|
63
|
+
];
|
|
64
|
+
cert.setSubject(attrs);
|
|
65
|
+
cert.setIssuer(attrs);
|
|
66
|
+
const extensions = [
|
|
67
|
+
{
|
|
68
|
+
name: 'basicConstraints',
|
|
69
|
+
cA: true,
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
name: 'keyUsage',
|
|
73
|
+
keyCertSign: true,
|
|
74
|
+
digitalSignature: true,
|
|
75
|
+
nonRepudiation: true,
|
|
76
|
+
keyEncipherment: true,
|
|
77
|
+
dataEncipherment: true,
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
name: 'extKeyUsage',
|
|
81
|
+
serverAuth: true,
|
|
82
|
+
clientAuth: true,
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
name: 'subjectAltName',
|
|
86
|
+
altNames: hostnames.map((hostname) => {
|
|
87
|
+
if (/^(?:\d{1,3}\.){3}\d{1,3}$/.test(hostname) || /^(?:[0-9a-f]{0,4}:){2,7}[0-9a-f]{0,4}$/i.test(hostname)) {
|
|
88
|
+
return {
|
|
89
|
+
type: 7,
|
|
90
|
+
ip: hostname,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
return {
|
|
95
|
+
type: 2,
|
|
96
|
+
value: hostname,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
}),
|
|
100
|
+
},
|
|
101
|
+
];
|
|
102
|
+
cert.setExtensions(extensions);
|
|
103
|
+
cert.sign(keys.privateKey, forge.md.sha256.create());
|
|
104
|
+
const privateKeyPem = forge.pki.privateKeyToPem(keys.privateKey);
|
|
105
|
+
const certificatePem = forge.pki.certificateToPem(cert);
|
|
106
|
+
await writeFile(this.privateKeyPath, privateKeyPem, 'utf8');
|
|
107
|
+
await writeFile(this.certificatePath, certificatePem, 'utf8');
|
|
108
|
+
this.logger.log(`Self-signed certificate generated successfully for: ${hostnames.join(', ')}`);
|
|
109
|
+
return {
|
|
110
|
+
privateKey: Buffer.from(privateKeyPem),
|
|
111
|
+
certificate: Buffer.from(certificatePem),
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
catch (error) {
|
|
115
|
+
this.logger.error('Failed to generate self-signed certificate:', error);
|
|
116
|
+
throw error;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
};
|
|
120
|
+
SslCertGeneratorService = SslCertGeneratorService_1 = __decorate([
|
|
121
|
+
Injectable(),
|
|
122
|
+
__metadata("design:paramtypes", [])
|
|
123
|
+
], SslCertGeneratorService);
|
|
124
|
+
export { SslCertGeneratorService };
|
|
125
|
+
//# sourceMappingURL=ssl-cert-generator.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ssl-cert-generator.service.js","sourceRoot":"","sources":["../../../src/core/ssl/ssl-cert-generator.service.ts"],"names":[],"mappings":"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"}
|
package/dist/globalDefaults.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalDefaults.js","sourceRoot":"","sources":["../src/globalDefaults.ts"],"names":[],"mappings":"AACA,UAAU,CAAC,MAAM,GAAG;IAElB,aAAa,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAC/B,iBAAiB,EAAE,MAAM;IAGzB,iBAAiB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IACnC,qBAAqB,EAAE,MAAM;CAC9B,CAAA;AAED,UAAU,CAAC,QAAQ,GAAG;IAEpB,UAAU,EAAE,KAAK;CAClB,CAAA"}
|
|
1
|
+
{"version":3,"file":"globalDefaults.js","sourceRoot":"","sources":["../src/globalDefaults.ts"],"names":[],"mappings":"AACA,UAAU,CAAC,MAAM,GAAG;IAElB,aAAa,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAC/B,iBAAiB,EAAE,MAAM;IAGzB,iBAAiB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IACnC,qBAAqB,EAAE,MAAM;CAC9B,CAAA;AAED,UAAU,CAAC,QAAQ,GAAG;IAEpB,UAAU,EAAE,KAAK;CAClB,CAAA;AAED,UAAU,CAAC,OAAO,GAAG;IAEnB,SAAS,EAAE,QAAQ;CACpB,CAAA"}
|
package/dist/main.js
CHANGED
|
@@ -12,6 +12,7 @@ import { AppModule } from './app.module.js';
|
|
|
12
12
|
import { ConfigService } from './core/config/config.service.js';
|
|
13
13
|
import { getStartupConfig } from './core/config/config.startup.js';
|
|
14
14
|
import { Logger } from './core/logger/logger.service.js';
|
|
15
|
+
import { SpaHtmlService } from './core/spa/spa-html.service.js';
|
|
15
16
|
import { SpaFilter } from './core/spa/spa.filter.js';
|
|
16
17
|
import './env-setup.js';
|
|
17
18
|
import 'reflect-metadata';
|
|
@@ -67,7 +68,19 @@ async function bootstrap() {
|
|
|
67
68
|
});
|
|
68
69
|
const configService = app.get(ConfigService);
|
|
69
70
|
const logger = app.get(Logger);
|
|
70
|
-
|
|
71
|
+
let realWebroot = startupConfig.webroot || '';
|
|
72
|
+
try {
|
|
73
|
+
await SpaHtmlService.updateIndexHtml(startupConfig.webroot);
|
|
74
|
+
process.env.UIX_ORIGINAL_WEBROOT = startupConfig.webroot;
|
|
75
|
+
configService.setOriginalWebroot(startupConfig.webroot);
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
78
|
+
logger.warn(`Could not update index.html with webroot ${startupConfig.webroot}: ${error.message}`);
|
|
79
|
+
realWebroot = '';
|
|
80
|
+
process.env.UIX_ORIGINAL_WEBROOT = globalThis.webroot.errorCode;
|
|
81
|
+
configService.setOriginalWebroot(globalThis.webroot.errorCode);
|
|
82
|
+
}
|
|
83
|
+
app.getHttpAdapter().get(realWebroot || '/', async (req, res) => {
|
|
71
84
|
res.type('text/html');
|
|
72
85
|
res.header('Cache-Control', 'no-cache, no-store, must-revalidate');
|
|
73
86
|
res.header('Pragma', 'no-cache');
|
|
@@ -79,8 +92,9 @@ async function bootstrap() {
|
|
|
79
92
|
setHeaders(res) {
|
|
80
93
|
res.setHeader('Cache-Control', 'public,max-age=31536000,immutable');
|
|
81
94
|
},
|
|
95
|
+
...realWebroot ? { prefix: realWebroot } : {},
|
|
82
96
|
});
|
|
83
|
-
app.setGlobalPrefix('/api
|
|
97
|
+
app.setGlobalPrefix(`${realWebroot || ''}/api`);
|
|
84
98
|
app.enableCors({
|
|
85
99
|
origin: ['http://localhost:8080', 'http://localhost:4200'],
|
|
86
100
|
methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
|
|
@@ -103,7 +117,7 @@ async function bootstrap() {
|
|
|
103
117
|
})
|
|
104
118
|
.build();
|
|
105
119
|
const document = SwaggerModule.createDocument(app, options);
|
|
106
|
-
SwaggerModule.setup(
|
|
120
|
+
SwaggerModule.setup(`${realWebroot}/swagger`.replace(/^\//, ''), app, document);
|
|
107
121
|
app.useGlobalFilters(new SpaFilter());
|
|
108
122
|
logger.warn(`Homebridge UI v${configService.package.version} is listening on ${startupConfig.host} port ${configService.ui.port}.`);
|
|
109
123
|
await app.listen(configService.ui.port, startupConfig.host);
|
|
@@ -120,7 +134,7 @@ async function bootstrap() {
|
|
|
120
134
|
port: configService.ui.port,
|
|
121
135
|
host: startupConfig.host === '0.0.0.0' || startupConfig.host === '::' ? undefined : startupConfig.host,
|
|
122
136
|
txt: {
|
|
123
|
-
path: '/',
|
|
137
|
+
path: realWebroot || '/',
|
|
124
138
|
version: configService.package.version,
|
|
125
139
|
https: startupConfig.httpsOptions ? 'true' : 'false',
|
|
126
140
|
},
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,6 @@ export declare class AccessoriesController {
|
|
|
5
5
|
constructor(accessoriesService: AccessoriesService);
|
|
6
6
|
getAccessories(): Promise<import("@homebridge/hap-client").ServiceType[]>;
|
|
7
7
|
getAccessoryLayout(req: any): Promise<any>;
|
|
8
|
-
getAccessory(uniqueId: string): Promise<import("@homebridge/hap-client").ServiceType>;
|
|
8
|
+
getAccessory(uniqueId: string): Promise<import("@homebridge/hap-client").ServiceType | import("./accessories.interfaces.js").MatterService>;
|
|
9
9
|
setAccessoryCharacteristic(uniqueId: any, body: AccessorySetCharacteristicDto): Promise<import("@homebridge/hap-client").ServiceType>;
|
|
10
10
|
}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
export interface MatterEvent {
|
|
2
|
+
type: 'accessoriesData' | 'accessoryUpdate' | 'accessoryAdded' | 'accessoryRemoved' | 'accessoryControlResponse';
|
|
3
|
+
data?: MatterAccessoriesResponse | MatterAccessoryInfo | MatterStateUpdate | MatterControlResponse;
|
|
4
|
+
}
|
|
5
|
+
export interface MatterAccessoriesResponse {
|
|
6
|
+
accessories: MatterAccessory[];
|
|
7
|
+
error?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface MatterAccessory {
|
|
10
|
+
uuid: string;
|
|
11
|
+
displayName: string;
|
|
12
|
+
deviceType: string;
|
|
13
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
14
|
+
manufacturer?: string;
|
|
15
|
+
model?: string;
|
|
16
|
+
serialNumber?: string;
|
|
17
|
+
firmwareRevision?: string;
|
|
18
|
+
bridge?: {
|
|
19
|
+
name?: string;
|
|
20
|
+
username?: string;
|
|
21
|
+
};
|
|
22
|
+
plugin?: string;
|
|
23
|
+
platform?: string;
|
|
24
|
+
commissioned?: boolean;
|
|
25
|
+
fabricCount?: number;
|
|
26
|
+
fabrics?: unknown[];
|
|
27
|
+
parts?: MatterAccessoryPart[];
|
|
28
|
+
}
|
|
29
|
+
export interface MatterAccessoryPart {
|
|
30
|
+
id: string;
|
|
31
|
+
displayName: string;
|
|
32
|
+
deviceType: string;
|
|
33
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
34
|
+
}
|
|
35
|
+
export interface MatterAccessoryInfo extends MatterAccessory {
|
|
36
|
+
error?: string;
|
|
37
|
+
}
|
|
38
|
+
export interface MatterService {
|
|
39
|
+
uniqueId: string;
|
|
40
|
+
uuid: string;
|
|
41
|
+
serviceName: string;
|
|
42
|
+
displayName: string;
|
|
43
|
+
deviceType: string;
|
|
44
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
45
|
+
partId?: string;
|
|
46
|
+
protocol: 'matter';
|
|
47
|
+
instance: {
|
|
48
|
+
name: string;
|
|
49
|
+
username: string;
|
|
50
|
+
};
|
|
51
|
+
accessoryInformation: {
|
|
52
|
+
'Name': string;
|
|
53
|
+
'Manufacturer': string;
|
|
54
|
+
'Model': string;
|
|
55
|
+
'Serial Number': string;
|
|
56
|
+
'Firmware Revision': string;
|
|
57
|
+
};
|
|
58
|
+
bridge?: {
|
|
59
|
+
name?: string;
|
|
60
|
+
username?: string;
|
|
61
|
+
};
|
|
62
|
+
plugin?: string;
|
|
63
|
+
platform?: string;
|
|
64
|
+
commissioned?: boolean;
|
|
65
|
+
fabricCount?: number;
|
|
66
|
+
fabrics?: unknown[];
|
|
67
|
+
aid: 0;
|
|
68
|
+
iid: 0;
|
|
69
|
+
}
|
|
70
|
+
export interface MatterStateUpdate {
|
|
71
|
+
uuid: string;
|
|
72
|
+
cluster: string;
|
|
73
|
+
state: Record<string, unknown>;
|
|
74
|
+
partId?: string;
|
|
75
|
+
}
|
|
76
|
+
export interface MatterControlResponse {
|
|
77
|
+
success: boolean;
|
|
78
|
+
error?: string;
|
|
79
|
+
}
|
|
80
|
+
export interface MatterControlRequest {
|
|
81
|
+
uniqueId: string;
|
|
82
|
+
cluster: string;
|
|
83
|
+
attributes: Record<string, unknown>;
|
|
84
|
+
}
|
|
85
|
+
export interface AccessoryControlMessage {
|
|
86
|
+
set?: {
|
|
87
|
+
uniqueId: string;
|
|
88
|
+
iid?: number;
|
|
89
|
+
value?: string | number | boolean;
|
|
90
|
+
cluster?: string;
|
|
91
|
+
attributes?: Record<string, unknown>;
|
|
92
|
+
};
|
|
93
|
+
refresh?: boolean;
|
|
94
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessories.interfaces.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.interfaces.ts"],"names":[],"mappings":""}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { Module } from '@nestjs/common';
|
|
8
8
|
import { PassportModule } from '@nestjs/passport';
|
|
9
9
|
import { ConfigModule } from '../../core/config/config.module.js';
|
|
10
|
+
import { HomebridgeIpcModule } from '../../core/homebridge-ipc/homebridge-ipc.module.js';
|
|
10
11
|
import { LoggerModule } from '../../core/logger/logger.module.js';
|
|
11
12
|
import { AccessoriesController } from './accessories.controller.js';
|
|
12
13
|
import { AccessoriesGateway } from './accessories.gateway.js';
|
|
@@ -19,6 +20,7 @@ AccessoriesModule = __decorate([
|
|
|
19
20
|
PassportModule.register({ defaultStrategy: 'jwt' }),
|
|
20
21
|
ConfigModule,
|
|
21
22
|
LoggerModule,
|
|
23
|
+
HomebridgeIpcModule,
|
|
22
24
|
],
|
|
23
25
|
providers: [
|
|
24
26
|
AccessoriesService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoBtD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAlB7B,MAAM,CAAC;QACN,OAAO,EAAE;YACP,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YACnD,YAAY;YACZ,YAAY;YACZ,mBAAmB;SACpB;QACD,SAAS,EAAE;YACT,kBAAkB;YAClB,kBAAkB;SACnB;QACD,OAAO,EAAE;YACP,kBAAkB;SACnB;QACD,WAAW,EAAE;YACX,qBAAqB;SACtB;KACF,CAAC;GACW,iBAAiB,CAAG"}
|
|
@@ -1,20 +1,38 @@
|
|
|
1
1
|
import type { ServiceType } from '@homebridge/hap-client';
|
|
2
|
+
import type { Socket } from 'socket.io';
|
|
3
|
+
import type { MatterService } from './accessories.interfaces.js';
|
|
2
4
|
import { HapClient } from '@homebridge/hap-client';
|
|
3
5
|
import NodeCache from 'node-cache';
|
|
4
6
|
import { ConfigService } from '../../core/config/config.service.js';
|
|
7
|
+
import { HomebridgeIpcService } from '../../core/homebridge-ipc/homebridge-ipc.service.js';
|
|
5
8
|
import { Logger } from '../../core/logger/logger.service.js';
|
|
6
9
|
export declare class AccessoriesService {
|
|
7
10
|
private readonly configService;
|
|
8
11
|
private readonly logger;
|
|
12
|
+
private readonly homebridgeIpcService;
|
|
9
13
|
hapClient: HapClient;
|
|
10
14
|
accessoriesCache: NodeCache;
|
|
11
|
-
|
|
12
|
-
|
|
15
|
+
private matterMonitoringActive;
|
|
16
|
+
private matterUpdateListener;
|
|
17
|
+
private activeClients;
|
|
18
|
+
private matterAccessories;
|
|
19
|
+
constructor(configService: ConfigService, logger: Logger, homebridgeIpcService: HomebridgeIpcService);
|
|
20
|
+
connect(client: Socket): Promise<void>;
|
|
13
21
|
private refreshCharacteristics;
|
|
14
22
|
loadAccessories(): Promise<ServiceType[]>;
|
|
15
|
-
getAccessory(uniqueId: string): Promise<ServiceType>;
|
|
23
|
+
getAccessory(uniqueId: string): Promise<ServiceType | MatterService>;
|
|
24
|
+
private getMatterAccessory;
|
|
16
25
|
setAccessoryCharacteristic(uniqueId: string, characteristicType: string, value: number | boolean | string): Promise<ServiceType>;
|
|
17
26
|
getAccessoryLayout(username: string): Promise<any>;
|
|
18
27
|
saveAccessoryLayout(user: string, layout: Record<string, unknown>): Promise<Record<string, unknown>>;
|
|
19
28
|
resetInstancePool(): void;
|
|
29
|
+
private parseMatterUniqueId;
|
|
30
|
+
private buildMatterUniqueId;
|
|
31
|
+
private waitForMatterEvent;
|
|
32
|
+
private startMatterMonitoring;
|
|
33
|
+
private stopMatterMonitoring;
|
|
34
|
+
private loadMatterAccessories;
|
|
35
|
+
private transformMatterAccessory;
|
|
36
|
+
private handleMatterStateUpdate;
|
|
37
|
+
private handleMatterControl;
|
|
20
38
|
}
|