Support API level 2. (#13)

WebThingsIO · Mar 2, 2018 · c051f21 · c051f21
1 parent f46df01
commit c051f21
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zwave-adapter",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Z-Wave adapter plugin for Mozilla IoT Gateway",
   "main": "index.js",
   "keywords": [
@@ -31,7 +31,7 @@
   "moziot": {
     "api": {
       "min": 1,
-      "max": 1
+      "max": 2
     },
     "enabled": true,
     "plugin": true,

diff --git a/zwave-adapter.js b/zwave-adapter.js
@@ -11,10 +11,21 @@
 
 const path = require('path');
 const fs = require('fs');
-const Adapter = require('../adapter');
 const ZWaveNode = require('./zwave-node');
 const SerialPort = require('serialport');
 const zwaveClassifier = require('./zwave-classifier');
+
+let Adapter;
+try {
+  Adapter = require('../adapter');
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') {
+    throw e;
+  }
+
+  Adapter = require('gateway-addon').Adapter;
+}
+
 var ZWaveModule;
 
 const DEBUG = false;

diff --git a/zwave-classifier.js b/zwave-classifier.js
@@ -10,9 +10,19 @@
 
 'use strict';
 
-const Constants = require('../addon-constants');
 const ZWaveProperty = require('./zwave-property');
 
+let Constants;
+try {
+  Constants = require('../addon-constants');
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') {
+    throw e;
+  }
+
+  Constants = require('gateway-addon').Constants;
+}
+
 // See; http://wiki.micasaverde.com/index.php/ZWave_Command_Classes for a
 // complete list of command classes.
 

diff --git a/zwave-node.js b/zwave-node.js
@@ -9,12 +9,23 @@
 
 'use strict';
 
-var Device = require('../device');
-var utils = require('../utils');
+let Device, Utils;
+try {
+  Device = require('../device');
+  Utils = require('../utils');
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') {
+    throw e;
+  }
+
+  const gwa = require('gateway-addon');
+  Device = gwa.Device;
+  Utils = gwa.Utils;
+}
 
-var padLeft = utils.padLeft;
-var padRight = utils.padRight;
-var repeatChar = utils.repeatChar;
+var padLeft = Utils.padLeft;
+var padRight = Utils.padRight;
+var repeatChar = Utils.repeatChar;
 
 let BASIC_STR = [
   '???',

diff --git a/zwave-property.js b/zwave-property.js
@@ -10,8 +10,19 @@
 
 'use strict';
 
-const Deferred = require('../deferred');
-const Property = require('../property');
+let Deferred, Property;
+try {
+  Deferred = require('../deferred');
+  Property = require('../property');
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') {
+    throw e;
+  }
+
+  const gwa = require('gateway-addon');
+  Deferred = gwa.Deferred;
+  Property = gwa.Property;
+}
 
 class ZWaveProperty extends Property {
   constructor(device, name, propertyDescr, valueId,