@mhome/core-protocol 1.40.1 → 1.44.0

package/README.md

@@ -5,6 +5,15 @@ provider runtimes. Public `/app/*` contracts belong to
 `mhome-app-facade-api`; this crate owns internal MWS, authentication, LLM,
 Messaging normalization, Node runtime, and Storage contracts.
 
+`messaging::IngressRedeem` carries a parsed identity code and a dedicated
+`IdentityRedemptionContext`: event ID, receiving address, sender and optional
+conversation display name. Redemption is independent of normalized message
+content and its schema version. The receiver validates the context and authorizes
+the registered account before consuming the code. External protocol 23 requires
+Host and Core to use the dedicated context; cloud ingress must be upgraded with
+the local receiver. There is no full-message redemption compatibility path. The shared wire example is
+[`fixtures/messaging-redemption.json`](fixtures/messaging-redemption.json).
+
 The additive [`client_identity`](contract/client-identity.md) contract separates
 User and Space Client identity, installation ID and enrollment ID. Runtime ingress
 has not yet cut over to this contract; operation authorization remains separate.

package/fixtures/camera-plugin-management.conformance.json

@@ -38,7 +38,7 @@
               "state.cameraMotion"
             ],
             "health": "ready",
-            "sourceId": null,
+            "connectionId": "connection-1",
             "resolutionStatus": "ready"
           }
         ],
@@ -50,7 +50,7 @@
             "source": "onvif"
           }
         ],
-        "sources": [],
+        "connections": [],
         "cameraSettings": [
           {
             "deviceId": "camera-1",
@@ -59,7 +59,9 @@
               "watchMode": "off",
               "objectDetectionMode": "off",
               "personDetectionMode": "off",
-              "recordMode": "off"
+              "recordMode": "off",
+              "preRollSeconds": 8,
+              "postRollSeconds": 15
             }
           }
         ]
@@ -78,7 +80,8 @@
         "deviceIds": [
           "camera-1"
         ],
-        "changed": true
+        "changed": true,
+        "connectionId": "connection-1"
       }
     },
     {
@@ -90,7 +93,9 @@
           "watchMode": "off",
           "objectDetectionMode": "off",
           "personDetectionMode": "off",
-          "recordMode": "off"
+          "recordMode": "off",
+          "preRollSeconds": 8,
+          "postRollSeconds": 15
         }
       }
     },
@@ -103,26 +108,66 @@
       }
     },
     {
-      "name": "remove-ha-source",
+      "name": "connection-detail-request",
       "value": {
-        "sourceId": "ha-1"
+        "connectionId": "ha-1"
       }
     },
     {
       "name": "connected-empty-ha",
       "value": {
         "providers": [],
-        "sources": [
+        "connections": [
           {
             "id": "ha-1",
             "name": "http://homeassistant.local:8123",
-            "deviceCount": 0
+            "deviceCount": 0,
+            "provider": "home_assistant",
+            "revision": 1
           }
         ],
         "devices": [],
         "onlineStates": [],
         "cameraSettings": []
       }
+    },
+    {
+      "name": "recording without preroll or postroll",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": 0,
+          "postRollSeconds": 0
+        }
+      }
+    },
+    {
+      "name": "recording retention limits",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": 120,
+          "postRollSeconds": 300
+        }
+      }
+    },
+    {
+      "name": "update only preroll",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": 60
+        }
+      }
+    },
+    {
+      "name": "update only postroll",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": 30
+        }
+      }
     }
   ],
   "invalid": [
@@ -143,12 +188,12 @@
             "name": "Front",
             "capabilities": [],
             "health": "unknown",
-            "sourceId": null,
+            "connectionId": "connection-1",
             "resolutionStatus": "ready"
           }
         ],
         "onlineStates": [],
-        "sources": [],
+        "connections": [],
         "cameraSettings": []
       }
     },
@@ -162,7 +207,7 @@
             "capabilities": [],
             "health": "ready",
             "sourceUid": "secret",
-            "sourceId": null,
+            "connectionId": "connection-1",
             "resolutionStatus": "ready"
           }
         ],
@@ -184,6 +229,137 @@
           "watchMode": "on"
         }
       }
