will/LanternPowerMonitor
1
0
Fork 0
mirror of https://github.com/zyphlar/LanternPowerMonitor.git synced 2024-03-08 14:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: will:main
Branches Tags
will:main
will:patch-1
will:1.1.1
will:1.0.7
..
compare: will:1.1.1
Branches Tags
will:patch-1
will:main
will:1.1.1
will:1.0.7

No commits in common. "main" and "1.1.1" have entirely different histories.
main ... 1.1.1

14 changed files with 43 additions and 193 deletions
Show Stats Expand all files Collapse all files

BIN
bom/BOM.xlsx
View File

Binary file not shown.

10
bom/LCSC_BOM.csv
View File

@ -1,10 +0,0 @@
LCSC Part Number,Quantity
C2977589,1
C43846,1
C43840,1
C385441,2
C385449,1
C385460,1
C385498,1
C433508,1
C397337,16
1 LCSC Part Number Quantity
2 C2977589 1
3 C43846 1
4 C43840 1
5 C385441 2
6 C385449 1
7 C385460 1
8 C385498 1
9 C433508 1
10 C397337 16

2
currentmonitor/lantern-currentmonitor/pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lantern-currentmonitor</artifactId>
<packaging>jar</packaging>
<version>1.1.3</version>
<version>1.1.1</version>
<name>lantern-currentmonitor</name>
<parent>

29
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/BluetoothConfig.java
View File

@ -7,38 +7,27 @@ import com.lanternsoftware.currentmonitor.bluetooth.BleHelper;
import com.lanternsoftware.currentmonitor.bluetooth.BleService;
import com.lanternsoftware.datamodel.currentmonitor.HubConfigService;
import com.lanternsoftware.util.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
public class BluetoothConfig {
private static final Logger LOG = LoggerFactory.getLogger(BluetoothConfig.class);
private final BleApplication app;
public BluetoothConfig(String _hubName, BleCharacteristicListener _listener) {
BleApplication a = null;
try {
BleHelper.getAdapter().setPowered(true);
BleHelper.requestBusName("com.lanternsoftware");
BleHelper.setBasePath("/com/lanternsoftware");
List<BleCharacteristic> chars = CollectionUtils.transform(HubConfigService.getCharacteristics(), _c -> new BleCharacteristic("HubConfig", _c.getUUID(), _c.name(), _c.getFlags()));
chars.forEach(_c -> _c.setListener(_listener));
a = new BleApplication("Lantern", _hubName, new BleService("HubConfig", HubConfigService.getServiceUUID(), chars));
}
catch (Throwable _t) {
LOG.error("Failed to initialize BLE service", _t);
}
app = a;
BleHelper.getAdapter().setPowered(true);
BleHelper.requestBusName("com.lanternsoftware");
BleHelper.setBasePath("/com/lanternsoftware");
HubConfigService service = new HubConfigService();
List<BleCharacteristic> chars = CollectionUtils.transform(service.getCharacteristics(), _c->new BleCharacteristic("HubConfig", _c.getUUID(), _c.name(), _c.getFlags()));
chars.forEach(_c->_c.setListener(_listener));
app = new BleApplication("Lantern", _hubName, new BleService("HubConfig", service.getServiceUUID(), chars));
}
public void start() {
if (app != null)
app.start();
app.start();
}
public void stop() {
if (app != null)
app.stop();
app.stop();
}
}

12
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/MonitorApp.java
View File

@ -219,7 +219,7 @@ public class MonitorApp {
config = new MonitorConfig();
ResourceLoader.writeFile(WORKING_DIR + "config.json", DaoSerializer.toJson(config));
}
pool = HttpPool.builder().withValidateSSLCertificates(!config.isAcceptSelfSignedCertificates()).build();
pool = new HttpPool(10, 10, config.getSocketTimeout(), config.getConnectTimeout(), config.getSocketTimeout());
if (NullUtils.isNotEmpty(config.getHost()))
host = NullUtils.terminateWith(config.getHost(), "/");
monitor.setDebug(config.isDebug());
@ -301,12 +301,10 @@ public class MonitorApp {
monitor.stop();
pool.shutdown();
}, "Monitor Shutdown"));
synchronized (monitor) {
try {
monitor.wait();
} catch (InterruptedException _e) {
LOG.error("Interrupted, shutting down", _e);
}
try {
monitor.wait();
} catch (InterruptedException _e) {
LOG.error("Interrupted, shutting down", _e);
}
}

