homebridge-nest-accfactory 0.0.4-a → 0.0.5

package/dist/protect.js

@@ -1,7 +1,7 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 30/8/2024
+// Code version 12/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -80,7 +80,7 @@ export default class NestProtect extends HomeKitDevice {
         EveSmoke_alarmtest: this.deviceData.self_test_in_progress,
         EveSmoke_heatstatus: this.deviceData.heat_status,
         EveSmoke_hushedstate: this.deviceData.hushed_state,
-        EveSmoke_statusled: this.deviceData.ntp_green_led,
+        EveSmoke_statusled: this.deviceData.ntp_green_led_enable,
         EveSmoke_smoketestpassed: this.deviceData.smoke_test_passed,
         EveSmoke_heattestpassed: this.deviceData.heat_test_passed,
       });
@@ -131,11 +131,11 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     if (deviceData.smoke_status !== 0 && this.deviceData.smoke_status === 0) {
-      this?.log?.warn && this.log.warn('Smoke detected in "%s"', this.deviceData.description);
+      this?.log?.warn && this.log.warn('Smoke detected in "%s"', deviceData.description);
     }
 
     if (deviceData.smoke_status === 0 && this.deviceData.smoke_status !== 0) {
-      this?.log?.info && this.log.info('Smoke is nolonger detected in "%s"', this.deviceData.description);
+      this?.log?.info && this.log.info('Smoke is nolonger detected in "%s"', deviceData.description);
     }
 
     // Update carbon monoxide details
@@ -161,11 +161,11 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     if (deviceData.co_status !== 0 && this.deviceData.co_status === 0) {
-      this?.log?.warn && this.log.warn('Abnormal carbon monoxide levels detected in "%s"', this.deviceData.description);
+      this?.log?.warn && this.log.warn('Abnormal carbon monoxide levels detected in "%s"', deviceData.description);
     }
 
     if (deviceData.co_status === 0 && this.deviceData.co_status !== 0) {
-      this?.log?.info && this.log.info('Carbon monoxide levels have returned to normal in "%s"', this.deviceData.description);
+      this?.log?.info && this.log.info('Carbon monoxide levels have returned to normal in "%s"', deviceData.description);
     }
 
     // Update motion service if present
