homey-api 3.0.26 → 3.1.0

package/assets/specifications/AthomCloudAPI.json

@@ -1095,6 +1095,25 @@
         }
       }
     },
+    "addTagToMailChimpUser": {
+      "path": "/mail/mailchimp/tag",
+      "method": "post",
+      "private": true,
+      "parameters": {
+        "listId": {
+          "type": "string",
+          "in": "body"
+        },
+        "userId": {
+          "type": "string",
+          "in": "body"
+        },
+        "tag": {
+          "type": "string",
+          "in": "body"
+        }
+      }
+    },
     "getAppInstallsStatistics": {
       "path": "/stats/app-installs",
       "method": "get",

package/assets/types/homey-api.private.d.ts

@@ -2659,6 +2659,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -3183,6 +3191,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -4465,6 +4481,8 @@ export class Util {
 
   static serializeQueryObject(queryObject: object): string;
 
+  static encodeUrlSearchParams(params: object): string;
+
   static fetch(args: any): Promise;
 
   static wait(ms: number): Promise<void>;
@@ -4498,6 +4516,8 @@ export class Util {
   static promiseAny(promises: Array<Promise>): Promise<any>;
 
   static serializeQueryObject(queryObject: object): string;
+
+  static encodeUrlSearchParams(params: object): string;
 }
 
 export class APIDefinition {}
@@ -5683,6 +5703,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -6207,6 +6235,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -7425,6 +7461,8 @@ export class Util {
 
   static serializeQueryObject(queryObject: object): string;
 
+  static encodeUrlSearchParams(params: object): string;
+
   static fetch(args: any): Promise;
 
   static wait(ms: number): Promise<void>;
@@ -7458,6 +7496,8 @@ export class Util {
   static promiseAny(promises: Array<Promise>): Promise<any>;
 
   static serializeQueryObject(queryObject: object): string;
+
+  static encodeUrlSearchParams(params: object): string;
 }
 
 export namespace HomeyAPIV3Cloud {

package/lib/AthomCloudAPI.js

@@ -214,20 +214,21 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       throw new Error('Missing Redirect URL');
     }
 
-    const search = new URLSearchParams();
-    search.append('client_id', this.__clientId);
-    search.append('redirect_uri', this.__redirectUrl);
-    search.append('response_type', 'code');
+    const params = {
+      client_id: this.__clientId,
+      redirect_uri: this.__redirectUrl,
+      response_type: 'code',
+    }
 
     if (typeof state === 'string') {
-      search.append('state', state);
+      params.state = state;
     }
 
     if (Array.isArray(scopes)) {
-      search.append('scope', scopes.join(','));
+      params.scope = scopes.join(',');
     }
 
-    return `${this.baseUrl}/oauth2/authorise?${search.toString()}`;
+    return `${this.baseUrl}/oauth2/authorise?${Util.encodeUrlSearchParams(params)}`;
   }
 
   async getDelegatedLoginUrl(args = {}) {
@@ -240,19 +241,20 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       meta: args.meta,
     });
 
-    const search = new URLSearchParams();
-    search.append('user_token', token);
+    const params = {
+      user_token: token,
+    }
 
     if (typeof args.state === 'string') {
-      search.append('state', args.state);
+      params.state = args.state;
     }
 
     if (typeof args.resource === 'string') {
-      search.append('resource', args.resource);
+      params.resource = args.resource;
     }
 
     const seperator = args.baseUrl.indexOf('?') >= 0 ? '&' : '?';
-    return args.baseUrl + seperator + search.toString();
+    return args.baseUrl + seperator + Util.encodeUrlSearchParams(params);
   }
 
   /**
@@ -366,11 +368,12 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       throw new Error('Missing Client Secret');
     }
 
-    const body = new URLSearchParams();
-    body.append('grant_type', 'client_credentials');
+    const params = {
+      grant_type: 'client_credentials',
+    }
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body: body.toString(),
+      body: Util.encodeUrlSearchParams(params),
       method: 'post',
       headers: {
         Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
@@ -427,12 +430,13 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       throw new Error('Missing Client Secret');
     }
 
-    const body = new URLSearchParams();
-    body.append('grant_type', 'authorization_code');
-    body.append('code', code);
+    const params = {
+      grant_type: 'authorization_code',
+      code: code,
+    }
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body: body.toString(),
+      body: Util.encodeUrlSearchParams(params),
       method: 'post',
       headers: {
         Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
@@ -487,13 +491,14 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       throw new Error('Missing Client Secret');
     }
 
-    const body = new URLSearchParams();
-    body.append('grant_type', 'password');
-    body.append('username', encodeURIComponent(username));
-    body.append('password', encodeURIComponent(password));
+    const params = {
+      grant_type: 'password',
+      username: username,
+      password: password,
+    }
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body: body.toString(),
+      body: Util.encodeUrlSearchParams(params),
       method: 'post',
       headers: {
         Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
@@ -533,12 +538,13 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
           throw new Error('Missing Refresh Token');
         }
 
-        const body = new URLSearchParams();
-        body.append('grant_type', 'refresh_token');
-        body.append('refresh_token', this.__token.refresh_token);
+        const params = {
+          grant_type: 'refresh_token',
+          refresh_token: this.__token.refresh_token,
+        }
 
         const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-          body: body.toString(),
+          body: Util.encodeUrlSearchParams(params),
           method: 'post',
           headers: {
             Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -433,7 +433,7 @@ class Manager extends EventEmitter {
   }
 
   __debug(...props) {
-    this.homey.__debug(`[${this.constructor.name}]`, ...props);
+    this.homey.__debug(`[Manager${this.constructor.ID[0].toUpperCase() + this.constructor.ID.slice(1)}]`, ...props);
   }
 
   /**

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -625,10 +625,15 @@ class HomeyAPIV3 extends HomeyAPI {
 
     return {
       unsubscribe: () => {
-        this.__homeySocket.emit('unsubscribe', uri);
-        this.__homeySocket.removeListener(uri, __onEvent);
-        this.__socket.removeListener('disconnect', __onDisconnect);
-        this.__socket.removeListener('reconnect', __onReconnect);
+        if (this.__homeySocket) {
+          this.__homeySocket.emit('unsubscribe', uri);
+          this.__homeySocket.removeListener(uri, __onEvent);
+        }
+
+        if (this.__socket) {
+          this.__socket.removeListener('disconnect', __onDisconnect);
+          this.__socket.removeListener('reconnect', __onReconnect);
+        }
       },
     };
   }
@@ -713,9 +718,11 @@ class HomeyAPIV3 extends HomeyAPI {
   async disconnect() {
     // Should we wait for connect here?
 
+    // Also disconnect __homeySocket?
+
     if (this.__socket) {
       await new Promise(resolve => {
-        this.__socket.once('disconnect', resolve());
+        this.__socket.once('disconnect', () => resolve());
         this.__socket.disconnect();
         this.__socket.removeAllListeners();
         this.__socket = null;
@@ -726,9 +733,16 @@ class HomeyAPIV3 extends HomeyAPI {
   }
 
   destroy() {
+    if (this.__homeySocket) {
+      this.__homeySocket.removeAllListeners();
+      this.__homeySocket.close();
+      this.__homeySocket = null;
+    }
+
     if (this.__socket) {
       this.__socket.removeAllListeners();
       this.__socket.close();
+      this.__socket = null;
     }
   }
 

package/lib/Util.js

@@ -309,6 +309,25 @@ class Util {
     return querystring.join('&');
   }
 
+  /**
+   * We use this instead of URLSearchParams because in react-native URLSearchParams are not encoded
+   * for some reason.
+   * 
+   * @param {object} params
+   * @returns {string} encoded params
+   */
+  static encodeUrlSearchParams(params) {
+    const encodedPairs = [];
+
+    for (const [key, value] of Object.entries(params)) {
+      const encodedKey = encodeURIComponent(key);
+      const encodedValue = encodeURIComponent(value);
+      encodedPairs.push(encodedKey + "=" + encodedValue);
+    }
+
+    return encodedPairs.join("&");
+  }
+
 }
 
 module.exports = Util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.0.26",
+  "version": "3.1.0",
   "description": "Homey API",
   "main": "index.js",
   "files": [
@@ -47,10 +47,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "core-js": "^3.19.1",
     "form-data": "^4.0.0",
     "node-fetch": "^2.6.7",
-    "regenerator-runtime": "^0.13.9",
     "socket.io-client": "^2.5.0"
   },
   "devDependencies": {