homebridge-econet-rheem 1.5.12 → 1.5.13-beta.1

package/package.json

@@ -2,9 +2,9 @@
   "name": "homebridge-econet-rheem",
   "platform": "HomebridgeEconetRheem",
   "displayName": "Homebridge Econet Rheem",
-  "description": "Homebridge plugin based on pyeconet for control of Rheem water heaters",
+  "description": "Homebridge plugin for control of Rheem thermostats and water heaters",
   "type": "module",
-  "version": "1.5.12",
+  "version": "1.5.13-beta.1",
   "homepage": "https://github.com/mpatfield/homebridge-econet-rheem#readme",
   "repository": {
     "type": "git",
@@ -19,10 +19,11 @@
   },
   "main": "dist/homebridge/index.js",
   "scripts": {
-    "build": "rimraf ./dist && tsc",
+    "build": "rimraf ./dist && tsc && npm run build:html && npm run build:ui",
+    "build:html": "mkdir ./dist/homebridge-ui/public && cp -r ./src/homebridge-ui/public/* ./dist/homebridge-ui/public/",
+    "build:ui": "esbuild src/homebridge-ui/ui.ts --bundle --outfile=dist/homebridge-ui/public/ui.js --minify",
     "lint": "eslint . --max-warnings=0",
-    "prepublishOnly": "npm run lint && npm run build",
-    "watch": "npm run build && npm link && nodemon"
+    "prepublishOnly": "npm run lint && npm run build"
   },
   "keywords": [
     "homebridge",
@@ -44,18 +45,20 @@
     "@homebridge/plugin-ui-utils": "^2.0.2",
     "axios": "^1.7.2",
     "homebridge-lib": "^7.1.4",
+    "lodash.merge": "^4.6.2",
+    "node-persist": "^4.0.4",
     "mqtt": "^5.7.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
-    "@types/node": "^22.13.5",
+    "@types/lodash.merge": "^4.6.9",
+    "@types/node-persist": "^3.1.8",
     "@types/ws": "^8.18.1",
+    "esbuild": "^0.25.5",
     "eslint": "^9.24.0",
     "homebridge": "^2.0.0-beta.0",
-    "nodemon": "^3.1.9",
+    "jiti": "^2.4.2",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.3",
     "typescript-eslint": "^8.24.1"
   },
   "homebridge": {

package/src/homebridge-ui/public/index.html

@@ -1,104 +1,17 @@
 <p class="text-center">
   <img
     src="https://github.com/mpatfield/homebridge-econet-rheem/blob/latest/img/banner.png?raw=true"
-    alt="homebridge-econet-rheem logo"
+    alt="Homebridge Econet Rheem"
     style="width: 60%;"
   />
 </p>
 <div id="support" class="text-center" style="display: none;">
-  <p>For help and support please visit <a target="_blank" href="https://github.com/mpatfield/homebridge-econet-rheem/">GitHub</a>. We hope you find this plugin useful!</p>
+  <p i18n="support" i18n_replace="github"></p>
 </div>
 <div id="pageIntro" class="text-center" style="display: none;">
-  <p class="lead">Thank you for installing <strong>homebridge-econet-rheem</strong></p>
-  <p>
-  </br>You will need your Rheem username and password</br>
-  </p>
-  </br><button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
+  <p class="lead" i18n="thankYou"></p>
+  <p i18n="needed"></p>
+  </br><button type="button" class="btn btn-primary" id="introContinue" i18n="continue", i18n_replace="arrow"></button>
 </div>
-<div id="spinner-container">
-  <div id="spinner" class="spinner"></div>
-</div>
-<style>
-
-#spinner-container {
-  margin-top: 2rem;
-  display: none;
-  justify-content: center;
-}
-
-.spinner {
-  border: 8px solid #f3f3f3;
-  border-radius: 50%;
-  border-top: 8px solid #3498db;
-  width: 60px;
-  height: 60px;
-  -webkit-animation: spin 1s linear infinite; /* Safari */
-  animation: spin 1s linear infinite;
-}
-
-/* Safari */
-@-webkit-keyframes spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(360deg); }
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-</style>
-<script>
-  ;(async () => {
-
-      const showSpinner = () => {
-        const spinnerContainer = document.getElementById('spinner-container')
-        spinnerContainer.style.display = 'flex'
-      }
-
-      const hideSpinner = () => {
-        const spinnerContainer = document.getElementById('spinner-container')
-        spinnerContainer.style.display = 'none'
-      }
-
-      const showIntro = () => {
-        const introContinue = document.getElementById('introContinue')
-        introContinue.addEventListener('click', async () => {
-          showSettings()
-        })
-        document.getElementById('pageIntro').style.display = 'block'
-        hideSpinner()
-      }
-
-      const showSupport = () => {
-        document.getElementById('support').style.display = 'block'
-      }
-
-      const showSettings = async () => {
-        document.getElementById('pageIntro').style.display = 'none'
-        showSpinner()
-        showSupport()
-        await homebridge.showSchemaForm()
-        hideSpinner()
-      }
-
-    try {
-
-      showSpinner()
-      await new Promise(r => setTimeout(r, 500))
-
-      const currentConfig = await homebridge.getPluginConfig()
 
-      if (currentConfig.length) {
-        await showSettings()
-      } else {
-        currentConfig.push({ name: 'Econet Rheem' })
-        await homebridge.updatePluginConfig(currentConfig)
-        showIntro()
-      }
-      
-    } catch (err) {
-      homebridge.toast.error(err.message, 'Sorry, something went wrong. Please try again.')
-      hideSpinner()
-    }
-  })()
-</script>
+<script src="ui.js"></script>

