Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[intesis] Improve session handling #16476

Merged
merged 6 commits into from
Mar 5, 2024
Merged

[intesis] Improve session handling #16476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9757abf
[intesis] SESSION ID HANDLING IMPROVED
fd0cwp Mar 2, 2024
3aaea09
Update bundles/org.openhab.binding.intesis/src/main/java/org/openhab/…
fd0cwp Mar 4, 2024
35f5f2a
Merge branch 'openhab:main' into main
fd0cwp Mar 4, 2024
38906ef
[intesis] Improve session handling
fd0cwp Mar 4, 2024
56b77c7
Merge branch 'main' of https://github.com/fd0cwp/openhab-addons
fd0cwp Mar 4, 2024
1b72283
[intesis] Improve session handling
fd0cwp Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...g.intesis/src/main/java/org/openhab/binding/intesis/internal/gson/IntesisHomeJSonDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class IntesisHomeJSonDTO {
public static class Response {
public boolean success;
public JsonElement data;
public JsonElement error;
}

public static class Data {
Expand All @@ -36,6 +37,11 @@ public static class Data {
public JsonElement dpval;
}

public static class ResponseError {
public int code;
public String message;
}

public static class Id {
public String sessionID; // Session ID
}
Expand Down
45 changes: 35 additions & 10 deletions ...ntesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisHomeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.openhab.binding.intesis.internal.gson.IntesisHomeJSonDTO.Id;
import org.openhab.binding.intesis.internal.gson.IntesisHomeJSonDTO.Info;
import org.openhab.binding.intesis.internal.gson.IntesisHomeJSonDTO.Response;
import org.openhab.binding.intesis.internal.gson.IntesisHomeJSonDTO.ResponseError;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
Expand Down Expand Up @@ -86,6 +87,8 @@ public class IntesisHomeHandler extends BaseThingHandler {

private IntesisHomeConfiguration config = new IntesisHomeConfiguration();

private String sessionId = "";

private @Nullable ScheduledFuture<?> refreshJob;

public IntesisHomeHandler(final Thing thing, final HttpClient httpClient,
Expand All @@ -109,6 +112,9 @@ public void initialize() {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Password not set");
return;
} else {
logger.trace("trying to log in - current session ID: {}", sessionId);
login();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

initialize() should return fast and not do any blocking network calls. This is the reason for background initialization below.


// start background initialization:
scheduler.submit(() -> {
populateProperties();
Expand All @@ -129,6 +135,8 @@ public void dispose() {
refreshJob.cancel(true);
this.refreshJob = null;
}

logout(sessionId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

}

@Override
Expand Down Expand Up @@ -216,26 +224,29 @@ public void handleCommand(ChannelUID channelUID, Command command) {
}

public @Nullable String login() {
// lambda's can't modify local variables, so we use an array here to get around the issue
String[] sessionId = new String[1];
postRequest(
"{\"command\":\"login\",\"data\":{\"username\":\"Admin\",\"password\":\"" + config.password + "\"}}",
resp -> {
Data data = gson.fromJson(resp.data, Data.class);
ResponseError error = gson.fromJson(resp.error, ResponseError.class);
if (error != null) {
logger.debug("Login - Error: {}", error);
}
if (data != null) {
Id id = gson.fromJson(data.id, Id.class);
if (id != null) {
sessionId[0] = id.sessionID;
sessionId = id.sessionID.toString();
}
}
});
if (sessionId[0] != null && !sessionId[0].isEmpty()) {
logger.trace("Login - received session ID: {}", sessionId);
if (sessionId != null && !sessionId.isEmpty()) {
updateStatus(ThingStatus.ONLINE);
return sessionId[0];
} else {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "SessionId not received");
return null;
sessionId = "";
}
return sessionId;
}

public @Nullable String logout(String sessionId) {
Expand Down Expand Up @@ -309,18 +320,34 @@ public void addChannel(String channelId, String itemType, @Nullable final Collec
}

private void postRequest(String request, Consumer<Response> handler) {
postRequest(request, handler, false);
}

private void postRequest(String request, Consumer<Response> handler, boolean retry) {
try {
logger.trace("request : '{}'", request);
String response = api.postRequest(config.ipAddress, request);
if (response != null) {
Response resp = gson.fromJson(response, Response.class);
if (resp != null) {
boolean success = resp.success;
if (success) {
if (resp.success) {
handler.accept(resp);
} else {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Request unsuccessful");
ResponseError respError = gson.fromJson(resp.error, ResponseError.class);
if (respError != null) {
logger.warn("postRequest failed - respErrorCode: {} / respErrorMessage: {} / retry {}",
respError.code, respError.message, retry);
if (!retry && respError.code == 1) {
logger.debug(
"postRequest: trying to log in and retry request - respErrorCode: {} / respErrorMessage: {} / retry {}",
respError.code, respError.message, retry);
login();
postRequest(request, handler, true);
}
}

}
}
} else {
Expand All @@ -332,13 +359,11 @@ private void postRequest(String request, Consumer<Response> handler) {
}

private void postRequestInSession(UnaryOperator<String> requestFactory, Consumer<Response> handler) {
String sessionId = login();
if (sessionId != null) {
try {
String request = requestFactory.apply(sessionId);
postRequest(request, handler);
} finally {
logout(sessionId);
}
}
}
Expand Down