[pull] master from GladysAssistant:master

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
 {
   "name": "Gladys Assistant - Node.js",
-  "image": "mcr.microsoft.com/devcontainers/javascript-node:18",
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:22",
   "forwardPorts": [1443, 1444],
   "extensions": [
     "dbaeumer.vscode-eslint",

.github/workflows/docker-dev-build.yml

@@ -10,7 +10,7 @@ on:
       platforms:
         description: 'Docker platform to build'
         required: true
-        default: 'linux/amd64,linux/arm/v7,linux/arm64/v8'
+        default: 'linux/amd64,linux/arm64/v8'
 
 jobs:
   build-front:

.github/workflows/docker-master-test.yml

@@ -19,7 +19,7 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM front packages
         working-directory: ./front
         run: |
@@ -86,7 +86,7 @@ jobs:
           sudo apt-get install -y libudev-dev sqlite3 openssl python-is-python3
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM server packages
         working-directory: ./server
         run: |

.github/workflows/docker-pr-build.yml

@@ -25,7 +25,7 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM front packages
         working-directory: ./front
         run: |
@@ -62,7 +62,7 @@ jobs:
           sudo apt-get install -y libudev-dev sqlite3 openssl python-is-python3
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM server packages
         working-directory: ./server
         run: |

.github/workflows/docker-release-build.yml

@@ -21,7 +21,7 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM front packages
         working-directory: ./front
         run: |
@@ -58,7 +58,7 @@ jobs:
           sudo apt-get install -y libudev-dev sqlite3 openssl python-is-python3
       - name: 📦 Install Global NPM Packages
         run: |
-          sudo npm install typescript node-gyp npm@latest -g
+          sudo npm install typescript node-gyp -g
       - name: 📦 Install NPM server packages
         working-directory: ./server
         run: |
@@ -168,7 +168,7 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile.buildx
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
           tags: ${{ steps.docker_meta.outputs.tags }}

docker/Dockerfile

@@ -2,7 +2,7 @@ ARG TARGET
 ARG VERSION
 ARG BUILD_DATE
 
-FROM ${TARGET}/node:18-slim
+FROM ${TARGET}/node:22-slim
 
 LABEL \
   org.label-schema.build-date=$BUILD_DATE \

docker/Dockerfile.buildx

@@ -1,6 +1,6 @@
 # STEP 1
 # Prepare server package*.json files
-FROM node:18-slim as json-files
+FROM node:22-slim as json-files
 COPY ./server /json-files/server
 WORKDIR /json-files/server/
 RUN find . -type f \! -name "package*.json" -exec rm -r {} \;
@@ -9,7 +9,7 @@ COPY ./server/utils /json-files/server/utils
 
 # STEP 3
 # Gladys Bundle
-FROM node:18-slim as gladys
+FROM node:22-slim as gladys
 
 # System dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

front/cypress/e2e/routes/0-signup/SignUp.cy.js

@@ -52,7 +52,9 @@ describe('Sign-up', () => {
       // Email
       cy.wrap(inputs[3]).type(tony.email);
       // Password
-      cy.wrap(inputs[4]).type('short');
+      cy.wrap(inputs[4]).as('passwordInput');
+      cy.get('@passwordInput').clear();
+      cy.get('@passwordInput').type('short');
       // Password retype
       cy.wrap(inputs[5]).type('short');
     });
@@ -77,9 +79,9 @@ describe('Sign-up', () => {
     // Fill form
     cy.get('input:visible').then(inputs => {
       // Password
-      cy.wrap(inputs[4])
-        .clear()
-        .type(tony.password);
+      cy.wrap(inputs[4]).as('passwordInput');
+      cy.get('@passwordInput').clear();
+      cy.get('@passwordInput').type(tony.password);
     });
 
     // Submit empty form
@@ -98,9 +100,9 @@ describe('Sign-up', () => {
     // Fill form
     cy.get('input:visible').then(inputs => {
       // Password
-      cy.wrap(inputs[5])
-        .clear()
-        .type(tony.password);
+      cy.wrap(inputs[5]).as('passwordConfirmInput');
+      cy.get('@passwordConfirmInput').clear();
+      cy.get('@passwordConfirmInput').type(tony.password);
     });
 
     // Store access token
@@ -138,15 +140,15 @@ describe('Sign-up', () => {
     // Fill form
     cy.get('input:visible').then(inputs => {
       // House name
-      cy.wrap(inputs[0])
-        .clear()
-        .type(house.name);
+      cy.wrap(inputs[0]).as('houseNameInput');
+      cy.get('@houseNameInput').clear();
+      cy.get('@houseNameInput').type(house.name);
 
       // Room
       house.rooms.forEach(room => {
-        cy.wrap(inputs[1])
-          .clear()
-          .type(room.name);
+        cy.wrap(inputs[1]).as('roomInput');
+        cy.get('@roomInput').clear();
+        cy.get('@roomInput').type(room.name);
       });
     });
 

front/cypress/e2e/routes/integration/bluetooth/devices/BluetoothDeviceEdit.cy.js

@@ -61,32 +61,26 @@ describe('Bluetooth device edit', () => {
       .should('exist')
       .parent('.card')
       .within(() => {
+        // Input name
         cy.get('input')
           .first()
-          .clear()
-          .type('New name');
+          .as('nameInput');
+        cy.get('@nameInput').clear();
+        cy.get('@nameInput').type('New name');
+
+        // Select room
         cy.get('select').select(rooms[0].name);
-        cy.get('#featureName_0')
-          .clear()
-          .type('Sensor');
+
+        // Feature name
+        cy.get('#featureName_0').as('featureInput');
+        cy.get('@featureInput').clear();
+        cy.get('@featureInput').type('Sensor');
+
         cy.get('#keep_history_0').should(keepHistoryValueBegin);
         cy.get('[class="custom-switch-indicator"]').click();
         cy.get('#keep_history_0').should(keepHistoryValueAfter);
 
         cy.contains('button', 'integration.bluetooth.device.saveButton').click();
       });
   });
-
-  it('Check updated device', () => {
-    cy.contains('button', 'global.backButton').click();
-
-    const { rooms } = Cypress.env('house');
-    cy.contains('.card-header', 'New name')
-      .should('exist')
-      .parent('.card')
-      .within(() => {
-        cy.get('input').should('have.value', 'New name');
-        cy.get('select option:selected').should('have.text', rooms[0].name);
-      });
-  });
 });

front/cypress/e2e/routes/integration/bluetooth/devices/BluetoothDeviceList.cy.js

@@ -39,7 +39,6 @@ describe('Bluetooth device list', () => {
       .parent('.card')
       .within(() => {
         cy.get('input').should('have.value', device.name);
-        cy.get('select').should('have.value', '');
       });
   });
 
@@ -49,9 +48,10 @@ describe('Bluetooth device list', () => {
       .should('exist')
       .parent('.card')
       .within(() => {
-        cy.get('input')
-          .clear()
-          .type('New name');
+        cy.get('input').as('deviceInput');
+
+        cy.get('@deviceInput').clear();
+        cy.get('@deviceInput').type('New name');
         cy.get('select').select(rooms[0].name);
 
         cy.get('.card-header').should('have.text', 'New name');

front/cypress/e2e/routes/integration/bluetooth/discover/BluetoothDiscover.cy.js

@@ -43,10 +43,11 @@ describe('Bluetooth discover', () => {
       }
     ).as('scan');
 
-    cy.contains('integration.bluetooth.discover.scanButton')
-      .should('have.class', 'btn-outline-primary')
-      .click()
-      .should('have.class', 'btn-outline-danger');
+    // Start scan
+    cy.contains('integration.bluetooth.discover.scanButton').as('scanButton');
+    cy.get('@scanButton').should('have.class', 'btn-outline-primary');
+    cy.get('@scanButton').click();
+    cy.get('@scanButton').should('have.class', 'btn-outline-danger');
 
     cy.wait('@scan')
       .its('request.body')
@@ -65,10 +66,11 @@ describe('Bluetooth discover', () => {
       }
     );
 
-    cy.contains('integration.bluetooth.discover.scanButton')
-      .should('have.class', 'btn-outline-danger')
-      .click()
-      .should('have.class', 'btn-outline-primary');
+    // Manual stop scan
+    cy.contains('integration.bluetooth.discover.scanButton').as('scanButton');
+    cy.get('@scanButton').should('have.class', 'btn-outline-danger');
+    cy.get('@scanButton').click();
+    cy.get('@scanButton').should('have.class', 'btn-outline-primary');
   });
 
   it('Auto stop scan', () => {

front/cypress/e2e/routes/integration/bluetooth/scanner/BluetoothScanner.cy.js

@@ -61,12 +61,11 @@ describe('Bluetooth scanner', () => {
     cy.get('input[type=number]').should('be.disabled');
 
     // Check all buttons are enabled
-    cy.contains('button', 'integration.bluetooth.setup.saveLabel')
-      .should('not.be.disabled')
-      .first()
-      // Submit new config
-      .click()
-      .should('be.disabled');
+    cy.contains('button', 'integration.bluetooth.setup.saveLabel').as('saveButton');
+    cy.get('@saveButton').should('not.be.disabled');
+    cy.get('@saveButton').first();
+    cy.get('@saveButton').click();
+    cy.get('@saveButton').should('be.disabled');
 
     cy.wait('@saveStatus');
   });
@@ -98,12 +97,11 @@ describe('Bluetooth scanner', () => {
     cy.get('input[type=number]').type('{selectall}2');
 
     // Check all buttons are enabled
-    cy.contains('button', 'integration.bluetooth.setup.saveLabel')
-      .should('not.be.disabled')
-      .first()
-      // Submit new config
-      .click()
-      .should('be.disabled');
+    cy.contains('button', 'integration.bluetooth.setup.saveLabel').as('saveButton');
+    cy.get('@saveButton').should('not.be.disabled');
+    cy.get('@saveButton').first();
+    cy.get('@saveButton').click();
+    cy.get('@saveButton').should('be.disabled');
 
     cy.wait('@saveStatus');
   });

front/cypress/e2e/routes/integration/broadlink/devices/BroadlinkEditRemote.cy.js

@@ -68,8 +68,11 @@ describe('Broadlink edit remote', () => {
     cy.get('.card-body').within(() => {
       // Check device name
       cy.get('input')
-        .should('have.value', 'Light Remote')
-        .should('not.be.disabled');
+        .first()
+        .as('nameInput');
+      cy.get('@nameInput').clear();
+      cy.get('@nameInput').type('New name');
+      cy.get('@nameInput').should('have.value', 'New name');
       // Check selects
       cy.get('select')
         .should('have.length', 3)
@@ -113,10 +116,10 @@ describe('Broadlink edit remote', () => {
       { learn: true }
     ).as('learnMode');
 
-    cy.contains('button', 'integration.broadlink.setup.learnAllLabel')
-      .should('not.be.disabled')
-      .click()
-      .should('not.exist');
+    cy.contains('button', 'integration.broadlink.setup.learnAllLabel').as('learnButton');
+
+    cy.get('@learnButton').should('not.be.disabled');
+    cy.get('@learnButton').click();
 
     cy.contains('button', 'integration.broadlink.setup.quitLearnModeLabel')
       .should('exist')

front/cypress/e2e/routes/integration/broadlink/devices/BroadlinkEditRemoteLearnAll.cy.js

@@ -66,7 +66,8 @@ describe('Broadlink edit remote - learn all', () => {
     cy.contains('.card-header', 'Light Remote').should('exist');
     cy.get('.card-body').within(() => {
       // Check device name
-      cy.get('input')
+      cy.get('input').as('nameInput');
+      cy.get('@nameInput')
         .should('have.value', 'Light Remote')
         .should('not.be.disabled');
       // Check selects
@@ -112,11 +113,10 @@ describe('Broadlink edit remote - learn all', () => {
       { learn: true }
     ).as('learnMode');
 
-    cy.contains('button', 'integration.broadlink.setup.learnAllLabel')
-      .should('not.be.disabled')
-      .click()
-      .should('not.exist');
-
+    // Learn all mode button
+    cy.contains('button', 'integration.broadlink.setup.learnAllLabel').as('learnButton');
+    cy.get('@learnButton').should('not.be.disabled');
+    cy.get('@learnButton').click();
     cy.contains('button', 'integration.broadlink.setup.quitLearnModeLabel')
       .should('exist')
       .should('not.be.disabled');
@@ -138,10 +138,12 @@ describe('Broadlink edit remote - learn all', () => {
 
     cy.get('.tag-info').should('be.length', 0);
 
-    cy.get('.tag-secondary')
-      .should('be.length', 1)
+    cy.get('.tag-secondary').as('tagSecondary');
+    cy.get('@tagSecondary').should('be.length', 1);
+    cy.get('@tagSecondary')
       .first()
-      .i18n('deviceFeatureCategory.light.binary');
+      .as('firstTag');
+    cy.get('@firstTag').i18n('deviceFeatureCategory.light.binary');
   });
 
   [