Merge remote-tracking branch 'upstream/master'

Author: WulfgarW

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/go
+{
+	"name": "evcc",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
+	"features": {
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+			"moby": true,
+			"installDockerBuildx": true,
+			"version": "latest",
+			"dockerDashComposeVersion": "v2"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"nodeGypDependencies": true,
+			"installYarnUsingApt": true,
+			"version": "latest",
+			"pnpmVersion": "latest",
+			"nvmVersion": "latest"
+		}
+	},
+	"postCreateCommand": "make install-ui && make install",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"esbenp.prettier-vscode",
+				"octref.vetur"
+			]
+		}
+	}
+}

.eslintrc.cjs

@@ -18,6 +18,7 @@ module.exports = {
 		"vue/attribute-hyphenation": "off",
 		"vue/multi-word-component-names": "off",
 		"vue/no-reserved-component-names": "off",
+		/*"vue/no-undef-properties": "warn",*/
 		"no-param-reassign": "error",
 	},
 };

.github/workflows/nightly.yml

@@ -89,9 +89,6 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
         id: go
 
-      - name: Install Cloudsmith CLI
-        run: pip install --upgrade cloudsmith-cli
-
       - name: Patch ASN1
         run: make patch-asn1-sudo
 
@@ -111,6 +108,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TESLA_CLIENT_ID: ${{ secrets.TESLA_CLIENT_ID }}
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Install Cloudsmith CLI
+        run: pip install --upgrade cloudsmith-cli
+
       - name: Publish .deb to Cloudsmith
         env:
           CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

.github/workflows/release.yml

@@ -68,9 +68,6 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
         id: go
 
-      - name: Install Cloudsmith CLI
-        run: pip install --upgrade cloudsmith-cli
-
       - name: Patch ASN1
         run: make patch-asn1-sudo
 
@@ -105,6 +102,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           TESLA_CLIENT_ID: ${{ secrets.TESLA_CLIENT_ID }}
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Install Cloudsmith CLI
+        run: pip install --upgrade cloudsmith-cli
+
       - name: Publish .deb to Cloudsmith
         env:
           CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
@@ -138,7 +142,7 @@ jobs:
 
       - name: Update version
         run: |
-          sed -i -e s#\"version.*#\"version\":\ \"$(echo ${{ github.ref }} | sed -e s#refs/tags/##)\",# ./hassio/evcc/config.json
+          sed -i -e s#version.*#version\:\ $(echo ${{ github.ref }} | sed -e s#refs/tags/##)# ./hassio/evcc/config.yaml
 
       - name: Push
         run: |

.gitignore

@@ -6,6 +6,7 @@ __debug_bin*
 *.py
 *.log
 *.json
+!.devcontainer/devcontainer.json
 *.yaml
 !templates/**/*.yaml
 !templates/**/*-schema.json

.goreleaser-nightly.yml

@@ -1,3 +1,5 @@
+version: 2
+
 dist: release
 release:
   disable: true
@@ -48,7 +50,7 @@ checksum:
   name_template: "checksums.txt"
 
 snapshot:
-  name_template: '{{ .Version }}{{ if eq (len (split .Version ".")) 2 }}.0{{ end }}+{{ .Timestamp }}'
+  version_template: '{{ .Version }}{{ if eq (len (split .Version ".")) 2 }}.0{{ end }}+{{ .Timestamp }}'
 
 changelog:
   sort: asc
@@ -73,6 +75,9 @@ nfpms:
     formats:
       - deb
 
+    dependencies:
+      - adduser
+
     contents:
       - src: ./packaging/init/evcc.service
         dst: /lib/systemd/system/evcc.service

.goreleaser.yml

@@ -81,6 +81,9 @@ nfpms:
     formats:
       - deb
 
+    dependencies:
+      - adduser
+
     contents:
       - src: ./packaging/init/evcc.service
         dst: /lib/systemd/system/evcc.service

CONTRIBUTING.md