+    },
+    {
+      "name": "preRollSeconds null",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": null
+        }
+      }
+    },
+    {
+      "name": "preRollSeconds negative",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": -1
+        }
+      }
+    },
+    {
+      "name": "preRollSeconds fractional",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": 1.5
+        }
+      }
+    },
+    {
+      "name": "preRollSeconds string",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": "15"
+        }
+      }
+    },
+    {
+      "name": "preRollSeconds above limit",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "preRollSeconds": 121
+        }
+      }
+    },
+    {
+      "name": "settings snapshot missing preRollSeconds",
+      "value": {
+        "deviceId": "camera-1",
+        "revision": 1,
+        "settings": {
+          "watchMode": "off",
+          "objectDetectionMode": "off",
+          "personDetectionMode": "off",
+          "recordMode": "off",
+          "postRollSeconds": 15
+        }
+      }
+    },
+    {
+      "name": "postRollSeconds null",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": null
+        }
+      }
+    },
+    {
+      "name": "postRollSeconds negative",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": -1
+        }
+      }
+    },
+    {
+      "name": "postRollSeconds fractional",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": 1.5
+        }
+      }
+    },
+    {
+      "name": "postRollSeconds string",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": "15"
+        }
+      }
+    },
+    {
+      "name": "postRollSeconds above limit",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "postRollSeconds": 301
+        }
+      }
+    },
+    {
+      "name": "settings snapshot missing postRollSeconds",
+      "value": {
+        "deviceId": "camera-1",
+        "revision": 1,
+        "settings": {
+          "watchMode": "off",
+          "objectDetectionMode": "off",
+          "personDetectionMode": "off",
+          "recordMode": "off",
+          "preRollSeconds": 8
+        }
+      }
+    },
+    {
+      "name": "old source request",
+      "value": {
+        "sourceId": "ha-1"
+      }
+    },
+    {
+      "name": "disconnect without valid revision",
+      "value": {
+        "connectionId": "connection-1",
+        "expectedRevision": 0
+      }
     }
   ]
 }

package/manifest/core.v1.json

