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

Fixed equals method and refactored vue folder

Browse source
This commit is contained in:
Ziver Koc 2025-10-24 01:10:58 +02:00
parent c96a00333b
commit ac97ca8068
13 changed files with 111 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

0
hal-core/resources/web/js/vue/components/App.js → hal-core/resources/web/js/vue/App.js vendored
View file

2
hal-core/resources/web/js/vue/components/EventTableRowComponent.js vendored
View file

@ -17,7 +17,7 @@ export default {
}, },
template: ` template: `
<tr :data-device-id="event.id"> <tr :data-device-id="event.id">
<td><a :href="'?id=' + event.id">{{ event.name }}</a></td> <td><a :href="'event/' + event.id">{{ event.name }}</a></td>
<td>{{ event.configType }}</td> <td>{{ event.configType }}</td>
<td>{{ event.data?.valueStr }}</td> <td>{{ event.data?.valueStr }}</td>
<td class="timestamp">{{ timestamp }}</td> <td class="timestamp">{{ timestamp }}</td>

0
hal-core/resources/web/js/vue/vue-router.esm-browser.js → hal-core/resources/web/js/vue/lib/vue-router.esm-browser.js vendored
View file

0
hal-core/resources/web/js/vue/vue-router.esm-browser.prod.js → hal-core/resources/web/js/vue/lib/vue-router.esm-browser.prod.js vendored
View file

0
hal-core/resources/web/js/vue/vue.esm-browser.js → hal-core/resources/web/js/vue/lib/vue.esm-browser.js vendored
View file

0
hal-core/resources/web/js/vue/vue.esm-browser.prod.js → hal-core/resources/web/js/vue/lib/vue.esm-browser.prod.js vendored
View file

30
hal-core/resources/web/main_index.tmpl
View file

