@homebridge/hap-client 3.4.0 → 3.4.1-beta.0
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/.github/npm-version-script-esm.js +97 -0
- package/CHANGELOG.md +13 -0
- package/dist/eventedHttpClient/httpParser.js +7 -10
- package/dist/eventedHttpClient/httpParser.js.map +1 -1
- package/dist/eventedHttpClient/index.d.ts +1 -1
- package/dist/eventedHttpClient/index.js +6 -14
- package/dist/eventedHttpClient/index.js.map +1 -1
- package/dist/hap-types.js +4 -7
- package/dist/hap-types.js.map +1 -1
- package/dist/index.d.ts +11 -9
- package/dist/index.js +161 -131
- package/dist/index.js.map +1 -1
- package/dist/interfaces.js +1 -2
- package/dist/mdns-discovery.d.ts +21 -0
- package/dist/mdns-discovery.js +143 -0
- package/dist/mdns-discovery.js.map +1 -0
- package/dist/mdns-packet.d.ts +38 -0
- package/dist/mdns-packet.js +201 -0
- package/dist/mdns-packet.js.map +1 -0
- package/dist/monitor.d.ts +5 -5
- package/dist/monitor.js +8 -12
- package/dist/monitor.js.map +1 -1
- package/dist/uuid.js +3 -7
- package/dist/uuid.js.map +1 -1
- package/package.json +21 -13
- package/scripts/gen-hap-types.ts +4 -1
- package/scripts/notest.ts +1 -1
- package/vitest.config.ts +10 -0
- package/jest.config.ts +0 -12
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import { createSocket } from 'node:dgram';
|
|
2
|
+
import { EventEmitter } from 'node:events';
|
|
3
|
+
import { buildQuery, DNS_TYPE, parseResponse, } from './mdns-packet.js';
|
|
4
|
+
const MDNS_ADDRESS = '224.0.0.251';
|
|
5
|
+
const MDNS_PORT = 5353;
|
|
6
|
+
export class MdnsDiscovery extends EventEmitter {
|
|
7
|
+
socket = null;
|
|
8
|
+
queryInterval = null;
|
|
9
|
+
emitTimers = new Map();
|
|
10
|
+
pendingServices = new Map();
|
|
11
|
+
emittedServices = new Set();
|
|
12
|
+
start() {
|
|
13
|
+
if (this.socket) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
this.socket = createSocket({ type: 'udp4', reuseAddr: false });
|
|
17
|
+
this.socket.on('message', (msg) => {
|
|
18
|
+
this.handleResponse(msg);
|
|
19
|
+
});
|
|
20
|
+
this.socket.on('error', (err) => {
|
|
21
|
+
this.emit('error', err);
|
|
22
|
+
});
|
|
23
|
+
this.socket.bind(0, () => {
|
|
24
|
+
this.sendQuery();
|
|
25
|
+
this.queryInterval = setInterval(() => {
|
|
26
|
+
this.sendQuery();
|
|
27
|
+
}, 15000);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
stop() {
|
|
31
|
+
if (this.queryInterval) {
|
|
32
|
+
clearInterval(this.queryInterval);
|
|
33
|
+
this.queryInterval = null;
|
|
34
|
+
}
|
|
35
|
+
for (const timer of this.emitTimers.values()) {
|
|
36
|
+
clearTimeout(timer);
|
|
37
|
+
}
|
|
38
|
+
this.emitTimers.clear();
|
|
39
|
+
this.pendingServices.clear();
|
|
40
|
+
this.emittedServices.clear();
|
|
41
|
+
if (this.socket) {
|
|
42
|
+
try {
|
|
43
|
+
this.socket.close();
|
|
44
|
+
}
|
|
45
|
+
catch { }
|
|
46
|
+
this.socket = null;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
update() {
|
|
50
|
+
this.emittedServices.clear();
|
|
51
|
+
this.sendQuery();
|
|
52
|
+
}
|
|
53
|
+
sendQuery() {
|
|
54
|
+
if (!this.socket) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const query = buildQuery('_hap._tcp.local', DNS_TYPE.PTR, true);
|
|
58
|
+
this.socket.send(query, 0, query.length, MDNS_PORT, MDNS_ADDRESS, (err) => {
|
|
59
|
+
if (err) {
|
|
60
|
+
this.emit('error', err);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
handleResponse(msg) {
|
|
65
|
+
const response = parseResponse(msg);
|
|
66
|
+
const allRecords = [...response.answers, ...response.additionals];
|
|
67
|
+
for (const record of response.answers) {
|
|
68
|
+
if (record.type === DNS_TYPE.PTR && record.name === '_hap._tcp.local') {
|
|
69
|
+
const ptrData = record.data;
|
|
70
|
+
if (ptrData?.domain) {
|
|
71
|
+
this.getOrCreatePending(ptrData.domain);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
for (const record of allRecords) {
|
|
76
|
+
switch (record.type) {
|
|
77
|
+
case DNS_TYPE.SRV: {
|
|
78
|
+
const srvData = record.data;
|
|
79
|
+
const pending = this.pendingServices.get(record.name);
|
|
80
|
+
if (pending && srvData) {
|
|
81
|
+
pending.hostname = srvData.target;
|
|
82
|
+
pending.port = srvData.port;
|
|
83
|
+
}
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
case DNS_TYPE.TXT: {
|
|
87
|
+
const txtData = record.data;
|
|
88
|
+
const pending = this.pendingServices.get(record.name);
|
|
89
|
+
if (pending && txtData?.entries) {
|
|
90
|
+
pending.txt = txtData.entries;
|
|
91
|
+
}
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
case DNS_TYPE.A: {
|
|
95
|
+
const aData = record.data;
|
|
96
|
+
if (aData?.address) {
|
|
97
|
+
for (const pending of this.pendingServices.values()) {
|
|
98
|
+
if (pending.hostname === record.name && !pending.addresses.includes(aData.address)) {
|
|
99
|
+
pending.addresses.push(aData.address);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
break;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
for (const [instanceName, pending] of this.pendingServices) {
|
|
108
|
+
if (pending.port && pending.txt && pending.addresses.length > 0) {
|
|
109
|
+
this.scheduleEmit(instanceName, pending);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
getOrCreatePending(instanceName) {
|
|
114
|
+
let pending = this.pendingServices.get(instanceName);
|
|
115
|
+
if (!pending) {
|
|
116
|
+
pending = { instanceName, addresses: [] };
|
|
117
|
+
this.pendingServices.set(instanceName, pending);
|
|
118
|
+
}
|
|
119
|
+
return pending;
|
|
120
|
+
}
|
|
121
|
+
scheduleEmit(instanceName, pending) {
|
|
122
|
+
if (this.emittedServices.has(instanceName) && this.emitTimers.has(instanceName)) {
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
const existingTimer = this.emitTimers.get(instanceName);
|
|
126
|
+
if (existingTimer) {
|
|
127
|
+
clearTimeout(existingTimer);
|
|
128
|
+
}
|
|
129
|
+
const timer = setTimeout(() => {
|
|
130
|
+
this.emitTimers.delete(instanceName);
|
|
131
|
+
this.emittedServices.add(instanceName);
|
|
132
|
+
const device = {
|
|
133
|
+
name: pending.instanceName,
|
|
134
|
+
txt: pending.txt,
|
|
135
|
+
port: pending.port,
|
|
136
|
+
addresses: [...pending.addresses],
|
|
137
|
+
};
|
|
138
|
+
this.emit('up', device);
|
|
139
|
+
}, 150);
|
|
140
|
+
this.emitTimers.set(instanceName, timer);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=mdns-discovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mdns-discovery.js","sourceRoot":"","sources":["../src/mdns-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Buffer } from 'node:buffer';
|
|
2
|
+
export declare const DNS_TYPE: {
|
|
3
|
+
readonly A: 1;
|
|
4
|
+
readonly PTR: 12;
|
|
5
|
+
readonly TXT: 16;
|
|
6
|
+
readonly AAAA: 28;
|
|
7
|
+
readonly SRV: 33;
|
|
8
|
+
};
|
|
9
|
+
export interface DnsRecord {
|
|
10
|
+
name: string;
|
|
11
|
+
type: number;
|
|
12
|
+
ttl: number;
|
|
13
|
+
data: PtrData | SrvData | TxtData | AData | AaaaData | unknown;
|
|
14
|
+
}
|
|
15
|
+
export interface PtrData {
|
|
16
|
+
domain: string;
|
|
17
|
+
}
|
|
18
|
+
export interface SrvData {
|
|
19
|
+
priority: number;
|
|
20
|
+
weight: number;
|
|
21
|
+
port: number;
|
|
22
|
+
target: string;
|
|
23
|
+
}
|
|
24
|
+
export interface TxtData {
|
|
25
|
+
entries: Record<string, string>;
|
|
26
|
+
}
|
|
27
|
+
export interface AData {
|
|
28
|
+
address: string;
|
|
29
|
+
}
|
|
30
|
+
export interface AaaaData {
|
|
31
|
+
address: string;
|
|
32
|
+
}
|
|
33
|
+
export interface ParsedResponse {
|
|
34
|
+
answers: DnsRecord[];
|
|
35
|
+
additionals: DnsRecord[];
|
|
36
|
+
}
|
|
37
|
+
export declare function buildQuery(name: string, type: number, unicastResponse?: boolean): Buffer;
|
|
38
|
+
export declare function parseResponse(buf: Buffer): ParsedResponse;
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
import { Buffer } from 'node:buffer';
|
|
2
|
+
export const DNS_TYPE = {
|
|
3
|
+
A: 1,
|
|
4
|
+
PTR: 12,
|
|
5
|
+
TXT: 16,
|
|
6
|
+
AAAA: 28,
|
|
7
|
+
SRV: 33,
|
|
8
|
+
};
|
|
9
|
+
export function buildQuery(name, type, unicastResponse = true) {
|
|
10
|
+
const header = Buffer.alloc(12);
|
|
11
|
+
header.writeUInt16BE(1, 4);
|
|
12
|
+
const qname = encodeName(name);
|
|
13
|
+
const qtypeClass = Buffer.alloc(4);
|
|
14
|
+
qtypeClass.writeUInt16BE(type, 0);
|
|
15
|
+
qtypeClass.writeUInt16BE(unicastResponse ? 0x8001 : 0x0001, 2);
|
|
16
|
+
return Buffer.concat([header, qname, qtypeClass]);
|
|
17
|
+
}
|
|
18
|
+
export function parseResponse(buf) {
|
|
19
|
+
if (buf.length < 12) {
|
|
20
|
+
return { answers: [], additionals: [] };
|
|
21
|
+
}
|
|
22
|
+
const qdcount = buf.readUInt16BE(4);
|
|
23
|
+
const ancount = buf.readUInt16BE(6);
|
|
24
|
+
const nscount = buf.readUInt16BE(8);
|
|
25
|
+
const arcount = buf.readUInt16BE(10);
|
|
26
|
+
let offset = 12;
|
|
27
|
+
for (let i = 0; i < qdcount; i++) {
|
|
28
|
+
const result = decodeName(buf, offset);
|
|
29
|
+
offset = result.offset + 4;
|
|
30
|
+
}
|
|
31
|
+
const answers = [];
|
|
32
|
+
for (let i = 0; i < ancount; i++) {
|
|
33
|
+
const result = parseRecord(buf, offset);
|
|
34
|
+
if (!result) {
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
answers.push(result.record);
|
|
38
|
+
offset = result.offset;
|
|
39
|
+
}
|
|
40
|
+
for (let i = 0; i < nscount; i++) {
|
|
41
|
+
const result = skipRecord(buf, offset);
|
|
42
|
+
if (!result) {
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
offset = result;
|
|
46
|
+
}
|
|
47
|
+
const additionals = [];
|
|
48
|
+
for (let i = 0; i < arcount; i++) {
|
|
49
|
+
const result = parseRecord(buf, offset);
|
|
50
|
+
if (!result) {
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
additionals.push(result.record);
|
|
54
|
+
offset = result.offset;
|
|
55
|
+
}
|
|
56
|
+
return { answers, additionals };
|
|
57
|
+
}
|
|
58
|
+
function encodeName(name) {
|
|
59
|
+
const parts = name.split('.');
|
|
60
|
+
const buffers = [];
|
|
61
|
+
for (const part of parts) {
|
|
62
|
+
if (part.length > 63) {
|
|
63
|
+
throw new Error(`DNS label too long: ${part}`);
|
|
64
|
+
}
|
|
65
|
+
buffers.push(Buffer.from([part.length]));
|
|
66
|
+
buffers.push(Buffer.from(part));
|
|
67
|
+
}
|
|
68
|
+
buffers.push(Buffer.from([0]));
|
|
69
|
+
return Buffer.concat(buffers);
|
|
70
|
+
}
|
|
71
|
+
function decodeName(buf, offset) {
|
|
72
|
+
const labels = [];
|
|
73
|
+
let jumped = false;
|
|
74
|
+
let readOffset = offset;
|
|
75
|
+
const visited = new Set();
|
|
76
|
+
while (readOffset < buf.length) {
|
|
77
|
+
const len = buf[readOffset];
|
|
78
|
+
if (len === 0) {
|
|
79
|
+
if (!jumped) {
|
|
80
|
+
offset = readOffset + 1;
|
|
81
|
+
}
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
if ((len & 0xC0) === 0xC0) {
|
|
85
|
+
if (readOffset + 1 >= buf.length) {
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
const pointer = ((len & 0x3F) << 8) | buf[readOffset + 1];
|
|
89
|
+
if (visited.has(pointer)) {
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
visited.add(pointer);
|
|
93
|
+
if (!jumped) {
|
|
94
|
+
offset = readOffset + 2;
|
|
95
|
+
}
|
|
96
|
+
jumped = true;
|
|
97
|
+
readOffset = pointer;
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
readOffset++;
|
|
101
|
+
if (readOffset + len > buf.length) {
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
labels.push(buf.toString('utf8', readOffset, readOffset + len));
|
|
105
|
+
readOffset += len;
|
|
106
|
+
}
|
|
107
|
+
return { name: labels.join('.'), offset };
|
|
108
|
+
}
|
|
109
|
+
function parseRecord(buf, offset) {
|
|
110
|
+
if (offset >= buf.length) {
|
|
111
|
+
return null;
|
|
112
|
+
}
|
|
113
|
+
const nameResult = decodeName(buf, offset);
|
|
114
|
+
offset = nameResult.offset;
|
|
115
|
+
if (offset + 10 > buf.length) {
|
|
116
|
+
return null;
|
|
117
|
+
}
|
|
118
|
+
const type = buf.readUInt16BE(offset);
|
|
119
|
+
const ttl = buf.readUInt32BE(offset + 4);
|
|
120
|
+
const rdlength = buf.readUInt16BE(offset + 8);
|
|
121
|
+
offset += 10;
|
|
122
|
+
if (offset + rdlength > buf.length) {
|
|
123
|
+
return null;
|
|
124
|
+
}
|
|
125
|
+
const data = parseRecordData(buf, offset, rdlength, type);
|
|
126
|
+
offset += rdlength;
|
|
127
|
+
return {
|
|
128
|
+
record: { name: nameResult.name, type, ttl, data },
|
|
129
|
+
offset,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
function skipRecord(buf, offset) {
|
|
133
|
+
if (offset >= buf.length) {
|
|
134
|
+
return null;
|
|
135
|
+
}
|
|
136
|
+
const nameResult = decodeName(buf, offset);
|
|
137
|
+
offset = nameResult.offset;
|
|
138
|
+
if (offset + 10 > buf.length) {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
const rdlength = buf.readUInt16BE(offset + 8);
|
|
142
|
+
offset += 10 + rdlength;
|
|
143
|
+
return offset <= buf.length ? offset : null;
|
|
144
|
+
}
|
|
145
|
+
function parseRecordData(buf, offset, rdlength, type) {
|
|
146
|
+
switch (type) {
|
|
147
|
+
case DNS_TYPE.PTR: {
|
|
148
|
+
const result = decodeName(buf, offset);
|
|
149
|
+
return { domain: result.name };
|
|
150
|
+
}
|
|
151
|
+
case DNS_TYPE.SRV: {
|
|
152
|
+
if (rdlength < 6) {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
const priority = buf.readUInt16BE(offset);
|
|
156
|
+
const weight = buf.readUInt16BE(offset + 2);
|
|
157
|
+
const port = buf.readUInt16BE(offset + 4);
|
|
158
|
+
const target = decodeName(buf, offset + 6).name;
|
|
159
|
+
return { priority, weight, port, target };
|
|
160
|
+
}
|
|
161
|
+
case DNS_TYPE.TXT: {
|
|
162
|
+
const entries = {};
|
|
163
|
+
let pos = offset;
|
|
164
|
+
const end = offset + rdlength;
|
|
165
|
+
while (pos < end) {
|
|
166
|
+
const txtLen = buf[pos];
|
|
167
|
+
pos++;
|
|
168
|
+
if (pos + txtLen > end) {
|
|
169
|
+
break;
|
|
170
|
+
}
|
|
171
|
+
const txt = buf.toString('utf8', pos, pos + txtLen);
|
|
172
|
+
const eqIndex = txt.indexOf('=');
|
|
173
|
+
if (eqIndex > 0) {
|
|
174
|
+
entries[txt.slice(0, eqIndex)] = txt.slice(eqIndex + 1);
|
|
175
|
+
}
|
|
176
|
+
pos += txtLen;
|
|
177
|
+
}
|
|
178
|
+
return { entries };
|
|
179
|
+
}
|
|
180
|
+
case DNS_TYPE.A: {
|
|
181
|
+
if (rdlength !== 4) {
|
|
182
|
+
return null;
|
|
183
|
+
}
|
|
184
|
+
const address = `${buf[offset]}.${buf[offset + 1]}.${buf[offset + 2]}.${buf[offset + 3]}`;
|
|
185
|
+
return { address };
|
|
186
|
+
}
|
|
187
|
+
case DNS_TYPE.AAAA: {
|
|
188
|
+
if (rdlength !== 16) {
|
|
189
|
+
return null;
|
|
190
|
+
}
|
|
191
|
+
const parts = [];
|
|
192
|
+
for (let i = 0; i < 16; i += 2) {
|
|
193
|
+
parts.push(buf.readUInt16BE(offset + i).toString(16));
|
|
194
|
+
}
|
|
195
|
+
return { address: parts.join(':') };
|
|
196
|
+
}
|
|
197
|
+
default:
|
|
198
|
+
return null;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
//# sourceMappingURL=mdns-packet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mdns-packet.js","sourceRoot":"","sources":["../src/mdns-packet.ts"],"names":[],"mappings":"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"}
|
package/dist/monitor.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
|
-
import { HapEvInstance, ServiceType } from './interfaces';
|
|
2
|
+
import { HapEvInstance, ServiceType } from './interfaces.js';
|
|
3
3
|
export declare class HapMonitor extends EventEmitter {
|
|
4
|
-
private pin;
|
|
5
|
-
private evInstances;
|
|
6
|
-
private services;
|
|
4
|
+
private readonly pin;
|
|
5
|
+
private readonly evInstances;
|
|
6
|
+
private readonly services;
|
|
7
7
|
private logger;
|
|
8
|
-
private debug;
|
|
8
|
+
private readonly debug;
|
|
9
9
|
constructor(logger: any, debug: any, pin: string, services: ServiceType[]);
|
|
10
10
|
log(message: string): void;
|
|
11
11
|
error(message: string): void;
|
package/dist/monitor.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const node_events_1 = require("node:events");
|
|
5
|
-
const eventedHttpClient_1 = require("./eventedHttpClient");
|
|
6
|
-
class HapMonitor extends node_events_1.EventEmitter {
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import { createConnection, parseMessage } from './eventedHttpClient/index.js';
|
|
3
|
+
export class HapMonitor extends EventEmitter {
|
|
7
4
|
pin;
|
|
8
5
|
evInstances;
|
|
9
6
|
services;
|
|
@@ -33,10 +30,10 @@ class HapMonitor extends node_events_1.EventEmitter {
|
|
|
33
30
|
connectInstance(instance) {
|
|
34
31
|
try {
|
|
35
32
|
this.debug(`[HapClient] [${instance.ipAddress}:${instance.port} (${instance.username})] Connecting`);
|
|
36
|
-
instance.socket =
|
|
33
|
+
instance.socket = createConnection(instance, this.pin, { characteristics: instance.evCharacteristics });
|
|
37
34
|
this.debug(`[HapClient] [${instance.ipAddress}:${instance.port} (${instance.username})] Connected`);
|
|
38
35
|
instance.socket.on('data', (data) => {
|
|
39
|
-
const message =
|
|
36
|
+
const message = parseMessage(data);
|
|
40
37
|
if (message.statusCode === 401) {
|
|
41
38
|
this.debug(`[HapClient] [${instance.ipAddress}:${instance.port} (${instance.username})] `
|
|
42
39
|
+ `${message.statusCode} ${message.statusMessage} - make sure Homebridge pin for this instance is set to ${this.pin}.`);
|
|
@@ -110,14 +107,14 @@ class HapMonitor extends node_events_1.EventEmitter {
|
|
|
110
107
|
for (const service of this.services) {
|
|
111
108
|
const evCharacteristics = service.serviceCharacteristics.filter(x => x.perms.includes('ev'));
|
|
112
109
|
if (evCharacteristics.length) {
|
|
113
|
-
if (!this.evInstances.
|
|
114
|
-
const newInstance =
|
|
110
|
+
if (!this.evInstances.some(x => x.username === service.instance.username)) {
|
|
111
|
+
const newInstance = { ...service.instance };
|
|
115
112
|
newInstance.evCharacteristics = [];
|
|
116
113
|
this.evInstances.push(newInstance);
|
|
117
114
|
}
|
|
118
115
|
const instance = this.evInstances.find(x => x.username === service.instance.username);
|
|
119
116
|
for (const evCharacteristic of evCharacteristics) {
|
|
120
|
-
if (!instance.evCharacteristics.
|
|
117
|
+
if (!instance.evCharacteristics.some(x => x.aid === service.aid && x.iid === evCharacteristic.iid)) {
|
|
121
118
|
instance.evCharacteristics.push({ aid: service.aid, iid: evCharacteristic.iid, ev: true });
|
|
122
119
|
}
|
|
123
120
|
}
|
|
@@ -125,5 +122,4 @@ class HapMonitor extends node_events_1.EventEmitter {
|
|
|
125
122
|
}
|
|
126
123
|
}
|
|
127
124
|
}
|
|
128
|
-
exports.HapMonitor = HapMonitor;
|
|
129
125
|
//# sourceMappingURL=monitor.js.map
|
package/dist/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../src/monitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../src/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/uuid.js
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isValid = isValid;
|
|
4
|
-
exports.toLongFormUUID = toLongFormUUID;
|
|
5
1
|
const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
6
|
-
function isValid(UUID) {
|
|
2
|
+
export function isValid(UUID) {
|
|
7
3
|
return VALID_UUID_REGEX.test(UUID);
|
|
8
4
|
}
|
|
9
5
|
const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i;
|
|
10
|
-
function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
|
|
6
|
+
export function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
|
|
11
7
|
if (isValid(uuid)) {
|
|
12
8
|
return uuid.toUpperCase();
|
|
13
9
|
}
|
|
@@ -17,6 +13,6 @@ function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
|
|
|
17
13
|
if (!isValid(`00000000${base}`)) {
|
|
18
14
|
throw new TypeError('base was not a valid base UUID');
|
|
19
15
|
}
|
|
20
|
-
return ((`00000000${uuid}`).
|
|
16
|
+
return ((`00000000${uuid}`).slice(-8) + base).toUpperCase();
|
|
21
17
|
}
|
|
22
18
|
//# sourceMappingURL=uuid.js.map
|
package/dist/uuid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../src/uuid.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../src/uuid.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG,iEAAiE,CAAA;AAE1F,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpC,CAAC;AACD,MAAM,iBAAiB,GAAG,kBAAkB,CAAA;AAE5C,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAI,GAAG,8BAA8B;IAChF,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;IACD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAA;IACvD,CAAC;IAED,OAAO,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAA;AAC7D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@homebridge/hap-client",
|
|
3
|
-
"version": "3.4.0",
|
|
3
|
+
"version": "3.4.1-beta.0",
|
|
4
4
|
"description": "A client for HAP-NodeJS.",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"main": "dist/index.js",
|
|
6
7
|
"types": "dist/index.d.ts",
|
|
8
|
+
"exports": {
|
|
9
|
+
".": {
|
|
10
|
+
"types": "./dist/index.d.ts",
|
|
11
|
+
"default": "./dist/index.js"
|
|
12
|
+
},
|
|
13
|
+
"./hap-types": {
|
|
14
|
+
"types": "./dist/hap-types.d.ts",
|
|
15
|
+
"default": "./dist/hap-types.js"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
7
18
|
"scripts": {
|
|
8
19
|
"check": "npm install && npm outdated",
|
|
9
20
|
"clean": "rimraf ./dist",
|
|
@@ -11,8 +22,8 @@
|
|
|
11
22
|
"lint:fix": "npm run lint -- --fix",
|
|
12
23
|
"build": "tsc",
|
|
13
24
|
"prepublishOnly": "npm run lint && npm run build",
|
|
14
|
-
"test": "
|
|
15
|
-
"test-coverage": "
|
|
25
|
+
"test": "vitest run",
|
|
26
|
+
"test-coverage": "vitest run --coverage",
|
|
16
27
|
"gen": "ts-node scripts/gen-hap-types.ts"
|
|
17
28
|
},
|
|
18
29
|
"repository": {
|
|
@@ -41,20 +52,17 @@
|
|
|
41
52
|
"dependencies": {
|
|
42
53
|
"axios": "1.13.6",
|
|
43
54
|
"bonjour-service": "1.3.0",
|
|
44
|
-
"decamelize": "
|
|
45
|
-
"inflection": "3.0.2"
|
|
46
|
-
"source-map-support": "0.5.21"
|
|
55
|
+
"decamelize": "6.0.1",
|
|
56
|
+
"inflection": "3.0.2"
|
|
47
57
|
},
|
|
48
58
|
"devDependencies": {
|
|
49
|
-
"@antfu/eslint-config": "^7.
|
|
59
|
+
"@antfu/eslint-config": "^7.7.0",
|
|
50
60
|
"@homebridge/hap-nodejs": "^2.1.0",
|
|
51
|
-
"@types/
|
|
52
|
-
"@
|
|
53
|
-
"@types/source-map-support": "^0.5.10",
|
|
61
|
+
"@types/node": "^25.4.0",
|
|
62
|
+
"@vitest/coverage-v8": "^4.0.18",
|
|
54
63
|
"eslint-plugin-format": "^2.0.1",
|
|
55
|
-
"jest": "^30.2.0",
|
|
56
|
-
"ts-jest": "^29.4.6",
|
|
57
64
|
"ts-node": "^10.9.2",
|
|
58
|
-
"typescript": "^5.9.3"
|
|
65
|
+
"typescript": "^5.9.3",
|
|
66
|
+
"vitest": "^4.0.18"
|
|
59
67
|
}
|
|
60
68
|
}
|
package/scripts/gen-hap-types.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { writeFileSync } from 'node:fs';
|
|
2
|
-
import { resolve } from 'node:path';
|
|
2
|
+
import { dirname, resolve } from 'node:path';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
3
4
|
|
|
4
5
|
import { Characteristic, Service, Categories } from '@homebridge/hap-nodejs';
|
|
5
6
|
|
|
7
|
+
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
8
|
+
|
|
6
9
|
/** Generate Service Types */
|
|
7
10
|
|
|
8
11
|
let Services = [
|
package/scripts/notest.ts
CHANGED
package/vitest.config.ts
ADDED
package/jest.config.ts
DELETED