@@ -1,6 +1,6 @@
 {
   "manifest": "mhome.core.v1",
-  "contractVersion": "1.40.1",
+  "contractVersion": "1.44.0",
   "protocols": {
     "agentGateway": {
       "submitTarget": "/agent/submit",
@@ -30,13 +30,16 @@
       "routes": {
         "deviceList": "device/list",
         "managementSnapshot": "management/snapshot",
-        "deviceRemove": "device/remove",
-        "sourceRemove": "source/remove",
         "deviceSettingsGet": "device/settings/get",
-        "deviceSettingsUpdate": "device/settings/update"
+        "deviceSettingsUpdate": "device/settings/update",
+        "providerList": "provider/list",
+        "connectionList": "connection/list",
+        "connectionDetail": "connection/detail",
+        "connectionDisconnect": "connection/disconnect"
       },
       "flows": {
-        "deviceAdd": "device.add"
+        "connectionCreate": "connection.create",
+        "connectionReconfigure": "connection.reconfigure"
       }
     },
     "audioBridgePlugin": {
@@ -49,7 +52,6 @@
         "deviceRefresh": "device/refresh",
         "devicePair": "device/pair",
         "deviceUnpair": "device/unpair",
-        "deviceTest": "device/test",
         "deviceListenSet": "device/listen",
         "smartSpeakerSnapshot": "smart-speaker/snapshot",
         "smartSpeakerCreate": "smart-speaker/create",
@@ -66,7 +68,7 @@
       "version": "storage.v2"
     },
     "hostDelivery": {
-      "externalProtocolVersion": 21,
+      "externalProtocolVersion": 23,
       "requestKind": "deliveryRequested",
       "connectionControlKind": "connectionControlRequested",
       "acceptanceBoundaries": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mhome/core-protocol",
-  "version": "1.40.1",
+  "version": "1.44.0",
   "description": "Build-time protocol artifacts for mhome.core",
   "license": "MIT",
   "repository": {

package/protocol.json

@@ -1,6 +1,6 @@
 {
   "protocol": "mhome.core",
-  "contractVersion": "1.40.1",
+  "contractVersion": "1.44.0",
   "manifest": "manifest/core.v1.json",
   "schemas": {
     "hostManagementRequest": "schema/host-management-request.v1.schema.json",

package/schema/camera-plugin-management.v1.schema.json

@@ -19,7 +19,7 @@
       "$ref": "#/$defs/deviceListResponse"
     },
     {
-      "$ref": "#/$defs/deviceMutationResponse"
+      "$ref": "#/$defs/connectionMutationResponse"
     },
     {
       "$ref": "#/$defs/deviceSettingsResponse"
@@ -28,7 +28,19 @@
       "$ref": "#/$defs/errorResponse"
     },
     {
-      "$ref": "#/$defs/sourceIdRequest"
+      "$ref": "#/$defs/connectionIdRequest"
+    },
+    {
+      "$ref": "#/$defs/connectionDisconnectRequest"
+    },
+    {
+      "$ref": "#/$defs/connectionListResponse"
+    },
+    {
+      "$ref": "#/$defs/providerListResponse"
+    },
+    {
+      "$ref": "#/$defs/connectionDetailResponse"
     }
   ],
   "$defs": {
@@ -82,7 +94,7 @@
         "name",
         "capabilities",
         "health",
-        "sourceId",
+        "connectionId",
         "resolutionStatus"
       ],
       "properties": {
@@ -118,11 +130,8 @@
           "type": "string",
           "minLength": 1
         },
-        "sourceId": {
-          "type": [
-            "string",
-            "null"
-          ],
+        "connectionId": {
+          "type": "string",
           "minLength": 1
         },
         "resolutionStatus": {
@@ -173,7 +182,7 @@
         "devices",
         "onlineStates",
         "cameraSettings",
-        "sources"
+        "connections"
       ],
       "properties": {
         "providers": {
@@ -194,10 +203,10 @@
             "$ref": "#/$defs/onlineStateObservation"
           }
         },
-        "sources": {
+        "connections": {
           "type": "array",
           "items": {
-            "$ref": "#/$defs/homeAssistantSource"
+            "$ref": "#/$defs/cameraConnection"
           }
         },
         "cameraSettings": {
@@ -231,11 +240,12 @@
       },
       "additionalProperties": false
     },
-    "deviceMutationResponse": {
+    "connectionMutationResponse": {
       "type": "object",
       "required": [
         "deviceIds",
-        "changed"
+        "changed",
+        "connectionId"
       ],
       "properties": {
         "deviceIds": {
@@ -248,6 +258,10 @@
         },
         "changed": {
           "type": "boolean"
+        },
+        "connectionId": {
+          "type": "string",
+          "minLength": 1
         }
       },
       "additionalProperties": false
@@ -274,25 +288,27 @@
       },
       "additionalProperties": false
     },
-    "sourceIdRequest": {
+    "connectionIdRequest": {
       "type": "object",
       "required": [
-        "sourceId"
+        "connectionId"
       ],
       "properties": {
-        "sourceId": {
+        "connectionId": {
           "type": "string",
           "minLength": 1
         }
       },
       "additionalProperties": false
     },
-    "homeAssistantSource": {
+    "cameraConnection": {
       "type": "object",
       "required": [
         "id",
         "name",
-        "deviceCount"
+        "deviceCount",
+        "provider",
+        "revision"
       ],
       "properties": {
         "id": {
@@ -318,6 +334,14 @@
             "string",
             "null"
           ]
+        },
+        "provider": {
+          "type": "string",
+          "minLength": 1
+        },
+        "revision": {
+          "type": "integer",
+          "minimum": 1
         }
       },
       "additionalProperties": false
@@ -348,6 +372,16 @@
             "off",
             "event"
           ]
+        },
+        "preRollSeconds": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 120
+        },
+        "postRollSeconds": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 300
         }
       },
       "additionalProperties": false,
@@ -355,7 +389,9 @@
         "watchMode",
         "objectDetectionMode",
         "personDetectionMode",
-        "recordMode"
+        "recordMode",
+        "preRollSeconds",
+        "postRollSeconds"
       ]
     },
     "cameraSettingsPatch": {
@@ -384,6 +420,16 @@
             "off",
             "event"
           ]
+        },
+        "preRollSeconds": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 120
+        },
+        "postRollSeconds": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 300
         }
       },
       "additionalProperties": false,
@@ -427,6 +473,87 @@
         }
       },
       "additionalProperties": false
+    },
+    "connectionDisconnectRequest": {
+      "type": "object",
+      "required": [
+        "connectionId",
+        "expectedRevision"
+      ],
+      "properties": {
+        "connectionId": {
+          "type": "string",
+          "minLength": 1
+        },
+        "expectedRevision": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "expectedDeviceIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "uniqueItems": true
+        }
+      },
+      "additionalProperties": false
+    },
+    "connectionListResponse": {
+      "type": "object",
+      "required": [
+        "connections"
+      ],
+      "properties": {
+        "connections": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/cameraConnection"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "providerListResponse": {
+      "type": "object",
+      "required": [
+        "providers"
+      ],
+      "properties": {
+        "providers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/providerCatalogItem"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "connectionDetailResponse": {
+      "type": "object",
+      "required": [
+        "connection",
+        "devices"
+      ],
+      "properties": {
+        "connection": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/cameraConnection"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "devices": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/cameraDevice"
+          }
+        }
+      },
+      "additionalProperties": false
     }
   }
 }