homey-api 1.7.8 → 1.8.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.
Files changed (6) hide show
  1. package/assets/specifications/HomeyAPIV3Local.json +3691 -1
  2. package/assets/types/homey-api.d.ts +6505 -2323
  3. package/assets/types/homey-api.private.d.ts +6645 -2330
  4. package/lib/HomeyAPI/HomeyAPI.js +2 -0
  5. package/lib/HomeyAPI/HomeyAPIV2.js +20 -0
  6. 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({
package/lib/HomeyAPI/HomeyAPIV2.js CHANGED
@@ -272,6 +272,12 @@ class HomeyAPIV2 extends HomeyAPI {
272
272
  pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD].catch(err => this.__debug(`Ping ${HomeyAPI.DISCOVERY_STRATEGIES.CLOUD} Error:`, err && err.message));
273
273
  }
274
274
 
275
+ // Ping Direct (https://xxx-xxx-xxx-xx.homey.homeylocal.com:12345)
276
+ if (urls[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
277
+ pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED] = ping(HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED, 2000);
278
+ pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED].catch(err => this.__debug(`Ping ${HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED} Error:`, err && err.message));
279
+ }
280
+
275
281
  // Select the best route
276
282
  if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE]) {
277
283
  pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE]
@@ -283,6 +289,10 @@ class HomeyAPIV2 extends HomeyAPI {
283
289
  promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]);
284
290
  }
285
291
 
292
+ if (pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
293
+ promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]);
294
+ }
295
+
286
296
  if (pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]) {
287
297
  promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]);
288
298
  }
@@ -319,6 +329,16 @@ class HomeyAPIV2 extends HomeyAPI {
319
329
  .catch(err => reject(new APIErrorHomeyOffline(err)));
320
330
  }
321
331
  });
332
+ } else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
333
+ pings[HomeyAPI.DISCOVERY_STRATEGIES.REMOTE_FORWARDED]
334
+ .then(result => resolve(result))
335
+ .catch(() => {
336
+ if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
337
+ pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]
338
+ .then(result => resolve(result))
339
+ .catch(err => reject(new APIErrorHomeyOffline(err)));
340
+ }
341
+ });
322
342
  } else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
323
343
  pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]
324
344
  .then(result => resolve(result))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "homey-api",
3
- "version": "1.7.8",
3
+ "version": "1.8.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": "^11.3.2",
69
+ "serve": "^14.0.1",
70
70
  "watch": "^1.0.2",
71
71
  "webpack": "^5.64.0",
72
72
  "webpack-cli": "^4.9.1",