@@ -6,6 +6,8 @@
 
 Developing evcc requires [Go][1] 1.23 and [Node][2] 22. We recommend VSCode with the [Go](https://marketplace.visualstudio.com/items?itemName=golang.Go), [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) and [Vetur](https://marketplace.visualstudio.com/items?itemName=octref.vetur) extensions.
 
+Alternatively, if you use VS Code and [devcontainers](https://code.visualstudio.com/docs/devcontainers/containers), you can use the "Dev containers: Clone repository in container volume" action. This will create a devcontainer with the required toolchain and install the prerequisites as explained below. Wait until the startup log says "Done. Press any key to close the terminal." and check for any errors.
+
 We use linters (golangci-lint, Prettier) to keep a coherent source code formatting. It's recommended to use the format-on-save feature of your editor. You can manually reformat your code by running:
 
 ```sh

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1 build ui
-FROM --platform=$BUILDPLATFORM node:22-alpine as node
+FROM --platform=$BUILDPLATFORM node:22-alpine AS node
 
 RUN apk update && apk add --no-cache make
 
@@ -20,7 +20,7 @@ RUN make ui
 
 
 # STEP 2 build executable binary
-FROM --platform=$BUILDPLATFORM golang:1.23-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
 
 # Install git + SSL ca certificates.
 # Git is required for fetching the dependencies.
@@ -69,7 +69,7 @@ RUN RELEASE=${RELEASE} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build
 
 
 # STEP 3 build a small image including module support
-FROM alpine:3.19
+FROM alpine:3.20
 
 WORKDIR /app
 

api/api.go

@@ -44,6 +44,11 @@ type BatteryCapacity interface {
 	Capacity() float64
 }
 
+// MaxACPower provides max AC power in W
+type MaxACPower interface {
+	MaxACPower() float64
+}
+
 // ChargeState provides current charging status
 type ChargeState interface {
 	Status() (ChargeStatus, error)

api/globalconfig/types.go

@@ -88,6 +88,7 @@ type Influx struct {
 	Org      string `json:"org"`
 	User     string `json:"user"`
 	Password string `json:"password"`
+	Insecure bool   `json:"insecure"`
 }
 
 // Redacted implements the redactor interface used by the tee publisher
@@ -98,11 +99,13 @@ func (c Influx) Redacted() any {
 		Database string `json:"database"`
 		Org      string `json:"org"`
 		User     string `json:"user"`
+		Insecure bool   `json:"insecure"`
 	}{
 		URL:      c.URL,
 		Database: c.Database,
 		Org:      c.Org,
 		User:     c.User,
+		Insecure: c.Insecure,
 	}
 }
 

assets/css/app.css

@@ -23,9 +23,9 @@
 
 :root {
 	--evcc-green: #baffcb;
-	--evcc-dark-green: #0fde41;
-	--evcc-darker-green: #0ba631;
-	--evcc-darkest-green: #076f20;
+	--evcc-dark-green: #0fde41ff;
+	--evcc-darker-green: #0ba631ff;
+	--evcc-darkest-green: #076f20ff;
 	--evcc-darkest-green-rgb: 11, 166, 49;
 	--evcc-yellow: #faf000;
 	--evcc-dark-yellow: #bbb400;
@@ -90,7 +90,7 @@
 	--evcc-grid: var(--bs-gray-medium);
 	--evcc-background: var(--bs-gray-deep);
 	--evcc-box: var(--bs-gray-dark);
-	--evcc-box-border: var(--vs-gray-darker);
+	--evcc-box-border: var(--bs-gray-darker);
 	--evcc-default-text: var(--bs-white);
 	--evcc-gray: var(--bs-gray-light);
 	--evcc-accent1: var(--evcc-yellow);
@@ -195,6 +195,10 @@ a:hover {
 	color: inherit;
 }
 
+.evcc-background {
+	background-color: var(--evcc-background);
+}
+
 .btn-primary,
 .btn-primary:focus {
 	background-color: var(--bs-primary);
@@ -217,7 +221,11 @@ a:hover {
 	color: inherit !important;
 	background-color: inherit !important;
 	border-color: inherit !important;
-	opacity: 0.2;
+	opacity: 0.3;
+}
+
+.dark .btn-disabled {
+	opacity: 0.4;
 }
 
 .btn-outline-primary {

assets/js/colors.js

@@ -0,0 +1,62 @@
+import { reactive } from "vue";
+
+// alternatives
+// const COLORS = [ "#40916C", "#52B788", "#74C69D", "#95D5B2", "#B7E4C7", "#D8F3DC", "#081C15", "#1B4332", "#2D6A4F"];
+// const COLORS = ["#577590", "#43AA8B", "#90BE6D", "#F9C74F", "#F8961E", "#F3722C", "#F94144"];
+// const COLORS = ["#0077b6", "#00b4d8", "#90e0ef", "#caf0f8", "#03045e"];
+// const COLORS = [ "#0077B6FF", "#0096C7FF", "#00B4D8FF", "#48CAE4FF", "#90E0EFFF", "#ADE8F4FF", "#CAF0F8FF", "#03045EFF", "#023E8AFF",
+// const COLORS = [ "#0077B6FF", "#00B4D8FF", "#90E0EFFF", "#40A578FF", "#9DDE8BFF", "#F8961EFF", "#F9C74FFF", "#E6FF94FF"];
+
+const colors = reactive({
+  text: null,
+  muted: null,
+  border: null,
+  self: null,
+  grid: null,
+  co2PerKWh: null,
+  pricePerKWh: null,
+  price: "#FF912FFF",
+  co2: "#00916EFF",
+  background: null,
+  selfPalette: ["#0fde41ff", "#0ba631ff", "#076f20ff", "#054e18ff", "#043611ff", "#02230bff"],
+  palette: [
+    "#03C1EFFF",
+    "#FD6158FF",
+    "#31AB4AFF",
+    "#41517AFF",
+    "#FF922EFF",
+    "#0F662DFF",
+    "#0470D4FF",
+    "#FFBD2FFF",
+    "#77C93EFF",
+    "#4E1D10FF",
+    "#0AAFBFFF",
+    "#813504FF",
+  ],
+});
+
+function updateCssColors() {
+  const style = window.getComputedStyle(document.documentElement);
+  colors.text = style.getPropertyValue("--evcc-default-text");
+  colors.muted = style.getPropertyValue("--bs-gray-medium");
+  colors.border = style.getPropertyValue("--bs-border-color-translucent");
+  colors.self = style.getPropertyValue("--evcc-self");
+  colors.grid = style.getPropertyValue("--evcc-grid");
+  colors.background = style.getPropertyValue("--evcc-background");
+  colors.pricePerKWh = style.getPropertyValue("--bs-gray-medium");
+  colors.co2PerKWh = style.getPropertyValue("--bs-gray-medium");
+}
+
+// update colors on theme change
+window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", updateCssColors);
+updateCssColors();
+
+export const dimColor = (color) => {
+  return color.toLowerCase().replace(/ff$/, "20");
+};
+
+export const fullColor = (color) => {
+  return color.toLowerCase().replace(/20$/, "ff");
+};
+
+export default colors;

assets/js/components/BatterySettingsModal.vue

@@ -160,7 +160,7 @@
 								@change="changeBufferStart"
 							>
 								<span class="text-decoration-underline">
-									{{ bufferStartOption.name }}
+									{{ selectedBufferStartName }}
 								</span>
 							</CustomSelect>
 						</small>
@@ -332,20 +332,21 @@ export default {
 			for (let i = 100; i >= this.bufferSoc; i -= 5) {
 				options.push({
 					value: i,
-					name: this.$t(`batterySettings.bufferStart.${i === 100 ? "full" : "above"}`, {
-						soc: this.fmtSoc(i),
-					}),
+					name: this.getBufferStartName(i),
 				});
 			}
 			options.push({
 				value: 0,
-				name: this.$t("batterySettings.bufferStart.never"),
+				name: this.getBufferStartName(0),
 			});
 			return options;
 		},
 		bufferStartOption() {
 			return this.bufferStartOptions.find((option) => this.bufferStartSoc >= option.value);
 		},
+		selectedBufferStartName() {
+			return this.getBufferStartName(this.selectedBufferStartSoc);
+		},
 		topHeight() {
 			return 100 - (this.bufferSoc || 100);
 		},
@@ -361,7 +362,7 @@ export default {
 			}
 			return this.battery
 				.filter(({ capacity }) => capacity > 0)
-				.map(({ soc, capacity }) => {
+				.map(({ soc = 0, capacity }) => {
 					const multipleBatteries = this.battery.length > 1;
 					const energy = this.fmtWh(
 						(capacity / 100) * soc * 1e3,
@@ -488,6 +489,11 @@ export default {
 				console.error(err);
 			}
 		},
+		getBufferStartName(value) {
+			const key = value === 0 ? "never" : value === 100 ? "full" : "above";
+			const soc = this.fmtSoc(value);
+			return this.$t(`batterySettings.bufferStart.${key}`, { soc });
+		},
 	},
 };
 </script>

assets/js/components/Config/InfluxModal.vue

@@ -73,6 +73,19 @@
 					autocomplete="off"
 				/>
 			</FormRow>
+			<FormRow id="influxInsecure" :label="$t('config.influx.labelInsecure')">
+				<div class="d-flex">
+					<input
+						class="form-check-input"
+						id="influxInsecure"
+						type="checkbox"
+						v-model="values.insecure"
+					/>
+					<label class="form-check-label ms-2" for="influxInsecure">
+						{{ $t("config.influx.labelCheckInsecure") }}
+					</label>
+				</div>
+			</FormRow>
 			<p>
 				<button
 					v-if="showV1(values)"