9
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/MonitorConfig.java
View File

@ -19,7 +19,6 @@ public class MonitorConfig {
private int socketTimeout;
private boolean postSamples = false;
private boolean needsCalibration = true;
private boolean acceptSelfSignedCertificates = false;
private String mqttBrokerUrl;
private String mqttUserName;
private String mqttPassword;
@ -116,14 +115,6 @@ public class MonitorConfig {
needsCalibration = _needsCalibration;
}
public boolean isAcceptSelfSignedCertificates() {
return acceptSelfSignedCertificates;
}
public void setAcceptSelfSignedCertificates(boolean _acceptSelfSignedCertificates) {
acceptSelfSignedCertificates = _acceptSelfSignedCertificates;
}
public String getMqttBrokerUrl() {
return mqttBrokerUrl;
}

2
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/dao/MonitorConfigSerializer.java
View File

@ -36,7 +36,6 @@ public class MonitorConfigSerializer extends AbstractDaoSerializer<MonitorConfig
d.put("socket_timeout", _o.getSocketTimeout());
d.put("post_samples", _o.isPostSamples());
d.put("needs_calibration", _o.isNeedsCalibration());
d.put("accept_self_signed_certificates", _o.isAcceptSelfSignedCertificates());
d.put("mqtt_broker_url", _o.getMqttBrokerUrl());
d.put("mqtt_user_name", _o.getMqttUserName());
d.put("mqtt_password", _o.getMqttPassword());
@ -61,7 +60,6 @@ public class MonitorConfigSerializer extends AbstractDaoSerializer<MonitorConfig
o.setSocketTimeout(DaoSerializer.getInteger(_d, "socket_timeout"));
o.setPostSamples(DaoSerializer.getBoolean(_d, "post_samples"));
o.setNeedsCalibration(DaoSerializer.getBoolean(_d, "needs_calibration"));
o.setAcceptSelfSignedCertificates(DaoSerializer.getBoolean(_d, "accept_self_signed_certificates"));
o.setMqttBrokerUrl(DaoSerializer.getString(_d, "mqtt_broker_url"));
o.setMqttUserName(DaoSerializer.getString(_d, "mqtt_user_name"));
o.setMqttPassword(DaoSerializer.getString(_d, "mqtt_password"));

2
currentmonitor/lantern-dataaccess-currentmonitor/src/main/java/com/lanternsoftware/dataaccess/currentmonitor/MongoCurrentMonitorDao.java
View File

@ -662,7 +662,7 @@ public class MongoCurrentMonitorDao implements CurrentMonitorDao {
if (NullUtils.isEmpty(_username) || NullUtils.isEmpty(_password))
return null;
Account acct = proxy.queryOne(Account.class, new DaoQuery("username", _username.toLowerCase().trim()));
if ((acct == null) || !BCrypt.checkpw(_password, NullUtils.makeNotNull(acct.getPassword())))
if ((acct == null) || !BCrypt.checkpw(_password, acct.getPassword()))
return null;
return toAuthCode(acct.getId(), acct.getAuxiliaryAccountIds());
}

4
currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/HubConfigService.java
View File

@ -8,7 +8,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
public abstract class HubConfigService {
public class HubConfigService {
public static final UUIDFormatter uuidFormat = new UUIDFormatter("c5650001-d50f-49af-b906-cada0dc17937");
private static final AESTool aes = new AESTool(37320708309265127L,-8068168662055796771L,-4867793276337148572L,4425609941731230765L);
private static final UUID serviceUUID = uuidFormat.format(1);
@ -20,7 +20,7 @@ public abstract class HubConfigService {
return serviceUUID;
}
public static List<HubConfigCharacteristic> getCharacteristics() {
public List<HubConfigCharacteristic> getCharacteristics() {
return Arrays.asList(HubConfigCharacteristic.values());
}

BIN
pigpio/lantern-pigpio/src/main/resources/lib/armhf/lantern-pigpio.so
View File

Binary file not shown.

2
util/lantern-util-cloudservices/src/main/java/com/lanternsoftware/util/cloudservices/apple/AppleSSO.java
View File

@ -28,7 +28,7 @@ public class AppleSSO {
private final String audience;
public AppleSSO(String _credentialsPath) {
audience = NullUtils.trim(ResourceLoader.loadFileAsString(_credentialsPath));
audience = ResourceLoader.loadFileAsString(_credentialsPath).trim();
}
public String getEmailFromIdToken(String _idToken) {

116
util/lantern-util-http/src/main/java/com/lanternsoftware/util/http/HttpPool.java
View File

@ -1,36 +1,27 @@
package com.lanternsoftware.util.http;
import com.lanternsoftware.util.NullUtils;
import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.CookieStore;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.ConnectionKeepAliveStrategy;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.protocol.HttpContext;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.SSLContexts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.security.KeyStore;
import com.lanternsoftware.util.NullUtils;
public class HttpPool {
private static final Logger LOG = LoggerFactory.getLogger(HttpPool.class);
@ -41,43 +32,17 @@ public class HttpPool {
private final PoolingHttpClientConnectionManager connectionManager;
public HttpPool(int _maxTotalConnections, int _maxPerRoute) {
this(_maxTotalConnections, _maxPerRoute, null, null);
}
public HttpPool(int _maxTotalConnections, int _maxPerRoute, KeyStore _keystore, String _keystorePassword) {
this(_maxTotalConnections, _maxPerRoute, 10000, 5000, 10000, _keystore, _keystorePassword, true);
this(_maxTotalConnections, _maxPerRoute, 10000, 5000, 10000);
}
public HttpPool(int _maxTotalConnections, int _maxPerRoute, int _socketTimeoutMs, int _connectTimeoutMs, int _connectionRequestTimeoutMs) {
this(_maxTotalConnections, _maxPerRoute, _socketTimeoutMs, _connectTimeoutMs, _connectionRequestTimeoutMs, null, null, true);
}
public HttpPool(int _maxTotalConnections, int _maxPerRoute, int _socketTimeoutMs, int _connectTimeoutMs, int _connectionRequestTimeoutMs, KeyStore _keystore, String _keystorePassword, boolean _validateSSLCertificates) {
requestConfig = RequestConfig.custom().setSocketTimeout(_socketTimeoutMs).setConnectTimeout(_connectTimeoutMs).setConnectionRequestTimeout(_connectionRequestTimeoutMs).setCookieSpec(CookieSpecs.STANDARD).build();
keepAliveStrategy = (HttpResponse response, HttpContext context) -> 0;
Registry<ConnectionSocketFactory> registry = null;
if ((_keystore != null) || !_validateSSLCertificates) {
try {
SSLContextBuilder contextBuilder = SSLContexts.custom();
if (_keystore != null)
contextBuilder.loadKeyMaterial(_keystore, _keystorePassword.toCharArray());
if (!_validateSSLCertificates)
contextBuilder.loadTrustMaterial(null, (x509CertChain, authType) -> true);
SSLConnectionSocketFactory socketFactory = _validateSSLCertificates ? new SSLConnectionSocketFactory(contextBuilder.build()) : new SSLConnectionSocketFactory(contextBuilder.build(), NoopHostnameVerifier.INSTANCE);
registry = RegistryBuilder.<ConnectionSocketFactory>create().register("https", socketFactory).register("http", new PlainConnectionSocketFactory()).build();
} catch (Exception _e) {
LOG.error("Failed to load SSL keystore", _e);
}
}
connectionManager = registry != null ? new PoolingHttpClientConnectionManager(registry) : new PoolingHttpClientConnectionManager();
connectionManager = new PoolingHttpClientConnectionManager();
connectionManager.setMaxTotal(_maxTotalConnections);
connectionManager.setDefaultMaxPerRoute(_maxPerRoute);
}
public static Builder builder() {
return new Builder();
}
public void shutdown() {
connectionManager.shutdown();
}
@ -111,28 +76,26 @@ public class HttpPool {
}
public byte[] executeToByteArray(HttpUriRequest _request) {
return executeToPayload(_request).getPayload();
}
public HttpResponsePayload executeToPayload(HttpUriRequest _request) {
InputStream is = null;
CloseableHttpResponse resp = null;
try {
resp = execute(_request);
if (resp == null)
return new HttpResponsePayload(HttpStatus.SC_INTERNAL_SERVER_ERROR, null);
if ((resp.getStatusLine().getStatusCode() < 200) || (resp.getStatusLine().getStatusCode() >= 300))
return null;
if ((resp.getStatusLine().getStatusCode() < 200) || (resp.getStatusLine().getStatusCode() >= 300)) {
LOG.error("Failed to make http request to " + _request.getURI().toString() + ". Status code: " + resp.getStatusLine().getStatusCode());
return null;
}
HttpEntity entity = resp.getEntity();
if (entity != null) {
is = entity.getContent();
return new HttpResponsePayload(resp.getStatusLine().getStatusCode(), IOUtils.toByteArray(is));
return IOUtils.toByteArray(is);
}
return new HttpResponsePayload(resp.getStatusLine().getStatusCode(), null);
return null;
}
catch (Exception _e) {
LOG.error("Failed to make http request to " + _request.getURI().toString(), _e);
return new HttpResponsePayload(HttpStatus.SC_INTERNAL_SERVER_ERROR, null);
return null;
}
finally {
IOUtils.closeQuietly(is);
@ -143,57 +106,4 @@ public class HttpPool {
public static void addBasicAuthHeader(HttpUriRequest _request, String _username, String _password) {
_request.addHeader("Authorization", "Basic " + Base64.encodeBase64String(NullUtils.toByteArray(_username + ":" + _password)));
}
public static final class Builder {
private int maxTotalConnections = 10;
private int maxPerRoute = 10;
private int socketTimeoutMs = 10000;
private int connectTimeoutMs = 5000;
private int connectionRequestTimeoutMs = 10000;
private KeyStore keystore;
private String keystorePassword;
private boolean validateSSLCertificates = true;
private Builder() {
}
public Builder withMaxTotalConnections(int val) {
maxTotalConnections = val;
return this;
}
public Builder withMaxPerRoute(int val) {
maxPerRoute = val;
return this;
}
public Builder withSocketTimeoutMs(int val) {
socketTimeoutMs = val;
return this;
}
public Builder withConnectTimeoutMs(int val) {
connectTimeoutMs = val;
return this;
}
public Builder withConnectionRequestTimeoutMs(int val) {
connectionRequestTimeoutMs = val;
return this;
}
public Builder withKeystore(KeyStore _keystore, String _password) {
keystore = _keystore;
keystorePassword = _password;
return this;
}
public Builder withValidateSSLCertificates(boolean val) {
validateSSLCertificates = val;
return this;
}
public HttpPool build() {
return new HttpPool(maxTotalConnections, maxPerRoute, socketTimeoutMs, connectTimeoutMs, connectionRequestTimeoutMs, keystore, keystorePassword, validateSSLCertificates);
}
}
}

29
util/lantern-util-http/src/main/java/com/lanternsoftware/util/http/HttpResponsePayload.java
View File

@ -1,29 +0,0 @@
package com.lanternsoftware.util.http;
import com.lanternsoftware.util.NullUtils;
public class HttpResponsePayload {
private final int status;
private final byte[] payload;
public HttpResponsePayload(int _status, byte[] _payload) {
status = _status;
payload = _payload;
}
public int getStatus() {
return status;
}
public byte[] getPayload() {
return payload;
}
public boolean isSuccess() {
return (status >= 200) && (status < 300);
}
public String asString() {
return NullUtils.toString(payload);
}
}

19
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/context/ZWaveApp.java
View File

@ -76,6 +76,7 @@ public class ZWaveApp {
private HttpPool pool;
private SwitchScheduleTask nextScheduleTask;
private final Map<Integer, Double> sensors = new HashMap<>();
private final Object ZWAVE_MUTEX = new Object();
private ExecutorService executor = null;
public void start() {
@ -558,15 +559,17 @@ public class ZWaveApp {
if (_sw.isSourceUrlValid())
return DaoSerializer.getDouble(DaoSerializer.parse(pool.executeToString(new HttpGet(_sw.getSourceUrl()))), "temp");
else if (_sw.isZWaveThermostat() && config.isMySwitch(_sw)) {
synchronized (sensors) {
controller.send(new MultilevelSensorGetRequest((byte) _sw.getNodeId()));
try {
sensors.wait(3000);
} catch (InterruptedException _e) {
_e.printStackTrace();
synchronized (ZWAVE_MUTEX) {
synchronized (sensors) {
controller.send(new MultilevelSensorGetRequest((byte) _sw.getNodeId()));
try {
sensors.wait(3000);
} catch (InterruptedException _e) {
_e.printStackTrace();
}
Double temp = sensors.get(_sw.getNodeId());
return (temp == null) ? 0.0 : temp;
}
Double temp = sensors.get(_sw.getNodeId());
return (temp == null) ? 0.0 : temp;
}
}
return 0.0;