homey-api 1.4.1 → 1.5.0

package/README.md

@@ -35,11 +35,15 @@ const AthomCloudAPI = require('homey-api/lib/AthomCloudAPI');
 Include Homey API from our CDN:
 
 ```html
-<script type="text/javascript" src="https://cdn.athom.com/homey-api/latest.js"></script>
+<script type="text/javascript" src="https://cdn.athom.com/homey-api/$VERSION.js"></script>
 ```
 
 You can then access the APIs using `window.AthomCloudAPI` etc.
 
+### In-app
+
+To use Homey API inside of an Homey Pro app with the `homey:manager:api` permission, see {@link HomeyAPIApp}.
+
 ## Issues
 
 Please report any issues you find in the [Web API Issue Tracker](https://github.com/athombv/homey-web-api-issues/issues).

package/assets/specifications/AthomAppsAPI.json

@@ -140,6 +140,17 @@
         }
       }
     },
+    "getAppChangelog": {
+      "path": "/app/{appId}/changelog",
+      "method": "get",
+      "parameters": {
+        "appId": {
+          "in": "path",
+          "type": "string",
+          "required": true
+        }
+      }
+    },
     "updateAppAuthor": {
       "path": "/app/{appId}/author",
       "method": "put",

package/index.js

@@ -21,4 +21,5 @@ module.exports = {
   AthomWeatherAPI: require('./lib/AthomWeatherAPI'),
   AthomWebhooksAPI: require('./lib/AthomWebhooksAPI'),
   HomeyCloudAPI: require('./lib/HomeyCloudAPI'),
+  HomeyAPIApp: require('./lib/HomeyAPI/HomeyAPIApp'),
 };

package/lib/API.js

@@ -195,7 +195,7 @@ class API {
     }
 
     // Body
-    if (['PUT', 'POST'].includes(request.method)) {
+    if (['PUT', 'POST', 'DELETE'].includes(request.method)) {
       if (request.body && request.bodyJSON !== false) {
         request.headers['Content-Type'] = 'application/json';
 

package/lib/HomeyAPI/HomeyAPIApp.js

@@ -0,0 +1,122 @@
+'use strict';
+
+const HomeyAPI = require('./HomeyAPI');
+const HomeyAPIV2 = require('./HomeyAPIV2');
+
+/**
+ * Use this class to utilize Homey Pro's Web API from inside an app.
+ *
+ * > This class only works on apps using Apps SDK v3 running on Homey Pro.
+ *
+ * > Make sure your app has the `homey:manager:api` permission.
+ *
+ * @class
+ * @extends HomeyAPIV2
+ * @example
+ * // app.json
+ * {
+ *   ...
+ *   "platforms": [ "local" ],
+ *   "permissions": [ "homey:manager:api" ],
+ * }
+ *
+ * // app.js
+ * const { Homey } = require('homey');
+ * const { HomeyAPIApp } = require('homey-api');
+ *
+ * class MyApp extends Homey.App {
+ *
+ *   async onInit() {
+ *     const api = new HomeyAPIApp({
+ *       homey: this.homey,
+ *     });
+ *
+ *     const devices = await api.devices.getDevices();
+ *     this.log('Devices:', devices);
+ *   }
+ *
+ * }
+ */
+class HomeyAPIApp extends HomeyAPIV2 {
+
+  /**
+   * Possible Discovery Strategies
+   * @static
+   * @property {object} DISCOVERY_STRATEGIES
+   * @property {string} DISCOVERY_STRATEGIES.LOCAL - Local HTTP, e.g. `http://192.168.1.100`.
+   */
+  static DISCOVERY_STRATEGIES = {};
+
+  constructor({
+    homey,
+    debug = false,
+    ...props
+  }) {
+    super({
+      ...props,
+      api: null,
+      properties: {
+        id: 'local',
+        softwareVersion: null,
+      },
+      strategy: [
+        HomeyAPI.DISCOVERY_STRATEGIES.LOCAL,
+      ],
+    });
+
+    Object.defineProperty(this, '__homeySDK', {
+      value: homey,
+      enumerable: false,
+      writable: true,
+    });
+
+    Object.defineProperty(this, '__debugEnabled', {
+      value: !!debug,
+      enumerable: false,
+      writable: true,
+    });
+  }
+
+  __debug(...props) {
+    if (!this.__debugEnabled) return;
+    this.__homeySDK.log('[homey-api]', `[${this.constructor.name}]`, ...props);
+  }
+
+  async login() {
+    if (!this.__loginPromise) {
+      this.__loginPromise = Promise.resolve().then(async () => {
+        const token = await this.__homeySDK.api.getOwnerApiToken();
+        this.__debug(`Local Token: ${token}`);
+        return token;
+      });
+
+      this.__loginPromise
+        .then(token => {
+          this.__token = token;
+        })
+        .catch(err => {
+          this.__debug('Error Logging In:', err);
+        })
+        .finally(() => {
+          this.__loginPromise = null;
+        });
+    }
+
+    return this.__loginPromise;
+  }
+
+  async discoverBaseUrl() {
+    this.__baseUrl = await this.__homeySDK.api.getLocalUrl();
+    this.__strategyId = 'local';
+
+    this.__debug(`Local URL: ${this.__baseUrl}`);
+
+    return {
+      baseUrl: this.__baseUrl,
+      strategyId: this.__strategyId,
+    };
+  }
+
+}
+
+module.exports = HomeyAPIApp;

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -275,24 +275,30 @@ class HomeyAPIV2 extends HomeyAPI {
       pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL_SECURE]
         .then(result => resolve(result))
         .catch(() => {
-          Promise.race([
-            pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]
-              ? pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]
-              : undefined,
-
-            pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]
-              ? pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]
-              : undefined,
-          ])
-            .then(result => resolve(result))
-            .catch(() => {
-              if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
-                pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]
-                  .then(result => resolve(result))
-                  .catch(() => reject(new HomeyOfflineError()));
-              }
-            });
-        });
+          const promises = [];
+
+          if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]) {
+            promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]);
+          }
+
+          if (pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]) {
+            promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]);
+          }
+
+          // TODO: Move this to the catch handler to always fallback on cloud
+          // Now mdns or local will error first and cloud won't have a chance!!
+          if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
+            promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]);
+          }
+
+          if (!promises.length) {
+            throw new HomeyOfflineError();
+          }
+
+          return Promise.race(promises);
+        })
+        .then(result => resolve(result))
+        .catch(() => reject(new HomeyOfflineError()));
     } else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]) {
       pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]
         .then(result => resolve(result))
@@ -466,11 +472,11 @@ class HomeyAPIV2 extends HomeyAPI {
   }
 
   async subscribe(uri, {
-    onConnect = () => {},
-    onReconnect = () => {},
-    onReconnectError = () => {},
-    onDisconnect = () => {},
-    onEvent = () => {},
+    onConnect = () => { },
+    onReconnect = () => { },
+    onReconnectError = () => { },
+    onDisconnect = () => { },
+    onEvent = () => { },
   }) {
     this.__debug('subscribe', uri);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Homey API",
   "main": "src/index.js",
   "types": "assets/types/homey-api.d.ts",
@@ -52,7 +52,6 @@
     "ejs": "^3.1.6",
     "eslint": "^7.32.0",
     "eslint-config-athom": "^2.1.1",
-    "filemanager-webpack-plugin": "^5.0.0",
     "fs-extra": "^10.0.0",
     "homey-jsdoc-template": "github:athombv/homey-jsdoc-template#1.4",
     "http-server": "^0.12.3",