Bluetooth: remove sub brands

server/services/bluetooth/devices/awox/models/awox.remote.mesh.js → server/services/awox/models/awox.remote.mesh.js

@@ -1,5 +1,5 @@
 const { isRemote, isMesh } = require('../lib/awox.utils');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'rcum',

server/services/bluetooth/devices/awox/models/awox.smlc.js → server/services/awox/models/awox.smlc.js

@@ -1,5 +1,5 @@
 const { isRemote, isMesh, isColor } = require('../lib/awox.utils');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'smlc',

server/services/bluetooth/devices/awox/models/awox.smlc.mesh.js → server/services/awox/models/awox.smlc.mesh.js

@@ -1,5 +1,5 @@
 const { isRemote, isMesh, isColor } = require('../lib/awox.utils');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'smlcm',

server/services/bluetooth/devices/awox/models/awox.smlw.js → server/services/awox/models/awox.smlw.js

@@ -1,6 +1,6 @@
 const { isRemote, isMesh, isWhite } = require('../lib/awox.utils');
-const { connectAndSend } = require('../../../lib/utils/connectAndSend');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { connectAndSend } = require('../../bluetooth/lib/utils/connectAndSend');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'smlw',

server/services/bluetooth/devices/awox/models/awox.smlw.mesh.js → server/services/awox/models/awox.smlw.mesh.js

@@ -1,5 +1,5 @@
 const { isRemote, isMesh, isWhite } = require('../lib/awox.utils');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'smlwm',

server/services/awox/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "gladys-awox",
+  "version": "1.0.0",
+  "main": "index.js",
+  "os": [
+    "darwin",
+    "linux",
+    "freebsd",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm",
+    "arm64"
+  ]
+}

server/services/bluetooth/lib/index.js

@@ -1,6 +1,4 @@
 // DEVICE IMPL
-const nutDevice = require('../devices/nut');
-const awoxDevice = require('../devices/awox');
 const GenericDevice = require('../devices');
 
 // EVENTS
@@ -40,8 +38,6 @@ const BluetoothManager = function BluetoothManager(noble, gladys, serviceId) {
 
   // All types of device managed by implementations
   this.availableBrands = new Map();
-  this.availableBrands.set('nut', new GenericDevice(nutDevice));
-  this.availableBrands.set('awox', new GenericDevice(awoxDevice));
 };
 
 // EVENTS

server/services/bluetooth/devices/nut/models/nut.tracker.js → server/services/nut/models/nut.tracker.js

@@ -1,5 +1,5 @@
-const { battery } = require('../../generic/generic.pollFeatures');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../../utils/constants');
+const { battery } = require('../../bluetooth/devices/generic/generic.pollFeatures');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
 module.exports = {
   name: 'tracker',

server/services/nut/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "gladys-nut",
+  "version": "1.0.0",
+  "main": "index.js",
+  "os": [
+    "darwin",
+    "linux",
+    "freebsd",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm",
+    "arm64"
+  ]
+}

server/test/services/bluetooth/devices/awox/bluetooth.awox.test.js → server/test/services/awox/bluetooth.awox.test.js

@@ -1,13 +1,13 @@
 const { expect } = require('chai');
 const sinon = require('sinon');
 
-const awox = require('../../../../../services/bluetooth/devices/awox');
+const awox = require('../../../services/awox');
 
-const remote = require('../../../../../services/bluetooth/devices/awox/models/awox.remote.mesh');
-const smlc = require('../../../../../services/bluetooth/devices/awox/models/awox.smlc');
-const smlcm = require('../../../../../services/bluetooth/devices/awox/models/awox.smlc.mesh');
-const smlw = require('../../../../../services/bluetooth/devices/awox/models/awox.smlw');
-const smlwm = require('../../../../../services/bluetooth/devices/awox/models/awox.smlw.mesh');
+const remote = require('../../../services/awox/models/awox.remote.mesh');
+const smlc = require('../../../services/awox/models/awox.smlc');
+const smlcm = require('../../../services/awox/models/awox.smlc.mesh');
+const smlw = require('../../../services/awox/models/awox.smlw');
+const smlwm = require('../../../services/awox/models/awox.smlw.mesh');
 
 describe('Bluetooth AwoX -> getMatchingModels', () => {
   beforeEach(() => {

server/test/services/bluetooth/lib/bluetooth.availableBrands.test.js

@@ -218,9 +218,7 @@ describe('Bluetooth : verify all available brands', () => {
 
           if (feature.min >= feature.max) {
             assert.fail(
-              `Feature min (${feature.min}) should be lower than max (${
-                feature.max
-              }) for ${key} ${featureName} feature at position ${fIndex} (${modelName} model at position ${index})`,
+              `Feature min (${feature.min}) should be lower than max (${feature.max}) for ${key} ${featureName} feature at position ${fIndex} (${modelName} model at position ${index})`,
             );
           }
         });

server/test/services/bluetooth/lib/commands/bluetooth.getMatchingDevices.test.js

@@ -8,7 +8,6 @@ const event = new EventEmitter();
 const BluetoothManager = require('../../../../../services/bluetooth/lib');
 
 const GenericDevice = require('../../../../../services/bluetooth/devices');
-const nutDevice = require('../../../../../services/bluetooth/devices/nut/models/nut.tracker');
 
 const { EVENTS } = require('../../../../../utils/constants');
 
@@ -38,12 +37,6 @@ describe('BluetoothManager getMatchingDevices command', () => {
     expect(result).deep.eq([]);
   });
 
-  it('get single matching device', () => {
-    const charMap = { '2a00': 'nut' };
-    const result = bluetoothManager.getMatchingDevices(charMap);
-    expect(result).deep.eq([{ brand: 'nut', model: 'tracker', device: nutDevice.device }]);
-  });
-
   it('get matching device but missing method', () => {
     bluetoothManager.availableBrands.set('new', new GenericDevice({}));
     const charMap = { '?': '?' };

server/test/services/bluetooth/devices/nut/bluetooth.nut.test.js → server/test/services/nut/bluetooth.nut.test.js

@@ -1,8 +1,8 @@
 const { expect } = require('chai');
 const sinon = require('sinon');
 
-const nut = require('../../../../../services/bluetooth/devices/nut');
-const nutDevice = require('../../../../../services/bluetooth/devices/nut/models/nut.tracker');
+const nut = require('../../../services/nut');
+const nutDevice = require('../../../services/nut/models/nut.tracker');
 
 describe('Bluetooth Nut -> getMatchingModels', () => {
   beforeEach(() => {

server/test/services/bluetooth/devices/nut/models/bluetooth.nut.tracker.test.js → server/test/services/nut/models/bluetooth.nut.tracker.test.js

@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const sinon = require('sinon');
 
-const model = require('../../../../../../services/bluetooth/devices/nut/models/nut.tracker');
+const model = require('../../../../services/nut/models/nut.tracker');
 
 describe('Bluetooth model Tracker', () => {
   beforeEach(() => {