* (Apollon77) Return response body for getCharacteristics and subscri…

…be/unsubscribe also when return code was 207 in IP mode
Apollon77 · Jan 10, 2023 · d474e28 · d474e28
1 parent c7c171a
commit d474e28
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -273,6 +273,10 @@ Please feel free to open an [issue](https://github.com/Apollon77/hap-controller-
 For Issues please consider to directly provide debug loggins (see above). 
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (Apollon77) Return response body for getCharacteristics and subscribe/unsubscribe also when return code was 207 in IP mode
+
 ### 0.9.0 (2023-01-09)
 * (Apollon77) BREAKING: Returned data objects partially contain BigInt values (represented by bignumber.js instances) for iid/aid fields!
 

diff --git a/src/transport/ip/http-client.ts b/src/transport/ip/http-client.ts
@@ -608,7 +608,7 @@ export default class HttpClient extends EventEmitter {
      *                                       in form ["aid.iid", ...]
      * @returns {Promise} Promise
      */
-    async subscribeCharacteristics(characteristics: string[]): Promise<void> {
+    async subscribeCharacteristics(characteristics: string[]): Promise<Record<string, unknown> | null> {
         let connection: HttpConnection;
         if (this.subscriptionsUseSameConnection) {
             connection = await this.getDefaultVerifiedConnection();
@@ -693,7 +693,20 @@ export default class HttpClient extends EventEmitter {
                 );
             }
             this.subscribedCharacteristics = this.subscribedCharacteristics.concat(newSubscriptions);
+
+            let body = {};
+            try {
+                if (response.body) {
+                    body = JSONBig.parse(response.body.toString());
+                }
+            } catch (err) {
+                // ignore
+            }
+
+            return body;
         }
+
+        return null;
     }
 
     /**
@@ -704,9 +717,9 @@ export default class HttpClient extends EventEmitter {
      *                   if ommited all currently subscribed characteristics will be unsubscribed
      * @returns {Promise} Promise which resolves when the procedure is done.
      */
-    async unsubscribeCharacteristics(characteristics?: string[]): Promise<void> {
+    async unsubscribeCharacteristics(characteristics?: string[]): Promise<Record<any, unknown> | null> {
         if (!this.subscriptionConnection || !this.subscribedCharacteristics.length) {
-            return;
+            return null;
         }
 
         if (!characteristics) {
@@ -760,7 +773,19 @@ export default class HttpClient extends EventEmitter {
                 this.subscriptionConnection?.removeAllListeners('event');
                 delete this.subscriptionConnection;
             }
+
+            let body = {};
+            try {
+                if (response.body) {
+                    body = JSONBig.parse(response.body.toString());
+                }
+            } catch (err) {
+                // ignore
+            }
+
+            return body;
         }
+        return null;
     }
 
     /**