package/dist/lang/en.d.ts

@@ -1,53 +0,0 @@
-declare const langEn: {
-    brand: string;
-    redacted: string;
-    undefined: string;
-    badConfig: string;
-    newEquipment: string;
-    removeDevice: string;
-    restoringDevice: string;
-    setupComplete: string;
-    setupFailed: string;
-    welcomeMessage_1: string;
-    welcomeMessage_2: string;
-    welcomeMessage_3: string;
-    welcomeMessage_4: string;
-    outOfRangeCool: string;
-    outOfRangeHeat: string;
-    setpointUnknown: string;
-    thermostat: string;
-    unknownMode: string;
-    unsupportedEquipment: string;
-    unsupportedState: string;
-    waterHeater: string;
-    authSuccess: string;
-    httpRetryMinutes: string;
-    httpRetrySeconds: string;
-    noDataReceived: string;
-    noEquipment: string;
-    reauthenticate: string;
-    reauthFailed: string;
-    authMissing: string;
-    connected: string;
-    connectionClosed: string;
-    connectionError: string;
-    clientError: string;
-    clientNotConnected: string;
-    idleConnection: string;
-    parseFailed: string;
-    reconnectInMinutes: string;
-    reconnectInSeconds: string;
-    unstableConnection: string;
-    alertCount: string;
-    availabilityState: string;
-    clientOffline: string;
-    currentTempState: string;
-    coolSetpoint: string;
-    enabledState: string;
-    heatSetpoint: string;
-    humidityState: string;
-    modeState: string;
-    runningState: string;
-    setpointState: string;
-};
-export default langEn;

package/dist/lang/en.js

@@ -1,60 +0,0 @@
-const langEn = {
-    // General
-    brand: 'EcoNet',
-    redacted: '****redacted****',
-    undefined: 'undefined',
-    // Startup
-    badConfig: 'One or more required variables are missing from the config. Please check the documentation. https://github.com/mpatfield/homebridge-econet-rheem',
-    newEquipment: 'Adding new device:',
-    removeDevice: 'Removing device:',
-    restoringDevice: 'Restoring device:',
-    setupComplete: '✓ Setup complete.',
-    setupFailed: 'Setup failed:',
-    welcomeMessage_1: 'Please ★ this plugin on GitHub if you\'re finding it useful! https://github.com/mpatfield/homebridge-econet-rheem',
-    welcomeMessage_2: 'Would you like to sponsor this plugin? https://github.com/sponsors/mpatfield',
-    welcomeMessage_3: 'Please rate us on HOOBS! https://plugins.hoobs.org/plugin/homebridge-econet-rheem',
-    welcomeMessage_4: 'Want to see this plugin in your own language? Please create a ticket! https://github.com/mpatfield/homebridge-econet-rheem/issues',
-    // Equipment
-    outOfRangeCool: 'Cool setpoint out of range, lower: %s, upper: %s, setpoint: %s',
-    outOfRangeHeat: 'Heat setpoint out of range, lower: %s, upper: %s, setpoint: %s',
-    setpointUnknown: 'Cannot determine desired setpoint when mode is %s',
-    thermostat: 'Thermostat',
-    unknownMode: 'Unknown thermostat mode:',
-    unsupportedEquipment: 'Unsupported equipment type: %s',
-    unsupportedState: 'Unsupported state:',
-    waterHeater: 'Water Heater',
-    // HTTP
-    authSuccess: 'Successfully authenticated',
-    httpRetryMinutes: 'Request failed. Retrying in %s minutes…',
-    httpRetrySeconds: 'Request failed. Retrying in %s seconds…',
-    noDataReceived: 'No data received from EcoNet',
-    noEquipment: 'No equipment found',
-    reauthenticate: 'Attempting to re-authenticate',
-    reauthFailed: 'Re-authentication failed:',
-    // MQTT
-    authMissing: 'MQTT is missing auth',
-    connected: 'Connected and listening for updates…',
-    connectionClosed: 'Connection closed',
-    connectionError: 'MQTT cannot connect',
-    clientError: 'Client error:',
-    clientNotConnected: 'Client not connected',
-    idleConnection: 'Idle connection',
-    parseFailed: 'Failed to parse message:',
-    reconnectInMinutes: 'Will attempt to reconnect in %s minutes…',
-    reconnectInSeconds: 'Will attempt to reconnect in %s seconds…',
-    unstableConnection: 'Having trouble staying connected',
-    // Debug
-    alertCount: '%s alert count = %s',
-    availabilityState: '%s availability = %s',
-    clientOffline: 'Client offline',
-    currentTempState: '%s current temp = %s',
-    coolSetpoint: '%s cool setpoint = %s',
-    enabledState: '%s enabled = %s',
-    heatSetpoint: '%s heat setpoint = %s',
-    humidityState: '%s humidity = %s',
-    modeState: '%s mode = %s',
-    runningState: '%s running = %s',
-    setpointState: '%s setpoint = %s',
-};
-export default langEn;
-//# sourceMappingURL=en.js.map

