Merge branch 'master' of https://github.com/fiz1962/ESP-adapter

fiz1962 · Mar 2, 2018 · 301f5a6 · 301f5a6
2 parents 1fcd7b7 + 52afbf7
commit 301f5a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/esp-adapter.js b/esp-adapter.js
@@ -8,11 +8,24 @@
 
 'use strict';
 
-const Adapter = require('../adapter');
-const Device = require('../device');
-const Property = require('../property');
 const fetch = require('node-fetch');
 
+let Adapter, Device, Property;
+try {
+  Adapter = require('../adapter');
+  Device = require('../device');
+  Property = require('../property');
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') {
+    throw e;
+  }
+
+  const gwa = require('gateway-addon');
+  Adapter = gwa.Adapter;
+  Device = gwa.Device;
+  Property = gwa.Property;
+}
+
 class ESPProperty extends Property {
   constructor(device, name, propertyDescription) {
     super(device, name, propertyDescription);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP-adapter",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "ESP Mozillia-IOT adapter",
   "main": "index.js",
   "keywords": [
@@ -31,7 +31,7 @@
   "moziot": {
     "api": {
       "min": 1,
-      "max": 1
+      "max": 2
     },
     "plugin": true,
     "exec": "{nodeLoader} {path}",