This repository has been archived by the owner on Sep 21, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Nest] Reopen new EventSource on disconnection and exception handling…
… improvements (#2940) * Reopen EventSource on disconnects * Properly cache redirect URL for PUT requests to reduce going offline due to FailedResolvingNestUrlExceptions * Increase PUT timeout from 5 to 30 seconds to reduce going offline due to FailedSendingNestDataExceptions * Schedule reconnect when offline to get online again * Schedule job for sending pending requests when going online * Introduce NestRedirectUrlSupplier for resolving redirect URLs * Reset cached redirect URL on Exceptions that may be caused by an offline host * Don't reopen EventSource when it is already being reopened * Fix potential NPE when updating configuration when redirectUrlSupplier is null * Schedule initialize job to fix warnings on initialize which may take more than 5 seconds * Cancel scheduled jobs in dispose Fixes #2845 Signed-off-by: Wouter Born <eclipse@maindrain.net>
- Loading branch information
Showing
4 changed files
with
216 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
....binding.nest/src/main/java/org/openhab/binding/nest/handler/NestRedirectUrlSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /** | ||
| * Copyright (c) 2010-2017 by the respective copyright holders. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| */ | ||
| package org.openhab.binding.nest.handler; | ||
|
|
||
| import java.util.Properties; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
| import org.eclipse.jetty.client.HttpClient; | ||
| import org.eclipse.jetty.client.api.ContentResponse; | ||
| import org.eclipse.jetty.client.api.Request; | ||
| import org.eclipse.jetty.http.HttpHeader; | ||
| import org.eclipse.jetty.http.HttpMethod; | ||
| import org.eclipse.jetty.http.HttpStatus; | ||
| import org.eclipse.jetty.util.ssl.SslContextFactory; | ||
| import org.eclipse.smarthome.io.net.http.HttpUtil; | ||
| import org.openhab.binding.nest.NestBindingConstants; | ||
| import org.openhab.binding.nest.internal.exceptions.FailedResolvingNestUrlException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Supplies resolved redirect URLs of {@link NestBindingConstants#NEST_URL} so they can be used with HTTP clients that | ||
| * do not pass Authorization headers after redirects like the Jetty client used by {@link HttpUtil}. | ||
| * | ||
| * @author Wouter Born - Extract resolving redirect URL from NestBridgeHandler into NestRedirectUrlSupplier | ||
| */ | ||
| @NonNullByDefault | ||
| public class NestRedirectUrlSupplier { | ||
|
|
||
| private final Logger logger = LoggerFactory.getLogger(NestRedirectUrlSupplier.class); | ||
|
|
||
| private String cachedUrl = ""; | ||
|
|
||
| private Properties httpHeaders; | ||
|
|
||
| NestRedirectUrlSupplier(Properties httpHeaders) { | ||
| this.httpHeaders = httpHeaders; | ||
| } | ||
|
|
||
| public String getRedirectUrl() throws FailedResolvingNestUrlException { | ||
| if (cachedUrl.isEmpty()) { | ||
| cachedUrl = resolveRedirectUrl(); | ||
| } | ||
| return cachedUrl; | ||
| } | ||
|
|
||
| public void resetCache() { | ||
| cachedUrl = ""; | ||
| } | ||
|
|
||
| /** | ||
| * Resolves the redirect URL for calls using the {@link NestBindingConstants#NEST_URL}. | ||
| * | ||
| * The Jetty client used by {@link HttpUtil} will not pass the Authorization header after a redirect resulting in | ||
| * "401 Unauthorized error" issues. | ||
| * | ||
| * Note that this workaround currently does not use any configured proxy like {@link HttpUtil} does. | ||
| * | ||
| * @see https://developers.nest.com/documentation/cloud/how-to-handle-redirects | ||
| */ | ||
| private String resolveRedirectUrl() throws FailedResolvingNestUrlException { | ||
| HttpClient httpClient = new HttpClient(new SslContextFactory()); | ||
| httpClient.setFollowRedirects(false); | ||
|
|
||
| Request request = httpClient.newRequest(NestBindingConstants.NEST_URL).method(HttpMethod.GET).timeout(30, | ||
| TimeUnit.SECONDS); | ||
| for (String httpHeaderKey : httpHeaders.stringPropertyNames()) { | ||
| request.header(httpHeaderKey, httpHeaders.getProperty(httpHeaderKey)); | ||
| } | ||
|
|
||
| ContentResponse response; | ||
| try { | ||
| httpClient.start(); | ||
| response = request.send(); | ||
| httpClient.stop(); | ||
| } catch (Exception e) { | ||
| throw new FailedResolvingNestUrlException("Failed to resolve redirect URL: " + e.getMessage(), e); | ||
| } | ||
|
|
||
| int status = response.getStatus(); | ||
| String redirectUrl = response.getHeaders().get(HttpHeader.LOCATION); | ||
|
|
||
| if (status != HttpStatus.TEMPORARY_REDIRECT_307) { | ||
| logger.debug("Redirect status: {}", status); | ||
| logger.debug("Redirect response: {}", response.getContentAsString()); | ||
| throw new FailedResolvingNestUrlException("Failed to get redirect URL, expected status " | ||
| + HttpStatus.TEMPORARY_REDIRECT_307 + " but was " + status); | ||
| } else if (StringUtils.isEmpty(redirectUrl)) { | ||
| throw new FailedResolvingNestUrlException("Redirect URL is empty"); | ||
| } | ||
|
|
||
| redirectUrl = redirectUrl.endsWith("/") ? redirectUrl.substring(0, redirectUrl.length() - 1) : redirectUrl; | ||
| logger.debug("Redirect URL: {}", redirectUrl); | ||
| return redirectUrl; | ||
| } | ||
| } |
Oops, something went wrong.