@ -1,3 +1,27 @@
<!--
~ The MIT License (MIT)
~
~ Copyright (c) 2025 Ziver Koc
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -53,14 +77,14 @@
<script type="importmap"> <script type="importmap">
{ {
"imports": { "imports": {
"vue": "./js/vue/vue.esm-browser.js", "vue": "./js/vue/lib/vue.esm-browser.js",
"vue-router": "./js/vue/vue-router.esm-browser.js", "vue-router": "./js/vue/lib/vue-router.esm-browser.js",
"@vue/devtools-api": "https://unpkg.com/@vue/devtools-api@6.4.5/lib/esm/index.js", "@vue/devtools-api": "https://unpkg.com/@vue/devtools-api@6.4.5/lib/esm/index.js",
{{#javascriptModules}}"{{.getModuleName()}}": "{{.getScriptPath()}}", {{#javascriptModules}}"{{.getModuleName()}}": "{{.getScriptPath()}}",
{{/javascriptModules}} {{/javascriptModules}}
"App": "./js/vue/components/App.js" "App": "./js/vue/App.js"
} }
} }
</script> </script>

28
hal-core/src/se/hal/page/JavascriptModules.java
View file

@ -1,3 +1,27 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2025 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package se.hal.page; package se.hal.page;
import se.hal.intf.HalJavascriptModule; import se.hal.intf.HalJavascriptModule;
@ -7,7 +31,7 @@ public class JavascriptModules implements HalJavascriptModule {
@Override @Override
public HalJsModule[] getJavascriptModules() { public HalJsModule[] getJavascriptModules() {
HalWebPage.getRootNav().createSubNav("Events").createSubNav("event_overview", "Overview"); HalWebPage.getRootNav().createSubNav("Events").createSubNav("events", "Overview");
return new HalJsModule[] { return new HalJsModule[] {
new HalJsModule("AlertStore", "./js/vue/stores/AlertStore.js"), new HalJsModule("AlertStore", "./js/vue/stores/AlertStore.js"),
@ -19,7 +43,7 @@ public class JavascriptModules implements HalJavascriptModule {
new HalJsModule("EventActionComponent", "./js/vue/components/EventActionComponent.js"), new HalJsModule("EventActionComponent", "./js/vue/components/EventActionComponent.js"),
new HalJsModulePage("EventDetailPageComponent", "./js/vue/components/EventDetailPageComponent.js", "/event/:id"), new HalJsModulePage("EventDetailPageComponent", "./js/vue/components/EventDetailPageComponent.js", "/event/:id"),
new HalJsModulePage("EventOverviewPageComponent", "./js/vue/components/EventOverviewPageComponent.js", "/event_overview"), new HalJsModulePage("EventOverviewPageComponent", "./js/vue/components/EventOverviewPageComponent.js", "/events"),
new HalJsModule("EventTableComponent", "./js/vue/components/EventTableComponent.js"), new HalJsModule("EventTableComponent", "./js/vue/components/EventTableComponent.js"),
new HalJsModule("EventTableRowComponent", "./js/vue/components/EventTableRowComponent.js"), new HalJsModule("EventTableRowComponent", "./js/vue/components/EventTableRowComponent.js"),
}; };

4
hal.conf.example
View file

@ -36,6 +36,10 @@ hal_core.http_port=8080
## Tibber Plugin ## Tibber Plugin
#hal_tibber.token= #hal_tibber.token=
## EcoSense plugin
#hal_vendor_ecosense.username=
#hal_vendor_ecosense.password=
## Zigbee plugin ## Zigbee plugin
#hal_zigbee.com_port=COM4 #hal_zigbee.com_port=COM4
#hal_zigbee.dongle=CC2531|CONBEE|XBEE #hal_zigbee.dongle=CC2531|CONBEE|XBEE

8
plugins/hal-vendor-ecosense/src/se/hal/plugin/vendor/ecosense/EcoSenseCloudAPIClient.java vendored
View file

@ -41,6 +41,8 @@ import zutil.parser.json.JSONWriter;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
@ -59,8 +61,6 @@ public class EcoSenseCloudAPIClient {
private static final String USER_POOL_REGION = "us-west-2"; private static final String USER_POOL_REGION = "us-west-2";
private static final String API_URL = "https://api.cloud.ecosense.io/api"; private static final String API_URL = "https://api.cloud.ecosense.io/api";
private static SimpleDateFormat DATE_PARSER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); //2025-10-22T14:09:29.691533
private String username; private String username;
private String password; private String password;
/** The authenticated Amazon Cognito ID token. */ /** The authenticated Amazon Cognito ID token. */
@ -147,8 +147,8 @@ public class EcoSenseCloudAPIClient {
ecoSenseDevice.wifiName = deviceNode.getString("wifi_name"); ecoSenseDevice.wifiName = deviceNode.getString("wifi_name");
try { try {
ecoSenseDevice.lastRadonUpdateTime = DATE_PARSER.parse(deviceNode.getString("last_radon_update_time")).getTime(); ecoSenseDevice.lastRadonUpdateTime = LocalDateTime.parse(deviceNode.getString("last_radon_update_time")).toInstant(ZoneOffset.UTC).toEpochMilli();
ecoSenseDevice.lastUpdateTime = DATE_PARSER.parse(deviceNode.getString("last_update_time")).getTime(); ecoSenseDevice.lastUpdateTime = LocalDateTime.parse(deviceNode.getString("last_update_time")).toInstant(ZoneOffset.UTC).toEpochMilli();
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.WARNING, "Was unable to parse timestamp from EcoSense API.", e); logger.log(Level.WARNING, "Was unable to parse timestamp from EcoSense API.", e);
} }

14
plugins/hal-vendor-ecosense/src/se/hal/plugin/vendor/ecosense/device/EccoCubeRadonSensor.java vendored
View file

@ -30,6 +30,8 @@ import se.hal.intf.HalSensorData;
import se.hal.plugin.vendor.ecosense.EcoSenseController; import se.hal.plugin.vendor.ecosense.EcoSenseController;
import se.hal.struct.devicedata.RadonSensorData; import se.hal.struct.devicedata.RadonSensorData;
import java.util.Objects;
/** /**
* A sensor that calculate current radon level * A sensor that calculate current radon level
*/ */
@ -63,7 +65,15 @@ public class EccoCubeRadonSensor implements HalSensorConfig {
} }
@Override @Override
public boolean equals(Object obj) { public final boolean equals(Object o) {
return false; if (!(o instanceof EccoCubeRadonSensor)) return false;
EccoCubeRadonSensor that = (EccoCubeRadonSensor) o;
return Objects.equals(serialNumber, that.serialNumber);
}
@Override
public int hashCode() {
return Objects.hashCode(serialNumber);
} }
} }

24
plugins/hal-vendor-tibber/build.gradle
View file

@ -1,3 +1,27 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2025 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
dependencies { dependencies {
implementation project(':hal-core') implementation project(':hal-core')
} }

30
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberAPIClient.java vendored
View file

@ -35,6 +35,8 @@ import zutil.parser.json.JSONParser;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.logging.Logger; import java.util.logging.Logger;
/** /**
@ -44,7 +46,6 @@ public class TibberAPIClient {
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
private static final String TIBBER_API_ENDPOINT = "https://api.tibber.com/v1-beta/gql"; private static final String TIBBER_API_ENDPOINT = "https://api.tibber.com/v1-beta/gql";
private static SimpleDateFormat DATE_PARSER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); // 2024-12-28T23:00:00.000+01:00
private String tibberToken; private String tibberToken;
@ -80,16 +81,16 @@ public class TibberAPIClient {
"consumptionUnit " + // Should be Kwh "consumptionUnit " + // Should be Kwh
"}" + "}" +
"}" + "}" +
"currentSubscription {" + // "currentSubscription {" +
"priceInfo {" + // "priceInfo {" +
"current {" + // "current {" +
"total " + // "total " +
"energy " + // "energy " +
"tax " + // "tax " +
"startsAt " + // "startsAt " +
"}" + // "}" +
"}" + // "}" +
"}" + // "}" +
"}" + "}" +
"}" + "}" +
"}\"" + "}\"" +
@ -100,12 +101,7 @@ public class TibberAPIClient {
// unitPrice=0.1507875, cost=0.3131856375, from=2024-12-28T21:00:00.000+01:00, consumption=2.077, to=2024-12-28T22:00:00.000+01:00, unitPriceVAT=0.0301575, consumptionUnit=kWh // unitPrice=0.1507875, cost=0.3131856375, from=2024-12-28T21:00:00.000+01:00, consumption=2.077, to=2024-12-28T22:00:00.000+01:00, unitPriceVAT=0.0301575, consumptionUnit=kWh
TibberConsumption consumption = new TibberConsumption(); TibberConsumption consumption = new TibberConsumption();
consumption.timestamp = LocalDateTime.parse(data.getString("from")).toInstant(ZoneOffset.UTC).toEpochMilli();
try {
consumption.timestamp = DATE_PARSER.parse(data.getString("from")).getTime();
} catch (ParseException e) {
logger.warning("Was unable to parse timestamp from Tibber API.");
}
if (data.get("cost") != null) { if (data.get("cost") != null) {
consumption.cost = data.getDouble("cost"); consumption.cost = data.getDouble("cost");