Merge remote-tracking branch 'upstream/master'

Author: WulfgarW

.eslintrc.cjs

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

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -63,6 +63,15 @@ body:
         - Docker container
         - HomeAssistant Add-on
 
+  - type: checkboxes
+    id: nightly
+    attributes:
+      label: Nightly build
+      description: Check if issue as already been fixed in the latest nightly build
+      options:
+        - label: I have verified that the issue is reproducible with the latest nightly build
+          required: true
+
   - type: input
     attributes:
       label: Version

.github/workflows/default.yml

@@ -1,7 +1,7 @@
 name: Default
 
 env:
-  GO_VERSION: ^1.22
+  GO_VERSION: ^1.23
 
 on:
   push:
@@ -74,7 +74,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "22"
           cache: "npm"
 
       - run: mkdir dist && touch dist/empty
@@ -148,7 +148,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "22"
           cache: "npm"
 
       - name: Install
@@ -199,7 +199,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "22"
           cache: "npm"
 
       - name: Build UI

.github/workflows/documentation.yml

@@ -1,7 +1,7 @@
 name: Deploy updated templates
 
 env:
-  GO_VERSION: ^1.22
+  GO_VERSION: ^1.23
 
 on:
   schedule:

.github/workflows/nightly.yml

@@ -1,7 +1,7 @@
 name: Nightly Build
 
 env:
-  GO_VERSION: ^1.22
+  GO_VERSION: ^1.23
 
 on:
   schedule: # runs on the default branch: master

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Release
 
 env:
-  GO_VERSION: ^1.22
+  GO_VERSION: ^1.23
 
 on:
   push:

.github/workflows/website.yml

@@ -1,7 +1,7 @@
 name: Deploy data to website
 
 env:
-  GO_VERSION: ^1.22
+  GO_VERSION: ^1.23
 
 on:
   release:

.gitignore

@@ -41,5 +41,8 @@ asset-stats.html
 /test-results/
 /playwright-report/
 /playwright/.cache/
+.gitpod.yml
+/evcc.db
+
 debug_sensonet_reldata.txt
 debug_sensonet_system.txt

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  go: "1.22"
+  go: "1.23"
 
 issues:
   exclude:
@@ -14,7 +14,6 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    - dogsled
     - durationcheck
     - gci
     - gofmt
@@ -37,6 +36,7 @@ linters:
     - whitespace
 
     # fixme
+    # - dogsled
     # - bodyclose
     # - exhaustive
     # - exportloopref

.goreleaser.yml

@@ -55,7 +55,7 @@ checksum:
   name_template: "checksums.txt"
 
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 
 changelog:
   sort: asc

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 #### Development environment
 
-Developing evcc requires [Go][1] 1.22 and [Node][2] 18. 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.
+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.
 
 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:
 
@@ -15,14 +15,14 @@ make lint-ui
 
 #### Changing device templates
 
-evcc supports a massive amount of different devices. To keep our documentation and website in sync with the latest software the core project (this repo) generates meta-data that's pushed to the `docs` and `evcc.io` repository. Make sure to update this meta-data every time you make changes to a templates.
+evcc supports a massive amount of different devices. To keep our documentation and website in sync with the latest software the core project (this repo) generates meta-data that's pushed to the `docs` and `evcc.io` repository.
+
+You can verify the generated meta-data by running:
 
 ```sh
 make docs
 ```
 
-If you miss one of the above steps Gitub Actions will likely trigger a **Porcelain** error.
-
 ### Building from source
 
 Install prerequisites (once):

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1 build ui
-FROM --platform=$BUILDPLATFORM node:18-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.22-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine as builder
 
 # Install git + SSL ca certificates.
 # Git is required for fetching the dependencies.

Makefile

@@ -140,3 +140,8 @@ patch-asn1::
 	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
 	patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/packaging/patch/asn1.diff
 	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
+
+upgrade::
+	$(shell go list -u -f '{{if (and (not (or .Main .Indirect)) .Update)}}{{.Path}}{{end}}' -m all | xargs go get)
+	go get modernc.org/sqlite@latest
+	go mod tidy

api/api.go

@@ -49,6 +49,10 @@ type ChargeState interface {
 	Status() (ChargeStatus, error)
 }
 
+type StatusReasoner interface {
+	StatusReason() (Reason, error)
+}
+
 // CurrentController provides settings charging maximum charging current
 type CurrentController interface {
 	MaxCurrent(current int64) error

api/rates.go

@@ -31,7 +31,7 @@ func (r Rates) Sort() {
 // Current returns the rates current rate or error
 func (r Rates) Current(now time.Time) (Rate, error) {
 	for _, rr := range r {
-		if (rr.Start.Before(now) || rr.Start.Equal(now)) && rr.End.After(now) {
+		if !rr.Start.After(now) && rr.End.After(now) {
 			return rr, nil
 		}
 	}

api/reason.go

@@ -0,0 +1,10 @@
+package api
+
+type Reason int
+
+//go:generate enumer -type Reason -trimprefix Reason -transform=lower
+const (
+	ReasonUnknown Reason = iota
+	ReasonWaitingForAuthorization
+	ReasonDisconnectRequired
+)

api/reason_enumer.go

@@ -112,6 +112,10 @@ body {
 	color: var(--evcc-default-text);
 }
 
+body:not(.modal-open) {
+	overflow-y: scroll;
+}
+
 h1,
 h2,
 h3,
@@ -184,6 +188,13 @@ a:hover {
 	--bs-btn-border-width: 2px;
 }
 
+.btn-reset {
+	border: none;
+	background: none;
+	padding: 0;
+	color: inherit;
+}
+
 .btn-primary,
 .btn-primary:focus {
 	background-color: var(--bs-primary);

assets/css/app.css

@@ -5,11 +5,27 @@ const { protocol, hostname, port, pathname } = window.location;
 
 const base = protocol + "//" + hostname + (port ? ":" + port : "") + pathname;
 
+// override the way axios serializes arrays in query parameters (a=1&a=2&a=3 instead of a[]=1&a[]=2&a[]=3)
+function customParamsSerializer(params) {
+  const queryString = Object.keys(params)
+    .filter((key) => params[key] !== null)
+    .map((key) => {
+      const value = params[key];
+      if (Array.isArray(value)) {
+        return value.map((v) => `${encodeURIComponent(key)}=${encodeURIComponent(v)}`).join("&");
+      }
+      return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+    })
+    .join("&");
+  return queryString;
+}
+
 const api = axios.create({
   baseURL: base + "api/",
   headers: {
     Accept: "application/json",
   },
+  paramsSerializer: customParamsSerializer,
 });
 
 // global error handling