@@ -202,7 +202,7 @@ export default class NestProtect extends HomeKitDevice {
       this.deviceData.latest_alarm_test = deviceData.latest_alarm_test;
       this.deviceData.self_test_in_progress = deviceData.self_test_in_progress;
       this.deviceData.heat_status = deviceData.heat_status;
-      this.deviceData.ntp_green_led = deviceData.ntp_green_led;
+      this.deviceData.ntp_green_led_enable = deviceData.ntp_green_led_enable;
       this.deviceData.smoke_test_passed = deviceData.smoke_test_passed;
       this.deviceData.heat_test_passed = deviceData.heat_test_passed;
       this.historyService.updateEveHome(this.smokeService, this.#EveHomeGetcommand.bind(this));
@@ -216,7 +216,7 @@ export default class NestProtect extends HomeKitDevice {
       EveHomeGetData.lastalarmtest = this.deviceData.latest_alarm_test;
       EveHomeGetData.alarmtest = this.deviceData.self_test_in_progress;
       EveHomeGetData.heatstatus = this.deviceData.heat_status;
-      EveHomeGetData.statusled = this.deviceData.ntp_green_led;
+      EveHomeGetData.statusled = this.deviceData.ntp_green_led_enable;
       EveHomeGetData.smoketestpassed = this.deviceData.smoke_test_passed;
       EveHomeGetData.heattestpassed = this.deviceData.heat_test_passed;
       EveHomeGetData.hushedstate = this.deviceData.hushed_state;
@@ -233,7 +233,6 @@ export default class NestProtect extends HomeKitDevice {
       //this.log.info('Eve Smoke Alarm test', (EveHomeSetData.alarmtest === true ? 'start' : 'stop'));
     }
     if (typeof EveHomeSetData?.statusled === 'boolean') {
-      this.deviceData.ntp_green_led = EveHomeSetData.statusled; // Do quick status update as setting Nest values does take sometime
       this.set({ ntp_green_led_enable: EveHomeSetData.statusled });
     }
   }

package/dist/protobuf/google/trait/product/camera.proto

@@ -50,4 +50,5 @@ message FloodlightSettingsTrait {
     OnOffTrigger liveViewingTrigger = 4;
     DaylightSensitivity daylightSensitivity = 5;
     OnOffTrigger cameraEventTrigger = 6;
+    uin32 lightState = 7;
 }

package/dist/protobuf/googlehome/foyer.proto

@@ -28,15 +28,20 @@ message StructuresService {
     string uuid = 1;
     string name = 2;
     Address address = 3;
-    EmailAddress emailAddress = 4;
+    repeated EmailAddress linked_users = 4;
     repeated Room rooms = 6;
     repeated Device devices = 7;
   }
 
   message Address {
     string line1 = 1;
-    string line2 = 2;
+    message Coordinates {
+      double latitude = 1;
+      double longitude = 2;
+    }
+    Coordinates coordinates = 2;
     uint64 timeCreated = 5;
+    string timezone = 6;
   }
 
   message EmailAddress {
@@ -47,7 +52,10 @@ message StructuresService {
   message Room {
     string uuid = 1;
     string name = 3;
-    google.protobuf.StringValue type = 4;
+    message Category {
+      string name = 1;
+    }
+    Category category = 4;
     repeated Device devices = 5;
   }
 

package/dist/protobuf/nest/nexustalk.proto

@@ -0,0 +1,181 @@
+syntax = "proto3";
+
+package nest.nexustalk.v1;
+
+enum Profile {
+    AVPROFILE_MOBILE_1 = 1;
+    AVPROFILE_HD_MAIN_1 = 2;
+    AUDIO_AAC = 3;
+    AUDIO_SPEEX = 4;
+    AUDIO_OPUS = 5;
+    VIDEO_H264_50KBIT_L12 = 6;
+    VIDEO_H264_530KBIT_L31 = 7;
+    VIDEO_H264_100KBIT_L30 = 8;
+    VIDEO_H264_2MBIT_L40 = 9;
+    VIDEO_H264_50KBIT_L12_THUMBNAIL = 10;
+    META = 11;
+    DIRECTORS_CUT = 12;
+    AUDIO_OPUS_LIVE = 13;
+    VIDEO_H264_L31 = 14;
+    VIDEO_H264_L40 = 15;
+}
+
+message Hello {
+    enum ProtocolVersion {
+        VERSION_1 = 1;
+        VERSION_2 = 2;
+        VERSION_3 = 3;
+    }
+
+    enum ClientType {
+        ANDROID = 1;
+        IOS = 2;
+        WEB = 3;
+    }
+
+    ProtocolVersion protocolVersion = 1;
+    string uuid = 2;
+    bool requireConnectedCamera = 3;
+    string sessionToken = 4;
+    bool isCamera = 5;
+    string deviceId = 6;
+    string userAgent = 7;
+    string serviceAccessKey = 8;
+    ClientType clientType = 9;
+    string wwnAccessToken = 10;
+    string encryptedDeviceId = 11;
+    bytes authoriseRequest = 12;
+    string clientIpAddress = 13;
+    bool requireOwnerServer = 15;
+}
+
+message AuthoriseRequest {
+    string sessionToken = 1;
+    string wwnAccessToken = 2;
+    string serviceAccessKey = 3;
+    string oliveToken = 4;
+}
+
+message Redirect {
+    string newHost = 1;
+    bool isTranscode = 2;
+}
+
+message Ok {
+    uint32 udpPort = 1;
+}
+
+message PlaybackPacket {
+    message DirectorsCutRegions {
+        uint32 id = 1;
+        uint32 left = 2;
+        uint32 right = 3;
+        uint32 top = 4;
+        uint32 bottom = 5;
+    }
+    uint32 sessionId = 1;
+    uint32 channelId = 2;
+    sint32 timestampDelta = 3;
+    bytes payload = 4;
+    uint64 latencyRtpSequence = 5;
+    uint64 latencyRtpSsrc = 6;
+    repeated DirectorsCutRegions directorsCutRegions = 7;
+}
+
+message PlaybackEnd {
+    enum Reason {
+        USER_ENDED_SESSION = 0;
+        ERROR_TIME_NOT_AVAILABLE = 1;
+        ERROR_PROFILE_NOT_AVAILABLE = 2;
+        ERROR_TRANSCODE_NOT_AVAILABLE = 3;
+        ERROR_LEAF_NODE_CANNOT_REACH_CAMERA = 4;
+        PLAY_END_SESSION_COMPLETE = 128;
+    }
+
+    uint32 sessionId = 1;
+    Reason reason = 2;
+}
+
+message PlaybackBegin {
+    enum CodecType {
+        SPEEX = 0;
+        PCM_S16_LE = 1;
+        H264 = 2;
+        AAC = 3;
+        OPUS = 4;
+        META = 5;
+        DIRECTORS_CUT = 6;
+    }
+
+    message Channels {
+        uint32 channelId = 1;
+        CodecType codecType = 2;
+        uint32 sampleRate = 3;
+        bytes privateData = 4;
+        double startTime = 5;
+        double rtpStartTime = 6;
+        uint32 udpSsrc = 7;
+        Profile profile = 8;
+    }
+    uint32 sessionId = 1;
+    repeated Channels channels = 2;
+    bytes srtpMasterKey = 3;
+    bytes srtpMasterSalt = 4;
+    uint32 fecKVal = 5;
+    uint32 fecNVal = 7;
+}
+
+message Error {
+    enum ErrorCode {
+        ERROR_CAMERA_NOT_CONNECTED = 1;
+        ERROR_ILLEGAL_PACKET = 2;
+        ERROR_AUTHORIZATION_FAILED = 3;
+        ERROR_NO_TRANSCODER_AVAILABLE = 4;
+        ERROR_TRANSCODE_PROXY_ERROR = 5;
+        ERROR_INTERNAL = 6;
+    }
+
+    ErrorCode code = 1;
+    string message = 2;
+}
+
+message TalkbackBegin {
+    string userId = 1;
+    uint32 sessionId = 2;
+    uint32 quickActionId = 3;
+    string deviceId = 4;
+}
+
+message TalkbackEnd {
+    string userId = 1;
+    uint32 sessionId = 2;
+    uint32 quickActionId = 3;
+    string deviceId = 4;
+}
+
+message StartPlayback {
+    enum ProfileNotFoundAction {
+        REDIRECT = 0;
+        USE_NEXT_AVAILABLE = 1;
+    }
+
+    uint32 sessionId = 1;
+    Profile profile = 2;
+    double startTime = 3;
+    bytes externalIp = 4;
+    uint32 externalPort = 5;
+    repeated Profile otherProfiles = 6;
+    ProfileNotFoundAction profileNotFoundAction = 7;
+}
+
+message StopPlayback {
+    uint32 sessionId = 1;
+}
+
+message AudioPayload {
+    bytes payload = 1;
+    uint32 sessionId = 2;
+    CodecType codec = 3;
+    uint32 sampleRate = 4;
+    uint32 latencyMeasureTag = 5;
+}

package/dist/protobuf/nestlabs/eventingapi/v1.proto

@@ -3,12 +3,16 @@ syntax = "proto3";
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
-import "../../nest/messages.proto";
 import "../../weave/common.proto";
 import "../../wdl-event-importance.proto";
 
 package nestlabs.eventingapi.v1;
 
+message SchemaVersion {
+    uint32 currentVersion = 1;
+    uint32 minCompatVersion = 2;
+}
+
 message EventAgent {
     weave.common.ResourceId deviceId = 1;
     ServiceId serviceId = 2;
@@ -58,7 +62,7 @@ message EventHeader {
     EventAgent producerAgent = 22;
     string producerEventKey = 23;
     map<string, string> tags = 24;
-    nest.messages.SchemaVersion schemaVersion = 25;
+    SchemaVersion schemaVersion = 25;
     map<string, google.protobuf.Timestamp> serviceTimestamps = 26;
     WdmEventFields wdmEventFields = 40;
 

package/dist/protobuf/nestlabs/gateway/v1.proto

@@ -4,11 +4,15 @@ import "google/protobuf/any.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 import "../../google/rpc/status.proto";
-import "../../nest/messages.proto";
 import "../../wdl-event-importance.proto";
 
 package nestlabs.gateway.v1;
 
+message SchemaVersion {
+    uint32 currentVersion = 1;
+    uint32 minCompatVersion = 2;
+}
+
 message TraitStateNotification {
     google.protobuf.Any state = 1;
     google.protobuf.FieldMask stateMask = 2;
@@ -42,7 +46,7 @@ message Event {
     string subjectPairerId = 10;
     string subjectTypeName = 11;
     string subjectInstanceId = 12;
-    nest.messages.SchemaVersion schemaVersion = 13;
+    SchemaVersion schemaVersion = 13;
 }
 
 message TraitRequest {
@@ -108,7 +112,7 @@ message TraitGetStateResponse {
 
 message TraitInfo {
     string traitType = 1;
-    nest.messages.SchemaVersion schemaVersion = 2;
+    SchemaVersion schemaVersion = 2;
 }
 
 message TraitUpdateStateRequest {
@@ -116,7 +120,7 @@ message TraitUpdateStateRequest {
     google.protobuf.Any state = 2;
     google.protobuf.FieldMask stateMask = 3;
     uint64 matchPublisherVersion = 4;
-    nest.messages.SchemaVersion schemaVersion = 5;
+    SchemaVersion schemaVersion = 5;
 }
 
 message TraitNotifyRequest {
@@ -139,7 +143,7 @@ message TraitCommand {
     google.protobuf.Timestamp expiryTime = 3;
     bytes authenticator = 4;
     uint64 matchPublisherVersion = 5;
-    nest.messages.SchemaVersion schemaVersion = 6;
+    SchemaVersion schemaVersion = 6;
     string namespaceId = 7;
 }
 
@@ -183,7 +187,7 @@ message ResourceInfo {
 message IfaceInfo {
     string ifaceType = 1;
     repeated IfaceTraitInfo ifaceTraitInfos = 2;
-    nest.messages.SchemaVersion schemaVersion = 6;
+    SchemaVersion schemaVersion = 6;
 }
 
 message IfaceTraitInfo {
@@ -231,43 +235,45 @@ message ResourceNotifyResponse {
     repeated TraitNotifyResponse traitResponses = 2;
 }
 
-message ResourceCommandRequest {
-    ResourceRequest resourceRequest = 1;
-    repeated ResourceCommand resourceCommands = 2;
-}
-
 message ResourceCommand {
     string traitLabel = 1;
     google.protobuf.Any command = 2;
     google.protobuf.Timestamp expiryTime = 3;
     bytes authenticator = 4;
     uint64 matchPublisherVersion = 5;
-    nest.messages.SchemaVersion schemaVersion = 6;
+    SchemaVersion schemaVersion = 6;
     string resourceType = 7;
 }
 
-message ResourceCommandResponse {
+message SendCommandRequest {
     ResourceRequest resourceRequest = 1;
-    repeated TraitOperation traitOperations = 2;
+    repeated ResourceCommand resourceCommands = 2;
 }
 
-message ResourceCommandResponseFromAPI {
-    repeated ResourceCommandResponse resourceCommandResponse = 1;
-    string unknown = 2;
+message SendCommandResponse {
+    message ResourceCommandResponse {
+        ResourceRequest resourceRequest = 1;
+        repeated TraitOperation traitOperations = 2;
+    }
+
+    repeated ResourceCommandResponse sendCommandResponse = 1;
 }
 
-message BatchTraitUpdateStateRequest {
-    repeated TraitUpdateStateRequest requests = 1;
+message BatchUpdateStateRequest {
+    repeated TraitUpdateStateRequest batchUpdateStateRequest = 1;
 }
 
-message BatchTraitOperation {
-    repeated TraitOperation traitOperation = 1;
+message BatchUpdateStateResponse {
+    message TraitOperationStateResponse {   
+        repeated TraitOperation traitOperations = 1;
+    }
+    repeated TraitOperationStateResponse  batchUpdateStateResponse = 1;
 }
 
 service TraitBatchApi {
-    rpc BatchUpdateState(BatchTraitUpdateStateRequest) returns (BatchTraitOperation);
+    rpc BatchUpdateState(BatchUpdateStateRequest) returns (BatchUpdateStateResponse);
 }
 
 service ResourceApi {
-    rpc SendCommand(ResourceCommandRequest) returns (ResourceCommandResponse);
+    rpc SendCommand(SendCommandRequest) returns (SendCommandResponse);
 }

package/dist/protobuf/nestlabs/gateway/v2.proto

@@ -3,7 +3,6 @@ syntax = "proto3";
 import "google/protobuf/any.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "../../nest/messages.proto";
 import "../../nestlabs/gateway/v1.proto";
 
 package nestlabs.gateway.v2;
@@ -20,17 +19,22 @@ enum StateType {
     ACCEPTED = 2;
 }
 
+message SchemaVersion {
+    uint32 currentVersion = 1;
+    uint32 minCompatVersion = 2;
+}
+
 message TraitMeta {
     string traitLabel = 1;
     string type = 2;
-    nest.messages.SchemaVersion schemaVersion = 3;
+    SchemaVersion schemaVersion = 3;
 }
 
 message IfaceMeta {
     string ifaceLabel = 1;
     string type = 2;
     map<string, string> traitLabelMapping = 3;
-    nest.messages.SchemaVersion schemaVersion = 4;
+    SchemaVersion schemaVersion = 4;
 }
 
 message ResourceMeta {
@@ -84,11 +88,15 @@ message TraitOperationList {
 }
 
 message ObserveResponse {
-    repeated ResourceMeta resourceMetas = 1;
-    bool initialResourceMetasContinue = 2;
-    repeated TraitState traitStates = 3;
-    repeated TraitOperationList traitOperationLists = 4;
-    google.protobuf.Timestamp currentTime = 5;
+    message ObserveResponse {
+        repeated ResourceMeta resourceMetas = 1;
+        bool initialResourceMetasContinue = 2;
+        repeated TraitState traitStates = 3;
+        repeated TraitOperationList traitOperationLists = 4;
+        google.protobuf.Timestamp currentTime = 5;
+    }
+
+    repeated ObserveResponse observeResponse = 1;
 }
 
 service GatewayService {

package/dist/protobuf/root.proto

@@ -1,9 +1,6 @@
-// Protobuf schema for Nest Observe and Nest BatchUpdateState API calls
-
 syntax = "proto3";
 
 import "google/trait/product/camera.proto";
-import "nest/messages.proto";
 import "nest/trait/audio.proto";
 import "nest/trait/detector.proto";
 import "nest/trait/hvac.proto";
@@ -26,6 +23,7 @@ import "nest/trait/service.proto";
 import "nest/trait/structure.proto";
 import "nest/trait/ui.proto";
 import "weave/common.proto";
+import "weave/trait/actuator.proto";
 import "weave/trait/audio.proto";
 import "weave/trait/description.proto";
 import "weave/trait/heartbeat.proto";
@@ -38,27 +36,4 @@ import "weave/trait/schedule.proto";
 import "weave/trait/security.proto";
 import "weave/trait/time.proto";
 import "nestlabs/gateway/v2.proto";
-import "nestlabs/history/v1.proto";
-import "googlehome/foyer.proto";
-
-package nest.rpc;
-
-message NestTraitSetRequest {
-    message TraitObject {
-        nestlabs.gateway.v2.TraitId traitId = 1;
-        google.protobuf.Any property = 2;
-    }
-
-    repeated TraitObject set = 1;
-}
-
-message NestIncomingMessage {
-    repeated nestlabs.gateway.v2.ResourceMeta resourceMetas = 1;
-    repeated nestlabs.gateway.v2.TraitState get = 3;
-}
-
-message StreamBody {
-    repeated NestIncomingMessage message = 1;
-    google.rpc.Status status = 2;
-    repeated bytes noop = 15;
-}
+import "nestlabs/history/v1.proto";

package/dist/protobuf/weave/trait/actuator.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+import "google/protobuf/wrappers.proto";
+
+package weave.trait.actuator;
+
+message OnOffTrait {
+    message SetStateRequest {
+        bool on = 1;
+    }
+
+    bool on = 1;
+}