improve log and axios (#24)

Author: Takeshi Kishi

src/natureRemoApi.ts

@@ -1,6 +1,6 @@
 import { URLSearchParams } from 'url';
-import axios, { Axios, AxiosError } from 'axios';
 import { Mutex } from 'async-mutex';
+import axios, { AxiosError } from 'axios';
 import { API, HapStatusError, Logger } from 'homebridge';
 import { ACButton, AirConParams, Appliance, Device, LIGHTState, OperationMode } from './types';
 import { API_URL, CACHE_THRESHOLD } from './settings';
@@ -22,7 +22,6 @@ type AirConSettings = { button?: ACButton; operation_mode?: OperationMode; tempe
 export class NatureRemoApi {
 
   private readonly mutex = new Mutex();
-  private readonly client: Axios;
 
   private applianceCache: ApplianceCache = { updated: 0, appliances: null };
   private deviceCache: DeviceCache = { updated: 0, devices: null };
@@ -31,10 +30,9 @@ export class NatureRemoApi {
     private readonly logger: Logger,
     private readonly api: API,
     accessToken: string) {
-    this.client = axios.create({
-      baseURL: API_URL,
-      headers: { 'Authorization': `Bearer ${accessToken}` },
-    });
+    axios.defaults.baseURL = API_URL;
+    axios.defaults.headers.common['Authorization'] = `Bearer ${accessToken}`;
+    axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
   }
 
   async getAllAppliances(): Promise<Appliance[]> {
@@ -115,7 +113,7 @@ export class NatureRemoApi {
 
   private async getMessage(url: string): Promise<Appliance[] | Device[]> {
     try {
-      const res = await this.client.get(url);
+      const res = await axios.get(url);
       return res.data;
     } catch (err) {
       throw this.convertToHapStatusError(err as AxiosError);
@@ -125,7 +123,7 @@ export class NatureRemoApi {
   private async postMessage(url: string, params: Record<string, string>): Promise<void> {
     try {
       const data = new URLSearchParams(params);
-      await this.client.post(url, data.toString());
+      await axios.post(url, data.toString());
     } catch (err) {
       throw this.convertToHapStatusError(err as AxiosError);
     }

src/tvAccessory.ts

@@ -59,6 +59,7 @@ export class NatureNemoTvAccessory {
 
   async getActive(): Promise<CharacteristicValue> {
     this.platform.logger.debug('getActive called');
+    this.platform.logger.info('[%s] Active -> %s', this.name, this.state.active === this.platform.Characteristic.Active.ACTIVE);
     return this.state.active;
   }
 
@@ -72,12 +73,13 @@ export class NatureNemoTvAccessory {
       return;
     }
     await this.platform.natureRemoApi.setTvButton(this.id, 'power');
-    this.platform.logger.info('[%s] Active <- %s', this.name, value);
+    this.platform.logger.info('[%s] Active <- %s', this.name, value === this.platform.Characteristic.Active.ACTIVE);
     this.state.active = value;
   }
 
   async getActiveIdentifier(): Promise<CharacteristicValue> {
-    this.platform.logger.debug('getAgetActiveIdentifierctive called');
+    this.platform.logger.debug('getActiveIdentifier called');
+    this.platform.logger.info('[%s] ActiveIdentifierctive -> %s', this.name, this.state.activeIdentifier);
     return this.state.activeIdentifier;
   }
 
@@ -90,17 +92,20 @@ export class NatureNemoTvAccessory {
       this.platform.logger.debug('[%s] Same state. skip sending', this.name);
       return;
     }
+    this.platform.logger.info('[%s] ActiveIdentifierctive <- %s', this.name, value);
     this.state.activeIdentifier = value;
   }
 
   async setRemoteKey(value: CharacteristicValue): Promise<void> {
     this.platform.logger.debug('setRemoteKey called ->', value);
-    await this.platform.natureRemoApi.setTvButton(this.id, this.convertRemoteKey(value));
-    this.platform.logger.info('[%s] Remote Key <- %s', this.name, value);
+    const key = this.convertRemoteKey(value);
+    await this.platform.natureRemoApi.setTvButton(this.id, key);
+    this.platform.logger.info('[%s] Remote Key <- %s', this.name, key);
   }
 
   async getMute(): Promise<CharacteristicValue> {
     this.platform.logger.debug('getMute called');
+    this.platform.logger.info('[%s] Mute -> %s', this.name, this.state.mute);
     return this.state.mute;
   }
 
@@ -120,8 +125,9 @@ export class NatureNemoTvAccessory {
 
   async setVolumeSelector(value: CharacteristicValue): Promise<void> {
     this.platform.logger.debug('setVolumeSelector called ->', value);
-    await this.platform.natureRemoApi.setTvButton(this.id, this.convertVolumeSelector(value));
-    this.platform.logger.info('[%s] VolumeSelector <- %s', this.name, value);
+    const key = this.convertVolumeSelector(value);
+    await this.platform.natureRemoApi.setTvButton(this.id, key);
+    this.platform.logger.info('[%s] VolumeSelector <- %s', this.name, key);
   }
 
   private convertRemoteKey(value: CharacteristicValue): string {