package/dist/lang/en.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"en.js","sourceRoot":"","sources":["../../src/lang/en.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG;IAEb,UAAU;IACV,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,kBAAkB;IAC5B,SAAS,EAAE,WAAW;IAEtB,UAAU;IACV,SAAS,EAAE,kJAAkJ;IAC7J,YAAY,EAAE,oBAAoB;IAClC,YAAY,EAAE,kBAAkB;IAChC,eAAe,EAAE,mBAAmB;IACpC,aAAa,EAAE,mBAAmB;IAClC,WAAW,EAAE,eAAe;IAC5B,gBAAgB,EAAE,mHAAmH;IACrI,gBAAgB,EAAE,8EAA8E;IAChG,gBAAgB,EAAE,mFAAmF;IACrG,gBAAgB,EAAE,mIAAmI;IAErJ,YAAY;IACZ,cAAc,EAAE,gEAAgE;IAChF,cAAc,EAAE,gEAAgE;IAChF,eAAe,EAAE,mDAAmD;IACpE,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,0BAA0B;IACvC,oBAAoB,EAAE,gCAAgC;IACtD,gBAAgB,EAAE,oBAAoB;IACtC,WAAW,EAAE,cAAc;IAE3B,OAAO;IACP,WAAW,EAAE,4BAA4B;IACzC,gBAAgB,EAAE,yCAAyC;IAC3D,gBAAgB,EAAE,yCAAyC;IAC3D,cAAc,EAAE,8BAA8B;IAC9C,WAAW,EAAE,oBAAoB;IACjC,cAAc,EAAE,+BAA+B;IAC/C,YAAY,EAAE,2BAA2B;IAEzC,OAAO;IACP,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,sCAAsC;IACjD,gBAAgB,EAAE,mBAAmB;IACrC,eAAe,EAAE,qBAAqB;IACtC,WAAW,EAAE,eAAe;IAC5B,kBAAkB,EAAE,sBAAsB;IAC1C,cAAc,EAAE,iBAAiB;IACjC,WAAW,EAAE,0BAA0B;IACvC,kBAAkB,EAAE,0CAA0C;IAC9D,kBAAkB,EAAE,0CAA0C;IAC9D,kBAAkB,EAAE,kCAAkC;IAEtD,QAAQ;IACR,UAAU,EAAE,qBAAqB;IACjC,iBAAiB,EAAE,sBAAsB;IACzC,aAAa,EAAE,gBAAgB;IAC/B,gBAAgB,EAAE,sBAAsB;IACxC,YAAY,EAAE,uBAAuB;IACrC,YAAY,EAAE,iBAAiB;IAC/B,YAAY,EAAE,uBAAuB;IACrC,aAAa,EAAE,kBAAkB;IACjC,SAAS,EAAE,cAAc;IACzB,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,kBAAkB;CAClC,CAAC;AAEF,eAAe,MAAM,CAAC"}