v0.1.2

Change Last Activation Logic. Remove node-persist.
stickpin · Jan 11, 2020 · da5715e · da5715e
1 parent 2239f5f
commit da5715e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,6 @@ If you use the EVE.app you can also see the presence history of every person-sen
     {
         "platform": "PeopleARP",
         "threshold" : 3,
-        "cacheDirectory": "./.node-persist/storage",
         "checkInterval": 10000,
         "people" : [
             {
@@ -43,7 +42,6 @@ If you use the EVE.app you can also see the presence history of every person-sen
 | Parameter                  | Note                                                                                                                                                                                         |
 |----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `threshold`                | optional, in minutes, default: 3                                                                                                                                                             |
-| `cacheDirectory`           | optional, default: "./.node-persist/storage"                                                                                                                                                 |
 | `checkInterval`            | optional, in milliseconds, default: 10000. minimal value: 10000                                                                                                                              |
 | `target`                   | may be either a hostname or IP address                                                                                                                                                       |
 | `macAddress`               | mac address of the device                                                                                                                                                                    |

diff --git a/index.js b/index.js
@@ -1,9 +1,8 @@
 var ping = require('ping');
 var arp = require('arp-a-x');
 var moment = require('moment');
-var FakeGatoHistoryService;
 
-var Service, Characteristic, HomebridgeAPI;
+var Service, Characteristic, HomebridgeAPI, FakeGatoHistoryService;
 module.exports = function(homebridge) {
     Service = homebridge.hap.Service;
     Characteristic = homebridge.hap.Characteristic;
@@ -21,11 +20,8 @@ module.exports = function(homebridge) {
 function PeoplePlatform(log, config){
     this.log = log;
     this.threshold = config['threshold'] || 3;
-    this.cacheDirectory = config["cacheDirectory"] || HomebridgeAPI.user.persistPath();
     this.checkInterval = config["checkInterval"] || 10000;
     this.people = config['people'];
-    this.storage = require('node-persist');
-    this.storage.initSync({dir:this.cacheDirectory});
 }
 
 PeoplePlatform.prototype = {
@@ -156,7 +152,9 @@ function PeopleAccessory(log, config, platform) {
         },
         {
             storage: 'fs',
-            disableTimer: true
+            disableTimer: true,
+            path: HomebridgeAPI.user.storagePath() + '/accessories',
+            filename: 'history_' + "hps-" + this.name.toLowerCase() + '.json'
         });
 
     this.historyService.addCharacteristic(ResetTotalCharacteristic);
@@ -181,11 +179,8 @@ PeopleAccessory.prototype.getState = function(callback) {
 }
 
 PeopleAccessory.prototype.getLastActivation = function(callback) {
-    var lastSeenUnix = this.platform.storage.getItemSync('lastConnectionLoss_' + this.target);
-    if (lastSeenUnix) {
-        var lastSeenMoment = moment(lastSeenUnix).unix();
-        callback(null, lastSeenMoment - this.historyService.getInitialTime());
-    }
+    var lastActivation = now - this.historyService.getInitialTime();
+    callback(null, lastActivation);
 }
 
 PeopleAccessory.prototype.identify = function(callback) {
@@ -208,7 +203,6 @@ PeopleAccessory.prototype.arp = function() {
                     if (entry.mac == this.macAddress.toLowerCase()) {
                         if(entry.flag == "0x0") {
                             newState = false;
-                            this.platform.storage.setItemSync('lastConnectionLoss_' + this.target, Date.now());
                         }
                         this.setNewState(newState);
                         setTimeout(PeopleAccessory.prototype.arp.bind(this), this.checkInterval);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-people-arp",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Homebridge plugin that provides details of who is in a Home + History (powered by fakegato) based on IP and MAC Address",
   "keywords": [
     "homebridge-plugin"
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "moment": "^2.11.2",
-    "node-persist": "2.1.0",
     "ping": "^0.1.10",
     "arp-a-x": "^0.5.3",
     "fakegato-history": "^0.5.0"