From 74efd8db615e52bd1e8ef4fc9cfac61707fa8341 Mon Sep 17 00:00:00 2001 From: jbnadal Date: Tue, 24 Apr 2018 12:02:42 +0200 Subject: [PATCH] Update rest configuration. files to new format. --- .../uhttpd/uhttpd-rest-api/configs/core.json | 474 ++---------------- .../uhttpd-rest-api/configs/origin/core.json | 431 ++++++++++++++++ .../configs/{ => origin}/spotify.json | 0 .../configs/{ => origin}/voice-control.json | 0 4 files changed, 479 insertions(+), 426 deletions(-) create mode 100644 src/plugins/uhttpd/uhttpd-rest-api/configs/origin/core.json rename src/plugins/uhttpd/uhttpd-rest-api/configs/{ => origin}/spotify.json (100%) rename src/plugins/uhttpd/uhttpd-rest-api/configs/{ => origin}/voice-control.json (100%) diff --git a/src/plugins/uhttpd/uhttpd-rest-api/configs/core.json b/src/plugins/uhttpd/uhttpd-rest-api/configs/core.json index 04367595..09d3c061 100644 --- a/src/plugins/uhttpd/uhttpd-rest-api/configs/core.json +++ b/src/plugins/uhttpd/uhttpd-rest-api/configs/core.json @@ -1,431 +1,53 @@ // Comments { "controller": [ - // --- Network - { - // Network Info Controller - "path": "/Network/Info.json", - "model_name": "network.info" - }, - { - // WIFI AP List. - "path": "/Network/Wifi/List.json", - "model_name": "network.wifi", - "get_method": "list" - }, - { - // WIFI Connection. - "path": "/Network/Wifi/Connect.json", - "model_name": "network.wifi", - "set_method": "connect" - }, - { - // Static Settings. - "path": "/Network/StaticConfig.json", - "model_name": "network.config", - "set_method": "static_config" - }, - { - // Enable/Disable Wifi. - "path": "/Network/EnableWifi.json", - "model_name": "network.config", - "set_method": "wifi_enable" - }, - // --- System - { - // Locale Control Controller - "path": "/System/Locale.json", - "model_name": "system.locale" - }, - { - // Time Zone Controller - "path": "/System/Timezone.json", - "model_name": "system.timezone" - }, - { - // FriendlyName Control Controller - "path": "/System/FriendlyName.json", - "model_name": "system.friendlyname" - }, - { - // SoundNotification Control Controller - "path": "/System/SoundNotification.json", - "model_name": "system.soundnotification" - }, - { - // Reboot - "path": "/System/Reboot.json", - "model_name": "system.maintenance", - "set_method": "reboot" - }, - { - // Reset - "path": "/System/Reset.json", - "model_name": "system.maintenance", - "set_method": "reset" - }, - { - // DeviceInfo Controller - "path": "/System/DeviceInfo.json", - "model_name": "system.deviceinfo" - }, - { - // Standby - "path": "/System/Standby.json", - "model_name": "system.standby" - }, - { - // Standby switch - "path": "/System/Standby/Switch.json", - "model_name": "system.standby", - "set_method": "switch" - }, - { - // Block Input - "path": "/System/Input/Block.json", - "model_name": "system.input.control" - }, - // System - Upgrade Auto - { - "path": "/System/Upgrade/Auto.json", - "model_name": "system.upgrade.auto" - }, - { - "path": "/System/Upgrade/Check.json", - "model_name": "system.upgrade", - "set_method": "check" - }, - { - "path": "/System/Upgrade/Start.json", - "model_name": "system.upgrade", - "set_method": "start" - }, - { - "path": "/System/Upgrade/Stop.json", - "model_name": "system.upgrade", - "set_method": "stop" - }, - // -- Miscellaneous - { - "path": "/System/RangeExtender.json", - "model_name": "network.range_extender" - }, - { - "path": "/System/Status/Led.json", - "model_name": "light.capability.blue_led", - "get_method": "get_statewhenlightisoff", - "set_method": "set_statewhenlightisoff" - }, - // --- Hardware Control Controller - { - "path": "/Hardware/Cpu/Info.json", - "model_name": "hardware.cpuinfo" - }, - { - "path": "/Hardware/Memory/Info.json", - "model_name": "hardware.memoryinfo" - }, - // --- Presets Controller - { - // Browse. - "path": "/Player/Presets.json", - "model_name": "player.dlna.presets", - "set_method": "" - }, - { - // Play Preset. - "path": "/Player/PlayPreset.json", - "model_name": "player.dlna.presets", - "set_method": "play" - }, - { - // Store Preset. - "path": "/Player/StorePreset.json", - "model_name": "player.dlna.presets", - "set_method": "store" - }, - // --- Alarms Controller - { - // Configuration - "path": "/Alarm/Configuration.json", - "model_name": "alarm.configuration" - }, - { - // Count - "path": "/Alarm/Count.json", - "model_name": "alarm.count" - }, - { - // Preset Control - "path": "/Alarm/Preset/Info.json", - "model_name": "alarm.presets" - }, - // --- Mixer Controller - { - "path": "/Mixer/Capabilities.json", - "model_name": "system.mixer.capabilities" - }, - { - "path": "/Mixer/Capability/Volume.json", - "model_name": "zone.mixer.volume" - }, - { - "path": "/Mixer/Capability/Mute.json", - "model_name": "zone.mixer.mute" - }, - { - "path": "/Mixer/Capability/Mute/Switch.json", - "model_name": "zone.mixer.mute", - "set_method": "switch" - }, - // --- Song Queue Controller - // --- Content - { - "path": "/SongQueue/Content/List.json", - "model_name": "songqueue.content", - "get_method": "list" - }, - { - "path": "/SongQueue/Content/Add.json", - "model_name": "songqueue.content", - "set_method": "add" - }, - { - "path": "/SongQueue/Content/Remove.json", - "model_name": "songqueue.content", - "set_method": "remove" - }, - { - "path": "/SongQueue/Content/Clear.json", - "model_name": "songqueue.content", - "set_method": "clear" - }, - { - "path": "/SongQueue/Content/MaxSongsNumber.json", - "model_name": "songqueue.content", - "get_method": "get_maxsongsnumber" - }, - { - "path": "/SongQueue/Content/MovePosition.json", - "model_name": "songqueue.content", - "set_method": "move_position" - }, - //--- Control - { - "path": "/SongQueue/Control/Position.json", - "model_name": "songqueue.control", - "get_method": "get_position", - "set_method": "set_position" - }, - { - "path": "/SongQueue/Control/Play.json", - "model_name": "songqueue.control", - "set_method": "play" - }, - { - "path": "/SongQueue/Control/Pause.json", - "model_name": "songqueue.control", - "set_method": "pause" - }, - { - "path": "/SongQueue/Control/PlayPause.json", - "model_name": "songqueue.control", - "set_method": "play_pause" - }, - { - "path": "/SongQueue/Control/Stop.json", - "model_name": "songqueue.control", - "set_method": "stop" - }, - { - "path": "/SongQueue/Control/Next.json", - "model_name": "songqueue.control", - "set_method": "next" - }, - { - "path": "/SongQueue/Control/Previous.json", - "model_name": "songqueue.control", - "set_method": "previous" - }, - { - "path": "/SongQueue/Control/RepeatMode.json", - "model_name": "songqueue.control", - "get_method": "get_repeatmode", - "set_method": "set_repeatmode" - }, - { - "path": "/SongQueue/Control/ToggleRepeatMode.json", - "model_name": "songqueue.control", - "set_method": "toggle_repeatmode" - }, - { - "path": "/SongQueue/Control/ShuffleMode.json", - "model_name": "songqueue.control", - "get_method": "get_shufflemode", - "set_method": "set_shufflemode" - }, - { - "path": "/SongQueue/Control/ToggleShuffleMode.json", - "model_name": "songqueue.control", - "set_method": "toggle_shufflemode" - }, - { - "path": "/SongQueue/Control/ActiveState.json", - "model_name": "songqueue.control", - "get_method": "get_activestate" - }, - // --- Player Controller - { - "path": "/Player/PlayPause.json", - "model_name": "player.meta", - "set_method": "play_pause" - }, - { - "path": "/Player/Pause.json", - "model_name": "player.meta", - "set_method": "pause" - }, - { - "path": "/Player/Play.json", - "model_name": "player.meta", - "set_method": "play" - }, - { - "path": "/Player/Stop.json", - "model_name": "player.meta", - "set_method": "stop" - }, - { - "path": "/Player/Previous.json", - "model_name": "player.meta", - "set_method": "previous" - }, - { - "path": "/Player/Next.json", - "model_name": "player.meta", - "set_method": "next" - }, - { - "path": "/Player/SetPosition.json", - "model_name": "player.meta", - "set_method": "set_position" - }, - { - "path": "/Player/PlayURI.json", - "model_name": "player.meta", - "set_method": "play_uri" - }, - { - "path": "/Player/Say.json", - "model_name": "player.meta", - "set_method": "say" - }, - { - "path": "/Player/NotifyURI.json", - "model_name": "player.meta", - "set_method": "notify" - }, - { - // --- source selection - "path": "/Player/SourceSelection.json", - "model_name": "player.audio.source" - }, - // --- Private Controller - { - // --- PreProd Controller - "path": "/Control/PreProd.json", - "model_name": "system.upgrade", - "get_method": "get_preprod_state", - "set_method": "set_preprod_state" - }, - // --- Discovery Controller - { - "path": "/System/Discovery.json", - "model_name": "mdns.browser" - }, - // --- Playback stats controller - { - "path": "/ContentService/PlaybackStat/Start.json", - "model_name": "contentService.playbackStats", - "set_method": "start" - }, - { - "path": "/ContentService/PlaybackStat/Stop.json", - "model_name": "contentService.playbackStats", - "set_method": "stop" - }, - // --- AudioHub controller - { - // --- Control - "path": "/System/AudioHub.json", - "model_name": "system.audiohub" - }, - { - // --- Troubleshooting and statistics - "path": "/Stats/AudioHub/Bandwidth.json", - "model_name": "stats.audiohub.bandwidth" - }, - ], - "etag_controller": [ - { - // Zone State Controller - "path": "/Zone/State.json", - "model_name": "zone.state", - "event_name": "zone.state.updated", - "etag_key": "version_above", - "set_method": "post" - }, - { - // Zone Status (monitoring) Controller - "path": "/Zone/Status.json", - "model_name": "zone.status", - "event_name": "zone.status.updated", - "etag_key": "version_above" - }, - { - // Player State Controller - "path": "/Player/State.json", - "model_name": "player.meta", - "event_name": "player.state.updated", - "etag_key": "version_above", - "get_method": "get_state" - } - ], - "notification": [ - { - // Source selection. - "path": "/Service/Notification/SourceSelection.json", - "event_name": "player.sourceSelection" - }, - { - // Player Presets. - "path": "/Service/Notification/Presets.json", - "event_name": "player.preset" - }, - { - // Mixer. - "path": "/Service/Notification/Mixer.json", - "event_name": "system_mixer" - }, - { - // Song Queue. - "path": "/Service/Notification/SongQueue.json", - "event_name": "songqueue.notification" - }, - { - // Firmware upgrade. - "path": "/Service/Notification/Upgrade.json", - "event_name": "system.upgrade.notification" - }, - { - // Player state. - "path": "/Service/Notification/PlayerState.json", - "event_name": "player.state" - }, - { - // Player track. - "path": "/Service/Notification/PlayerTrack.json", - "event_name": "player.track" - } + { + "model": "get", + "endpoint": ["/v1/capabilities"], + "ubus": { + "path": "domo.capabilities", + "method": "get" + } + }, + { + "model": "get", + "endpoint": ["/v1/capabilities/lights", "/v1/capabilities/lights/:id"], + "ubus": { + "path": "domo.capabilities.lights", + "method": "get" + } + }, + { + "model": "get", + "endpoint": ["/v1/capabilities/shutters", "/v1/capabilities/shutters/:id"], + "ubus": { + "path": "domo.capabilities.shutters", + "method": "get" + } + }, + { + "model": "get", + "endpoint": ["/v1/capabilities/sprinklers", "/v1/capabilities/sprinklers/:id"], + "ubus": { + "path": "domo.capabilities.sprinklers", + "method": "get" + } + }, + { + "model": "put", + "endpoint": ["/v1/capabilities/sprinklers/:id/open"], + "ubus": { + "path": "domo.capabilities.sprinklers.open", + "method": "open" + } + }, + { + "model": "put", + "endpoint": ["/v1/capabilities/sprinklers/:id/close"], + "ubus": { + "path": "domo.capabilities.sprinklers.close", + "method": "close" + } + } ] } diff --git a/src/plugins/uhttpd/uhttpd-rest-api/configs/origin/core.json b/src/plugins/uhttpd/uhttpd-rest-api/configs/origin/core.json new file mode 100644 index 00000000..04367595 --- /dev/null +++ b/src/plugins/uhttpd/uhttpd-rest-api/configs/origin/core.json @@ -0,0 +1,431 @@ +// Comments +{ + "controller": [ + // --- Network + { + // Network Info Controller + "path": "/Network/Info.json", + "model_name": "network.info" + }, + { + // WIFI AP List. + "path": "/Network/Wifi/List.json", + "model_name": "network.wifi", + "get_method": "list" + }, + { + // WIFI Connection. + "path": "/Network/Wifi/Connect.json", + "model_name": "network.wifi", + "set_method": "connect" + }, + { + // Static Settings. + "path": "/Network/StaticConfig.json", + "model_name": "network.config", + "set_method": "static_config" + }, + { + // Enable/Disable Wifi. + "path": "/Network/EnableWifi.json", + "model_name": "network.config", + "set_method": "wifi_enable" + }, + // --- System + { + // Locale Control Controller + "path": "/System/Locale.json", + "model_name": "system.locale" + }, + { + // Time Zone Controller + "path": "/System/Timezone.json", + "model_name": "system.timezone" + }, + { + // FriendlyName Control Controller + "path": "/System/FriendlyName.json", + "model_name": "system.friendlyname" + }, + { + // SoundNotification Control Controller + "path": "/System/SoundNotification.json", + "model_name": "system.soundnotification" + }, + { + // Reboot + "path": "/System/Reboot.json", + "model_name": "system.maintenance", + "set_method": "reboot" + }, + { + // Reset + "path": "/System/Reset.json", + "model_name": "system.maintenance", + "set_method": "reset" + }, + { + // DeviceInfo Controller + "path": "/System/DeviceInfo.json", + "model_name": "system.deviceinfo" + }, + { + // Standby + "path": "/System/Standby.json", + "model_name": "system.standby" + }, + { + // Standby switch + "path": "/System/Standby/Switch.json", + "model_name": "system.standby", + "set_method": "switch" + }, + { + // Block Input + "path": "/System/Input/Block.json", + "model_name": "system.input.control" + }, + // System - Upgrade Auto + { + "path": "/System/Upgrade/Auto.json", + "model_name": "system.upgrade.auto" + }, + { + "path": "/System/Upgrade/Check.json", + "model_name": "system.upgrade", + "set_method": "check" + }, + { + "path": "/System/Upgrade/Start.json", + "model_name": "system.upgrade", + "set_method": "start" + }, + { + "path": "/System/Upgrade/Stop.json", + "model_name": "system.upgrade", + "set_method": "stop" + }, + // -- Miscellaneous + { + "path": "/System/RangeExtender.json", + "model_name": "network.range_extender" + }, + { + "path": "/System/Status/Led.json", + "model_name": "light.capability.blue_led", + "get_method": "get_statewhenlightisoff", + "set_method": "set_statewhenlightisoff" + }, + // --- Hardware Control Controller + { + "path": "/Hardware/Cpu/Info.json", + "model_name": "hardware.cpuinfo" + }, + { + "path": "/Hardware/Memory/Info.json", + "model_name": "hardware.memoryinfo" + }, + // --- Presets Controller + { + // Browse. + "path": "/Player/Presets.json", + "model_name": "player.dlna.presets", + "set_method": "" + }, + { + // Play Preset. + "path": "/Player/PlayPreset.json", + "model_name": "player.dlna.presets", + "set_method": "play" + }, + { + // Store Preset. + "path": "/Player/StorePreset.json", + "model_name": "player.dlna.presets", + "set_method": "store" + }, + // --- Alarms Controller + { + // Configuration + "path": "/Alarm/Configuration.json", + "model_name": "alarm.configuration" + }, + { + // Count + "path": "/Alarm/Count.json", + "model_name": "alarm.count" + }, + { + // Preset Control + "path": "/Alarm/Preset/Info.json", + "model_name": "alarm.presets" + }, + // --- Mixer Controller + { + "path": "/Mixer/Capabilities.json", + "model_name": "system.mixer.capabilities" + }, + { + "path": "/Mixer/Capability/Volume.json", + "model_name": "zone.mixer.volume" + }, + { + "path": "/Mixer/Capability/Mute.json", + "model_name": "zone.mixer.mute" + }, + { + "path": "/Mixer/Capability/Mute/Switch.json", + "model_name": "zone.mixer.mute", + "set_method": "switch" + }, + // --- Song Queue Controller + // --- Content + { + "path": "/SongQueue/Content/List.json", + "model_name": "songqueue.content", + "get_method": "list" + }, + { + "path": "/SongQueue/Content/Add.json", + "model_name": "songqueue.content", + "set_method": "add" + }, + { + "path": "/SongQueue/Content/Remove.json", + "model_name": "songqueue.content", + "set_method": "remove" + }, + { + "path": "/SongQueue/Content/Clear.json", + "model_name": "songqueue.content", + "set_method": "clear" + }, + { + "path": "/SongQueue/Content/MaxSongsNumber.json", + "model_name": "songqueue.content", + "get_method": "get_maxsongsnumber" + }, + { + "path": "/SongQueue/Content/MovePosition.json", + "model_name": "songqueue.content", + "set_method": "move_position" + }, + //--- Control + { + "path": "/SongQueue/Control/Position.json", + "model_name": "songqueue.control", + "get_method": "get_position", + "set_method": "set_position" + }, + { + "path": "/SongQueue/Control/Play.json", + "model_name": "songqueue.control", + "set_method": "play" + }, + { + "path": "/SongQueue/Control/Pause.json", + "model_name": "songqueue.control", + "set_method": "pause" + }, + { + "path": "/SongQueue/Control/PlayPause.json", + "model_name": "songqueue.control", + "set_method": "play_pause" + }, + { + "path": "/SongQueue/Control/Stop.json", + "model_name": "songqueue.control", + "set_method": "stop" + }, + { + "path": "/SongQueue/Control/Next.json", + "model_name": "songqueue.control", + "set_method": "next" + }, + { + "path": "/SongQueue/Control/Previous.json", + "model_name": "songqueue.control", + "set_method": "previous" + }, + { + "path": "/SongQueue/Control/RepeatMode.json", + "model_name": "songqueue.control", + "get_method": "get_repeatmode", + "set_method": "set_repeatmode" + }, + { + "path": "/SongQueue/Control/ToggleRepeatMode.json", + "model_name": "songqueue.control", + "set_method": "toggle_repeatmode" + }, + { + "path": "/SongQueue/Control/ShuffleMode.json", + "model_name": "songqueue.control", + "get_method": "get_shufflemode", + "set_method": "set_shufflemode" + }, + { + "path": "/SongQueue/Control/ToggleShuffleMode.json", + "model_name": "songqueue.control", + "set_method": "toggle_shufflemode" + }, + { + "path": "/SongQueue/Control/ActiveState.json", + "model_name": "songqueue.control", + "get_method": "get_activestate" + }, + // --- Player Controller + { + "path": "/Player/PlayPause.json", + "model_name": "player.meta", + "set_method": "play_pause" + }, + { + "path": "/Player/Pause.json", + "model_name": "player.meta", + "set_method": "pause" + }, + { + "path": "/Player/Play.json", + "model_name": "player.meta", + "set_method": "play" + }, + { + "path": "/Player/Stop.json", + "model_name": "player.meta", + "set_method": "stop" + }, + { + "path": "/Player/Previous.json", + "model_name": "player.meta", + "set_method": "previous" + }, + { + "path": "/Player/Next.json", + "model_name": "player.meta", + "set_method": "next" + }, + { + "path": "/Player/SetPosition.json", + "model_name": "player.meta", + "set_method": "set_position" + }, + { + "path": "/Player/PlayURI.json", + "model_name": "player.meta", + "set_method": "play_uri" + }, + { + "path": "/Player/Say.json", + "model_name": "player.meta", + "set_method": "say" + }, + { + "path": "/Player/NotifyURI.json", + "model_name": "player.meta", + "set_method": "notify" + }, + { + // --- source selection + "path": "/Player/SourceSelection.json", + "model_name": "player.audio.source" + }, + // --- Private Controller + { + // --- PreProd Controller + "path": "/Control/PreProd.json", + "model_name": "system.upgrade", + "get_method": "get_preprod_state", + "set_method": "set_preprod_state" + }, + // --- Discovery Controller + { + "path": "/System/Discovery.json", + "model_name": "mdns.browser" + }, + // --- Playback stats controller + { + "path": "/ContentService/PlaybackStat/Start.json", + "model_name": "contentService.playbackStats", + "set_method": "start" + }, + { + "path": "/ContentService/PlaybackStat/Stop.json", + "model_name": "contentService.playbackStats", + "set_method": "stop" + }, + // --- AudioHub controller + { + // --- Control + "path": "/System/AudioHub.json", + "model_name": "system.audiohub" + }, + { + // --- Troubleshooting and statistics + "path": "/Stats/AudioHub/Bandwidth.json", + "model_name": "stats.audiohub.bandwidth" + }, + ], + "etag_controller": [ + { + // Zone State Controller + "path": "/Zone/State.json", + "model_name": "zone.state", + "event_name": "zone.state.updated", + "etag_key": "version_above", + "set_method": "post" + }, + { + // Zone Status (monitoring) Controller + "path": "/Zone/Status.json", + "model_name": "zone.status", + "event_name": "zone.status.updated", + "etag_key": "version_above" + }, + { + // Player State Controller + "path": "/Player/State.json", + "model_name": "player.meta", + "event_name": "player.state.updated", + "etag_key": "version_above", + "get_method": "get_state" + } + ], + "notification": [ + { + // Source selection. + "path": "/Service/Notification/SourceSelection.json", + "event_name": "player.sourceSelection" + }, + { + // Player Presets. + "path": "/Service/Notification/Presets.json", + "event_name": "player.preset" + }, + { + // Mixer. + "path": "/Service/Notification/Mixer.json", + "event_name": "system_mixer" + }, + { + // Song Queue. + "path": "/Service/Notification/SongQueue.json", + "event_name": "songqueue.notification" + }, + { + // Firmware upgrade. + "path": "/Service/Notification/Upgrade.json", + "event_name": "system.upgrade.notification" + }, + { + // Player state. + "path": "/Service/Notification/PlayerState.json", + "event_name": "player.state" + }, + { + // Player track. + "path": "/Service/Notification/PlayerTrack.json", + "event_name": "player.track" + } + ] +} diff --git a/src/plugins/uhttpd/uhttpd-rest-api/configs/spotify.json b/src/plugins/uhttpd/uhttpd-rest-api/configs/origin/spotify.json similarity index 100% rename from src/plugins/uhttpd/uhttpd-rest-api/configs/spotify.json rename to src/plugins/uhttpd/uhttpd-rest-api/configs/origin/spotify.json diff --git a/src/plugins/uhttpd/uhttpd-rest-api/configs/voice-control.json b/src/plugins/uhttpd/uhttpd-rest-api/configs/origin/voice-control.json similarity index 100% rename from src/plugins/uhttpd/uhttpd-rest-api/configs/voice-control.json rename to src/plugins/uhttpd/uhttpd-rest-api/configs/origin/voice-control.json