homey-api 1.7.8 → 1.9.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/assets/specifications/HomeyAPIV3Cloud.json +606 -130
- package/assets/specifications/HomeyAPIV3Local.json +4004 -1
- package/assets/types/homey-api.d.ts +7372 -2394
- package/assets/types/homey-api.private.d.ts +7587 -2410
- package/lib/HomeyAPI/HomeyAPI.js +2 -0
- package/lib/HomeyAPI/HomeyAPIV2/Manager.js +4 -0
- package/lib/HomeyAPI/HomeyAPIV2.js +27 -0
- package/package.json +2 -2
package/lib/HomeyAPI/HomeyAPI.js
CHANGED
|
@@ -14,12 +14,14 @@ class HomeyAPI {
|
|
|
14
14
|
* @property {string} DISCOVERY_STRATEGIES.MDNS - Local HTTP, e.g. `http://homey-abcdef.local`
|
|
15
15
|
* @property {string} DISCOVERY_STRATEGIES.LOCAL - Local HTTP, e.g. `http://192.168.1.100`.
|
|
16
16
|
* @property {string} DISCOVERY_STRATEGIES.LOCAL_SECURE - Local HTTPS, e.g. `https://192-168-1-100.homey.homeylocal.com`.
|
|
17
|
+
* @property {string} DISCOVERY_STRATEGIES.REMOTE_FORWARDED - Remote HTTPS, e.g. `https://12-34-56-78.homey.homeylocal.com:12345`.
|
|
17
18
|
*/
|
|
18
19
|
static DISCOVERY_STRATEGIES = {
|
|
19
20
|
MDNS: 'mdns',
|
|
20
21
|
CLOUD: 'cloud',
|
|
21
22
|
LOCAL: 'local',
|
|
22
23
|
LOCAL_SECURE: 'localSecure',
|
|
24
|
+
REMOTE_FORWARDED: 'remoteForwarded',
|
|
23
25
|
};
|
|
24
26
|
|
|
25
27
|
constructor({
|
|
@@ -152,6 +152,10 @@ class Manager extends EventEmitter {
|
|
|
152
152
|
if (parameter.type === 'array' && !Array.isArray(value)) {
|
|
153
153
|
throw new Error(`Invalid Parameter Type: ${parameterId}. Got: ${typeof value}. Expected: array`);
|
|
154
154
|
}
|
|
155
|
+
|
|
156
|
+
if (Array.isArray(parameter.type)) {
|
|
157
|
+
// TODO
|
|
158
|
+
}
|
|
155
159
|
}
|
|
156
160
|
}
|
|
157
161
|
|
|
@@ -31,6 +31,7 @@ class HomeyAPIV2 extends HomeyAPI {
|
|
|
31
31
|
HomeyAPI.DISCOVERY_STRATEGIES.CLOUD,
|
|
32
32
|
HomeyAPI.DISCOVERY_STRATEGIES.LOCAL,
|
|
33
33
|
HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE,
|
|
34
|
+
HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED,
|
|
34
35
|
],
|
|
35
36
|
...props
|
|
36
37
|
}) {
|
|
@@ -178,6 +179,12 @@ class HomeyAPIV2 extends HomeyAPI {
|
|
|
178
179
|
}
|
|
179
180
|
}
|
|
180
181
|
|
|
182
|
+
if (this.__strategies.includes(HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED)) {
|
|
183
|
+
if (this.__properties.remoteUrlForwarded) {
|
|
184
|
+
urls[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED] = `${this.__properties.remoteUrlForwarded}`;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
181
188
|
if (!Object.keys(urls).length) {
|
|
182
189
|
throw new Error('No Discovery Strategies Available');
|
|
183
190
|
}
|
|
@@ -272,6 +279,12 @@ class HomeyAPIV2 extends HomeyAPI {
|
|
|
272
279
|
pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD].catch(err => this.__debug(`Ping ${HomeyAPI.DISCOVERY_STRATEGIES.CLOUD} Error:`, err && err.message));
|
|
273
280
|
}
|
|
274
281
|
|
|
282
|
+
// Ping Direct (https://xxx-xxx-xxx-xx.homey.homeylocal.com:12345)
|
|
283
|
+
if (urls[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
|
|
284
|
+
pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED] = ping(HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED, 2000);
|
|
285
|
+
pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED].catch(err => this.__debug(`Ping ${HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED} Error:`, err && err.message));
|
|
286
|
+
}
|
|
287
|
+
|
|
275
288
|
// Select the best route
|
|
276
289
|
if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE]) {
|
|
277
290
|
pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE]
|
|
@@ -283,6 +296,10 @@ class HomeyAPIV2 extends HomeyAPI {
|
|
|
283
296
|
promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]);
|
|
284
297
|
}
|
|
285
298
|
|
|
299
|
+
if (pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
|
|
300
|
+
promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]);
|
|
301
|
+
}
|
|
302
|
+
|
|
286
303
|
if (pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]) {
|
|
287
304
|
promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]);
|
|
288
305
|
}
|
|
@@ -319,6 +336,16 @@ class HomeyAPIV2 extends HomeyAPI {
|
|
|
319
336
|
.catch(err => reject(new APIErrorHomeyOffline(err)));
|
|
320
337
|
}
|
|
321
338
|
});
|
|
339
|
+
} else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
|
|
340
|
+
pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]
|
|
341
|
+
.then(result => resolve(result))
|
|
342
|
+
.catch(() => {
|
|
343
|
+
if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
|
|
344
|
+
pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]
|
|
345
|
+
.then(result => resolve(result))
|
|
346
|
+
.catch(err => reject(new APIErrorHomeyOffline(err)));
|
|
347
|
+
}
|
|
348
|
+
});
|
|
322
349
|
} else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
|
|
323
350
|
pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]
|
|
324
351
|
.then(result => resolve(result))
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homey-api",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.0",
|
|
4
4
|
"description": "Homey API",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"files": [
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"jsdoc-to-markdown": "^7.1.0",
|
|
67
67
|
"jsdoc-ts-utils": "^2.0.1",
|
|
68
68
|
"keypather": "^3.1.0",
|
|
69
|
-
"serve": "^
|
|
69
|
+
"serve": "^14.0.1",
|
|
70
70
|
"watch": "^1.0.2",
|
|
71
71
|
"webpack": "^5.64.0",
|
|
72
72
|
"webpack-cli": "^4.9.1",
|