From 94b3cc143f751fc863ca5db8097c4aa9fe129b59 Mon Sep 17 00:00:00 2001 From: Arne Blumentritt Date: Wed, 5 May 2021 12:06:54 +0200 Subject: [PATCH] Removed beta debug information --- src/api.ts | 51 ---------------------------------- src/homebridgeNeatoPlatform.ts | 26 +++-------------- 2 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 src/api.ts diff --git a/src/api.ts b/src/api.ts deleted file mode 100644 index 6f78b20..0000000 --- a/src/api.ts +++ /dev/null @@ -1,51 +0,0 @@ -var axios = require('axios'); - -function request(url, payload, method, headers, callback) -{ - if (!url || url === '') - { - if (typeof callback === 'function') callback('no url specified'); - return; - } - - var options = { - data: null, - method: method === 'GET' ? 'GET' : 'POST', - url: url, - headers: { - 'Accept': 'application/vnd.neato.nucleo.v1' - } - }; - - if (options.method === 'POST') - { - options.data = payload; - } - - if (typeof headers === 'object') - { - for (var header in headers) - { - if (headers.hasOwnProperty(header)) - { - options.headers[header] = headers[header]; - } - } - } - - let res, err; - - axios(options) - .then(function (response) { - res = response.data; - }) - .catch(function (error) { - err = error; - }) - .finally(function () { - // Callback needs to be called in finally block, see: https://github.com/Pmant/node-botvac/issues/15 - if (typeof callback === 'function') callback(err, res); - }); -} - -exports.request = request; diff --git a/src/homebridgeNeatoPlatform.ts b/src/homebridgeNeatoPlatform.ts index 914d274..eb8ca7d 100644 --- a/src/homebridgeNeatoPlatform.ts +++ b/src/homebridgeNeatoPlatform.ts @@ -3,8 +3,6 @@ import NeatoApi from "node-botvac"; import {PLATFORM_NAME, PLUGIN_NAME} from "./settings"; import {NeatoVacuumRobotAccessory} from "./accessories/NeatoVacuumRobot"; -const api = require("./api"); - /** * HomebridgePlatform * This class is the main constructor for your plugin, this is where you should @@ -55,22 +53,6 @@ export class HomebridgeNeatoPlatform implements DynamicPlatformPlugin return; } - // Debug robot request TODO: remove after beta - let that = this; - api.request(client._baseUrl + "/users/me/robots", null, "GET", {Authorization: client._tokenType + client._token}, (function (error, result) { - result.forEach(r => { - r.serial = "xxx" + r.serial.length; - r.secret_key = "xxx" + r.secret_key.length; - r.mac_address = "xxx" + r.mac_address.length; - that.log.debug("Robot Request Result: " + JSON.stringify(r)); - }); - - if (error) - { - that.log.debug("Robot Request Error: " + JSON.stringify(error)); - } - })); - // Get all robots from account client.getRobots((error, robots) => { if (error) @@ -115,17 +97,17 @@ export class HomebridgeNeatoPlatform implements DynamicPlatformPlugin if (cachedRobot) { - this.log.debug("[" + robot.name + "] Updating meta information for robot in cache."); + this.log.debug("[" + robot.name + "] Connecting to cached robot and updating information."); } else { - this.log.debug("[" + robot.name + "] Getting meta information for new robot."); + this.log.debug("[" + robot.name + "] Connecting to new robot and updating information."); } robot.getState((error, state) => { if (error) { - this.log.error("[" + robot.name + "] Error getting meta information. Is the robot connected to the internet? Error: " + error + ". State: " + state); + this.log.error("[" + robot.name + "] Cannot connect to robot. Is the robot connected to the internet? Error: " + error + ". State: " + state); } else { @@ -141,7 +123,7 @@ export class HomebridgeNeatoPlatform implements DynamicPlatformPlugin cachedRobot.context.robot = robot; this.api.updatePlatformAccessories([cachedRobot]); new NeatoVacuumRobotAccessory(this, cachedRobot, this.config); - this.log.info("[" + robot.name + "] Successfully loaded from cache"); + this.log.info("[" + robot.name + "] Successfully loaded robot from cache"); } // Create new robot accessory else