Revert "Add mandatory traits"

This reverts commit 59ed28f.
atrovato · Oct 19, 2023 · b6d3f13 · b6d3f13
1 parent 59ed28f
commit b6d3f13
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 124 deletions.
diff --git a/server/services/google-actions/lib/deviceTypes/googleActions.curtain.type.js b/server/services/google-actions/lib/deviceTypes/googleActions.curtain.type.js
@@ -6,7 +6,6 @@ const { DEVICE_FEATURE_CATEGORIES } = require('../../../../utils/constants');
 const curtainType = {
   key: 'action.devices.types.CURTAIN',
   category: DEVICE_FEATURE_CATEGORIES.CURTAIN,
-  mandatoryTraits: ['action.devices.traits.OpenClose'],
 };
 
 module.exports = {

diff --git a/server/services/google-actions/lib/deviceTypes/googleActions.light.type.js b/server/services/google-actions/lib/deviceTypes/googleActions.light.type.js
@@ -6,7 +6,6 @@ const { DEVICE_FEATURE_CATEGORIES } = require('../../../../utils/constants');
 const lightType = {
   key: 'action.devices.types.LIGHT',
   category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-  mandatoryTraits: ['action.devices.traits.OnOff'],
 };
 
 module.exports = {

diff --git a/server/services/google-actions/lib/deviceTypes/googleActions.shutter.type.js b/server/services/google-actions/lib/deviceTypes/googleActions.shutter.type.js
@@ -6,7 +6,6 @@ const { DEVICE_FEATURE_CATEGORIES } = require('../../../../utils/constants');
 const shutterType = {
   key: 'action.devices.types.SHUTTER',
   category: DEVICE_FEATURE_CATEGORIES.SHUTTER,
-  mandatoryTraits: ['action.devices.traits.OpenClose'],
 };
 
 module.exports = {

diff --git a/server/services/google-actions/lib/deviceTypes/googleActions.switch.type.js b/server/services/google-actions/lib/deviceTypes/googleActions.switch.type.js
@@ -6,7 +6,6 @@ const { DEVICE_FEATURE_CATEGORIES } = require('../../../../utils/constants');
 const switchType = {
   key: 'action.devices.types.SWITCH',
   category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-  mandatoryTraits: ['action.devices.traits.OnOff'],
 };
 
 module.exports = {

diff --git a/server/services/google-actions/lib/deviceTypes/googleActions.tv.type.js b/server/services/google-actions/lib/deviceTypes/googleActions.tv.type.js
@@ -6,14 +6,6 @@ const { DEVICE_FEATURE_CATEGORIES } = require('../../../../utils/constants');
 const televisionType = {
   key: 'action.devices.types.TV',
   category: DEVICE_FEATURE_CATEGORIES.TELEVISION,
-  mandatoryTraits: [
-    'action.devices.traits.AppSelector',
-    'action.devices.traits.InputSelector',
-    'action.devices.traits.MediaState',
-    'action.devices.traits.OnOff',
-    'action.devices.traits.TransportControl',
-    'action.devices.traits.Volume',
-  ],
 };
 
 module.exports = {

diff --git a/server/services/google-actions/lib/smarthome/googleActions.onExecute.js b/server/services/google-actions/lib/smarthome/googleActions.onExecute.js
@@ -41,14 +41,13 @@ async function onExecute(body) {
             // Command key not found
             logger.error(`GoogleActions "${exec.command}" command is not managed.`);
             // All devices are failure
-            commands.push({ ids: [selector], status: 'ERROR', errorCode: 'functionNotSupported' });
+            commands.push({ ids: [selector], status: 'ERROR' });
           } else {
             const commandExecutor = trait.commands[exec.command];
 
-            const deviceStatus = { ids: [selector] };
+            const deviceStatus = { ids: [selector], status: 'ERROR' };
             // Build related feature events according incomping attributes
-            // errorCodes : see https://developers.home.google.com/cloud-to-cloud/intents/errors-exceptions
-            const { events = [], errorCode } = await commandExecutor(gladysDevice, exec.params, this.gladys);
+            const { events = [] } = await commandExecutor(gladysDevice, exec.params, this.gladys);
 
             if (events.length > 0) {
               events.forEach((eventMessage) => {
@@ -61,9 +60,6 @@ async function onExecute(body) {
                 this.gladys.event.emit(EVENTS.ACTION.TRIGGERED, action);
               });
               deviceStatus.status = 'PENDING';
-            } else {
-              deviceStatus.status = 'ERROR';
-              deviceStatus.errorCode = errorCode || 'functionNotSupported';
             }
 
             commands.push(deviceStatus);

diff --git a/server/services/google-actions/lib/traits/googleActions.appSelector.trait.js b/server/services/google-actions/lib/traits/googleActions.appSelector.trait.js
diff --git a/server/services/google-actions/lib/traits/googleActions.inputSelector.trait.js b/server/services/google-actions/lib/traits/googleActions.inputSelector.trait.js
diff --git a/server/services/google-actions/lib/traits/index.js b/server/services/google-actions/lib/traits/index.js
@@ -1,19 +1,15 @@
-const { appSelectorTrait } = require('./googleActions.appSelector.trait');
 const { brightnessTrait } = require('./googleActions.brightness.trait');
 const { channelTrait } = require('./googleActions.channel.trait');
 const { colorSettingTrait } = require('./googleActions.colorSetting.trait');
-const { inputSelectorTrait } = require('./googleActions.inputSelector.trait');
 const { onOffTrait } = require('./googleActions.onOff.trait');
 const { openCloseTrait } = require('./googleActions.openClose.trait');
 const { transportControl } = require('./googleActions.transportControl.trait');
 const { volumeTrait } = require('./googleActions.volume.trait');
 
 const TRAITS = [
-  appSelectorTrait,
   brightnessTrait,
   channelTrait,
   colorSettingTrait,
-  inputSelectorTrait,
   onOffTrait,
   openCloseTrait,
   transportControl,

diff --git a/server/services/google-actions/lib/utils/googleActions.determineTrait.js b/server/services/google-actions/lib/utils/googleActions.determineTrait.js
@@ -23,7 +23,7 @@ const exploreTrait = (trait, feature) => {
  * @param {object} feature - Gladys device feature.
  * @returns {object} GoogleActions device type and traits.
  * @example
- * determineTrait(device);
+ * determineTypeAndTraits(device);
  */
 function determineTrait(feature) {
   // Matching feature trait

diff --git a/server/services/google-actions/lib/utils/googleActions.determineTypeAndTraits.js b/server/services/google-actions/lib/utils/googleActions.determineTypeAndTraits.js
@@ -43,14 +43,6 @@ function determineTypeAndTraits(device) {
     if (nbFeatureTypeMatch > nbFeatureTypeMatches) {
       type = deviceType.key;
       nbFeatureTypeMatches = nbFeatureTypeMatch;
-
-      const mandatoryTraits = deviceType.mandatoryTraits || [];
-      mandatoryTraits.forEach((trait) => {
-        // Add mandatory trait only if missing
-        if (!traits.includes(trait)) {
-          traits.push(trait);
-        }
-      });
     }
   });
 

diff --git a/...gle-actions/lib/smarthome/devices_and_traits/googleActions.brightness.trait.light.test.js b/...gle-actions/lib/smarthome/devices_and_traits/googleActions.brightness.trait.light.test.js
@@ -103,7 +103,7 @@ describe('GoogleActions Handler - onSync - brightness (light)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.LIGHT',
-            traits: ['action.devices.traits.Brightness', 'action.devices.traits.OnOff'],
+            traits: ['action.devices.traits.Brightness'],
             attributes: {},
             name: {
               name: 'Device 1',

diff --git a/...le-actions/lib/smarthome/devices_and_traits/googleActions.brightness.trait.switch.test.js b/...le-actions/lib/smarthome/devices_and_traits/googleActions.brightness.trait.switch.test.js
@@ -103,7 +103,7 @@ describe('GoogleActions Handler - onSync - brightness (switch)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.SWITCH',
-            traits: ['action.devices.traits.Brightness', 'action.devices.traits.OnOff'],
+            traits: ['action.devices.traits.Brightness'],
             attributes: {},
             name: {
               name: 'Device 1',

diff --git a/...es/google-actions/lib/smarthome/devices_and_traits/googleActions.channel.trait.tv.test.js b/...es/google-actions/lib/smarthome/devices_and_traits/googleActions.channel.trait.tv.test.js
@@ -103,15 +103,7 @@ describe('GoogleActions Handler - onSync - channel (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.Channel',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.OnOff',
-              'action.devices.traits.TransportControl',
-              'action.devices.traits.Volume',
-            ],
+            traits: ['action.devices.traits.Channel'],
             attributes: {
               commandOnlyChannels: true,
             },
@@ -154,15 +146,7 @@ describe('GoogleActions Handler - onSync - channel (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.Channel',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.OnOff',
-              'action.devices.traits.TransportControl',
-              'action.devices.traits.Volume',
-            ],
+            traits: ['action.devices.traits.Channel'],
             attributes: {
               commandOnlyChannels: false,
             },

diff --git a/...e-actions/lib/smarthome/devices_and_traits/googleActions.colorSetting.trait.color.test.js b/...e-actions/lib/smarthome/devices_and_traits/googleActions.colorSetting.trait.color.test.js
@@ -101,7 +101,7 @@ describe('GoogleActions Handler - onSync - color', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.LIGHT',
-            traits: ['action.devices.traits.ColorSetting', 'action.devices.traits.OnOff'],
+            traits: ['action.devices.traits.ColorSetting'],
             attributes: {
               colorModel: 'rgb',
             },

diff --git a/...tions/lib/smarthome/devices_and_traits/googleActions.colorSetting.trait.colorTemp.test.js b/...tions/lib/smarthome/devices_and_traits/googleActions.colorSetting.trait.colorTemp.test.js
@@ -106,7 +106,7 @@ describe('GoogleActions Handler - onSync - color', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.LIGHT',
-            traits: ['action.devices.traits.ColorSetting', 'action.devices.traits.OnOff'],
+            traits: ['action.devices.traits.ColorSetting'],
             attributes: {
               colorTemperatureRange: {
                 temperatureMinK: 2203,

diff --git a/...ices/google-actions/lib/smarthome/devices_and_traits/googleActions.onOff.trait.tv.test.js b/...ices/google-actions/lib/smarthome/devices_and_traits/googleActions.onOff.trait.tv.test.js
@@ -101,14 +101,7 @@ describe('GoogleActions Handler - onSync - onOff (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.OnOff',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.TransportControl',
-              'action.devices.traits.Volume',
-            ],
+            traits: ['action.devices.traits.OnOff'],
             attributes: {},
             name: {
               name: 'Device 1',

diff --git a/...-actions/lib/smarthome/devices_and_traits/googleActions.transportControl.trait.tv.test.js b/...-actions/lib/smarthome/devices_and_traits/googleActions.transportControl.trait.tv.test.js
@@ -103,14 +103,7 @@ describe('GoogleActions Handler - onSync - TransportControl (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.TransportControl',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.OnOff',
-              'action.devices.traits.Volume',
-            ],
+            traits: ['action.devices.traits.TransportControl'],
             attributes: {
               transportControlSupportedCommands: ['PAUSE', 'RESUME', 'STOP', 'NEXT', 'PREVIOUS'],
             },

diff --git a/...ces/google-actions/lib/smarthome/devices_and_traits/googleActions.volume.trait.tv.test.js b/...ces/google-actions/lib/smarthome/devices_and_traits/googleActions.volume.trait.tv.test.js
@@ -114,14 +114,7 @@ describe('GoogleActions Handler - onSync - volume (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.Volume',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.OnOff',
-              'action.devices.traits.TransportControl',
-            ],
+            traits: ['action.devices.traits.Volume'],
             attributes: {
               volumeMaxLevel: 45,
               volumeCanMuteAndUnmute: false,
@@ -166,14 +159,7 @@ describe('GoogleActions Handler - onSync - volume (tv)', () => {
           {
             id: 'device-1',
             type: 'action.devices.types.TV',
-            traits: [
-              'action.devices.traits.Volume',
-              'action.devices.traits.AppSelector',
-              'action.devices.traits.InputSelector',
-              'action.devices.traits.MediaState',
-              'action.devices.traits.OnOff',
-              'action.devices.traits.TransportControl',
-            ],
+            traits: ['action.devices.traits.Volume'],
             attributes: {
               volumeMaxLevel: 30,
               volumeCanMuteAndUnmute: true,

diff --git a/server/test/services/google-actions/lib/smarthome/googleActions.onExecute.test.js b/server/test/services/google-actions/lib/smarthome/googleActions.onExecute.test.js
@@ -202,7 +202,6 @@ describe('GoogleActions Handler - onExecute', () => {
           {
             ids: ['device-1'],
             status: 'ERROR',
-            errorCode: 'functionNotSupported',
           },
         ],
       },
@@ -255,7 +254,6 @@ describe('GoogleActions Handler - onExecute', () => {
           {
             ids: ['device-1'],
             status: 'ERROR',
-            errorCode: 'functionNotSupported',
           },
         ],
       },