node-red-contrib-homebridge-automation 0.3.3 → 0.3.4-beta.0

package/.github/npm-version-script.js

@@ -0,0 +1,97 @@
+#!/bin/env node
+
+/**
+ * This scripts queries the npm registry to pull out the latest version for a given tag.
+ */
+
+const assert = require('node:assert')
+const child_process = require('node:child_process')
+const fs = require('node:fs')
+const process = require('node:process')
+
+const BRANCH_VERSION_PATTERN = /^([A-Z]+)-(\d+\.\d+\.\d+)$/i
+
+// Load the contents of the package.json file
+const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+
+const refArgument = process.argv[2]
+const tagArgument = process.argv[3] || 'latest'
+
+if (!refArgument) {
+  console.error('ref argument is missing')
+  console.error('Usage: npm-version-script.js <ref> [tag]')
+  process.exit(1)
+}
+
+/**
+ * Queries the NPM registry for the latest version for the provided base version and tag.
+ * If the tag is latest, then the base version is returned if it exists. For other tags, the latest
+ * version found for that base version and tag is returned.
+ * @param baseVersion The base version to query for, e.g. 2.0.0
+ * @param tag The tag to query for, e.g. beta or latest
+ * @returns {string} Returns the version, or '' if not found
+ */
+function getTagVersionFromNpm(baseVersion, tag) {
+  try {
+    return JSON.parse(child_process.execSync(`npm info ${packageJSON.name} versions --json`).toString('utf8').trim())
+      .filter(v => tag === 'latest' ? v === baseVersion : v.startsWith(`${baseVersion}-${tag}.`)) // find all published versions for this base version and tag
+      .reduce((_, current) => current, '') // choose the last as they're sorted in ascending order, or '' if there are none
+  } catch (e) {
+    console.error(`Failed to query the npm registry for the latest version for tag: ${tag}`, e)
+    // throw e;
+    return ''
+  }
+}
+
+function desiredTargetVersion(ref) {
+  // ref is a GitHub action ref string
+  if (ref.startsWith('refs/pull/')) {
+    throw new Error('The version script was executed inside a PR!')
+  }
+
+  assert(ref.startsWith('refs/heads/'))
+  const branchName = ref.slice('refs/heads/'.length)
+
+  const results = branchName.match(BRANCH_VERSION_PATTERN)
+  if (results !== null) {
+    if (results[1] !== tagArgument) {
+      console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`)
+    }
+
+    return results[2]
+  }
+
+  throw new Error(`Malformed branch name for ref: ${ref}. Can't derive the base version. Use a branch name like: beta-x.x.x or alpha-x.x.x`)
+}
+
+// derive the base version from the branch ref
+const baseVersion = desiredTargetVersion(refArgument)
+
+// query the npm registry for the latest version of the provided tag name
+const latestReleasedVersion = getTagVersionFromNpm(baseVersion, tagArgument) // e.g. 0.7.0-beta.12
+
+let publishTag
+
+if (latestReleasedVersion) {
+  console.warn(`Latest published version for ${baseVersion} with tag ${tagArgument} is ${latestReleasedVersion}`)
+  publishTag = latestReleasedVersion // set this released beta or alpha to be incremented
+} else {
+  console.warn(`No published versions for ${baseVersion} with tag ${tagArgument}`)
+  publishTag = baseVersion // start off with a new beta or alpha version
+}
+
+if (packageJSON.version !== publishTag) {
+  // report the change for CI
+  console.warn(`Changing version in package.json from ${packageJSON.version} to ${publishTag}`)
+
+  // save the package.json
+  packageJSON.version = publishTag
+  fs.writeFileSync('package.json', JSON.stringify(packageJSON, null, 2))
+
+  // perform the same change to the package-lock.json
+  const packageLockJSON = JSON.parse(fs.readFileSync('package-lock.json', 'utf8'))
+  packageLockJSON.version = publishTag
+  fs.writeFileSync('package-lock.json', JSON.stringify(packageLockJSON, null, 2))
+} else {
+  console.warn(`Leaving version in package.json at ${packageJSON.version}`)
+}

package/.github/workflows/Build and Publish.yml

@@ -90,11 +90,9 @@ jobs:
     needs: [get_tags, create_documentation]
     name: Publish Release Version
     if: ${{ needs.get_tags.outputs.BRANCH_NAME == 'main' }}
-    uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
+    uses: homebridge/.github/.github/workflows/npm-publish-oidc.yml@latest
     with:
       install_cmd: npm ci
-    secrets:
-      npm_auth_token: ${{ secrets.npm_token }}
 
   publish_test_release:
     permissions:
@@ -102,14 +100,13 @@ jobs:
     needs: [get_tags, create_documentation]
     name: Publish Test Version - ${{ needs.get_tags.outputs.BRANCH_NAME }}
     if: ${{ needs.get_tags.outputs.BRANCH_NAME != 'main' }}
-    uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
+    uses: homebridge/.github/.github/workflows/npm-publish-oidc.yml@latest
     with:
       tag: ${{ needs.get_tags.outputs.TARGET_IMAGE_TAG }}
       dynamically_adjust_version: true
       npm_version_command: 'pre'
       pre_id: ${{ needs.get_tags.outputs.TARGET_IMAGE_TAG }}
-    secrets:
-      npm_auth_token: ${{ secrets.npm_token }}
+      install_cmd: npm ci
 
   publish_github_release:
     needs: [publish_prod_release]
@@ -117,7 +114,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Create Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homebridge-automation",
-  "version": "0.3.3",
+  "version": "0.3.4-beta.0",
   "description": "NodeRED Automation for HomeBridge",
   "main": "src/HAP-NodeRed.js",
   "scripts": {

package/test/node-red/flows.json

@@ -3,7 +3,7 @@
         "id": "caef1e7b5b399e80",
         "type": "tab",
         "label": "Flow 1",
-        "disabled": true,
+        "disabled": false,
         "info": "",
         "env": []
     },
@@ -174,14 +174,14 @@
         "id": "0ed3cd7e0d60beda",
         "type": "hb-control",
         "z": "caef1e7b5b399e80",
-        "name": "West Bedroom Fan",
+        "name": "West Bedroom",
         "Homebridge": "homebridge",
         "Manufacturer": "Tasmota",
         "Service": "Fan",
-        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom Fan00000040",
+        "device": "homebridge1C:22:3D:E3:CF:34TasmotaWest Bedroom00000040",
         "conf": "7e647d67.f33acc",
         "outputs": 0,
-        "x": 510,
+        "x": 500,
         "y": 220,
         "wires": []
     },
@@ -477,14 +477,14 @@
         "id": "12ce98441601c981",
         "type": "hb-event",
         "z": "caef1e7b5b399e80",
-        "name": "Driveway",
+        "name": "Driveway 8E52",
         "Homebridge": "ECI-T24F2",
         "Manufacturer": "HikVision",
         "Service": "MotionSensor",
-        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway00000085",
+        "device": "ECI-T24F2CB:6F:94:DD:43:77HikVisionDriveway 8E5200000085",
         "conf": "7e647d67.f33acc",
         "sendInitialState": true,
-        "x": 320,
+        "x": 340,
         "y": 520,
         "wires": [
             [
@@ -2883,14 +2883,14 @@
         "id": "6df154716efd4949",
         "type": "hb-event",
         "z": "92f59d974b9c8a86",
-        "name": "North Sidewalk 6EED",
+        "name": "North Sidewalk 5036",
         "Homebridge": "ECI-T24F2",
         "Manufacturer": "HikVision",
         "Service": "MotionSensor",
-        "device": "ECI-T24F28E:88:AB:7A:D0:54HikVisionNorth Sidewalk 6EED00000085",
+        "device": "ECI-T24F25C:EE:FE:4D:64:B4HikVisionNorth Sidewalk 503600000085",
         "conf": "7e647d67.f33acc",
         "sendInitialState": true,
-        "x": 140,
+        "x": 130,
         "y": 220,
         "wires": [
             [
@@ -2955,11 +2955,11 @@
         "id": "769d2de2c6bd3544",
         "type": "hb-control",
         "z": "92f59d974b9c8a86",
-        "name": "North Sidewalk 6EED",
+        "name": "North Sidewalk 5036",
         "Homebridge": "ECI-T24F2",
         "Manufacturer": "HikVision",
         "Service": "CameraRTPStreamManagement",
-        "device": "ECI-T24F28E:88:AB:7A:D0:54HikVisionNorth Sidewalk 6EED00000110",
+        "device": "ECI-T24F25C:EE:FE:4D:64:B4HikVisionNorth Sidewalk 503600000110",
         "conf": "7e647d67.f33acc",
         "outputs": 1,
         "x": 760,
@@ -3157,11 +3157,11 @@
         "id": "448a23fd99b4e52a",
         "type": "hb-event",
         "z": "92f59d974b9c8a86",
-        "name": "Side door",
+        "name": "Side Door",
         "Homebridge": "homebridge",
         "Manufacturer": "Eufy",
         "Service": "MotionSensor",
-        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000085",
+        "device": "homebridge0E:89:A7:DA:D3:21EufySide Door00000085",
         "conf": "7e647d67.f33acc",
         "sendInitialState": true,
         "x": 100,
@@ -3229,11 +3229,11 @@
         "id": "389516e4379cfcc8",
         "type": "hb-control",
         "z": "92f59d974b9c8a86",
-        "name": "Side door",
+        "name": "Side Door",
         "Homebridge": "homebridge",
         "Manufacturer": "Eufy",
         "Service": "CameraRTPStreamManagement",
-        "device": "homebridge0E:89:A7:DA:D3:21EufySide door00000110",
+        "device": "homebridge0E:89:A7:DA:D3:21EufySide Door00000110",
         "conf": "7e647d67.f33acc",
         "outputs": 1,
         "x": 720,
@@ -3248,11 +3248,11 @@
         "id": "2802a70d3cd5570b",
         "type": "hb-event",
         "z": "92f59d974b9c8a86",
-        "name": "Canoe 5036",
+        "name": "Canoe B6AE",
         "Homebridge": "ECI-T24F2",
         "Manufacturer": "HikVision",
         "Service": "MotionSensor",
-        "device": "ECI-T24F25C:EE:FE:4D:64:B4HikVisionCanoe 503600000085",
+        "device": "ECI-T24F2C1:BB:DE:42:A5:39HikVisionCanoe B6AE00000085",
         "conf": "7e647d67.f33acc",
         "sendInitialState": true,
         "x": 130,