ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Moved sync request to smart app

Browse source
This commit is contained in:
Ziver Koc 2021-01-01 22:19:51 +01:00
parent b60a7af9cd
commit ee485c4466
2 changed files with 32 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

74
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/ReportState.java
View file

@ -1,74 +0,0 @@
/*
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package se.hal.plugin.assistant.google;
import java.util.Map;
import java.util.logging.Logger;
import com.google.actions.api.smarthome.SmartHomeApp;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.home.graph.v1.HomeGraphApiServiceProto;
import com.google.home.graph.v1.HomeGraphApiServiceProto.ReportStateAndNotificationDevice;
import com.google.home.graph.v1.HomeGraphApiServiceProto.ReportStateAndNotificationRequest;
import com.google.home.graph.v1.HomeGraphApiServiceProto.StateAndNotificationPayload;
import com.google.protobuf.Struct;
import com.google.protobuf.Value;
import com.google.protobuf.util.JsonFormat;
import zutil.log.LogUtil;
import zutil.parser.DataNode;
import zutil.parser.json.JSONParser;
/**
* A singleton class to encapsulate state reporting behavior with changing ColorSetting state values.
*/
final class ReportState {
private static final Logger logger = LogUtil.getLogger();
private ReportState() {
}
/**
* Creates and completes a ReportStateAndNotification request
*
* @param actionsApp The SmartHomeApp instance to use to make the gRPC request
* @param userId The agent user ID
* @param deviceId The device ID
* @param states A Map of state keys and their values for the provided device ID
*/
public static void makeRequest(SmartHomeApp actionsApp, String userId, String deviceId, Map<String, Object> states) {
Struct.Builder statesStruct = Struct.newBuilder();
ReportStateAndNotificationDevice.Builder deviceBuilder =
ReportStateAndNotificationDevice.newBuilder().setStates(
Struct.newBuilder().putFields(deviceId,
Value.newBuilder().setStructValue(statesStruct).build()
));
ReportStateAndNotificationRequest request =
ReportStateAndNotificationRequest.newBuilder()
.setRequestId(String.valueOf(Math.random()))
.setAgentUserId(userId) // our single user's id
.setPayload(StateAndNotificationPayload.newBuilder().setDevices(deviceBuilder))
.build();
actionsApp.reportState(request);
}
}

32
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
View file

@ -25,6 +25,9 @@ import com.google.actions.api.smarthome.*;
import com.google.auth.oauth2.AccessToken; import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.GoogleCredentials; import com.google.auth.oauth2.GoogleCredentials;
import com.google.home.graph.v1.DeviceProto; import com.google.home.graph.v1.DeviceProto;
import com.google.home.graph.v1.HomeGraphApiServiceProto;
import com.google.protobuf.Struct;
import com.google.protobuf.Value;
import org.json.JSONObject; import org.json.JSONObject;
import se.hal.HalContext; import se.hal.HalContext;
import se.hal.plugin.assistant.google.trait.DeviceTrait; import se.hal.plugin.assistant.google.trait.DeviceTrait;
@ -127,6 +130,32 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
return res; return res;
} }
/**
* Creates a and sends a request for a sync from Google
*
* @param userId The agent user ID
* @param deviceId The device ID
* @param states A Map of state keys and their values for the provided device ID
*/
public void syncRequest(String userId, String deviceId, Map<String, Object> states) {
Struct.Builder statesStruct = Struct.newBuilder();
HomeGraphApiServiceProto.ReportStateAndNotificationDevice.Builder deviceBuilder =
HomeGraphApiServiceProto.ReportStateAndNotificationDevice.newBuilder().setStates(
Struct.newBuilder().putFields(deviceId,
Value.newBuilder().setStructValue(statesStruct).build()
));
HomeGraphApiServiceProto.ReportStateAndNotificationRequest request =
HomeGraphApiServiceProto.ReportStateAndNotificationRequest.newBuilder()
.setRequestId(String.valueOf(Math.random()))
.setAgentUserId(userId) // our single user's id
.setPayload(HomeGraphApiServiceProto.StateAndNotificationPayload.newBuilder().setDevices(deviceBuilder))
.build();
this.reportState(request);
}
/** /**
* https://developers.google.com/assistant/smarthome/reference/intent/query * https://developers.google.com/assistant/smarthome/reference/intent/query
*/ */
@ -177,6 +206,9 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
return res; return res;
} }
/**
* TODO:
*/
@Override @Override
public ExecuteResponse onExecute(ExecuteRequest executeRequest, Map<?, ?> headers) { public ExecuteResponse onExecute(ExecuteRequest executeRequest, Map<?, ?> headers) {
logger.fine("Received execute request."); logger.fine("Received execute request.");