homebridge-lockstate 1.0.1 → 1.0.2

package/index.js

@@ -2,11 +2,11 @@ var Service, Characteristic, Homebridge
 const request = require('request')
 const packageJson = require('./package.json')
 const Net = require('net')
-const Modbus = require('jsmodbus')
-const STATE_UNSECURED = 0;
-const STATE_SECURED = 1;
-const STATE_JAMMED = 2;
-const STATE_UNKNOWN = 3;
+
+const STATE_UNSECURED = 0;//���������
+const STATE_SECURED = 1;//���ߴ�������״̬
+const STATE_JAMMED = 2;//���߷������ϣ�������
+const STATE_UNKNOWN = 3;//����״̬δ֪
 
 module.exports = function (homebridge) {
   Homebridge = homebridge
@@ -16,8 +16,8 @@ module.exports = function (homebridge) {
 }
 
 function lockstate(log, config) {
-    this.status = []
-    this.status_update = []
+  this.status = []
+  this.status_update = []
   this.config = config
   this.log = log
   this.name = config.name
@@ -29,21 +29,14 @@ function lockstate(log, config) {
   this.username = config.username || null
   this.password = config.password || null
   this.timeout = (config.httptimeout * 1000) || 5000
-  this.http_method = config.http_method || 'GET'
-
-  this.openURL = config.openURL
-  this.openBody = config.openBody || ''
-  this.openHeader = config.openHeader || null
-  this.closeURL = config.closeURL
-  this.closeBody = config.closeBody || ''
-  this.closeHeader = config.closeHeader || null
+ 
 
   this.autoLock = config.autoLock || false
   this.autoLockDelay = config.autoLockDelay || 5
   
   this.resetLock = config.resetLock || false
     this.resetLockTime = config.resetLockTime || 5
-//   this.interval = setInterval(this.update.bind(this), this.config.pollFrequency || 1000);
+
     this.currentState = STATE_SECURED;
   this.targetState = this.currentState;
   if (this.username != null && this.password != null) {
@@ -55,62 +48,6 @@ function lockstate(log, config) {
 
   this.log(this.name)
   this.service = new Service.LockMechanism(this.name)
-
-
-
-    this.ip = {
-        'host': config.ip || '127.0.0.1',
-        'port': config.port || 502
-    }
-    this.socket = new Net.Socket();
-    this.modbus = new Modbus.client.TCP(this.socket, this.config.unit, this.config.timeout);
-    this.log("electromagnetic", config.unit, config.timeout)
-    this.flagscontect = false;
-    Homebridge.on("didFinishLaunching", () => {
-        this.socket.connect(this.ip);
-        this.log("Connecting to", this.ip.host);
-
-    });
-
-    this.socket.on('connect', () => {
-        this.log("Socket connected");
-        this.flagscontect = true;
-        flags_connect = true;
-        if (this.interval) {
-            clearInterval(this.interval);
-           
-        }
-    //    else {
-    //        this.update();
-    //    }
-         this.interval = setInterval(this.update.bind(this), this.config.pollFrequency || 1000);
-    });
-
-    this.socket.on('error', (error) => {
-        if (error) {
-            this.log(error);
-        }
-        this.log("error-Connection error");
-       // this.flagscontect = false;
-      
-        setTimeout(() => {
-            //this.socket.connect(this.ip);
-            this.log("error-Reconnecting to", this.ip.host);
-        }, 10000);
-    });
-
-    this.socket.on('close', (error) => {
-        if (error) {
-            this.log(error);
-        }
-        this.log("Connection lost");
-        this.flagscontect = false;
-       
-        setTimeout(() => {
-            this.socket.connect(this.ip);
-            this.log("Reconnecting to", this.ip.host);
-        }, 9000);
-    });
 }
 
 lockstate.prototype = {
@@ -118,160 +55,25 @@ lockstate.prototype = {
   identify: function (callback) {
     this.log('Identify requested!')
     callback()
-  },
-  _httpRequest: function (url, headers, body, method, callback) {
-    request({
-      url: url,
-      headers: headers,
-      body: body,
-      method: this.http_method,
-      timeout: this.timeout,
-      rejectUnauthorized: false,
-     auth: this.auth
-    },
-    function (error, response, body) {
-      callback(error, response, body)
-    })
-  },
-   update: function () {
-       
-      if (this.interval) {
-          this.modbus.readCoils(9, 1).then((resp) => {          //����״̬������Ϊ�������
-              this.status_update[0] = resp.response._body.valuesAsArray;
-
-              let val_update = parseInt(this.status_update[0]);
-           // if (parseInt(resp.response._body.valuesAsArray)) {
-           //   if (val_update != this.targetState) {
-
-                  if (val_update == 0) {
-                     
-                      //this.log('update-target-securd', val);
-                      this.service.getCharacteristic(Characteristic.LockTargetState).updateValue(STATE_SECURED);
-                      this.service.getCharacteristic(Characteristic.LockCurrentState).updateValue(STATE_SECURED);
-
-                      this.targetState = STATE_SECURED
-                      this.currentState = STATE_SECURED
-                      //     this.service.setCharacteristic(Characteristic.LockCurrentState, Characteristic.LockCurrentState.SECURED)
-                      //    this.service.setCharacteristic(Characteristic.LockkTargetState, Characteristic.LockTargetState.SECURED)
-                  }
-                  else {
-                     
-                      //         this.log('update-target-unsecurd', val);
-                      this.service.getCharacteristic(Characteristic.LockTargetState).updateValue(STATE_UNSECURED);
-                      this.service.getCharacteristic(Characteristic.LockCurrentState).updateValue(STATE_UNSECURED);
-                      this.targetState = STATE_UNSECURED
-                      this.currentState = STATE_UNSECURED
 
-                      //    this.service.setCharacteristic(Characteristic.LockCurrentState, Characteristic.LockCurrentState.UNSECURED)
-                      //    this.service.setCharacteristic(Characteristic.LockkTargetState, Characteristic.LockTargetState.UNSECURED)
-                  }
-           //   }
-          }).catch((error) => {
-              this.log("error-update");
-              this.reset();
-          });
-      //  this.log("writeing-every-time");
-      }  
-       
-  },
-   reset: function () {
-        if (this.interval) {
-            clearInterval(this.interval);
-        }
-
-        this.flagscontect = false;
-        this.commands = [];
-        this.command = null;
-        if (flags_connect) {
-            this.log("error-rest-rest-rest");
-            flags_connect = false;
-            this.socket.end();
-        }
-        else {
-            this.log("error-norest-norest-norest");
-            //flags_connect = true;
-            //this.socket.end();
-        }
   },
+   
    getLockTargetState: function (callback) {
         this.log("Lock target state: %s", this.targetState);
- 
-       // this.modbus.readCoils(9, 1).then((resp) => {          //����״̬������Ϊ�������
-       //       this.status_get_Target[0] = resp.response._body.valuesAsArray;
-       //       let val_get_Target = parseInt(this.status[0]);
-       //       if (val_get_Target == 0) {
-       //   //    if (parseInt(resp.response._body.valuesAsArray)) {
-      //            this.targetState = STATE_SECURED
-      //            this.currentState = STATE_SECURED
-      //         //   this.log('target-securd', val_get);
-      //        }
-      //        else {
-      //            this.targetState = STATE_UNSECURED
-      //            this.currentState = STATE_UNSECURED
-       //       //   this.log('target-unsecurd', val_get);
-        //      }
-        //      //   this.log('target-state', val_get);
-
-              callback(null, this.currentState);
-       //   }).catch((error) => {
-        //      this.log("error-getLockTargetStates-readCoils9-1");
-       //       this.reset();
-       //   });
+         callback(null, this.currentState);
+       
   },
+
   getLockCurrentState: function (callback) {                    //�򿪼�ͥ������һ��
     this.log("Lock Current state: %s", this.currentState);
   
-  //  this.modbus.readCoils(9, 1).then((resp) => {              //����״̬������Ϊ�������
-  //      this.status[0] = resp.response._body.valuesAsArray;
 
-   //     let val = parseInt(this.status[0]);
-   //     if (val == 0){
-       // if (parseInt(resp.response._body.valuesAsArray)) { 
-   //          this.targetState = STATE_SECURED
-   //          this.currentState = STATE_SECURED
-   //            //   this.log('current-securd', val);
-   //     }
-    //
-  //      else {
-   //          this.targetState = STATE_UNSECURED
-   //          this.currentState = STATE_UNSECURED
-   //             //  this.log('current-unsecurd',val);
-   //     }
-     //        // this.log('current-state', val);
-        callback(null, this.currentState);
-  //  }).catch((error) => {
-  //      this.log("error-getLockCurrentStates-readCoils-9-1");
-  //      this.reset();
-  //  });
+     callback(null, this.currentState);
+ 
   },
 
   setLockTargetState: function (value, callback) {
 
-    var url
-    var body
-    var headers
-    this.log('[+] Setting LockTargetState to %s', value)
-    if (value == 1) {
-      url = this.closeURL
-      body = this.closeBody
-      headers = this.closeHeader
-    }else {
-      url = this.openURL
-      body = this.openBody
-      headers = this.openHeader
-      }
-  
-
-    this._httpRequest(url, headers, body, this.http_method, function (error, response, responseBody) {
-    	  }.bind(this))
-   	this.modbus.readCoils(9, 1).then((resp) => {          //����״̬������Ϊ�������
-              	this.status_update[0] = resp.response._body.valuesAsArray;
-	
-     	 });
-              	let val_update = parseInt(this.status_update[0]);
-        
-               value =  val_update;
-
         if (value == 1) {
            
                 this.service.getCharacteristic(Characteristic.LockTargetState).updateValue(STATE_SECURED);
@@ -286,30 +88,11 @@ lockstate.prototype = {
                 this.currentState = STATE_UNSECURED
         }
         callback()
-  
-  },
-
-  autoLockFunction: function () {
-    this.log('[+] Waiting %s seconds for autolock', this.autoLockDelay)
-    setTimeout(() => {
-      this.service.setCharacteristic(Characteristic.LockTargetState, Characteristic.LockTargetState.SECURED)
-      this.log('[*] Autolocking')
-    }, this.autoLockDelay * 1000)
-  },
-  
-  resetLockFunction: function () {
-    this.log('[+] Waiting %s seconds for resetting lock state to locked', this.resetLockTime)
-    setTimeout(() => {
-	  this.service.getCharacteristic(Characteristic.LockCurrentState).updateValue(1)
-	  this.service.getCharacteristic(Characteristic.LockTargetState).updateValue(1)
-      this.log('[*] Lock State resetted')
-    }, this.resetLockTime * 1000)
   },
 
   getServices: function () {
     this.service.setCharacteristic(Characteristic.LockCurrentState, Characteristic.LockCurrentState.SECURED)
     this.service.setCharacteristic(Characteristic.LockTargetState, Characteristic.LockTargetState.SECURED)
-
     this.informationService = new Service.AccessoryInformation()
     this.informationService
       .setCharacteristic(Characteristic.Manufacturer, this.manufacturer)
@@ -319,16 +102,12 @@ lockstate.prototype = {
       this.service
           .getCharacteristic(Characteristic.LockCurrentState)
           .on("get", this.getLockCurrentState.bind(this))
-
       this.service
           .getCharacteristic(Characteristic.LockTargetState)
           .on('get', this.getLockTargetState.bind(this))
-	//.on('set', this.getLockTargetState.bind(this))
           .on('set', this.setLockTargetState.bind(this))
 
     return [this.informationService, this.service]
   }
 }
 
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-lockstate",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "lock",
   "main": "index.js",
   "keywords": [