alexa: maybe fix alexa when no detection types are available

koush · Feb 5, 2025 · 2ceb2cd · 2ceb2cd
1 parent a5fd1c0
commit 2ceb2cd
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 84 deletions.
diff --git a/plugins/alexa/CHANGELOG.md b/plugins/alexa/CHANGELOG.md
@@ -1,6 +1,16 @@
 <details>
 <summary>Changelog</summary>
 
+### 0.3.4
+
+Alexa: add option to not auto enable devices (#1615)
+
+
+### 0.3.3
+
+google-home/alexa: republish with new sdk for media converter
+
+
 ### 0.3.2
 
 alexa: fix syncedDevices being undefined

diff --git a/plugins/alexa/package-lock.json b/plugins/alexa/package-lock.json
diff --git a/plugins/alexa/package.json b/plugins/alexa/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/alexa",
-   "version": "0.3.4",
+   "version": "0.3.6",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",

diff --git a/plugins/alexa/src/main.ts b/plugins/alexa/src/main.ts
@@ -718,6 +718,9 @@ class HttpResponseLoggingImpl implements AlexaHttpResponse {
     sendSocket(socket: any, options: HttpResponseOptions): void {
         this.response.sendSocket(socket, options);
     }
+    sendStream(stream: AsyncGenerator<Buffer, void>, options?: HttpResponseOptions): void {
+        this.response.sendStream(stream, options);
+    }
 }
 
 export default AlexaPlugin;
diff --git a/plugins/alexa/src/types/camera/capabilities.ts b/plugins/alexa/src/types/camera/capabilities.ts
@@ -126,68 +126,69 @@ export async function getCameraCapabilities(device: ScryptedDevice): Promise<Dis
     ];
 
     if (device.interfaces.includes(ScryptedInterface.ObjectDetector)) {
-        const detectionTypes = await (device as any as ObjectDetector).getObjectTypes();
-        const classNames = detectionTypes.classes.filter(t => t !== 'ring' && t !== 'motion').map(type => type.toLowerCase());
-
-        capabilities.push(
-            {
-                "type": "AlexaInterface",
-                "interface": "Alexa.SmartVision.ObjectDetectionSensor",
-                "version": "1.0",
-                "properties": {
-                    "supported": [{
-                        "name": "objectDetectionClasses"
-                    }],
-                    "proactivelyReported": true,
-                    "retrievable": true
-                },
-                "configuration": {
-                    "objectDetectionConfiguration": classNames.map(type => ({
-                        "imageNetClass": type
-                    }))
-                }
-            } as DiscoveryCapability
-        );
-
-        capabilities.push(
-            {
-                "type": "AlexaInterface",
-                "interface": "Alexa.DataController",
-                "instance": "Camera.SmartVisionData",
-                "version": "1.0",
-                "properties": undefined,
-                "configuration": {
-                    "targetCapability": {
-                        "name": "Alexa.SmartVision.ObjectDetectionSensor",
-                        "version": "1.0"
-                    },
-                    "dataRetrievalSchema": {
-                        "type": "JSON",
-                        "schema": "SmartVisionData"
+        const detectionTypes = await (device as any as ObjectDetector).getObjectTypes().catch(() => {}) || undefined;
+        const classNames = detectionTypes?.classes?.filter(t => t !== 'ring' && t !== 'motion').map(type => type.toLowerCase()).filter(c => !!c);
+        if (classNames?.length) {
+            capabilities.push(
+                {
+                    "type": "AlexaInterface",
+                    "interface": "Alexa.SmartVision.ObjectDetectionSensor",
+                    "version": "1.0",
+                    "properties": {
+                        "supported": [{
+                            "name": "objectDetectionClasses"
+                        }],
+                        "proactivelyReported": true,
+                        "retrievable": true
                     },
-                    "supportedAccess": ["BY_IDENTIFIER", "BY_TIMESTAMP_RANGE"]
-                }
-            } as DiscoveryCapability
-        );
-    }
-
-    if (device.interfaces.includes(ScryptedInterface.MotionSensor)) {
-        capabilities.push(
-            {
-                "type": "AlexaInterface",
-                "interface": "Alexa.MotionSensor",
-                "version": "3",
-                "properties": {
-                    "supported": [
-                        {
-                            "name": "detectionState"
-                        }
-                    ],
-                    "proactivelyReported": true,
-                    "retrievable": true
-                }
-            } as DiscoveryCapability
-        );
+                    "configuration": {
+                        "objectDetectionConfiguration": classNames.map(type => ({
+                            "imageNetClass": type
+                        }))
+                    }
+                } as DiscoveryCapability
+            );
+
+            capabilities.push(
+                {
+                    "type": "AlexaInterface",
+                    "interface": "Alexa.DataController",
+                    "instance": "Camera.SmartVisionData",
+                    "version": "1.0",
+                    "properties": undefined,
+                    "configuration": {
+                        "targetCapability": {
+                            "name": "Alexa.SmartVision.ObjectDetectionSensor",
+                            "version": "1.0"
+                        },
+                        "dataRetrievalSchema": {
+                            "type": "JSON",
+                            "schema": "SmartVisionData"
+                        },
+                        "supportedAccess": ["BY_IDENTIFIER", "BY_TIMESTAMP_RANGE"]
+                    }
+                } as DiscoveryCapability
+            );
+        }
+
+        if (device.interfaces.includes(ScryptedInterface.MotionSensor)) {
+            capabilities.push(
+                {
+                    "type": "AlexaInterface",
+                    "interface": "Alexa.MotionSensor",
+                    "version": "3",
+                    "properties": {
+                        "supported": [
+                            {
+                                "name": "detectionState"
+                            }
+                        ],
+                        "proactivelyReported": true,
+                        "retrievable": true
+                    }
+                } as DiscoveryCapability
+            );
+        }
     }
 
     return capabilities;