From d86d3bfa7affe4157a753cb032ef6a60c68a2a49 Mon Sep 17 00:00:00 2001 From: Xiole-KKE Date: Wed, 3 Jan 2024 14:18:07 -0800 Subject: [PATCH 1/3] Update alexa_smart_home_message_schema.json --- validation_schemas/alexa_smart_home_message_schema.json | 1 + 1 file changed, 1 insertion(+) diff --git a/validation_schemas/alexa_smart_home_message_schema.json b/validation_schemas/alexa_smart_home_message_schema.json index e85efc7..c8f1805 100644 --- a/validation_schemas/alexa_smart_home_message_schema.json +++ b/validation_schemas/alexa_smart_home_message_schema.json @@ -864,6 +864,7 @@ "uncertaintyInMilliseconds", "value" ], + "dummy": "dummy", "type": "object", "properties": { "namespace": { From a512e0920e90589d7a2b70525844a313919e6d55 Mon Sep 17 00:00:00 2001 From: Xiole-KKE Date: Wed, 3 Jan 2024 14:19:55 -0800 Subject: [PATCH 2/3] Update alexa_smart_home_message_schema.json --- validation_schemas/alexa_smart_home_message_schema.json | 1 - 1 file changed, 1 deletion(-) diff --git a/validation_schemas/alexa_smart_home_message_schema.json b/validation_schemas/alexa_smart_home_message_schema.json index c8f1805..e85efc7 100644 --- a/validation_schemas/alexa_smart_home_message_schema.json +++ b/validation_schemas/alexa_smart_home_message_schema.json @@ -864,7 +864,6 @@ "uncertaintyInMilliseconds", "value" ], - "dummy": "dummy", "type": "object", "properties": { "namespace": { From 4318bfbaa33adaf4d988af39d35644c8f832ac90 Mon Sep 17 00:00:00 2001 From: Xiaolei Zhou Date: Thu, 18 Apr 2024 11:14:18 -0700 Subject: [PATCH 3/3] Update alexa_smart_home_message_schema.json P126279152 --- .../alexa_smart_home_message_schema.json | 1354 +++++++++-------- 1 file changed, 704 insertions(+), 650 deletions(-) diff --git a/validation_schemas/alexa_smart_home_message_schema.json b/validation_schemas/alexa_smart_home_message_schema.json index e85efc7..361e5ab 100644 --- a/validation_schemas/alexa_smart_home_message_schema.json +++ b/validation_schemas/alexa_smart_home_message_schema.json @@ -334,8 +334,7 @@ "COOL", "HEAT", "ECO", - "OFF", - "EM_HEAT" + "OFF" ] }, "timeOfSample": { @@ -2247,31 +2246,19 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking" + "Alexa.Cooking.TimeController" ] }, "name": { "enum": [ - "cookingTimeInterval" + "requestedCookTime" ] }, "instance": { "type": "string" }, "value": { - "type": "object", - "properties": { - "start": { - "type": "string" - }, - "end": { - "type": "string" - }, - "duration": { - "type": "string" - } - }, - "additionalProperties": false + "type": "string" }, "timeOfSample": { "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" @@ -2294,12 +2281,12 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking" + "Alexa.Cooking.TimeController" ] }, "name": { "enum": [ - "cookingMode" + "cookingPowerLevel" ] }, "instance": { @@ -2309,222 +2296,40 @@ "oneOf": [ { "type": "object", - "required": [ - "value" - ], "properties": { - "value": { + "@type": { "type": "string", "enum": [ - "AIR_FRY", - "BAKE", - "BLANCH", - "BREW", - "BOIL", - "BROIL", - "BROWN", - "CAN", - "CONVECTION_BAKE", - "CONVECTION_BROIL", - "CONVECTION_ROAST", - "CONVECTION_STEAM", - "CURE", - "CUSTOM", - "DEFROST", - "DEHYDRATE", - "FERMENT", - "FRY", - "GRILL", - "INCUBATE", - "MELT", - "OFF", - "PRESET", - "PRESSURE", - "PROOF", - "REHEAT", - "ROAST", - "SAUTE", - "SEAR", - "SIMMER", - "SLOW_COOK", - "SMOKE", - "SOFTEN", - "SOUS_VIDE", - "STEAM", - "STERILIZE", - "STEW", - "STIR_FRY", - "TIMECOOK", - "TOAST", - "WARM" + "EnumeratedPowerLevel" ] }, - "customName": { + "value": { "type": "string", - "minLength": 1 + "enum": [ + "LOW", + "MEDIUM", + "HIGH" + ] } }, "additionalProperties": false }, { - "type": "string", - "enum": [ - "AIR_FRY", - "BAKE", - "BLANCH", - "BREW", - "BOIL", - "BROIL", - "BROWN", - "CAN", - "CONVECTION_BAKE", - "CONVECTION_BROIL", - "CONVECTION_ROAST", - "CONVECTION_STEAM", - "CURE", - "CUSTOM", - "DEFROST", - "DEHYDRATE", - "FERMENT", - "FRY", - "GRILL", - "INCUBATE", - "MELT", - "OFF", - "PRESET", - "PRESSURE", - "PROOF", - "REHEAT", - "ROAST", - "SAUTE", - "SEAR", - "SIMMER", - "SLOW_COOK", - "SMOKE", - "SOFTEN", - "SOUS_VIDE", - "STEAM", - "STERILIZE", - "STEW", - "STIR_FRY", - "TIMECOOK", - "TOAST", - "WARM" - ] - } - ] - }, - "timeOfSample": { - "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" - }, - "uncertaintyInMilliseconds": { - "$ref": "#/definitions/common/model.StatePropertyBase.UncertaintyInMilliseconds" - } - }, - "additionalProperties": false - }, - { - "required": [ - "name", - "namespace", - "timeOfSample", - "uncertaintyInMilliseconds", - "value" - ], - "type": "object", - "properties": { - "namespace": { - "enum": [ - "Alexa.Cooking" - ] - }, - "name": { - "enum": [ - "foodItem" - ] - }, - "instance": { - "type": "string" - }, - "value": { - "type": "object", - "required": [ - "foodName" - ], - "properties": { - "foodName": { - "type": "string" - }, - "foodCategory": { - "type": "string", - "enum": [ - "BEEF", - "BEVERAGE", - "CHICKEN", - "FISH", - "MEAT", - "PIZZA", - "POPCORN", - "PORK", - "POTATO", - "SHRIMP", - "SOUP", - "STEAK", - "TURKEY", - "VEGETABLE", - "WATER" - ] - }, - "foodQuantity": { - "type": "object", - "discriminator": { - "propertyName": "@type" - } - }, - "foodState": { - "type": "string", - "enum": [ - "BRINED", - "CANNED", - "CHILLED", - "COLD_SMOKED", - "DEFROSTED", - "DRIED", - "EMULSIFIED", - "FREEZE_DRIED", - "FRESH", - "FROZEN", - "MELTED", - "REFRIGERATED", - "ROOM_TEMPERATURE", - "SMOKED", - "WHIPPED" - ] - }, - "foodThickness": { "type": "object", "properties": { - "value": { - "type": "number" - }, - "unit": { + "@type": { "type": "string", "enum": [ - "METER", - "KILOMETER", - "CENTIMETER", - "MILLIMETER", - "INCH", - "SPAN", - "FOOT", - "YARD", - "MILE" + "IntegralPowerLevel" ] + }, + "value": { + "type": "number" } - } + }, + "additionalProperties": false } - }, - "additionalProperties": false + ] }, "timeOfSample": { "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" @@ -2547,20 +2352,20 @@ "properties": { "namespace": { "enum": [ - "Alexa.TimeHoldController" + "Alexa.Cooking.PresetController" ] }, "name": { "enum": [ - "holdStartTime" + "presetName" ] }, "instance": { "type": "string" }, "value": { - "pattern": "^(?:[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\dZ$", - "type": "string" + "type": "string", + "additionalProperties": false }, "timeOfSample": { "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" @@ -2583,25 +2388,88 @@ "properties": { "namespace": { "enum": [ - "Alexa.TimeHoldController" + "Alexa.Cooking.PresetController" ] }, "name": { "enum": [ - "holdEndTime" + "requestedFoodDoneness" ] }, "instance": { "type": "string" }, "value": { - "pattern": "^(?:[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\dZ$", - - "type": "string" - }, - "timeOfSample": { - "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" - }, + "oneOf": [ + { + "type": "object", + "properties": { + "value": { + "type": "string", + "enum": [ + "AL_DENTE", + "CREAMY", + "CRISPY", + "DRY", + "FIRM", + "FLAKY", + "HARD", + "JUICY", + "MEDIUM", + "MEDIUM_RARE", + "MEDIUM_WELL", + "MOIST", + "OPAQUE", + "OVERCOOKED", + "RARE", + "RUNNY", + "SMOOTH", + "SOFT", + "SPRINGY", + "SUCCULENT", + "TENDER", + "UNDERCOOKED", + "VELVETY", + "WELL_DONE" + ] + } + }, + "additionalProperties": false + }, + { + "type": "string", + "enum": [ + "AL_DENTE", + "CREAMY", + "CRISPY", + "DRY", + "FIRM", + "FLAKY", + "HARD", + "JUICY", + "MEDIUM", + "MEDIUM_RARE", + "MEDIUM_WELL", + "MOIST", + "OPAQUE", + "OVERCOOKED", + "RARE", + "RUNNY", + "SMOOTH", + "SOFT", + "SPRINGY", + "SUCCULENT", + "TENDER", + "UNDERCOOKED", + "VELVETY", + "WELL_DONE" + ] + } + ] + }, + "timeOfSample": { + "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" + }, "uncertaintyInMilliseconds": { "$ref": "#/definitions/common/model.StatePropertyBase.UncertaintyInMilliseconds" } @@ -2788,19 +2656,30 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking.PresetController" + "Alexa.Cooking" ] }, "name": { "enum": [ - "presetName" + "cookingTimeInterval" ] }, "instance": { "type": "string" }, "value": { - "type": "string", + "type": "object", + "properties": { + "start": { + "type": "string" + }, + "end": { + "type": "string" + }, + "duration": { + "type": "string" + } + }, "additionalProperties": false }, "timeOfSample": { @@ -2824,12 +2703,12 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking.PresetController" + "Alexa.Cooking" ] }, "name": { "enum": [ - "requestedFoodDoneness" + "cookingMode" ] }, "instance": { @@ -2839,69 +2718,222 @@ "oneOf": [ { "type": "object", + "required": [ + "value" + ], "properties": { "value": { "type": "string", "enum": [ - "AL_DENTE", - "CREAMY", - "CRISPY", - "DRY", - "FIRM", - "FLAKY", - "HARD", - "JUICY", - "MEDIUM", - "MEDIUM_RARE", - "MEDIUM_WELL", - "MOIST", - "OPAQUE", - "OVERCOOKED", - "RARE", - "RUNNY", - "SMOOTH", - "SOFT", - "SPRINGY", - "SUCCULENT", - "TENDER", - "UNDERCOOKED", - "VELVETY", - "WELL_DONE" + "AIR_FRY", + "BAKE", + "BLANCH", + "BREW", + "BOIL", + "BROIL", + "BROWN", + "CAN", + "CONVECTION_BAKE", + "CONVECTION_BROIL", + "CONVECTION_ROAST", + "CONVECTION_STEAM", + "CURE", + "CUSTOM", + "DEFROST", + "DEHYDRATE", + "FERMENT", + "FRY", + "GRILL", + "INCUBATE", + "MELT", + "OFF", + "PRESET", + "PRESSURE", + "PROOF", + "REHEAT", + "ROAST", + "SAUTE", + "SEAR", + "SIMMER", + "SLOW_COOK", + "SMOKE", + "SOFTEN", + "SOUS_VIDE", + "STEAM", + "STERILIZE", + "STEW", + "STIR_FRY", + "TIMECOOK", + "TOAST", + "WARM" + ] + }, + "customName": { + "type": "string", + "minLength": 1 + } + }, + "additionalProperties": false + }, + { + "type": "string", + "enum": [ + "AIR_FRY", + "BAKE", + "BLANCH", + "BREW", + "BOIL", + "BROIL", + "BROWN", + "CAN", + "CONVECTION_BAKE", + "CONVECTION_BROIL", + "CONVECTION_ROAST", + "CONVECTION_STEAM", + "CURE", + "CUSTOM", + "DEFROST", + "DEHYDRATE", + "FERMENT", + "FRY", + "GRILL", + "INCUBATE", + "MELT", + "OFF", + "PRESET", + "PRESSURE", + "PROOF", + "REHEAT", + "ROAST", + "SAUTE", + "SEAR", + "SIMMER", + "SLOW_COOK", + "SMOKE", + "SOFTEN", + "SOUS_VIDE", + "STEAM", + "STERILIZE", + "STEW", + "STIR_FRY", + "TIMECOOK", + "TOAST", + "WARM" + ] + } + ] + }, + "timeOfSample": { + "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" + }, + "uncertaintyInMilliseconds": { + "$ref": "#/definitions/common/model.StatePropertyBase.UncertaintyInMilliseconds" + } + }, + "additionalProperties": false + }, + { + "required": [ + "name", + "namespace", + "timeOfSample", + "uncertaintyInMilliseconds", + "value" + ], + "type": "object", + "properties": { + "namespace": { + "enum": [ + "Alexa.Cooking" + ] + }, + "name": { + "enum": [ + "foodItem" + ] + }, + "instance": { + "type": "string" + }, + "value": { + "type": "object", + "required": [ + "foodName" + ], + "properties": { + "foodName": { + "type": "string" + }, + "foodCategory": { + "type": "string", + "enum": [ + "BEEF", + "BEVERAGE", + "CHICKEN", + "FISH", + "MEAT", + "PIZZA", + "POPCORN", + "PORK", + "POTATO", + "SHRIMP", + "SOUP", + "STEAK", + "TURKEY", + "VEGETABLE", + "WATER" + ] + }, + "foodQuantity": { + "type": "object", + "discriminator": { + "propertyName": "@type" + } + }, + "foodState": { + "type": "string", + "enum": [ + "BRINED", + "CANNED", + "CHILLED", + "COLD_SMOKED", + "DEFROSTED", + "DRIED", + "EMULSIFIED", + "FREEZE_DRIED", + "FRESH", + "FROZEN", + "MELTED", + "REFRIGERATED", + "ROOM_TEMPERATURE", + "SMOKED", + "WHIPPED" + ] + }, + "foodThickness": { + "type": "object", + "properties": { + "value": { + "type": "number" + }, + "unit": { + "type": "string", + "enum": [ + "METER", + "KILOMETER", + "CENTIMETER", + "MILLIMETER", + "INCH", + "SPAN", + "FOOT", + "YARD", + "MILE" ] } - }, - "additionalProperties": false - }, - { - "type": "string", - "enum": [ - "AL_DENTE", - "CREAMY", - "CRISPY", - "DRY", - "FIRM", - "FLAKY", - "HARD", - "JUICY", - "MEDIUM", - "MEDIUM_RARE", - "MEDIUM_WELL", - "MOIST", - "OPAQUE", - "OVERCOOKED", - "RARE", - "RUNNY", - "SMOOTH", - "SOFT", - "SPRINGY", - "SUCCULENT", - "TENDER", - "UNDERCOOKED", - "VELVETY", - "WELL_DONE" - ] + } } - ] + }, + "additionalProperties": false }, "timeOfSample": { "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" @@ -2963,18 +2995,19 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking.TimeController" + "Alexa.TimeHoldController" ] }, "name": { "enum": [ - "requestedCookTime" + "holdStartTime" ] }, "instance": { "type": "string" }, "value": { + "pattern": "^(?:[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\dZ$", "type": "string" }, "timeOfSample": { @@ -2998,55 +3031,20 @@ "properties": { "namespace": { "enum": [ - "Alexa.Cooking.TimeController" + "Alexa.TimeHoldController" ] }, "name": { "enum": [ - "cookingPowerLevel" + "holdEndTime" ] }, "instance": { "type": "string" }, "value": { - "oneOf": [ - { - "type": "object", - "properties": { - "@type": { - "type": "string", - "enum": [ - "EnumeratedPowerLevel" - ] - }, - "value": { - "type": "string", - "enum": [ - "LOW", - "MEDIUM", - "HIGH" - ] - } - }, - "additionalProperties": false - }, - { - "type": "object", - "properties": { - "@type": { - "type": "string", - "enum": [ - "IntegralPowerLevel" - ] - }, - "value": { - "type": "number" - } - }, - "additionalProperties": false - } - ] + "pattern": "^(?:[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\dZ$", + "type": "string" }, "timeOfSample": { "$ref": "#/definitions/common/model.StatePropertyBase.TimeOfSample" @@ -3738,8 +3736,7 @@ "COOL", "HEAT", "ECO", - "OFF", - "EM_HEAT" + "OFF" ] } } @@ -8692,9 +8689,8 @@ "properties": { "name": { "enum": [ - "cookingTimeInterval", - "cookingMode", - "foodItem" + "requestedCookTime", + "cookingPowerLevel" ] } } @@ -8725,7 +8721,7 @@ "properties": { "interface": { "enum": [ - "Alexa.Cooking" + "Alexa.Cooking.TimeController" ], "type": "string" }, @@ -8802,8 +8798,8 @@ "properties": { "name": { "enum": [ - "holdStartTime", - "holdEndTime" + "presetName", + "requestedFoodDoneness" ] } } @@ -8818,169 +8814,14 @@ "readOnly": { "type": "boolean" }, - "nonControllable": { - "type": "boolean", - "writeOnly": true - } - } - }, - "configuration": { - "type": "object" - } - } - }, - { - "type": "object", - "properties": { - "interface": { - "enum": [ - "Alexa.TimeHoldController" - ], - "type": "string" - }, - "version": { - "enum": [ - "3" - ], - "type": "string" - }, - "type": { - "enum": [ - "AlexaInterface" - ], - "type": "string" - } - } - } - ] - }, - { - "type": "object", - "allOf": [ - { - "type": "object", - "required": [ - "type", - "interface", - "version", - "cameraStreamConfigurations" - ], - "properties": { - "instance": { - "type": "string" - }, - "interface": { - "type": "string" - }, - "type": { - "pattern": "^[ a-zA-Z0-9_\\-=#;:?@&]+$", - "type": "string" - }, - "version": { - "type": "string" - }, - "cameraStreamConfigurations": { - "uniqueItems": true, - "items": { - "type": "object", - "required": [ - "protocols", - "resolutions", - "authorizationTypes", - "videoCodecs", - "audioCodecs" - ], - "properties": { - "authorizationTypes": { - "uniqueItems": true, - "items": { - "enum": [ - "BASIC", - "DIGEST", - "NONE" - ] - }, - "type": "array" - }, - "resolutions": { - "uniqueItems": true, - "items": { - "type": "object", - "required": [ - "width", - "height" - ], - "additionalProperties": false, - "properties": { - "width": { - "minimum": 1, - "type": "integer", - "format": "int32" - }, - "height": { - "minimum": 1, - "type": "integer", - "format": "int32" - } - } - }, - "type": "array" - }, - "videoCodecs": { - "uniqueItems": true, - "items": { - "enum": [ - "H264", - "MPEG2", - "MJPEG", - "JPG" - ] - }, - "type": "array" - }, - "audioCodecs": { - "uniqueItems": true, - "items": { - "enum": [ - "G711", - "AAC", - "NONE" - ] - }, - "type": "array" - }, - "protocols": { - "uniqueItems": true, - "items": { - "enum": [ - "RTSP", - "WEBRTC" - ] - }, - "type": "array" - } - } - }, - "type": "array" - }, - "capabilityResources": { - "required": [ - "friendlyNames" - ], - "type": "object", - "properties": { - "friendlyNames": { - "items": { - "type": "object", - "properties": { - "value": { - "type": "object" - } - } - }, - "type": "array" + "nonControllable": { + "type": "boolean", + "writeOnly": true } } + }, + "configuration": { + "type": "object" } } }, @@ -8989,7 +8830,7 @@ "properties": { "interface": { "enum": [ - "Alexa.CameraStreamController" + "Alexa.Cooking.PresetController" ], "type": "string" }, @@ -9313,8 +9154,9 @@ "properties": { "name": { "enum": [ - "presetName", - "requestedFoodDoneness" + "cookingTimeInterval", + "cookingMode", + "foodItem" ] } } @@ -9345,7 +9187,7 @@ "properties": { "interface": { "enum": [ - "Alexa.Cooking.PresetController" + "Alexa.Cooking" ], "type": "string" }, @@ -9369,22 +9211,129 @@ "type": "object", "allOf": [ { + "type": "object", "required": [ - "interface", "type", - "version" + "interface", + "version", + "cameraStreamConfigurations" ], - "type": "object", "properties": { - "interface": { + "instance": { "type": "string" }, - "version": { + "interface": { "type": "string" }, "type": { "pattern": "^[ a-zA-Z0-9_\\-=#;:?@&]+$", "type": "string" + }, + "version": { + "type": "string" + }, + "cameraStreamConfigurations": { + "uniqueItems": true, + "items": { + "type": "object", + "required": [ + "protocols", + "resolutions", + "authorizationTypes", + "videoCodecs", + "audioCodecs" + ], + "properties": { + "authorizationTypes": { + "uniqueItems": true, + "items": { + "enum": [ + "BASIC", + "DIGEST", + "NONE" + ] + }, + "type": "array" + }, + "resolutions": { + "uniqueItems": true, + "items": { + "type": "object", + "required": [ + "width", + "height" + ], + "additionalProperties": false, + "properties": { + "width": { + "minimum": 1, + "type": "integer", + "format": "int32" + }, + "height": { + "minimum": 1, + "type": "integer", + "format": "int32" + } + } + }, + "type": "array" + }, + "videoCodecs": { + "uniqueItems": true, + "items": { + "enum": [ + "H264", + "MPEG2", + "MJPEG", + "JPG" + ] + }, + "type": "array" + }, + "audioCodecs": { + "uniqueItems": true, + "items": { + "enum": [ + "G711", + "AAC", + "NONE" + ] + }, + "type": "array" + }, + "protocols": { + "uniqueItems": true, + "items": { + "enum": [ + "RTSP", + "WEBRTC" + ] + }, + "type": "array" + } + } + }, + "type": "array" + }, + "capabilityResources": { + "required": [ + "friendlyNames" + ], + "type": "object", + "properties": { + "friendlyNames": { + "items": { + "type": "object", + "properties": { + "value": { + "type": "object" + } + } + }, + "type": "array" + } + } } } }, @@ -9393,7 +9342,7 @@ "properties": { "interface": { "enum": [ - "Alexa.MediaMetadata" + "Alexa.CameraStreamController" ], "type": "string" }, @@ -9522,6 +9471,54 @@ } ] }, + { + "type": "object", + "allOf": [ + { + "required": [ + "interface", + "type", + "version" + ], + "type": "object", + "properties": { + "interface": { + "type": "string" + }, + "version": { + "type": "string" + }, + "type": { + "pattern": "^[ a-zA-Z0-9_\\-=#;:?@&]+$", + "type": "string" + } + } + }, + { + "type": "object", + "properties": { + "interface": { + "enum": [ + "Alexa.MediaMetadata" + ], + "type": "string" + }, + "version": { + "enum": [ + "3" + ], + "type": "string" + }, + "type": { + "enum": [ + "AlexaInterface" + ], + "type": "string" + } + } + } + ] + }, { "type": "object", "allOf": [ @@ -9579,8 +9576,8 @@ "properties": { "name": { "enum": [ - "requestedCookTime", - "cookingPowerLevel" + "holdStartTime", + "holdEndTime" ] } } @@ -9611,7 +9608,7 @@ "properties": { "interface": { "enum": [ - "Alexa.Cooking.TimeController" + "Alexa.TimeHoldController" ], "type": "string" }, @@ -10364,74 +10361,9 @@ }, "additionalProperties": false } - } - }, - "additionalProperties": false - } - } - } - } - }, - { - "description": "A Response message for Alexa.Authorization", - "type": "object", - "required": [ - "event" - ], - "additionalProperties": false, - "properties": { - "context": { - "$ref": "#/definitions/common/model.Context" - }, - "event": { - "type": "object", - "required": [ - "header", - "payload" - ], - "additionalProperties": false, - "properties": { - "header": { - "type": "object", - "required": [ - "namespace", - "name", - "payloadVersion", - "messageId" - ], - "additionalProperties": false, - "properties": { - "namespace": { - "type": "string", - "enum": [ - "Alexa.Authorization" - ] - }, - "name": { - "type": "string", - "enum": [ - "AcceptGrant.Response" - ] - }, - "payloadVersion": { - "$ref": "#/definitions/common/model.PayloadVersion" - }, - "messageId": { - "$ref": "#/definitions/common/model.MessageId" - }, - "correlationToken": { - "$ref": "#/definitions/common/model.CorrelationToken" - } - } - }, - "endpoint": { - "$ref": "#/definitions/common/model.Endpoint" - }, - "payload": { - "type": "object", - "additionalProperties": false, - "properties": {}, - "maxProperties": 0 + } + }, + "additionalProperties": false } } } @@ -10593,6 +10525,71 @@ } } }, + { + "description": "A Response message for Alexa.Authorization", + "type": "object", + "required": [ + "event" + ], + "additionalProperties": false, + "properties": { + "context": { + "$ref": "#/definitions/common/model.Context" + }, + "event": { + "type": "object", + "required": [ + "header", + "payload" + ], + "additionalProperties": false, + "properties": { + "header": { + "type": "object", + "required": [ + "namespace", + "name", + "payloadVersion", + "messageId" + ], + "additionalProperties": false, + "properties": { + "namespace": { + "type": "string", + "enum": [ + "Alexa.Authorization" + ] + }, + "name": { + "type": "string", + "enum": [ + "AcceptGrant.Response" + ] + }, + "payloadVersion": { + "$ref": "#/definitions/common/model.PayloadVersion" + }, + "messageId": { + "$ref": "#/definitions/common/model.MessageId" + }, + "correlationToken": { + "$ref": "#/definitions/common/model.CorrelationToken" + } + } + }, + "endpoint": { + "$ref": "#/definitions/common/model.Endpoint" + }, + "payload": { + "type": "object", + "additionalProperties": false, + "properties": {}, + "maxProperties": 0 + } + } + } + } + }, { "description": "A Response message for Alexa.MediaMetadata", "type": "object", @@ -11436,6 +11433,63 @@ } }, "additionalProperties": false + }, + { + "required": [ + "message", + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "PARTNER_OUTAGE" + ] + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false + }, + { + "required": [ + "message", + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "HDMI_CEC_NOT_PRESENT" + ] + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false + }, + { + "required": [ + "message", + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "HDMI_CEC_DISABLED_ON_DEVICE" + ] + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false } ] } @@ -11777,7 +11831,7 @@ } }, { - "description": "An ErrorResponse message for Alexa.Authorization", + "description": "An ErrorResponse message for Alexa.Cooking", "type": "object", "required": [ "event" @@ -11805,7 +11859,7 @@ "namespace": { "type": "string", "enum": [ - "Alexa.Authorization" + "Alexa.Cooking" ] }, "name": { @@ -11829,30 +11883,65 @@ "$ref": "#/definitions/common/model.Endpoint" }, "payload": { - "additionalProperties": false, - "required": [ - "message", - "type" - ], - "type": "object", - "properties": { - "message": { - "type": "string" + "oneOf": [ + { + "additionalProperties": false, + "required": [ + "type", + "message" + ], + "type": "object", + "properties": { + "message": { + "type": "string" + }, + "type": { + "enum": [ + "CHILD_LOCK", + "DOOR_CLOSED_TOO_LONG", + "DOOR_OPEN", + "PREHEAT_REQUIRED", + "PROBE_REQUIRED", + "REMOTE_START_NOT_SUPPORTED", + "REMOVE_PROBE", + "REMOTE_START_DISABLED" + ], + "type": "string" + } + } }, - "type": { - "enum": [ - "ACCEPT_GRANT_FAILED" + { + "additionalProperties": false, + "required": [ + "type", + "message", + "maxCookTime" ], - "type": "string" + "type": "object", + "properties": { + "message": { + "type": "string" + }, + "type": { + "enum": [ + "COOK_DURATION_TOO_LONG" + ], + "type": "string" + }, + "maxCookTime": { + "type": "string" + } + } } - } + ], + "type": "object" } } } } }, { - "description": "An ErrorResponse message for Alexa.Cooking", + "description": "An ErrorResponse message for Alexa.Authorization", "type": "object", "required": [ "event" @@ -11880,7 +11969,7 @@ "namespace": { "type": "string", "enum": [ - "Alexa.Cooking" + "Alexa.Authorization" ] }, "name": { @@ -11904,58 +11993,23 @@ "$ref": "#/definitions/common/model.Endpoint" }, "payload": { - "oneOf": [ - { - "additionalProperties": false, - "required": [ - "type", - "message" - ], - "type": "object", - "properties": { - "message": { - "type": "string" - }, - "type": { - "enum": [ - "CHILD_LOCK", - "DOOR_CLOSED_TOO_LONG", - "DOOR_OPEN", - "PREHEAT_REQUIRED", - "PROBE_REQUIRED", - "REMOTE_START_NOT_SUPPORTED", - "REMOVE_PROBE", - "REMOTE_START_DISABLED" - ], - "type": "string" - } - } + "additionalProperties": false, + "required": [ + "message", + "type" + ], + "type": "object", + "properties": { + "message": { + "type": "string" }, - { - "additionalProperties": false, - "required": [ - "type", - "message", - "maxCookTime" + "type": { + "enum": [ + "ACCEPT_GRANT_FAILED" ], - "type": "object", - "properties": { - "message": { - "type": "string" - }, - "type": { - "enum": [ - "COOK_DURATION_TOO_LONG" - ], - "type": "string" - }, - "maxCookTime": { - "type": "string" - } - } + "type": "string" } - ], - "type": "object" + } } } } @@ -13026,4 +13080,4 @@ } } ] -} +} \ No newline at end of file